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/K8sNetworkListCommand.java b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/cli/K8sNetworkListCommand.java
index 82904a6..e3562e2 100644
--- a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/cli/K8sNetworkListCommand.java
+++ b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/cli/K8sNetworkListCommand.java
@@ -17,7 +17,9 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
+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;
@@ -27,6 +29,13 @@
import java.util.Comparator;
import java.util.List;
+import static org.onosproject.k8snetworking.api.Constants.CLI_ID_LENGTH;
+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_NAME_LENGTH;
+import static org.onosproject.k8snetworking.api.Constants.CLI_SEG_ID_LENGTH;
+import static org.onosproject.k8snetworking.api.Constants.CLI_TYPE_LENGTH;
+import static org.onosproject.k8snetworking.util.K8sNetworkingUtil.genFormatString;
import static org.onosproject.k8snetworking.util.K8sNetworkingUtil.prettyJson;
/**
@@ -37,22 +46,26 @@
description = "Lists all kubernetes networks")
public class K8sNetworkListCommand extends AbstractShellCommand {
- private static final String FORMAT = "%-40s%-20s%-20s%-20s%-16s";
-
@Override
protected void doExecute() {
K8sNetworkService service = get(K8sNetworkService.class);
List<K8sNetwork> networks = Lists.newArrayList(service.networks());
networks.sort(Comparator.comparing(K8sNetwork::name));
+ String format = genFormatString(ImmutableList.of(CLI_ID_LENGTH, CLI_NAME_LENGTH,
+ CLI_TYPE_LENGTH, CLI_SEG_ID_LENGTH, CLI_IP_ADDRESS_LENGTH));
+
if (outputJson()) {
print("%s", json(networks));
} else {
- print(FORMAT, "ID", "Name", "Type", "SegId", "Gateway");
+ print(format, "ID", "Name", "Type", "SegId", "Gateway");
for (K8sNetwork net: networks) {
- print(FORMAT, net.networkId(),
- net.name(),
+ print(format,
+ StringUtils.substring(net.networkId(),
+ 0, CLI_ID_LENGTH - CLI_MARGIN_LENGTH),
+ StringUtils.substring(net.name(),
+ 0, CLI_NAME_LENGTH - CLI_MARGIN_LENGTH),
net.type().toString(),
net.segmentId(),
net.gatewayIp() == null ? "" : net.gatewayIp().toString());