Remove API deprecated in Falcon
Change-Id: I80a8afbcd577a9cce174d3fc1e511b711d3c68d4
diff --git a/apps/routing/src/test/java/org/onosproject/routing/impl/ControlPlaneRedirectManagerTest.java b/apps/routing/src/test/java/org/onosproject/routing/impl/ControlPlaneRedirectManagerTest.java
index 59f1fc2..08e89e7 100644
--- a/apps/routing/src/test/java/org/onosproject/routing/impl/ControlPlaneRedirectManagerTest.java
+++ b/apps/routing/src/test/java/org/onosproject/routing/impl/ControlPlaneRedirectManagerTest.java
@@ -149,7 +149,7 @@
@Test
public void testAddDevice() {
ConnectPoint sw1eth4 = new ConnectPoint(DEVICE_ID, PortNumber.portNumber(4));
- Set<InterfaceIpAddress> interfaceIpAddresses4 = Sets.newHashSet();
+ List<InterfaceIpAddress> interfaceIpAddresses4 = new ArrayList<>();
interfaceIpAddresses4
.add(new InterfaceIpAddress(IpAddress.valueOf("192.168.40.101"), IpPrefix.valueOf("192.168.40.0/24")));
@@ -168,7 +168,7 @@
@Test
public void testUpdateNetworkConfig() {
ConnectPoint sw1eth4 = new ConnectPoint(DEVICE_ID, PortNumber.portNumber(4));
- Set<InterfaceIpAddress> interfaceIpAddresses4 = Sets.newHashSet();
+ List<InterfaceIpAddress> interfaceIpAddresses4 = new ArrayList<>();
interfaceIpAddresses4
.add(new InterfaceIpAddress(IpAddress.valueOf("192.168.40.101"), IpPrefix.valueOf("192.168.40.0/24")));
@@ -189,7 +189,7 @@
@Test
public void testAddInterface() {
ConnectPoint sw1eth4 = new ConnectPoint(DEVICE_ID, PortNumber.portNumber(4));
- Set<InterfaceIpAddress> interfaceIpAddresses4 = Sets.newHashSet();
+ List<InterfaceIpAddress> interfaceIpAddresses4 = new ArrayList<>();
interfaceIpAddresses4
.add(new InterfaceIpAddress(IpAddress.valueOf("192.168.40.101"), IpPrefix.valueOf("192.168.40.0/24")));
@@ -209,7 +209,7 @@
@Test
public void testRemoveInterface() {
ConnectPoint sw1eth4 = new ConnectPoint(DEVICE_ID, PortNumber.portNumber(4));
- Set<InterfaceIpAddress> interfaceIpAddresses4 = Sets.newHashSet();
+ List<InterfaceIpAddress> interfaceIpAddresses4 = new ArrayList<>();
interfaceIpAddresses4
.add(new InterfaceIpAddress(IpAddress.valueOf("192.168.40.101"), IpPrefix.valueOf("192.168.40.0/24")));
@@ -329,21 +329,21 @@
* Setup Interface expectation for all Testcases.
**/
private void setUpInterfaceService() {
- Set<InterfaceIpAddress> interfaceIpAddresses1 = Sets.newHashSet();
+ List<InterfaceIpAddress> interfaceIpAddresses1 = new ArrayList<>();
interfaceIpAddresses1
.add(new InterfaceIpAddress(IpAddress.valueOf("192.168.10.101"), IpPrefix.valueOf("192.168.10.0/24")));
Interface sw1Eth1 = new Interface(SW1_ETH1.deviceId().toString(), SW1_ETH1, interfaceIpAddresses1,
MacAddress.valueOf("00:00:00:00:00:01"), VlanId.NONE);
interfaces.add(sw1Eth1);
- Set<InterfaceIpAddress> interfaceIpAddresses2 = Sets.newHashSet();
+ List<InterfaceIpAddress> interfaceIpAddresses2 = new ArrayList<>();
interfaceIpAddresses2
.add(new InterfaceIpAddress(IpAddress.valueOf("192.168.20.101"), IpPrefix.valueOf("192.168.20.0/24")));
Interface sw1Eth2 = new Interface(SW1_ETH1.deviceId().toString(), SW1_ETH2, interfaceIpAddresses2,
MacAddress.valueOf("00:00:00:00:00:02"), VlanId.NONE);
interfaces.add(sw1Eth2);
- Set<InterfaceIpAddress> interfaceIpAddresses3 = Sets.newHashSet();
+ List<InterfaceIpAddress> interfaceIpAddresses3 = new ArrayList<>();
interfaceIpAddresses3
.add(new InterfaceIpAddress(IpAddress.valueOf("192.168.30.101"), IpPrefix.valueOf("192.168.30.0/24")));
Interface sw1Eth3 = new Interface(SW1_ETH1.deviceId().toString(), SW1_ETH3, interfaceIpAddresses3,
diff --git a/apps/sdnip/src/test/java/org/onosproject/sdnip/PeerConnectivityManagerTest.java b/apps/sdnip/src/test/java/org/onosproject/sdnip/PeerConnectivityManagerTest.java
index 1799155..32bae14 100644
--- a/apps/sdnip/src/test/java/org/onosproject/sdnip/PeerConnectivityManagerTest.java
+++ b/apps/sdnip/src/test/java/org/onosproject/sdnip/PeerConnectivityManagerTest.java
@@ -15,6 +15,7 @@
*/
package org.onosproject.sdnip;
+import com.google.common.collect.ImmutableList;
import com.google.common.collect.Sets;
import org.junit.Before;
import org.junit.Test;
@@ -216,10 +217,11 @@
InterfaceIpAddress ia4 =
new InterfaceIpAddress(IpAddress.valueOf("192.168.40.101"),
IpPrefix.valueOf("192.168.40.0/24"));
- Interface intfsw3eth1 = new Interface(s3Eth1,
- Collections.singleton(ia4),
- MacAddress.valueOf("00:00:00:00:00:04"),
- VLAN10);
+ Interface intfsw3eth1 = new Interface(Interface.NO_INTERFACE_NAME,
+ s3Eth1,
+ ImmutableList.of(ia4),
+ MacAddress.valueOf("00:00:00:00:00:04"),
+ VLAN10);
configuredInterfaces.put(interfaceSw3Eth1, intfsw3eth1);
@@ -227,10 +229,11 @@
InterfaceIpAddress ia5 =
new InterfaceIpAddress(IpAddress.valueOf("192.168.50.101"),
IpPrefix.valueOf("192.168.50.0/24"));
- Interface intfsw3eth1intf2 = new Interface(s3Eth1,
- Collections.singleton(ia5),
- MacAddress.valueOf("00:00:00:00:00:05"),
- VLAN20);
+ Interface intfsw3eth1intf2 = new Interface(Interface.NO_INTERFACE_NAME,
+ s3Eth1,
+ ImmutableList.of(ia5),
+ MacAddress.valueOf("00:00:00:00:00:05"),
+ VLAN20);
configuredInterfaces.put(interfaceSw3Eth1intf2, intfsw3eth1intf2);