ConsistentLinkResourceStore to replace HazelcastLinkResourceStore. Also
includes:
- typo fix (intendId -> intentId)
- refactored ResourceAllocations command so it doesn't use error handling as
part of control flow
- add ability to compare LinkResourceAllocations
Reference: ONOS-1076
Conflicts:
cli/src/main/java/org/onosproject/cli/net/ResourceAllocationsCommand.java
Change-Id: I6a68012d8d7d359ce7c5dcd31e80a3b9f63d5670
diff --git a/core/api/src/main/java/org/onosproject/net/resource/DefaultLinkResourceRequest.java b/core/api/src/main/java/org/onosproject/net/resource/DefaultLinkResourceRequest.java
index 10c991c..0c6f4bf 100644
--- a/core/api/src/main/java/org/onosproject/net/resource/DefaultLinkResourceRequest.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/DefaultLinkResourceRequest.java
@@ -18,12 +18,14 @@
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
+import java.util.Objects;
import org.onosproject.net.Link;
import org.onosproject.net.intent.Constraint;
import org.onosproject.net.intent.IntentId;
import com.google.common.collect.ImmutableSet;
+
import org.onosproject.net.intent.constraint.BandwidthConstraint;
import org.onosproject.net.intent.constraint.LambdaConstraint;
@@ -59,7 +61,7 @@
}
@Override
- public IntentId intendId() {
+ public IntentId intentId() {
return intentId;
}
@@ -150,7 +152,6 @@
return this;
}
-
/**
* Returns link resource request.
*
@@ -162,4 +163,21 @@
}
}
+ @Override
+ public int hashCode() {
+ return Objects.hash(intentId, links);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null || getClass() != obj.getClass()) {
+ return false;
+ }
+ final DefaultLinkResourceRequest other = (DefaultLinkResourceRequest) obj;
+ return Objects.equals(this.intentId, other.intentId)
+ && Objects.equals(this.links, other.links);
+ }
}