From 1c48d4d9765a0fabc1abce8e90ab263580a40870 Mon Sep 17 00:00:00 2001
From: "K.V Suneelu Verma" <k.v.suneelu.verma@ericsson.com>
Date: Mon, 17 Apr 2017 16:55:13 +0530
Subject: [PATCH] bug 8257 handling back to back mcast mac updates

Making the remove mcast mac participate in depenency resolution
flow.

Put the delete event on hold while the previous add/update on
the same key is still in transit.

Delete mcast mac event resumes after we receive the
 response for the previous create.

Mark the state of the mcast mac key in transit while we execute its delete/add/update.

Change-Id: I0b15d82dad346bd2c35c0368b4d7f63dc3bfa09d
Signed-off-by: K.V Suneelu Verma <k.v.suneelu.verma@ericsson.com>
---
 .../transact/AbstractTransactCommand.java     | 23 +++++++-----
 .../transact/LogicalSwitchRemoveCommand.java  |  5 +++
 .../transact/McastMacsLocalRemoveCommand.java |  5 +++
 .../McastMacsRemoteRemoveCommand.java         | 36 +++++++++++++++----
 .../McastMacsRemoteUpdateCommand.java         |  1 +
 .../transact/UcastMacsLocalRemoveCommand.java |  5 +++
 .../UcastMacsRemoteRemoveCommand.java         |  4 +++
 7 files changed, 65 insertions(+), 14 deletions(-)

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/AbstractTransactCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/AbstractTransactCommand.java
index 2688a2000..32c07889f 100644
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/AbstractTransactCommand.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/AbstractTransactCommand.java
@@ -62,21 +62,25 @@ public abstract class AbstractTransactCommand<T extends Identifiable, Aug extend
 
     void updateCurrentTxData(Class<? extends Identifiable> cls, InstanceIdentifier key, UUID uuid, Object data) {
         operationalState.updateCurrentTxData(cls, key, uuid);
-        operationalState.getDeviceInfo().markKeyAsInTransit(cls, key);
         operationalState.getDeviceInfo().updateConfigData(cls, key, data);
     }
 
-    void processDependencies(UnMetDependencyGetter<T> unMetDependencyGetter,
-                             TransactionBuilder transaction,
+    void processDependencies(final UnMetDependencyGetter<T> unMetDependencyGetter,
+                             final TransactionBuilder transaction,
                              final InstanceIdentifier<Node> nodeIid,
                              final InstanceIdentifier key,
                              final T data, final Object... extraData) {
 
         HwvtepDeviceInfo deviceInfo = operationalState.getDeviceInfo();
-        Map inTransitDependencies = unMetDependencyGetter.getInTransitDependencies(operationalState, data);
-        Map confingDependencies = unMetDependencyGetter.getUnMetConfigDependencies(operationalState, data);
-        //we can skip the config termination point dependency as we can create them in device as part of this tx
-        confingDependencies.remove(TerminationPoint.class);
+        Map inTransitDependencies = Collections.EMPTY_MAP;
+        Map confingDependencies = Collections.EMPTY_MAP;
+
+        if (!isRemoveCommand() && unMetDependencyGetter != null) {
+            inTransitDependencies = unMetDependencyGetter.getInTransitDependencies(operationalState, data);
+            confingDependencies = unMetDependencyGetter.getUnMetConfigDependencies(operationalState, data);
+            //we can skip the config termination point dependency as we can create them in device as part of this tx
+            confingDependencies.remove(TerminationPoint.class);
+        }
 
         Type type = getClass().getGenericSuperclass();
         Type classType = ((ParameterizedType)type).getActualTypeArguments()[0];
@@ -88,7 +92,6 @@ public abstract class AbstractTransactCommand<T extends Identifiable, Aug extend
 
         if (HwvtepSouthboundUtil.isEmptyMap(confingDependencies) && HwvtepSouthboundUtil.isEmptyMap(inTransitDependencies)) {
             doDeviceTransaction(transaction, nodeIid, data, key, extraData);
-            //TODO put proper uuid
             updateCurrentTxData((Class<? extends Identifiable>) classType, key, new UUID("uuid"), data);
         }
         if (!HwvtepSouthboundUtil.isEmptyMap(confingDependencies)) {
@@ -299,4 +302,8 @@ public abstract class AbstractTransactCommand<T extends Identifiable, Aug extend
     protected boolean cascadeDelete() {
         return false;
     }
+
+    protected boolean isRemoveCommand() {
+        return false;
+    }
 }
diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/LogicalSwitchRemoveCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/LogicalSwitchRemoveCommand.java
index 0dadf6792..48abea148 100644
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/LogicalSwitchRemoveCommand.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/LogicalSwitchRemoveCommand.java
@@ -104,4 +104,9 @@ public class LogicalSwitchRemoveCommand extends AbstractTransactCommand<LogicalS
     protected boolean areEqual(LogicalSwitches a , LogicalSwitches b) {
         return a.getKey().equals(b.getKey()) && Objects.equals(a.getTunnelKey(), b.getTunnelKey());
     }
+
+    @Override
+    protected boolean isRemoveCommand() {
+        return true;
+    }
 }
diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsLocalRemoveCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsLocalRemoveCommand.java
index fc10a3b56..63e1603cd 100644
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsLocalRemoveCommand.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsLocalRemoveCommand.java
@@ -100,4 +100,9 @@ public class McastMacsLocalRemoveCommand extends AbstractTransactCommand<LocalMc
             return Collections.emptyList();
         }
     }
