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/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackFlowTraceCommand.java

diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackFlowTraceCommand.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackFlowTraceCommand.java
index 5829772..77eb03f 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackFlowTraceCommand.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackFlowTraceCommand.java
@@ -28,6 +28,7 @@
 
 import java.util.Optional;
 
+import static org.onosproject.cli.AbstractShellCommand.get;
 import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.sendTraceRequestToNode;
 import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.traceRequestString;
 
@@ -49,16 +50,19 @@
     @Completion(InstanceIpAddressCompleter.class)
     private String dstIp = null;
 
-    private static final String NO_ELEMENT = "There's no instance port information with given ip address";
-    private static final String FLOW_TRACE_REQUEST_STRING_UPLINK = "Flow trace request string for uplink: ";
-    private static final String FLOW_TRACE_REQUEST_STRING_DOWNLINK = "Flow trace request string for downlink: ";
+    private static final String NO_ELEMENT =
+                "There's no instance port information with given ip address";
+    private static final String FLOW_TRACE_REQUEST_STRING_UPLINK =
+                "Flow trace request string for uplink: ";
+    private static final String FLOW_TRACE_REQUEST_STRING_DOWNLINK =
+                "Flow trace request string for downlink: ";
 
 
     @Override
     protected void doExecute() {
-        OpenstackNodeAdminService osNodeService = AbstractShellCommand.get(OpenstackNodeAdminService.class);
-        InstancePortAdminService instancePortService = AbstractShellCommand.get(InstancePortAdminService.class);
-        OpenstackNetworkAdminService osNetService = AbstractShellCommand.get(OpenstackNetworkAdminService.class);
+        OpenstackNodeAdminService osNodeService = get(OpenstackNodeAdminService.class);
+        InstancePortAdminService instancePortService = get(InstancePortAdminService.class);
+        OpenstackNetworkAdminService osNetService = get(OpenstackNetworkAdminService.class);
 
         Optional<InstancePort> srcInstance = instancePortService.instancePorts().stream()
                 .filter(port -> port.ipAddress().toString().equals(srcIp)).findAny();
@@ -71,8 +75,9 @@
         OpenstackNode srcNode = osNodeService.node(srcInstance.get().deviceId());
         if (srcNode == null || srcNode.sshAuthInfo() == null) {
             log.error("Openstack node {} is null or has no SSH authentication information.\n" +
-                            " Please refers to the sample network-cfg.json in OpenstackNode app to push" +
-                            "SSH authentication information", srcNode == null ? "" : srcNode.hostname());
+                            " Please refers to the sample network-cfg.json in " +
+                            "OpenstackNode app to push SSH authentication information",
+                            srcNode == null ? "" : srcNode.hostname());
 
             return;
         }