commit 27cff8c80525650944fc46e77c9520e43c130e87
author Ray Milkey <ray@opennetworking.org> Mon Mar 05 14:58:26 2018 -0800
committer Thomas Vachuska <tom@opennetworking.org> Tue Mar 06 17:17:59 2018 +0000
tree 78f59fe83de6058db50fe8582d4ea3d1bd481ff2
parent 0a8417e90df7f3ec1b9f25cef72258ed4a8a9f4f

Remove deprecated unfiltered connect point methods from multipoint to single point intents

Change-Id: I220a024568852d1f3168bac3f5cf47d0b3fd9d86

apps/castor/src/main/java/org/onosproject/castor/ConnectivityManager.java

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 2d40f6d..a9a986ee 100644
--- a/apps/castor/src/main/java/org/onosproject/castor/ConnectivityManager.java
+++ b/apps/castor/src/main/java/org/onosproject/castor/ConnectivityManager.java
@@ -322,12 +322,12 @@
             updateExistingL2Intents(peer);
         }
 
-        Set<ConnectPoint> ingressPorts = new HashSet<>();
+        Set<FilteredConnectPoint> ingressPorts = new HashSet<>();
         ConnectPoint egressPort = ConnectPoint.deviceConnectPoint(peer.getPort());
 
         for (Peer inPeer : castorStore.getAllPeers()) {
             if (!inPeer.getName().equals(peer.getName())) {
-                ingressPorts.add(ConnectPoint.deviceConnectPoint(inPeer.getPort()));
+                ingressPorts.add(new FilteredConnectPoint(ConnectPoint.deviceConnectPoint(inPeer.getPort())));
             }
         }
         TrafficSelector.Builder selector = DefaultTrafficSelector.builder();
@@ -341,8 +341,8 @@
                 .key(key)
                 .selector(selector.build())
                 .treatment(treatment)
-                .ingressPoints(ingressPorts)
-                .egressPoint(egressPort)
+                .filteredIngressPoints(ingressPorts)
+                .filteredEgressPoint(new FilteredConnectPoint(egressPort))
                 .priority(FLOW_PRIORITY)
                 .build();
         intentSynchronizer.submit(intent);
@@ -364,9 +364,9 @@
 
         for (MultiPointToSinglePointIntent oldIntent : oldIntents) {
 
-            Set<ConnectPoint> ingressPoints = oldIntent.ingressPoints();
+            Set<FilteredConnectPoint> ingressPoints = oldIntent.filteredIngressPoints();
             ConnectPoint egressPoint = oldIntent.egressPoint();
-            if (ingressPoints.add(ConnectPoint.deviceConnectPoint(peer.getPort()))) {
+            if (ingressPoints.add(new FilteredConnectPoint(ConnectPoint.deviceConnectPoint(peer.getPort())))) {
 
                 MultiPointToSinglePointIntent updatedMp2pIntent =
                         MultiPointToSinglePointIntent.builder()
@@ -374,8 +374,8 @@
                                 .key(oldIntent.key())
                                 .selector(oldIntent.selector())
                                 .treatment(oldIntent.treatment())
-                                .ingressPoints(ingressPoints)
-                                .egressPoint(egressPoint)
+                                .filteredIngressPoints(ingressPoints)
+                                .filteredEgressPoint(new FilteredConnectPoint(egressPoint))
                                 .priority(oldIntent.priority())
                                 .build();
 
@@ -453,9 +453,9 @@
 
         for (MultiPointToSinglePointIntent oldIntent : oldIntents) {
 
-            Set<ConnectPoint> ingressPoints = oldIntent.ingressPoints();
-            ConnectPoint egressPoint = oldIntent.egressPoint();
-            if (ingressPoints.remove(ConnectPoint.deviceConnectPoint(peer.getPort()))) {
+            Set<FilteredConnectPoint> ingressPoints = oldIntent.filteredIngressPoints();
+            FilteredConnectPoint egressPoint = oldIntent.filteredEgressPoint();
+            if (ingressPoints.remove(new FilteredConnectPoint(ConnectPoint.deviceConnectPoint(peer.getPort())))) {
 
                 MultiPointToSinglePointIntent updatedMp2pIntent =
                         MultiPointToSinglePointIntent.builder()
@@ -463,8 +463,8 @@
                                 .key(oldIntent.key())
                                 .selector(oldIntent.selector())
                                 .treatment(oldIntent.treatment())
-                                .ingressPoints(ingressPoints)
-                                .egressPoint(egressPoint)
+                                .filteredIngressPoints(ingressPoints)
+                                .filteredEgressPoint(egressPoint)
                                 .priority(oldIntent.priority())
                                 .build();