+
+    @Override
+    protected boolean isRemoveCommand() {
+        return true;
+    }
 }
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 95814f617..8aeff6a79 100644
--- 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
@@ -70,9 +70,30 @@ public class McastMacsRemoteRemoveCommand extends AbstractTransactCommand<Remote
         }
     }
 
-    private void removeMcastMacRemote(TransactionBuilder transaction,
-            InstanceIdentifier<Node> instanceIdentifier, List<RemoteMcastMacs> macList) {
-        for (RemoteMcastMacs mac: macList) {
+    private void removeMcastMacRemote(final TransactionBuilder transaction,
+                                      final InstanceIdentifier<Node> nodeIid, final List<RemoteMcastMacs> macList) {
+        for (RemoteMcastMacs mac : macList) {
+            InstanceIdentifier<RemoteMcastMacs> macKey = nodeIid.augmentation(HwvtepGlobalAugmentation.class).
+                    child(RemoteMcastMacs.class, mac.getKey());
+            onConfigUpdate(transaction, nodeIid, mac, macKey);
+        }
+    }
+
+    @Override
+    public void onConfigUpdate(final TransactionBuilder transaction,
+                               final InstanceIdentifier<Node> nodeIid,
+                               final RemoteMcastMacs remoteMcastMac,
+                               final InstanceIdentifier macKey,
+                               final Object... extraData) {
+        processDependencies(null, transaction, nodeIid, macKey, remoteMcastMac);
+    }
+
+    @Override
+    public void doDeviceTransaction(final TransactionBuilder transaction,
+                                    final InstanceIdentifier<Node> instanceIdentifier,
+                                    final RemoteMcastMacs mac,
+                                    final InstanceIdentifier macIid,
+                                    final Object... extraData) {
             LOG.debug("Removing remoteMcastMacs, mac address: {}", mac.getMacEntryKey().getValue());
             Optional<RemoteMcastMacs> operationalMacOptional =
                     getOperationalState().getRemoteMcastMacs(instanceIdentifier, mac.getKey());
@@ -86,14 +107,12 @@ public class McastMacsRemoteRemoveCommand extends AbstractTransactCommand<Remote
                 transaction.add(op.delete(mcastMacsRemote.getSchema()).
                         where(mcastMacsRemote.getUuidColumn().getSchema().opEqual(macEntryUUID)).build());
                 transaction.add(op.comment("McastMacRemote: Deleting " + mac.getMacEntryKey().getValue()));
+                getOperationalState().getDeviceInfo().markKeyAsInTransit(RemoteMcastMacs.class, macIid);
             } else {
                 LOG.warn("Unable to delete remoteMcastMacs {} because it was not found in the operational store",
                         mac.getMacEntryKey().getValue());
             }
-            InstanceIdentifier<RemoteMcastMacs> macIid = instanceIdentifier.augmentation(HwvtepGlobalAugmentation.class).
-                    child(RemoteMcastMacs.class, mac.getKey());
             updateCurrentTxDeleteData(RemoteMcastMacs.class, macIid, mac);
-        }
     }
 
     @Override
@@ -105,4 +124,9 @@ public class McastMacsRemoteRemoveCommand extends AbstractTransactCommand<Remote
     protected boolean areEqual(RemoteMcastMacs a, RemoteMcastMacs b) {
         return a.getKey().equals(b.getKey()) && Objects.equals(a.getLocatorSet(), b.getLocatorSet());
     }
+
+    @Override
+    protected boolean isRemoveCommand() {
+        return true;
+    }
 }
diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsRemoteUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsRemoteUpdateCommand.java
index 4f986e0cb..6d6538fac 100644
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsRemoteUpdateCommand.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsRemoteUpdateCommand.java
@@ -97,6 +97,7 @@ public class McastMacsRemoteUpdateCommand extends AbstractTransactCommand<Remote
                 LOG.trace("execute: create RemoteMcastMac entry: {}", mcastMacsRemote);
                 transaction.add(op.insert(mcastMacsRemote));
                 transaction.add(op.comment("McastMacRemote: Creating " + mac.getMacEntryKey().getValue()));
+                getOperationalState().getDeviceInfo().markKeyAsInTransit(RemoteMcastMacs.class, macKey);
             } else if (operationalMacOptional.get().getMacEntryUuid() != null) {
                 UUID macEntryUUID = new UUID(operationalMacOptional.get().getMacEntryUuid().getValue());
                 McastMacsRemote extraMac = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(),
diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsLocalRemoveCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsLocalRemoveCommand.java
index 557040049..918c28dd6 100644
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsLocalRemoveCommand.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsLocalRemoveCommand.java
@@ -101,4 +101,9 @@ public class UcastMacsLocalRemoveCommand extends AbstractTransactCommand<LocalUc
             return Collections.emptyList();
         }
     }
+
+    @Override
+    protected boolean isRemoveCommand() {
+        return true;
+    }
 }
\ No newline at end of file
diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsRemoteRemoveCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsRemoteRemoveCommand.java
index c757f6abb..7f068b427 100644
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsRemoteRemoveCommand.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsRemoteRemoveCommand.java
@@ -78,4 +78,8 @@ public class UcastMacsRemoteRemoveCommand extends AbstractTransactCommand<Remote
         return augmentation.getRemoteUcastMacs();
     }
 
+    @Override
+    protected boolean isRemoveCommand() {
+        return true;
+    }
 }
-- 
2.36.6