[ONOS-4426] [ONOS-4511] [ONOS-4502] Upgrade Vtn Module when access same network segment.
Change-Id: I3afe6b36a44f0eedd642eeadfc23fc3233e7621e
diff --git a/protocols/ovsdb/api/src/main/java/org/onosproject/ovsdb/controller/driver/DefaultOvsdbClient.java b/protocols/ovsdb/api/src/main/java/org/onosproject/ovsdb/controller/driver/DefaultOvsdbClient.java
index cc1f68b..3649866 100644
--- a/protocols/ovsdb/api/src/main/java/org/onosproject/ovsdb/controller/driver/DefaultOvsdbClient.java
+++ b/protocols/ovsdb/api/src/main/java/org/onosproject/ovsdb/controller/driver/DefaultOvsdbClient.java
@@ -461,6 +461,10 @@
return;
}
+ Map<String, String> options = new HashMap<>();
+ options.put("disable-in-band", "true");
+ bridge.setOtherConfig(options);
+
String bridgeUuid = getBridgeUuid(bridgeName);
if (bridgeUuid == null) {
log.debug("Create a new bridge");
@@ -525,16 +529,18 @@
return;
}
+ Map<String, String> options = new HashMap<>();
+ options.put("disable-in-band", "true");
+ if (dpid != null) {
+ options.put("datapath-id", dpid);
+ }
+ bridge.setOtherConfig(options);
+
String bridgeUuid = getBridgeUuid(bridgeName);
if (bridgeUuid == null) {
log.debug("Create a new bridge");
bridge.setName(bridgeName);
- if (dpid != null) {
- Map<String, String> options = new HashMap<>();
- options.put("datapath-id", dpid);
- bridge.setOtherConfig(options);
- }
bridgeUuid = insertConfig(OvsdbConstant.BRIDGE, "_uuid",
OvsdbConstant.DATABASENAME, "bridges",
ovsUuid, bridge.getRow());
@@ -586,7 +592,10 @@
bridge.setProtocols(protocols);
Map<String, String> options = new HashMap<>();
- options.put("datapath-id", dpid);
+ options.put("disable-in-band", "true");
+ if (dpid != null) {
+ options.put("datapath-id", dpid);
+ }
bridge.setOtherConfig(options);
String bridgeUuid = getBridgeUuid(bridgeName);