Remove deprecated API from the Interface class
Change-Id: Id25d58a74cf5511e964b24b3de5eba80da74104d
diff --git a/apps/routing/common/src/main/java/org/onosproject/routing/impl/BgpSpeakerNeighbourHandler.java b/apps/routing/common/src/main/java/org/onosproject/routing/impl/BgpSpeakerNeighbourHandler.java
index b98b69a..9fe73dc 100644
--- a/apps/routing/common/src/main/java/org/onosproject/routing/impl/BgpSpeakerNeighbourHandler.java
+++ b/apps/routing/common/src/main/java/org/onosproject/routing/impl/BgpSpeakerNeighbourHandler.java
@@ -120,7 +120,7 @@
private void updateInterface(Interface intf) {
// Only use interfaces that have an IP address
- if (!intf.ipAddresses().isEmpty()) {
+ if (!intf.ipAddressesList().isEmpty()) {
neighbourService.registerNeighbourHandler(intf, externalHandler, appId);
}
}
@@ -144,7 +144,7 @@
// address on this port. Drop all other requests.
interfaceService.getInterfacesByPort(context.inPort())
.stream()
- .filter(intf -> intf.ipAddresses()
+ .filter(intf -> intf.ipAddressesList()
.stream()
.anyMatch(ia -> ia.ipAddress().equals(context.target()) &&
ia.subnetAddress().contains(context.sender())))
diff --git a/apps/routing/cpr/src/main/java/org/onosproject/routing/cpr/ControlPlaneRedirectManager.java b/apps/routing/cpr/src/main/java/org/onosproject/routing/cpr/ControlPlaneRedirectManager.java
index 17de391..8e793e2 100644
--- a/apps/routing/cpr/src/main/java/org/onosproject/routing/cpr/ControlPlaneRedirectManager.java
+++ b/apps/routing/cpr/src/main/java/org/onosproject/routing/cpr/ControlPlaneRedirectManager.java
@@ -265,7 +265,7 @@
DeviceId deviceId = intf.connectPoint().deviceId();
PortNumber controlPlanePort = request.controlPlaneConnectPoint().port();
- for (InterfaceIpAddress ip : intf.ipAddresses()) {
+ for (InterfaceIpAddress ip : intf.ipAddressesList()) {
// create nextObjectives for forwarding to this interface and the
// controlPlaneConnectPoint
int cpNextId, intfNextId;
diff --git a/apps/routing/cpr/src/test/java/org/onosproject/routing/cpr/ControlPlaneRedirectManagerTest.java b/apps/routing/cpr/src/test/java/org/onosproject/routing/cpr/ControlPlaneRedirectManagerTest.java
index ffcce3b..40c27d3 100644
--- a/apps/routing/cpr/src/test/java/org/onosproject/routing/cpr/ControlPlaneRedirectManagerTest.java
+++ b/apps/routing/cpr/src/test/java/org/onosproject/routing/cpr/ControlPlaneRedirectManagerTest.java
@@ -272,7 +272,7 @@
private void setUpInterfaceConfiguration(Interface intf, boolean install) {
DeviceId deviceId = controlPlaneConnectPoint.deviceId();
PortNumber controlPlanePort = controlPlaneConnectPoint.port();
- for (InterfaceIpAddress ip : intf.ipAddresses()) {
+ for (InterfaceIpAddress ip : intf.ipAddressesList()) {
int cpNextId, intfNextId;
cpNextId = modifyNextObjective(deviceId, controlPlanePort,
VlanId.vlanId(ControlPlaneRedirectManager.ASSIGNED_VLAN), true, install);
@@ -698,7 +698,7 @@
public Interface getMatchingInterface(IpAddress ip) {
Interface intff = null;
for (Interface intf : interfaces) {
- for (InterfaceIpAddress address : intf.ipAddresses()) {
+ for (InterfaceIpAddress address : intf.ipAddressesList()) {
if (address.ipAddress().equals(ip)) {
intff = intf;
break;