commit a6f5838504bc7e9509befc7240acc45bfb87fd9f
author Jian Li <pyguni@gmail.com> Mon Dec 16 14:22:13 2019 +0900
committer Jian Li <pyguni@gmail.com> Wed Mar 04 08:45:48 2020 +0000
tree 247ac050b492ba481ece4e0b91f1f04b61c7490c
parent 516c0e3ec8139fc8c465d37df11265df11815bc3

Refactor k8s-node and k8s-networking command line interfaces

Change-Id: I1eb20ccea5238893a1c58e7faeb4c3a06accd2a9

apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/cli/K8sEndpointsListCommand.java

diff --git a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/cli/K8sEndpointsListCommand.java b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/cli/K8sEndpointsListCommand.java
index 5258c18..c866f04 100644
--- a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/cli/K8sEndpointsListCommand.java
+++ b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/cli/K8sEndpointsListCommand.java
@@ -18,9 +18,11 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import io.fabric8.kubernetes.api.model.Endpoints;
 import io.fabric8.kubernetes.client.utils.Serialization;
+import org.apache.commons.lang.StringUtils;
 import org.apache.karaf.shell.api.action.Command;
 import org.apache.karaf.shell.api.action.lifecycle.Service;
 import org.onosproject.cli.AbstractShellCommand;
@@ -30,6 +32,11 @@
 import java.util.Comparator;
 import java.util.List;
 
+import static org.onosproject.k8snetworking.api.Constants.CLI_IP_ADDRESSES_LENGTH;
+import static org.onosproject.k8snetworking.api.Constants.CLI_MARGIN_LENGTH;
+import static org.onosproject.k8snetworking.api.Constants.CLI_NAME_LENGTH;
+import static org.onosproject.k8snetworking.api.Constants.CLI_PORTS_LENGTH;
+import static org.onosproject.k8snetworking.util.K8sNetworkingUtil.genFormatString;
 import static org.onosproject.k8snetworking.util.K8sNetworkingUtil.prettyJson;
 
 /**
@@ -40,7 +47,6 @@
         description = "Lists all kubernetes endpoints")
 public class K8sEndpointsListCommand extends AbstractShellCommand {
 
-    private static final String FORMAT = "%-50s%-50s%-20s";
     private static final String PORT_PROTOCOL_SEPARATOR = "/";
 
     @Override
@@ -49,10 +55,13 @@
         List<Endpoints> endpointses = Lists.newArrayList(service.endpointses());
         endpointses.sort(Comparator.comparing(e -> e.getMetadata().getName()));
 
+        String format = genFormatString(ImmutableList.of(CLI_NAME_LENGTH,
+                CLI_IP_ADDRESSES_LENGTH, CLI_PORTS_LENGTH));
+
         if (outputJson()) {
             print("%s", json(endpointses));
         } else {
-            print(FORMAT, "Name", "IP Addresses", "Ports");
+            print(format, "Name", "IP Addresses", "Ports");
 
             for (Endpoints endpoints : endpointses) {
 
@@ -65,9 +74,11 @@
                             PORT_PROTOCOL_SEPARATOR + p.getProtocol()));
                 });
 
-                print(FORMAT,
-                        endpoints.getMetadata().getName(),
-                        ips.isEmpty() ? "" : ips,
+                print(format,
+                        StringUtils.substring(endpoints.getMetadata().getName(),
+                                0, CLI_NAME_LENGTH - CLI_MARGIN_LENGTH),
+                        ips.isEmpty() ? "" : StringUtils.substring(ips.toString(),
+                                0, CLI_IP_ADDRESSES_LENGTH - CLI_MARGIN_LENGTH),
                         portWithProtocol.isEmpty() ? "" : portWithProtocol);
             }
         }