workaorund blueprint restart for NetvirtSfcIT

Change-Id: I1cdf0daa18c1a8385f87f0b81f59fe3c637f8643
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/openstack/net-virt-providers/src/main/resources/org/opendaylight/blueprint/netvirt-provider.xml b/openstack/net-virt-providers/src/main/resources/org/opendaylight/blueprint/netvirt-provider.xml
index 0845e79adb4ca09e5a6b09a52ba51c962f50ccd8..9806ac801095235b01fabc877b1bf3620f611b2f 100644 (file)
--- a/openstack/net-virt-providers/src/main/resources/org/opendaylight/blueprint/netvirt-provider.xml
+++ b/openstack/net-virt-providers/src/main/resources/org/opendaylight/blueprint/netvirt-provider.xml
@@ -12,10 +12,6 @@
   <reference id="rpcRegistry"
     interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry" />
 
-  <odl:clustered-app-config id="netvirtProviderConfig"
-    binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netvirt.providers.config.rev160109.NetvirtProvidersConfig">
-  </odl:clustered-app-config>
-
   <odl:rpc-service id="salFlowService"
     interface="org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.SalFlowService" />
   <odl:rpc-service id="packetProcessingService"
@@ -29,9 +25,7 @@
     <argument ref="notificationService" />
     <argument ref="packetProcessingService" />
     <argument ref="salFlowService" />
-    <argument>
-      <bean factory-ref="netvirtProviderConfig" factory-method="getTableOffset" />
-    </argument>
+    <argument value="0" />
   </bean>
 
 </blueprint>

diff --git a/openstack/net-virt-sfc/features/src/main/features/features.xml b/openstack/net-virt-sfc/features/src/main/features/features.xml
index 59fa90dcc03917cf0333bf8be919746ed15dafe1..4195703d6a19e32962646f8a90aa3d380f3f3f0f 100644 (file)
--- a/openstack/net-virt-sfc/features/src/main/features/features.xml
+++ b/openstack/net-virt-sfc/features/src/main/features/features.xml
@@ -53,6 +53,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <bundle>mvn:org.opendaylight.netvirt/utils.mdsal-utils/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.ovsdb/utils.mdsal-utils/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.ovsdb/utils.southbound-utils/{{VERSION}}</bundle>
-    <feature version='${project.version}'>odl-ovsdb-sfc-ui</feature>
+    <feature version='${project.version}'>odl-ovsdb-sfc</feature>
   </feature>
 </features>