Proper handling of Link expected state
- inherit from Link
- or only expect a Link for white list(=allowed) configuration
Change-Id: Ie539ad5d738438ffc3e7eed6a509aadc08068ac7
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 31820a9..cabe565 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
@@ -108,7 +108,9 @@
checkNotNull(dst, "Must supply a destination endpoint");
checkNotNull(link, "Must supply a link");
return new DefaultLinkDescription(
- src, dst, link.type(), (SparseAnnotations) link.annotations());
+ src, dst, link.type(),
+ link.isExpected(),
+ (SparseAnnotations) link.annotations());
}
/**
@@ -126,7 +128,11 @@
checkNotNull(src, "Must supply a source endpoint");
checkNotNull(dst, "Must supply a destination endpoint");
checkNotNull(link, "Must supply a link config");
+ // Only allowed link is expected link
+ boolean expected = link.isAllowed();
return new DefaultLinkDescription(
- src, dst, link.type(), combine(link, DefaultAnnotations.EMPTY));
+ src, dst, link.type(),
+ expected,
+ combine(link, DefaultAnnotations.EMPTY));
}
}