ONOS-4971: Synthetic Link Data -- WIP, merge anyway
- created temp Topology2 View (topoX) to "process" and display topology data.
- made root layout parent of itself (just like /.. = /) to simplify layout hierarchy operations.
- added nodeType property to JSON rep of regions/devices/hosts.
- augmented peers to include devices.
- added skeleton topo2NavRegion event.
Change-Id: I8219125d7dfe33d211350ae27111a3d9de6eb4ca
diff --git a/core/api/src/main/java/org/onosproject/ui/UiTopoLayoutService.java b/core/api/src/main/java/org/onosproject/ui/UiTopoLayoutService.java
index 287cc43..0036521 100644
--- a/core/api/src/main/java/org/onosproject/ui/UiTopoLayoutService.java
+++ b/core/api/src/main/java/org/onosproject/ui/UiTopoLayoutService.java
@@ -63,7 +63,7 @@
* @param layoutId layout identifier
* @return set of peer layouts; empty set if layout has no peers
*/
- Set<UiTopoLayout> getPeers(UiTopoLayoutId layoutId);
+ Set<UiTopoLayout> getPeerLayouts(UiTopoLayoutId layoutId);
/**
* Returns the set of the child layouts of the specified layout.
diff --git a/core/api/src/main/java/org/onosproject/ui/model/topo/UiTopoLayout.java b/core/api/src/main/java/org/onosproject/ui/model/topo/UiTopoLayout.java
index 604cf65..12c9de6 100644
--- a/core/api/src/main/java/org/onosproject/ui/model/topo/UiTopoLayout.java
+++ b/core/api/src/main/java/org/onosproject/ui/model/topo/UiTopoLayout.java
@@ -39,7 +39,8 @@
public UiTopoLayout(UiTopoLayoutId id, Region region, UiTopoLayoutId parent) {
this.id = id;
this.region = region;
- this.parent = parent;
+ // NOTE: root layout is its own parent...
+ this.parent = parent != null ? parent : this.id;
}
@Override
@@ -85,5 +86,13 @@
return parent;
}
- // TODO: additional properties pertinent to the layout
+ /**
+ * Returns true if this layout instance is at the top of the
+ * hierarchy tree.
+ *
+ * @return true if this is the root layout
+ */
+ public boolean isRoot() {
+ return id.equals(parent);
+ }
}