Remove unused service interfaces

There are various places where dependency injection is used to get service interfaces. The ones removed in this patch were unsused. This will make it easier to implement the southbound equivalent of the services since these removed ones can be ignored.

Patch set 2: Modify unit tests verify clauses to not expect certain methods to have been called.

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

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/Activator.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/Activator.java
index fcc2436e2d14dc4a9b965c96e2a6a3c7ec68dcca..cfd5a336d96c0763f386cfdd25a551914ecd4d6c 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/Activator.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/Activator.java
@@ -90,7 +90,6 @@ public class Activator extends DependencyActivatorBase {
         manager.add(createComponent()
                 .setInterface(TenantNetworkManager.class.getName(), null)
                 .setImplementation(TenantNetworkManagerImpl.class)
-                .add(createServiceDependency().setService(NetworkingProviderManager.class))
                 .add(createServiceDependency().setService(OvsdbConfigurationService.class))
                 .add(createServiceDependency().setService(OvsdbConnectionService.class))
                 .add(createServiceDependency().setService(INeutronNetworkCRUD.class).setRequired(true))
@@ -123,11 +122,9 @@ public class Activator extends DependencyActivatorBase {
                 .setImplementation(NetworkHandler.class)
                 .add(createServiceDependency().setService(TenantNetworkManager.class).setRequired(true))
                 .add(createServiceDependency().setService(BridgeConfigurationManager.class).setRequired(true))
-                .add(createServiceDependency().setService(ConfigurationService.class).setRequired(true))
                 .add(createServiceDependency().setService(OvsdbConfigurationService.class).setRequired(true))
                 .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
                 .add(createServiceDependency().setService(INeutronNetworkCRUD.class).setRequired(true))
-                .add(createServiceDependency().setService(OvsdbInventoryListener.class).setRequired(true))
                 .add(createServiceDependency().setService(EventDispatcher.class).setRequired(true))
                 .add(createServiceDependency().setService(NeutronL3Adapter.class).setRequired(true)));
 
@@ -150,7 +147,6 @@ public class Activator extends DependencyActivatorBase {
                 .setImplementation(PortHandler.class)
                 .add(createServiceDependency().setService(OvsdbConfigurationService.class).setRequired(true))
                 .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
-                .add(createServiceDependency().setService(OvsdbInventoryListener.class).setRequired(true))
                 .add(createServiceDependency().setService(EventDispatcher.class).setRequired(true))
                 .add(createServiceDependency().setService(NeutronL3Adapter.class).setRequired(true)));
 
@@ -243,8 +239,7 @@ public class Activator extends DependencyActivatorBase {
                                 INeutronSecurityGroupAware.class.getName(), AbstractHandler.class.getName()},
                         portSecurityHandlerProperties)
                 .setImplementation(PortSecurityHandler.class)
-                .add(createServiceDependency().setService(EventDispatcher.class).setRequired(true))
-                .add(createServiceDependency().setService(SecurityServicesManager.class).setRequired(true)));
+                .add(createServiceDependency().setService(EventDispatcher.class).setRequired(true)));
 
         manager.add(createComponent()
                 .setInterface(new String[]{SecurityServicesManager.class.getName()}, null)
@@ -264,7 +259,6 @@ public class Activator extends DependencyActivatorBase {
         manager.add(createComponent()
                 .setInterface(NetworkingProviderManager.class.getName(), null)
                 .setImplementation(ProviderNetworkManagerImpl.class)
-                .add(createServiceDependency().setService(ConfigurationService.class).setRequired(true))
                 .add(createServiceDependency().setService(NetworkingProvider.class)
                         .setCallbacks("providerAdded", "providerRemoved")));
 
@@ -280,13 +274,11 @@ public class Activator extends DependencyActivatorBase {
                 .setImplementation(NeutronL3Adapter.class)
                 .add(createServiceDependency().setService(ConfigurationService.class).setRequired(true))
                 .add(createServiceDependency().setService(TenantNetworkManager.class).setRequired(true))
-                .add(createServiceDependency().setService(NetworkingProviderManager.class).setRequired(true))
                 .add(createServiceDependency().setService(OvsdbConfigurationService.class).setRequired(true))
                 .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
                 .add(createServiceDependency().setService(INeutronNetworkCRUD.class).setRequired(true))
                 .add(createServiceDependency().setService(INeutronSubnetCRUD.class).setRequired(true))
                 .add(createServiceDependency().setService(INeutronPortCRUD.class).setRequired(true))
-                .add(createServiceDependency().setService(MultiTenantAwareRouter.class).setRequired(true))
                 /* ToDo, we should probably just use the NetworkingProvider interface
                  * This should provide a way of getting service implementations
                  * Either that, or we should do service lookup at runtime based on getProvider().getName()

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandler.java
index 37afc7fc622ae6b49430c071f6524420944f8d3d..521ed27130c1a708aad35ef8f1173f0e4bef3b6c 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandler.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandler.java
@@ -16,12 +16,12 @@ import org.opendaylight.ovsdb.lib.notation.Row;
 import org.opendaylight.ovsdb.lib.notation.UUID;
 import org.opendaylight.ovsdb.openstack.netvirt.api.Action;
 import org.opendaylight.ovsdb.openstack.netvirt.api.BridgeConfigurationManager;
-import org.opendaylight.ovsdb.openstack.netvirt.api.ConfigurationService;
+//import org.opendaylight.ovsdb.openstack.netvirt.api.ConfigurationService;
 import org.opendaylight.ovsdb.openstack.netvirt.api.TenantNetworkManager;
 import org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter;
 import org.opendaylight.ovsdb.plugin.api.OvsdbConfigurationService;
 import org.opendaylight.ovsdb.plugin.api.OvsdbConnectionService;
-import org.opendaylight.ovsdb.plugin.api.OvsdbInventoryListener;
+//import org.opendaylight.ovsdb.plugin.api.OvsdbInventoryListener;
 import org.opendaylight.ovsdb.schema.openvswitch.Interface;
 import org.opendaylight.ovsdb.schema.openvswitch.Port;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
@@ -51,11 +51,11 @@ public class NetworkHandler extends AbstractHandler
     // The implementation for each of these services is resolved by the OSGi Service Manager
     private volatile TenantNetworkManager tenantNetworkManager;
     private volatile BridgeConfigurationManager bridgeConfigurationManager;
-    private volatile ConfigurationService configurationService;
+    //private volatile ConfigurationService configurationService;
     private volatile OvsdbConfigurationService ovsdbConfigurationService;
     private volatile OvsdbConnectionService connectionService;
     private volatile INeutronNetworkCRUD neutronNetworkCache;
-    private volatile OvsdbInventoryListener ovsdbInventoryListener;
+    //private volatile OvsdbInventoryListener ovsdbInventoryListener;
     private volatile NeutronL3Adapter neutronL3Adapter;
 
     /**

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortHandler.java
index b7add82762ddcae7d8b008d2ef16199716db606e..4a2e5c19939ef77907a4c80267f757513c450c64 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortHandler.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortHandler.java
@@ -45,7 +45,6 @@ public class PortHandler extends AbstractHandler
     // The implementation for each of these services is resolved by the OSGi Service Manager
     private volatile OvsdbConfigurationService ovsdbConfigurationService;
     private volatile OvsdbConnectionService connectionService;
-    private volatile OvsdbInventoryListener ovsdbInventoryListener;
     private volatile NeutronL3Adapter neutronL3Adapter;
 
     /**

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/TenantNetworkManager.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/TenantNetworkManager.java
index e22472d7d4249a504ec65dd43348240330d1ffe0..5eaf9cc338a15a4c01d44e1cf45c2e45b5cf19f5 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/TenantNetworkManager.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/TenantNetworkManager.java
@@ -62,12 +62,6 @@ public interface TenantNetworkManager {
      */
     public NeutronNetwork getTenantNetwork(Interface intf);
 
-    /**
-     * Network Created Callback
-     */
-    @Deprecated
-    public void networkCreated (String networkId);
-
     /**
      * Network Created Callback
      */

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3Adapter.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3Adapter.java
index 773eaa97d51c4d17a509651de5ba2bc9df73e9d1..c090e5653d205d972dba0058a7e3f6960300c7bd 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3Adapter.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3Adapter.java
@@ -23,8 +23,6 @@ import org.opendaylight.neutron.spi.Neutron_IPs;
 import org.opendaylight.ovsdb.lib.notation.Row;
 import org.opendaylight.ovsdb.openstack.netvirt.api.ConfigurationService;
 import org.opendaylight.ovsdb.openstack.netvirt.api.Constants;
-import org.opendaylight.ovsdb.openstack.netvirt.api.MultiTenantAwareRouter;
-import org.opendaylight.ovsdb.openstack.netvirt.api.NetworkingProviderManager;
 import org.opendaylight.ovsdb.openstack.netvirt.api.TenantNetworkManager;
 import org.opendaylight.ovsdb.plugin.api.OvsdbConfigurationService;
 import org.opendaylight.ovsdb.plugin.api.OvsdbConnectionService;
@@ -69,13 +67,11 @@ public class NeutronL3Adapter {
     // The implementation for each of these services is resolved by the OSGi Service Manager
     private volatile ConfigurationService configurationService;
     private volatile TenantNetworkManager tenantNetworkManager;
-    private volatile NetworkingProviderManager networkingProviderManager;
     private volatile OvsdbConfigurationService ovsdbConfigurationService;
     private volatile OvsdbConnectionService connectionService;
     private volatile INeutronNetworkCRUD neutronNetworkCache;
     private volatile INeutronSubnetCRUD neutronSubnetCache;
     private volatile INeutronPortCRUD neutronPortCache;
-    private volatile MultiTenantAwareRouter multiTenantAwareRouter;
     private volatile L3ForwardingProvider l3ForwardingProvider;
     private volatile InboundNatProvider inboundNatProvider;
     private volatile OutboundNatProvider outboundNatProvider;

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/ProviderNetworkManagerImpl.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/ProviderNetworkManagerImpl.java
index 4a3116d9a7a7ae38b561d13ce1fb5b08ef692d4e..5d4288ea7454aac7fd065dce9045eb07bf0e8734 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/ProviderNetworkManagerImpl.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/ProviderNetworkManagerImpl.java
@@ -28,9 +28,6 @@ import com.google.common.collect.Maps;
 public class ProviderNetworkManagerImpl implements NetworkingProviderManager {
 
     static final Logger logger = LoggerFactory.getLogger(ProviderNetworkManagerImpl.class);
-    // The provider for each of these services is resolved by the OSGi Service Manager
-    private volatile ConfigurationService configurationService;
-
     private HashMap<Long, ProviderEntry> providers = Maps.newHashMap();
     private HashMap<Node, NetworkingProvider> nodeToProviderMapping = Maps.newHashMap();
 
@@ -41,12 +38,6 @@ public class ProviderNetworkManagerImpl implements NetworkingProviderManager {
         }
 
         final String targetVersion = Constants.OPENFLOW13;
-        /*
-         * Since we have hard depedencies on OpenFlow1.3 to get any of the services supported, we are
-         * Hardcoding the Openflow13 as the only version that we are interested in
-         */
-        // final String targetVersion = configurationService.getOpenflowVersion(node);
-
         Predicate<ProviderEntry> providerEntryPredicate = new Predicate<ProviderEntry>() {
             @Override
             public boolean apply(ProviderEntry providerEntry) {

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/TenantNetworkManagerImpl.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/TenantNetworkManagerImpl.java
index 00680427a3662edf010b7e62ddb6ee57b2f29e04..37604285bcc51c302f1ce6ca24337c0b7f177336 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/TenantNetworkManagerImpl.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/TenantNetworkManagerImpl.java
@@ -36,7 +36,6 @@ public class TenantNetworkManagerImpl implements TenantNetworkManager {
     static final Logger logger = LoggerFactory.getLogger(TenantNetworkManagerImpl.class);
 
     // The implementation for each of these services is resolved by the OSGi Service Manager
-    private volatile NetworkingProviderManager networkingProviderManager;
     private volatile OvsdbConfigurationService ovsdbConfigurationService;
     private volatile OvsdbConnectionService connectionService;
     private volatile INeutronNetworkCRUD neutronNetworkCache;
@@ -90,13 +89,6 @@ public class TenantNetworkManagerImpl implements TenantNetworkManager {
             logger.debug("Tenant Network not found with Segmenation-id {}",segmentationId);
             return false;
         }
-        if (networkingProviderManager.getProvider(node).hasPerTenantTunneling()) {
-            int internalVlan = vlanConfigurationCache.getInternalVlan(node, networkId);
-            if (internalVlan == 0) {
-                logger.debug("No InternalVlan provisioned for Tenant Network {}",networkId);
-                return false;
-            }
-        }
 
         try {
             /*
@@ -173,16 +165,6 @@ public class TenantNetworkManagerImpl implements TenantNetworkManager {
         return neutronNetwork;
     }
 
-    @Override
-    public void networkCreated (String networkId) {
-        List<Node> nodes = connectionService.getNodes();
-
-        for (Node node : nodes) {
-            this.networkCreated(node, networkId);
-        }
-
-    }
-
     @Override
     public int networkCreated (Node node, String networkId) {
         return vlanConfigurationCache.assignInternalVlan(node, networkId);

diff --git a/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/TenantNetworkManagerImplTest.java b/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/TenantNetworkManagerImplTest.java
index 0b0ffb02e32ffd8a4003f6ebf048cbac4570dd3f..fe7850690a2b70084fbea2ad148b8938f3e0f9ce 100644 (file)
--- a/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/TenantNetworkManagerImplTest.java
+++ b/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/TenantNetworkManagerImplTest.java
@@ -162,10 +162,6 @@ public class TenantNetworkManagerImplTest {
         when(neutronPort.getNetworkUUID()).thenReturn("networkUUID");
 
         assertTrue("Error, did not return correct boolean for isTenantNetworkPresentInNode", tenantNetworkManagerImpl.isTenantNetworkPresentInNode(mock(Node.class), "segId"));
-
-
-        verify(networkingProviderManager, times(1)).getProvider(any(Node.class));
-        verify(vlanConfigurationCache, times(1)).getInternalVlan(any(Node.class), anyString());
     }
 
     /**
@@ -211,25 +207,4 @@ public class TenantNetworkManagerImplTest {
         verify(neutronNetworkCache, times(1)).getNetwork(anyString());
     }
 
-    /**
-     * Test method {@link TenantNetworkManagerImpl#networkCreated(String)}
-     */
-    @Test
-    public void testNetworkCreated() {
-        int numberOfNode = 10;
-        when(vlanConfigurationCache.assignInternalVlan(any(Node.class), anyString())).thenReturn(10);
-
-        List<Node> nodes = new ArrayList();
-        for (int i = 0; i<numberOfNode; i++) {
-            nodes.add(mock(Node.class));
-        }
-        when(ovsdbConnectionService.getNodes()).thenReturn(nodes);
-
-        tenantNetworkManagerImpl.networkCreated(NETWORK_ID);
-
-        verify(ovsdbConnectionService, times(1)).getNodes();
-        verify(vlanConfigurationCache, times(numberOfNode)).assignInternalVlan(any(Node.class), anyString());
-
-        assertEquals("Error, did not return the correct network id", 10,tenantNetworkManagerImpl.networkCreated(mock(Node.class), NETWORK_ID));
-    }
 }