Remove vpn-portip-to-port entry for Floating IP

Remove vpn-portip-to-port entry for floating IP
after the Floating IP is deleted

JIRA: NETVIRT-1354

Change-Id: Ia40de16d56553f1f94a93a48f465889b00d8bb76
Signed-off-by: Vinh Nguyen <vinh.nguyen@hcl.com>

diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java
index d375f4df92a85f4a58d28d535e3e03ad3df966eb..facce142fbf80a36038cdd111466c8893e48af54 100644 (file)
--- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java
+++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java
@@ -666,14 +666,15 @@ public class NeutronPortChangeListener extends AsyncDataTreeChangeListenerBase<P
                     }
                     internetVpnId = subnetMap.getInternetVpnId();
 
-                    if (NeutronConstants.DEVICE_OWNER_GATEWAY_INF.equals(port.getDeviceOwner())) {
-                        String routerGwIpAddress = String.valueOf(ip.getIpAddress().getValue());
+                    if (NeutronConstants.DEVICE_OWNER_GATEWAY_INF.equals(port.getDeviceOwner())
+                        || NeutronConstants.DEVICE_OWNER_FLOATING_IP.equals(port.getDeviceOwner())) {
+                        String ipAddress = String.valueOf(ip.getIpAddress().getValue());
                         if (vpnId != null) {
-                            neutronvpnUtils.removeVpnPortFixedIpToPort(vpnId.getValue(), routerGwIpAddress, confTx);
+                            neutronvpnUtils.removeVpnPortFixedIpToPort(vpnId.getValue(), ipAddress, confTx);
                         }
                         if (internetVpnId != null) {
                             neutronvpnUtils.removeVpnPortFixedIpToPort(internetVpnId.getValue(),
-                                routerGwIpAddress, confTx);
+                                ipAddress, confTx);
                         }
                     }
                 }