Removed IntentId which is used only for allocating resources. (ONOS-4406)
Change-Id: I9a4ee5fbb5c0e569c058f34c1271ca573c8eb2f1
diff --git a/apps/newoptical/src/main/java/org/onosproject/newoptical/api/OpticalConnectivityId.java b/apps/newoptical/src/main/java/org/onosproject/newoptical/api/OpticalConnectivityId.java
index 4926373..df6a500 100644
--- a/apps/newoptical/src/main/java/org/onosproject/newoptical/api/OpticalConnectivityId.java
+++ b/apps/newoptical/src/main/java/org/onosproject/newoptical/api/OpticalConnectivityId.java
@@ -18,6 +18,8 @@
import com.google.common.annotations.Beta;
import com.google.common.base.MoreObjects;
import org.onlab.util.Identifier;
+import org.onosproject.net.resource.ResourceConsumer;
+import org.onosproject.net.resource.ResourceConsumerId;
// TODO: After ResourceManager is made to accept app-defined ResourceConsumer,
// this class should be implemented as ResourceConsumer.
@@ -25,7 +27,7 @@
* ID for optical connectivity.
*/
@Beta
-public final class OpticalConnectivityId extends Identifier<Long> {
+public final class OpticalConnectivityId extends Identifier<Long> implements ResourceConsumer {
public static OpticalConnectivityId of(long value) {
return new OpticalConnectivityId(value);
@@ -36,6 +38,11 @@
}
@Override
+ public ResourceConsumerId consumerId() {
+ return ResourceConsumerId.of(this);
+ }
+
+ @Override
public String toString() {
return MoreObjects.toStringHelper(this)
.add("value", id())