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

diff --git a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/cli/K8sIngressListCommand.java b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/cli/K8sIngressListCommand.java
index 8003e28..3f9dc28 100644
--- a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/cli/K8sIngressListCommand.java
+++ b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/cli/K8sIngressListCommand.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.extensions.Ingress;
 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_ADDRESS_LENGTH;
+import static org.onosproject.k8snetworking.api.Constants.CLI_MARGIN_LENGTH;
+import static org.onosproject.k8snetworking.api.Constants.CLI_NAMESPACE_LENGTH;
+import static org.onosproject.k8snetworking.api.Constants.CLI_NAME_LENGTH;
+import static org.onosproject.k8snetworking.util.K8sNetworkingUtil.genFormatString;
 import static org.onosproject.k8snetworking.util.K8sNetworkingUtil.prettyJson;
 
 /**
@@ -40,18 +47,19 @@
         description = "Lists all kubernetes ingresses")
 public class K8sIngressListCommand extends AbstractShellCommand {
 
-    private static final String FORMAT = "%-50s%-15s%-30s";
-
     @Override
     protected void doExecute() {
         K8sIngressService service = get(K8sIngressService.class);
         List<Ingress> ingresses = Lists.newArrayList(service.ingresses());
         ingresses.sort(Comparator.comparing(p -> p.getMetadata().getName()));
 
+        String format = genFormatString(ImmutableList.of(CLI_NAME_LENGTH,
+                CLI_NAMESPACE_LENGTH, CLI_IP_ADDRESS_LENGTH));
+
         if (outputJson()) {
             print("%s", json(ingresses));
         } else {
-            print(FORMAT, "Name", "Namespace", "LB Addresses");
+            print(format, "Name", "Namespace", "LB Addresses");
 
             for (Ingress ingress : ingresses) {
 
@@ -60,9 +68,11 @@
                 ingress.getStatus().getLoadBalancer()
                         .getIngress().forEach(i -> lbIps.add(i.getIp()));
 
-                print(FORMAT,
-                        ingress.getMetadata().getName(),
-                        ingress.getMetadata().getNamespace(),
+                print(format,
+                        StringUtils.substring(ingress.getMetadata().getName(),
+                                0, CLI_NAME_LENGTH - CLI_MARGIN_LENGTH),
+                        StringUtils.substring(ingress.getMetadata().getNamespace(),
+                                0, CLI_NAMESPACE_LENGTH - CLI_MARGIN_LENGTH),
                         lbIps.isEmpty() ? "" : lbIps);
             }
         }