Remove vpn-portip-to-port after unset router GW

Issue: After router unsets external-gateway the
vpn-portip-to-port entry for router external gateway IP remains.

JIRA: NETVIRT-1313

Change-Id: Ic4b2e56f61d87469ea24fcbb3576c35d54987c8a
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 d5d440d0207ba253441b517b620c1c2b42a07fab..d375f4df92a85f4a58d28d535e3e03ad3df966eb 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
@@ -665,6 +665,17 @@ public class NeutronPortChangeListener extends AsyncDataTreeChangeListenerBase<P
                         routerIds.add(subnetMap.getRouterId());
                     }
                     internetVpnId = subnetMap.getInternetVpnId();
+
+                    if (NeutronConstants.DEVICE_OWNER_GATEWAY_INF.equals(port.getDeviceOwner())) {
+                        String routerGwIpAddress = String.valueOf(ip.getIpAddress().getValue());
+                        if (vpnId != null) {
+                            neutronvpnUtils.removeVpnPortFixedIpToPort(vpnId.getValue(), routerGwIpAddress, confTx);
+                        }
+                        if (internetVpnId != null) {
+                            neutronvpnUtils.removeVpnPortFixedIpToPort(internetVpnId.getValue(),
+                                routerGwIpAddress, confTx);
+                        }
+                    }
                 }
                 if (vpnId != null || internetVpnId != null) {
                     // remove vpn-interface for this neutron port