NETVIRT-1671

Multiple entries with same key.

Same default entry Disable in band was getting added twice.
Removed from elanbridgemanger.

Signed-off-by: Nishchya Gupta <nishchyag@altencalsoftlabs.com>
Change-Id: I0d140bbb83b4ba28ded0ec3ca58bab4ad5795c7c

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 4042747e729ea3b88f961ff21150f40d85e330c5..96176538f806213e94a3317d6477108d610347f0 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
@@ -372,13 +372,13 @@ public class ElanBridgeManager {
                                 .setBridgeOtherConfigValue(mac).build());
             }
         }
-
-        if (otherConfigs.stream().noneMatch(otherConfig ->
+        //ovsdb always adds disableInBand=true, so no need to add this default value here.
+        /*if (otherConfigs.stream().noneMatch(otherConfig ->
                 otherConfig.getBridgeOtherConfigKey().equals(OTHER_CONFIG_DISABLE_IN_BAND))) {
             otherConfigs.add(new BridgeOtherConfigsBuilder()
                             .setBridgeOtherConfigKey(OTHER_CONFIG_DISABLE_IN_BAND)
                             .setBridgeOtherConfigValue("true").build());
-        }
+        }*/
 
         return otherConfigs;
     }