| commit | 4994c3dc8b9c873e13caccbe86b4881aab88bab1 | [log] [tgz] |
|---|---|---|
| author | yoonseon <yoonseon@onlab.us> | Fri Jan 27 13:07:18 2017 -0800 |
| committer | yoonseon <yoonseon@onlab.us> | Fri Jan 27 13:08:14 2017 -0800 |
| tree | 889acf4a89c2dba3ebe6e3628cdccc4173801f02 | |
| parent | a98ae9ddfe024a138e850f1bff815d1d54daa6d6 [diff] |
Fix: stc setup fail due to virtual packet provider Change-Id: If8c8370f25beff8a175913f7382083108e77c5d1
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 2187be4..497e49a 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
@@ -78,9 +78,6 @@ protected CoreService coreService; @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) - protected VirtualPacketProviderService providerService; - - @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) protected VirtualNetworkAdminService virtualNetworkAdminService; @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) @@ -103,7 +100,7 @@ @Activate public void activate() { appId = coreService.registerApplication( - "org.onosproject.provider.virtual-packet-provider"); + "org.onosproject.virtual.virtual-packet"); providerRegistryService.registerProvider(this); processor = new InternalPacketProcessor();
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 6d6d7c7..cbaaa34 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
@@ -162,7 +162,6 @@ virtualProvider.deactivate(); virtualProvider.coreService = null; virtualProvider.virtualNetworkAdminService = null; - virtualProvider.providerService = null; }