From b8d44834604e071f050515b96a64d8e00a09c379 Mon Sep 17 00:00:00 2001
From: Koby Aizer <koby.aizer@hpe.com>
Date: Thu, 2 Mar 2017 12:24:55 +0200
Subject: [PATCH] Bug 7888: handle update of floating ip port

In Ocata, when a floating ip port is created, its deviceId may be
set to "PENDING", and an update will follow with the deviceId later on ([1])

This is causing both an uncaught exception in NeutronPortChangeListener.add()
which assumed deviceId is always a Uuid, and also there is no creation of
FloatingIpIdToPortMapping during update().

[1] https://review.openstack.org/#/c/396013/

Change-Id: Ide44ef016f0a8c576f02dfd28d9a4ee9d492841e
Signed-off-by: Koby Aizer <koby.aizer@hpe.com>
---
 .../api/utils/NeutronConstants.java           |  1 +
 .../neutronvpn/NeutronPortChangeListener.java | 20 +++++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/vpnservice/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronConstants.java b/vpnservice/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronConstants.java
index 7a83cb0e62..5ddb61891c 100644
--- a/vpnservice/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronConstants.java
+++ b/vpnservice/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronConstants.java
@@ -12,6 +12,7 @@ public class NeutronConstants {
     public static final String DEVICE_OWNER_GATEWAY_INF = "network:router_gateway";
     public static final String DEVICE_OWNER_ROUTER_INF = "network:router_interface";
     public static final String DEVICE_OWNER_FLOATING_IP = "network:floatingip";
+    public static final String FLOATING_IP_DEVICE_ID_PENDING = "PENDING";
     public static final String PREFIX_TAP = "tap";
     public static final String PREFIX_VHOSTUSER = "vhu";
     public static final String RD_IDPOOL_NAME = "RouteDistinguisherPool";
diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java b/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java
index 55cf817fa2..1ca9890bdf 100644
--- a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java
+++ b/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java
@@ -118,14 +118,7 @@ public class NeutronPortChangeListener extends AsyncDataTreeChangeListenerBase<P
             if (NeutronConstants.DEVICE_OWNER_GATEWAY_INF.equals(input.getDeviceOwner())) {
                 handleRouterGatewayUpdated(input);
             } else if (NeutronConstants.DEVICE_OWNER_FLOATING_IP.equals(input.getDeviceOwner())) {
-
-                // populate floating-ip uuid and floating-ip port attributes (uuid, mac and subnet id for the ONLY
-                // fixed IP) to be used by NAT, depopulated in NATService once mac is retrieved in the removal path
-                addToFloatingIpPortInfo(new Uuid(input.getDeviceId()), input.getUuid(), input.getFixedIps().get(0)
-                                .getSubnetId(), input.getMacAddress().getValue());
-
-                elanService.handleKnownL3DmacAddress(input.getMacAddress().getValue(), input.getNetworkId().getValue(),
-                        NwConstants.ADD_FLOW);
+                handleFloatingIpPortUpdated(null, input);
             }
         }
         if (input.getFixedIps() != null && !input.getFixedIps().isEmpty()) {
@@ -229,6 +222,17 @@ public class NeutronPortChangeListener extends AsyncDataTreeChangeListenerBase<P
         if (NeutronConstants.DEVICE_OWNER_GATEWAY_INF.equals(update.getDeviceOwner())) {
             handleRouterGatewayUpdated(update);
         } else if (NeutronConstants.DEVICE_OWNER_FLOATING_IP.equals(update.getDeviceOwner())) {
+            handleFloatingIpPortUpdated(original, update);
+        }
+    }
+
+    private void handleFloatingIpPortUpdated(Port original, Port update) {
+        if (((original == null) || (original.getDeviceId().equals(NeutronConstants.FLOATING_IP_DEVICE_ID_PENDING)))
+            && !update.getDeviceId().equals(NeutronConstants.FLOATING_IP_DEVICE_ID_PENDING)) {
+            // populate floating-ip uuid and floating-ip port attributes (uuid, mac and subnet id for the ONLY
+            // fixed IP) to be used by NAT, depopulated in NATService once mac is retrieved in the removal path
+            addToFloatingIpPortInfo(new Uuid(update.getDeviceId()), update.getUuid(), update.getFixedIps().get(0)
+                    .getSubnetId(), update.getMacAddress().getValue());
             elanService.handleKnownL3DmacAddress(update.getMacAddress().getValue(), update.getNetworkId().getValue(),
                     NwConstants.ADD_FLOW);
         }
-- 
2.36.6