Committed by
Gerrit Code Review
GUI -- TopoView - re-instated Equalize Mastership Roles.
Change-Id: I8e3970e6da3a0854592a76141b2bc3f2fcd6a3c3
Showing
1 changed file
with
10 additions
and
4 deletions
... | @@ -28,7 +28,7 @@ | ... | @@ -28,7 +28,7 @@ |
28 | ]; | 28 | ]; |
29 | 29 | ||
30 | // references to injected services etc. | 30 | // references to injected services etc. |
31 | - var $log, fs, ks, zs, gs, ms, sus, tes, tfs, tps, tis, tss, tts; | 31 | + var $log, fs, ks, zs, gs, ms, sus, flash, tes, tfs, tps, tis, tss, tts; |
32 | 32 | ||
33 | // DOM elements | 33 | // DOM elements |
34 | var ovtopo, svg, defs, zoomLayer, mapG, forceG, noDevsLayer; | 34 | var ovtopo, svg, defs, zoomLayer, mapG, forceG, noDevsLayer; |
... | @@ -64,7 +64,7 @@ | ... | @@ -64,7 +64,7 @@ |
64 | A: [tts.showAllTrafficAction, 'Monitor all traffic'], | 64 | A: [tts.showAllTrafficAction, 'Monitor all traffic'], |
65 | F: [tts.showDeviceLinkFlowsAction, 'Show device link flows'], | 65 | F: [tts.showDeviceLinkFlowsAction, 'Show device link flows'], |
66 | 66 | ||
67 | - //E: [equalizeMasters, 'Equalize mastership roles'], | 67 | + E: [equalizeMasters, 'Equalize mastership roles'], |
68 | 68 | ||
69 | esc: handleEscape, | 69 | esc: handleEscape, |
70 | 70 | ||
... | @@ -101,6 +101,11 @@ | ... | @@ -101,6 +101,11 @@ |
101 | zoomer.reset(); | 101 | zoomer.reset(); |
102 | } | 102 | } |
103 | 103 | ||
104 | + function equalizeMasters() { | ||
105 | + tes.sendEvent('equalizeMasters'); | ||
106 | + flash.flash('Equalizing master roles'); | ||
107 | + } | ||
108 | + | ||
104 | function handleEscape() { | 109 | function handleEscape() { |
105 | if (tis.showMaster()) { | 110 | if (tis.showMaster()) { |
106 | // if an instance is selected, cancel the affinity mapping | 111 | // if an instance is selected, cancel the affinity mapping |
... | @@ -206,12 +211,12 @@ | ... | @@ -206,12 +211,12 @@ |
206 | .controller('OvTopoCtrl', [ | 211 | .controller('OvTopoCtrl', [ |
207 | '$scope', '$log', '$location', '$timeout', | 212 | '$scope', '$log', '$location', '$timeout', |
208 | 'FnService', 'MastService', 'KeyService', 'ZoomService', | 213 | 'FnService', 'MastService', 'KeyService', 'ZoomService', |
209 | - 'GlyphService', 'MapService', 'SvgUtilService', | 214 | + 'GlyphService', 'MapService', 'SvgUtilService', 'FlashService', |
210 | 'TopoEventService', 'TopoForceService', 'TopoPanelService', | 215 | 'TopoEventService', 'TopoForceService', 'TopoPanelService', |
211 | 'TopoInstService', 'TopoSelectService', 'TopoTrafficService', | 216 | 'TopoInstService', 'TopoSelectService', 'TopoTrafficService', |
212 | 217 | ||
213 | function ($scope, _$log_, $loc, $timeout, _fs_, mast, | 218 | function ($scope, _$log_, $loc, $timeout, _fs_, mast, |
214 | - _ks_, _zs_, _gs_, _ms_, _sus_, | 219 | + _ks_, _zs_, _gs_, _ms_, _sus_, _flash_, |
215 | _tes_, _tfs_, _tps_, _tis_, _tss_, _tts_) { | 220 | _tes_, _tfs_, _tps_, _tis_, _tss_, _tts_) { |
216 | var self = this, | 221 | var self = this, |
217 | projection, | 222 | projection, |
... | @@ -230,6 +235,7 @@ | ... | @@ -230,6 +235,7 @@ |
230 | gs = _gs_; | 235 | gs = _gs_; |
231 | ms = _ms_; | 236 | ms = _ms_; |
232 | sus = _sus_; | 237 | sus = _sus_; |
238 | + flash = _flash_; | ||
233 | tes = _tes_; | 239 | tes = _tes_; |
234 | tfs = _tfs_; | 240 | tfs = _tfs_; |
235 | tps = _tps_; | 241 | tps = _tps_; | ... | ... |
-
Please register or login to post a comment