From 5bb48da58acdf35b4786409b87ec9f222d2bf483 Mon Sep 17 00:00:00 2001 From: Michael Vorburger Date: Mon, 15 Aug 2016 15:02:25 +0200 Subject: [PATCH] Fix bug wherein console commands would not work with Karaf ssh session Thank You to Checkstyle for pointing these out. Please see https://wiki.opendaylight.org/view/BestPractices/Coding_Guidelines#System.out for background & details. Change-Id: I042e2679a4463fc509a5d8d9cc9065454b55e2c3 Signed-off-by: Michael Vorburger --- .../netvirt/elan/cli/ElanAdd.java | 4 ++-- .../netvirt/elan/cli/ElanDelete.java | 4 ++-- .../netvirt/elan/cli/ElanGet.java | 12 +++++----- .../netvirt/elan/cli/ElanInterfaceGet.java | 10 ++++----- .../netvirt/elan/cli/ElanMacTableGet.java | 8 +++---- .../netvirt/elan/cli/etree/EtreeAdd.java | 4 ++-- .../netvirt/elan/cli/etree/EtreeDelete.java | 4 ++-- .../netvirt/elan/cli/etree/EtreeGet.java | 12 +++++----- .../elan/cli/etree/EtreeInterfaceAdd.java | 8 +++---- .../elan/cli/etree/EtreeInterfaceDelete.java | 8 +++---- .../elan/cli/etree/EtreeInterfaceGet.java | 13 +++++------ .../elan/cli/l2gw/L2GwUtilsCacheCli.java | 22 +++++++++---------- 12 files changed, 54 insertions(+), 55 deletions(-) diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanAdd.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanAdd.java index 85a908529a..f02d3358c5 100644 --- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanAdd.java +++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanAdd.java @@ -38,10 +38,10 @@ public class ElanAdd extends OsgiCommandSupport { if(elanName.length()<= MAX_LENGTH) { boolean isSuccess = elanProvider.createElanInstance(elanName, macTimeOut, elanDescr); if (isSuccess) { - System.out.println("Elan Instance is created successfully"); + session.getConsole().println("Elan Instance is created successfully"); } } else { - System.out.println("Failed to create Elan Instance, max length is allowed 1 .. 31"); + session.getConsole().println("Failed to create Elan Instance, max length is allowed 1 .. 31"); } } catch (Exception e) { logger.error("Elan Instance failed to create {}", e); diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanDelete.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanDelete.java index c9fe8a326d..04a339f7bf 100644 --- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanDelete.java +++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanDelete.java @@ -33,9 +33,9 @@ public class ElanDelete extends OsgiCommandSupport { logger.debug("Executing the Deletion of ElanInstance command" + "\t" + elanName + "\t"); boolean isSuccess = elanProvider.deleteElanInstance(elanName); if(isSuccess) { - System.out.println("Elan Instance deleted successfully"); + session.getConsole().println("Elan Instance deleted successfully"); } else { - System.out.println("ELan Instance failed to delete"); + session.getConsole().println("ELan Instance failed to delete"); } } catch (Exception e) { logger.error("Failed to delete Elan Instance {}", e); diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanGet.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanGet.java index a48d076c1a..5fe6db3d59 100644 --- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanGet.java +++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanGet.java @@ -38,21 +38,21 @@ public class ElanGet extends OsgiCommandSupport { if(elanName != null) { ElanInstance elanInstance = elanProvider.getElanInstance(elanName); if (elanInstance == null) { - System.out.println("No Elan Instance present with name:" + elanName); + session.getConsole().println("No Elan Instance present with name:" + elanName); } else { - System.out.println(getElanHeaderOutput()); - System.out.println(String.format(ElanCLIUtils.ELAN_CLI_FORMAT, elanInstance.getElanInstanceName(), elanInstance.getMacTimeout(), elanInstance.getElanTag(), elanInstance.getDescription())); + session.getConsole().println(getElanHeaderOutput()); + session.getConsole().println(String.format(ElanCLIUtils.ELAN_CLI_FORMAT, elanInstance.getElanInstanceName(), elanInstance.getMacTimeout(), elanInstance.getElanTag(), elanInstance.getDescription())); } } else { List elanInstanceList = elanProvider.getElanInstances(); if(elanInstanceList != null && !elanInstanceList.isEmpty()) { - System.out.println(getElanHeaderOutput()); + session.getConsole().println(getElanHeaderOutput()); for(ElanInstance elanInstance : elanInstanceList) { - System.out.println(String.format(ElanCLIUtils.ELAN_CLI_FORMAT, elanInstance.getElanInstanceName(), elanInstance.getMacTimeout(), elanInstance.getElanTag(), elanInstance.getDescription())); + session.getConsole().println(String.format(ElanCLIUtils.ELAN_CLI_FORMAT, elanInstance.getElanInstanceName(), elanInstance.getMacTimeout(), elanInstance.getElanTag(), elanInstance.getDescription())); } } else { - System.out.println("No Elan Instances are present"); + session.getConsole().println("No Elan Instances are present"); } } diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceGet.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceGet.java index ac14a91326..eae2e8d141 100644 --- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceGet.java +++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceGet.java @@ -48,20 +48,20 @@ public class ElanInterfaceGet extends OsgiCommandSupport { ElanInstance elanInstance = elanProvider.getElanInstance(elanName); List elanInterfaces = elanProvider.getElanInterfaces(elanName); if (elanInterfaces == null) { - System.out.println("No Elan Interfaces present for ELan Instance:" + elanName); + session.getConsole().println("No Elan Interfaces present for ELan Instance:" + elanName); return null; } - System.out.println(getElanInterfaceHeaderOutput()); + session.getConsole().println(getElanInterfaceHeaderOutput()); displayInterfaces(elanInstance, elanInterfaces); } else { List elanInstances = elanProvider.getElanInstances(); if(!elanInstances.isEmpty()) { - System.out.println(getElanInterfaceHeaderOutput()); + session.getConsole().println(getElanInterfaceHeaderOutput()); for(ElanInstance elanInstance : elanInstances) { List elanInterfaces = elanProvider.getElanInterfaces(elanInstance.getElanInstanceName()); displayInterfaces(elanInstance, elanInterfaces); - System.out.println("\n"); + session.getConsole().println("\n"); } } @@ -87,7 +87,7 @@ public class ElanInterfaceGet extends OsgiCommandSupport { { InterfaceInfo interfaceInfo = interfaceManager.getInterfaceInfo(elanInterface); if (interfaceInfo != null) { - System.out.println(String.format(ElanCLIUtils.ELAN_INTERFACE_CLI_FORMAT, elanInstance.getElanInstanceName()+"/"+elanInstance.getElanTag(), elanInterface+"/"+interfaceInfo.getInterfaceTag(), interfaceInfo.getOpState(), interfaceInfo.getAdminState())); + session.getConsole().println(String.format(ElanCLIUtils.ELAN_INTERFACE_CLI_FORMAT, elanInstance.getElanInstanceName()+"/"+elanInstance.getElanTag(), elanInterface+"/"+interfaceInfo.getInterfaceTag(), interfaceInfo.getOpState(), interfaceInfo.getAdminState())); } } } diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableGet.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableGet.java index b4cf1f71a7..d3a299c519 100644 --- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableGet.java +++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanMacTableGet.java @@ -40,12 +40,12 @@ public class ElanMacTableGet extends OsgiCommandSupport { Collection macTables = elanProvider.getElanMacTable(elanName); if(!macTables.isEmpty()) { SimpleDateFormat formatter = new SimpleDateFormat("dd-MM-yy:HH:mm:ss"); - System.out.println(getMacTableHeaderOutput()); - System.out.println(elanName); + session.getConsole().println(getMacTableHeaderOutput()); + session.getConsole().println(elanName); for(MacEntry mac : macTables) { boolean isStatic = mac.isIsStaticAddress(); - System.out.println(String.format(ElanCLIUtils.MAC_TABLE_CLI_FORMAT, "", mac.getInterface(), mac.getMacAddress().getValue(), "")); - System.out.println(String.format(ElanCLIUtils.MAC_TABLE_CLI_FORMAT, "", isStatic, "", isStatic? "-" : formatter.format(new Date(mac.getControllerLearnedForwardingEntryTimestamp().longValue())))); + session.getConsole().println(String.format(ElanCLIUtils.MAC_TABLE_CLI_FORMAT, "", mac.getInterface(), mac.getMacAddress().getValue(), "")); + session.getConsole().println(String.format(ElanCLIUtils.MAC_TABLE_CLI_FORMAT, "", isStatic, "", isStatic? "-" : formatter.format(new Date(mac.getControllerLearnedForwardingEntryTimestamp().longValue())))); } } } catch (Exception e) { diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeAdd.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeAdd.java index 94733371ab..0141258c56 100644 --- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeAdd.java +++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeAdd.java @@ -39,10 +39,10 @@ public class EtreeAdd extends OsgiCommandSupport { if (etreeName.length() <= MAX_LENGTH) { boolean isSuccess = elanProvider.createEtreeInstance(etreeName, macTimeOut, etreeDescr); if (isSuccess) { - System.out.println("Etree Instance was created successfully"); + session.getConsole().println("Etree Instance was created successfully"); } } else { - System.out.println("Failed to create Etree Instance, max length is allowed 1 .. 31"); + session.getConsole().println("Failed to create Etree Instance, max length is allowed 1 .. 31"); } } catch (Exception e) { logger.error("Etree Instance failed to create {}", e); diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeDelete.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeDelete.java index 2b9aefdefe..790c2e548a 100644 --- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeDelete.java +++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeDelete.java @@ -33,9 +33,9 @@ public class EtreeDelete extends OsgiCommandSupport { LOG.debug("Executing the Deletion of EtreeInstance command" + "\t" + etreeName + "\t"); boolean isSuccess = elanProvider.deleteEtreeInstance(etreeName); if (isSuccess) { - System.out.println("Etree Instance deleted successfully"); + session.getConsole().println("Etree Instance deleted successfully"); } else { - System.out.println("Etree Instance failed to delete"); + session.getConsole().println("Etree Instance failed to delete"); } } catch (Exception e) { LOG.error("Failed to delete Etree Instance {}", e); diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeGet.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeGet.java index c0efc9e378..1f18b62052 100644 --- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeGet.java +++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeGet.java @@ -38,20 +38,20 @@ public class EtreeGet extends OsgiCommandSupport { if (etreeName != null) { ElanInstance elanInstance = elanProvider.getElanInstance(etreeName); if (elanInstance == null || elanInstance.getAugmentation(EtreeInstance.class) == null) { - System.out.println("No Etree Instance present with name:" + etreeName); + session.getConsole().println("No Etree Instance present with name:" + etreeName); } else { - System.out.println(getEtreeHeaderOutput()); - System.out.println(String.format(ElanCLIUtils.ETREE_CLI_FORMAT, elanInstance.getElanInstanceName(), + session.getConsole().println(getEtreeHeaderOutput()); + session.getConsole().println(String.format(ElanCLIUtils.ETREE_CLI_FORMAT, elanInstance.getElanInstanceName(), elanInstance.getMacTimeout(), elanInstance.getElanTag(), elanInstance.getDescription())); } } else { List elanInstanceList = elanProvider.getElanInstances(); if (elanInstanceList != null && !elanInstanceList.isEmpty()) { - System.out.println(getEtreeHeaderOutput()); + session.getConsole().println(getEtreeHeaderOutput()); for (ElanInstance elanInstance : elanInstanceList) { if (elanInstance.getAugmentation(EtreeInstance.class) != null) { - System.out.println(String.format(ElanCLIUtils.ETREE_CLI_FORMAT, + session.getConsole().println(String.format(ElanCLIUtils.ETREE_CLI_FORMAT, elanInstance.getElanInstanceName(), elanInstance.getMacTimeout(), elanInstance.getElanTag(), elanInstance.getAugmentation(EtreeInstance.class).getEtreeLeafTagVal().getValue(), @@ -59,7 +59,7 @@ public class EtreeGet extends OsgiCommandSupport { } } } else { - System.out.println("No Etree Instances are present"); + session.getConsole().println("No Etree Instances are present"); } } diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceAdd.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceAdd.java index 1a3aabd789..b06fd2d87f 100644 --- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceAdd.java +++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceAdd.java @@ -50,17 +50,17 @@ public class EtreeInterfaceAdd extends OsgiCommandSupport { } } if (inputType == null) { - System.out.println("interfaceType must be one of: leaf/root, but was: " + interfaceType); + session.getConsole().println("interfaceType must be one of: leaf/root, but was: " + interfaceType); return null; } ElanInstance elanInstance = elanProvider.getElanInstance(elanName); if (elanInstance == null) { - System.out.println("Etree instance " + elanName + " does not exist."); + session.getConsole().println("Etree instance " + elanName + " does not exist."); return null; } else { if (elanInstance.getAugmentation(EtreeInstance.class) == null) { - System.out.println("Etree instance " + elanName + " exists but isn't configured as Etree."); + session.getConsole().println("Etree instance " + elanName + " exists but isn't configured as Etree."); return null; } } @@ -69,7 +69,7 @@ public class EtreeInterfaceAdd extends OsgiCommandSupport { logger.debug("Executing create EtreeInterface command" + "\t" + elanName + "\t" + interfaceName + "\t" + interfaceType + "\t" + staticMacAddresses + "\t" + elanInterfaceDescr + "\t"); elanProvider.addEtreeInterface(elanName, interfaceName, inputType, staticMacAddresses, elanInterfaceDescr); - System.out.println("Created etree interface successfully"); + session.getConsole().println("Created etree interface successfully"); } catch (Exception e) { e.printStackTrace(); } diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceDelete.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceDelete.java index 67493fa1e9..eb8fdb93b0 100644 --- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceDelete.java +++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceDelete.java @@ -11,7 +11,6 @@ import org.apache.karaf.shell.commands.Argument; import org.apache.karaf.shell.commands.Command; import org.apache.karaf.shell.console.OsgiCommandSupport; import org.opendaylight.netvirt.elan.internal.ElanServiceProvider; -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.EtreeInterface; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.interfaces.ElanInterface; @@ -44,13 +43,14 @@ public class EtreeInterfaceDelete extends OsgiCommandSupport { ElanInterface existingInterface = ElanServiceProvider.getElanutils().getElanInterfaceByElanInterfaceName(interfaceName); if (existingInterface == null || existingInterface.getAugmentation(EtreeInterface.class) == null) { - System.out.println("Etree interface doesn't exist or isn't configured as etree: " + interfaceName); + session.getConsole() + .println("Etree interface doesn't exist or isn't configured as etree: " + interfaceName); } elanProvider.deleteEtreeInterface(etreeName, interfaceName); - System.out.println("Deleted the Etree interface succesfully"); + session.getConsole().println("Deleted the Etree interface succesfully"); } catch (Exception e) { e.printStackTrace(); } return null; } -} \ No newline at end of file +} 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 dd6e49dc84..301cc8f57f 100644 --- 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 @@ -15,7 +15,6 @@ 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; @@ -56,26 +55,26 @@ public class EtreeInterfaceGet extends OsgiCommandSupport { 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 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 elanInstances = elanProvider.getElanInstances(); if (!elanInstances.isEmpty()) { - System.out.println(getEtreeInterfaceHeaderOutput()); + session.getConsole().println(getEtreeInterfaceHeaderOutput()); for (ElanInstance elanInstance : elanInstances) { List elanInterfaces = elanProvider.getElanInterfaces(elanInstance.getElanInstanceName()); displayInterfaces(elanInstance, elanInterfaces); - System.out.println("\n"); + session.getConsole().println("\n"); } } @@ -103,7 +102,7 @@ public class EtreeInterfaceGet extends OsgiCommandSupport { EtreeInterface etreeInterface = ElanServiceProvider.getElanutils().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())); diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwUtilsCacheCli.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwUtilsCacheCli.java index 9a8be7c311..0891e8d774 100644 --- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwUtilsCacheCli.java +++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwUtilsCacheCli.java @@ -38,9 +38,9 @@ public class L2GwUtilsCacheCli extends OsgiCommandSupport { protected Object doExecute() { try { if (cacheName == null) { - System.out.println("Available caches"); - System.out.println(ElanL2GwCacheUtils.L2GATEWAY_CONN_CACHE_NAME); - System.out.println(L2GatewayCacheUtils.L2GATEWAY_CACHE_NAME); + session.getConsole().println("Available caches"); + session.getConsole().println(ElanL2GwCacheUtils.L2GATEWAY_CONN_CACHE_NAME); + session.getConsole().println(L2GatewayCacheUtils.L2GATEWAY_CACHE_NAME); return null; } switch (cacheName) { @@ -61,11 +61,11 @@ public class L2GwUtilsCacheCli extends OsgiCommandSupport { ConcurrentMap devices = (ConcurrentMap) CacheUtil .getCache(L2GatewayCacheUtils.L2GATEWAY_CACHE_NAME); if (devices == null) { - System.out.println("no devices are present in cache"); + session.getConsole().println("no devices are present in cache"); return; } for (String deviceName : devices.keySet()) { - System.out.println("device "+ devices.get(deviceName)); + session.getConsole().println("device "+ devices.get(deviceName)); } } @@ -75,12 +75,12 @@ public class L2GwUtilsCacheCli extends OsgiCommandSupport { (ConcurrentMap>) CacheUtil.getCache( cacheName); if (cache == null) { - System.out.println("no devices are present in elan cache"); + session.getConsole().println("no devices are present in elan cache"); } for (String elan : cache.keySet()) { print(elan, cache.get(elan)); - System.out.println(DEMARCATION); - System.out.println(DEMARCATION); + session.getConsole().println(DEMARCATION); + session.getConsole().println(DEMARCATION); } return; } @@ -91,10 +91,10 @@ public class L2GwUtilsCacheCli extends OsgiCommandSupport { private void print(String elan, ConcurrentMap devices) { - System.out.println("Elan name : "+elan); - System.out.println("No of devices in elan "+devices.keySet().size()); + session.getConsole().println("Elan name : "+elan); + session.getConsole().println("No of devices in elan "+devices.keySet().size()); for (String deviceName : devices.keySet()) { - System.out.println("device "+ devices.get(deviceName)); + session.getConsole().println("device "+ devices.get(deviceName)); } } } -- 2.36.6