commit da03ce9d721662631ee567d6dec1f99515ffce85
author Jian Li <pyguni@gmail.com> Tue Jul 24 21:41:53 2018 +0900
committer Jian Li <pyguni@gmail.com> Thu Jul 26 02:05:35 2018 +0000
tree e61f93538bca9eb2ac866218590f78c888c9a9c3
parent a01ef78df34450b15cc058f0e879df6654c07192

Fix: resolve a set of exceptions raised by tempest integration test

Change-Id: I7931f969d93afc28819dff31e2857cfbc6f720ac

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 9878de0..3f204fb 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
@@ -146,6 +146,13 @@
         checkArgument(!Strings.isNullOrEmpty(instancePort.portId()),
                                                     ERR_NULL_INSTANCE_PORT_ID);
 
+        // in case OpenStack removes the port prior to OVS, we will not update
+        // the instance port as it does not exist in the store
+        if (instancePortStore.instancePort(instancePort.portId()) == null) {
+            log.warn("Unable to update instance port {}, as it does not exist", instancePort.portId());
+            return;
+        }
+
         instancePortStore.updateInstancePort(instancePort);
         log.info(String.format(MSG_INSTANCE_PORT, instancePort.portId(), MSG_UPDATED));
     }