Remove deprecated connect point APIs for point to point intents
Change-Id: Ie7d29a9e6d54283d3a3310ed8b1e749a631031b1
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
index f694dee..35876d6 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
@@ -261,7 +261,7 @@
// remove associated group if there is one
if (intent instanceof PointToPointIntent) {
PointToPointIntent pointIntent = (PointToPointIntent) intent;
- DeviceId deviceId = pointIntent.ingressPoint().deviceId();
+ DeviceId deviceId = pointIntent.filteredIngressPoint().connectPoint().deviceId();
GroupKey groupKey = PointToPointIntentCompiler.makeGroupKey(intent.id());
groupService.removeGroup(deviceId, groupKey,
intent.appId());
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 b85addd..acdaddd 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
@@ -461,7 +461,7 @@
private List<FlowRule> createFailoverFlowRules(PointToPointIntent intent) {
List<FlowRule> flowRules = new ArrayList<>();
- ConnectPoint ingress = intent.ingressPoint();
+ ConnectPoint ingress = intent.filteredIngressPoint().connectPoint();
DeviceId deviceId = ingress.deviceId();
// flow rule with failover traffic treatment
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/TwoWayP2PIntentCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/TwoWayP2PIntentCompiler.java
index 9f3d4b0..753e04f 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/TwoWayP2PIntentCompiler.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/TwoWayP2PIntentCompiler.java
@@ -19,6 +19,7 @@
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
+import org.onosproject.net.FilteredConnectPoint;
import org.onosproject.net.intent.Intent;
import org.onosproject.net.intent.PointToPointIntent;
import org.onosproject.net.intent.TwoWayP2PIntent;
@@ -50,8 +51,8 @@
.key(intent.key())
.selector(intent.selector())
.treatment(intent.treatment())
- .ingressPoint(intent.one())
- .egressPoint(intent.two())
+ .filteredIngressPoint(new FilteredConnectPoint(intent.one()))
+ .filteredEgressPoint(new FilteredConnectPoint(intent.two()))
.constraints(intent.constraints())
.priority(intent.priority())
.resourceGroup(intent.resourceGroup())
@@ -61,8 +62,8 @@
.key(intent.key())
.selector(intent.selector())
.treatment(intent.treatment())
- .ingressPoint(intent.two())
- .egressPoint(intent.one())
+ .filteredIngressPoint(new FilteredConnectPoint(intent.two()))
+ .filteredEgressPoint(new FilteredConnectPoint(intent.one()))
.constraints(intent.constraints())
.priority(intent.priority())
.resourceGroup(intent.resourceGroup())
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/VirtualNetworkIntentCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/VirtualNetworkIntentCompiler.java
index 90ad393..bf92873 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/VirtualNetworkIntentCompiler.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/VirtualNetworkIntentCompiler.java
@@ -31,6 +31,7 @@
import org.onosproject.incubator.net.virtual.VirtualNetworkStore;
import org.onosproject.incubator.net.virtual.VirtualPort;
import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.FilteredConnectPoint;
import org.onosproject.net.Link;
import org.onosproject.net.Path;
import org.onosproject.net.intent.Intent;
@@ -175,8 +176,8 @@
PointToPointIntent physicalIntent = PointToPointIntent.builder()
.key(intentKey)
.appId(intent.appId())
- .ingressPoint(ingressPoint)
- .egressPoint(egressPoint)
+ .filteredIngressPoint(new FilteredConnectPoint(ingressPoint))
+ .filteredEgressPoint(new FilteredConnectPoint(egressPoint))
.constraints(intent.constraints())
.selector(intent.selector())
.treatment(intent.treatment())