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/UpdateExternalPeerRouterVlanCommand.java

diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/UpdateExternalPeerRouterVlanCommand.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/UpdateExternalPeerRouterVlanCommand.java
index f53f5f5..bf6c3ae 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/UpdateExternalPeerRouterVlanCommand.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/UpdateExternalPeerRouterVlanCommand.java
@@ -33,6 +33,8 @@
 
 import java.util.List;
 
+import static org.onosproject.cli.AbstractShellCommand.get;
+
 /**
  * Updates external peer router macc address.
  */
@@ -51,13 +53,14 @@
     private String vlanId = null;
 
     private static final String FORMAT = "%-20s%-20s%-20s";
-    private static final String NO_ELEMENT = "There's no external peer router information with given ip address";
+    private static final String NO_ELEMENT =
+            "There's no external peer router information with given ip address";
     private static final String NONE = "None";
 
     @Override
     protected void doExecute() {
-        OpenstackNetworkAdminService osNetAdminService = AbstractShellCommand.get(OpenstackNetworkAdminService.class);
-        OpenstackRouterService osRouterService = AbstractShellCommand.get(OpenstackRouterService.class);
+        OpenstackNetworkAdminService osNetAdminService = get(OpenstackNetworkAdminService.class);
+        OpenstackRouterService osRouterService = get(OpenstackRouterService.class);
 
         IpAddress externalPeerIpAddress = IpAddress.valueOf(
                 IpAddress.Version.INET, Ip4Address.valueOf(ipAddress).toOctets());
@@ -93,10 +96,13 @@
 
         try {
             if (vlanId.equals(NONE)) {
-                osNetAdminService.updateExternalPeerRouterVlan(externalPeerIpAddress, VlanId.NONE);
-                osNetAdminService.deriveExternalPeerRouterMac(router.getExternalGatewayInfo(), router, VlanId.NONE);
+                osNetAdminService.updateExternalPeerRouterVlan(
+                        externalPeerIpAddress, VlanId.NONE);
+                osNetAdminService.deriveExternalPeerRouterMac(
+                        router.getExternalGatewayInfo(), router, VlanId.NONE);
             } else {
-                osNetAdminService.updateExternalPeerRouterVlan(externalPeerIpAddress, VlanId.vlanId(vlanId));
+                osNetAdminService.updateExternalPeerRouterVlan(
+                        externalPeerIpAddress, VlanId.vlanId(vlanId));
                 osNetAdminService.deriveExternalPeerRouterMac(
                         router.getExternalGatewayInfo(), router, VlanId.vlanId(vlanId));
 
@@ -106,7 +112,8 @@
         }
 
         print(FORMAT, "Router IP", "Mac Address", "VLAN ID");
-        List<ExternalPeerRouter> routers = Lists.newArrayList(osNetAdminService.externalPeerRouters());
+        List<ExternalPeerRouter> routers =
+                Lists.newArrayList(osNetAdminService.externalPeerRouters());
 
         for (ExternalPeerRouter r: routers) {
             print(FORMAT, r.ipAddress(),