[ONOS-5924] fix for Cbench test regression
Change-Id: I85c4f3a36510b48df59ebfe1b9caa3164b0ccdab
diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/provider/DefaultVirtualPacketProvider.java b/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/provider/DefaultVirtualPacketProvider.java
index 497e49a..5e65d94 100644
--- a/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/provider/DefaultVirtualPacketProvider.java
+++ b/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/provider/DefaultVirtualPacketProvider.java
@@ -103,9 +103,6 @@
"org.onosproject.virtual.virtual-packet");
providerRegistryService.registerProvider(this);
- processor = new InternalPacketProcessor();
- packetService.addProcessor(processor, PACKET_PROCESSOR_PRIORITY);
-
contextMap = Maps.newConcurrentMap();
log.info("Started");
@@ -127,6 +124,12 @@
packetService.emit(devirtualize(networkId, packet));
}
+ @Override
+ public void startPacketHandling() {
+ processor = new InternalPacketProcessor();
+ packetService.addProcessor(processor, PACKET_PROCESSOR_PRIORITY);
+ }
+
/**
* Translate the requested physical PacketContext into a virtual PacketContext.
* See {@link org.onosproject.net.packet.OutboundPacket}
diff --git a/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkPacketManagerTest.java b/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkPacketManagerTest.java
index b9771e4..9fe9d86 100644
--- a/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkPacketManagerTest.java
+++ b/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkPacketManagerTest.java
@@ -198,6 +198,11 @@
public void emit(NetworkId networkId, OutboundPacket packet) {
emittedPacket = packet;
}
+
+ @Override
+ public void startPacketHandling() {
+
+ }
}
private class TestProcessor implements PacketProcessor {
diff --git a/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/provider/DefaultVirtualPacketProviderTest.java b/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/provider/DefaultVirtualPacketProviderTest.java
index cbaaa34..675feac 100644
--- a/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/provider/DefaultVirtualPacketProviderTest.java
+++ b/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/provider/DefaultVirtualPacketProviderTest.java
@@ -154,6 +154,7 @@
providerManager.registerProviderService(VNET_ID, providerService);
virtualProvider.activate();
+ virtualProvider.startPacketHandling();
vAppId = new TestApplicationId(0, "Virtual App");
}