Vagrantfile: Add test_ovs_system_userspace provision.

Add 'test_ovs_system_userspace' provision. Command: # vagrant provision --provision-with=test_ovs_system_userspace will run "make check-system-userspace" in the vagrant launched VM. It may be more convenient to run this tests inside a vm rather than in the host, because they interact with system networking. Suggested-by: Joe Stringer <[email protected]> Signed-off-by: Daniele Di Proietto <[email protected]> Acked-by: Joe Stringer <[email protected]>
dhanunjaya · Aug 7, 2015 · 548f9fe · 548f9fe
1 parent d7c5426
commit 548f9fe
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/INSTALL.md b/INSTALL.md
@@ -631,6 +631,13 @@ To recompile and reinstall OVS using RPM:
 	./boot.sh
 	vagrant provision --provision-with configure_ovs,install_rpm
 
+Two provisioners are included to run system tests with the OVS kernel
+module or with a userspace datapath.  This tests are different from
+the self-tests mentioned above.  To run them:
+
+	./boot.sh
+	vagrant provision --provision-with configure_ovs,test_ovs_kmod,test_ovs_system_userspace
+
 Continuous Integration with Travis-CI
 -------------------------------------
 

diff --git a/NEWS b/NEWS
@@ -17,6 +17,9 @@ Post-v2.4.0
    - Added OpenFlow 1.4+ OFPT_SET_ASYNC_CONFIG and OFPT_GET_ASYNC_CONFIG
      that allows controllers to have more precise control over OpenFlow1.4
      asynchronous messages.
+   - New 'check-system-userspace', 'check-kmod' and 'check-kernel' Makefile
+     targets to run a new system testsuite.  These tests can be run inside
+     a Vagrant box.  See INSTALL.md for details
 
 
 v2.4.0 - xx xxx xxxx

diff --git a/Vagrantfile b/Vagrantfile
@@ -47,13 +47,19 @@ systemctl start openvswitch
 systemctl status openvswitch
 SCRIPT
 
+$test_ovs_system_userspace = <<SCRIPT
+cd ~/build
+make check-system-userspace
+SCRIPT
+
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.define "fedora-20" do |fedora|
        fedora.vm.box = "chef/fedora-20"
        fedora.vm.provision "bootstrap", type: "shell", inline: $bootstrap_fedora
        fedora.vm.provision "configure_ovs", type: "shell", inline: $configure_ovs
        fedora.vm.provision "build_ovs", type: "shell", inline: $build_ovs
        fedora.vm.provision "test_ovs_kmod", type: "shell", inline: $test_kmod
+       fedora.vm.provision "test_ovs_system_userspace", type: "shell", inline: $test_ovs_system_userspace
        fedora.vm.provision "install_rpm", type: "shell", inline: $install_rpm
   end
 end