Merge "Changed the tcp_flag match builder param in /util/md/match"

diff --git a/README b/README
index 2356030fbe5431aadb9b682f05631fbc35f05d69..4e84de038fe2b0facbef36145a20934781e8a5f6 100644 (file)
--- a/README
+++ b/README
@@ -94,3 +94,28 @@ Pre-requisites : JDK 1.7+, Maven 3+
    199 | Active | 80 | 1.0.0.SNAPSHOT | OVSDB Open_vSwitch Schema
    200 | Active | 80 | 1.0.0.SNAPSHOT | OVSDB hardware_vtep Schema
    201 | Active | 80 | 1.0.0.SNAPSHOT | OpenDaylight OVSDB Plugin
+
+Running The Integration Tests
+=============================
+
+To run the integration tests locally the following components are required:
+
+ - Docker
+ - Fig
+
+To install docker, follow the installation guide for your platform:
+   http://docs.docker.com/installation/
+
+To install fig:
+   http://www.fig.sh/install.html
+
+To run the integration tests:
+
+    mvn clean install
+    fig start
+    # OSX
+    mvn verify -Pintegrationtest -Dovsdbserver.ipaddress=$(boot2docker ip 2>/dev/null) -Dovsdbserver.port=6640
+    # Linux
+    mvn verify -Pintegrationtest -Dovsdbserver.ipaddress=127.0.0.1 -Dovsdbserver.port=6640
+    fig stop
+

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/fig.yml b/fig.yml
new file mode 100644 (file)
index 0000000..9c9a77a
--- /dev/null
+++ b/fig.yml
@@ -0,0 +1,6 @@
+ovs:
+ image: davetucker/docker-ovs:2.1.2
+ ports: 
+   - "6640:6640"
+ command: "/usr/bin/supervisord -n"
+ privileged: true

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,