Fix compile issues due to recent API changes
Change-Id: I7ef5727291c317c5deb6a117c1819cf6e9e32338
diff --git a/ecord/co/src/main/java/org/onosproject/ecord/co/BigSwitchDeviceProvider.java b/ecord/co/src/main/java/org/onosproject/ecord/co/BigSwitchDeviceProvider.java
index f54a6d2..d75f59e 100644
--- a/ecord/co/src/main/java/org/onosproject/ecord/co/BigSwitchDeviceProvider.java
+++ b/ecord/co/src/main/java/org/onosproject/ecord/co/BigSwitchDeviceProvider.java
@@ -15,10 +15,10 @@
*/
package org.onosproject.ecord.co;
-import org.apache.commons.lang3.tuple.Pair;
-
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.base.Strings;
-
+import org.apache.commons.lang3.tuple.Pair;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
@@ -58,21 +58,13 @@
import org.onosproject.net.link.LinkProvider;
import org.onosproject.net.link.LinkProviderRegistry;
import org.onosproject.net.link.LinkProviderService;
+import org.onosproject.net.packet.DefaultOutboundPacket;
import org.onosproject.net.packet.PacketContext;
import org.onosproject.net.packet.PacketProcessor;
import org.onosproject.net.packet.PacketService;
import org.onosproject.net.provider.ProviderId;
-import org.slf4j.Logger;
import org.osgi.service.component.ComponentContext;
-import org.onosproject.net.packet.DefaultOutboundPacket;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
-import java.net.URI;
-import java.util.Map;
-import java.util.Optional;
-import java.nio.ByteBuffer;
+import org.slf4j.Logger;
import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder;
@@ -80,19 +72,22 @@
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-
+import java.net.URI;
+import java.nio.ByteBuffer;
import java.util.Dictionary;
+import java.util.Map;
+import java.util.Optional;
import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
import static org.onlab.util.Tools.groupedThreads;
import static org.onosproject.cluster.ClusterMetadata.NO_NAME;
import static org.onosproject.ecord.co.BigSwitchManager.REALIZED_BY;
import static org.onosproject.net.config.basics.SubjectFactories.CONNECT_POINT_SUBJECT_FACTORY;
-import static org.slf4j.LoggerFactory.getLogger;
import static org.onosproject.net.flow.DefaultTrafficTreatment.builder;
+import static org.slf4j.LoggerFactory.getLogger;
/* To configure the BigSwitchDevice parameters at startup, add configuration to tools/package/config/component-cfg.json
before using onos-package command.
@@ -494,6 +489,10 @@
return true;
}
+ @Override
+ public void changePortState(DeviceId deviceId, PortNumber portNumber, boolean b) {
+ }
+
public class InternalConfigListener implements NetworkConfigListener {
@Override
diff --git a/sdx-l3/src/test/java/org/onosproject/sdxl3/SdxL3ArpHandlerTest.java b/sdx-l3/src/test/java/org/onosproject/sdxl3/SdxL3ArpHandlerTest.java
index 6df8f6d..e32a63d 100644
--- a/sdx-l3/src/test/java/org/onosproject/sdxl3/SdxL3ArpHandlerTest.java
+++ b/sdx-l3/src/test/java/org/onosproject/sdxl3/SdxL3ArpHandlerTest.java
@@ -1067,7 +1067,7 @@
IpAddress.valueOf(PEER1_IP6),
IpAddress.valueOf(PEER2_IP6)));
- speakers.add(new BgpConfig.BgpSpeakerConfig(speakerName,
+ speakers.add(new BgpConfig.BgpSpeakerConfig(speakerName, VlanId.NONE,
connectPoint,
connectedPeers));
diff --git a/sdx-l3/src/test/java/org/onosproject/sdxl3/impl/SdxL3PeerAdministrationTest.java b/sdx-l3/src/test/java/org/onosproject/sdxl3/impl/SdxL3PeerAdministrationTest.java
index 168e620..5a9d820 100644
--- a/sdx-l3/src/test/java/org/onosproject/sdxl3/impl/SdxL3PeerAdministrationTest.java
+++ b/sdx-l3/src/test/java/org/onosproject/sdxl3/impl/SdxL3PeerAdministrationTest.java
@@ -296,7 +296,7 @@
connectedPeers.add(IpAddress.valueOf(PEER_IP));
connectedPeers.add(IpAddress.valueOf(NEW_PEER1_IP));
BgpConfig.BgpSpeakerConfig speaker1 = new BgpConfig.BgpSpeakerConfig(
- Optional.empty(), SW1_ETH100, connectedPeers);
+ Optional.empty(), VlanId.NONE, SW1_ETH100, connectedPeers);
Set<BgpConfig.BgpSpeakerConfig> speakers = Sets.newHashSet();
speakers.add(speaker1);
diff --git a/sdx-l3/src/test/java/org/onosproject/sdxl3/impl/SdxL3PeerConnectivityTest.java b/sdx-l3/src/test/java/org/onosproject/sdxl3/impl/SdxL3PeerConnectivityTest.java
index 995f9f1..e1e8894 100644
--- a/sdx-l3/src/test/java/org/onosproject/sdxl3/impl/SdxL3PeerConnectivityTest.java
+++ b/sdx-l3/src/test/java/org/onosproject/sdxl3/impl/SdxL3PeerConnectivityTest.java
@@ -320,10 +320,10 @@
connectedPeers.add(IpAddress.valueOf(PEER1_IP));
connectedPeers.add(IpAddress.valueOf(PEER3_IP));
BgpConfig.BgpSpeakerConfig speaker1 = new BgpConfig.BgpSpeakerConfig(
- Optional.empty(), SW1_ETH100, connectedPeers);
+ Optional.empty(), VlanId.NONE, SW1_ETH100, connectedPeers);
BgpConfig.BgpSpeakerConfig speaker2 = new BgpConfig.BgpSpeakerConfig(
- Optional.empty(),
+ Optional.empty(), VlanId.NONE,
SW2_ETH100, Collections.singleton(IpAddress.valueOf(PEER2_IP)));
Set<BgpConfig.BgpSpeakerConfig> speakers = Sets.newHashSet();