Remove deprecated DefaultPath constructor with a scalar cost
Change-Id: Ifc4104cff773c9c692cc108fda02ce44bc6c2870
diff --git a/core/api/src/main/java/org/onosproject/net/DefaultPath.java b/core/api/src/main/java/org/onosproject/net/DefaultPath.java
index aa0b697..3fd3ece 100644
--- a/core/api/src/main/java/org/onosproject/net/DefaultPath.java
+++ b/core/api/src/main/java/org/onosproject/net/DefaultPath.java
@@ -43,26 +43,6 @@
* @param links contiguous links that comprise the path
* @param cost unit-less path cost
* @param annotations optional key/value annotations
- *
- * @deprecated in Junco (1.9.0)
- */
- @Deprecated
- public DefaultPath(ProviderId providerId, List<Link> links, double cost,
- Annotations... annotations) {
- super(providerId, source(links), destination(links), Type.INDIRECT,
- State.ACTIVE, annotations);
- this.links = ImmutableList.copyOf(links);
- this.cost = new ScalarWeight(cost);
- }
-
- /**
- * Creates a path from the specified source and destination using the
- * supplied list of links.
- *
- * @param providerId provider identity
- * @param links contiguous links that comprise the path
- * @param cost unit-less path cost
- * @param annotations optional key/value annotations
*/
public DefaultPath(ProviderId providerId, List<Link> links, Weight cost,
Annotations... annotations) {
diff --git a/core/api/src/test/java/org/onosproject/net/DefaultDisjointPathTest.java b/core/api/src/test/java/org/onosproject/net/DefaultDisjointPathTest.java
index ec62814..5c30c57 100644
--- a/core/api/src/test/java/org/onosproject/net/DefaultDisjointPathTest.java
+++ b/core/api/src/test/java/org/onosproject/net/DefaultDisjointPathTest.java
@@ -21,6 +21,7 @@
import com.google.common.collect.ImmutableList;
import com.google.common.testing.EqualsTester;
+import org.onlab.graph.ScalarWeight;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
@@ -53,15 +54,15 @@
private static List<Link> links1 = ImmutableList.of(link1, link2);
private static DefaultPath path1 =
- new DefaultPath(PID, links1, 1.0);
+ new DefaultPath(PID, links1, ScalarWeight.toWeight(1.0));
private static List<Link> links2 = ImmutableList.of(link2, link1);
private static DefaultPath path2 =
- new DefaultPath(PID, links2, 2.0);
+ new DefaultPath(PID, links2, ScalarWeight.toWeight(2.0));
private static List<Link> links3 = ImmutableList.of(link1, link2, link3);
private static DefaultPath path3 =
- new DefaultPath(PID, links3, 3.0);
+ new DefaultPath(PID, links3, ScalarWeight.toWeight(3.0));
private static DefaultDisjointPath disjointPath1 =
new DefaultDisjointPath(PID, path1, path2);
diff --git a/core/api/src/test/java/org/onosproject/net/NetTestTools.java b/core/api/src/test/java/org/onosproject/net/NetTestTools.java
index 8f161fc..dcc3e15 100644
--- a/core/api/src/test/java/org/onosproject/net/NetTestTools.java
+++ b/core/api/src/test/java/org/onosproject/net/NetTestTools.java
@@ -16,6 +16,7 @@
package org.onosproject.net;
import com.google.common.collect.ImmutableList;
+import org.onlab.graph.ScalarWeight;
import org.onlab.junit.TestUtils;
import org.onlab.packet.ChassisId;
import org.onlab.packet.IpPrefix;
@@ -130,7 +131,7 @@
for (int i = 0; i < ids.length - 1; i++) {
links.add(link(ids[i], 2, ids[i + 1], 1));
}
- return new DefaultPath(PID, links, ids.length);
+ return new DefaultPath(PID, links, ScalarWeight.toWeight(ids.length));
}
// Creates a path that leads through the given hosts.
@@ -145,7 +146,7 @@
links.add(link(ids[i], 2, ids[i + 1], 1));
}
}
- return new DefaultPath(PID, links, ids.length);
+ return new DefaultPath(PID, links, ScalarWeight.toWeight(ids.length));
}
// Creates OCh signal
diff --git a/core/api/src/test/java/org/onosproject/net/intent/IntentTestsMocks.java b/core/api/src/test/java/org/onosproject/net/intent/IntentTestsMocks.java
index 59aad9c..48b4a87 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/IntentTestsMocks.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/IntentTestsMocks.java
@@ -17,6 +17,7 @@
import com.google.common.base.MoreObjects;
import com.google.common.collect.Sets;
+import org.onlab.graph.ScalarWeight;
import org.onlab.graph.Weight;
import org.onosproject.core.GroupId;
import org.onosproject.net.DefaultPath;
@@ -290,7 +291,7 @@
} else {
return result;
}
- path = new DefaultPath(providerId, links, 3);
+ path = new DefaultPath(providerId, links, ScalarWeight.toWeight(3));
result.add(path);
return result;
diff --git a/core/api/src/test/java/org/onosproject/net/intent/PathIntentTest.java b/core/api/src/test/java/org/onosproject/net/intent/PathIntentTest.java
index e55f21f..ec1fc1a 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/PathIntentTest.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/PathIntentTest.java
@@ -19,6 +19,7 @@
import java.util.Collections;
import org.junit.Test;
+import org.onlab.graph.ScalarWeight;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DefaultLink;
import org.onosproject.net.DefaultPath;
@@ -133,7 +134,7 @@
.appId(APPID)
.selector(MATCH)
.treatment(NOP)
- .path(new DefaultPath(provider1, Collections.singletonList(link1), cost))
+ .path(new DefaultPath(provider1, Collections.singletonList(link1), ScalarWeight.toWeight(cost)))
.build();
}
@@ -147,7 +148,7 @@
.appId(APPID)
.selector(MATCH)
.treatment(NOP)
- .path(new DefaultPath(provider1, Arrays.asList(link1, link2), cost))
+ .path(new DefaultPath(provider1, Arrays.asList(link1, link2), ScalarWeight.toWeight(cost)))
.build();
}
diff --git a/core/api/src/test/java/org/onosproject/net/intent/constraint/LatencyConstraintTest.java b/core/api/src/test/java/org/onosproject/net/intent/constraint/LatencyConstraintTest.java
index b035ee4..eada7bf 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/constraint/LatencyConstraintTest.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/constraint/LatencyConstraintTest.java
@@ -18,6 +18,7 @@
import com.google.common.testing.EqualsTester;
import org.junit.Before;
import org.junit.Test;
+import org.onlab.graph.ScalarWeight;
import org.onosproject.net.Annotations;
import org.onosproject.net.DefaultAnnotations;
import org.onosproject.net.DefaultLink;
@@ -83,7 +84,7 @@
.type(DIRECT)
.annotations(annotations2)
.build();
- path = new DefaultPath(PROVIDER_ID, Arrays.asList(link1, link2), 10);
+ path = new DefaultPath(PROVIDER_ID, Arrays.asList(link1, link2), ScalarWeight.toWeight(10));
}
/**
diff --git a/core/api/src/test/java/org/onosproject/net/intent/constraint/ObstacleConstraintTest.java b/core/api/src/test/java/org/onosproject/net/intent/constraint/ObstacleConstraintTest.java
index 359555b..29e7c98 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/constraint/ObstacleConstraintTest.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/constraint/ObstacleConstraintTest.java
@@ -22,6 +22,7 @@
import com.google.common.testing.EqualsTester;
import org.junit.Before;
import org.junit.Test;
+import org.onlab.graph.ScalarWeight;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
import org.onosproject.net.DefaultAnnotations;
@@ -100,9 +101,9 @@
edgelink1 = createEdgeLink(host1, true);
edgelink2 = createEdgeLink(host2, false);
- path = new DefaultPath(PROVIDER_ID, Arrays.asList(link1, link2), 10);
+ path = new DefaultPath(PROVIDER_ID, Arrays.asList(link1, link2), ScalarWeight.toWeight(10));
pathWithEdgeLink = new DefaultPath(PROVIDER_ID,
- Arrays.asList(edgelink1, link1, link2, edgelink2), 10);
+ Arrays.asList(edgelink1, link1, link2, edgelink2), ScalarWeight.toWeight(10));
}
@Test
diff --git a/core/api/src/test/java/org/onosproject/net/intent/constraint/WaypointConstraintTest.java b/core/api/src/test/java/org/onosproject/net/intent/constraint/WaypointConstraintTest.java
index ffe96cd..060607b 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/constraint/WaypointConstraintTest.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/constraint/WaypointConstraintTest.java
@@ -18,6 +18,7 @@
import com.google.common.testing.EqualsTester;
import org.junit.Before;
import org.junit.Test;
+import org.onlab.graph.ScalarWeight;
import org.onosproject.net.DefaultLink;
import org.onosproject.net.DefaultPath;
import org.onosproject.net.DeviceId;
@@ -75,7 +76,7 @@
.type(DIRECT)
.build();
- path = new DefaultPath(PROVIDER_ID, Arrays.asList(link1, link2), 10);
+ path = new DefaultPath(PROVIDER_ID, Arrays.asList(link1, link2), ScalarWeight.toWeight(10));
}
/**
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/HostToHostIntentCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/HostToHostIntentCompiler.java
index bf2b274..4ba0bfe 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/HostToHostIntentCompiler.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/HostToHostIntentCompiler.java
@@ -102,7 +102,7 @@
for (Link link : path.links()) {
reverseLinks.add(0, reverseLink(link));
}
- return new DefaultPath(path.providerId(), reverseLinks, path.cost());
+ return new DefaultPath(path.providerId(), reverseLinks, path.weight());
}
// Produces a reverse variant of the specified link.
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/PointToPointIntentCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/PointToPointIntentCompiler.java
index 0c47196..32784a3 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/PointToPointIntentCompiler.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/PointToPointIntentCompiler.java
@@ -21,6 +21,7 @@
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
+import org.onlab.graph.ScalarWeight;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DefaultPath;
import org.onosproject.net.DeviceId;
@@ -150,7 +151,7 @@
ConnectPoint egressPoint,
PointToPointIntent intent) {
List<Link> links = asList(createEdgeLink(ingressPoint, true), createEdgeLink(egressPoint, false));
- return asList(createPathIntent(new DefaultPath(PID, links, DEFAULT_COST),
+ return asList(createPathIntent(new DefaultPath(PID, links, ScalarWeight.toWeight(DEFAULT_COST)),
intent, PathIntent.ProtectionType.PRIMARY));
}
@@ -179,7 +180,7 @@
links.addAll(path.links());
links.add(createEdgeLink(egressPoint, false));
- return asList(createPathIntent(new DefaultPath(PID, links, path.cost(),
+ return asList(createPathIntent(new DefaultPath(PID, links, path.weight(),
path.annotations()), intent,
PathIntent.ProtectionType.PRIMARY));
}
@@ -253,23 +254,24 @@
PortNumber primaryPort = getPrimaryPort(intent);
if (primaryPort != null && !links.get(0).src().port().equals(primaryPort)) {
reusableIntents.add(createPathIntent(new DefaultPath(PID, links,
- path.cost(), path.annotations()),
+ path.weight(), path.annotations()),
intent, PathIntent.ProtectionType.BACKUP));
updateFailoverGroup(intent, links);
return reusableIntents;
} else {
- reusableIntents.add(createPathIntent(new DefaultPath(PID, backupLinks, path.backup().cost(),
- path.backup().annotations()), intent, PathIntent.ProtectionType.BACKUP));
+ reusableIntents.add(createPathIntent(new DefaultPath(PID, backupLinks,
+ path.backup().weight(),
+ path.backup().annotations()), intent, PathIntent.ProtectionType.BACKUP));
updateFailoverGroup(intent, backupLinks);
return reusableIntents;
}
}
- intentList.add(createPathIntent(new DefaultPath(PID, links, path.cost(),
+ intentList.add(createPathIntent(new DefaultPath(PID, links, path.weight(),
path.annotations()),
intent, PathIntent.ProtectionType.PRIMARY));
- intentList.add(createPathIntent(new DefaultPath(PID, backupLinks, path.backup().cost(),
+ intentList.add(createPathIntent(new DefaultPath(PID, backupLinks, path.backup().weight(),
path.backup().annotations()),
intent, PathIntent.ProtectionType.BACKUP));
@@ -335,7 +337,7 @@
links.add(createEdgeLink(ingressPoint, true));
links.addAll(onlyPath.links());
links.add(createEdgeLink(egressPoint, false));
- return asList(createPathIntent(new DefaultPath(PID, links, onlyPath.cost(),
+ return asList(createPathIntent(new DefaultPath(PID, links, onlyPath.weight(),
onlyPath.annotations()),
intent, PathIntent.ProtectionType.PRIMARY));
}
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/ProtectedTransportIntentCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/ProtectedTransportIntentCompiler.java
index f7eceef..9020e5a 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/ProtectedTransportIntentCompiler.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/ProtectedTransportIntentCompiler.java
@@ -299,7 +299,7 @@
List<Link> revLinks = Lists.reverse(transform(path.links(), this::reverse));
return new DefaultPath(path.providerId(),
revLinks,
- path.cost(),
+ path.weight(),
path.annotations());
}
diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/PathIntentCompilerTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/PathIntentCompilerTest.java
index 6d015ae..e37ae41 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/PathIntentCompilerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/PathIntentCompilerTest.java
@@ -18,6 +18,7 @@
import com.google.common.collect.ImmutableList;
import org.junit.Before;
import org.junit.Test;
+import org.onlab.graph.ScalarWeight;
import org.onlab.packet.Ethernet;
import org.onlab.packet.MplsLabel;
import org.onlab.packet.VlanId;
@@ -172,7 +173,7 @@
.selector(selector)
.treatment(treatment)
.priority(PRIORITY)
- .path(new DefaultPath(pid, links, hops))
+ .path(new DefaultPath(pid, links, ScalarWeight.toWeight(hops)))
.build();
//Intent with VLAN encap without egress VLAN
@@ -182,7 +183,7 @@
.treatment(treatment)
.priority(PRIORITY)
.constraints(ImmutableList.of(new EncapsulationConstraint(EncapsulationType.VLAN)))
- .path(new DefaultPath(pid, links, hops))
+ .path(new DefaultPath(pid, links, ScalarWeight.toWeight(hops)))
.build();
//Intent with VLAN encap with ingress and egress VLAN
@@ -192,7 +193,7 @@
.treatment(vlanTreatment)
.priority(PRIORITY)
.constraints(ImmutableList.of(new EncapsulationConstraint(EncapsulationType.VLAN)))
- .path(new DefaultPath(pid, links, hops))
+ .path(new DefaultPath(pid, links, ScalarWeight.toWeight(hops)))
.build();
constraintMplsIntent = PathIntent.builder()
@@ -201,7 +202,7 @@
.treatment(treatment)
.priority(PRIORITY)
.constraints(ImmutableList.of(new EncapsulationConstraint(EncapsulationType.MPLS)))
- .path(new DefaultPath(pid, links, hops))
+ .path(new DefaultPath(pid, links, ScalarWeight.toWeight(hops)))
.build();
edgeIntentNoVlan = PathIntent.builder()
@@ -210,7 +211,7 @@
.treatment(treatment)
.priority(PRIORITY)
.constraints(ImmutableList.of(new EncapsulationConstraint(EncapsulationType.VLAN)))
- .path(new DefaultPath(pid, edgeNet, edgeHops))
+ .path(new DefaultPath(pid, edgeNet, ScalarWeight.toWeight(edgeHops)))
.build();
edgeIntentIngressVlan = PathIntent.builder()
@@ -219,7 +220,7 @@
.treatment(treatment)
.priority(PRIORITY)
.constraints(ImmutableList.of(new EncapsulationConstraint(EncapsulationType.VLAN)))
- .path(new DefaultPath(pid, edgeNet, edgeHops))
+ .path(new DefaultPath(pid, edgeNet, ScalarWeight.toWeight(edgeHops)))
.build();
edgeIntentEgressVlan = PathIntent.builder()
@@ -228,7 +229,7 @@
.treatment(vlanTreatment)
.priority(PRIORITY)
.constraints(ImmutableList.of(new EncapsulationConstraint(EncapsulationType.VLAN)))
- .path(new DefaultPath(pid, edgeNet, edgeHops))
+ .path(new DefaultPath(pid, edgeNet, ScalarWeight.toWeight(edgeHops)))
.build();
edgeIntentVlan = PathIntent.builder()
@@ -237,7 +238,7 @@
.treatment(vlanTreatment)
.priority(PRIORITY)
.constraints(ImmutableList.of(new EncapsulationConstraint(EncapsulationType.VLAN)))
- .path(new DefaultPath(pid, edgeNet, edgeHops))
+ .path(new DefaultPath(pid, edgeNet, ScalarWeight.toWeight(edgeHops)))
.build();
singleHopIndirectIntentNoVlan = PathIntent.builder()
@@ -246,7 +247,7 @@
.treatment(treatment)
.priority(PRIORITY)
.constraints(ImmutableList.of(new EncapsulationConstraint(EncapsulationType.VLAN)))
- .path(new DefaultPath(pid, singleHopIndirect, singleHopIndirectHops))
+ .path(new DefaultPath(pid, singleHopIndirect, ScalarWeight.toWeight(singleHopIndirectHops)))
.build();
singleHopIndirectIntentIngressVlan = PathIntent.builder()
@@ -255,7 +256,7 @@
.treatment(treatment)
.priority(PRIORITY)
.constraints(ImmutableList.of(new EncapsulationConstraint(EncapsulationType.VLAN)))
- .path(new DefaultPath(pid, singleHopIndirect, singleHopIndirectHops))
+ .path(new DefaultPath(pid, singleHopIndirect, ScalarWeight.toWeight(singleHopIndirectHops)))
.build();
singleHopIndirectIntentEgressVlan = PathIntent.builder()
@@ -264,7 +265,7 @@
.treatment(vlanTreatment)
.priority(PRIORITY)
.constraints(ImmutableList.of(new EncapsulationConstraint(EncapsulationType.VLAN)))
- .path(new DefaultPath(pid, singleHopIndirect, singleHopIndirectHops))
+ .path(new DefaultPath(pid, singleHopIndirect, ScalarWeight.toWeight(singleHopIndirectHops)))
.build();
singleHopIndirectIntentVlan = PathIntent.builder()
@@ -273,7 +274,7 @@
.treatment(vlanTreatment)
.priority(PRIORITY)
.constraints(ImmutableList.of(new EncapsulationConstraint(EncapsulationType.VLAN)))
- .path(new DefaultPath(pid, singleHopIndirect, singleHopIndirectHops))
+ .path(new DefaultPath(pid, singleHopIndirect, ScalarWeight.toWeight(singleHopIndirectHops)))
.build();
singleHopDirectIntentNoVlan = PathIntent.builder()
@@ -282,7 +283,7 @@
.treatment(treatment)
.priority(PRIORITY)
.constraints(ImmutableList.of(new EncapsulationConstraint(EncapsulationType.VLAN)))
- .path(new DefaultPath(pid, singleHopDirect, singleHopDirectHops))
+ .path(new DefaultPath(pid, singleHopDirect, ScalarWeight.toWeight(singleHopDirectHops)))
.build();
singleHopDirectIntentIngressVlan = PathIntent.builder()
@@ -291,7 +292,7 @@
.treatment(treatment)
.priority(PRIORITY)
.constraints(ImmutableList.of(new EncapsulationConstraint(EncapsulationType.VLAN)))
- .path(new DefaultPath(pid, singleHopDirect, singleHopDirectHops))
+ .path(new DefaultPath(pid, singleHopDirect, ScalarWeight.toWeight(singleHopDirectHops)))
.build();
singleHopDirectIntentEgressVlan = PathIntent.builder()
@@ -300,7 +301,7 @@
.treatment(vlanTreatment)
.priority(PRIORITY)
.constraints(ImmutableList.of(new EncapsulationConstraint(EncapsulationType.VLAN)))
- .path(new DefaultPath(pid, singleHopDirect, singleHopDirectHops))
+ .path(new DefaultPath(pid, singleHopDirect, ScalarWeight.toWeight(singleHopDirectHops)))
.build();
singleHopDirectIntentVlan = PathIntent.builder()
@@ -309,7 +310,7 @@
.treatment(vlanTreatment)
.priority(PRIORITY)
.constraints(ImmutableList.of(new EncapsulationConstraint(EncapsulationType.VLAN)))
- .path(new DefaultPath(pid, singleHopDirect, singleHopDirectHops))
+ .path(new DefaultPath(pid, singleHopDirect, ScalarWeight.toWeight(singleHopDirectHops)))
.build();
intentExtensionService = createMock(IntentExtensionService.class);
diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/phase/CompilingTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/phase/CompilingTest.java
index 982a4f9..c504501 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/phase/CompilingTest.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/phase/CompilingTest.java
@@ -17,6 +17,7 @@
import org.junit.Before;
import org.junit.Test;
+import org.onlab.graph.ScalarWeight;
import org.onosproject.TestApplicationId;
import org.onosproject.core.ApplicationId;
import org.onosproject.core.IdGenerator;
@@ -67,7 +68,7 @@
private final List<Link> links = Collections.singletonList(
DefaultLink.builder().providerId(pid).src(cp2).dst(cp4).type(DIRECT).build());
- private final Path path = new DefaultPath(pid, links, 10);
+ private final Path path = new DefaultPath(pid, links, ScalarWeight.toWeight(10));
private PointToPointIntent input;
private PathIntent compiled;