Refactor k8s-node and k8s-networking command line interfaces
Change-Id: I1eb20ccea5238893a1c58e7faeb4c3a06accd2a9
diff --git a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/cli/K8sNamespaceListCommand.java b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/cli/K8sNamespaceListCommand.java
index 4d69082..db649aa 100644
--- a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/cli/K8sNamespaceListCommand.java
+++ b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/cli/K8sNamespaceListCommand.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.Namespace;
import io.fabric8.kubernetes.client.utils.Serialization;
+import org.apache.commons.lang.StringUtils;
import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.k8snetworking.api.K8sNamespaceService;
@@ -29,6 +31,11 @@
import java.util.Comparator;
import java.util.List;
+import static org.onosproject.k8snetworking.api.Constants.CLI_LABELS_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_PHASE_LENGTH;
+import static org.onosproject.k8snetworking.util.K8sNetworkingUtil.genFormatString;
import static org.onosproject.k8snetworking.util.K8sNetworkingUtil.prettyJson;
/**
@@ -38,28 +45,32 @@
description = "Lists all kubernetes namespaces")
public class K8sNamespaceListCommand extends AbstractShellCommand {
- private static final String FORMAT = "%-50s%-15s%-30s";
-
@Override
protected void doExecute() {
K8sNamespaceService service = get(K8sNamespaceService.class);
List<Namespace> namespaces = Lists.newArrayList(service.namespaces());
namespaces.sort(Comparator.comparing(n -> n.getMetadata().getName()));
+ String format = genFormatString(ImmutableList.of(CLI_NAME_LENGTH,
+ CLI_PHASE_LENGTH, CLI_LABELS_LENGTH));
+
if (outputJson()) {
print("%s", json(namespaces));
} else {
- print(FORMAT, "Name", "Phase", "Labels");
+ print(format, "Name", "Phase", "Labels");
for (Namespace namespace : namespaces) {
- print(FORMAT,
- namespace.getMetadata().getName(),
+ print(format,
+ StringUtils.substring(namespace.getMetadata().getName(),
+ 0, CLI_NAME_LENGTH - CLI_MARGIN_LENGTH),
namespace.getStatus().getPhase(),
namespace.getMetadata() != null &&
namespace.getMetadata().getLabels() != null &&
!namespace.getMetadata().getLabels().isEmpty() ?
- namespace.getMetadata().getLabels() : "");
+ StringUtils.substring(namespace.getMetadata()
+ .getLabels().toString(), 0,
+ CLI_LABELS_LENGTH - CLI_MARGIN_LENGTH) : "");
}
}
}