bug-6326 use new sig for setBridgeController

depends on: https://git.opendaylight.org/gerrit/42979

Change-Id: Id8a8d9a1838089f81c996597ef8fc2f315a53120
Signed-off-by: Josh <jhershbe@redhat.com>

diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java
index b8c2ba7e108d7c13b3bb58c16f5b58d20ca43253..7637a3fa6d8a3226dcd2cade51ef24bc480c5c91 100644 (file)
--- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java
+++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java
@@ -114,7 +114,7 @@ public class ElanBridgeManager {
             //if br-int already exists, we can add provider networks
             Node brIntNode = southboundUtils.readBridgeNode(node, INTEGRATION_BRIDGE);
             if (brIntNode != null) {
-                if(!addControllerToBridge(node, brIntNode, INTEGRATION_BRIDGE)) {
+                if(!addControllerToBridge(node, INTEGRATION_BRIDGE)) {
                     LOG.error("Failed to set controller to existing integration bridge {}", brIntNode);
                 }
 
@@ -224,8 +224,8 @@ public class ElanBridgeManager {
         return rv;
     }
 
-    private boolean addControllerToBridge(Node ovsdbNode, Node bridgeNode, String bridgeName) {
-        return southboundUtils.setBridgeController(ovsdbNode, bridgeNode,
+    private boolean addControllerToBridge(Node ovsdbNode,String bridgeName) {
+        return southboundUtils.setBridgeController(ovsdbNode,
                             bridgeName, southboundUtils.getControllersFromOvsdbNode(ovsdbNode));
     }