Bri Prebilic Cole

GUI -- Base Link View added -- WIP.

Change-Id: Iad0bb3d4a796b420d0fcb071812d320c35941b6b
/*
* 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.net.ConnectPoint;
import org.onosproject.net.Link;
import org.onosproject.net.link.LinkService;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
* Message handler for link view related messages.
*/
public class LinkViewMessageHandler extends AbstractTabularViewMessageHandler {
/**
* Creates a new message handler for the link messages.
*/
protected LinkViewMessageHandler() {
super(ImmutableSet.of("linkDataRequest"));
}
@Override
public void process(ObjectNode message) {
ObjectNode payload = payload(message);
String sortCol = string(payload, "sortCol", "src");
String sortDir = string(payload, "sortDir", "asc");
LinkService service = get(LinkService.class);
TableRow[] rows = generateTableRows(service);
RowComparator rc =
new RowComparator(sortCol, RowComparator.direction(sortDir));
Arrays.sort(rows, rc);
ArrayNode links = generateArrayNode(rows);
ObjectNode rootNode = mapper.createObjectNode();
rootNode.set("links", links);
connection().sendMessage("linkDataResponse", 0, rootNode);
}
private TableRow[] generateTableRows(LinkService service) {
List<TableRow> list = new ArrayList<>();
for (Link link : service.getLinks()) {
list.add(new LinkTableRow(link));
}
return list.toArray(new TableRow[list.size()]);
}
/**
* TableRow implementation for {@link Link links}.
*/
private static class LinkTableRow extends AbstractTableRow {
private static final String SOURCE = "src";
private static final String DEST = "dst";
private static final String TYPE = "type";
private static final String STATE = "state";
private static final String DURABLE = "durable";
private static final String[] COL_IDS = {
SOURCE, DEST, TYPE, STATE, DURABLE
};
public LinkTableRow(Link l) {
ConnectPoint src = l.src();
ConnectPoint dst = l.dst();
add(SOURCE, src.elementId().toString() + "/" + src.port().toString());
add(DEST, dst.elementId().toString() + "/" + dst.port().toString());
add(TYPE, l.type().toString());
add(STATE, l.state().toString());
add(DURABLE, Boolean.toString(l.isDurable()));
}
@Override
protected String[] columnIds() {
return COL_IDS;
}
}
}
......@@ -62,6 +62,7 @@ public class UiExtensionManager implements UiExtensionService {
new UiView("app", "Applications"),
new UiView("intent", "Intents"),
new UiView("cluster", "Cluster Nodes"),
new UiView("link", "Links"),
new UiView("sample", "Sample"));
UiMessageHandlerFactory messageHandlerFactory =
() -> ImmutableList.of(
......@@ -70,7 +71,8 @@ public class UiExtensionManager implements UiExtensionService {
new HostViewMessageHandler(),
new ApplicationViewMessageHandler(),
new IntentViewMessageHandler(),
new ClusterViewMessageHandler()
new ClusterViewMessageHandler(),
new LinkViewMessageHandler()
);
return new UiExtension(coreViews, messageHandlerFactory, "core",
UiExtensionManager.class.getClassLoader());
......
......@@ -5,3 +5,4 @@
<link rel="stylesheet" href="app/view/app/app.css">
<link rel="stylesheet" href="app/view/intent/intent.css">
<link rel="stylesheet" href="app/view/cluster/cluster.css">
<link rel="stylesheet" href="app/view/link/link.css">
......
......@@ -17,4 +17,5 @@
<script src="app/view/app/app.js"></script>
<script src="app/view/intent/intent.js"></script>
<script src="app/view/cluster/cluster.js"></script>
<script src="app/view/link/link.js"></script>
<script src="app/view/sample/sample.js"></script>
......
/*
* 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 -- Link View -- CSS file
*/
#ov-link 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.
-->
<!-- Link partial HTML -->
<div id="ov-link">
<h2>Links ({{ctrl.tableData.length}} total)</h2>
<table class="summary-list"
onos-fixed-header
onos-sortable-header
sort-callback="sortCallback(requestParams)">
<thead>
<tr>
<th colId="src" sortable>Source </th>
<th colId="dst" sortable>Destination </th>
<th colId="type" sortable>Type </th>
<th colId="state" sortable>State </th>
<th colId="durable" sortable>Durable </th>
</tr>
</thead>
<tbody>
<tr ng-hide="ctrl.tableData.length">
<td class="nodata" colspan="5">
No Links found
</td>
</tr>
<tr ng-repeat="link in ctrl.tableData"
ng-repeat-done>
<td>{{link.src}}</td>
<td>{{link.dst}}</td>
<td>{{link.type}}</td>
<td>{{link.state}}</td>
<td>{{link.durable}}</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 -- Host View Module
*/
(function () {
'use strict';
angular.module('ovLink', [])
.controller('OvLinkCtrl',
['$log', '$scope', 'TableBuilderService',
function ($log, $scope, tbs) {
tbs.buildTable({
self: this,
scope: $scope,
tag: 'link'
});
$log.log('OvLinkCtrl has been created');
}]);
}());
......@@ -115,6 +115,7 @@
<script src="app/view/app/app.js"></script>
<script src="app/view/intent/intent.js"></script>
<script src="app/view/cluster/cluster.js"></script>
<script src="app/view/link/link.js"></script>
<script src="app/view/sample/sample.js"></script>
<!-- {INJECTED-JAVASCRIPT-END} -->
......@@ -127,6 +128,7 @@
<link rel="stylesheet" href="app/view/app/app.css">
<link rel="stylesheet" href="app/view/intent/intent.css">
<link rel="stylesheet" href="app/view/cluster/cluster.css">
<link rel="stylesheet" href="app/view/link/link.css">
<link rel="stylesheet" href="app/view/sample/sample.css">
<!-- {INJECTED-STYLESHEETS-END} -->
......
......@@ -42,6 +42,7 @@
'app',
'intent',
'cluster',
'link',
'sample',
// {INJECTED-VIEW-IDS-END}
......