commit 8a5fb64ed8392a3a46a87517cbaef76992b94090
author Jian Li <pyguni@gmail.com> Fri Sep 14 15:50:04 2018 +0900
committer Jian Li <pyguni@gmail.com> Fri Sep 14 06:59:38 2018 +0000
tree fe5df7005e207a46178bc1a250ef12b982c03c9e
parent bcc422822aec2a4cceb8ea35c3f7d4eb57196759

Fix: remove the instance port only if osPort remove event is issued

Change-Id: I54c99321eef72d19c04f5849718b0165cef949de

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

diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingFloatingIpHandler.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingFloatingIpHandler.java
index f0c0550..6c3ef24 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingFloatingIpHandler.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingFloatingIpHandler.java
@@ -79,6 +79,7 @@
 import static org.onosproject.openstacknetworking.api.Constants.PRIORITY_EXTERNAL_FLOATING_ROUTING_RULE;
 import static org.onosproject.openstacknetworking.api.Constants.PRIORITY_FLOATING_EXTERNAL;
 import static org.onosproject.openstacknetworking.api.Constants.ROUTING_TABLE;
+import static org.onosproject.openstacknetworking.api.InstancePort.State.REMOVE_PENDING;
 import static org.onosproject.openstacknetworking.api.InstancePortEvent.Type.OPENSTACK_INSTANCE_MIGRATION_ENDED;
 import static org.onosproject.openstacknetworking.api.InstancePortEvent.Type.OPENSTACK_INSTANCE_MIGRATION_STARTED;
 import static org.onosproject.openstacknetworking.api.OpenstackNetworkEvent.Type.OPENSTACK_PORT_PRE_REMOVE;
@@ -869,6 +870,9 @@
                             associatedFloatingIp(instPort, osRouterAdminService.floatingIps());
 
                     if (fip != null) {
+
+                        instancePortService.updateInstancePort(instPort.updateState(REMOVE_PENDING));
+
                         eventExecutor.execute(() ->
                                 updateFipStore(instancePortService.instancePort(event.port().getId())));
                     } else {