Code Review / ovsdb.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Remove plugin dependencies
[ovsdb.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 73cc7c1943fa2e8527208ab3912de2e38acc9cf7..32bb3d5dc3c555e6aa398288c9ae901cc5919a46 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
@@ -47,8 +47,6 @@ import org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13.services.L3
 import org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13.services.LoadBalancerService;
 import org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13.services.OutboundNatService;
 import org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13.services.RoutingService;
-import org.opendaylight.ovsdb.plugin.api.OvsdbConfigurationService;
-import org.opendaylight.ovsdb.plugin.api.OvsdbConnectionService;
 
 import org.osgi.framework.BundleContext;
 
@@ -79,8 +77,7 @@ public class Activator extends DependencyActivatorBase {
                 .add(createServiceDependency().setService(BridgeConfigurationManager.class).setRequired(true))
                 .add(createServiceDependency().setService(TenantNetworkManager.class).setRequired(true))
                 .add(createServiceDependency().setService(SecurityServicesManager.class).setRequired(true))
-                .add(createServiceDependency().setService(OvsdbConfigurationService.class).setRequired(true))
-                .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
+                .add(createServiceDependency().setService(org.opendaylight.ovsdb.openstack.netvirt.impl.MdsalConsumerImpl.class).setRequired(true))
                 .add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true))
                 .add(createServiceDependency().setService(ClassifierProvider.class).setRequired(true))
                 .add(createServiceDependency().setService(IngressAclProvider.class).setRequired(true))
