Set the default fail-mode as secure and make sure to set the Openflow Type appropriat...

Change-Id: Ic0c0e3330ca0c511fb2704b7572d08e9b8ca57a8
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>

diff --git a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/InternalNetworkManager.java b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/InternalNetworkManager.java
index 5122344a2975282b0f87f6466c61bec95f23772c..a1e128b65ea291c4355e461d3b48ee03ca49b0a0 100644 (file)
--- a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/InternalNetworkManager.java
+++ b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/InternalNetworkManager.java
@@ -138,13 +138,20 @@ public class InternalNetworkManager {
 
         String bridgeUUID = this.getInternalBridgeUUID(node, bridgeName);
         Bridge bridge = new Bridge();
+        OvsDBSet<String> failMode = new OvsDBSet<String>();
+        failMode.add("secure");
+        bridge.setFail_mode(failMode);
+
+        OvsDBSet<String> protocols = new OvsDBSet<String>();
+        if (!ProviderNetworkManager.getManager().hasPerTenantTunneling()) {
+            protocols.add("OpenFlow13");
+        } else {
+            protocols.add("OpenFlow10");
+        }
+        bridge.setProtocols(protocols);
+
         if (bridgeUUID == null) {
             bridge.setName(bridgeName);
-            if (!ProviderNetworkManager.getManager().hasPerTenantTunneling()) {
-                OvsDBSet<String> protocols = new OvsDBSet<String>();
-                protocols.add("OpenFlow13");
-                bridge.setProtocols(protocols);
-            }
 
             StatusWithUuid statusWithUuid = ovsdbTable.insertRow(node, Bridge.NAME.getName(), null, bridge);
             if (!statusWithUuid.isSuccess()) return statusWithUuid;
@@ -152,10 +159,7 @@ public class InternalNetworkManager {
             Port port = new Port();
             port.setName(bridgeName);
             ovsdbTable.insertRow(node, Port.NAME.getName(), bridgeUUID, port);
-        } else if (!ProviderNetworkManager.getManager().hasPerTenantTunneling()) {
-            OvsDBSet<String> protocols = new OvsDBSet<String>();
-            protocols.add("OpenFlow13");
-            bridge.setProtocols(protocols);
+        } else {
             ovsdbTable.updateRow(node, Bridge.NAME.getName(), null, bridgeUUID, bridge);
         }