CORD-349 Support VLAN cross-connect traffic
Change related to this topic:
- Support VLAN cross-connect traffic
Utilize ports subjectClass to achieve. For non-xConnect port, set interface VLAN to -1
- Remove VLAN checking since we have multiple VLANs per port
- Hash the L2 interface group key generation to include VLAN as well
- Update the network-cfg.json sample
Other refactoring changes:
- Read next objective stores from srManager directly
- Use constant for flow priority
- CORD-267 Javadoc fix
Change-Id: I4ca8c2d9c8b3633a4a0101c5070d19343f7e5b90
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/TunnelHandler.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/TunnelHandler.java
index 5a82e71..8695874 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/TunnelHandler.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/TunnelHandler.java
@@ -43,16 +43,54 @@
private Map<DeviceId, DefaultGroupHandler> groupHandlerMap;
private LinkService linkService;
+ /**
+ * Result of tunnel creation or removal.
+ */
public enum Result {
+ /**
+ * Success.
+ */
SUCCESS,
+
+ /**
+ * More than one router needs to specified to created a tunnel.
+ */
WRONG_PATH,
+
+ /**
+ * The same tunnel exists already.
+ */
TUNNEL_EXISTS,
+
+ /**
+ * The same tunnel ID exists already.
+ */
ID_EXISTS,
+
+ /**
+ * Tunnel not found.
+ */
TUNNEL_NOT_FOUND,
+
+ /**
+ * Cannot remove the tunnel used by a policy.
+ */
TUNNEL_IN_USE,
+
+ /**
+ * Failed to create/remove groups for the tunnel.
+ */
INTERNAL_ERROR
}
+ /**
+ * Constructs tunnel handler.
+ *
+ * @param linkService link service
+ * @param deviceConfiguration device configuration
+ * @param groupHandlerMap group handler map
+ * @param tunnelStore tunnel store
+ */
public TunnelHandler(LinkService linkService,
DeviceConfiguration deviceConfiguration,
Map<DeviceId, DefaultGroupHandler> groupHandlerMap,