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/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 73e9f19..f20eb51 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
@@ -90,7 +90,6 @@
 import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.swapStaleLocation;
 import static org.onosproject.openstacknetworking.util.RulePopulatorUtil.buildExtension;
 import static org.onosproject.openstacknode.api.OpenstackNode.NodeType.GATEWAY;
-import static org.openstack4j.model.network.NetworkType.FLAT;
 
 /**
  * Handles OpenStack floating IP events.
@@ -204,11 +203,11 @@
         if (install) {
             preCommitPortService.subscribePreCommit(osPort.getId(),
                     OPENSTACK_PORT_PRE_REMOVE, this.getClass().getName());
-            log.info("Subscribed the port pre-remove event");
+            log.info("Subscribed the port {} on listening pre-remove event", osPort.getId());
         } else {
             preCommitPortService.unsubscribePreCommit(osPort.getId(),
                     OPENSTACK_PORT_PRE_REMOVE, this.getClass().getName());
-            log.info("Unsubscribed the port pre-remove event");
+            log.info("Unsubscribed the port {} on listening pre-remove event", osPort.getId());
         }
 
         updateComputeNodeRules(instPort, osNet, gateway, install);
@@ -690,6 +689,12 @@
                             if (osNetworkService.port(osFip.getPortId()) != null) {
                                 disassociateFloatingIp(osFip, osFip.getPortId());
                             }
+
+                            // since we skip floating IP disassociation, we need to
+                            // manually unsubscribe the port pre-remove event
+                            preCommitPortService.unsubscribePreCommit(osFip.getPortId(),
+                                    OPENSTACK_PORT_PRE_REMOVE, this.getClass().getName());
+                            log.info("Unsubscribed the port {} on listening pre-remove event", osFip.getPortId());
                         }
                         log.info("Removed floating IP {}", osFip.getFloatingIpAddress());
                     });
@@ -945,8 +950,7 @@
         public boolean isRelevant(OpenstackNetworkEvent event) {
             // do not allow to proceed without leadership
             NodeId leader = leadershipService.getLeader(appId.name());
-            return Objects.equals(localNodeId, leader) &&
-                    event.subject().getNetworkType() != FLAT;
+            return Objects.equals(localNodeId, leader);
         }
 
         @Override