commit 5b22f1121aa88b4ba10413a1e66ded6836252b81
author Jian Li <pyguni@gmail.com> Mon Oct 05 22:36:41 2020 +0900
committer Jian Li <pyguni@gmail.com> Sun Oct 11 01:24:40 2020 +0900
tree 33f8c3fee4bab17e4c0f18013885ce1587c65f4d
parent dd54d5657f40fbd9b2835f9776bedcaf51ff89e9

Fix: make all openstack resource name optional

Change-Id: I6f4fd34ab691701ea0d6a15eb77428c9e8f4e700

apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSubnetListCommand.java

diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSubnetListCommand.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSubnetListCommand.java
index 4a4a3c5..6fbfd5b 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSubnetListCommand.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSubnetListCommand.java
@@ -29,6 +29,7 @@
 import java.util.Comparator;
 import java.util.List;
 
+import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.deriveResourceName;
 import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.modelEntityToJson;
 import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.prettyJson;
 
@@ -46,7 +47,7 @@
     protected void doExecute() {
         OpenstackNetworkService service = get(OpenstackNetworkService.class);
         List<Subnet> subnets = Lists.newArrayList(service.subnets());
-        subnets.sort(Comparator.comparing(Subnet::getName));
+        subnets.sort(Comparator.comparing(Subnet::getId));
 
         if (outputJson()) {
             print("%s", json(subnets));
@@ -56,10 +57,10 @@
 
             for (Subnet subnet: subnets) {
                 Network osNet = service.network(subnet.getNetworkId());
-                String netName = osNet == null ? "N/A" : osNet.getName();
+                String netName = osNet == null ? "N/A" : deriveResourceName(osNet);
                 print(FORMAT,
                         subnet.getId(),
-                        subnet.getName(),
+                        deriveResourceName(subnet),
                         subnet.getCidr(),
                         subnet.getGateway(),
                         subnet.getNetworkId(),