Bulk merge of l2gw changes

[netvirt.git] / elanmanager / impl / src / main / java / org / opendaylight / netvirt / elan / l2gw / jobs / DisAssociateHwvtepFromElanJob.java

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DisAssociateHwvtepFromElanJob.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DisAssociateHwvtepFromElanJob.java
index 053b171f6d6c742251cc188b256cd1735c9c8cea..3f2be5452026373c23d6200a93a72f3751715ebe 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DisAssociateHwvtepFromElanJob.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DisAssociateHwvtepFromElanJob.java
@@ -11,10 +11,13 @@ import com.google.common.util.concurrent.ListenableFuture;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Callable;
-import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.infrautils.jobcoordinator.JobCoordinator;
 import org.opendaylight.netvirt.elan.l2gw.ha.HwvtepHAUtil;
+import org.opendaylight.netvirt.elan.l2gw.utils.ElanL2GatewayBcGroupUtils;
 import org.opendaylight.netvirt.elan.l2gw.utils.ElanL2GatewayMulticastUtils;
 import org.opendaylight.netvirt.elan.l2gw.utils.ElanL2GatewayUtils;
+import org.opendaylight.netvirt.elan.utils.ElanClusterUtils;
+import org.opendaylight.netvirt.elan.utils.Scheduler;
 import org.opendaylight.netvirt.neutronvpn.api.l2gw.L2GatewayDevice;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l2gateways.rev150712.l2gateway.attributes.Devices;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
