Bri Prebilic Cole

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
/*
* 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;
}
}
}
......@@ -60,13 +60,15 @@ public class UiExtensionManager implements UiExtensionService {
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());
......
......@@ -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">
......
......@@ -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>
......
......@@ -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 = [];
......
......@@ -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 = [];
......
......@@ -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 = [];
......
/*
* 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
<!--
~ 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>
/*
* 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');
}]);
}());
......@@ -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} -->
......
......@@ -40,6 +40,7 @@
'device',
'host',
'app',
'intent',
'sample',
// {INJECTED-VIEW-IDS-END}
......