Support multiple host locations in HostHandler
Also include refactoring and some unit tests
Change-Id: I8e213d0ebff0cc8c87569f515a72007f63d85a14
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
index 1f126c6..9ac8d1a 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
@@ -648,6 +648,21 @@
}
/**
+ * Returns internal VLAN for untagged hosts on given connect point.
+ * <p>
+ * The internal VLAN is either vlan-untagged for an access port,
+ * or vlan-native for a trunk port.
+ *
+ * @param connectPoint connect point
+ * @return internal VLAN or null if both vlan-untagged and vlan-native are undefined
+ */
+ public VlanId getInternalVlanId(ConnectPoint connectPoint) {
+ VlanId untaggedVlanId = getUntaggedVlanId(connectPoint);
+ VlanId nativeVlanId = getNativeVlanId(connectPoint);
+ return untaggedVlanId != null ? untaggedVlanId : nativeVlanId;
+ }
+
+ /**
* Returns vlan port map of given device.
*
* @param deviceId device id
@@ -1465,7 +1480,7 @@
hostHandler.processHostMovedEvent(event);
break;
case HOST_REMOVED:
- hostHandler.processHostRemoveEvent(event);
+ hostHandler.processHostRemovedEvent(event);
break;
case HOST_UPDATED:
hostHandler.processHostUpdatedEvent(event);