Bug 6692: remove InstanceIdentifierCodec instance from SBU

[ovsdb.git] / southbound / southbound-impl / src / main / java / org / opendaylight / ovsdb / southbound / ovsdb / transact / TerminationPointDeleteCommand.java

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointDeleteCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointDeleteCommand.java
index 672169e2470e711d4133796c60f77114684a9882..d8adae70e4de950d7c959cb755ca8f6945cc16fa 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointDeleteCommand.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointDeleteCommand.java
@@ -9,9 +9,12 @@ package org.opendaylight.ovsdb.southbound.ovsdb.transact;
 
 import static org.opendaylight.ovsdb.lib.operations.Operations.op;
 
+import com.google.common.base.Optional;
+import com.google.common.collect.Sets;
+import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
-
+import org.opendaylight.controller.md.sal.binding.api.DataTreeModification;
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
 import org.opendaylight.ovsdb.lib.notation.Mutator;
 import org.opendaylight.ovsdb.lib.notation.UUID;
@@ -19,6 +22,7 @@ import org.opendaylight.ovsdb.lib.operations.TransactionBuilder;
 import org.opendaylight.ovsdb.lib.schema.typed.TyperUtils;
 import org.opendaylight.ovsdb.schema.openvswitch.Bridge;
 import org.opendaylight.ovsdb.schema.openvswitch.Port;
+import org.opendaylight.ovsdb.southbound.InstanceIdentifierCodec;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentation;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
@@ -27,37 +31,57 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Optional;
-import com.google.common.collect.Sets;
-
 /**
- * @author avishnoi@brocade.com (Anil Vishnoi)
+ * Transaction handler for the TerminationPoints.
  *
+ * @author avishnoi@brocade.com (Anil Vishnoi)
  */
 public class TerminationPointDeleteCommand implements TransactCommand {
     private static final Logger LOG = LoggerFactory.getLogger(TerminationPointDeleteCommand.class);
 
     @Override
     public void execute(TransactionBuilder transaction, BridgeOperationalState state,
-                        AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> events) {
+            AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> events,
+            InstanceIdentifierCodec instanceIdentifierCodec) {
         execute(transaction, state, TransactUtils.extractOriginal(events, OvsdbTerminationPointAugmentation.class),
                 TransactUtils.extractOriginal(events, Node.class),
                 TransactUtils.extractRemoved(events, OvsdbTerminationPointAugmentation.class));
     }
 
+    @Override
+    public void execute(TransactionBuilder transaction, BridgeOperationalState state,
+            Collection<DataTreeModification<Node>> modifications,
+            InstanceIdentifierCodec instanceIdentifierCodec) {
+        execute(transaction, state,
+                TransactUtils.extractOriginal(modifications, OvsdbTerminationPointAugmentation.class),
+                TransactUtils.extractOriginal(modifications, Node.class),
+                TransactUtils.extractRemoved(modifications, OvsdbTerminationPointAugmentation.class));
+    }
+
     private void execute(TransactionBuilder transaction, BridgeOperationalState state,
-                         Map<InstanceIdentifier<OvsdbTerminationPointAugmentation>, OvsdbTerminationPointAugmentation> originals,
+                         Map<InstanceIdentifier<OvsdbTerminationPointAugmentation>,
+                                 OvsdbTerminationPointAugmentation> originals,
                          Map<InstanceIdentifier<Node>, Node> originalNodes,
                          Set<InstanceIdentifier<OvsdbTerminationPointAugmentation>> removedTps) {
         for (InstanceIdentifier<OvsdbTerminationPointAugmentation> removedTpIid: removedTps) {
-            LOG.info("Received request to delete termination point {}",removedTpIid);
+            LOG.debug("Received request to delete termination point {}", removedTpIid);
 
             OvsdbTerminationPointAugmentation original = originals.get(removedTpIid);
             Node originalNode = originalNodes.get(removedTpIid.firstIdentifierOf(Node.class));
             OvsdbBridgeAugmentation originalOvsdbBridgeAugmentation =
                     originalNode.getAugmentation(OvsdbBridgeAugmentation.class);
-            String bridgeName = originalOvsdbBridgeAugmentation != null
-                     ? originalOvsdbBridgeAugmentation.getBridgeName().getValue() : "Bridge name not found";
+            String bridgeName = null;
+            if (originalOvsdbBridgeAugmentation != null) {
+                bridgeName = originalOvsdbBridgeAugmentation.getBridgeName().getValue();
+            } else {
+                Optional<OvsdbBridgeAugmentation> bridgeAug = state.getOvsdbBridgeAugmentation(removedTpIid);
+                if (bridgeAug.isPresent()) {
+                    bridgeName = bridgeAug.get().getBridgeName().getValue();
+                } else {
+                    LOG.error("Bridge does not exist for termination point {}", removedTpIid);
+                }
+            }
+
             Port port = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), Port.class,null);
             Optional<OvsdbTerminationPointAugmentation> tpAugmentation =
                     state.getOvsdbTerminationPointAugmentation(removedTpIid);
@@ -81,6 +105,8 @@ public class TerminationPointDeleteCommand implements TransactCommand {
 
                     transaction.add(op.comment("Bridge: Mutating " + bridgeName
                             + " to remove port " + portUuid));
+                    LOG.info("Deleted Termination Point : {} with uuid : {}",
+                            original.getName(), portUuid);
                 } else {
                     LOG.warn("Unable to delete port {} from bridge  {} because it was not found in the operational "
                             + "store, operational store,  and thus we cannot retrieve its UUID",