Bug 1824 : OpenFlow13 Protocol plugin is made the default. Also Karaf edition doesnt...

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

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/ConfigurationServiceImpl.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/ConfigurationServiceImpl.java
index 329cd5647d7042d530157f76dcea3aa7fe029d7e..789660a4f97fc78707b22dce97fe4fba00928e3f 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/ConfigurationServiceImpl.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/ConfigurationServiceImpl.java
@@ -9,22 +9,22 @@
  */
 package org.opendaylight.ovsdb.openstack.netvirt.impl;
 
+import java.net.InetAddress;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
 import org.opendaylight.controller.sal.core.Node;
 import org.opendaylight.ovsdb.lib.notation.Row;
 import org.opendaylight.ovsdb.lib.notation.Version;
 import org.opendaylight.ovsdb.openstack.netvirt.api.Constants;
 import org.opendaylight.ovsdb.plugin.api.OvsdbConfigurationService;
 import org.opendaylight.ovsdb.schema.openvswitch.OpenVSwitch;
-
-import com.google.common.collect.Maps;
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.net.InetAddress;
-import java.util.Map;
-import java.util.Set;
+import com.google.common.collect.Maps;
 
 public class ConfigurationServiceImpl implements org.opendaylight.ovsdb.openstack.netvirt.api.ConfigurationService {
     static final Logger logger = LoggerFactory.getLogger(ConfigurationServiceImpl.class);
@@ -113,6 +113,7 @@ public class ConfigurationServiceImpl implements org.opendaylight.ovsdb.openstac
         this.patchPortNames = patchPortNames;
     }
 
+    @Override
     public String getPatchPortName(Pair portTuple){
         return this.patchPortNames.get(portTuple);
     }
@@ -170,7 +171,7 @@ public class ConfigurationServiceImpl implements org.opendaylight.ovsdb.openstac
     @Override
     public String getOpenflowVersion(Node node) {
 
-        String configuredVersion = System.getProperty("ovsdb.of.version");
+        String configuredVersion = System.getProperty("ovsdb.of.version", "1.3");
         if (configuredVersion != null){
             switch (configuredVersion){
                 case "1.0":

diff --git a/plugin/src/main/java/org/opendaylight/ovsdb/plugin/impl/ConfigurationServiceImpl.java b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/impl/ConfigurationServiceImpl.java
index 7e5273bfb69e6ef373eaefc53e40ea2b6a2bcbf9..394233b65b16499a9b218ab4013f6f6e8f4aeaed 100644 (file)
--- a/plugin/src/main/java/org/opendaylight/ovsdb/plugin/impl/ConfigurationServiceImpl.java
+++ b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/impl/ConfigurationServiceImpl.java
@@ -474,15 +474,15 @@ public class ConfigurationServiceImpl implements IPluginInBridgeDomainConfigServ
         try {
             OvsdbSet<String> protocols = new OvsdbSet<String>();
 
-            String ofVersion = System.getProperty("ovsdb.of.version", OPENFLOW_10);
+            String ofVersion = System.getProperty("ovsdb.of.version", OPENFLOW_13);
             switch (ofVersion) {
-                case OPENFLOW_13:
-                    protocols.add("OpenFlow13");
-                    break;
                 case OPENFLOW_10:
+                    protocols.add("OpenFlow10");
+                    break;
+                case OPENFLOW_13:
                     //fall through
                 default:
-                    protocols.add("OpenFlow10");
+                    protocols.add("OpenFlow13");
                     break;
             }
             bridge.setProtocols(protocols);