Remove LambdaConstraint as IndexLambda is soon removed
Change-Id: I1b0a2b3e09d87bb2b8cf39136de15d0f3368f589
diff --git a/core/api/src/main/java/org/onosproject/net/intent/constraint/LambdaConstraint.java b/core/api/src/main/java/org/onosproject/net/intent/constraint/LambdaConstraint.java
deleted file mode 100644
index eba2898..0000000
--- a/core/api/src/main/java/org/onosproject/net/intent/constraint/LambdaConstraint.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2014 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.net.intent.constraint;
-
-import com.google.common.annotations.Beta;
-import org.onosproject.net.IndexedLambda;
-import org.onosproject.net.Link;
-import org.onosproject.net.resource.link.LinkResourceService;
-import org.onosproject.net.resource.ResourceRequest;
-import org.onosproject.net.resource.ResourceType;
-
-import java.util.Objects;
-
-import static com.google.common.base.MoreObjects.toStringHelper;
-
-/**
- * Constraint that evaluates links based on available lambda.
- */
-@Beta
-public class LambdaConstraint extends BooleanConstraint {
-
- private final IndexedLambda lambda;
-
- /**
- * Creates a new optical lambda constraint.
- *
- * @param lambda optional lambda to indicate a specific lambda
- */
- public LambdaConstraint(IndexedLambda lambda) {
- this.lambda = lambda;
- }
-
- // Constructor for serialization
- private LambdaConstraint() {
- this.lambda = null;
- }
-
- @Override
- public boolean isValid(Link link, LinkResourceService resourceService) {
- for (ResourceRequest request : resourceService.getAvailableResources(link)) {
- if (request.type() == ResourceType.LAMBDA) {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Returns the lambda required by this constraint.
- *
- * @return required lambda
- */
- public IndexedLambda lambda() {
- return lambda;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(lambda);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null || getClass() != obj.getClass()) {
- return false;
- }
- final LambdaConstraint other = (LambdaConstraint) obj;
- return Objects.equals(this.lambda, other.lambda);
- }
-
- @Override
- public String toString() {
- return toStringHelper(this).add("lambda", lambda).toString();
- }
-}
diff --git a/core/api/src/main/java/org/onosproject/net/resource/link/DefaultLinkResourceRequest.java b/core/api/src/main/java/org/onosproject/net/resource/link/DefaultLinkResourceRequest.java
index 583570f..6071717 100644
--- a/core/api/src/main/java/org/onosproject/net/resource/link/DefaultLinkResourceRequest.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/link/DefaultLinkResourceRequest.java
@@ -31,7 +31,6 @@
import org.onosproject.net.intent.IntentId;
import org.onosproject.net.intent.constraint.BandwidthConstraint;
-import org.onosproject.net.intent.constraint.LambdaConstraint;
import org.onosproject.net.resource.ResourceRequest;
import org.onosproject.net.resource.ResourceType;
@@ -197,9 +196,7 @@
@Override
public LinkResourceRequest.Builder addConstraint(Constraint constraint) {
- if (constraint instanceof LambdaConstraint) {
- return addLambdaRequest();
- } else if (constraint instanceof BandwidthConstraint) {
+ if (constraint instanceof BandwidthConstraint) {
BandwidthConstraint bw = (BandwidthConstraint) constraint;
return addBandwidthRequest(bw.bandwidth().bps());
}
diff --git a/core/api/src/test/java/org/onosproject/net/intent/LinkCollectionIntentTest.java b/core/api/src/test/java/org/onosproject/net/intent/LinkCollectionIntentTest.java
index dd371c1..05158ed 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/LinkCollectionIntentTest.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/LinkCollectionIntentTest.java
@@ -15,6 +15,7 @@
*/
package org.onosproject.net.intent;
+import java.time.Duration;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
@@ -22,20 +23,19 @@
import org.junit.Test;
import org.onosproject.net.ConnectPoint;
-import org.onosproject.net.IndexedLambda;
import org.onosproject.net.Link;
import org.onosproject.net.NetTestTools;
import org.onosproject.net.flow.TrafficSelector;
-import org.onosproject.net.intent.constraint.LambdaConstraint;
import com.google.common.collect.ImmutableSet;
import com.google.common.testing.EqualsTester;
+import org.onosproject.net.intent.constraint.LatencyConstraint;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue;
-import static org.hamcrest.Matchers.startsWith;
import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
import static org.onosproject.net.NetTestTools.APP_ID;
import static org.onosproject.net.NetTestTools.link;
@@ -132,7 +132,7 @@
final LinkedList<Constraint> constraints = new LinkedList<>();
links1.add(link("src", 1, "dst", 2));
- constraints.add(new LambdaConstraint(new IndexedLambda(23)));
+ constraints.add(new LatencyConstraint(Duration.ofMillis(100)));
final LinkCollectionIntent collectionIntent =
LinkCollectionIntent.builder()
.appId(APP_ID)
@@ -155,7 +155,7 @@
final List<Constraint> createdConstraints = collectionIntent.constraints();
assertThat(createdConstraints, hasSize(1));
- assertThat(createdConstraints.get(0).toString(), startsWith("LambdaConstraint"));
+ assertThat(createdConstraints.get(0), instanceOf(LatencyConstraint.class));
}
/**
diff --git a/core/api/src/test/java/org/onosproject/net/intent/constraint/ConstraintObjectsTest.java b/core/api/src/test/java/org/onosproject/net/intent/constraint/ConstraintObjectsTest.java
index d2e9940..a2bc31e 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/constraint/ConstraintObjectsTest.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/constraint/ConstraintObjectsTest.java
@@ -17,7 +17,6 @@
import org.junit.Test;
import org.onlab.util.Bandwidth;
-import org.onosproject.net.IndexedLambda;
import org.onosproject.net.Link;
import com.google.common.testing.EqualsTester;
@@ -63,36 +62,6 @@
.testEquals();
}
- // Lambda Constraint
-
- final LambdaConstraint lambdaConstraint1 =
- new LambdaConstraint(new IndexedLambda(100));
- final LambdaConstraint lambdaConstraintSameAs1 =
- new LambdaConstraint(new IndexedLambda(100));
- final LambdaConstraint lambdaConstraint2 =
- new LambdaConstraint(new IndexedLambda(200));
-
- /**
- * Checks that the objects were created properly.
- */
- @Test
- public void testLambdaConstraintCreation() {
- assertThat(lambdaConstraint1.lambda().index(), is(equalTo(100L)));
- assertThat(lambdaConstraintSameAs1.lambda().index(), is(equalTo(100L)));
- assertThat(lambdaConstraint2.lambda().index(), is(equalTo(200L)));
- }
-
- /**
- * Checks the correctness of the equals() method.
- */
- @Test
- public void testLambdaConstraintEquals() {
- new EqualsTester()
- .addEqualityGroup(lambdaConstraint1, lambdaConstraintSameAs1)
- .addEqualityGroup(lambdaConstraint2)
- .testEquals();
- }
-
// LinkType Constraint
final LinkTypeConstraint linkTypeConstraint1 =