More elan Blueprint clean-up

[netvirt.git] / vpnservice / elanmanager / elanmanager-impl / src / main / java / org / opendaylight / netvirt / elan / internal / ElanServiceProvider.java

diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanServiceProvider.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanServiceProvider.java
index 3e6944907355cb749350edc5a1640a2297a13f49..cb1a9978328d6e22929b9cc9065e5066768b993a 100644 (file)
--- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanServiceProvider.java
+++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanServiceProvider.java
@@ -90,10 +90,6 @@ public class ElanServiceProvider implements IElanService {
         elanInterfaceManager.setElanUtils(elanUtils);
     }
 
-    public static ElanUtils getElanutils() {
-        return ElanServiceProvider.elanUtils;
-    }
-
     public void init() {
         LOG.info("Starting ElnaServiceProvider");
         elanStatusMonitor.reportStatus("STARTING");
@@ -179,6 +175,11 @@ public class ElanServiceProvider implements IElanService {
         return isSuccess;
     }
 
+    @Override
+    public EtreeInterface getEtreeInterfaceByElanInterfaceName(String elanInterface) {
+        return ElanUtils.getEtreeInterfaceByElanInterfaceName(broker, elanInterface);
+    }
+
     public static boolean compareWithExistingElanInstance(ElanInstance existingElanInstance, long macTimeOut,
             String description) {
         boolean isEqual = false;
@@ -263,7 +264,7 @@ public class ElanServiceProvider implements IElanService {
     @Override
     public void updateElanInterface(String elanInstanceName, String interfaceName,
             List<String> updatedStaticMacAddresses, String newDescription) {
-        ElanInterface existingElanInterface = elanUtils.getElanInterfaceByElanInterfaceName(interfaceName);
+        ElanInterface existingElanInterface = ElanUtils.getElanInterfaceByElanInterfaceName(broker, interfaceName);
         if (existingElanInterface == null) {
             return;
         }
@@ -288,7 +289,7 @@ public class ElanServiceProvider implements IElanService {
 
     @Override
     public void deleteElanInterface(String elanInstanceName, String interfaceName) {
-        ElanInterface existingElanInterface = elanUtils.getElanInterfaceByElanInterfaceName(interfaceName);
+        ElanInterface existingElanInterface = ElanUtils.getElanInterfaceByElanInterfaceName(broker, interfaceName);
         if (existingElanInterface != null) {
             ElanUtils.delete(broker, LogicalDatastoreType.CONFIGURATION,
                     ElanUtils.getElanInterfaceConfigurationDataPathId(interfaceName));
@@ -298,7 +299,7 @@ public class ElanServiceProvider implements IElanService {
 
     @Override
     public void addStaticMacAddress(String elanInstanceName, String interfaceName, String macAddress) {
-        ElanInterface existingElanInterface = elanUtils.getElanInterfaceByElanInterfaceName(interfaceName);
+        ElanInterface existingElanInterface = ElanUtils.getElanInterfaceByElanInterfaceName(broker, interfaceName);
         PhysAddress updateStaticMacAddress = new PhysAddress(macAddress);
         if (existingElanInterface != null) {
             List<PhysAddress> existingMacAddress = existingElanInterface.getStaticMacEntries();
@@ -318,7 +319,7 @@ public class ElanServiceProvider implements IElanService {
     @Override
     public void deleteStaticMacAddress(String elanInstanceName, String interfaceName, String macAddress)
             throws MacNotFoundException {
-        ElanInterface existingElanInterface = elanUtils.getElanInterfaceByElanInterfaceName(interfaceName);
+        ElanInterface existingElanInterface = ElanUtils.getElanInterfaceByElanInterfaceName(broker, interfaceName);
         PhysAddress physAddress = new PhysAddress(macAddress);
         if (existingElanInterface == null) {
             return;
@@ -407,7 +408,7 @@ public class ElanServiceProvider implements IElanService {
 
     @Override
     public ElanInstance getElanInstance(String elanName) {
-        return elanUtils.getElanInstanceByName(elanName);
+        return ElanUtils.getElanInstanceByName(broker, elanName);
     }
 
     @Override
@@ -582,6 +583,11 @@ public class ElanServiceProvider implements IElanService {
         return elanUtils.isExternal(interfaceName);
     }
 
+    @Override
+    public ElanInterface getElanInterfaceByElanInterfaceName(String interfaceName) {
+        return ElanUtils.getElanInterfaceByElanInterfaceName(broker, interfaceName);
+    }
+
     /**
      * Create ietf-interfaces based on the ELAN segment type.<br>
      * For segment type flat - create transparent interface pointing to the