홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Jian Li
Committed by Gerrit Code Review
79f6732b 1 parent 2bac2f23

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

Change-Id: Iba1f10adf981b90fbc47ec649493436c7c50589c
Inline Side-by-side
Showing 6 changed files with 21 additions and 9 deletions
1 /* 1 /*
2 - * Copyright 2015 Open Networking Laboratory 2 + * Copyright 2015,2016 Open Networking Laboratory
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
...@@ -62,7 +62,8 @@ public class AlarmTopovOverlay extends UiTopoOverlay { ...@@ -62,7 +62,8 @@ public class AlarmTopovOverlay extends UiTopoOverlay {
62 .addButton(ALARM2_BUTTON); 62 .addButton(ALARM2_BUTTON);
63 63
64 pp.removeButtons(CoreButtons.SHOW_PORT_VIEW) 64 pp.removeButtons(CoreButtons.SHOW_PORT_VIEW)
65 - .removeButtons(CoreButtons.SHOW_GROUP_VIEW); 65 + .removeButtons(CoreButtons.SHOW_GROUP_VIEW)
66 + .removeButtons(CoreButtons.SHOW_METER_VIEW);
66 } 67 }
67 68
68 private void addAlarmCountsProperties(PropertyPanel pp, Map<Alarm.SeverityLevel, Long> countsForDevice) { 69 private void addAlarmCountsProperties(PropertyPanel pp, Map<Alarm.SeverityLevel, Long> countsForDevice) {
......
1 /* 1 /*
2 - * Copyright 2015 Open Networking Laboratory 2 + * Copyright 2015,2016 Open Networking Laboratory
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
...@@ -126,6 +126,9 @@ public final class TopoConstants { ...@@ -126,6 +126,9 @@ public final class TopoConstants {
126 126
127 public static final ButtonId SHOW_GROUP_VIEW = 127 public static final ButtonId SHOW_GROUP_VIEW =
128 new ButtonId("showGroupView"); 128 new ButtonId("showGroupView");
129 +
130 + public static final ButtonId SHOW_METER_VIEW =
131 + new ButtonId("showMeterView");
129 } 132 }
130 133
131 } 134 }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 #set( $symbol_dollar = '$' ) 2 #set( $symbol_dollar = '$' )
3 #set( $symbol_escape = '\' ) 3 #set( $symbol_escape = '\' )
4 /* 4 /*
5 - * Copyright 2014,2015 Open Networking Laboratory 5 + * Copyright 2014-2016 Open Networking Laboratory
6 * 6 *
7 * Licensed under the Apache License, Version 2.0 (the "License"); 7 * Licensed under the Apache License, Version 2.0 (the "License");
8 * you may not use this file except in compliance with the License. 8 * you may not use this file except in compliance with the License.
...@@ -76,7 +76,8 @@ public class AppUiTopovOverlay extends UiTopoOverlay { ...@@ -76,7 +76,8 @@ public class AppUiTopovOverlay extends UiTopoOverlay {
76 .addButton(BAR_BUTTON); 76 .addButton(BAR_BUTTON);
77 77
78 pp.removeButtons(CoreButtons.SHOW_PORT_VIEW) 78 pp.removeButtons(CoreButtons.SHOW_PORT_VIEW)
79 - .removeButtons(CoreButtons.SHOW_GROUP_VIEW); 79 + .removeButtons(CoreButtons.SHOW_GROUP_VIEW)
80 + .removeButtons(CoreButtons.SHOW_METER_VIEW);
80 } 81 }
81 82
82 } 83 }
......
1 /* 1 /*
2 - * Copyright 2015 Open Networking Laboratory 2 + * Copyright 2015,2016 Open Networking Laboratory
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
...@@ -432,7 +432,8 @@ public abstract class TopologyViewMessageHandlerBase extends UiMessageHandler { ...@@ -432,7 +432,8 @@ public abstract class TopologyViewMessageHandlerBase extends UiMessageHandler {
432 .addButton(CoreButtons.SHOW_DEVICE_VIEW) 432 .addButton(CoreButtons.SHOW_DEVICE_VIEW)
433 .addButton(CoreButtons.SHOW_FLOW_VIEW) 433 .addButton(CoreButtons.SHOW_FLOW_VIEW)
434 .addButton(CoreButtons.SHOW_PORT_VIEW) 434 .addButton(CoreButtons.SHOW_PORT_VIEW)
435 - .addButton(CoreButtons.SHOW_GROUP_VIEW); 435 + .addButton(CoreButtons.SHOW_GROUP_VIEW)
436 + .addButton(CoreButtons.SHOW_METER_VIEW);
436 437
437 return pp; 438 return pp;
438 } 439 }
......
1 /* 1 /*
2 - * Copyright 2015 Open Networking Laboratory 2 + * Copyright 2015,2016 Open Networking Laboratory
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
...@@ -68,7 +68,8 @@ public class AppUiTopoOverlay extends UiTopoOverlay { ...@@ -68,7 +68,8 @@ public class AppUiTopoOverlay extends UiTopoOverlay {
68 .addButton(BAR_BUTTON); 68 .addButton(BAR_BUTTON);
69 69
70 pp.removeButtons(CoreButtons.SHOW_PORT_VIEW) 70 pp.removeButtons(CoreButtons.SHOW_PORT_VIEW)
71 - .removeButtons(CoreButtons.SHOW_GROUP_VIEW); 71 + .removeButtons(CoreButtons.SHOW_GROUP_VIEW)
72 + .removeButtons(CoreButtons.SHOW_METER_VIEW);
72 } 73 }
73 74
74 } 75 }
......
...@@ -181,6 +181,11 @@ ...@@ -181,6 +181,11 @@
181 gid: 'groupTable', 181 gid: 'groupTable',
182 tt: 'Show Group View for this Device', 182 tt: 'Show Group View for this Device',
183 path: 'group' 183 path: 'group'
184 + },
185 + showMeterView: {
186 + gid: 'meterTable',
187 + tt: 'Show Meter View for this Device',
188 + path: 'meter'
184 } 189 }
185 }; 190 };
186 191
......