Merge remote-tracking branch 'origin/master' into merge-branch

[netvirt.git] / plugin / src / test / java / org / opendaylight / ovsdb / plugin / OvsdbTestBridgeConfigIT.java

diff --git a/plugin/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestBridgeConfigIT.java b/plugin/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestBridgeConfigIT.java
index bc0eb13603871d7bbb81de9f1eac673608393a1d..d8891f91e65307ff7b0354b2e68cc36f957bfbe1 100644 (file)
--- a/plugin/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestBridgeConfigIT.java
+++ b/plugin/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestBridgeConfigIT.java
@@ -31,13 +31,13 @@ public class OvsdbTestBridgeConfigIT extends OvsdbTestBase {
         Map<ConfigConstants, Object> configs = new HashMap<ConfigConstants, Object>();
 
         Map<String, String> exterIDPairs = new HashMap<String, String>();
-        exterIDPairs.put("bridge-foo", "bri-bar");
+        exterIDPairs.put("br-foo", "br-bar");
         //Will accept multiple array pairs. Pairs must be arrays not maps.
         configs.put(ConfigConstants.CUSTOM, exterIDPairs);
 
         ConfigurationService configurationService = new ConfigurationService();
         configurationService.setConnectionServiceInternal(connectionService);
-        configurationService.addBridgeDomainConfig(node, "br0", configs);
+        configurationService.addBridgeDomainConfig(node, BRIDGE_NAME, configs);
     }
 
 }
\ No newline at end of file