@@ -102,8 +99,7 @@ public class Activator extends DependencyActivatorBase {
                 .setInterface(new String[]{AbstractServiceInstance.class.getName(), ClassifierProvider.class.getName()},
                         props2)
                 .setImplementation(ClassifierService.class)
-                .add(createServiceDependency().setService(OvsdbConfigurationService.class).setRequired(true))
-                .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
+                .add(createServiceDependency().setService(org.opendaylight.ovsdb.openstack.netvirt.impl.MdsalConsumerImpl.class).setRequired(true))
                 .add(createServiceDependency().setService(PipelineOrchestrator.class).setRequired(true))
                 .add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
 
@@ -115,8 +111,7 @@ public class Activator extends DependencyActivatorBase {
                 .setInterface(new String[]{AbstractServiceInstance.class.getName(), ArpProvider.class.getName()},
                         props3)
                 .setImplementation(ArpResponderService.class)
-                .add(createServiceDependency().setService(OvsdbConfigurationService.class).setRequired(true))
-                .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
+                .add(createServiceDependency().setService(org.opendaylight.ovsdb.openstack.netvirt.impl.MdsalConsumerImpl.class).setRequired(true))
                 .add(createServiceDependency().setService(PipelineOrchestrator.class).setRequired(true))
                 .add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
 
@@ -128,8 +123,7 @@ public class Activator extends DependencyActivatorBase {
                 .setInterface(new String[]{AbstractServiceInstance.class.getName(),
                         InboundNatProvider.class.getName()}, props4)
                 .setImplementation(InboundNatService.class)
-                .add(createServiceDependency().setService(OvsdbConfigurationService.class).setRequired(true))
-                .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
+                .add(createServiceDependency().setService(org.opendaylight.ovsdb.openstack.netvirt.impl.MdsalConsumerImpl.class).setRequired(true))
                 .add(createServiceDependency().setService(PipelineOrchestrator.class).setRequired(true))
                 .add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
 
@@ -141,8 +135,7 @@ public class Activator extends DependencyActivatorBase {
                 .setInterface(new String[]{AbstractServiceInstance.class.getName(), IngressAclProvider.class.getName()},
                         props5)
                 .setImplementation(IngressAclService.class)
-                .add(createServiceDependency().setService(OvsdbConfigurationService.class).setRequired(true))
-                .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
+                .add(createServiceDependency().setService(org.opendaylight.ovsdb.openstack.netvirt.impl.MdsalConsumerImpl.class).setRequired(true))
                 .add(createServiceDependency().setService(PipelineOrchestrator.class).setRequired(true))
                 .add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
 
@@ -151,11 +144,10 @@ public class Activator extends DependencyActivatorBase {
         props6.put(Constants.PROVIDER_NAME_PROPERTY, OF13Provider.NAME);
 
         manager.add(createComponent()
-                .setInterface(new String[] {AbstractServiceInstance.class.getName(),
-                                LoadBalancerProvider.class.getName()}, props6)
+                .setInterface(new String[]{AbstractServiceInstance.class.getName(),
+                        LoadBalancerProvider.class.getName()}, props6)
                 .setImplementation(LoadBalancerService.class)
-                .add(createServiceDependency().setService(OvsdbConfigurationService.class).setRequired(true))
-                .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
+                .add(createServiceDependency().setService(org.opendaylight.ovsdb.openstack.netvirt.impl.MdsalConsumerImpl.class).setRequired(true))
                 .add(createServiceDependency().setService(PipelineOrchestrator.class).setRequired(true))
                 .add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
 
@@ -164,11 +156,10 @@ public class Activator extends DependencyActivatorBase {
         props7.put(Constants.PROVIDER_NAME_PROPERTY, OF13Provider.NAME);
 
         manager.add(createComponent()
-                .setInterface(new String[] {AbstractServiceInstance.class.getName(), RoutingProvider.class.getName()},
+                .setInterface(new String[]{AbstractServiceInstance.class.getName(), RoutingProvider.class.getName()},
                         props7)
                 .setImplementation(RoutingService.class)
-                .add(createServiceDependency().setService(OvsdbConfigurationService.class).setRequired(true))
-                .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
+                .add(createServiceDependency().setService(org.opendaylight.ovsdb.openstack.netvirt.impl.MdsalConsumerImpl.class).setRequired(true))
                 .add(createServiceDependency().setService(PipelineOrchestrator.class).setRequired(true))
                 .add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
 
@@ -177,11 +168,10 @@ public class Activator extends DependencyActivatorBase {
         props8.put(Constants.PROVIDER_NAME_PROPERTY, OF13Provider.NAME);
 
         manager.add(createComponent()
-                .setInterface(new String[] {AbstractServiceInstance.class.getName(),
-                                L3ForwardingProvider.class.getName()}, props8)
+                .setInterface(new String[]{AbstractServiceInstance.class.getName(),
+                        L3ForwardingProvider.class.getName()}, props8)
                 .setImplementation(L3ForwardingService.class)
-                .add(createServiceDependency().setService(OvsdbConfigurationService.class).setRequired(true))
-                .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
+                .add(createServiceDependency().setService(org.opendaylight.ovsdb.openstack.netvirt.impl.MdsalConsumerImpl.class).setRequired(true))
                 .add(createServiceDependency().setService(PipelineOrchestrator.class).setRequired(true))
                 .add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
 
@@ -192,8 +182,7 @@ public class Activator extends DependencyActivatorBase {
         manager.add(createComponent()
                 .setInterface(AbstractServiceInstance.class.getName(), props9)
                 .setImplementation(L2RewriteService.class)
-                .add(createServiceDependency().setService(OvsdbConfigurationService.class).setRequired(true))
-                .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
+                .add(createServiceDependency().setService(org.opendaylight.ovsdb.openstack.netvirt.impl.MdsalConsumerImpl.class).setRequired(true))
                 .add(createServiceDependency().setService(PipelineOrchestrator.class).setRequired(true))
                 .add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
 
@@ -202,12 +191,11 @@ public class Activator extends DependencyActivatorBase {
         props10.put(Constants.PROVIDER_NAME_PROPERTY, OF13Provider.NAME);
 
         manager.add(createComponent()
-                .setInterface(new String[] {AbstractServiceInstance.class.getName(),
+                .setInterface(new String[]{AbstractServiceInstance.class.getName(),
                                 L2ForwardingProvider.class.getName()},
                         props10)
                 .setImplementation(L2ForwardingService.class)
-                .add(createServiceDependency().setService(OvsdbConfigurationService.class).setRequired(true))
-                .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
+                .add(createServiceDependency().setService(org.opendaylight.ovsdb.openstack.netvirt.impl.MdsalConsumerImpl.class).setRequired(true))
                 .add(createServiceDependency().setService(PipelineOrchestrator.class).setRequired(true))
                 .add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
 
@@ -219,8 +207,7 @@ public class Activator extends DependencyActivatorBase {
                 .setInterface(new String[]{AbstractServiceInstance.class.getName(), EgressAclProvider.class.getName()},
                         props11)
                 .setImplementation(EgressAclService.class)
-                .add(createServiceDependency().setService(OvsdbConfigurationService.class).setRequired(true))
-                .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
+                .add(createServiceDependency().setService(org.opendaylight.ovsdb.openstack.netvirt.impl.MdsalConsumerImpl.class).setRequired(true))
                 .add(createServiceDependency().setService(PipelineOrchestrator.class).setRequired(true))
                 .add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
 
@@ -233,8 +220,7 @@ public class Activator extends DependencyActivatorBase {
                                 OutboundNatProvider.class.getName()},
                         props12)
                 .setImplementation(OutboundNatService.class)
-                .add(createServiceDependency().setService(OvsdbConfigurationService.class).setRequired(true))
-                .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
+                .add(createServiceDependency().setService(org.opendaylight.ovsdb.openstack.netvirt.impl.MdsalConsumerImpl.class).setRequired(true))
                 .add(createServiceDependency().setService(PipelineOrchestrator.class).setRequired(true))
                 .add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
     }
Open vSwitch Database Management Protocol