ONOS-4971: Synthetic Link Data -- WIP
- Enhancing UiRegion to capture the hierarchical (parent/child) relationships captured in the UiTopoLayouts.
Change-Id: I152e0d52d4580b14b679f3387402077f16f61e6a
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 12c9de6..ade86e1 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
@@ -68,13 +68,16 @@
}
/**
- * Returns the identifier of the backing region. Will be null if the
- * region is null.
+ * Returns the identifier of the backing region. If this is the default
+ * layout, the null-region ID will be returned, otherwise the ID of the
+ * backing region for this layout will be returned; null in the case that
+ * there is no backing region.
*
* @return backing region identifier
*/
public RegionId regionId() {
- return region == null ? null : region.id();
+ return isRoot() ? UiRegion.NULL_ID
+ : (region == null ? null : region.id());
}
/**