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/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());