@@ -22,51 +25,65 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
-* Created by ekvsver on 4/15/2016.
-*/
+ * Created by ekvsver on 4/15/2016.
+ */
 public class DisAssociateHwvtepFromElanJob implements Callable<List<? extends ListenableFuture<?>>> {
     private static final Logger LOG = LoggerFactory.getLogger(DisAssociateHwvtepFromElanJob.class);
 
     private final ElanL2GatewayUtils elanL2GatewayUtils;
     private final ElanL2GatewayMulticastUtils elanL2GatewayMulticastUtils;
+    private final ElanL2GatewayBcGroupUtils elanL2GatewayBcGroupUtils;
+    private final ElanClusterUtils elanClusterUtils;
+    private final Scheduler scheduler;
+    private final JobCoordinator jobCoordinator;
     private final L2GatewayDevice l2GatewayDevice;
     private final String elanName;
     private final Devices l2Device;
     private final Integer defaultVlan;
     private final boolean isLastL2GwConnDeleted;
     private final NodeId hwvtepNodeId;
+    private final String hwvtepNodeIdString;
 
     public DisAssociateHwvtepFromElanJob(ElanL2GatewayUtils elanL2GatewayUtils,
                                          ElanL2GatewayMulticastUtils elanL2GatewayMulticastUtils,
-                                         @Nullable L2GatewayDevice l2GatewayDevice, String elanName,
-                                         Devices l2Device,
-                                         Integer defaultVlan, String nodeId, boolean isLastL2GwConnDeleted) {
+                                         ElanL2GatewayBcGroupUtils elanL2GatewayBcGroupUtils,
+                                         ElanClusterUtils elanClusterUtils, Scheduler scheduler,
+                                         JobCoordinator jobCoordinator,
+                                         L2GatewayDevice l2GatewayDevice,  String elanName,
+                                         Devices l2Device, Integer defaultVlan,
+                                         String nodeId, boolean isLastL2GwConnDeleted) {
         this.elanL2GatewayUtils = elanL2GatewayUtils;
         this.elanL2GatewayMulticastUtils = elanL2GatewayMulticastUtils;
+        this.elanL2GatewayBcGroupUtils = elanL2GatewayBcGroupUtils;
+        this.elanClusterUtils = elanClusterUtils;
+        this.scheduler = scheduler;
+        this.jobCoordinator = jobCoordinator;
         this.l2GatewayDevice = l2GatewayDevice;
         this.elanName = elanName;
         this.l2Device = l2Device;
         this.defaultVlan = defaultVlan;
         this.isLastL2GwConnDeleted = isLastL2GwConnDeleted;
         this.hwvtepNodeId = new NodeId(nodeId);
-        LOG.info("created disassociate l2gw connection job for {}", elanName);
+        this.hwvtepNodeIdString = nodeId;
+        LOG.trace("created disassociate l2gw connection job for {}", elanName);
     }
 
     public String getJobKey() {
-        return elanName + HwvtepHAUtil.L2GW_JOB_KEY;
+        return hwvtepNodeIdString + HwvtepHAUtil.L2GW_JOB_KEY;
     }
 
     @Override
-    public List<ListenableFuture<?>> call() {
+    public List<ListenableFuture<?>> call() throws Exception {
         String strHwvtepNodeId = hwvtepNodeId.getValue();
-        LOG.info("running disassosiate l2gw connection job for {} {}", elanName, strHwvtepNodeId);
+        LOG.info("running disassociate l2gw connection job for elanName:{},strHwvtepNodeId:{},"
+            + "isLastL2GwConnDeleted:{}", elanName, strHwvtepNodeId, isLastL2GwConnDeleted);
 
         List<ListenableFuture<?>> futures = new ArrayList<>();
 
         // Remove remote MACs and vlan mappings from physical port
         // Once all above configurations are deleted, delete logical
         // switch
-        LOG.info("delete vlan bindings for {} {}", elanName, strHwvtepNodeId);
+        LOG.trace("delete vlan bindings for {} {}", elanName, strHwvtepNodeId);
         futures.add(elanL2GatewayUtils.deleteVlanBindingsFromL2GatewayDevice(hwvtepNodeId, l2Device, defaultVlan));
 
         if (isLastL2GwConnDeleted) {
@@ -76,24 +93,28 @@ public class DisAssociateHwvtepFromElanJob implements Callable<List<? extends Li
                         ElanL2GatewayUtils.getLogicalSwitchFromElan(elanName));
                 return futures;
             }
-            LOG.info("delete remote ucast macs {} {}", elanName, strHwvtepNodeId);
-            futures.add(elanL2GatewayUtils.deleteElanMacsFromL2GatewayDevice(hwvtepNodeId.getValue(), elanName));
+            LOG.trace("delete remote ucast macs {} {}", elanName, strHwvtepNodeId);
+            elanL2GatewayUtils.deleteElanMacsFromL2GatewayDevice(hwvtepNodeId.getValue(), elanName);
+
+            LOG.trace("delete mcast mac for {} {}", elanName, strHwvtepNodeId);
+            McastUpdateJob.removeMcastForNode(elanName, l2GatewayDevice.getHwvtepNodeId(),
+                    elanL2GatewayMulticastUtils, elanClusterUtils, scheduler, jobCoordinator);
+            elanL2GatewayBcGroupUtils.updateBcGroupForAllDpns(elanName, l2GatewayDevice, false);
+            elanL2GatewayMulticastUtils.updateMcastMacsForAllElanDevices(elanName, l2GatewayDevice, false);
 
-            LOG.info("delete mcast mac for {} {}", elanName, strHwvtepNodeId);
-            futures.addAll(elanL2GatewayMulticastUtils.handleMcastForElanL2GwDeviceDelete(this.elanName,
-                    l2GatewayDevice));
+//            futures.addAll(elanL2GatewayMulticastUtils.handleMcastForElanL2GwDeviceDelete(this.elanName,
+//                    l2GatewayDevice));
 
-            LOG.info("delete local ucast macs {} {}", elanName, strHwvtepNodeId);
+            LOG.trace("delete local ucast macs {} {}", elanName, strHwvtepNodeId);
             elanL2GatewayUtils.deleteL2GwDeviceUcastLocalMacsFromElan(l2GatewayDevice, elanName);
 
             LOG.info("scheduled delete logical switch {} {}", elanName, strHwvtepNodeId);
             elanL2GatewayUtils.scheduleDeleteLogicalSwitch(hwvtepNodeId,
                     ElanL2GatewayUtils.getLogicalSwitchFromElan(elanName));
         } else {
-            LOG.info("l2gw mcast delete not triggered for nodeId {}  with elan {}",
+            LOG.trace("l2gw mcast delete not triggered for nodeId {} with elan {}",
                     l2GatewayDevice != null ? l2GatewayDevice.getHwvtepNodeId() : null, elanName);
         }
-
         return futures;
     }
 }