API changes for net config link provider
Change-Id: I4c20987b9922906573b69511f634197054f1e8ec
diff --git a/apps/flowanalyzer/src/test/java/org/onosproject/flowanalyzer/MockLinkService.java b/apps/flowanalyzer/src/test/java/org/onosproject/flowanalyzer/MockLinkService.java
index 2171c6f..6ae2c2b 100644
--- a/apps/flowanalyzer/src/test/java/org/onosproject/flowanalyzer/MockLinkService.java
+++ b/apps/flowanalyzer/src/test/java/org/onosproject/flowanalyzer/MockLinkService.java
@@ -136,6 +136,11 @@
}
@Override
+ public boolean isExpected() {
+ return false;
+ }
+
+ @Override
public Annotations annotations() {
return null;
}
diff --git a/core/api/src/main/java/org/onosproject/net/DefaultLink.java b/core/api/src/main/java/org/onosproject/net/DefaultLink.java
index 4d1ca6d..e1e48b9 100644
--- a/core/api/src/main/java/org/onosproject/net/DefaultLink.java
+++ b/core/api/src/main/java/org/onosproject/net/DefaultLink.java
@@ -31,7 +31,7 @@
private final ConnectPoint dst;
private final Type type;
private final State state;
- private final boolean isDurable;
+ private final boolean isExpected;
/**
* Creates an active infrastructure link using the supplied information.
@@ -57,18 +57,18 @@
* @param dst link destination
* @param type link type
* @param state link state
- * @param isDurable indicates if the link is to be considered durable
+ * @param isExpected indicates if the link is preconfigured
* @param annotations optional key/value annotations
*/
public DefaultLink(ProviderId providerId, ConnectPoint src, ConnectPoint dst,
- Type type, State state,
- boolean isDurable, Annotations... annotations) {
+ Type type, State state,
+ boolean isExpected, Annotations... annotations) {
super(providerId, annotations);
this.src = src;
this.dst = dst;
this.type = type;
this.state = state;
- this.isDurable = isDurable;
+ this.isExpected = isExpected;
}
@Override
@@ -93,7 +93,12 @@
@Override
public boolean isDurable() {
- return isDurable;
+ return isExpected();
+ }
+
+ @Override
+ public boolean isExpected() {
+ return isExpected;
}
// Note: Durability & state are purposefully omitted form equality & hashCode.
@@ -124,7 +129,7 @@
.add("dst", dst)
.add("type", type)
.add("state", state)
- .add("durable", isDurable)
+ .add("configured", isExpected)
.toString();
}
diff --git a/core/api/src/main/java/org/onosproject/net/Link.java b/core/api/src/main/java/org/onosproject/net/Link.java
index 7541f75..eb09290 100644
--- a/core/api/src/main/java/org/onosproject/net/Link.java
+++ b/core/api/src/main/java/org/onosproject/net/Link.java
@@ -108,7 +108,16 @@
* Indicates if the link is to be considered durable.
*
* @return true if the link is durable
+ * @deprecated in Falcon Release - replaced by isConfigured()
*/
+ @Deprecated
boolean isDurable();
+ /**
+ * Indicates if the link was created from a predefined configuration.
+ *
+ * @return true if the link was created from a predefined configuration,
+ * false otherwise.
+ */
+ boolean isExpected();
}
diff --git a/core/api/src/test/java/org/onosproject/ui/topo/BiLinkTestBase.java b/core/api/src/test/java/org/onosproject/ui/topo/BiLinkTestBase.java
index a6beec8..bb7fc65 100644
--- a/core/api/src/test/java/org/onosproject/ui/topo/BiLinkTestBase.java
+++ b/core/api/src/test/java/org/onosproject/ui/topo/BiLinkTestBase.java
@@ -54,6 +54,9 @@
@Override public boolean isDurable() {
return false;
}
+ @Override public boolean isExpected() {
+ return false;
+ }
@Override public Annotations annotations() {
return null;
}
diff --git a/core/store/dist/src/main/java/org/onosproject/store/link/impl/ECLinkStore.java b/core/store/dist/src/main/java/org/onosproject/store/link/impl/ECLinkStore.java
index fdc067f..48851f7 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/link/impl/ECLinkStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/link/impl/ECLinkStore.java
@@ -409,4 +409,4 @@
}
}
}
-}
\ No newline at end of file
+}