MD-SAL API integration

[ovsdb.git] / southbound / southbound-impl / src / main / java / org / opendaylight / ovsdb / southbound / transactions / md / OvsdbPortRemoveCommand.java

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortRemoveCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortRemoveCommand.java
index 09bf8b1a59d315efcfe9bea05fb1089de4eaff7a..916afcbaf7a7f10e2fe29d29253bc11cea79ff1d 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortRemoveCommand.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortRemoveCommand.java
@@ -5,14 +5,12 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.ovsdb.southbound.transactions.md;
 
-import java.util.Collection;
 import java.util.Map;
-
-import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import java.util.Map.Entry;
+import org.opendaylight.mdsal.binding.api.ReadWriteTransaction;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.ovsdb.lib.message.TableUpdates;
 import org.opendaylight.ovsdb.lib.notation.UUID;
 import org.opendaylight.ovsdb.lib.schema.DatabaseSchema;
@@ -34,44 +32,58 @@ public class OvsdbPortRemoveCommand extends AbstractTransactionCommand {
 
     private final InstanceIdentifierCodec instanceIdentifierCodec;
 
-    public OvsdbPortRemoveCommand(InstanceIdentifierCodec instanceIdentifierCodec, OvsdbConnectionInstance key,
-            TableUpdates updates, DatabaseSchema dbSchema) {
+    public OvsdbPortRemoveCommand(final InstanceIdentifierCodec instanceIdentifierCodec,
+            final OvsdbConnectionInstance key, final TableUpdates updates, final DatabaseSchema dbSchema) {
         super(key, updates, dbSchema);
         this.instanceIdentifierCodec = instanceIdentifierCodec;
     }
 
     @Override
-    public void execute(ReadWriteTransaction transaction) {
-        String portName = null;
-        Collection<Port> portRemovedRows = TyperUtils.extractRowsRemoved(
-                Port.class, getUpdates(), getDbSchema()).values();
+    public void execute(final ReadWriteTransaction transaction) {
+        Map<UUID, Port> portRemovedRows = TyperUtils.extractRowsRemoved(
+            Port.class, getUpdates(), getDbSchema());
+        Map<UUID, Port> portUpdatedRows = TyperUtils.extractRowsUpdated(
+                Port.class, getUpdates(), getDbSchema());
         Map<UUID,Bridge> bridgeUpdatedRows = TyperUtils.extractRowsUpdated(
                 Bridge.class, getUpdates(), getDbSchema());
         Map<UUID,Bridge> bridgeUpdatedOldRows = TyperUtils.extractRowsOld(
                 Bridge.class, getUpdates(), getDbSchema());
-        for (Port port : portRemovedRows) {
-            Bridge updatedBridgeData = null;
-            for (UUID bridgeUuid : bridgeUpdatedOldRows.keySet()) {
-                Bridge oldBridgeData = bridgeUpdatedOldRows.get(bridgeUuid);
+        for (Entry<UUID, Port> portRemoved: portRemovedRows.entrySet()) {
+            final UUID portUuid = portRemoved.getKey();
+            final Port port = portRemoved.getValue();
+            final String portName = port.getName();
+            boolean isPortInUpdatedRows = portUpdatedRows.values()
+                .stream().anyMatch(updatedPort -> portName.equals(updatedPort.getName()));
+            if (isPortInUpdatedRows) {
+                LOG.debug("port {} present in updated rows, skipping delete", portName);
+                continue;
+            }
+            Bridge bridgeData = null;
+            for (Entry<UUID, Bridge> entry : bridgeUpdatedOldRows.entrySet()) {
+                UUID bridgeUuid = entry.getKey();
+                Bridge oldBridgeData = entry.getValue();
                 if (oldBridgeData.getPortsColumn() != null
-                        && oldBridgeData.getPortsColumn().getData().contains(port.getUuidColumn().getData())
-                        && (! bridgeUpdatedRows.isEmpty())) {
-                    updatedBridgeData = bridgeUpdatedRows.get(bridgeUuid);
+                        && oldBridgeData.getPortsColumn().getData().contains(port.getUuidColumn().getData())) {
+                    // We have a match, try updated bridge rows first...
+                    bridgeData = bridgeUpdatedRows.get(bridgeUuid);
+                    if (bridgeData == null) {
+                        // ... and fall back to old data
+                        bridgeData = oldBridgeData;
+                    }
                     break;
                 }
             }
-            if (updatedBridgeData == null) {
-                LOG.warn("Bridge not found for port {}",port);
+            if (bridgeData == null) {
+                LOG.warn("Bridge not found for port {}", port);
                 continue;
             }
-            portName = port.getName();
-            final InstanceIdentifier<TerminationPoint> nodePath = SouthboundMapper
-                    .createInstanceIdentifier(instanceIdentifierCodec, getOvsdbConnectionInstance(),
-                            updatedBridgeData).child(
-                            TerminationPoint.class,
-                            new TerminationPointKey(new TpId(portName)));
+            final InstanceIdentifier<TerminationPoint> nodePath = SouthboundMapper.createInstanceIdentifier(
+                instanceIdentifierCodec, getOvsdbConnectionInstance(), bridgeData)
+                    .child(TerminationPoint.class, new TerminationPointKey(new TpId(portName)));
             transaction.delete(LogicalDatastoreType.OPERATIONAL, nodePath);
+            // Remove from OvsdbConnection Instance cache
+            getOvsdbConnectionInstance().removePort(portUuid);
+            getOvsdbConnectionInstance().removePortInterface(portName);
         }
     }
-
 }