Bug9016:Using Single Transaction during NAPT SwitchOver

[netvirt.git] / vpnservice / natservice / natservice-impl / src / main / java / org / opendaylight / netvirt / natservice / internal / ExternalSubnetVpnInstanceListener.java

diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalSubnetVpnInstanceListener.java b/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalSubnetVpnInstanceListener.java
index e248c06d2a18433fd846e60ffeeec4f2963ca3ec..4b6be5229fdd41f682839c3b3a0a03e115962d8c 100644 (file)
--- a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalSubnetVpnInstanceListener.java
+++ b/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalSubnetVpnInstanceListener.java
@@ -9,31 +9,46 @@ package org.opendaylight.netvirt.natservice.internal;
 
 import com.google.common.base.Optional;
 
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.AsyncDataTreeChangeListenerBase;
 import org.opendaylight.genius.mdsalutil.NwConstants;
+import org.opendaylight.netvirt.elanmanager.api.IElanService;
+import org.opendaylight.netvirt.vpnmanager.api.IVpnManager;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.instances.ElanInstance;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.VpnInstanceToVpnId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.instance.to.vpn.id.VpnInstance;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.external.subnets.Subnets;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev150602.subnetmaps.Subnetmap;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@Singleton
 public class ExternalSubnetVpnInstanceListener extends AsyncDataTreeChangeListenerBase<VpnInstance,
     ExternalSubnetVpnInstanceListener> implements AutoCloseable {
     private static final Logger LOG = LoggerFactory.getLogger(ExternalSubnetVpnInstanceListener.class);
     private final DataBroker dataBroker;
     private final SNATDefaultRouteProgrammer snatDefaultRouteProgrammer;
+    private final IElanService elanService;
+    private final IVpnManager vpnManager;
 
+    @Inject
     public ExternalSubnetVpnInstanceListener(final DataBroker dataBroker,
-            final SNATDefaultRouteProgrammer snatDefaultRouteProgrammer) {
+            final SNATDefaultRouteProgrammer snatDefaultRouteProgrammer,
+            final IElanService elanService, final IVpnManager vpnManager) {
         this.dataBroker = dataBroker;
         this.snatDefaultRouteProgrammer = snatDefaultRouteProgrammer;
+        this.elanService = elanService;
+        this.vpnManager = vpnManager;
     }
 
     @Override
+    @PostConstruct
     public void init() {
         LOG.info("{} init", getClass().getSimpleName());
         registerListener(LogicalDatastoreType.CONFIGURATION, dataBroker);
@@ -46,39 +61,65 @@ public class ExternalSubnetVpnInstanceListener extends AsyncDataTreeChangeListen
 
     @Override
     protected void remove(InstanceIdentifier<VpnInstance> key, VpnInstance vpnInstance) {
-        LOG.trace("NAT Service : External Subnet VPN Instance remove mapping method - key:{}. value={}",
-                key, vpnInstance);
-        addOrDelDefaultFibRouteToSNATFlow(vpnInstance, NwConstants.DEL_FLOW);
+        LOG.trace("remove : External Subnet VPN Instance remove mapping method - key:{}. value={}",
+                vpnInstance.getKey(), vpnInstance);
+        String possibleExtSubnetUuid = vpnInstance.getVpnInstanceName();
+        Optional<Subnets> optionalSubnets = NatUtil.getOptionalExternalSubnets(dataBroker,
+                new Uuid(possibleExtSubnetUuid));
+        if (optionalSubnets.isPresent()) {
+            addOrDelDefaultFibRouteToSNATFlow(vpnInstance, optionalSubnets.get(), NwConstants.DEL_FLOW);
+            invokeSubnetDeletedFromVpn(possibleExtSubnetUuid);
+        }
     }
 
     @Override
     protected void update(InstanceIdentifier<VpnInstance> key, VpnInstance vpnInstanceOrig,
             VpnInstance vpnInstanceNew) {
-        LOG.trace("NAT Service : External Subnet VPN Instance update mapping method - key:{}. original={}, new={}",
-                key, vpnInstanceOrig, vpnInstanceNew);
+        LOG.trace("update : External Subnet VPN Instance update mapping method - key:{} original:{} new:{}",
+                vpnInstanceNew.getKey(), vpnInstanceOrig, vpnInstanceNew);
     }
 
     @Override
     protected void add(InstanceIdentifier<VpnInstance> key, VpnInstance vpnInstance) {
-        LOG.trace("NAT Service : External Subnet VPN Instance OP Data Entry add mapping method - key:{}. value={}",
-                key, vpnInstance);
-        addOrDelDefaultFibRouteToSNATFlow(vpnInstance, NwConstants.ADD_FLOW);
+        LOG.trace("add : External Subnet VPN Instance OP Data Entry add mapping method - key:{}. value={}",
+                vpnInstance.getKey(), vpnInstance);
+        String possibleExtSubnetUuid = vpnInstance.getVpnInstanceName();
+        Optional<Subnets> optionalSubnets = NatUtil.getOptionalExternalSubnets(dataBroker,
+                new Uuid(possibleExtSubnetUuid));
+        if (optionalSubnets.isPresent()) {
+            LOG.debug("add : VpnInstance {} for external subnet {}.", possibleExtSubnetUuid,
+                    optionalSubnets.get());
+            addOrDelDefaultFibRouteToSNATFlow(vpnInstance, optionalSubnets.get(), NwConstants.ADD_FLOW);
+            invokeSubnetAddedToVpn(possibleExtSubnetUuid);
+        }
     }
 
-    private void addOrDelDefaultFibRouteToSNATFlow(VpnInstance vpnInstance, int flowAction) {
-        String vpnInstanceName = vpnInstance.getVpnInstanceName();
-        Uuid possibleExtSubnetUuid = new Uuid(vpnInstanceName);
-        Optional<Subnets> optionalSubnets = NatUtil.getOptionalExternalSubnets(dataBroker, possibleExtSubnetUuid);
-
-        if (optionalSubnets.isPresent()) {
-            LOG.debug("NAT Service : VpnInstance {} for external subnet {}.", vpnInstanceName, optionalSubnets.get());
-            Subnets subnet = optionalSubnets.get();
-            Long vpnId = vpnInstance.getVpnId();
-            snatDefaultRouteProgrammer.addOrDelDefaultFibRouteToSNATForSubnet(subnet,
-                    subnet.getExternalNetworkId().getValue(), flowAction, vpnId);
-        } else {
-            LOG.trace("NAT Service : VpnInstance {} is not for an external subnet.", vpnInstanceName);
+    private void invokeSubnetAddedToVpn(String externalSubnetId) {
+        Uuid externalSubnetUuid = new Uuid(externalSubnetId);
+        Subnetmap subnetMap = NatUtil.getSubnetMap(dataBroker, externalSubnetUuid);
+        if (subnetMap == null) {
+            LOG.error("invokeSubnetAddedToVpn : Cannot invoke onSubnetAddedToVpn for subnet-id {} in vpn-id {}"
+                    + " due to this subnet missing in Subnetmap model", externalSubnetUuid, externalSubnetId);
+            return;
         }
+        ElanInstance elanInstance = elanService.getElanInstance(subnetMap.getNetworkId().getValue());
+        vpnManager.onSubnetAddedToVpn(subnetMap, false, elanInstance.getElanTag());
+
+    }
+
+    private void invokeSubnetDeletedFromVpn(String externalSubnetId) {
+        Uuid externalSubnetUuid = new Uuid(externalSubnetId);
+        Subnetmap subnetMap = NatUtil.getSubnetMap(dataBroker, externalSubnetUuid);
+        vpnManager.onSubnetDeletedFromVpn(subnetMap, false);
+    }
+
+    private void addOrDelDefaultFibRouteToSNATFlow(VpnInstance vpnInstance, Subnets subnet, int flowAction) {
+        String vpnInstanceName = vpnInstance.getVpnInstanceName();
+        LOG.debug("addOrDelDefaultFibRouteToSNATFlow : VpnInstance {} for external subnet {}.",
+                vpnInstanceName, subnet);
+        Long vpnId = vpnInstance.getVpnId();
+        snatDefaultRouteProgrammer.addOrDelDefaultFibRouteToSNATForSubnet(subnet,
+                subnet.getExternalNetworkId().getValue(), flowAction, vpnId);
     }
 
     @Override