From 2bc58c9cca16dc3e389cdfc18593578748fd52d5 Mon Sep 17 00:00:00 2001 From: Madhu Venugopal Date: Thu, 11 Sep 2014 20:08:48 -0700 Subject: [PATCH] Bug 1824 : OpenFlow13 Protocol plugin is made the default. Also Karaf edition doesnt support the legacy openflow protocol plugin. Change-Id: I7ae3ea575f0c92a9da13176f3291a4f920d8cb34 Signed-off-by: Madhu Venugopal --- .../netvirt/impl/ConfigurationServiceImpl.java | 17 +++++++++-------- .../plugin/impl/ConfigurationServiceImpl.java | 10 +++++----- 2 files changed, 14 insertions(+), 13 deletions(-) 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 329cd5647..789660a4f 100644 --- 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 7e5273bfb..394233b65 100644 --- 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 protocols = new OvsdbSet(); - 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); -- 2.36.6