commit 5ecfd1a59c23bc80f25dd4f945aef437ecdc4443
author Jian Li <pyguni@gmail.com> Mon Dec 10 11:41:03 2018 +0900
committer Jian Li <pyguni@gmail.com> Fri Dec 14 03:55:31 2018 +0000
tree 1f9819d514836cb6ae90201ae8fe4133498cdefd
parent 6f5b646aa7884e8b13568c98eae1d05eeb4407e8

Refactor: reduce to number of column for better readability at SONA

Change-Id: Ic8dd78cfc219272f98f37651f244c3564755960c

apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/cli/OpenstackNodeListCommand.java

diff --git a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/cli/OpenstackNodeListCommand.java b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/cli/OpenstackNodeListCommand.java
index a4400f7..1907140 100644
--- a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/cli/OpenstackNodeListCommand.java
+++ b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/cli/OpenstackNodeListCommand.java
@@ -28,6 +28,7 @@
 import java.util.Comparator;
 import java.util.List;
 
+import static org.onosproject.openstacknode.api.OpenstackNode.NodeType.GATEWAY;
 import static org.onosproject.openstacknode.util.OpenstackNodeUtil.getGwByComputeNode;
 import static org.onosproject.openstacknode.util.OpenstackNodeUtil.prettyJson;
 
@@ -43,15 +44,15 @@
 
     @Override
     protected void doExecute() {
-        OpenstackNodeService osNodeService = AbstractShellCommand.get(OpenstackNodeService.class);
+        OpenstackNodeService osNodeService = get(OpenstackNodeService.class);
         List<OpenstackNode> osNodes = Lists.newArrayList(osNodeService.nodes());
         osNodes.sort(Comparator.comparing(OpenstackNode::hostname));
 
         if (outputJson()) {
             print("%s", json(osNodes));
         } else {
-            print(FORMAT, "Hostname", "Type", "Integration Bridge",
-                    "Management IP", "Data IP", "VLAN Intf", "Uplink Port", "State", "SelectedGw");
+            print(FORMAT, "Hostname", "Type", "Integration Bridge", "Management IP",
+                    "Data IP", "VLAN Intf", "Uplink Port", "State", "SelectedGw");
             for (OpenstackNode osNode : osNodes) {
                 print(FORMAT,
                         osNode.hostname(),
@@ -62,7 +63,7 @@
                         osNode.vlanIntf() != null ? osNode.vlanIntf() : "",
                         osNode.uplinkPort() != null ? osNode.uplinkPort() : "",
                         osNode.state(),
-                        getGwByComputeNode(osNodeService.completeNodes(OpenstackNode.NodeType.GATEWAY), osNode));
+                        getGwByComputeNode(osNodeService.completeNodes(GATEWAY), osNode));
             }
             print("Total %s nodes", osNodeService.nodes().size());
         }