MRI version bumpup for Aluminium

[netvirt.git] / elanmanager / impl / src / main / java / org / opendaylight / netvirt / elan / internal / ElanBridgeManager.java

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java
index 30903578c53c6d77a805544e1b95f710be5e14d5..6c94585f8e9bd0d254dd973d31b9c990266254c4 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java
@@ -10,7 +10,6 @@ package org.opendaylight.netvirt.elan.internal;
 import com.google.common.base.Splitter;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -222,7 +221,7 @@ public class ElanBridgeManager {
             return null;
         }
 
-        return ovsdbNode.nonnullManagedNodeEntry();
+        return new ArrayList<>(ovsdbNode.nonnullManagedNodeEntry().values());
     }
 
     private void prepareIntegrationBridge(Node ovsdbNode, Node brIntNode) {
@@ -260,7 +259,7 @@ public class ElanBridgeManager {
 
     private void copyBridgeToConfig(Node brIntNode) {
         NodeBuilder bridgeNodeBuilder = new NodeBuilder(brIntNode);
-        bridgeNodeBuilder.setTerminationPoint(null);
+        bridgeNodeBuilder.setTerminationPoint(Collections.emptyMap());
         InstanceIdentifier<Node> brNodeIid = SouthboundUtils.createInstanceIdentifier(brIntNode.getNodeId());
         try {
             SingleTransactionDataBroker.syncUpdate(dataBroker, LogicalDatastoreType.CONFIGURATION,
@@ -350,7 +349,7 @@ public class ElanBridgeManager {
         if (bridgeAug != null) {
             DatapathId dpId = bridgeAug.getDatapathId();
             if (dpId != null) {
-                otherConfigs = bridgeAug.getBridgeOtherConfigs();
+                otherConfigs = new ArrayList<>(bridgeAug.getBridgeOtherConfigs().values());
                 if (otherConfigs == null) {
                     otherConfigs = Lists.newArrayList();
                 }
@@ -573,13 +572,13 @@ public class ElanBridgeManager {
      */
     @Nullable
     private Node getBridgeNode(Uint64 dpId) {
-        List<Node> ovsdbNodes = southboundUtils.getOvsdbNodes();
+        Map<NodeKey, Node> ovsdbNodes = southboundUtils.getOvsdbNodes();
         if (null == ovsdbNodes) {
             LOG.debug("Could not find any (?) ovsdb nodes");
             return null;
         }
 
-        for (Node node : ovsdbNodes) {
+        for (Node node : ovsdbNodes.values()) {
             if (!isIntegrationBridge(node)) {
                 continue;
             }