Fix broken ovsdb build due to commit in openflowplugin

[netvirt.git] / openstack / net-virt-providers / src / main / java / org / opendaylight / ovsdb / openstack / netvirt / providers / Activator.java

diff --git a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/Activator.java b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/Activator.java
index cffedb68bd46acafc44613f6ed87374d73384fdb..e81335a0010ca691c3ba99800caef06a26dce5e0 100644 (file)
--- a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/Activator.java
+++ b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/Activator.java
@@ -20,6 +20,7 @@ import org.opendaylight.controller.switchmanager.ISwitchManager;
 import org.opendaylight.ovsdb.openstack.netvirt.api.ArpProvider;
 import org.opendaylight.ovsdb.openstack.netvirt.api.BridgeConfigurationManager;
 import org.opendaylight.ovsdb.openstack.netvirt.api.ClassifierProvider;
+import org.opendaylight.ovsdb.openstack.netvirt.api.ConfigurationService;
 import org.opendaylight.ovsdb.openstack.netvirt.api.Constants;
 import org.opendaylight.ovsdb.openstack.netvirt.api.EgressAclProvider;
 import org.opendaylight.ovsdb.openstack.netvirt.api.InboundNatProvider;
@@ -133,7 +134,7 @@ public class Activator extends ComponentActivatorAbstractBase {
 
             c.setInterface(NetworkingProvider.class.getName(), of10Properties);
             c.add(createServiceDependency()
-                          .setService(org.opendaylight.ovsdb.openstack.netvirt.api.ConfigurationService.class)
+                          .setService(ConfigurationService.class)
                           .setRequired(true));
             c.add(createServiceDependency()
                           .setService(BridgeConfigurationManager.class)
@@ -158,7 +159,7 @@ public class Activator extends ComponentActivatorAbstractBase {
 
             c.setInterface(NetworkingProvider.class.getName(), of13Properties);
             c.add(createServiceDependency()
-                          .setService(org.opendaylight.ovsdb.openstack.netvirt.api.ConfigurationService.class)
+                          .setService(ConfigurationService.class)
                           .setRequired(true));
             c.add(createServiceDependency()
                           .setService(BridgeConfigurationManager.class)
@@ -187,6 +188,8 @@ public class Activator extends ComponentActivatorAbstractBase {
         }
 
         if (AbstractServiceInstance.class.isAssignableFrom((Class) imp)) {
+            c.add(createServiceDependency().setService(OvsdbConfigurationService.class).setRequired(true));
+            c.add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true));
             c.add(createServiceDependency()
                           .setService(PipelineOrchestrator.class)
                           .setRequired(true));