More elan Blueprint clean-up

[netvirt.git] / vpnservice / elanmanager / elanmanager-impl / src / main / java / org / opendaylight / netvirt / elan / cli / etree / EtreeInterfaceGet.java

diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceGet.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceGet.java
index dd6e49dc846032259c2811f7d7307b9d32f5154a..5f0358ed045ff009ffe8af11fc4d823bca758f4d 100644 (file)
--- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceGet.java
+++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceGet.java
@@ -13,9 +13,7 @@ import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.opendaylight.genius.interfacemanager.globals.InterfaceInfo;
 import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager;
-import org.opendaylight.netvirt.elan.internal.ElanServiceProvider;
 import org.opendaylight.netvirt.elan.utils.ElanCLIUtils;
-import org.opendaylight.netvirt.elan.utils.ElanUtils;
 import org.opendaylight.netvirt.elanmanager.api.IElanService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.etree.rev160614.EtreeInstance;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.etree.rev160614.EtreeInterface;
@@ -26,7 +24,7 @@ import org.slf4j.LoggerFactory;
 @Command(scope = "etreeInterface", name = "show", description = "display Etree Interfaces for the EtreeInstance")
 public class EtreeInterfaceGet extends OsgiCommandSupport {
 
-    private static final Logger logger = LoggerFactory.getLogger(EtreeInterfaceGet.class);
+    private static final Logger LOG = LoggerFactory.getLogger(EtreeInterfaceGet.class);
 
     @Argument(index = 0, name = "etreeName", description = "ETREE-NAME", required = false, multiValued = false)
     private String etreeName;
@@ -51,37 +49,37 @@ public class EtreeInterfaceGet extends OsgiCommandSupport {
     @Override
     protected Object doExecute() {
         try {
-            logger.debug("Executing Get EtreeInterface command for the corresponding Etree Instance" + "\t" + etreeName
+            LOG.debug("Executing Get EtreeInterface command for the corresponding Etree Instance" + "\t" + etreeName
                     + "\t");
             if (etreeName != null) {
                 ElanInstance elanInstance = elanProvider.getElanInstance(etreeName);
                 if (elanInstance == null || elanInstance.getAugmentation(EtreeInstance.class) == null) {
-                    System.out.println("Etree instance doesn't exist or isn't configured as etree: " + etreeName);
+                    session.getConsole().println("Etree instance doesn't exist or isn't configured as etree: " + etreeName);
                     return null;
                 }
                 List<String> elanInterfaces = elanProvider.getElanInterfaces(etreeName);
                 if (elanInterfaces == null) {
-                    System.out.println("No Etree Interfaces present for ELan Instance:" + etreeName);
+                    session.getConsole().println("No Etree Interfaces present for ELan Instance:" + etreeName);
                     return null;
                 }
-                System.out.println(getEtreeInterfaceHeaderOutput());
+                session.getConsole().println(getEtreeInterfaceHeaderOutput());
                 displayInterfaces(elanInstance, elanInterfaces);
 
             } else {
                 List<ElanInstance> elanInstances = elanProvider.getElanInstances();
                 if (!elanInstances.isEmpty()) {
-                    System.out.println(getEtreeInterfaceHeaderOutput());
+                    session.getConsole().println(getEtreeInterfaceHeaderOutput());
                     for (ElanInstance elanInstance : elanInstances) {
                         List<String> elanInterfaces =
                                 elanProvider.getElanInterfaces(elanInstance.getElanInstanceName());
                         displayInterfaces(elanInstance, elanInterfaces);
-                        System.out.println("\n");
+                        session.getConsole().println("\n");
                     }
                 }
 
             }
         } catch (Exception e) {
-            logger.error("Elan Instance failed to get {}", e);
+            LOG.error("Elan Instance failed to get {}", e);
             e.printStackTrace();
         }
         return null;
@@ -100,10 +98,9 @@ public class EtreeInterfaceGet extends OsgiCommandSupport {
         if (!interfaceList.isEmpty()) {
             for (String elanInterface : interfaceList) {
                 InterfaceInfo interfaceInfo = interfaceManager.getInterfaceInfo(elanInterface);
-                EtreeInterface etreeInterface =
-                        ElanServiceProvider.getElanutils().getEtreeInterfaceByElanInterfaceName(elanInterface);
+                EtreeInterface etreeInterface = elanProvider.getEtreeInterfaceByElanInterfaceName(elanInterface);
                 if (interfaceInfo != null) {
-                    System.out.println(String.format(ElanCLIUtils.ETREE_INTERFACE_CLI_FORMAT,
+                    session.getConsole().println(String.format(ElanCLIUtils.ETREE_INTERFACE_CLI_FORMAT,
                             elanInstance.getElanInstanceName() + "/" + elanInstance.getElanTag(),
                             elanInterface + "/" + interfaceInfo.getInterfaceTag(), interfaceInfo.getOpState(),
                             interfaceInfo.getAdminState(), etreeInterface.getEtreeInterfaceType().getName()));