CORD-1419 CORD-1425 CORD-1496 CORD-639 Changes for dual-ToRs
Introduces the concept of edge-pairs (or paired-ToRs) which
can have some subnets/prefixes reachable by both ToRs.
- Each ToR can also have prefixes reachable only by itself,
even though it is part of an edge-pair.
- The paired link between ToRs in an edge-pair is ignored
for ECMP calculations.
- Required a change in how destinations and next-hops are stored.
The neighborSet is now a destinationSet, and no longer carries
next-hop info, which is now stored in NextNeighbors. As a result,
the DestinationSetNextObjectiveStoreKey and ECMP group id do not
change as next-hops come and go.
- It is now possible to have buckets in hash groups with the same
outport but different labels.
- DefaultRoutingHandler has been rearraged to be more readable, and
clearly highlight the three major ways that routing changes can
happen in the network.
Also fixes the case where config is added after switches connect to the controller.
Change-Id: I7ce93ab201f6ef2c01cbe07a51ee78cd6a0a112e
diff --git a/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java b/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java
index 71a199e..8989288 100644
--- a/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java
+++ b/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java
@@ -72,6 +72,8 @@
SetMultimap<PortNumber, IpAddress> gatewayIps;
SetMultimap<PortNumber, IpPrefix> subnets;
Map<Integer, Set<Integer>> adjacencySids;
+ DeviceId pairDeviceId;
+ PortNumber pairLocalPort;
public SegmentRouterInfo() {
gatewayIps = HashMultimap.create();
@@ -87,7 +89,10 @@
*/
public DeviceConfiguration(SegmentRoutingManager srManager) {
this.srManager = srManager;
+ updateConfig();
+ }
+ public void updateConfig() {
// Read config from device subject, excluding gatewayIps and subnets.
Set<DeviceId> deviceSubjects =
srManager.cfgService.getSubjects(DeviceId.class, SegmentRoutingDeviceConfig.class);
@@ -103,6 +108,8 @@
info.mac = config.routerMac();
info.isEdge = config.isEdgeRouter();
info.adjacencySids = config.adjacencySids();
+ info.pairDeviceId = config.pairDeviceId();
+ info.pairLocalPort = config.pairLocalPort();
deviceConfigMap.put(info.deviceId, info);
log.debug("Read device config for device: {}", info.deviceId);
/*
@@ -158,6 +165,7 @@
});
}
+
@Override
public boolean isConfigured(DeviceId deviceId) {
return deviceConfigMap.get(deviceId) != null;
@@ -639,4 +647,34 @@
}
return false;
}
+
+ public boolean isPairedEdge(DeviceId deviceId) throws DeviceConfigNotFoundException {
+ if (!isEdgeDevice(deviceId)) {
+ return false;
+ }
+ SegmentRouterInfo srinfo = deviceConfigMap.get(deviceId);
+ return (srinfo.pairDeviceId == null) ? false : true;
+ }
+
+ public DeviceId getPairDeviceId(DeviceId deviceId) throws DeviceConfigNotFoundException {
+ SegmentRouterInfo srinfo = deviceConfigMap.get(deviceId);
+ if (srinfo != null) {
+ return srinfo.pairDeviceId;
+ } else {
+ String message = "getPairDeviceId fails for device: " + deviceId + ".";
+ throw new DeviceConfigNotFoundException(message);
+ }
+ }
+
+ public PortNumber getPairLocalPort(DeviceId deviceId)
+ throws DeviceConfigNotFoundException {
+ SegmentRouterInfo srinfo = deviceConfigMap.get(deviceId);
+ if (srinfo != null) {
+ return srinfo.pairLocalPort;
+ } else {
+ String message = "getPairLocalPort fails for device: " + deviceId + ".";
+ throw new DeviceConfigNotFoundException(message);
+ }
+ }
+
}