commit 736a73bff4e71d57a5feb00dfd57d7368464aaa9
author yoonseon <yoonseon@onlab.us> Thu Jan 26 14:27:48 2017 -0800
committer yoonseon <yoonseon@onlab.us> Thu Jan 26 14:27:48 2017 -0800
tree 95a22f0a07c4f5bc792b8f1a0eaa302803b68a30
parent 322c9c35201fcc62fd9b5f827484c546eeafbdbd

fix: virtual packet provider test

Change-Id: I03d7ac079a99be5c193f757c2d024f5e97c3a18d

incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/provider/DefaultVirtualPacketProviderTest.java

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 af4f760..6d6d7c7 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
@@ -39,6 +39,7 @@
 import org.onosproject.incubator.net.virtual.VirtualNetwork;
 import org.onosproject.incubator.net.virtual.VirtualNetworkAdminService;
 import org.onosproject.incubator.net.virtual.VirtualPort;
+import org.onosproject.incubator.net.virtual.provider.AbstractVirtualProviderService;
 import org.onosproject.incubator.net.virtual.provider.VirtualPacketProvider;
 import org.onosproject.incubator.net.virtual.provider.VirtualPacketProviderService;
 import org.onosproject.net.ConnectPoint;
@@ -129,7 +130,9 @@
 
     protected DefaultVirtualPacketProvider virtualProvider;
     protected TestPacketService testPacketService;
-    protected TestVirtualPacketProivderService providerService;
+    protected TestVirtualPacketProviderService providerService;
+
+    private VirtualProviderManager providerManager;
 
     private ApplicationId vAppId;
 
@@ -141,12 +144,15 @@
         virtualProvider.virtualNetworkAdminService =
                 new TestVirtualNetworkAdminService();
 
-        providerService = new TestVirtualPacketProivderService();
-        virtualProvider.virtualPacketProviderService = providerService;
+        providerService = new TestVirtualPacketProviderService();
 
         testPacketService = new TestPacketService();
         virtualProvider.packetService = testPacketService;
 
+        providerManager = new VirtualProviderManager();
+        virtualProvider.providerRegistryService = providerManager;
+        providerManager.registerProviderService(VNET_ID, providerService);
+
         virtualProvider.activate();
         vAppId = new TestApplicationId(0, "Virtual App");
     }
@@ -212,9 +218,6 @@
 
         testPacketService.sendTestPacketContext(pContext);
 
-        assertEquals("The virtual network Id should be 1", VNET_ID,
-                     providerService.getRequestedNetworkId(0));
-
         PacketContext vContext = providerService.getRequestedPacketContext(0);
         InboundPacket vInPacket = vContext.inPacket();
 
@@ -292,6 +295,11 @@
         }
 
         @Override
+        public ApplicationId getVirtualNetworkApplicationId(NetworkId networkId) {
+            return null;
+        }
+
+        @Override
         public void registerTenantId(TenantId tenantId) {
 
         }
@@ -375,7 +383,8 @@
         }
     }
 
-    private static class TestVirtualPacketProivderService
+    private static class TestVirtualPacketProviderService
+            extends AbstractVirtualProviderService<VirtualPacketProvider>
             implements VirtualPacketProviderService {
         static List<PacketContext> requestedContext = new LinkedList();
         static List<NetworkId> requestedNetworkId = new LinkedList();
@@ -385,18 +394,17 @@
             return null;
         }
 
-        @Override
-        public void processPacket(NetworkId networkId, PacketContext context) {
-            requestedNetworkId.add(networkId);
-            requestedContext.add(context);
-        }
-
         public NetworkId getRequestedNetworkId(int index) {
-            return requestedNetworkId.get(0);
+            return requestedNetworkId.get(index);
         }
 
         public PacketContext getRequestedPacketContext(int index) {
-            return requestedContext.get(0);
+            return requestedContext.get(index);
+        }
+
+        @Override
+        public void processPacket(PacketContext context) {
+            requestedContext.add(context);
         }
     }