Adjusting ovsdb project to work with the new default openflowplugin and openflowjava...

With the latest changes in the Controller and Integration projects, MD-SAL based Openflowplugin is made
the default openflow plugin. In order to work in tandem with Controller/Integration project, this changeset
contains the changes that will make MD-SAL Openflow Plugin as the default Openflow Provider in the OVSDB local
distribution target.

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

diff --git a/distribution/opendaylight/pom.xml b/distribution/opendaylight/pom.xml
index beac26dc0bd15faf295a86e6e5d5b552668abc37..54095f632609902f419bc2cc44e499cf2345b1a9 100755 (executable)
--- a/distribution/opendaylight/pom.xml
+++ b/distribution/opendaylight/pom.xml
@@ -16,13 +16,17 @@ see https://git.opendaylight.org/gerrit/#/c/390/
   <packaging>pom</packaging>
   <name>ovsdb Distribution</name>
   <dependencies>
+    <!-- openflowjava -->
+    <dependency>
+      <groupId>org.opendaylight.openflowjava</groupId>
+      <artifactId>util</artifactId>
+      <version>0.5-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowjava</groupId>
       <artifactId>openflow-protocol-api</artifactId>
       <version>0.5-SNAPSHOT</version>
     </dependency>
-
-    <!-- openflowjava -->
     <dependency>
       <groupId>org.opendaylight.openflowjava</groupId>
       <artifactId>openflow-protocol-impl</artifactId>

diff --git a/distribution/opendaylight/src/assemble/resources/run.base.sh b/distribution/opendaylight/src/assemble/resources/run.base.sh
index f721ef834f4deaf5ac82dd63995f495f3a5d2fb1..c90da054da2d7600b16bc143e0b54bbde53c7ada 100755 (executable)
--- a/distribution/opendaylight/src/assemble/resources/run.base.sh
+++ b/distribution/opendaylight/src/assemble/resources/run.base.sh
@@ -9,18 +9,19 @@ OF_FILTER=
 # Be extra careful to pass on usage from run.internal.sh, but add our
 # usage as well in the standard way
 function usage {
-    $CONTROLLER_RUNSH -help | sed 's/\[-help\]/\[-help\] \[-of13\] \[-bundlefilter \<bundlefilter\> \]/' | sed "s;$CONTROLLER_RUNSH;$0;"
+    $CONTROLLER_RUNSH -help | sed 's/\[-help\]/\[-help\] \[-of10\] \[-bundlefilter \<bundlefilter\> \]/' | sed "s;$CONTROLLER_RUNSH;$0;"
     exit 1
 }
 
-OF13=0
+OF13=1
 BUNDLEFILTER=
 while true ; do
     (( i += 1 ))
     case "${@:$i:1}" in
-        -of13) OF13=1 ;;
+        -of10) OF13=0 ; (( i += 1 ));;
+        -of13) OF13=1 ; (( i += 1 ));;
         -bundlefilter) (( i += 1 )); BUNDLEFILTER="|${@:$i:1}";;
-        -help) usage ;;
+        -help) (( i += 1 )); helparg=${@:$i:1}; usage ;;
         "") break ;;
     esac
 done
@@ -39,7 +40,8 @@ fi
 
 # Make sure we suck out our additional args so as to not confuse
 # run.internal.sh
-NEWARGS=`echo $@|sed 's/-of13//'|sed 's/-bundlefilter[ ]*[^ ]*//'`
+NEWARGS=`echo $@|sed 's/-of13//'|sed 's/-of10//'|sed 's/-bundlefilter[ ]*[^ ]*//'`
+
 
 # Build the filter string
 FILTERBEGINING='^(?!'