GUI -- Adjusted height of tables in tabular views, added new and removed columns in Device View. Removed rounded bottom corners of tabular views, created table.css instead of using common.css
Change-Id: I77ff4c3abe051e1e4e566eb805e4b4a695f011ba
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/DeviceViewMessageHandler.java b/web/gui/src/main/java/org/onosproject/ui/impl/DeviceViewMessageHandler.java
index 6b1ac7b..a3c7e2f 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/DeviceViewMessageHandler.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/DeviceViewMessageHandler.java
@@ -20,12 +20,18 @@
import com.google.common.collect.ImmutableSet;
import org.onosproject.mastership.MastershipService;
import org.onosproject.net.Device;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Port;
import org.onosproject.net.device.DeviceService;
+import org.onosproject.net.link.LinkService;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+//import org.onosproject.net.Link;
+//import java.util.Set;
+
/**
* Message handler for device view related messages.
*/
@@ -46,7 +52,10 @@
DeviceService service = get(DeviceService.class);
MastershipService mastershipService = get(MastershipService.class);
- TableRow[] rows = generateTableRows(service, mastershipService);
+ LinkService linkService = get(LinkService.class);
+ TableRow[] rows = generateTableRows(service,
+ mastershipService,
+ linkService);
RowComparator rc =
new RowComparator(sortCol, RowComparator.direction(sortDir));
Arrays.sort(rows, rc);
@@ -58,10 +67,14 @@
}
private TableRow[] generateTableRows(DeviceService service,
- MastershipService mastershipService) {
+ MastershipService mastershipService,
+ LinkService linkService) {
List<TableRow> list = new ArrayList<>();
for (Device dev : service.getDevices()) {
- list.add(new DeviceTableRow(service, mastershipService, dev));
+ list.add(new DeviceTableRow(service,
+ mastershipService,
+ linkService,
+ dev));
}
return list.toArray(new TableRow[list.size()]);
}
@@ -76,40 +89,70 @@
private static final String AVAILABLE_IID = "_iconid_available";
private static final String TYPE_IID = "_iconid_type";
private static final String DEV_ICON_PREFIX = "devIcon_";
- private static final String ROLE = "role";
+ private static final String NUM_PORTS = "num_ports";
+ private static final String NUM_EGRESS_LINKS = "num_elinks";
private static final String MFR = "mfr";
private static final String HW = "hw";
private static final String SW = "sw";
- private static final String SERIAL = "serial";
private static final String PROTOCOL = "protocol";
- private static final String CHASSISID = "chassisid";
private static final String MASTERID = "masterid";
+ private static final String CHASSISID = "chassisid";
+ private static final String SERIAL = "serial";
private static final String[] COL_IDS = {
- ID, AVAILABLE, AVAILABLE_IID, TYPE_IID, ROLE,
- MFR, HW, SW, SERIAL, PROTOCOL, CHASSISID, MASTERID
+ AVAILABLE, AVAILABLE_IID, TYPE_IID, ID,
+ NUM_PORTS, NUM_EGRESS_LINKS, MASTERID, MFR, HW, SW,
+ PROTOCOL, CHASSISID, SERIAL
};
private static final String ICON_ID_ONLINE = "deviceOnline";
private static final String ICON_ID_OFFLINE = "deviceOffline";
+ // TODO: use in details pane
+// private String getPorts(List<Port> ports) {
+// String formattedString = "";
+// int numPorts = 0;
+//
+// for (Port p : ports) {
+// numPorts++;
+// formattedString += p.number().toString() + ", ";
+// }
+// return formattedString + "Total: " + numPorts;
+// }
+
+ // TODO: use in details pane
+// private String getEgressLinks(Set<Link> links) {
+// String formattedString = "";
+//
+// for (Link l : links) {
+// formattedString += l.dst().port().toString() + ", ";
+// }
+// return formattedString;
+// }
+
+ // TODO: include "extra" backend information in device details pane
public DeviceTableRow(DeviceService service,
MastershipService ms,
+ LinkService ls,
Device d) {
boolean available = service.isAvailable(d.id());
String iconId = available ? ICON_ID_ONLINE : ICON_ID_OFFLINE;
+ DeviceId id = d.id();
+ List<Port> ports = service.getPorts(id);
+// Set<Link> links = ls.getDeviceEgressLinks(id);
- add(ID, d.id().toString());
+ add(ID, id.toString());
add(AVAILABLE, Boolean.toString(available));
add(AVAILABLE_IID, iconId);
add(TYPE_IID, getTypeIconId(d));
- add(ROLE, service.getRole(d.id()).toString());
add(MFR, d.manufacturer());
add(HW, d.hwVersion());
add(SW, d.swVersion());
- add(SERIAL, d.serialNumber());
+// add(SERIAL, d.serialNumber());
add(PROTOCOL, d.annotations().value(PROTOCOL));
- add(CHASSISID, d.chassisId().toString());
+ add(NUM_PORTS, Integer.toString(ports.size()));
+// add(NUM_EGRESS_LINKS, Integer.toString(links.size()));
+// add(CHASSISID, d.chassisId().toString());
add(MASTERID, ms.getMasterFor(d.id()).toString());
}