Jian Li
Committed by Gerrit Code Review

[ONOS-3642] Add missing meter icon in topology view

Change-Id: Iba1f10adf981b90fbc47ec649493436c7c50589c
/*
* Copyright 2015 Open Networking Laboratory
* Copyright 2015,2016 Open Networking Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -62,7 +62,8 @@ public class AlarmTopovOverlay extends UiTopoOverlay {
.addButton(ALARM2_BUTTON);
pp.removeButtons(CoreButtons.SHOW_PORT_VIEW)
.removeButtons(CoreButtons.SHOW_GROUP_VIEW);
.removeButtons(CoreButtons.SHOW_GROUP_VIEW)
.removeButtons(CoreButtons.SHOW_METER_VIEW);
}
private void addAlarmCountsProperties(PropertyPanel pp, Map<Alarm.SeverityLevel, Long> countsForDevice) {
......
/*
* Copyright 2015 Open Networking Laboratory
* Copyright 2015,2016 Open Networking Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -126,6 +126,9 @@ public final class TopoConstants {
public static final ButtonId SHOW_GROUP_VIEW =
new ButtonId("showGroupView");
public static final ButtonId SHOW_METER_VIEW =
new ButtonId("showMeterView");
}
}
......
......@@ -2,7 +2,7 @@
#set( $symbol_dollar = '$' )
#set( $symbol_escape = '\' )
/*
* Copyright 2014,2015 Open Networking Laboratory
* Copyright 2014-2016 Open Networking Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -76,7 +76,8 @@ public class AppUiTopovOverlay extends UiTopoOverlay {
.addButton(BAR_BUTTON);
pp.removeButtons(CoreButtons.SHOW_PORT_VIEW)
.removeButtons(CoreButtons.SHOW_GROUP_VIEW);
.removeButtons(CoreButtons.SHOW_GROUP_VIEW)
.removeButtons(CoreButtons.SHOW_METER_VIEW);
}
}
......
/*
* Copyright 2015 Open Networking Laboratory
* Copyright 2015,2016 Open Networking Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -432,7 +432,8 @@ public abstract class TopologyViewMessageHandlerBase extends UiMessageHandler {
.addButton(CoreButtons.SHOW_DEVICE_VIEW)
.addButton(CoreButtons.SHOW_FLOW_VIEW)
.addButton(CoreButtons.SHOW_PORT_VIEW)
.addButton(CoreButtons.SHOW_GROUP_VIEW);
.addButton(CoreButtons.SHOW_GROUP_VIEW)
.addButton(CoreButtons.SHOW_METER_VIEW);
return pp;
}
......
/*
* Copyright 2015 Open Networking Laboratory
* Copyright 2015,2016 Open Networking Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -68,7 +68,8 @@ public class AppUiTopoOverlay extends UiTopoOverlay {
.addButton(BAR_BUTTON);
pp.removeButtons(CoreButtons.SHOW_PORT_VIEW)
.removeButtons(CoreButtons.SHOW_GROUP_VIEW);
.removeButtons(CoreButtons.SHOW_GROUP_VIEW)
.removeButtons(CoreButtons.SHOW_METER_VIEW);
}
}
......
......@@ -181,6 +181,11 @@
gid: 'groupTable',
tt: 'Show Group View for this Device',
path: 'group'
},
showMeterView: {
gid: 'meterTable',
tt: 'Show Meter View for this Device',
path: 'meter'
}
};
......