Remove deprecated connect point APIs for point to point intents
Change-Id: Ie7d29a9e6d54283d3a3310ed8b1e749a631031b1
diff --git a/apps/castor/src/main/java/org/onosproject/castor/ConnectivityManager.java b/apps/castor/src/main/java/org/onosproject/castor/ConnectivityManager.java
index 7a1fcec..2d40f6d 100644
--- a/apps/castor/src/main/java/org/onosproject/castor/ConnectivityManager.java
+++ b/apps/castor/src/main/java/org/onosproject/castor/ConnectivityManager.java
@@ -30,6 +30,7 @@
import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService;
import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.FilteredConnectPoint;
import org.onosproject.net.flow.DefaultTrafficSelector;
import org.onosproject.net.flow.DefaultTrafficTreatment;
import org.onosproject.net.flow.TrafficSelector;
@@ -188,8 +189,8 @@
.key(key)
.selector(selector)
.treatment(treatment)
- .ingressPoint(portOne)
- .egressPoint(portTwo)
+ .filteredIngressPoint(new FilteredConnectPoint(portOne))
+ .filteredEgressPoint(new FilteredConnectPoint(portTwo))
.priority(PRIORITY_OFFSET)
.build());
@@ -207,8 +208,8 @@
.key(key)
.selector(selector)
.treatment(treatment)
- .ingressPoint(portTwo)
- .egressPoint(portOne)
+ .filteredIngressPoint(new FilteredConnectPoint(portTwo))
+ .filteredEgressPoint(new FilteredConnectPoint(portOne))
.priority(PRIORITY_OFFSET)
.build());
@@ -226,8 +227,8 @@
.key(key)
.selector(selector)
.treatment(treatment)
- .ingressPoint(portOne)
- .egressPoint(portTwo)
+ .filteredIngressPoint(new FilteredConnectPoint(portOne))
+ .filteredEgressPoint(new FilteredConnectPoint(portTwo))
.priority(PRIORITY_OFFSET)
.build());
@@ -245,8 +246,8 @@
.key(key)
.selector(selector)
.treatment(treatment)
- .ingressPoint(portTwo)
- .egressPoint(portOne)
+ .filteredIngressPoint(new FilteredConnectPoint(portTwo))
+ .filteredEgressPoint(new FilteredConnectPoint(portOne))
.priority(PRIORITY_OFFSET)
.build());
diff --git a/apps/sdnip/src/test/java/org/onosproject/sdnip/PeerConnectivityManagerTest.java b/apps/sdnip/src/test/java/org/onosproject/sdnip/PeerConnectivityManagerTest.java
index aa00738..19e898e 100644
--- a/apps/sdnip/src/test/java/org/onosproject/sdnip/PeerConnectivityManagerTest.java
+++ b/apps/sdnip/src/test/java/org/onosproject/sdnip/PeerConnectivityManagerTest.java
@@ -28,13 +28,11 @@
import org.onlab.packet.VlanId;
import org.onosproject.TestApplicationId;
import org.onosproject.core.ApplicationId;
-import org.onosproject.net.intf.Interface;
-import org.onosproject.net.intf.InterfaceListener;
-import org.onosproject.net.intf.InterfaceService;
import org.onosproject.intentsync.IntentSynchronizationService;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DeviceId;
import org.onosproject.net.EncapsulationType;
+import org.onosproject.net.FilteredConnectPoint;
import org.onosproject.net.PortNumber;
import org.onosproject.net.config.NetworkConfigListener;
import org.onosproject.net.config.NetworkConfigService;
@@ -47,6 +45,9 @@
import org.onosproject.net.intent.Intent;
import org.onosproject.net.intent.Key;
import org.onosproject.net.intent.PointToPointIntent;
+import org.onosproject.net.intf.Interface;
+import org.onosproject.net.intf.InterfaceListener;
+import org.onosproject.net.intf.InterfaceService;
import org.onosproject.routing.config.BgpConfig;
import org.onosproject.sdnip.config.SdnIpConfig;
@@ -58,7 +59,13 @@
import java.util.Optional;
import java.util.Set;
-import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.reset;
+import static org.easymock.EasyMock.verify;
import static org.onosproject.routing.TestIntentServiceHelper.eqExceptId;
/**
@@ -339,8 +346,8 @@
.key(key)
.selector(builder.build())
.treatment(treatment.build())
- .ingressPoint(srcConnectPoint)
- .egressPoint(dstConnectPoint)
+ .filteredIngressPoint(new FilteredConnectPoint(srcConnectPoint))
+ .filteredEgressPoint(new FilteredConnectPoint(dstConnectPoint))
.build();
intentList.add(intent);
@@ -511,8 +518,8 @@
.key(key)
.selector(builder.build())
.treatment(treatment.build())
- .ingressPoint(srcConnectPoint)
- .egressPoint(dstConnectPoint)
+ .filteredIngressPoint(new FilteredConnectPoint(srcConnectPoint))
+ .filteredEgressPoint(new FilteredConnectPoint(dstConnectPoint))
.build();
intentList.add(intent);
diff --git a/apps/test/intent-perf/src/main/java/org/onosproject/intentperf/IntentPerfInstaller.java b/apps/test/intent-perf/src/main/java/org/onosproject/intentperf/IntentPerfInstaller.java
index f7e46cc..4784475 100644
--- a/apps/test/intent-perf/src/main/java/org/onosproject/intentperf/IntentPerfInstaller.java
+++ b/apps/test/intent-perf/src/main/java/org/onosproject/intentperf/IntentPerfInstaller.java
@@ -40,6 +40,7 @@
import org.onosproject.mastership.MastershipService;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.Device;
+import org.onosproject.net.FilteredConnectPoint;
import org.onosproject.net.PortNumber;
import org.onosproject.net.device.DeviceService;
import org.onosproject.net.flow.DefaultTrafficSelector;
@@ -333,8 +334,8 @@
.key(key)
.selector(selector)
.treatment(treatment)
- .ingressPoint(ingress)
- .egressPoint(egress)
+ .filteredIngressPoint(new FilteredConnectPoint(ingress))
+ .filteredEgressPoint(new FilteredConnectPoint(egress))
.build();
}
diff --git a/apps/virtualbng/src/main/java/org/onosproject/virtualbng/VbngManager.java b/apps/virtualbng/src/main/java/org/onosproject/virtualbng/VbngManager.java
index 4f8e6d9..35ca7f9 100644
--- a/apps/virtualbng/src/main/java/org/onosproject/virtualbng/VbngManager.java
+++ b/apps/virtualbng/src/main/java/org/onosproject/virtualbng/VbngManager.java
@@ -32,6 +32,7 @@
import org.onosproject.core.CoreService;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DeviceId;
+import org.onosproject.net.FilteredConnectPoint;
import org.onosproject.net.Host;
import org.onosproject.net.flow.DefaultTrafficSelector;
import org.onosproject.net.flow.DefaultTrafficTreatment;
@@ -446,8 +447,8 @@
.key(key)
.selector(selector.build())
.treatment(treatment.build())
- .egressPoint(dstConnectPoint)
- .ingressPoint(srcConnectPoint)
+ .filteredEgressPoint(new FilteredConnectPoint(dstConnectPoint))
+ .filteredIngressPoint(new FilteredConnectPoint(srcConnectPoint))
.build();
log.info("Generated a PointToPointIntent for traffic from local host "
@@ -496,8 +497,8 @@
.key(key)
.selector(selector.build())
.treatment(treatment.build())
- .egressPoint(dstConnectPoint)
- .ingressPoint(srcConnectPoint)
+ .filteredEgressPoint(new FilteredConnectPoint(dstConnectPoint))
+ .filteredIngressPoint(new FilteredConnectPoint(srcConnectPoint))
.build();
log.info("Generated a PointToPointIntent for traffic to local host "
+ ": {}", intent);