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 0efa359cf2d8edf2a9f0d18446b9d5a3f5739763..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,52 +5,85 @@
  * 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 org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import java.util.Map;
+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;
 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.OvsdbClientKey;
+import org.opendaylight.ovsdb.southbound.InstanceIdentifierCodec;
+import org.opendaylight.ovsdb.southbound.OvsdbConnectionInstance;
 import org.opendaylight.ovsdb.southbound.SouthboundMapper;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeName;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TpId;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPoint;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPointKey;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class OvsdbPortRemoveCommand extends AbstractTransactionCommand {
-    public OvsdbPortRemoveCommand(OvsdbClientKey key, TableUpdates updates,
-            DatabaseSchema dbSchema) {
+    private static final Logger LOG = LoggerFactory.getLogger(OvsdbPortRemoveCommand.class);
+
+    private final InstanceIdentifierCodec instanceIdentifierCodec;
+
+    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 bridgeName = null;
-        String portName = null;
-        Collection<Port> portRemovedRows = TyperUtils.extractRowsRemoved(
-                Port.class, getUpdates(), getDbSchema()).values();
-        Collection<Port> portUpdatedRows = TyperUtils.extractRowsUpdated(
-                Port.class, getUpdates(), getDbSchema()).values();
-        for (Port bridge : portUpdatedRows) {
-            bridgeName = bridge.getName();
-            for (Port port : portRemovedRows) {
-                portName = port.getName();
-                final InstanceIdentifier<TerminationPoint> nodePath = SouthboundMapper
-                        .createInstanceIdentifier(getKey(),
-                                new OvsdbBridgeName(bridgeName)).child(
-                                TerminationPoint.class,
-                                new TerminationPointKey(new TpId(portName)));
-                transaction.delete(LogicalDatastoreType.OPERATIONAL, nodePath);
-                transaction.submit();
+    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 (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())) {
+                    // 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 (bridgeData == null) {
+                LOG.warn("Bridge not found for port {}", port);
+                continue;
+            }
+            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);
         }
     }
-
 }