Merge "Listen config DS then push configuration to switch"

[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 690789829c306aea4855e80848eb21fd45812e25..713093640dd82b3427200127f6ffae56736e1f9b 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
@@ -1,27 +1,29 @@
 /*
-* Copyright (c) 2015 Intel Corp. and others.  All rights reserved.
-*
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0 which accompanies this distribution,
-* and is available at http://www.eclipse.org/legal/epl-v10.html
-*/
+ * Copyright (c) 2015 Intel Corp. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * 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 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.OvsdbConnectionInstance;
 import org.opendaylight.ovsdb.southbound.SouthboundMapper;
-//import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentation;
-//import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.node.attributes.ManagedNodeEntry;
-//import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.node.attributes.ManagedNodeEntryKey;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
+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;
@@ -29,22 +31,42 @@ import org.slf4j.LoggerFactory;
 public class OvsdbPortRemoveCommand extends AbstractTransactionCommand {
     private static final Logger LOG = LoggerFactory.getLogger(OvsdbPortRemoveCommand.class);
 
-    public OvsdbPortRemoveCommand(OvsdbClientKey key, TableUpdates updates,
+    public OvsdbPortRemoveCommand(OvsdbConnectionInstance key, TableUpdates updates,
             DatabaseSchema dbSchema) {
-        super(key,updates,dbSchema);
+        super(key, updates, dbSchema);
     }
 
     @Override
     public void execute(ReadWriteTransaction transaction) {
-        Collection<Port> removedRows = TyperUtils.extractRowsRemoved(Port.class, getUpdates(), getDbSchema()).values();
-        for(Port port : removedRows) {
-            //InstanceIdentifier<Node> portIid = SouthboundMapper.createInstanceIdentifier(getKey(), port.getUuid());
-    //       InstanceIdentifier<ManagedNodeEntry> mnIid = SouthboundMapper.createInstanceIndentifier(getKey())
-    //                .augmentation(OvsdbTerminationPointAugmentation.class)
-    //                .child(ManagedNodeEntry.class, new ManagedNodeEntryKey(new OvsdbBridgeRef(bridgeIid)));
-            // TODO handle removal of reference to managed node from model
-           // transaction.delete(LogicalDatastoreType.OPERATIONAL, portIid);
-     //       transaction.delete(LogicalDatastoreType.OPERATIONAL, mnIid);
+        String portName = null;
+        Collection<Port> portRemovedRows = TyperUtils.extractRowsRemoved(
+                Port.class, getUpdates(), getDbSchema()).values();
+        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);
+                if (oldBridgeData.getPortsColumn() != null
+                        && oldBridgeData.getPortsColumn().getData().contains(port.getUuidColumn().getData())
+                        && (! bridgeUpdatedRows.isEmpty())) {
+                    updatedBridgeData = bridgeUpdatedRows.get(bridgeUUID);
+                    break;
+                }
+            }
+            if (updatedBridgeData == null) {
+                LOG.warn("Bridge not found for port {}",port);
+                continue;
+            }
+            portName = port.getName();
+            final InstanceIdentifier<TerminationPoint> nodePath = SouthboundMapper
+                    .createInstanceIdentifier(getOvsdbConnectionInstance(),
+                            updatedBridgeData).child(
+                            TerminationPoint.class,
+                            new TerminationPointKey(new TpId(portName)));
+            transaction.delete(LogicalDatastoreType.OPERATIONAL, nodePath);
         }
     }