Fixed a couple of runtime issues due to the existing support for the legacy vs MD...

1. In addition to filtering out the openflowplugin bundles, also filter out the extension bundles.
2. Bringing the visibility of legacy vs MD-SAL based OpenFlowPlugin to Java Runtime.
   The [-of10|-of13] flag is currently a script-only flag & is lost at the runtime.
   During Hydrogen time-frame, ovsdb project also added another redundant runtime flag ovsdb.of.version
   to determine the SAL to choose. AD-SAL vs MD-SAL. Currently ovsdb is the only project that uses both
   this flag and also the legacy plugin. Hence added a simple -Dovsdb.of.version based on [-of13|-of10] flag.

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

diff --git a/distributions/base/src/assemble/resources/run.sh b/distributions/base/src/assemble/resources/run.sh
index e51b3609529c0fef6919dd611b032ea44dd7d992..3404783bb7ea2de56aaf7b1bb0958ee5cf1fdc23 100755 (executable)
--- a/distributions/base/src/assemble/resources/run.sh
+++ b/distributions/base/src/assemble/resources/run.sh
@@ -5,6 +5,7 @@ RUNSH_DIR=$(dirname $0)
 CONTROLLER_RUNSH=${RUNSH_DIR}/run.internal.sh
 
 OF_FILTER=
+OF_PLUGIN_RUNTIME=
 helparg=
 # Added help for of13 before help from controller (this help common for intagration and controller)
 function usage {
@@ -57,8 +58,10 @@ find ${RUNSH_DIR}/configuration/initial -type l -exec rm {} \;
 #   Option to run the OpenDaylight controller with the OpenFlow plugin (1.3).
 ##
 # OF Filter selection
-OF_FILTER="org.opendaylight.(openflowplugin|openflowjava|controller.sal-compatibility)"
+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}) ${RUNSH_DIR}/configuration/initial/
@@ -75,4 +78,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