Fixing a couple of Integration distribution issues due to the legacy vs MD-SAL openfl...

After the introduction of NX-Extension support, the OVSDB project has moved from a soft-dependancy (via MD-SAL Apis)
to a more hard-depedency with Openflowplugin/Openflowjava projects. Due to that reason, the filtering done during the
[-of10|-of13] switch for legacy vs MD-SAL plugin selection needs some improvement and that is taken care in the
integration project using https://git.opendaylight.org/gerrit/#/c/10003/.

Unfortunately, the net-virt-providers currently carries both OF10, OF13 providers together and hence, filtering that
bundle is not an option based on the above flag switch. Hence, added optional-dependency directive to make sure the
OSGi runtime dont scream when it finds a missing bundle for NX-Extension when running in legacy -of10 mode.

Better fix would have been to reorganize the providers to their own bundles and fitering them out using the above switch.
But since Integration project is impacted, this gives a good smooth transition to the newer model.

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

diff --git a/distribution/opendaylight/src/assemble/resources/run.base.sh b/distribution/opendaylight/src/assemble/resources/run.base.sh
index c90da054da2d7600b16bc143e0b54bbde53c7ada..a38db3b8ab3b59ef956e25a3c18e9ebd7fbae8d7 100755 (executable)
--- a/distribution/opendaylight/src/assemble/resources/run.base.sh
+++ b/distribution/opendaylight/src/assemble/resources/run.base.sh
@@ -5,6 +5,7 @@ RUNSH_DIR=$(dirname $0)
 CONTROLLER_RUNSH=${RUNSH_DIR}/run.internal.sh
 
 OF_FILTER=
+OF_PLUGIN_RUNTIME=
 
 # Be extra careful to pass on usage from run.internal.sh, but add our
 # usage as well in the standard way
@@ -30,8 +31,10 @@ done
 find configuration/initial -type l -exec rm {} \;
 
 # OF Filter selection
-OF_FILTER="org.opendaylight.(openflowplugin|openflowjava)"
+OF_FILTER="org.opendaylight.(openflowplugin|openflowjava|controller.sal-compatibility|ovsdb.of-extension)"
+OF_PLUGIN_RUNTIME="1.0"
 if (( $OF13 != 0 )); then
+    OF_PLUGIN_RUNTIME="1.3"
     OF_FILTER="org.opendaylight.controller.(thirdparty.org.openflow|protocol_plugins.openflow)"
     while read ofConfig; do
         ln -s ../initial.available/$(basename ${ofConfig}) configuration/initial/
@@ -49,4 +52,4 @@ FILTERENDING=').*'
 FILTER=${FILTERBEGINING}${OF_FILTER}${BUNDLEFILTER}${FILTERENDING}
 
 # Run the command
-$CONTROLLER_RUNSH -Dfelix.fileinstall.filter="$FILTER" $NEWARGS
+$CONTROLLER_RUNSH -Dfelix.fileinstall.filter="$FILTER" -Dovsdb.of.version="$OF_PLUGIN_RUNTIME" $NEWARGS

diff --git a/openstack/net-virt-providers/pom.xml b/openstack/net-virt-providers/pom.xml
index 4e689a407e8c7b068684a3a037ce0305b3a3c879..8aacaec7b96fb13255665e9554d46e0e1966c358 100644 (file)
--- a/openstack/net-virt-providers/pom.xml
+++ b/openstack/net-virt-providers/pom.xml
@@ -84,6 +84,11 @@
                             org.opendaylight.controller.sal.action,
                             org.opendaylight.ovsdb.plugin.api,
                             org.opendaylight.ovsdb.lib.notation,
+                            org.opendaylight.ovs.nx.sal.*;resolution:="optional",
+                            org.opendaylight.yang.gen.v1.urn.opendaylight.ovs.nx.*;resolution:="optional",
+                            org.opendaylight.openflowplugin.*;resolution:="optional",
+                            org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.*;resolution:="optional",
+                            org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.*;resolution:="optional",
                             org.opendaylight.controller.sal.binding.api,
                             org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819,
                             org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes,