commit 2884b23489dbc3c714541706d3646f3f162c36b5
author Daniel Park <dan.mcpark84@gmail.com> Thu Mar 04 18:58:47 2021 +0900
committer Jian Li <pyguni@gmail.com> Tue Mar 09 05:57:24 2021 +0000
tree 4b70738fd0d8e2eab0bab1e5c46f4ef84aa9deee
parent da7ec1571d66602b64b526e833ce09358ca63e3a

Initial implementation of SNAT functionality.

Change-Id: I9094755c6d25a62e527976b9bf275d7c1e2a3f86
(cherry picked from commit b9a220261df1f591b75d59b646aa834c1efdb7f1)

apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/cli/KubevirtListRouterCommand.java

diff --git a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/cli/KubevirtListRouterCommand.java b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/cli/KubevirtListRouterCommand.java
index 772b841..5c59e0e 100644
--- a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/cli/KubevirtListRouterCommand.java
+++ b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/cli/KubevirtListRouterCommand.java
@@ -53,12 +53,12 @@
         routers.sort(Comparator.comparing(KubevirtRouter::name));
 
         String format = genFormatString(ImmutableList.of(CLI_NAME_LENGTH,
-                CLI_FLAG_LENGTH, CLI_IP_ADDRESSES_LENGTH, CLI_IP_ADDRESS_LENGTH));
+                CLI_FLAG_LENGTH, CLI_IP_ADDRESSES_LENGTH, CLI_IP_ADDRESS_LENGTH, CLI_NAME_LENGTH));
 
         if (outputJson()) {
             print("%s", json(routers));
         } else {
-            print(format, "Name", "SNAT", "Internal", "External");
+            print(format, "Name", "SNAT", "Internal", "External", "GatewayNode");
 
             for (KubevirtRouter router : routers) {
                 Set<String> internalCidrs = router.internal();
@@ -66,6 +66,7 @@
 
                 String internal = internalCidrs.size() == 0 ? "[]" : internalCidrs.toString();
                 String external = externalIps.size() == 0 ? "[]" : externalIps.toString();
+                String gwNode = router.electedGateway() == null ? "N/A" : router.electedGateway();
 
                 print(format, StringUtils.substring(router.name(), 0,
                         CLI_NAME_LENGTH - CLI_MARGIN_LENGTH),
@@ -74,7 +75,9 @@
                         StringUtils.substring(internal, 0,
                                 CLI_IP_ADDRESSES_LENGTH - CLI_MARGIN_LENGTH),
                         StringUtils.substring(external, 0,
-                                CLI_IP_ADDRESS_LENGTH - CLI_MARGIN_LENGTH)
+                                CLI_IP_ADDRESS_LENGTH - CLI_MARGIN_LENGTH),
+                        StringUtils.substring(gwNode, 0,
+                                CLI_NAME_LENGTH - CLI_MARGIN_LENGTH)
                 );
             }
         }