summaryrefslogtreecommitdiffstats
path: root/conf/integration
diff options
context:
space:
mode:
authorMartin Klozik <martinx.klozik@intel.com>2017-05-18 10:18:38 +0100
committerMartin Klozik <martinx.klozik@intel.com>2017-06-02 13:39:21 +0100
commitde6fc4b670fc42fc96f27f375fbcf7a099629434 (patch)
tree4b2b87baef82fffee6645d428794ee83a09da893 /conf/integration
parent862ef28b808aca4dd75cc44a83023362dcce1969 (diff)
tests: Improvement of step driven testcases
A set of improvements was introduced to enhance step driven testcases capabilities. Details: * delay among test steps is configurable by TEST_STEP_DELAY parameter * step driven tool function exec was renamed to exec_shell * new step driven tool function exec_python was introduced to execute a python code * new step driven object sleep was introduced to pause test execution for defined number of seconds. * fixed bug in settings.validate_getValue() to correctly validate access of parameters modified by TEST_PARAMS * new #PARAM() macro was introduced to allow references among configuration parameters * multistream support has been added into ixnetrfc2544v2.tcl, which is used for tunneling protocols test (op2p deployment) * fixed bug in op2p deployment to list interfaces and flows from both bridges involved in the test * test report updated to state exact rfcxxxx type of traffic type, e.g. rfc2544_continuous * test report of step driven testcases was updated to contain measured values from traffic generator in CSV report * method for ovs flow comparison was modified to normalize IPv4 CIDR network addr (e.g. 10.0.0.5/8 => 10.0.0.0/8) JIRA: VSPERF-512 Change-Id: Ib4f38dcdfbf3820dd766b25520da0ad0c81f3293 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> Reviewed-by: Ciara Loftus <ciara.loftus@intel.com>
Diffstat (limited to 'conf/integration')
-rw-r--r--conf/integration/01_testcases.conf22
1 files changed, 6 insertions, 16 deletions
diff --git a/conf/integration/01_testcases.conf b/conf/integration/01_testcases.conf
index 61766e33..b58fa965 100644
--- a/conf/integration/01_testcases.conf
+++ b/conf/integration/01_testcases.conf
@@ -1,4 +1,4 @@
-# Copyright 2015-2016 Intel Corporation.
+# Copyright 2015-2017 Intel Corporation.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -34,16 +34,6 @@ SUPPORTED_TUNNELING_PROTO = ['vxlan', 'gre', 'geneve']
#
# bidirectional testing for OP2P is not yet supported.
# TRAFFIC['bidir'] must be set to 'False'.
-#
-# "TestSteps": [] # Definition of integration test steps.
-# # In case that this list is defined, then
-# # vsperf will execute defined test steps
-# # one by one. It can be used to configure
-# # vswitch, insert flows and transmit traffic.
-# # It is possible to refer to result of any
-# # previous step through #STEP[i][j] macro.
-# # Where i is a number of step (starts from 0)
-# # and j is index of result returned by step i.
#
# Common TestSteps parts ("macros")
@@ -894,12 +884,12 @@ INTEGRATION_TESTS = [
"TestSteps": STEP_VSWITCH_PVVP_INIT + # STEP 0-6
[
# check that at least 2 numa slots are available
- ['tools', 'exec', 'numactl -H', 'available: ([0-9]+)'], # STEP 7
+ ['tools', 'exec_shell', 'numactl -H', 'available: ([0-9]+)'], # STEP 7
['tools', 'assert', '#STEP[-1][0]>1'], # STEP 8
# store last 2 cores from numa slot 0
- ['tools', 'exec', 'numactl -H', 'node 0 cpus:.*\s+(\\d+) (\\d+)$'], # STEP 9
+ ['tools', 'exec_shell', 'numactl -H', 'node 0 cpus:.*\s+(\\d+) (\\d+)$'], # STEP 9
# store last 2 cores from numa slot 1
- ['tools', 'exec', 'numactl -H', 'node 1 cpus:.*\s+(\\d+) (\\d+)$'], # STEP 10
+ ['tools', 'exec_shell', 'numactl -H', 'node 1 cpus:.*\s+(\\d+) (\\d+)$'], # STEP 10
# pin VNF1 to 1st NUMA slot and VNF2 to 2nd NUMA slot
['settings', 'setValue', 'GUEST_CORE_BINDING', # STEP 11
[("#STEP[-2][0][0]", "#STEP[-2][0][1]"),
@@ -912,7 +902,7 @@ INTEGRATION_TESTS = [
['settings', 'getValue', 'TOOLS'], # STEP 14
# check that PMD thread serving VNF1 runs at NUMA slot 0
## i.e. get numa slot ID serving dpdhvhostuser0...
- ['tools', 'exec', "sudo #STEP[-1]['ovs-appctl'] " # STEP 15
+ ['tools', 'exec_shell', "sudo #STEP[-1]['ovs-appctl'] " # STEP 15
"dpif-netdev/pmd-rxq-show | "
"sed -e '/dpdkvhostuser0/,$d' | tac",
'pmd thread numa_id ([0-9])+'
@@ -921,7 +911,7 @@ INTEGRATION_TESTS = [
['tools', 'assert', '#STEP[-1][0]==0'], # STEP 16
# check that PMD thread serving VNF2 runs at NUMA slot 1
## i.e. get numa slot ID serving dpdhvhostuser2...
- ['tools', 'exec', "sudo #STEP[-3]['ovs-appctl'] " # STEP 17
+ ['tools', 'exec_shell', "sudo #STEP[-3]['ovs-appctl'] " # STEP 17
"dpif-netdev/pmd-rxq-show | "
"sed -e '/dpdkvhostuser2/,$d' | tac",
'pmd thread numa_id ([0-9])+'