Remove deprecated unfiltered connect point methods from multipoint to single point intents
Change-Id: I220a024568852d1f3168bac3f5cf47d0b3fd9d86
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandler.java b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandler.java
index a359964..f8be6a8 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandler.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandler.java
@@ -34,6 +34,7 @@
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.Device;
import org.onosproject.net.DeviceId;
+import org.onosproject.net.FilteredConnectPoint;
import org.onosproject.net.Host;
import org.onosproject.net.HostId;
import org.onosproject.net.HostLocation;
@@ -554,7 +555,7 @@
HostId dst = hostId(string(payload, DST));
Host dstHost = services.host().getHost(dst);
- Set<ConnectPoint> ingressPoints = getHostLocations(src);
+ Set<FilteredConnectPoint> ingressPoints = getHostLocations(src);
// FIXME: clearly, this is not enough
TrafficSelector selector = DefaultTrafficSelector.builder()
@@ -566,8 +567,8 @@
.appId(appId)
.selector(selector)
.treatment(treatment)
- .ingressPoints(ingressPoints)
- .egressPoint(dstHost.location())
+ .filteredIngressPoints(ingressPoints)
+ .filteredEgressPoint(new FilteredConnectPoint(dstHost.location()))
.build();
services.intent().submit(intent);
@@ -832,10 +833,10 @@
}
}
- private Set<ConnectPoint> getHostLocations(Set<HostId> hostIds) {
- Set<ConnectPoint> points = new HashSet<>();
+ private Set<FilteredConnectPoint> getHostLocations(Set<HostId> hostIds) {
+ Set<FilteredConnectPoint> points = new HashSet<>();
for (HostId hostId : hostIds) {
- points.add(getHostLocation(hostId));
+ points.add(new FilteredConnectPoint(getHostLocation(hostId)));
}
return points;
}