commit 0488c73c2013804efe40e98621b29792331b33ad
author Jian Li <pyguni@gmail.com> Fri Sep 14 20:53:07 2018 +0900
committer Jian Li <pyguni@gmail.com> Sat Sep 15 01:38:56 2018 +0900
tree d6f805a0cddfd4a2b7b161cb8fbbd9fffcb0c3ef
parent 8a5fb64ed8392a3a46a87517cbaef76992b94090

Fix: resolve a set of NPEs and WARNs caused by null instance port

Change-Id: I62b1c21cb9fac7d38924e85838a435737664f6c0

apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/InstancePortManager.java

diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/InstancePortManager.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/InstancePortManager.java
index 476db2b..8d346a9 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/InstancePortManager.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/InstancePortManager.java
@@ -331,6 +331,16 @@
                     }
                     break;
                 case HOST_REMOVED:
+
+                    // in case the instance port cannot be found in the store,
+                    // this indicates that the instance port was removed due to
+                    // the removal of openstack port; in some cases, openstack
+                    // port removal message arrives before ovs port removal message
+                    if (instancePortStore.instancePort(instPort.portId()) == null) {
+                        log.debug("instance port was removed before ovs port removal");
+                        break;
+                    }
+
                     // we will remove instance port from persistent store,
                     // only if we receive port removal signal from neutron.
                     // by default, we update the instance port state to INACTIVE