Fixed bridge creation on Uni create.

Change-Id: Iadc763c7f4c50528185a4367bd3da4cd413b0dd4
Signed-off-by: Gabriel Robitaille-Montpetit <grmontpetit@inocybe.com>

diff --git a/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrUtils.java b/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrUtils.java
index 76a24e5cb5394faf3329c9d5893646636551bec1..dcdfbb295e157d66f843f1563ac6c870450ff537 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrUtils.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrUtils.java
@@ -117,13 +117,13 @@ public class UnimgrUtils {
                                         UniAugmentation uni,
                                         String bridgeName) {
         LOG.info("Creating a bridge on node {}", ovsdbNode.getNodeId());
-        InstanceIdentifier<Node> ovsdbNodeIid = UnimgrMapper.getOvsdbNodeIID(uni.getIpAddress());
-        ConnectionInfo connectionInfo = getConnectionInfo(dataBroker, ovsdbNode.getNodeId());
-        if (connectionInfo != null) {
+        InstanceIdentifier<Node> ovsdbNodeIid = (InstanceIdentifier<Node>) uni.getOvsdbNodeRef().getValue();
+        if (ovsdbNodeIid != null) {
             NodeBuilder bridgeNodeBuilder = new NodeBuilder();
             InstanceIdentifier<Node> bridgeIid = UnimgrMapper.getOvsdbBridgeNodeIID(ovsdbNode.getNodeId(), bridgeName);
-            NodeId bridgeNodeId = new NodeId(
-                    ovsdbNode.getNodeId() + UnimgrConstants.DEFAULT_BRIDGE_NODE_ID_SUFFIX + bridgeName);
+            NodeId bridgeNodeId = new NodeId(ovsdbNode.getNodeId()
+                                           + UnimgrConstants.DEFAULT_BRIDGE_NODE_ID_SUFFIX
+                                           + bridgeName);
             bridgeNodeBuilder.setNodeId(bridgeNodeId);
             OvsdbBridgeAugmentationBuilder ovsdbBridgeAugmentationBuilder = new OvsdbBridgeAugmentationBuilder();
             ovsdbBridgeAugmentationBuilder.setBridgeName(new OvsdbBridgeName(bridgeName));
@@ -135,8 +135,9 @@ public class UnimgrUtils {
             transaction.put(LogicalDatastoreType.CONFIGURATION, bridgeIid, bridgeNodeBuilder.build());
             transaction.submit();
         } else {
-            LOG.error("The OVSDB node is not connected {}", ovsdbNode.getNodeId());
+            LOG.info("OvsdbNodeRef is null");
         }
+
     }
 
     public static List<ControllerEntry> createControllerEntries(String targetString) {
@@ -513,7 +514,6 @@ public class UnimgrUtils {
         if (optionalNode.isPresent()) {
             Node node = optionalNode.get();
             WriteTransaction transaction = dataBroker.newWriteOnlyTransaction();
-            LOG.info("Updating Uni Node {} {} {}", uniKey, ovsdbNodeIid, dataStore);
             NodeBuilder nodeBuilder = new NodeBuilder();
             nodeBuilder.setKey(node.getKey());
             nodeBuilder.setNodeId(node.getNodeId());