commit 6bc29d9b8c598533537c3bced42b66657fe70cb1
author Jian Li <pyguni@gmail.com> Tue Oct 02 13:55:05 2018 +0900
committer Jian Li <pyguni@gmail.com> Tue Oct 02 17:05:37 2018 +0000
tree 843f7ef7f041a9d4599a14ad4fe443c6900269a6
parent ed5f05de6d971961c3762a11cbecbf747c3cdec0

Fix: resolve a contention problem of querying floatig IP by fixed IP

Change-Id: Iadd6f8cd4f0df9fc6dddc9fc7acf52fa549b68f5

apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/util/OpenstackNetworkingUtil.java

diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/util/OpenstackNetworkingUtil.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/util/OpenstackNetworkingUtil.java
index 65a9e9f..4f4e570 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/util/OpenstackNetworkingUtil.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/util/OpenstackNetworkingUtil.java
@@ -216,7 +216,8 @@
             if (Strings.isNullOrEmpty(fip.getFloatingIpAddress())) {
                 continue;
             }
-            if (fip.getFixedIpAddress().equals(port.ipAddress().toString())) {
+            if (fip.getFixedIpAddress().equals(port.ipAddress().toString()) &&
+                    fip.getPortId().equals(port.portId())) {
                 return fip;
             }
         }