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/grouphandler/DefaultGroupHandler.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java
index a4b89c1..4e64c4b 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java
@@ -35,6 +35,7 @@
import org.onlab.packet.VlanId;
import org.onlab.util.KryoNamespace;
import org.onosproject.core.ApplicationId;
+import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DeviceId;
import org.onosproject.net.Link;
import org.onosproject.net.PortNumber;
@@ -48,8 +49,6 @@
import org.onosproject.net.flowobjective.Objective;
import org.onosproject.net.flowobjective.ObjectiveContext;
import org.onosproject.net.flowobjective.ObjectiveError;
-import org.onosproject.net.group.DefaultGroupKey;
-import org.onosproject.net.group.GroupKey;
import org.onosproject.net.link.LinkService;
import org.onosproject.segmentrouting.SegmentRoutingManager;
import org.onosproject.segmentrouting.config.DeviceConfigNotFoundException;
@@ -81,12 +80,14 @@
//local store for ports on this device connected to neighbor-device-id
protected ConcurrentHashMap<PortNumber, DeviceId> portDeviceMap =
new ConcurrentHashMap<>();
- protected EventuallyConsistentMap<
- NeighborSetNextObjectiveStoreKey, Integer> nsNextObjStore = null;
- protected EventuallyConsistentMap<
- SubnetNextObjectiveStoreKey, Integer> subnetNextObjStore = null;
- protected EventuallyConsistentMap<
- PortNextObjectiveStoreKey, Integer> portNextObjStore = null;
+ protected EventuallyConsistentMap<NeighborSetNextObjectiveStoreKey, Integer>
+ nsNextObjStore = null;
+ protected EventuallyConsistentMap<SubnetNextObjectiveStoreKey, Integer>
+ subnetNextObjStore = null;
+ protected EventuallyConsistentMap<PortNextObjectiveStoreKey, Integer>
+ portNextObjStore = null;
+ protected EventuallyConsistentMap<XConnectNextObjectiveStoreKey, Integer>
+ xConnectNextObjStore = null;
private SegmentRoutingManager srManager;
protected KryoNamespace.Builder kryo = new KryoNamespace.Builder()
@@ -97,17 +98,10 @@
.register(GroupBucketIdentifier.class)
.register(GroupBucketIdentifier.BucketOutputType.class);
- // TODO Access stores through srManager
protected DefaultGroupHandler(DeviceId deviceId, ApplicationId appId,
DeviceProperties config,
LinkService linkService,
FlowObjectiveService flowObjService,
- EventuallyConsistentMap<NeighborSetNextObjectiveStoreKey,
- Integer> nsNextObjStore,
- EventuallyConsistentMap<SubnetNextObjectiveStoreKey,
- Integer> subnetNextObjStore,
- EventuallyConsistentMap<PortNextObjectiveStoreKey,
- Integer> portNextObjStore,
SegmentRoutingManager srManager) {
this.deviceId = checkNotNull(deviceId);
this.appId = checkNotNull(appId);
@@ -123,9 +117,10 @@
+ " Skipping value assignment in DefaultGroupHandler");
}
this.flowObjectiveService = flowObjService;
- this.nsNextObjStore = nsNextObjStore;
- this.subnetNextObjStore = subnetNextObjStore;
- this.portNextObjStore = portNextObjStore;
+ this.nsNextObjStore = srManager.nsNextObjStore;
+ this.subnetNextObjStore = srManager.subnetNextObjStore;
+ this.portNextObjStore = srManager.portNextObjStore;
+ this.xConnectNextObjStore = srManager.xConnectNextObjStore;
this.srManager = srManager;
populateNeighborMaps();
@@ -141,8 +136,7 @@
* @param config interface to retrieve the device properties
* @param linkService link service object
* @param flowObjService flow objective service object
- * @param nsNextObjStore NeighborSet next objective store map
- * @param subnetNextObjStore subnet next objective store map
+ * @param srManager segment routing manager
* @throws DeviceConfigNotFoundException if the device configuration is not found
* @return default group handler type
*/
@@ -152,12 +146,6 @@
DeviceProperties config,
LinkService linkService,
FlowObjectiveService flowObjService,
- EventuallyConsistentMap<NeighborSetNextObjectiveStoreKey,
- Integer> nsNextObjStore,
- EventuallyConsistentMap<SubnetNextObjectiveStoreKey,
- Integer> subnetNextObjStore,
- EventuallyConsistentMap<PortNextObjectiveStoreKey,
- Integer> portNextObjStore,
SegmentRoutingManager srManager)
throws DeviceConfigNotFoundException {
// handle possible exception in the caller
@@ -165,18 +153,12 @@
return new DefaultEdgeGroupHandler(deviceId, appId, config,
linkService,
flowObjService,
- nsNextObjStore,
- subnetNextObjStore,
- portNextObjStore,
srManager
);
} else {
return new DefaultTransitGroupHandler(deviceId, appId, config,
linkService,
flowObjService,
- nsNextObjStore,
- subnetNextObjStore,
- portNextObjStore,
srManager);
}
}
@@ -194,6 +176,8 @@
* discovered on this device.
*
* @param newLink new neighbor link
+ * @param isMaster true if local instance is the master
+ *
*/
public void linkUp(Link newLink, boolean isMaster) {
@@ -296,6 +280,7 @@
* Performs group recovery procedures when a port goes down on this device.
*
* @param port port number that has gone down
+ * @param isMaster true if local instance is the master
*/
public void portDown(PortNumber port, boolean isMaster) {
if (portDeviceMap.get(port) == null) {
@@ -448,8 +433,8 @@
*/
public int getPortNextObjectiveId(PortNumber portNum, TrafficTreatment treatment,
TrafficSelector meta) {
- Integer nextId = portNextObjStore.
- get(new PortNextObjectiveStoreKey(deviceId, portNum, treatment));
+ Integer nextId = portNextObjStore
+ .get(new PortNextObjectiveStoreKey(deviceId, portNum, treatment));
if (nextId == null) {
log.trace("getPortNextObjectiveId in device{}: Next objective id "
+ "not found for {} and {} creating", deviceId, portNum);
@@ -458,7 +443,33 @@
new PortNextObjectiveStoreKey(deviceId, portNum, treatment));
if (nextId == null) {
log.warn("getPortNextObjectiveId: unable to create next obj"
- + "for dev:{} port{}", deviceId, portNum);
+ + "for dev:{} port:{}", deviceId, portNum);
+ return -1;
+ }
+ }
+ return nextId;
+ }
+
+ /**
+ * Returns the next objective ID of type broadcast associated with the VLAN
+ * cross-connection.
+ *
+ * @param vlanId VLAN ID for the cross-connection
+ * @return int if found or created, -1 if there are errors during the
+ * creation of the next objective
+ */
+ public int getXConnectNextObjectiveId(VlanId vlanId) {
+ Integer nextId = xConnectNextObjStore
+ .get(new XConnectNextObjectiveStoreKey(deviceId, vlanId));
+ if (nextId == null) {
+ log.trace("getXConnectNextObjectiveId: Next objective id "
+ + "not found for device {} and vlan {}. Creating", deviceId, vlanId);
+ createGroupsForXConnect(deviceId);
+ nextId = xConnectNextObjStore.get(
+ new XConnectNextObjectiveStoreKey(deviceId, vlanId));
+ if (nextId == null) {
+ log.warn("getXConnectNextObjectiveId: Next objective id "
+ + "not found for device {} and vlan {}.", deviceId, vlanId);
return -1;
}
}
@@ -655,7 +666,6 @@
/**
* Creates broadcast groups for all ports in the same configured subnet.
- *
*/
public void createGroupsFromSubnetConfig() {
Map<Ip4Prefix, List<PortNumber>> subnetPortMap =
@@ -700,6 +710,54 @@
});
}
+ /**
+ * Creates broadcast groups for VLAN cross-connect ports.
+ *
+ * @param deviceId the DPID of the switch
+ */
+ public void createGroupsForXConnect(DeviceId deviceId) {
+ Map<VlanId, List<ConnectPoint>> xConnectsForDevice = deviceConfig.getXConnects();
+
+ xConnectsForDevice.forEach((vlanId, connectPoints) -> {
+ // Only proceed the xConnect for given device
+ for (ConnectPoint connectPoint : connectPoints) {
+ if (!connectPoint.deviceId().equals(deviceId)) {
+ return;
+ }
+ }
+
+ // Check if the next obj is already in the store
+ XConnectNextObjectiveStoreKey key =
+ new XConnectNextObjectiveStoreKey(deviceId, vlanId);
+ if (xConnectNextObjStore.containsKey(key)) {
+ log.debug("Cross-connect Broadcast group for device {} and vlanId {} exists",
+ deviceId, vlanId);
+ return;
+ }
+
+ TrafficSelector metadata =
+ DefaultTrafficSelector.builder().matchVlanId(vlanId).build();
+ int nextId = flowObjectiveService.allocateNextId();
+
+ NextObjective.Builder nextObjBuilder = DefaultNextObjective
+ .builder().withId(nextId)
+ .withType(NextObjective.Type.BROADCAST).fromApp(appId)
+ .withMeta(metadata);
+
+ connectPoints.forEach(connectPoint -> {
+ TrafficTreatment.Builder tBuilder = DefaultTrafficTreatment.builder();
+ tBuilder.setOutput(connectPoint.port());
+ nextObjBuilder.addTreatment(tBuilder.build());
+ });
+
+ NextObjective nextObj = nextObjBuilder.add();
+ flowObjectiveService.next(deviceId, nextObj);
+ log.debug("createGroupsForXConnect: Submited next objective {} in device {}",
+ nextId, deviceId);
+ xConnectNextObjStore.put(key, nextId);
+ });
+ }
+
/**
* Create simple next objective for a single port. The treatments can include
@@ -730,11 +788,6 @@
portNextObjStore.put(key, nextId);
}
-
- public GroupKey getGroupKey(Object obj) {
- return new DefaultGroupKey(kryo.build().serialize(obj));
- }
-
/**
* Removes groups for the next objective ID given.
*
@@ -766,6 +819,9 @@
return false;
}
+ /**
+ * Removes all groups from all next objective stores.
+ */
public void removeAllGroups() {
for (Map.Entry<NeighborSetNextObjectiveStoreKey, Integer> entry:
nsNextObjStore.entrySet()) {