commit 4f7e3631d27be7e08e4f7beac6179c156afffd51
author Ray Milkey <ray@opennetworking.org> Tue Feb 19 15:35:20 2019 -0800
committer Thomas Vachuska <tom@opennetworking.org> Fri Feb 22 18:01:45 2019 +0000
tree 90e342221ea017a01b775882ee2c4ffe691c47b2
parent ca840af1bdefe81e9496067c4cfc8f76e2116be0

Removal of deprecated APIs

- OchSignal constructor
- unfiltered connect point methods in single point to multi point intents
- useBackup() method from disjoint paths
- ChannelAdapter class
- getLastUpdatedInstant() method from cluster store
- switchWorkingPath() method from protection config behaviour
- getVersion() method from partition
- getFlowRulesById() method from flow rule service

Change-Id: I5c6c2f31725f7e7e44ac2abb18ce3fb96b09d93e

cli/src/main/java/org/onosproject/cli/net/AddSinglePointToMultiPointIntentCommand.java

diff --git a/cli/src/main/java/org/onosproject/cli/net/AddSinglePointToMultiPointIntentCommand.java b/cli/src/main/java/org/onosproject/cli/net/AddSinglePointToMultiPointIntentCommand.java
index 17f1072..8192dd45 100644
--- a/cli/src/main/java/org/onosproject/cli/net/AddSinglePointToMultiPointIntentCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/AddSinglePointToMultiPointIntentCommand.java
@@ -20,6 +20,7 @@
 import org.apache.karaf.shell.api.action.Completion;
 import org.apache.karaf.shell.api.action.lifecycle.Service;
 import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.FilteredConnectPoint;
 import org.onosproject.net.flow.TrafficSelector;
 import org.onosproject.net.flow.TrafficTreatment;
 import org.onosproject.net.intent.Constraint;
@@ -54,11 +55,11 @@
         String ingressDeviceString = deviceStrings[0];
         ConnectPoint ingressPoint = ConnectPoint.deviceConnectPoint(ingressDeviceString);
 
-        Set<ConnectPoint> egressPoints = new HashSet<>();
+        Set<FilteredConnectPoint> egressPoints = new HashSet<>();
         for (int index = 1; index < deviceStrings.length; index++) {
             String egressDeviceString = deviceStrings[index];
             ConnectPoint egress = ConnectPoint.deviceConnectPoint(egressDeviceString);
-            egressPoints.add(egress);
+            egressPoints.add(new FilteredConnectPoint(egress));
         }
 
         TrafficSelector selector = buildTrafficSelector();
@@ -71,8 +72,8 @@
                         .key(key())
                         .selector(selector)
                         .treatment(treatment)
-                        .ingressPoint(ingressPoint)
-                        .egressPoints(egressPoints)
+                        .filteredIngressPoint(new FilteredConnectPoint(ingressPoint))
+                        .filteredEgressPoints(egressPoints)
                         .constraints(constraints)
                         .priority(priority())
                         .resourceGroup(resourceGroup())