CORD-61 Dynamic XConnect support
- Add new XConnectConfig with unit test
- Gather XConnect features into XConnectHandler
- Introduce ObjectiveError.Type.GROUPREMOVALFAILED
- Rename
- NetworkConfigEventHandler -> AppConfigHandler
- XConnectNextObjectiveStoreKey -> XConnectStoreKey
- Test json file
- Refactor
Change-Id: I8ca3176ed976c71ce9e28b7f3722ce80d49c816f
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java
index 4474fb2..c1af6f2 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java
@@ -39,7 +39,6 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -58,7 +57,6 @@
private static final Logger log = LoggerFactory.getLogger(DeviceConfiguration.class);
private final List<Integer> allSegmentIds = new ArrayList<>();
private final Map<DeviceId, SegmentRouterInfo> deviceConfigMap = new ConcurrentHashMap<>();
- private final Map<VlanId, List<ConnectPoint>> xConnects = new ConcurrentHashMap<>();
private ApplicationId appId;
private NetworkConfigService cfgService;
@@ -148,28 +146,6 @@
}
info.subnets.put(port, interfaceAddress.subnetAddress().getIp4Prefix());
});
-
- // Extract VLAN cross-connect information
- // Do not setup cross-connect if VLAN is NONE
- if (vlanId.equals(VlanId.NONE)) {
- return;
- }
- List<ConnectPoint> connectPoints = xConnects.get(vlanId);
- if (connectPoints != null) {
- if (connectPoints.size() != 1) {
- log.warn("Cross-connect should only have two endpoints. Aborting.");
- return;
- }
- if (!connectPoints.get(0).deviceId().equals(connectPoint.deviceId())) {
- log.warn("Cross-connect endpoints must be on the same switch. Aborting.");
- return;
- }
- connectPoints.add(connectPoint);
- } else {
- connectPoints = new LinkedList<>();
- connectPoints.add(connectPoint);
- xConnects.put(vlanId, connectPoints);
- }
}
});
});
@@ -298,11 +274,6 @@
return subnetPortMap;
}
- @Override
- public Map<VlanId, List<ConnectPoint>> getXConnects() {
- return xConnects;
- }
-
/**
* Returns the device identifier or data plane identifier (dpid)
* of a segment router given its segment id.
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/DeviceProperties.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/DeviceProperties.java
index 967d2b6..5ad9cdc 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/DeviceProperties.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/DeviceProperties.java
@@ -21,8 +21,6 @@
import org.onlab.packet.Ip4Address;
import org.onlab.packet.Ip4Prefix;
import org.onlab.packet.MacAddress;
-import org.onlab.packet.VlanId;
-import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DeviceId;
import org.onosproject.net.PortNumber;
@@ -97,11 +95,4 @@
*/
Map<Ip4Prefix, List<PortNumber>> getSubnetPortsMap(DeviceId deviceId)
throws DeviceConfigNotFoundException;
-
- /**
- * Returns the VLAN cross-connect configuration.
- *
- * @return A map of that maps VLAN ID to a list of cross-connect endpoints
- */
- Map<VlanId, List<ConnectPoint>> getXConnects();
}
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/XConnectConfig.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/XConnectConfig.java
new file mode 100644
index 0000000..089f8b0
--- /dev/null
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/XConnectConfig.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2016-present Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onosproject.segmentrouting.config;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.collect.ImmutableSet;
+import org.onlab.packet.VlanId;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.config.Config;
+import org.onosproject.segmentrouting.storekey.XConnectStoreKey;
+
+import java.util.Set;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+/**
+ * Configuration object for cross-connect.
+ */
+public class XConnectConfig extends Config<ApplicationId> {
+ private static final String VLAN = "vlan";
+ private static final String PORTS = "ports";
+ private static final String NAME = "name"; // dummy field for naming
+
+ private static final String UNEXPECTED_FIELD_NAME = "Unexpected field name";
+
+ @Override
+ public boolean isValid() {
+ try {
+ getXconnects().forEach(this::getPorts);
+ } catch (IllegalArgumentException e) {
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Returns all xconnect keys.
+ *
+ * @return all keys (device/vlan pairs)
+ * @throws IllegalArgumentException if wrong format
+ */
+ public Set<XConnectStoreKey> getXconnects() {
+ ImmutableSet.Builder<XConnectStoreKey> builder = ImmutableSet.builder();
+ object.fields().forEachRemaining(entry -> {
+ DeviceId deviceId = DeviceId.deviceId(entry.getKey());
+ builder.addAll(getXconnects(deviceId));
+ });
+ return builder.build();
+ }
+
+ /**
+ * Returns xconnect keys of given device.
+ *
+ * @param deviceId ID of the device from which we want to get XConnect info
+ * @return xconnect keys (device/vlan pairs) of given device
+ * @throws IllegalArgumentException if wrong format
+ */
+ public Set<XConnectStoreKey> getXconnects(DeviceId deviceId) {
+ ImmutableSet.Builder<XConnectStoreKey> builder = ImmutableSet.builder();
+ JsonNode vlanPortPair = object.get(deviceId.toString());
+ if (vlanPortPair != null) {
+ vlanPortPair.forEach(jsonNode -> {
+ if (!hasOnlyFields((ObjectNode) jsonNode, VLAN, PORTS, NAME)) {
+ throw new IllegalArgumentException(UNEXPECTED_FIELD_NAME);
+ }
+ VlanId vlanId = VlanId.vlanId((short) jsonNode.get(VLAN).asInt());
+ builder.add(new XConnectStoreKey(deviceId, vlanId));
+ });
+ }
+ return builder.build();
+ }
+
+ /**
+ * Returns ports of given xconnect key.
+ *
+ * @param xconnect xconnect key
+ * @return set of two ports associated with given xconnect key
+ * @throws IllegalArgumentException if wrong format
+ */
+ public Set<PortNumber> getPorts(XConnectStoreKey xconnect) {
+ ImmutableSet.Builder<PortNumber> builder = ImmutableSet.builder();
+ object.get(xconnect.deviceId().toString()).forEach(vlanPortsPair -> {
+ if (xconnect.vlanId().toShort() == vlanPortsPair.get(VLAN).asInt()) {
+ int portCount = vlanPortsPair.get(PORTS).size();
+ checkArgument(portCount == 2,
+ "Expect 2 ports but found " + portCount + " on " + xconnect);
+ vlanPortsPair.get(PORTS).forEach(portNode -> {
+ builder.add(PortNumber.portNumber(portNode.asInt()));
+ });
+ }
+ });
+ return builder.build();
+ }
+}