diff options
| author |   Martin Klozik <martinx.klozik@intel.com> | 2017-04-21 09:57:56 +0100 |
|---|---|---|
| committer | Martin Klozik <martinx.klozik@intel.com> | 2017-05-03 14:35:20 +0100 |
| commit | b878f491b6590678210aa94ed49327d192148144 (patch) | |
| tree | b56374b99430f9ce3086cf4624aa3a77c055c052 /conf | |
| parent | 59aae8c0539ca9632d9ffdcb2788ab715fbff9ec (diff) | |
build: Automated VPP build
VSPERF makefiles were updated to automatically download and compile
VPP. VPP will not be installed into the OS, but it will be executed
from VSPERF's src subdirectory. Thus underlying OS is not affected
by VPP build required by VSPERF. It also allows quick switch among
different versions of various tools used by VSPERF.
As part of this patch, VERIFY and MERGE CI jobs were updated to
build VPP and test it with basic set of integration tests.
JIRA: VSPERF-493
Change-Id: I958b9031c4fefc87c4c63a471d2ba1a0db1eaaa4
Signed-off-by: Martin Klozik <martinx.klozik@intel.com>
Reviewed-by: Al Morton <acmorton@att.com>
Reviewed-by: Christian Trautman <ctrautma@redhat.com>
Reviewed-by: Sridhar Rao <sridhar.rao@spirent.com>
Reviewed-by: Trevor Cooper <trevor.cooper@intel.com>
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/02_vswitch.conf | 10 | ||||
| -rw-r--r-- | conf/integration/01_testcases.conf | 22 |
2 files changed, 28 insertions, 4 deletions
diff --git a/conf/02_vswitch.conf b/conf/02_vswitch.conf index 60ec7fb9..54ae6fa7 100644 --- a/conf/02_vswitch.conf +++ b/conf/02_vswitch.conf @@ -110,15 +110,17 @@ PATHS['vswitch'] = { 'ovs_var_tmp': '/usr/local/var/run/openvswitch/', 'ovs_etc_tmp': '/usr/local/etc/openvswitch/', 'VppDpdkVhost': { - 'type' : 'bin', + 'type' : 'src', 'src': { - 'path': os.path.join(ROOT_DIR, 'src/vpp/vpp/build-root/build-vpp-native'), - 'vpp': 'vpp', - 'vppctl': 'vppctl', + 'path': os.path.join(ROOT_DIR, 'src/vpp/vpp/build-root/install-vpp-native/vpp'), + 'vpp': 'bin/vpp', + 'vppctl': 'bin/vppctl', + 'vpp_plugin_path' : 'lib64/vpp_plugins', }, 'bin': { 'vpp': 'vpp', 'vppctl': 'vppctl', + 'vpp_plugin_path' : '/usr/lib/vpp_plugins', } }, } diff --git a/conf/integration/01_testcases.conf b/conf/integration/01_testcases.conf index 489c7a57..61766e33 100644 --- a/conf/integration/01_testcases.conf +++ b/conf/integration/01_testcases.conf @@ -976,6 +976,28 @@ INTEGRATION_TESTS = [ ['vswitch', 'del_switch', 'int_br0'], ] }, + # + # VPP tests used by VERIFY and MERGE jobs by OPNFV Jenkins + # + { + "Name": "vswitch_vports_add_del_connection_vpp", + "Deployment": "clean", + "Description": "VPP: vSwitch - configure switch with vports, add and delete connection", + "TestSteps": [ + ['vswitch', 'add_switch', 'int_br0'], + ['vswitch', 'add_vport', 'int_br0'], + ['vswitch', 'add_vport', 'int_br0'], + ['vswitch', 'add_connection', 'int_br0', '#STEP[1][0]', '#STEP[2][0]', True], + ['vswitch', 'dump_connections', 'int_br0'], + ['vswitch', 'del_connection', 'int_br0', '#STEP[1][0]', '#STEP[2][0]', True], + ['vswitch', 'del_port', 'int_br0', '#STEP[1][0]'], + ['vswitch', 'del_port', 'int_br0', '#STEP[2][0]'], + ['vswitch', 'del_switch', 'int_br0'], + ] + }, + # + # END of VPP tests used by VERIFY and MERGE jobs by OPNFV Jenkins + # ] # Example of TC definition with exact vSwitch, VNF and TRAFFICGEN values. |