From b1534957e463b5e34957a8d48ce5c6b0552ffbb4 Mon Sep 17 00:00:00 2001 From: Martin Klozik Date: Thu, 31 Aug 2017 15:01:18 +0200 Subject: teststeps: Improvements and bugfixing of teststeps This patch introduces several improvements and small bugfixes of teststeps. These changes were identified during implementation of OVS/DPDK regression tests. Patch content: * teststeps: step aliases were implemented * teststeps: improved filtering by regex for any step, which returns string or list of stings; filter will process all lines * teststeps: support for log object * teststeps: support for trafficgen get_results call * teststeps: configurable suppression of step validation * trafficgen: remove old results before traffic is executed * trafficgen: support for flow control on/off (IxNet) * trafficgen: support for configurable learning frames (IxNet) * trafficgen: support for runtime changes of TRAFFICGEN_PKT_SIZES, _DURATION and _LOSSRATE * vnf: flush pexpect output of previous commands * vnf: use execute_and_wait() to ensure correct cmds order * vnf: dpdk vHost User interface name set according to its type, e.g. dpdkvhostuserclient * vswitch: support for OVS restart * decap: simplify configuration of tunneling decapsulation tests * settings: values of all configuration options are restored after TC execution * modified formatting of test description used by --list * testcase name and description is logged before its execution * small bugfixes JIRA: VSPERF-539 Change-Id: I550ba0d897ece89abd3f33d6d66f545c4d863e7b Signed-off-by: Martin Klozik Reviewed-by: Al Morton Reviewed-by: Christian Trautman Reviewed-by: Sridhar Rao Reviewed-by: Trevor Cooper --- docs/testing/user/userguide/integration.rst | 39 +++++++---------------------- 1 file changed, 9 insertions(+), 30 deletions(-) (limited to 'docs/testing/user/userguide/integration.rst') diff --git a/docs/testing/user/userguide/integration.rst b/docs/testing/user/userguide/integration.rst index 249a03c4..66808400 100644 --- a/docs/testing/user/userguide/integration.rst +++ b/docs/testing/user/userguide/integration.rst @@ -140,13 +140,7 @@ To run VXLAN decapsulation tests: 1. Set the variables used in "Executing Tunnel encapsulation tests" -2. Set dstmac of DUT_NIC2_MAC to the MAC adddress of the 2nd NIC of your DUT - - .. code-block:: python - - DUT_NIC2_MAC = '' - -3. Run test: +2. Run test: .. code-block:: console @@ -181,13 +175,7 @@ To run GRE decapsulation tests: 1. Set the variables used in "Executing Tunnel encapsulation tests" -2. Set dstmac of DUT_NIC2_MAC to the MAC adddress of the 2nd NIC of your DUT - - .. code-block:: python - - DUT_NIC2_MAC = '' - -3. Run test: +2. Run test: .. code-block:: console @@ -238,13 +226,7 @@ To run GENEVE decapsulation tests: 1. Set the variables used in "Executing Tunnel encapsulation tests" -2. Set dstmac of DUT_NIC2_MAC to the MAC adddress of the 2nd NIC of your DUT - - .. code-block:: python - - DUT_NIC2_MAC = '' - -3. Run test: +2. Run test: .. code-block:: console @@ -289,8 +271,6 @@ To run VXLAN decapsulation tests: 'datapath/linux/openvswitch.ko', ] - DUT_NIC1_MAC = '' - TRAFFICGEN_PORT1_IP = '172.16.1.2' TRAFFICGEN_PORT2_IP = '192.168.1.11' @@ -302,7 +282,8 @@ To run VXLAN decapsulation tests: VXLAN_FRAME_L2 = {'srcmac': '01:02:03:04:05:06', - 'dstmac': DUT_NIC1_MAC + 'dstmac': + '06:05:04:03:02:01', } VXLAN_FRAME_L3 = {'proto': 'udp', @@ -349,8 +330,6 @@ To run GRE decapsulation tests: 'datapath/linux/openvswitch.ko', ] - DUT_NIC1_MAC = '' - TRAFFICGEN_PORT1_IP = '172.16.1.2' TRAFFICGEN_PORT2_IP = '192.168.1.11' @@ -362,7 +341,8 @@ To run GRE decapsulation tests: GRE_FRAME_L2 = {'srcmac': '01:02:03:04:05:06', - 'dstmac': DUT_NIC1_MAC + 'dstmac': + '06:05:04:03:02:01', } GRE_FRAME_L3 = {'proto': 'udp', @@ -408,8 +388,6 @@ To run GENEVE decapsulation tests: 'datapath/linux/openvswitch.ko', ] - DUT_NIC1_MAC = '' - TRAFFICGEN_PORT1_IP = '172.16.1.2' TRAFFICGEN_PORT2_IP = '192.168.1.11' @@ -421,7 +399,8 @@ To run GENEVE decapsulation tests: GENEVE_FRAME_L2 = {'srcmac': '01:02:03:04:05:06', - 'dstmac': DUT_NIC1_MAC + 'dstmac': + '06:05:04:03:02:01', } GENEVE_FRAME_L3 = {'proto': 'udp', -- cgit 1.2.3-korg