commit abbef4a035ae18fca940c7cb334c7acd9e37287b
author Jian Li <pyguni@gmail.com> Mon Sep 14 18:52:36 2020 +0900
committer Jian Li <pyguni@gmail.com> Mon Sep 14 18:52:36 2020 +0900
tree 1d37487eb8fb502ddedabc05084779378df8f5e5
parent eab513520b198300b10a974f7ba9e993f3a92d06

Fix: resolve a NPE due to the non-existing neutron port info

Change-Id: I464f93dd6b2d08f2e652e51eb343cc7d0d3efcdb

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

diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/InstancePortListCommand.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/InstancePortListCommand.java
index 55fac6f..9455aa5 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/InstancePortListCommand.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/InstancePortListCommand.java
@@ -55,7 +55,11 @@
             for (InstancePort port : instancePorts) {
                 Port neutronPort = osNetService.port(port.portId());
 
-                print(FORMAT, port.portId(), neutronPort.getDeviceId(), port.state(),
+                String vmId = "N/A";
+                if (neutronPort != null) {
+                    vmId = neutronPort.getDeviceId();
+                }
+                print(FORMAT, port.portId(), vmId, port.state(),
                         port.deviceId().toString(), port.portNumber().toLong(),
                         port.ipAddress().toString());
             }