GUI -- Basic Intent View implemented. Includes app id, key, type, and priority. Details / resources to be added later.
- deleted unused dependencies in controllers.
Change-Id: I8c38c4b688284f9eabc35e3a174dde3eb7b93bde
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
new file mode 100644
index 0000000..c0f0af1
--- /dev/null
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/IntentViewMessageHandler.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2015 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.ui.impl;
+
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.collect.ImmutableSet;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.net.intent.Intent;
+import org.onosproject.net.intent.IntentService;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Message handler for intent view related messages.
+ */
+public class IntentViewMessageHandler extends AbstractTabularViewMessageHandler {
+
+ /**
+ * Creates a new message handler for the intent messages.
+ */
+ protected IntentViewMessageHandler() {
+ super(ImmutableSet.of("intentDataRequest"));
+ }
+
+ @Override
+ public void process(ObjectNode message) {
+ ObjectNode payload = payload(message);
+ String sortCol = string(payload, "sortCol", "appId");
+ String sortDir = string(payload, "sortDir", "asc");
+
+ IntentService service = get(IntentService.class);
+ TableRow[] rows = generateTableRows(service);
+ RowComparator rc =
+ new RowComparator(sortCol, RowComparator.direction(sortDir));
+ Arrays.sort(rows, rc);
+ ArrayNode intents = generateArrayNode(rows);
+ ObjectNode rootNode = mapper.createObjectNode();
+ rootNode.set("intents", intents);
+
+ connection().sendMessage("intentDataResponse", 0, rootNode);
+ }
+
+ private TableRow[] generateTableRows(IntentService service) {
+ List<TableRow> list = new ArrayList<>();
+ for (Intent intent : service.getIntents()) {
+ list.add(new IntentTableRow(intent));
+ }
+ return list.toArray(new TableRow[list.size()]);
+ }
+
+ /**
+ * TableRow implementation for {@link Intent intents}.
+ */
+ 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[] COL_IDS = {
+ APP_ID, KEY, TYPE, PRIORITY
+ };
+
+ public IntentTableRow(Intent i) {
+ ApplicationId appid = i.appId();
+
+ add(APP_ID, String.valueOf(appid.id()) + " : " + appid.name());
+ add(KEY, i.key().toString());
+ add(TYPE, i.getClass().getSimpleName());
+ add(PRIORITY, Integer.toString(i.priority()));
+ }
+
+ @Override
+ protected String[] columnIds() {
+ return COL_IDS;
+ }
+ }
+
+}
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/UiExtensionManager.java b/web/gui/src/main/java/org/onosproject/ui/impl/UiExtensionManager.java
index f0541f6..469287e 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/UiExtensionManager.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/UiExtensionManager.java
@@ -60,13 +60,15 @@
new UiView("device", "Devices"),
new UiView("host", "Hosts"),
new UiView("app", "Applications"),
+ new UiView("intent", "Intents"),
new UiView("sample", "Sample"));
UiMessageHandlerFactory messageHandlerFactory =
() -> ImmutableList.of(
new TopologyViewMessageHandler(),
new DeviceViewMessageHandler(),
new HostViewMessageHandler(),
- new ApplicationViewMessageHandler()
+ new ApplicationViewMessageHandler(),
+ new IntentViewMessageHandler()
);
return new UiExtension(coreViews, messageHandlerFactory, "core",
UiExtensionManager.class.getClassLoader());
diff --git a/web/gui/src/main/resources/core/css.html b/web/gui/src/main/resources/core/css.html
index 3ff410c..f29b3e1 100644
--- a/web/gui/src/main/resources/core/css.html
+++ b/web/gui/src/main/resources/core/css.html
@@ -3,3 +3,4 @@
<link rel="stylesheet" href="app/view/device/device.css">
<link rel="stylesheet" href="app/view/host/host.css">
<link rel="stylesheet" href="app/view/app/app.css">
+<link rel="stylesheet" href="app/view/intent/intent.css">
diff --git a/web/gui/src/main/resources/core/js.html b/web/gui/src/main/resources/core/js.html
index c2ad984..68df55b 100644
--- a/web/gui/src/main/resources/core/js.html
+++ b/web/gui/src/main/resources/core/js.html
@@ -14,4 +14,5 @@
<script src="app/view/device/device.js"></script>
<script src="app/view/host/host.js"></script>
<script src="app/view/app/app.js"></script>
+<script src="app/view/intent/intent.js"></script>
<script src="app/view/sample/sample.js"></script>
diff --git a/web/gui/src/main/webapp/app/view/app/app.js b/web/gui/src/main/webapp/app/view/app/app.js
index d2bab39..e315072 100644
--- a/web/gui/src/main/webapp/app/view/app/app.js
+++ b/web/gui/src/main/webapp/app/view/app/app.js
@@ -23,9 +23,9 @@
angular.module('ovApp', [])
.controller('OvAppCtrl',
- ['$log', '$scope', '$location', 'FnService', 'WebSocketService',
+ ['$log', '$scope', 'FnService', 'WebSocketService',
- function ($log, $scope, $location, fs, wss) {
+ function ($log, $scope, fs, wss) {
var self = this;
self.appData = [];
diff --git a/web/gui/src/main/webapp/app/view/device/device.js b/web/gui/src/main/webapp/app/view/device/device.js
index d7b3292..a201e3f 100644
--- a/web/gui/src/main/webapp/app/view/device/device.js
+++ b/web/gui/src/main/webapp/app/view/device/device.js
@@ -23,9 +23,9 @@
angular.module('ovDevice', [])
.controller('OvDeviceCtrl',
- ['$log', '$scope', '$location', 'WebSocketService',
+ ['$log', '$scope', 'WebSocketService',
- function ($log, $scope, $location, wss) {
+ function ($log, $scope, wss) {
var self = this;
self.deviceData = [];
diff --git a/web/gui/src/main/webapp/app/view/host/host.js b/web/gui/src/main/webapp/app/view/host/host.js
index 378f597..c090c73 100644
--- a/web/gui/src/main/webapp/app/view/host/host.js
+++ b/web/gui/src/main/webapp/app/view/host/host.js
@@ -23,9 +23,9 @@
angular.module('ovHost', [])
.controller('OvHostCtrl',
- ['$log', '$scope', '$location', 'FnService', 'WebSocketService',
+ ['$log', '$scope', 'FnService', 'WebSocketService',
- function ($log, $scope, $location, fs, wss) {
+ function ($log, $scope, fs, wss) {
var self = this;
self.hostData = [];
diff --git a/web/gui/src/main/webapp/app/view/intent/intent.css b/web/gui/src/main/webapp/app/view/intent/intent.css
new file mode 100644
index 0000000..d0cb9a2
--- /dev/null
+++ b/web/gui/src/main/webapp/app/view/intent/intent.css
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2015 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ ONOS GUI -- Intent View -- CSS file
+ */
+
+#ov-intent td {
+}
\ No newline at end of file
diff --git a/web/gui/src/main/webapp/app/view/intent/intent.html b/web/gui/src/main/webapp/app/view/intent/intent.html
new file mode 100644
index 0000000..c3ff85a
--- /dev/null
+++ b/web/gui/src/main/webapp/app/view/intent/intent.html
@@ -0,0 +1,44 @@
+<!--
+ ~ Copyright 2015 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.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<!-- Intent partial HTML -->
+<div id="ov-intent">
+ <h2>Intents ({{ctrl.intentData.length}} total)</h2>
+ <table class="summary-list"
+ onos-fixed-header
+ onos-sortable-header
+ sort-callback="sortCallback(requestParams)">
+ <thead>
+ <tr>
+ <th colId="appId" sortable>Application ID </th>
+ <th colId="key" sortable>Key </th>
+ <th colId="type" sortable>Type </th>
+ <th colId="priority" sortable>Priority </th>
+ </tr>
+ </thead>
+
+ <tbody>
+ <tr ng-repeat="intent in ctrl.intentData"
+ ng-repeat-done>
+ <td>{{intent.appId}}</td>
+ <td>{{intent.key}}</td>
+ <td>{{intent.type}}</td>
+ <td>{{intent.priority}}</td>
+ </tr>
+ </tbody>
+ </table>
+
+</div>
diff --git a/web/gui/src/main/webapp/app/view/intent/intent.js b/web/gui/src/main/webapp/app/view/intent/intent.js
new file mode 100644
index 0000000..314bdf8
--- /dev/null
+++ b/web/gui/src/main/webapp/app/view/intent/intent.js
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2015 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ ONOS GUI -- Intent View Module
+ */
+
+(function () {
+ 'use strict';
+
+ angular.module('ovIntent', [])
+ .controller('OvIntentCtrl',
+ ['$log', '$scope', 'FnService', 'WebSocketService',
+
+ function ($log, $scope, fs, wss) {
+ var self = this;
+ self.intentData = [];
+
+ $scope.responseCallback = function(data) {
+ self.intentData = data.intents;
+ $scope.$apply();
+ };
+
+ $scope.sortCallback = function (requestParams) {
+ wss.sendEvent('intentDataRequest', requestParams);
+ };
+
+ var handlers = {
+ intentDataResponse: $scope.responseCallback
+ };
+ wss.bindHandlers(handlers);
+
+ // Cleanup on destroyed scope
+ $scope.$on('$destroy', function () {
+ wss.unbindHandlers(handlers);
+ });
+
+ $scope.sortCallback();
+
+ $log.log('OvIntentCtrl has been created');
+ }]);
+}());
diff --git a/web/gui/src/main/webapp/index.html b/web/gui/src/main/webapp/index.html
index ef45356..638f3f3 100644
--- a/web/gui/src/main/webapp/index.html
+++ b/web/gui/src/main/webapp/index.html
@@ -102,6 +102,7 @@
<script src="app/view/device/device.js"></script>
<script src="app/view/host/host.js"></script>
<script src="app/view/app/app.js"></script>
+ <script src="app/view/intent/intent.js"></script>
<script src="app/view/sample/sample.js"></script>
<!-- {INJECTED-JAVASCRIPT-END} -->
@@ -112,6 +113,7 @@
<link rel="stylesheet" href="app/view/device/device.css">
<link rel="stylesheet" href="app/view/host/host.css">
<link rel="stylesheet" href="app/view/app/app.css">
+ <link rel="stylesheet" href="app/view/intent/intent.css">
<link rel="stylesheet" href="app/view/sample/sample.css">
<!-- {INJECTED-STYLESHEETS-END} -->
diff --git a/web/gui/src/main/webapp/onos.js b/web/gui/src/main/webapp/onos.js
index 2822cf6..ad73fc8 100644
--- a/web/gui/src/main/webapp/onos.js
+++ b/web/gui/src/main/webapp/onos.js
@@ -40,6 +40,7 @@
'device',
'host',
'app',
+ 'intent',
'sample',
// {INJECTED-VIEW-IDS-END}