Using MD-SAL .exists() API

[ovsdb.git] / hwvtepsouthbound / hwvtepsouthbound-impl / src / main / java / org / opendaylight / ovsdb / hwvtepsouthbound / transact / McastMacsRemoteRemoveCommand.java

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsRemoteRemoveCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsRemoteRemoveCommand.java
index 29558f2b1b908192222562e4cedb25c693f71e27..bf162ea45812733fbff5b2a9439467e0f1919561 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsRemoteRemoveCommand.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsRemoteRemoveCommand.java
@@ -15,7 +15,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Objects;
-import org.opendaylight.controller.md.sal.binding.api.DataTreeModification;
+import org.opendaylight.mdsal.binding.api.DataTreeModification;
 import org.opendaylight.ovsdb.hwvtepsouthbound.HwvtepDeviceInfo;
 import org.opendaylight.ovsdb.hwvtepsouthbound.HwvtepSouthboundUtil;
 import org.opendaylight.ovsdb.lib.notation.UUID;
@@ -23,14 +23,15 @@ import org.opendaylight.ovsdb.lib.operations.TransactionBuilder;
 import org.opendaylight.ovsdb.schema.hardwarevtep.McastMacsRemote;
 import org.opendaylight.ovsdb.utils.mdsal.utils.TransactionType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.LogicalSwitches;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.RemoteMcastMacs;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.RemoteMcastMacsKey;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class McastMacsRemoteRemoveCommand extends AbstractTransactCommand<RemoteMcastMacs, HwvtepGlobalAugmentation> {
+public class McastMacsRemoteRemoveCommand
+        extends AbstractTransactCommand<RemoteMcastMacs, RemoteMcastMacsKey, HwvtepGlobalAugmentation> {
     private static final Logger LOG = LoggerFactory.getLogger(McastMacsRemoteRemoveCommand.class);
 
     public McastMacsRemoteRemoveCommand(final HwvtepOperationalState state,
@@ -92,28 +93,49 @@ public class McastMacsRemoteRemoveCommand extends AbstractTransactCommand<Remote
                                     final RemoteMcastMacs mac,
                                     final InstanceIdentifier macIid,
                                     final Object... extraData) {
-        LOG.debug("Removing remoteMcastMacs, mac address: {}", mac.getMacEntryKey().getValue());
-        HwvtepDeviceInfo.DeviceData operationalMacOptional =
-                getDeviceInfo().getDeviceOperData(RemoteMcastMacs.class, macIid);
+        String nodeId = instanceIdentifier.firstKeyOf(Node.class).getNodeId().getValue();
+        clearConfigData(RemoteMcastMacs.class, macIid);
+        long transactionId = getOperationalState().getTransactionId();
+        LOG.debug("Remove received for RemoteMcastMacs key: {} txId: {}", macIid, transactionId);
+        HwvtepDeviceInfo.DeviceData deviceData = getDeviceOpData(RemoteMcastMacs.class, macIid);
         McastMacsRemote mcastMacsRemote = transaction.getTypedRowSchema(McastMacsRemote.class);
-        if (operationalMacOptional != null && operationalMacOptional.getUuid() != null) {
-            //when mac entry is deleted, its referenced locator set and locators are deleted automatically.
-            //TODO: locator in config DS is not deleted
-            UUID macEntryUUID = operationalMacOptional.getUuid();
-            mcastMacsRemote.getUuidColumn().setData(macEntryUUID);
-            transaction.add(op.delete(mcastMacsRemote.getSchema())
-                    .where(mcastMacsRemote.getUuidColumn().getSchema().opEqual(macEntryUUID)).build());
-            transaction.add(op.comment("McastMacRemote: Deleting " + mac.getMacEntryKey().getValue()));
-            updateCurrentTxDeleteData(RemoteMcastMacs.class, macIid, mac);
-            updateControllerTxHistory(TransactionType.DELETE, mcastMacsRemote);
-        } else {
-            LOG.warn("Unable to delete remoteMcastMacs {} because it was not found in the operational store",
-                    mac.getMacEntryKey().getValue());
+        boolean deleted = false;
+        if (deviceData != null && deviceData.getData() != null && deviceData.getData() instanceof McastMacsRemote
+                && ((McastMacsRemote)deviceData.getData()).getLogicalSwitchColumn() != null) {
+            UUID logicalSwitchUid = ((McastMacsRemote)deviceData.getData()).getLogicalSwitchColumn().getData();
+            if (logicalSwitchUid != null) {
+                transaction.add(op.delete(mcastMacsRemote.getSchema())
+                        .where(mcastMacsRemote.getLogicalSwitchColumn().getSchema().opEqual(logicalSwitchUid)).build());
+                deleted = true;
+                updateCurrentTxDeleteData(RemoteMcastMacs.class, macIid, mac);
+                updateControllerTxHistory(TransactionType.DELETE, new StringBuilder(mcastMacsRemote.toString())
+                        .append(":  LS: ").append(logicalSwitchUid));
+                LOG.info("CONTROLLER - {} {} LS:{} Node:{}", TransactionType.DELETE,
+                    mcastMacsRemote, logicalSwitchUid, nodeId);
+
+            }
+        }
+        if (!deleted && deviceData != null) {
+            UUID macEntryUUID = deviceData.getUuid();
+            if (macEntryUUID != null) {
+                mcastMacsRemote.getUuidColumn().setData(macEntryUUID);
+                updateCurrentTxDeleteData(RemoteMcastMacs.class, macIid, mac);
+                transaction.add(op.delete(mcastMacsRemote.getSchema())
+                        .where(mcastMacsRemote.getUuidColumn().getSchema().opEqual(macEntryUUID)).build());
+                updateControllerTxHistory(TransactionType.DELETE, new StringBuilder(mcastMacsRemote.toString())
+                        .append(":  Mac : ").append(macEntryUUID));
+                LOG.info("CONTROLLER - {} {} Mac :{} Node:{}", TransactionType.DELETE,
+                    mcastMacsRemote, macEntryUUID, nodeId);
+            } else {
+                LOG.error("Failed to delete remote mcast entry as it is not found in device {}", macIid);
+                getDeviceInfo().clearConfigData(RemoteMcastMacs.class, macIid);
+                return;
+            }
         }
     }
 
     @Override
-    protected List<RemoteMcastMacs> getData(final HwvtepGlobalAugmentation augmentation) {
+    protected Map<RemoteMcastMacsKey, RemoteMcastMacs> getData(final HwvtepGlobalAugmentation augmentation) {
         return augmentation.getRemoteMcastMacs();
     }
 
@@ -127,15 +149,4 @@ public class McastMacsRemoteRemoveCommand extends AbstractTransactCommand<Remote
         return true;
     }
 
-
-    @Override
-    public void onCommandSucceeded() {
-        //remove the refcounts of the deleted macs
-        for (MdsalUpdate mdsalUpdate : updates.get(getDeviceTransaction())) {
-            RemoteMcastMacs deletedMac = (RemoteMcastMacs) mdsalUpdate.getNewData();
-            InstanceIdentifier<RemoteMcastMacs> macIid = mdsalUpdate.getKey();
-            getDeviceInfo().removeRemoteMcast(
-                    (InstanceIdentifier<LogicalSwitches>) deletedMac.getLogicalSwitchRef().getValue(), macIid);
-        }
-    }
 }