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/main/java/org/onosproject/incubator/net/virtual/impl/provider/DefaultVirtualPacketProvider.java

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 e2aa5bd..2187be4 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
@@ -35,6 +35,7 @@
 import org.onosproject.incubator.net.virtual.provider.AbstractVirtualProvider;
 import org.onosproject.incubator.net.virtual.provider.VirtualPacketProvider;
 import org.onosproject.incubator.net.virtual.provider.VirtualPacketProviderService;
+import org.onosproject.incubator.net.virtual.provider.VirtualProviderRegistryService;
 import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.PortNumber;
 import org.onosproject.net.flow.DefaultTrafficTreatment;
@@ -71,9 +72,6 @@
     private final Logger log = getLogger(getClass());
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected VirtualPacketProviderService virtualPacketProviderService;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected PacketService packetService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
@@ -85,6 +83,8 @@
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected VirtualNetworkAdminService virtualNetworkAdminService;
 
+    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+    protected VirtualProviderRegistryService providerRegistryService;
 
     ApplicationId appId;
     InternalPacketProcessor processor;
@@ -104,6 +104,7 @@
     public void activate() {
         appId = coreService.registerApplication(
                 "org.onosproject.provider.virtual-packet-provider");
+        providerRegistryService.registerProvider(this);
 
         processor = new InternalPacketProcessor();
         packetService.addProcessor(processor, PACKET_PROCESSOR_PRIORITY);
@@ -263,9 +264,14 @@
         @Override
         public void process(PacketContext context) {
             Set<VirtualPacketContext> vContexts = virtualize(context);
-            vContexts.forEach(vpc -> virtualPacketProviderService
-                                              .processPacket(vpc.getNetworkId(),
-                                                             vpc));
+
+            vContexts.forEach(vpc -> {
+                                  VirtualPacketProviderService service =
+                                          (VirtualPacketProviderService) providerRegistryService
+                                                  .getProviderService(vpc.getNetworkId(),
+                                                                      VirtualPacketProvider.class);
+                                  service.processPacket(vpc);
+                              });
         }
     }
 }