commit 40f032a9f9a92aaa850d7e0b40db35c162698f64
author Jian Li <pyguni@gmail.com> Wed Oct 02 20:36:09 2019 +0900
committer Jian Li <pyguni@gmail.com> Fri Oct 04 04:42:57 2019 +0000
tree 90395fd992a337b64cfd0e56d388b5446b9771d6
parent e39aa1cb0e8825866dc727f1b998b5c50a90d69c

Adds a CLI to show/clear cached openstack states with neutron DB

Change-Id: I270c27affc669d10236ce94ec7a546a4f85aea88

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 da378b0..4a4a3c5 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
@@ -22,13 +22,13 @@
 import org.apache.karaf.shell.api.action.lifecycle.Service;
 import org.onosproject.cli.AbstractShellCommand;
 import org.onosproject.openstacknetworking.api.OpenstackNetworkService;
+import org.openstack4j.model.network.Network;
 import org.openstack4j.model.network.Subnet;
 import org.openstack4j.openstack.networking.domain.NeutronSubnet;
 
 import java.util.Comparator;
 import java.util.List;
 
-import static org.onosproject.cli.AbstractShellCommand.get;
 import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.modelEntityToJson;
 import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.prettyJson;
 
@@ -55,13 +55,15 @@
                                                 "NetworkName", "HostRoutes");
 
             for (Subnet subnet: subnets) {
+                Network osNet = service.network(subnet.getNetworkId());
+                String netName = osNet == null ? "N/A" : osNet.getName();
                 print(FORMAT,
                         subnet.getId(),
                         subnet.getName(),
                         subnet.getCidr(),
                         subnet.getGateway(),
                         subnet.getNetworkId(),
-                        service.network(subnet.getNetworkId()).getName(),
+                        netName,
                         subnet.getHostRoutes());
             }
         }