[Cardinal] Add builders for Intents and remove extra constructors.
Starting with PointToPoint intent to see how it looks
Change-Id: I5366a05d657ceaad18c03b95cd71f5d1107200e2
diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/PointToPointIntentCompilerTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/PointToPointIntentCompilerTest.java
index aedc124..b0a5df8 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/PointToPointIntentCompilerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/PointToPointIntentCompilerTest.java
@@ -72,9 +72,13 @@
*/
private PointToPointIntent makeIntent(String ingressIdString,
String egressIdString) {
- return new PointToPointIntent(APPID, selector, treatment,
- connectPoint(ingressIdString, 1),
- connectPoint(egressIdString, 1));
+ return PointToPointIntent.builder()
+ .appId(APPID)
+ .selector(selector)
+ .treatment(treatment)
+ .ingressPoint(connectPoint(ingressIdString, 1))
+ .egressPoint(connectPoint(egressIdString, 1))
+ .build();
}
/**
@@ -87,10 +91,14 @@
*/
private PointToPointIntent makeIntent(String ingressIdString,
String egressIdString, List<Constraint> constraints) {
- return new PointToPointIntent(APPID, selector, treatment,
- connectPoint(ingressIdString, 1),
- connectPoint(egressIdString, 1),
- constraints, Intent.DEFAULT_INTENT_PRIORITY);
+ return PointToPointIntent.builder()
+ .appId(APPID)
+ .selector(selector)
+ .treatment(treatment)
+ .ingressPoint(connectPoint(ingressIdString, 1))
+ .egressPoint(connectPoint(egressIdString, 1))
+ .constraints(constraints)
+ .build();
}
/**
@@ -187,7 +195,13 @@
public void testSameSwitchDifferentPortsIntentCompilation() {
ConnectPoint src = new ConnectPoint(deviceId("1"), portNumber(1));
ConnectPoint dst = new ConnectPoint(deviceId("1"), portNumber(2));
- PointToPointIntent intent = new PointToPointIntent(APP_ID, selector, treatment, src, dst);
+ PointToPointIntent intent = PointToPointIntent.builder()
+ .appId(APP_ID)
+ .selector(selector)
+ .treatment(treatment)
+ .ingressPoint(src)
+ .egressPoint(dst)
+ .build();
String[] hops = {"1"};
PointToPointIntentCompiler sut = makeCompiler(hops);