Mechanism to add Port annotation via netcfg
- intended to be used for driver to support ONOS-5895
Change-Id: Iddcf6f1b99273e8f8670b5f64fc9831e5f4ce3cd
diff --git a/core/net/src/main/java/org/onosproject/net/config/impl/BasicNetworkConfigs.java b/core/net/src/main/java/org/onosproject/net/config/impl/BasicNetworkConfigs.java
index 0bd8b91..5cabfbd 100644
--- a/core/net/src/main/java/org/onosproject/net/config/impl/BasicNetworkConfigs.java
+++ b/core/net/src/main/java/org/onosproject/net/config/impl/BasicNetworkConfigs.java
@@ -36,6 +36,7 @@
import org.onosproject.net.config.basics.BasicLinkConfig;
import org.onosproject.net.config.basics.BasicRegionConfig;
import org.onosproject.net.config.basics.BasicUiTopoLayoutConfig;
+import org.onosproject.net.config.basics.PortAnnotationConfig;
import org.onosproject.net.config.basics.SubjectFactories;
import org.onosproject.net.region.RegionId;
import org.onosproject.ui.model.topo.UiTopoLayoutId;
@@ -112,6 +113,14 @@
public BasicUiTopoLayoutConfig createConfig() {
return new BasicUiTopoLayoutConfig();
}
+ },
+ new ConfigFactory<ConnectPoint, PortAnnotationConfig>(CONNECT_POINT_SUBJECT_FACTORY,
+ PortAnnotationConfig.class,
+ PortAnnotationConfig.CONFIG_KEY) {
+ @Override
+ public PortAnnotationConfig createConfig() {
+ return new PortAnnotationConfig();
+ }
}
);
diff --git a/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java b/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
index a3dbcad..6fbb21c 100644
--- a/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
+++ b/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
@@ -58,6 +58,7 @@
import org.onosproject.net.config.PortConfigOperator;
import org.onosproject.net.config.PortConfigOperatorRegistry;
import org.onosproject.net.config.basics.BasicDeviceConfig;
+import org.onosproject.net.config.basics.PortAnnotationConfig;
import org.onosproject.net.device.DefaultPortDescription;
import org.onosproject.net.device.DeviceAdminService;
import org.onosproject.net.device.DeviceDescription;
@@ -148,6 +149,9 @@
= synchronizedListMultimap(
newListMultimap(new ConcurrentHashMap<>(), CopyOnWriteArrayList::new));
+ // not part of portOps. must be executed at the end
+ private PortAnnotationOperator portAnnotationOp;
+
/**
* Local storage for connectivity status of devices.
*/
@@ -165,6 +169,9 @@
@Activate
public void activate() {
+ portAnnotationOp = new PortAnnotationOperator(networkConfigService);
+ portOpsIndex.put(PortAnnotationConfig.class, portAnnotationOp);
+
backgroundService = newSingleThreadScheduledExecutor(
groupedThreads("onos/device", "manager-background", log));
localNodeId = clusterService.getLocalNode().id();
@@ -976,7 +983,7 @@
for (PortConfigOperator portOp : portOps) {
work = portOp.combine(cpt, work);
}
- return work;
+ return portAnnotationOp.combine(cpt, work);
}
}
diff --git a/core/net/src/main/java/org/onosproject/net/device/impl/PortAnnotationOperator.java b/core/net/src/main/java/org/onosproject/net/device/impl/PortAnnotationOperator.java
new file mode 100644
index 0000000..3041a07
--- /dev/null
+++ b/core/net/src/main/java/org/onosproject/net/device/impl/PortAnnotationOperator.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2017-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.net.device.impl;
+
+import java.util.Map;
+
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DefaultAnnotations;
+import org.onosproject.net.DefaultAnnotations.Builder;
+import org.onosproject.net.config.NetworkConfigService;
+import org.onosproject.net.config.PortConfigOperator;
+import org.onosproject.net.config.basics.PortAnnotationConfig;
+import org.onosproject.net.device.DefaultPortDescription;
+import org.onosproject.net.device.PortDescription;
+
+/**
+ * Implementations of {@link PortConfigOperator} to weave
+ * annotations added via {@link PortAnnotationConfig}.
+ */
+public class PortAnnotationOperator implements PortConfigOperator {
+
+ private NetworkConfigService networkConfigService;
+
+ /**
+ * Creates {@link PortAnnotationOperator} instance.
+ */
+ public PortAnnotationOperator() {
+ }
+
+ PortAnnotationOperator(NetworkConfigService networkConfigService) {
+ bindService(networkConfigService);
+ }
+
+ @Override
+ public void bindService(NetworkConfigService networkConfigService) {
+ this.networkConfigService = networkConfigService;
+ }
+
+ private PortAnnotationConfig lookupConfig(ConnectPoint cp) {
+ if (networkConfigService == null) {
+ return null;
+ }
+ return networkConfigService.getConfig(cp, PortAnnotationConfig.class);
+ }
+
+ @Override
+ public PortDescription combine(ConnectPoint cp, PortDescription descr) {
+ PortAnnotationConfig cfg = lookupConfig(cp);
+ if (cfg == null) {
+ return descr;
+ }
+ Map<String, String> annotations = cfg.annotations();
+ if (annotations.isEmpty()) {
+ return descr;
+ }
+
+ Builder builder = DefaultAnnotations.builder();
+ builder.putAll(descr.annotations());
+ builder.putAll(annotations);
+
+ return DefaultPortDescription.copyReplacingAnnotation(descr, builder.build());
+ }
+
+}