From 394007f54ed4172e6894c4e5de908b976ddb7487 Mon Sep 17 00:00:00 2001
From: xcheara <chetan.arakere@altencalsoftlabs.com>
Date: Sat, 30 Nov 2019 18:33:35 +0530
Subject: [PATCH] NAT FloatingIP CSIT Failure

Signed-off-by: xcheara <chetan.arakere@altencalsoftlabs.com>
Change-Id: I1416b8494266b9f3cc60937906107546e3bb61f6
Signed-off-by: xcheara <chetan.arakere@altencalsoftlabs.com>
---
 .../natservice/ha/SnatNodeEventListener.java  | 30 ++++--------
 .../internal/FloatingIPListener.java          | 46 ++++++++++++-------
 2 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatNodeEventListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatNodeEventListener.java
index 19d86bb5be..d9206d99d1 100644
--- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatNodeEventListener.java
+++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatNodeEventListener.java
@@ -21,7 +21,6 @@ import org.opendaylight.serviceutils.tools.mdsal.listener.AbstractClusteredAsync
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.config.rev170206.NatserviceConfig;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.Uint64;
 import org.slf4j.Logger;
@@ -35,32 +34,23 @@ import org.slf4j.LoggerFactory;
 public class SnatNodeEventListener  extends AbstractClusteredAsyncDataTreeChangeListener<Node> {
     private static final Logger LOG = LoggerFactory.getLogger(SnatNodeEventListener.class);
     private final NatSwitchCache  centralizedSwitchCache;
-    private final NatserviceConfig.NatMode natMode;
 
     @Inject
     public SnatNodeEventListener(final DataBroker dataBroker,
-            final NatSwitchCache centralizedSwitchCache,
-            final NatserviceConfig config) {
+            final NatSwitchCache centralizedSwitchCache) {
 
         super(dataBroker,new DataTreeIdentifier<>(LogicalDatastoreType.OPERATIONAL, InstanceIdentifier
                 .create(Nodes.class).child(Node.class)),
                 Executors.newSingleThreadExecutor());
         this.centralizedSwitchCache = centralizedSwitchCache;
-        if (config != null) {
-            this.natMode = config.getNatMode();
-        } else {
-            this.natMode = NatserviceConfig.NatMode.Controller;
-        }
     }
 
     @Override
     public void remove(Node dataObjectModification) {
-        if (natMode == NatserviceConfig.NatMode.Conntrack) {
-            NodeKey nodeKey = dataObjectModification.key();
-            Uint64 dpnId = MDSALUtil.getDpnIdFromNodeName(nodeKey.getId());
-            LOG.info("Dpn removed {}", dpnId);
-            centralizedSwitchCache.removeSwitch(dpnId);
-        }
+        NodeKey nodeKey = dataObjectModification.key();
+        Uint64 dpnId = MDSALUtil.getDpnIdFromNodeName(nodeKey.getId());
+        LOG.info("Dpn removed {}", dpnId);
+        centralizedSwitchCache.removeSwitch(dpnId);
     }
 
     @Override
@@ -71,11 +61,9 @@ public class SnatNodeEventListener  extends AbstractClusteredAsyncDataTreeChange
 
     @Override
     public void add(Node dataObjectModification) {
-        if (natMode == NatserviceConfig.NatMode.Conntrack) {
-            NodeKey nodeKey = dataObjectModification.key();
-            Uint64 dpnId = MDSALUtil.getDpnIdFromNodeName(nodeKey.getId());
-            LOG.info("Dpn added {}", dpnId);
-            centralizedSwitchCache.addSwitch(dpnId);
-        }
+        NodeKey nodeKey = dataObjectModification.key();
+        Uint64 dpnId = MDSALUtil.getDpnIdFromNodeName(nodeKey.getId());
+        LOG.info("Dpn added {}", dpnId);
+        centralizedSwitchCache.addSwitch(dpnId);
     }
 }
diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPListener.java
index 1d63641dc0..22a298a8ba 100644
--- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPListener.java
+++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPListener.java
@@ -373,14 +373,10 @@ public class FloatingIPListener extends AsyncDataTreeChangeListenerBase<Internal
         return rtrPort.get().getExternalNetworkId();
     }
 
