Use service dependency injection rather than ServiceHelper.

This removes the need for sal.utils.

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

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/SecurityServicesImpl.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/SecurityServicesImpl.java
index 3f3c73b83e9ed8cfc20bb429c24db2553fbcb5e4..411dc550d85eb83ddffa25776dcba9e25a51ac4c 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/SecurityServicesImpl.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/SecurityServicesImpl.java
@@ -11,7 +11,6 @@ package org.opendaylight.ovsdb.openstack.netvirt.impl;
 import org.opendaylight.neutron.spi.INeutronPortCRUD;
 import org.opendaylight.neutron.spi.NeutronPort;
 import org.opendaylight.neutron.spi.NeutronSecurityGroup;
-import org.opendaylight.controller.sal.utils.ServiceHelper;
 import org.opendaylight.ovsdb.openstack.netvirt.api.Constants;
 import org.opendaylight.ovsdb.openstack.netvirt.api.SecurityServicesManager;
 
@@ -25,6 +24,7 @@ import java.util.Map;
 public class SecurityServicesImpl implements SecurityServicesManager {
 
     static final Logger logger = LoggerFactory.getLogger(TenantNetworkManagerImpl.class);
+    private volatile INeutronPortCRUD neutronPortService;
 
     public SecurityServicesImpl() {
     }
@@ -43,8 +43,6 @@ public class SecurityServicesImpl implements SecurityServicesManager {
         if (externalIds == null) return false;
         String neutronPortId = externalIds.get(Constants.EXTERNAL_ID_INTERFACE_ID);
         if (neutronPortId == null) return false;
-        INeutronPortCRUD neutronPortService = (INeutronPortCRUD) ServiceHelper.getGlobalInstance(INeutronPortCRUD.class,
-                this);
         NeutronPort neutronPort = neutronPortService.getPort(neutronPortId);
         String deviceOwner = neutronPort.getDeviceOwner();
         if (!deviceOwner.contains("compute")) {
@@ -80,8 +78,6 @@ public class SecurityServicesImpl implements SecurityServicesManager {
         if (externalIds == null) return null;
         String neutronPortId = externalIds.get(Constants.EXTERNAL_ID_INTERFACE_ID);
         if (neutronPortId == null) return null;
-        INeutronPortCRUD neutronPortService = (INeutronPortCRUD)
-                ServiceHelper.getGlobalInstance(INeutronPortCRUD.class, this);
         NeutronPort neutronPort = neutronPortService.getPort(neutronPortId);
         List<NeutronSecurityGroup> neutronSecurityGroups = neutronPort.getSecurityGroups();
         NeutronSecurityGroup neutronSecurityGroup = (NeutronSecurityGroup) neutronSecurityGroups.toArray()[0];