Managers refactored to use ConfigOperators:
o Device, Host, and LinkManagers now use respecive ConfigOperator
implementations to combine Descriptions with Network Configs. This
refactors work done in 3a0cdd57e7b2c2bbdc44743b780b072cb0475f2d.
o Touchups on ConfigOperator impls
Change-Id: I735e7e6bfa0c47c8727433aab804cb2782eebfff
diff --git a/core/net/src/main/java/org/onosproject/net/device/impl/BasicDeviceOperator.java b/core/net/src/main/java/org/onosproject/net/device/impl/BasicDeviceOperator.java
index 4af8000..c10b7e8 100644
--- a/core/net/src/main/java/org/onosproject/net/device/impl/BasicDeviceOperator.java
+++ b/core/net/src/main/java/org/onosproject/net/device/impl/BasicDeviceOperator.java
@@ -17,6 +17,7 @@
import static org.slf4j.LoggerFactory.getLogger;
+import org.onosproject.incubator.net.config.ConfigOperator;
import org.onosproject.incubator.net.config.basics.BasicDeviceConfig;
import org.onosproject.net.AnnotationKeys;
import org.onosproject.net.DefaultAnnotations;
@@ -30,7 +31,7 @@
* Implementations of merge policies for various sources of device configuration
* information. This includes applications, provides, and network configurations.
*/
-public final class BasicDeviceOperator {
+public final class BasicDeviceOperator implements ConfigOperator {
protected static final double DEFAULT_COORD = -1.0;
private static final Logger log = getLogger(BasicDeviceOperator.class);
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 b1390d1..01f85d8 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
@@ -37,14 +37,12 @@
import org.onosproject.mastership.MastershipService;
import org.onosproject.mastership.MastershipTerm;
import org.onosproject.mastership.MastershipTermService;
-import org.onosproject.net.DefaultAnnotations;
import org.onosproject.net.Device;
import org.onosproject.net.Device.Type;
import org.onosproject.net.DeviceId;
import org.onosproject.net.MastershipRole;
import org.onosproject.net.Port;
import org.onosproject.net.PortNumber;
-import org.onosproject.net.SparseAnnotations;
import org.onosproject.net.device.DefaultDeviceDescription;
import org.onosproject.net.device.DefaultPortDescription;
import org.onosproject.net.device.DeviceAdminService;
@@ -334,17 +332,8 @@
BasicDeviceConfig cfg = networkConfigService.getConfig(deviceId, BasicDeviceConfig.class);
checkState(cfg == null || cfg.isAllowed(), "Device " + deviceId + " is not allowed");
log.info("Device {} connected", deviceId);
- if (cfg != null) {
- SparseAnnotations finalSparse = processAnnotations(cfg, deviceDescription, deviceId);
- if (cfg.type() != Type.SWITCH) {
- deviceDescription = new DefaultDeviceDescription(deviceDescription,
- cfg.type(), finalSparse);
- } else {
- deviceDescription = new DefaultDeviceDescription(deviceDescription,
- deviceDescription.type(), finalSparse);
- }
- }
- return deviceDescription;
+
+ return BasicDeviceOperator.combine(cfg, deviceDescription);
}
@Override
@@ -500,37 +489,6 @@
deviceId, portStatistics);
post(event);
}
-
- // supplements or replaces deviceDescription annotations with
- // BasicDeviceConfig annotations
- private SparseAnnotations processAnnotations(BasicDeviceConfig cfg, DeviceDescription deviceDescription,
- DeviceId deviceId) {
- SparseAnnotations originalAnnotations = deviceDescription.annotations();
- DefaultAnnotations.Builder newBuilder = DefaultAnnotations.builder();
- if (cfg.driver() != deviceId.toString()) {
- newBuilder.set(cfg.DRIVER, cfg.driver());
- }
- if (cfg.type() != Type.SWITCH) {
- newBuilder.set(cfg.TYPE, cfg.type().toString());
- }
- if (cfg.name() != null) {
- newBuilder.set(cfg.NAME, cfg.name());
- }
- if (cfg.latitude() != -1) {
- newBuilder.set(cfg.LATITUDE, Double.toString(cfg.latitude()));
- }
- if (cfg.longitude() != -1) {
- newBuilder.set(cfg.LONGITUDE, Double.toString(cfg.longitude()));
- }
- if (cfg.rackAddress() != null) {
- newBuilder.set(cfg.RACK_ADDRESS, cfg.rackAddress());
- }
- if (cfg.owner() != null) {
- newBuilder.set(cfg.OWNER, cfg.owner());
- }
- DefaultAnnotations newAnnotations = newBuilder.build();
- return DefaultAnnotations.union(originalAnnotations, newAnnotations);
- }
}
// Applies the specified role to the device; ignores NONE
diff --git a/core/net/src/main/java/org/onosproject/net/host/impl/HostManager.java b/core/net/src/main/java/org/onosproject/net/host/impl/HostManager.java
index 73ac9c5..6179c14 100644
--- a/core/net/src/main/java/org/onosproject/net/host/impl/HostManager.java
+++ b/core/net/src/main/java/org/onosproject/net/host/impl/HostManager.java
@@ -31,13 +31,10 @@
import org.onosproject.incubator.net.config.NetworkConfigService;
import org.onosproject.incubator.net.config.basics.BasicHostConfig;
import org.onosproject.net.ConnectPoint;
-import org.onosproject.net.DefaultAnnotations;
import org.onosproject.net.DeviceId;
import org.onosproject.net.Host;
import org.onosproject.net.HostId;
-import org.onosproject.net.SparseAnnotations;
import org.onosproject.net.device.DeviceService;
-import org.onosproject.net.host.DefaultHostDescription;
import org.onosproject.net.host.HostAdminService;
import org.onosproject.net.host.HostDescription;
import org.onosproject.net.host.HostEvent;
@@ -246,14 +243,8 @@
private HostDescription validateHost(HostDescription hostDescription, HostId hostId) {
BasicHostConfig cfg = networkConfigService.getConfig(hostId, BasicHostConfig.class);
checkState(cfg == null || cfg.isAllowed(), "Host {} is not allowed", hostId);
- if (cfg != null) {
- SparseAnnotations finalSparse = processAnnotations(cfg, hostDescription);
- hostDescription = new DefaultHostDescription(hostId.mac(),
- hostDescription.vlan(),
- hostDescription.location(),
- finalSparse);
- }
- return hostDescription;
+
+ return BasicHostOperator.combine(cfg, hostDescription);
}
@Override
@@ -267,30 +258,6 @@
}
}
- // Supplements or replaces hostDescriptions's annotations with BasicHostConfig's
- // annotations
- private SparseAnnotations processAnnotations(BasicHostConfig cfg, HostDescription hostDescription) {
- SparseAnnotations originalAnnotations = hostDescription.annotations();
- DefaultAnnotations.Builder newBuilder = DefaultAnnotations.builder();
- if (cfg.name() != null) {
- newBuilder.set(cfg.NAME, cfg.name());
- }
- if (cfg.latitude() != -1) {
- newBuilder.set(cfg.LATITUDE, Double.toString(cfg.latitude()));
- }
- if (cfg.longitude() != -1) {
- newBuilder.set(cfg.LONGITUDE, Double.toString(cfg.longitude()));
- }
- if (cfg.rackAddress() != null) {
- newBuilder.set(cfg.RACK_ADDRESS, cfg.rackAddress());
- }
- if (cfg.owner() != null) {
- newBuilder.set(cfg.OWNER, cfg.owner());
- }
- DefaultAnnotations newAnnotations = newBuilder.build();
- return DefaultAnnotations.union(originalAnnotations, newAnnotations);
- }
-
// Store delegate to re-post events emitted from the store.
private class InternalStoreDelegate implements HostStoreDelegate {
@Override
diff --git a/core/net/src/main/java/org/onosproject/net/link/impl/BasicLinkOperator.java b/core/net/src/main/java/org/onosproject/net/link/impl/BasicLinkOperator.java
index 37ac066..7bb2da6 100644
--- a/core/net/src/main/java/org/onosproject/net/link/impl/BasicLinkOperator.java
+++ b/core/net/src/main/java/org/onosproject/net/link/impl/BasicLinkOperator.java
@@ -20,6 +20,7 @@
import java.time.Duration;
import org.onosproject.net.AnnotationKeys;
+import org.onosproject.incubator.net.config.ConfigOperator;
import org.onosproject.incubator.net.config.basics.BasicLinkConfig;
import org.onosproject.net.DefaultAnnotations;
import org.onosproject.net.Link;
@@ -32,8 +33,10 @@
* Implementations of merge policies for various sources of link configuration
* information. This includes applications, provides, and network configurations.
*/
-public final class BasicLinkOperator {
+public final class BasicLinkOperator implements ConfigOperator {
+ private static final long DEF_BANDWIDTH = -1L;
+ private static final Duration DEF_DURATION = Duration.ofNanos(-1L);
private static final Logger log = getLogger(BasicLinkOperator.class);
private BasicLinkOperator() {
@@ -72,10 +75,10 @@
*/
public static SparseAnnotations combine(BasicLinkConfig cfg, SparseAnnotations an) {
DefaultAnnotations.Builder b = DefaultAnnotations.builder();
- if (cfg.latency() != Duration.ofNanos(-1)) {
+ if (cfg.latency() != DEF_DURATION) {
b.set(AnnotationKeys.LATENCY, cfg.latency().toString());
}
- if (cfg.bandwidth() != -1) {
+ if (cfg.bandwidth() != DEF_BANDWIDTH) {
b.set(AnnotationKeys.BANDWIDTH, String.valueOf(cfg.bandwidth()));
}
return DefaultAnnotations.union(an, b.build());
diff --git a/core/net/src/main/java/org/onosproject/net/link/impl/LinkManager.java b/core/net/src/main/java/org/onosproject/net/link/impl/LinkManager.java
index b1316f6..e23825d 100644
--- a/core/net/src/main/java/org/onosproject/net/link/impl/LinkManager.java
+++ b/core/net/src/main/java/org/onosproject/net/link/impl/LinkManager.java
@@ -31,17 +31,14 @@
import org.onosproject.incubator.net.config.NetworkConfigService;
import org.onosproject.incubator.net.config.basics.BasicLinkConfig;
import org.onosproject.net.ConnectPoint;
-import org.onosproject.net.DefaultAnnotations;
import org.onosproject.net.DeviceId;
import org.onosproject.net.Link;
import org.onosproject.net.Link.State;
import org.onosproject.net.LinkKey;
import org.onosproject.net.MastershipRole;
-import org.onosproject.net.SparseAnnotations;
import org.onosproject.net.device.DeviceEvent;
import org.onosproject.net.device.DeviceListener;
import org.onosproject.net.device.DeviceService;
-import org.onosproject.net.link.DefaultLinkDescription;
import org.onosproject.net.link.LinkAdminService;
import org.onosproject.net.link.LinkDescription;
import org.onosproject.net.link.LinkEvent;
@@ -55,7 +52,6 @@
import org.onosproject.net.provider.AbstractProviderService;
import org.slf4j.Logger;
-import java.time.Duration;
import java.util.Set;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -206,6 +202,7 @@
removeLinks(getDeviceLinks(deviceId), false);
}
+ @Override
public void removeLink(ConnectPoint src, ConnectPoint dst) {
post(store.removeLink(src, dst));
}
@@ -264,38 +261,8 @@
checkState(cfg == null || cfg.isAllowed(), "Link " + linkDescription.toString() + " is not allowed");
checkState(cfgTwo == null || cfgTwo.isAllowed(), "Link " + linkDescription.toString() + " is not allowed");
- if (cfg != null) {
- SparseAnnotations finalSparse = processAnnotations(cfg, linkDescription);
- // check whether config has a specified type
- if (cfg.type() != Link.Type.DIRECT) {
- linkDescription = new DefaultLinkDescription(linkDescription.src(),
- linkDescription.dst(),
- cfg.type(), finalSparse);
- } else {
- linkDescription = new DefaultLinkDescription(linkDescription.src(),
- linkDescription.dst(),
- linkDescription.type(), finalSparse);
- }
- }
- return linkDescription;
- }
- // supplements or replaces linkDescriptions's annotations with BasicLinkConfig's
- // annotations
- private SparseAnnotations processAnnotations(BasicLinkConfig cfg, LinkDescription linkDescription) {
- SparseAnnotations originalAnnotations = linkDescription.annotations();
- DefaultAnnotations.Builder newBuilder = DefaultAnnotations.builder();
- if (cfg.type() != Link.Type.DIRECT) {
- newBuilder.set(cfg.TYPE, cfg.type().toString());
- }
- if (cfg.latency() != Duration.ofNanos(-1)) {
- newBuilder.set(cfg.LATENCY, cfg.latency().toString());
- }
- if (cfg.bandwidth() != -1) {
- newBuilder.set(cfg.BANDWIDTH, String.valueOf(cfg.bandwidth()));
- }
- DefaultAnnotations newAnnotations = newBuilder.build();
- return DefaultAnnotations.union(originalAnnotations, newAnnotations);
+ return BasicLinkOperator.combine(cfg, linkDescription);
}
@Override