홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Bri Prebilic Cole
Committed by Gerrit Code Review
43f17c02 1 parent a0ddb02b

GUI -- Refresh Icon added. - Fixed default column ID for intents view. 

Change-Id: Ic8991a1886e0e88de38b75c2885d42fc9ad00512
Inline Side-by-side
Showing 12 changed files with 29 additions and 21 deletions
...@@ -5,4 +5,4 @@ export OC1="192.168.56.101" ...@@ -5,4 +5,4 @@ export OC1="192.168.56.101"
5 export OC2="192.168.56.102" 5 export OC2="192.168.56.102"
6 export OCN="192.168.56.103" 6 export OCN="192.168.56.103"
7 7
8 -export ONOS_APPS="openflow,fwd,proxyarp,mobility" 8 +export ONOS_APPS="drivers,openflow,fwd,proxyarp,mobility"
......
...@@ -51,6 +51,12 @@ public class IntentViewMessageHandler extends UiMessageHandler { ...@@ -51,6 +51,12 @@ public class IntentViewMessageHandler extends UiMessageHandler {
51 51
52 private static final String INTENT_DATA_REQ = "intentDataRequest"; 52 private static final String INTENT_DATA_REQ = "intentDataRequest";
53 53
54 + private static final String APP_ID = "appId";
55 + private static final String KEY = "key";
56 + private static final String TYPE = "type";
57 + private static final String PRIORITY = "priority";
58 + private static final String RESOURCES = "resources";
59 + private static final String DETAILS = "details";
54 60
55 @Override 61 @Override
56 protected Collection<RequestHandler> getHandlers() { 62 protected Collection<RequestHandler> getHandlers() {
...@@ -67,7 +73,7 @@ public class IntentViewMessageHandler extends UiMessageHandler { ...@@ -67,7 +73,7 @@ public class IntentViewMessageHandler extends UiMessageHandler {
67 73
68 @Override 74 @Override
69 public void process(long sid, ObjectNode payload) { 75 public void process(long sid, ObjectNode payload) {
70 - RowComparator rc = TableUtils.createRowComparator(payload); 76 + RowComparator rc = TableUtils.createRowComparator(payload, APP_ID);
71 77
72 IntentService service = get(IntentService.class); 78 IntentService service = get(IntentService.class);
73 TableRow[] rows = generateTableRows(service); 79 TableRow[] rows = generateTableRows(service);
...@@ -94,13 +100,6 @@ public class IntentViewMessageHandler extends UiMessageHandler { ...@@ -94,13 +100,6 @@ public class IntentViewMessageHandler extends UiMessageHandler {
94 */ 100 */
95 private static class IntentTableRow extends AbstractTableRow { 101 private static class IntentTableRow extends AbstractTableRow {
96 102
97 - private static final String APP_ID = "appId";
98 - private static final String KEY = "key";
99 - private static final String TYPE = "type";
100 - private static final String PRIORITY = "priority";
101 - private static final String RESOURCES = "resources";
102 - private static final String DETAILS = "details";
103 -
104 private static final String[] COL_IDS = { 103 private static final String[] COL_IDS = {
105 APP_ID, KEY, TYPE, PRIORITY, RESOURCES, DETAILS 104 APP_ID, KEY, TYPE, PRIORITY, RESOURCES, DETAILS
106 }; 105 };
......
...@@ -124,6 +124,14 @@ ...@@ -124,6 +124,14 @@
124 '76.3z M31.1,85.1v-4.9l32.8-26.4c0.3,0.3,0.8,0.5,1.3,0.5h10.5l' + 124 '76.3z M31.1,85.1v-4.9l32.8-26.4c0.3,0.3,0.8,0.5,1.3,0.5h10.5l' +
125 '7.7,21.9h-3c-1,0-1.9,0.8-1.9,1.9v6.9H31.1z', 125 '7.7,21.9h-3c-1,0-1.9,0.8-1.9,1.9v6.9H31.1z',
126 126
127 + refresh: 'M102.6,40.8L88.4,70.5L69.8,43.4L80,42.6c-0.7-2.3-1.7-' +
128 + '5.1-3.4-7.8C71.8,27,64,23.1,53.5,23.1c-19.5,0-24.8,11.2-24.8,' +
129 + '11.3l-10.1-4.3c0.3-0.7,7.9-18,35-18c24.8,0,35,17.3,37.7,29.6L' +
130 + '102.6,40.8z M81.5,74.5c-0.2,0.5-5.5,11.4-24.9,11.4c-10.5,0-18.3' +
131 + '-3.9-23.1-11.7c-1.7-2.8-2.8-5.6-3.4-7.8l10.2-0.8L21.7,38.5L7.5,' +
132 + '68.2l11.4-0.9c2.7,12.3,12.9,29.6,37.7,29.6c26.9,0,34.6-17.2,34.9' +
133 + '-18L81.5,74.5z',
134 +
127 // --- Navigation glyphs ------------------------------------ 135 // --- Navigation glyphs ------------------------------------
128 136
129 flowTable: 'M15.9,19.1h-8v-13h8V19.1z M90.5,6.1H75.6v13h14.9V6.1z' + 137 flowTable: 'M15.9,19.1h-8v-13h8V19.1z M90.5,6.1H75.6v13h14.9V6.1z' +
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
37 play: 'play', 37 play: 'play',
38 stop: 'stop', 38 stop: 'stop',
39 39
40 - crown: 'crown', 40 + refresh: 'refresh',
41 41
42 upArrow: 'triangleUp', 42 upArrow: 'triangleUp',
43 downArrow: 'triangleDown', 43 downArrow: 'triangleDown',
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 <h2>Applications ({{ctrl.tableData.length}} total)</h2> 4 <h2>Applications ({{ctrl.tableData.length}} total)</h2>
5 <div class="ctrl-btns"> 5 <div class="ctrl-btns">
6 <div class="refresh active" 6 <div class="refresh active"
7 - icon icon-size="36" icon-id="crown" 7 + icon icon-size="36" icon-id="refresh"
8 ng-click="refresh()"></div> 8 ng-click="refresh()"></div>
9 <div class="separator"></div> 9 <div class="separator"></div>
10 <div id="app-install" icon icon-size="36" icon-id="plus" class="active"></div> 10 <div id="app-install" icon icon-size="36" icon-id="plus" class="active"></div>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 <h2>Cluster Nodes ({{ctrl.tableData.length}} total)</h2> 20 <h2>Cluster Nodes ({{ctrl.tableData.length}} total)</h2>
21 <div class="ctrl-btns"> 21 <div class="ctrl-btns">
22 <div class="refresh active" 22 <div class="refresh active"
23 - icon icon-size="36" icon-id="crown" 23 + icon icon-size="36" icon-id="refresh"
24 ng-click="refresh()"></div> 24 ng-click="refresh()"></div>
25 </div> 25 </div>
26 </div> 26 </div>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 <h2>Devices ({{ctrl.tableData.length}} total)</h2> 4 <h2>Devices ({{ctrl.tableData.length}} total)</h2>
5 <div class="ctrl-btns"> 5 <div class="ctrl-btns">
6 <div class="refresh active" 6 <div class="refresh active"
7 - icon icon-size="36" icon-id="crown" 7 + icon icon-size="36" icon-id="refresh"
8 ng-click="refresh()"></div> 8 ng-click="refresh()"></div>
9 </div> 9 </div>
10 </div> 10 </div>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
7 </h2> 7 </h2>
8 <div class="ctrl-btns"> 8 <div class="ctrl-btns">
9 <div class="refresh active" 9 <div class="refresh active"
10 - icon icon-size="36" icon-id="crown" 10 + icon icon-size="36" icon-id="refresh"
11 ng-click="refresh()"></div> 11 ng-click="refresh()"></div>
12 </div> 12 </div>
13 </div> 13 </div>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 <h2>Hosts ({{ctrl.tableData.length}} total)</h2> 4 <h2>Hosts ({{ctrl.tableData.length}} total)</h2>
5 <div class="ctrl-btns"> 5 <div class="ctrl-btns">
6 <div class="refresh active" 6 <div class="refresh active"
7 - icon icon-size="36" icon-id="crown" 7 + icon icon-size="36" icon-id="refresh"
8 ng-click="refresh()"></div> 8 ng-click="refresh()"></div>
9 </div> 9 </div>
10 </div> 10 </div>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 <h2>Intents ({{ctrl.tableData.length}} total)</h2> 20 <h2>Intents ({{ctrl.tableData.length}} total)</h2>
21 <div class="ctrl-btns"> 21 <div class="ctrl-btns">
22 <div class="refresh active" 22 <div class="refresh active"
23 - icon icon-size="36" icon-id="crown" 23 + icon icon-size="36" icon-id="refresh"
24 ng-click="refresh()"></div> 24 ng-click="refresh()"></div>
25 </div> 25 </div>
26 </div> 26 </div>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 <h2>Links ({{ctrl.tableData.length}} total)</h2> 20 <h2>Links ({{ctrl.tableData.length}} total)</h2>
21 <div class="ctrl-btns"> 21 <div class="ctrl-btns">
22 <div class="refresh active" 22 <div class="refresh active"
23 - icon icon-size="36" icon-id="crown" 23 + icon icon-size="36" icon-id="refresh"
24 ng-click="refresh()"></div> 24 ng-click="refresh()"></div>
25 </div> 25 </div>
26 </div> 26 </div>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 describe('factory: fw/svg/glyph.js', function() { 20 describe('factory: fw/svg/glyph.js', function() {
21 var $log, fs, gs, d3Elem, svg; 21 var $log, fs, gs, d3Elem, svg;
22 22
23 - var numBaseGlyphs = 38, 23 + var numBaseGlyphs = 39,
24 vbBird = '352 224 113 112', 24 vbBird = '352 224 113 112',
25 vbGlyph = '0 0 110 110', 25 vbGlyph = '0 0 110 110',
26 vbBadge = '0 0 10 10', 26 vbBadge = '0 0 10 10',
...@@ -39,6 +39,7 @@ describe('factory: fw/svg/glyph.js', function() { ...@@ -39,6 +39,7 @@ describe('factory: fw/svg/glyph.js', function() {
39 crown: 'M99.5,21.6c0,', 39 crown: 'M99.5,21.6c0,',
40 lock: 'M79.4,48.6h', 40 lock: 'M79.4,48.6h',
41 topo: 'M97.2,76.3H86.6', 41 topo: 'M97.2,76.3H86.6',
42 + refresh: 'M102.6,40.8L88.4',
42 43
43 // navigation specific glyphs 44 // navigation specific glyphs
44 flowTable: 'M15.9,19.1h-8v-13h', 45 flowTable: 'M15.9,19.1h-8v-13h',
...@@ -79,9 +80,9 @@ describe('factory: fw/svg/glyph.js', function() { ...@@ -79,9 +80,9 @@ describe('factory: fw/svg/glyph.js', function() {
79 }, 80 },
80 glyphIds = [ 81 glyphIds = [
81 'unknown', 'node', 'switch', 'roadm', 'endstation', 'router', 82 'unknown', 'node', 'switch', 'roadm', 'endstation', 'router',
82 - 'bgpSpeaker', 'chain', 'crown', 'lock', 'topo', 'flowTable', 83 + 'bgpSpeaker', 'chain', 'crown', 'lock', 'topo', 'refresh',
83 - 'summary', 'details', 'ports', 'map', 'cycleLabels', 'oblique', 84 + 'flowTable', 'summary', 'details', 'ports', 'map', 'cycleLabels',
84 - 'filters', 'resetZoom', 'relatedIntents', 'nextIntent', 85 + 'oblique', 'filters', 'resetZoom', 'relatedIntents', 'nextIntent',
85 'prevIntent', 'intentTraffic', 'allTraffic', 'flows', 'eqMaster' 86 'prevIntent', 'intentTraffic', 'allTraffic', 'flows', 'eqMaster'
86 ], 87 ],
87 badgeIds = [ 88 badgeIds = [
......