-    private Uint32 getVpnId(Uuid extNwId, Uuid floatingIpExternalId) {
+    private Uuid getVpnUuid(Uuid extNwId, Uuid floatingIpExternalId) {
         Uuid subnetId = NatUtil.getFloatingIpPortSubnetIdFromFloatingIpId(dataBroker, floatingIpExternalId);
         if (subnetId != null) {
-            Uint32 vpnId = NatUtil.getVpnId(dataBroker, subnetId.getValue());
-            if (vpnId != NatConstants.INVALID_ID) {
-                LOG.debug("getVpnId : Got vpnId {} for floatingIpExternalId {}", vpnId, floatingIpExternalId);
-                return vpnId;
-            }
+            return subnetId;
         }
 
         InstanceIdentifier<Networks> nwId = InstanceIdentifier.builder(ExternalNetworks.class).child(Networks.class,
@@ -390,17 +386,21 @@ public class FloatingIPListener extends AsyncDataTreeChangeListenerBase<Internal
                         LogicalDatastoreType.CONFIGURATION, nwId);
         if (!nw.isPresent()) {
             LOG.error("getVpnId : Unable to read external network for {}", extNwId);
-            return NatConstants.INVALID_ID;
+            return null;
         }
 
         Uuid vpnUuid = nw.get().getVpnid();
         if (vpnUuid == null) {
             LOG.error("getVpnId : Unable to read vpn from External network: {}", extNwId);
-            return NatConstants.INVALID_ID;
+            return null;
         }
+        return vpnUuid;
+    }
 
+    private Uint32 getVpnId(Uuid extNwId, Uuid floatingIpExternalId) {
+        Uuid vpnUuid = getVpnUuid(extNwId, floatingIpExternalId);
         //Get the id using the VPN UUID (also vpn instance name)
-        return NatUtil.getVpnId(dataBroker, vpnUuid.getValue());
+        return vpnUuid != null ? NatUtil.getVpnId(dataBroker, vpnUuid.getValue()) : NatConstants.INVALID_ID;
     }
 
     private void processFloatingIPAdd(final InstanceIdentifier<InternalToExternalPortMap> identifier,
@@ -528,8 +528,13 @@ public class FloatingIPListener extends AsyncDataTreeChangeListenerBase<Internal
             //routerId = associatedVpnId;
         }
 
-        String vpnUuid = NatUtil.getAssociatedVPN(dataBroker, extNwId);
-        VpnInstance vpnInstance = NatUtil.getVpnIdToVpnInstance(dataBroker, vpnUuid);
+        Uuid vpnUuid = getVpnUuid(extNwId, mapping.getExternalId());
+        if (vpnUuid == null) {
+            LOG.error("createNATFlowEntries : No VPN associated with Ext nw {}. Unable to create SNAT table entry "
+                    + "for fixed ip {}", extNwId, mapping.getInternalIp());
+            return;
+        }
+        VpnInstance vpnInstance = NatUtil.getVpnIdToVpnInstance(dataBroker, vpnUuid.getValue());
         if (vpnInstance == null || vpnInstance.getVpnId() == null) {
             LOG.error("createNATFlowEntries : No VPN associated with Ext nw {}. Unable to create SNAT table entry "
                     + "for fixed ip {}", extNwId, mapping.getInternalIp());
@@ -568,8 +573,13 @@ public class FloatingIPListener extends AsyncDataTreeChangeListenerBase<Internal
             //routerId = associatedVpnId;
         }
 
-        String vpnUuid = NatUtil.getAssociatedVPN(dataBroker, externalNetworkId);
-        VpnInstance vpnInstance = NatUtil.getVpnIdToVpnInstance(dataBroker, vpnUuid);
+        Uuid vpnUuid = getVpnUuid(externalNetworkId, mapping.getExternalId());
+        if (vpnUuid == null) {
+            LOG.error("createNATFlowEntries : No VPN associated with Ext nw {}. Unable to create SNAT table entry "
+                    + "for fixed ip {}", externalNetworkId, mapping.getInternalIp());
+            return;
+        }
+        VpnInstance vpnInstance = NatUtil.getVpnIdToVpnInstance(dataBroker, vpnUuid.getValue());
         if (vpnInstance == null || vpnInstance.getVpnId() == null) {
             LOG.error("createNATFlowEntries: No VPN associated with Ext nw {}. Unable to create SNAT table entry"
                     + " for fixed ip {}",externalNetworkId, mapping.getInternalIp());
@@ -667,9 +677,13 @@ public class FloatingIPListener extends AsyncDataTreeChangeListenerBase<Internal
 
         //Delete the DNAT and SNAT table entries
         removeDNATTblEntry(dpnId, internalIp, externalIp, routerId, removeFlowInvTx);
-
-        String vpnUuid = NatUtil.getAssociatedVPN(dataBroker, extNwId);
-        VpnInstance vpnInstance = NatUtil.getVpnIdToVpnInstance(dataBroker, vpnUuid);
+        Uuid vpnUuid = getVpnUuid(extNwId, mapping.getExternalId());
+        if (vpnUuid == null) {
+            LOG.error("removeNATFlowEntries : No VPN associated with Ext nw {}. Unable to remove SNAT table entry "
+                    + "for fixed ip {}", extNwId, mapping.getInternalIp());
+            return;
+        }
+        VpnInstance vpnInstance = NatUtil.getVpnIdToVpnInstance(dataBroker, vpnUuid.getValue());
         if (vpnInstance == null || vpnInstance.getVpnId() == null) {
             LOG.error("removeNATFlowEntries: No VPN associated with Ext nw {}. Unable to create SNAT table entry "
                 + "for fixed ip {}", extNwId, mapping.getInternalIp());
-- 
2.36.6