BUG7748: Subnet-op-data empty after cluster reboot

SubnetAddToVpn notification is fired from add() of SubnetMapListener
also instead of firing from update() only.The reason for doing this is
after reboot this event comes in subnetmap add().

Change-Id: I247753ba1a52e896a4bd2ec7f96c3b5efae35055
Signed-off-by: Suraj Ranjan <suraj.ranjan@ericsson.com>

diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/SubnetmapChangeListener.java b/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/SubnetmapChangeListener.java
index 1915e2e63887a1d224713dd6096222276f0d72f0..c5e1f543f280597e2591905b4d5f8d626d6ffe18 100644 (file)
--- a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/SubnetmapChangeListener.java
+++ b/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/SubnetmapChangeListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Hewlett Packard Enterprise, Co. and others. All rights reserved.
+ * Copyright (c) 2016, 2017 Ericsson India Global Services Pvt Ltd. and others. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -64,12 +64,39 @@ public class SubnetmapChangeListener extends AsyncDataTreeChangeListenerBase<Sub
 
     @Override
     protected void add(InstanceIdentifier<Subnetmap> identifier, Subnetmap subnetmap) {
-        LOG.trace("SubnetmapChangeListener add subnetmap method - key: " + identifier + ", value=" + subnetmap);
+        LOG.trace("add:SubnetmapChangeListener add subnetmap method - key: " + identifier + ", value=" + subnetmap);
+        Uuid subnetId = subnetmap.getId();
+        Uuid vpnId = subnetmap.getVpnId();
+        if (subnetmap.getVpnId() != null) {
+            //The isExternalVpn here represents if its a BGPVPN.
+            boolean isExternalVpn = !vpnId.equals(subnetmap.getRouterId());
+            String elanInstanceName = subnetmap.getNetworkId().getValue();
+            Long elanTag = getElanTag(elanInstanceName);
+            if (elanTag.equals(0L)) {
+                LOG.error("add:Unable to fetch elantag from ElanInstance {} and hence not proceeding with "
+                        + "subnetmapListener add for subnet {}", elanInstanceName, subnetId.getValue());
+                return;
+            }
+            try {
+                // subnet added to VPN case upon config DS replay after reboot
+                // ports added to subnet upon config DS replay after reboot are handled implicitly by the above
+                // notification in SubnetRouteHandler
+                checkAndPublishSubnetAddedToVpnNotification(subnetId, subnetmap.getSubnetIp(),
+                        vpnId.getValue(), isExternalVpn, elanTag);
+                LOG.debug("add:Subnet added to VPN notification sent for subnet {} on VPN {}", subnetId
+                        .getValue(), vpnId.getValue());
+            } catch (InterruptedException e) {
+                LOG.error("add:Subnet added to VPN notification failed for subnet {} on VPN {}", subnetId
+                        .getValue(), vpnId.getValue(), e);
+            }
+            return;
+        }
     }
 
     @Override
     protected void remove(InstanceIdentifier<Subnetmap> identifier, Subnetmap subnetmap) {
-        LOG.trace("SubnetmapChangeListener remove subnetmap method - key: " + identifier + ", value" + subnetmap);
+        LOG.trace("remove:SubnetmapChangeListener remove subnetmap method - key: " + identifier + ", value"
+                + subnetmap);
     }
 
     @Override
@@ -77,7 +104,7 @@ public class SubnetmapChangeListener extends AsyncDataTreeChangeListenerBase<Sub
     @SuppressWarnings("checkstyle:IllegalCatch")
     protected void update(InstanceIdentifier<Subnetmap> identifier, Subnetmap subnetmapOriginal, Subnetmap
             subnetmapUpdate) {
-        LOG.trace("SubnetmapListener update subnetmap method - key: {}, original: {}, update: {}",
+        LOG.trace("update:SubnetmapListener update subnetmap method - key: {}, original: {}, update: {}",
                     identifier, subnetmapOriginal, subnetmapUpdate);
         Uuid vpnIdNew = subnetmapUpdate.getVpnId();
         Uuid vpnIdOld = subnetmapOriginal.getVpnId();
@@ -86,8 +113,8 @@ public class SubnetmapChangeListener extends AsyncDataTreeChangeListenerBase<Sub
         String subnetIp = subnetmapUpdate.getSubnetIp();
         Long elanTag = getElanTag(elanInstanceName);
         if (elanTag.equals(0L)) {
-            LOG.debug("Unable to fetch elantag from ElanInstance {} and hence not proceeding with subnetmapListener update" +
-                    " for subnet {}", elanInstanceName, subnetId);
+            LOG.error("update:Unable to fetch elantag from ElanInstance {} and hence not proceeding with "
+                    + "subnetmapListener update for subnet {}", elanInstanceName, subnetId.getValue());
             return;
         }
         // subnet added to VPN case
@@ -96,10 +123,10 @@ public class SubnetmapChangeListener extends AsyncDataTreeChangeListenerBase<Sub
             try {
                 checkAndPublishSubnetAddedToVpnNotification(subnetId, subnetIp, vpnIdNew.getValue(),
                         isExternalVpn, elanTag);
-                LOG.debug("Subnet added to VPN notification sent for subnet {} on VPN {}", subnetId.getValue(),
+                LOG.debug("update:Subnet added to VPN notification sent for subnet {} on VPN {}", subnetId.getValue(),
                         vpnIdNew.getValue());
             } catch (Exception e) {
-                LOG.error("Subnet added to VPN notification failed for subnet {} on VPN {}", subnetId.getValue(),
+                LOG.error("update:Subnet added to VPN notification failed for subnet {} on VPN {}", subnetId.getValue(),
                         vpnIdNew.getValue(), e);
             }
             return;
@@ -110,11 +137,11 @@ public class SubnetmapChangeListener extends AsyncDataTreeChangeListenerBase<Sub
             try {
                 checkAndPublishSubnetDeletedFromVpnNotification(subnetId, subnetIp,
                         vpnIdOld.getValue(), isExternalVpn, elanTag);
-                LOG.debug("Subnet removed from VPN notification sent for subnet {} on VPN {}", subnetId.getValue(),
-                        vpnIdOld.getValue());
-            } catch (Exception e){
-                LOG.error("Subnet removed from VPN notification failed for subnet {} on VPN {}", subnetId.getValue(),
-                        vpnIdOld.getValue(), e);
+                LOG.debug("update:Subnet removed from VPN notification sent for subnet {} on VPN {}",
+                        subnetId.getValue(), vpnIdOld.getValue());
+            } catch (Exception e) {
+                LOG.error("update:Subnet removed from VPN notification failed for subnet {} on VPN {}",
+                        subnetId.getValue(), vpnIdOld.getValue(), e);
             }
             return;
         }