Bug 6185 - southbound system tests failing when

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

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeUpdateCommand.java
index 676a2aaa0758c501d6c39f7df20434da6a907830..63104189c2c8d4f05ea5bde2d0bb9f763605b2b1 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeUpdateCommand.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeUpdateCommand.java
@@ -9,14 +9,14 @@ 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.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
-
 import javax.annotation.Nonnull;
-
 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.UUID;
@@ -42,9 +42,6 @@ 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;
-
 public class BridgeUpdateCommand implements TransactCommand {
 
     private static final Logger LOG = LoggerFactory.getLogger(BridgeUpdateCommand.class);
@@ -74,19 +71,22 @@ public class BridgeUpdateCommand implements TransactCommand {
             TransactionBuilder transaction, BridgeOperationalState state,
             InstanceIdentifier<OvsdbBridgeAugmentation> iid, OvsdbBridgeAugmentation ovsdbManagedNode) {
         LOG.debug("Received request to create ovsdb bridge name: {} uuid: {}",
-                    ovsdbManagedNode.getBridgeName(),
-                    ovsdbManagedNode.getBridgeUuid());
-        Optional<OvsdbBridgeAugmentation> operationalBridgeOptional =
-                state.getOvsdbBridgeAugmentation(iid);
+                ovsdbManagedNode.getBridgeName(),
+                ovsdbManagedNode.getBridgeUuid());
         Bridge bridge = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), Bridge.class);
         setFailMode(bridge, ovsdbManagedNode);
         setDataPathType(bridge, ovsdbManagedNode);
         setOpenDaylightExternalIds(bridge, iid, ovsdbManagedNode);
         setOpenDaylightOtherConfig(bridge, ovsdbManagedNode);
+        Optional<OvsdbBridgeAugmentation> operationalBridgeOptional =
+                state.getOvsdbBridgeAugmentation(iid);
         if (!operationalBridgeOptional.isPresent()) {
             setName(bridge, ovsdbManagedNode,operationalBridgeOptional);
             setPort(transaction, bridge, ovsdbManagedNode);
             transaction.add(op.insert(bridge));
+            LOG.info("Added ovsdb Bridge name: {} uuid: {}",
+                    ovsdbManagedNode.getBridgeName(),
+                    ovsdbManagedNode.getBridgeUuid());
         } else {
             String existingBridgeName = operationalBridgeOptional.get().getBridgeName().getValue();
             // Name is immutable, and so we *can't* update it.  So we use extraBridge for the schema stuff
@@ -99,16 +99,12 @@ public class BridgeUpdateCommand implements TransactCommand {
         }
     }
 
-
-
     private void setDataPathType(Bridge bridge,OvsdbBridgeAugmentation ovsdbManagedNode) {
         if (ovsdbManagedNode.getDatapathType() != null) {
             bridge.setDatapathType(SouthboundMapper.createDatapathType(ovsdbManagedNode));
         }
     }
 
-
-
     private void setName(Bridge bridge, OvsdbBridgeAugmentation ovsdbManagedNode,
             Optional<OvsdbBridgeAugmentation> operationalBridgeOptional) {
         if (ovsdbManagedNode.getBridgeName() != null) {
@@ -118,8 +114,6 @@ public class BridgeUpdateCommand implements TransactCommand {
         }
     }
 
-
-
     private void setOpenDaylightExternalIds(Bridge bridge, InstanceIdentifier<OvsdbBridgeAugmentation> iid,
             OvsdbBridgeAugmentation ovsdbManagedNode) {
         // Set the iid external_id
@@ -135,8 +129,6 @@ public class BridgeUpdateCommand implements TransactCommand {
         bridge.setExternalIds(externalIdMap);
     }
 
-
-
     private void setOpenDaylightOtherConfig(@Nonnull Bridge bridge, @Nonnull OvsdbBridgeAugmentation ovsdbManagedNode) {
         try {
             bridge.setOtherConfig(YangUtils.convertYangKeyValueListToMap(ovsdbManagedNode.getBridgeOtherConfigs(),
@@ -146,14 +138,12 @@ public class BridgeUpdateCommand implements TransactCommand {
         }
     }
 
-
-
     private void setPort(TransactionBuilder transaction, Bridge bridge,
             OvsdbBridgeAugmentation ovsdbManagedNode) {
 
         Insert<GenericTableSchema> interfaceInsert = setInterface(transaction,ovsdbManagedNode);
         // Port part
-        String portNamedUuid = "Port_" + SouthboundMapper.getRandomUUID();
+        String portNamedUuid = "Port_" + SouthboundMapper.getRandomUuid();
         Port port = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), Port.class);
         port.setName(ovsdbManagedNode.getBridgeName().getValue());
         port.setInterfaces(Sets.newHashSet(TransactUtils.extractNamedUuid(interfaceInsert)));
@@ -164,7 +154,7 @@ public class BridgeUpdateCommand implements TransactCommand {
     private Insert<GenericTableSchema> setInterface(TransactionBuilder transaction,
             OvsdbBridgeAugmentation ovsdbManagedNode) {
         // Interface part
-        String interfaceNamedUuid = "Interface_" + SouthboundMapper.getRandomUUID();
+        String interfaceNamedUuid = "Interface_" + SouthboundMapper.getRandomUuid();
         Interface interfaceOvs = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), Interface.class);
         interfaceOvs.setName(ovsdbManagedNode.getBridgeName().getValue());
         interfaceOvs.setType(SouthboundMapper.createOvsdbInterfaceType(InterfaceTypeInternal.class));
@@ -173,8 +163,6 @@ public class BridgeUpdateCommand implements TransactCommand {
         return result;
     }
 
-
-
     private void setFailMode(Bridge bridge,
             OvsdbBridgeAugmentation ovsdbManagedNode) {
         if (ovsdbManagedNode.getFailMode() != null