GUI -- Refresh Icon added. - Fixed default column ID for intents view.
Change-Id: Ic8991a1886e0e88de38b75c2885d42fc9ad00512
diff --git a/tools/test/cells/local b/tools/test/cells/local
index c99d250..6d8b71c 100644
--- a/tools/test/cells/local
+++ b/tools/test/cells/local
@@ -5,4 +5,4 @@
export OC2="192.168.56.102"
export OCN="192.168.56.103"
-export ONOS_APPS="openflow,fwd,proxyarp,mobility"
+export ONOS_APPS="drivers,openflow,fwd,proxyarp,mobility"
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/IntentViewMessageHandler.java b/web/gui/src/main/java/org/onosproject/ui/impl/IntentViewMessageHandler.java
index 356b8b0..eb565cf 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/IntentViewMessageHandler.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/IntentViewMessageHandler.java
@@ -51,6 +51,12 @@
private static final String INTENT_DATA_REQ = "intentDataRequest";
+ private static final String APP_ID = "appId";
+ private static final String KEY = "key";
+ private static final String TYPE = "type";
+ private static final String PRIORITY = "priority";
+ private static final String RESOURCES = "resources";
+ private static final String DETAILS = "details";
@Override
protected Collection<RequestHandler> getHandlers() {
@@ -67,7 +73,7 @@
@Override
public void process(long sid, ObjectNode payload) {
- RowComparator rc = TableUtils.createRowComparator(payload);
+ RowComparator rc = TableUtils.createRowComparator(payload, APP_ID);
IntentService service = get(IntentService.class);
TableRow[] rows = generateTableRows(service);
@@ -94,13 +100,6 @@
*/
private static class IntentTableRow extends AbstractTableRow {
- private static final String APP_ID = "appId";
- private static final String KEY = "key";
- private static final String TYPE = "type";
- private static final String PRIORITY = "priority";
- private static final String RESOURCES = "resources";
- private static final String DETAILS = "details";
-
private static final String[] COL_IDS = {
APP_ID, KEY, TYPE, PRIORITY, RESOURCES, DETAILS
};
diff --git a/web/gui/src/main/webapp/app/fw/svg/glyph.js b/web/gui/src/main/webapp/app/fw/svg/glyph.js
index 3f65017..02b03ca 100644
--- a/web/gui/src/main/webapp/app/fw/svg/glyph.js
+++ b/web/gui/src/main/webapp/app/fw/svg/glyph.js
@@ -124,6 +124,14 @@
'76.3z M31.1,85.1v-4.9l32.8-26.4c0.3,0.3,0.8,0.5,1.3,0.5h10.5l' +
'7.7,21.9h-3c-1,0-1.9,0.8-1.9,1.9v6.9H31.1z',
+ refresh: 'M102.6,40.8L88.4,70.5L69.8,43.4L80,42.6c-0.7-2.3-1.7-' +
+ '5.1-3.4-7.8C71.8,27,64,23.1,53.5,23.1c-19.5,0-24.8,11.2-24.8,' +
+ '11.3l-10.1-4.3c0.3-0.7,7.9-18,35-18c24.8,0,35,17.3,37.7,29.6L' +
+ '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' +
+ '-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,' +
+ '68.2l11.4-0.9c2.7,12.3,12.9,29.6,37.7,29.6c26.9,0,34.6-17.2,34.9' +
+ '-18L81.5,74.5z',
+
// --- Navigation glyphs ------------------------------------
flowTable: 'M15.9,19.1h-8v-13h8V19.1z M90.5,6.1H75.6v13h14.9V6.1z' +
diff --git a/web/gui/src/main/webapp/app/fw/svg/icon.js b/web/gui/src/main/webapp/app/fw/svg/icon.js
index 2dfd0bb..679a7c1 100644
--- a/web/gui/src/main/webapp/app/fw/svg/icon.js
+++ b/web/gui/src/main/webapp/app/fw/svg/icon.js
@@ -37,7 +37,7 @@
play: 'play',
stop: 'stop',
- crown: 'crown',
+ refresh: 'refresh',
upArrow: 'triangleUp',
downArrow: 'triangleDown',
diff --git a/web/gui/src/main/webapp/app/view/app/app.html b/web/gui/src/main/webapp/app/view/app/app.html
index 01ab4bc..bb5f4ca 100644
--- a/web/gui/src/main/webapp/app/view/app/app.html
+++ b/web/gui/src/main/webapp/app/view/app/app.html
@@ -4,7 +4,7 @@
<h2>Applications ({{ctrl.tableData.length}} total)</h2>
<div class="ctrl-btns">
<div class="refresh active"
- icon icon-size="36" icon-id="crown"
+ icon icon-size="36" icon-id="refresh"
ng-click="refresh()"></div>
<div class="separator"></div>
<div id="app-install" icon icon-size="36" icon-id="plus" class="active"></div>
diff --git a/web/gui/src/main/webapp/app/view/cluster/cluster.html b/web/gui/src/main/webapp/app/view/cluster/cluster.html
index f418601..2c58bc0 100644
--- a/web/gui/src/main/webapp/app/view/cluster/cluster.html
+++ b/web/gui/src/main/webapp/app/view/cluster/cluster.html
@@ -20,7 +20,7 @@
<h2>Cluster Nodes ({{ctrl.tableData.length}} total)</h2>
<div class="ctrl-btns">
<div class="refresh active"
- icon icon-size="36" icon-id="crown"
+ icon icon-size="36" icon-id="refresh"
ng-click="refresh()"></div>
</div>
</div>
diff --git a/web/gui/src/main/webapp/app/view/device/device.html b/web/gui/src/main/webapp/app/view/device/device.html
index 7fad0ad..ba1cb4b 100644
--- a/web/gui/src/main/webapp/app/view/device/device.html
+++ b/web/gui/src/main/webapp/app/view/device/device.html
@@ -4,7 +4,7 @@
<h2>Devices ({{ctrl.tableData.length}} total)</h2>
<div class="ctrl-btns">
<div class="refresh active"
- icon icon-size="36" icon-id="crown"
+ icon icon-size="36" icon-id="refresh"
ng-click="refresh()"></div>
</div>
</div>
diff --git a/web/gui/src/main/webapp/app/view/flow/flow.html b/web/gui/src/main/webapp/app/view/flow/flow.html
index 540ee9c..d2278ab 100644
--- a/web/gui/src/main/webapp/app/view/flow/flow.html
+++ b/web/gui/src/main/webapp/app/view/flow/flow.html
@@ -7,7 +7,7 @@
</h2>
<div class="ctrl-btns">
<div class="refresh active"
- icon icon-size="36" icon-id="crown"
+ icon icon-size="36" icon-id="refresh"
ng-click="refresh()"></div>
</div>
</div>
diff --git a/web/gui/src/main/webapp/app/view/host/host.html b/web/gui/src/main/webapp/app/view/host/host.html
index 94fceda..9f70432 100644
--- a/web/gui/src/main/webapp/app/view/host/host.html
+++ b/web/gui/src/main/webapp/app/view/host/host.html
@@ -4,7 +4,7 @@
<h2>Hosts ({{ctrl.tableData.length}} total)</h2>
<div class="ctrl-btns">
<div class="refresh active"
- icon icon-size="36" icon-id="crown"
+ icon icon-size="36" icon-id="refresh"
ng-click="refresh()"></div>
</div>
</div>
diff --git a/web/gui/src/main/webapp/app/view/intent/intent.html b/web/gui/src/main/webapp/app/view/intent/intent.html
index 09c7f2b..2b737f4 100644
--- a/web/gui/src/main/webapp/app/view/intent/intent.html
+++ b/web/gui/src/main/webapp/app/view/intent/intent.html
@@ -20,7 +20,7 @@
<h2>Intents ({{ctrl.tableData.length}} total)</h2>
<div class="ctrl-btns">
<div class="refresh active"
- icon icon-size="36" icon-id="crown"
+ icon icon-size="36" icon-id="refresh"
ng-click="refresh()"></div>
</div>
</div>
diff --git a/web/gui/src/main/webapp/app/view/link/link.html b/web/gui/src/main/webapp/app/view/link/link.html
index 151ac3a..29121c9 100644
--- a/web/gui/src/main/webapp/app/view/link/link.html
+++ b/web/gui/src/main/webapp/app/view/link/link.html
@@ -20,7 +20,7 @@
<h2>Links ({{ctrl.tableData.length}} total)</h2>
<div class="ctrl-btns">
<div class="refresh active"
- icon icon-size="36" icon-id="crown"
+ icon icon-size="36" icon-id="refresh"
ng-click="refresh()"></div>
</div>
</div>
diff --git a/web/gui/src/main/webapp/tests/app/fw/svg/glyph-spec.js b/web/gui/src/main/webapp/tests/app/fw/svg/glyph-spec.js
index 354967e..fda0b91 100644
--- a/web/gui/src/main/webapp/tests/app/fw/svg/glyph-spec.js
+++ b/web/gui/src/main/webapp/tests/app/fw/svg/glyph-spec.js
@@ -20,7 +20,7 @@
describe('factory: fw/svg/glyph.js', function() {
var $log, fs, gs, d3Elem, svg;
- var numBaseGlyphs = 38,
+ var numBaseGlyphs = 39,
vbBird = '352 224 113 112',
vbGlyph = '0 0 110 110',
vbBadge = '0 0 10 10',
@@ -39,6 +39,7 @@
crown: 'M99.5,21.6c0,',
lock: 'M79.4,48.6h',
topo: 'M97.2,76.3H86.6',
+ refresh: 'M102.6,40.8L88.4',
// navigation specific glyphs
flowTable: 'M15.9,19.1h-8v-13h',
@@ -79,9 +80,9 @@
},
glyphIds = [
'unknown', 'node', 'switch', 'roadm', 'endstation', 'router',
- 'bgpSpeaker', 'chain', 'crown', 'lock', 'topo', 'flowTable',
- 'summary', 'details', 'ports', 'map', 'cycleLabels', 'oblique',
- 'filters', 'resetZoom', 'relatedIntents', 'nextIntent',
+ 'bgpSpeaker', 'chain', 'crown', 'lock', 'topo', 'refresh',
+ 'flowTable', 'summary', 'details', 'ports', 'map', 'cycleLabels',
+ 'oblique', 'filters', 'resetZoom', 'relatedIntents', 'nextIntent',
'prevIntent', 'intentTraffic', 'allTraffic', 'flows', 'eqMaster'
],
badgeIds = [