Remove OvsdbConfigurationService

[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 0f3772230eaa359fded5b8cf88a315a2cccd77a8..569fb01de720fb9363df5a00f90579c776fd7280 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
@@ -59,15 +59,14 @@ public class Activator extends DependencyActivatorBase {
                 .setInterface(NetworkingProvider.class.getName(), props1)
                 .setImplementation(OF13Provider.class)
                 .add(createServiceDependency().setService(ConfigurationService.class).setRequired(true))
-                .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(MdsalConsumer.class).setRequired(true))
+                //.add(createServiceDependency().setService(BridgeConfigurationManager.class).setRequired(true))
+                //.add(createServiceDependency().setService(TenantNetworkManager.class).setRequired(true)));
+                //.add(createServiceDependency().setService(SecurityServicesManager.class).setRequired(true))
+                //.add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
+                //.add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true))
                 .add(createServiceDependency().setService(ClassifierProvider.class).setRequired(true))
                 .add(createServiceDependency().setService(IngressAclProvider.class).setRequired(true))
-                .add(createServiceDependency().setService(EgressAclProvider.class).setRequired(true))
+                ////.add(createServiceDependency().setService(EgressAclProvider.class).setRequired(true))
                 .add(createServiceDependency().setService(L2ForwardingProvider.class).setRequired(true)));
 
         manager.add(createComponent()
@@ -84,10 +83,9 @@ public class Activator extends DependencyActivatorBase {
         props2.put(Constants.PROVIDER_NAME_PROPERTY, OF13Provider.NAME);
 
         manager.add(createComponent()
-                .setInterface(new String[]{AbstractServiceInstance.class.getName(), ClassifierProvider.class.getName()},
-                        props2)
+                .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(PipelineOrchestrator.class).setRequired(true))
                 .add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
@@ -100,7 +98,6 @@ 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(PipelineOrchestrator.class).setRequired(true))
                 .add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
@@ -113,7 +110,6 @@ 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(PipelineOrchestrator.class).setRequired(true))
                 .add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
@@ -126,7 +122,6 @@ 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(PipelineOrchestrator.class).setRequired(true))
                 .add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
@@ -139,7 +134,6 @@ public class Activator extends DependencyActivatorBase {
                 .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(PipelineOrchestrator.class).setRequired(true))
                 .add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
@@ -152,7 +146,6 @@ public class Activator extends DependencyActivatorBase {
                 .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(PipelineOrchestrator.class).setRequired(true))
                 .add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
@@ -165,7 +158,6 @@ public class Activator extends DependencyActivatorBase {
                 .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(PipelineOrchestrator.class).setRequired(true))
                 .add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
@@ -177,7 +169,6 @@ 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(PipelineOrchestrator.class).setRequired(true))
                 .add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
@@ -191,7 +182,6 @@ public class Activator extends DependencyActivatorBase {
                                 L2ForwardingProvider.class.getName()},
                         props10)
                 .setImplementation(L2ForwardingService.class)
-                .add(createServiceDependency().setService(OvsdbConfigurationService.class).setRequired(true))
                 .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
                 .add(createServiceDependency().setService(PipelineOrchestrator.class).setRequired(true))
                 .add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
@@ -204,7 +194,6 @@ 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(PipelineOrchestrator.class).setRequired(true))
                 .add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
@@ -215,10 +204,8 @@ public class Activator extends DependencyActivatorBase {
 
         manager.add(createComponent()
                 .setInterface(new String[]{AbstractServiceInstance.class.getName(),
-                                OutboundNatProvider.class.getName()},
-                        props12)
+                        OutboundNatProvider.class.getName()}, props12)
                 .setImplementation(OutboundNatService.class)
-                .add(createServiceDependency().setService(OvsdbConfigurationService.class).setRequired(true))
                 .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
                 .add(createServiceDependency().setService(PipelineOrchestrator.class).setRequired(true))
                 .add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));