commit f7934d53597ec280e05c3a4a22c4ab4c2d8b0cc9
author Jian Li <pyguni@gmail.com> Tue Jul 10 16:27:02 2018 +0900
committer Jian Li <pyguni@gmail.com> Tue Jul 10 20:30:27 2018 +0900
tree 006be5950a794981fa641da7f7aca73bf16d0b8b
parent 789fadba2b4b3a6d5e00607c8d5da71d2b5fdb7c

Fix: guarantee to referring to the correct openstack node state

Change-Id: I73265ba744ea5ec8e5e0e3e8f36735ae1d1ac952

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

diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingArpHandler.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingArpHandler.java
index 4e69759..fa72289 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingArpHandler.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingArpHandler.java
@@ -607,6 +607,12 @@
 
         @Override
         public boolean isRelevant(OpenstackNodeEvent event) {
+
+            // add subnet gateway to local storage in all cluster nodes
+            // TODO: need to persistent the gateway collection into eventually
+            // consistent map sooner or later
+            addAllSubnetGateways();
+
             // do not allow to proceed without leadership
             NodeId leader = leadershipService.getLeader(appId.name());
             return Objects.equals(localNodeId, leader) && event.subject().type() == COMPUTE;
@@ -619,7 +625,6 @@
                 case OPENSTACK_NODE_COMPLETE:
                     setDefaultArpRule(osNode, true);
                     setAllArpRules(osNode, true);
-                    addAllSubnetGateways();
                     break;
                 case OPENSTACK_NODE_INCOMPLETE:
                     setDefaultArpRule(osNode, false);