vswitches/ovs: integration TCs refactoring

Refactorization of the tests in for the new teardown functionality, that automatically deletes flows, ports and bridges when OVS stops.

JIRA: VSPERF-578

Change-Id: Ibe18f89c59ca5474a638808ed072cccd811ee75d
Signed-off-by: Richard Elias <richard.elias@tieto.com>
Reviewed-by: Martin Klozik <martin.klozik@tieto.com>
Reviewed-by: Al Morton <acmorton@att.com>
Reviewed-by: Christian Trautman <ctrautma@redhat.com>
Reviewed-by: Sridhar Rao <sridhar.rao@spirent.com>

5 files changed, 47 insertions, 346 deletions

diff --git a/conf/integration/01_testcases.conf b/conf/integration/01_testcases.conf
index 142ec812..bb478302 100644
--- a/conf/integration/01_testcases.conf
+++ b/conf/integration/01_testcases.conf
@@ -114,192 +114,6 @@ STEP_VSWITCH_PVVP_FLOWS_FINIT = [
     ['vswitch', 'del_flow', 'int_br0', {'in_port': '#STEP[3][1]'}],
 ] + STEP_VSWITCH_PVVP_FINIT
 
-STEP_VSWITCH_P4VP_INIT = STEP_VSWITCH_PVVP_INIT + [
-    ['vswitch', 'add_vport', 'int_br0'],            # STEP 7    vm3 ports
-    ['vswitch', 'add_vport', 'int_br0'],            # STEP 8
-    ['vswitch', 'add_vport', 'int_br0'],            # STEP 9    vm4 ports
-    ['vswitch', 'add_vport', 'int_br0'],            # STEP 10
-]
-
-STEP_VSWITCH_P4VP_FINIT = [
-    ['vswitch', 'del_port', 'int_br0', '#STEP[7][0]'],  # vm3 ports
-    ['vswitch', 'del_port', 'int_br0', '#STEP[8][0]'],
-    ['vswitch', 'del_port', 'int_br0', '#STEP[9][0]'],  # vm4 ports
-    ['vswitch', 'del_port', 'int_br0', '#STEP[10][0]'],
-] + STEP_VSWITCH_PVVP_FINIT
-
-STEP_VSWITCH_P4VP_FLOWS_INIT = STEP_VSWITCH_P4VP_INIT + [
-            ['vswitch', 'add_flow', 'int_br0', {'in_port': '#STEP[1][1]', \
-                'actions': ['output:#STEP[3][1]'], 'idle_timeout': '0'}],
-            ['vswitch', 'add_flow', 'int_br0', {'in_port': '#STEP[4][1]', \
-                'actions': ['output:#STEP[5][1]'], 'idle_timeout': '0'}],
-            ['vswitch', 'add_flow', 'int_br0', {'in_port': '#STEP[6][1]', \
-                'actions': ['output:#STEP[7][1]'], 'idle_timeout': '0'}],
-            ['vswitch', 'add_flow', 'int_br0', {'in_port': '#STEP[8][1]', \
-                'actions': ['output:#STEP[9][1]'], 'idle_timeout': '0'}],
-            ['vswitch', 'add_flow', 'int_br0', {'in_port': '#STEP[10][1]', \
-                'actions': ['output:#STEP[2][1]'], 'idle_timeout': '0'}],
-            ['vswitch', 'add_flow', 'int_br0', {'in_port': '#STEP[2][1]', \
-                'actions': ['output:#STEP[10][1]'], 'idle_timeout': '0'}],
-            ['vswitch', 'add_flow', 'int_br0', {'in_port': '#STEP[9][1]', \
-                'actions': ['output:#STEP[8][1]'], 'idle_timeout': '0'}],
-            ['vswitch', 'add_flow', 'int_br0', {'in_port': '#STEP[7][1]', \
-                'actions': ['output:#STEP[6][1]'], 'idle_timeout': '0'}],
-            ['vswitch', 'add_flow', 'int_br0', {'in_port': '#STEP[5][1]', \
-                'actions': ['output:#STEP[4][1]'], 'idle_timeout': '0'}],
-            ['vswitch', 'add_flow', 'int_br0', {'in_port': '#STEP[3][1]', \
-                'actions': ['output:#STEP[1][1]'], 'idle_timeout': '0'}],
-]
-
-STEP_VSWITCH_P4VP_FLOWS_FINIT = [
-    ['vswitch', 'dump_flows', 'int_br0'],
-    ['vswitch', 'del_flow', 'int_br0'],
-] + STEP_VSWITCH_P4VP_FINIT
-
-STEP_VSWITCH_2PHY_2VM_INIT = STEP_VSWITCH_PVVP_INIT
-
-STEP_VSWITCH_2PHY_2VM_FINIT = STEP_VSWITCH_PVVP_FINIT
-
-STEP_VSWITCH_2_PARALLEL_VM_FLOWS_INIT  = [
-            # Setup Flows to reply ICMPv6 and similar packets, so to
-            # avoid flooding the internal port with their re-transmissions
-            ['vswitch', 'add_flow', 'int_br0', \
-                {'priority': '1', 'dl_src': '00:00:00:00:00:01', \
-                'actions': ['output:#STEP[3][1]'], 'idle_timeout': '0'}],
-            ['vswitch', 'add_flow', 'int_br0', \
-                {'priority': '1', 'dl_src': '00:00:00:00:00:02', \
-                'actions': ['output:#STEP[4][1]'], 'idle_timeout': '0'}],
-            ['vswitch', 'add_flow', 'int_br0', \
-                {'priority': '1', 'dl_src': '00:00:00:00:00:03', \
-                'actions': ['output:#STEP[5][1]'], 'idle_timeout': '0'}],
-            ['vswitch', 'add_flow', 'int_br0', \
-                {'priority': '1', 'dl_src': '00:00:00:00:00:04', \
-                'actions': ['output:#STEP[6][1]'], 'idle_timeout': '0'}],
-            # Forward UDP packets depending on dest port
-            ['vswitch', 'add_flow', 'int_br0', {'in_port': '#STEP[1][1]', \
-                'dl_type': '0x0800', 'nw_proto': '17', 'udp_dst': '0', \
-                'actions': ['output:#STEP[3][1]'], 'idle_timeout': '0'}],
-            ['vswitch', 'add_flow', 'int_br0', {'in_port': '#STEP[1][1]', \
-                'dl_type': '0x0800', 'nw_proto': '17', 'udp_dst': '1', \
-                'actions': ['output:#STEP[5][1]'], 'idle_timeout': '0'}],
-            # Send VM outputs to phy port #2
-            ['vswitch', 'add_flow', 'int_br0', {'in_port': '#STEP[4][1]', \
-                'actions': ['output:#STEP[2][1]'], 'idle_timeout': '0'}],
-            ['vswitch', 'add_flow', 'int_br0', {'in_port': '#STEP[6][1]', \
-                'actions': ['output:#STEP[2][1]'], 'idle_timeout': '0'}],
-]
-
-STEP_VSWITCH_2PHY_4VM_INIT = STEP_VSWITCH_2PHY_2VM_INIT + [
-    ['vswitch', 'add_vport', 'int_br0'],            # STEP 7    vm3 ports
-    ['vswitch', 'add_vport', 'int_br0'],            # STEP 8
-    ['vswitch', 'add_vport', 'int_br0'],            # STEP 9    vm4 ports
-    ['vswitch', 'add_vport', 'int_br0'],            # STEP 10
-]
-
-STEP_VSWITCH_2PHY_4VM_FINIT = [
-    ['vswitch', 'del_port', 'int_br0', '#STEP[7][0]'],  # vm3 ports
-    ['vswitch', 'del_port', 'int_br0', '#STEP[8][0]'],
-    ['vswitch', 'del_port', 'int_br0', '#STEP[9][0]'],  # vm4 ports
-    ['vswitch', 'del_port', 'int_br0', '#STEP[10][0]'],
-] + STEP_VSWITCH_2PHY_2VM_FINIT
-
-STEP_VSWITCH_FLOWS_FINIT = [
-    ['vswitch', 'dump_flows', 'int_br0'],
-    ['vswitch', 'del_flow', 'int_br0'],
-]
-
-STEP_VSWITCH_4_PARALLEL_VM_FLOWS_INIT = [
-            # Setup Flows to reply ICMPv6 and similar packets, so to
-            # avoid flooding the internal port with their re-transmissions
-            ['vswitch', 'add_flow', 'int_br0', \
-                {'priority': '1', 'dl_src': '00:00:00:00:00:01', \
-                'actions': ['output:#STEP[3][1]'], 'idle_timeout': '0'}],
-            ['vswitch', 'add_flow', 'int_br0', \
-                {'priority': '1', 'dl_src': '00:00:00:00:00:02', \
-                'actions': ['output:#STEP[4][1]'], 'idle_timeout': '0'}],
-            ['vswitch', 'add_flow', 'int_br0', \
-                {'priority': '1', 'dl_src': '00:00:00:00:00:03', \
-                'actions': ['output:#STEP[5][1]'], 'idle_timeout': '0'}],
-            ['vswitch', 'add_flow', 'int_br0', \
-                {'priority': '1', 'dl_src': '00:00:00:00:00:04', \
-                'actions': ['output:#STEP[6][1]'], 'idle_timeout': '0'}],
-            ['vswitch', 'add_flow', 'int_br0', \
-                {'priority': '1', 'dl_src': '00:00:00:00:00:05', \
-                'actions': ['output:#STEP[7][1]'], 'idle_timeout': '0'}],
-            ['vswitch', 'add_flow', 'int_br0', \
-                {'priority': '1', 'dl_src': '00:00:00:00:00:06', \
-                'actions': ['output:#STEP[8][1]'], 'idle_timeout': '0'}],
-            ['vswitch', 'add_flow', 'int_br0', \
-                {'priority': '1', 'dl_src': '00:00:00:00:00:07', \
-                'actions': ['output:#STEP[9][1]'], 'idle_timeout': '0'}],
-            ['vswitch', 'add_flow', 'int_br0', \
-                {'priority': '1', 'dl_src': '00:00:00:00:00:08', \
-                'actions': ['output:#STEP[10][1]'], 'idle_timeout': '0'}],
-            # Forward UDP packets depending on dest port
-            ['vswitch', 'add_flow', 'int_br0', {'in_port': '#STEP[1][1]', \
-                'dl_type': '0x0800', 'nw_proto': '17', 'udp_dst': '0', \
-                'actions': ['output:#STEP[3][1]'], 'idle_timeout': '0'}],
-            ['vswitch', 'add_flow', 'int_br0', {'in_port': '#STEP[1][1]', \
-                'dl_type': '0x0800', 'nw_proto': '17', 'udp_dst': '1', \
-                'actions': ['output:#STEP[5][1]'], 'idle_timeout': '0'}],
-            ['vswitch', 'add_flow', 'int_br0', {'in_port': '#STEP[1][1]', \
-                'dl_type': '0x0800', 'nw_proto': '17', 'udp_dst': '2', \
-                'actions': ['output:#STEP[7][1]'], 'idle_timeout': '0'}],
-            ['vswitch', 'add_flow', 'int_br0', {'in_port': '#STEP[1][1]', \
-                'dl_type': '0x0800', 'nw_proto': '17', 'udp_dst': '3', \
-                'actions': ['output:#STEP[9][1]'], 'idle_timeout': '0'}],
-            # Send VM outputs to phy port #2
-            ['vswitch', 'add_flow', 'int_br0', {'in_port': '#STEP[4][1]', \
-                'actions': ['output:#STEP[2][1]'], 'idle_timeout': '0'}],
-            ['vswitch', 'add_flow', 'int_br0', {'in_port': '#STEP[6][1]', \
-                'actions': ['output:#STEP[2][1]'], 'idle_timeout': '0'}],
-            ['vswitch', 'add_flow', 'int_br0', {'in_port': '#STEP[8][1]', \
-                'actions': ['output:#STEP[2][1]'], 'idle_timeout': '0'}],
-            ['vswitch', 'add_flow', 'int_br0', {'in_port': '#STEP[10][1]', \
-                'actions': ['output:#STEP[2][1]'], 'idle_timeout': '0'}],
-]
-
-STEP_VSWITCH_2PHY_6VM_INIT = STEP_VSWITCH_2PHY_4VM_INIT + [
-            ['vswitch', 'add_vport', 'int_br0'],        # STEP 11   vm5    vhu8
-            ['vswitch', 'add_vport', 'int_br0'],        # STEP 12          vhu9
-            ['vswitch', 'add_vport', 'int_br0'],        # STEP 13   vm6    vhu10
-            ['vswitch', 'add_vport', 'int_br0'],        # STEP 14          vhu11
-]
-
-STEP_VSWITCH_6_PARALLEL_VM_FLOWS_INIT = STEP_VSWITCH_4_PARALLEL_VM_FLOWS_INIT + [
-            ['vswitch', 'add_flow', 'int_br0', \
-                {'priority': '1', 'dl_src': '00:00:00:00:00:09', \
-                'actions': ['output:#STEP[11][1]'], 'idle_timeout': '0'}],
-            ['vswitch', 'add_flow', 'int_br0', \
-                {'priority': '1', 'dl_src': '00:00:00:00:00:0a', \
-                'actions': ['output:#STEP[12][1]'], 'idle_timeout': '0'}],
-            ['vswitch', 'add_flow', 'int_br0', \
-                {'priority': '1', 'dl_src': '00:00:00:00:00:0b', \
-                'actions': ['output:#STEP[13][1]'], 'idle_timeout': '0'}],
-            ['vswitch', 'add_flow', 'int_br0', \
-                {'priority': '1', 'dl_src': '00:00:00:00:00:0c', \
-                'actions': ['output:#STEP[14][1]'], 'idle_timeout': '0'}],
-            # Forward UDP packets depending on dest port
-            ['vswitch', 'add_flow', 'int_br0', {'in_port': '#STEP[1][1]', \
-                'dl_type': '0x0800', 'nw_proto': '17', 'udp_dst': '4', \
-                'actions': ['output:#STEP[11][1]'], 'idle_timeout': '0'}],
-            ['vswitch', 'add_flow', 'int_br0', {'in_port': '#STEP[1][1]', \
-                'dl_type': '0x0800', 'nw_proto': '17', 'udp_dst': '5', \
-                'actions': ['output:#STEP[13][1]'], 'idle_timeout': '0'}],
-            # Send VM outputs to phy port #2
-            ['vswitch', 'add_flow', 'int_br0', {'in_port': '#STEP[12][1]', \
-                'actions': ['output:#STEP[2][1]'], 'idle_timeout': '0'}],
-            ['vswitch', 'add_flow', 'int_br0', {'in_port': '#STEP[14][1]', \
-                'actions': ['output:#STEP[2][1]'], 'idle_timeout': '0'}],
-]
-
-STEP_VSWITCH_2PHY_6VM_FINIT = [
-            ['vswitch', 'del_port', 'int_br0', '#STEP[11][0]'],  # vm5 ports
-            ['vswitch', 'del_port', 'int_br0', '#STEP[12][0]'],
-            ['vswitch', 'del_port', 'int_br0', '#STEP[13][0]'],  # vm6 ports
-            ['vswitch', 'del_port', 'int_br0', '#STEP[14][0]'],
-] + STEP_VSWITCH_2PHY_4VM_FINIT
-
 #
 # Definition of integration tests
 #
@@ -655,101 +469,45 @@ INTEGRATION_TESTS = [
                      STEP_VSWITCH_PVVP_FLOWS_FINIT
     },
     {
-        "Name": "vswitch_p4vp",
-        "Description": "Just configure 4 chained vnfs",
-        "Deployment": "clean",
-        "TestSteps": STEP_VSWITCH_P4VP_FLOWS_INIT +
-        [
-            ['vnf1', 'start'],
-            ['vnf2', 'start'],
-            ['vnf3', 'start'],
-            ['vnf4', 'start'],
-            ['vnf1', 'stop'],
-            ['vnf2', 'stop'],
-            ['vnf3', 'stop'],
-            ['vnf4', 'stop'],
-        ] +
-        STEP_VSWITCH_P4VP_FLOWS_FINIT
-    },
-    {
         "Name": "vswitch_p4vp_tput",
-        "Description": "4 chained vnfs, execute RFC2544 throughput test",
-        "Deployment": "clean",
-        "TestSteps": STEP_VSWITCH_P4VP_FLOWS_INIT +
-        [
-            ['vnf1', 'start'],
-            ['vnf2', 'start'],
-            ['vnf3', 'start'],
-            ['vnf4', 'start'],
-            ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_throughput', \
-                'bidir' : 'True'}],
-            ['vnf1', 'stop'],
-            ['vnf2', 'stop'],
-            ['vnf3', 'stop'],
-            ['vnf4', 'stop'],
-        ] +
-        STEP_VSWITCH_P4VP_FLOWS_FINIT
+        "Description": "4 chained vnfs, execute RFC2544 throughput test, deployment pvvp4",
+        "Deployment": "pvvp4",
+        "Parameters" : {
+            "TRAFFIC" : {
+                "traffic_type" : "rfc2544_throughput",
+            },
+        },
     },
     {
         "Name": "vswitch_p4vp_back2back",
-        "Description": "4 chained vnfs, execute RFC2544 back2back test",
-        "Deployment": "clean",
-        "TestSteps": STEP_VSWITCH_P4VP_FLOWS_INIT +
-        [
-            ['vnf1', 'start'],
-            ['vnf2', 'start'],
-            ['vnf3', 'start'],
-            ['vnf4', 'start'],
-            ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_back2back', \
-                'bidir' : 'True'}],
-            ['vnf1', 'stop'],
-            ['vnf2', 'stop'],
-            ['vnf3', 'stop'],
-            ['vnf4', 'stop'],
-        ] +
-        STEP_VSWITCH_P4VP_FLOWS_FINIT
+        "Description": "4 chained vnfs, execute RFC2544 back2back test, deployment pvvp4",
+        "Deployment": "pvvp4",
+        "Parameters" : {
+            "TRAFFIC" : {
+                "traffic_type" : "rfc2544_back2back",
+            },
+        },
     },
     {
         "Name": "vswitch_p4vp_cont",
-        "Description": "4 chained vnfs, execute RFC2544 continuous stream test",
-        "Deployment": "clean",
-        "TestSteps": STEP_VSWITCH_P4VP_FLOWS_INIT +
-        [
-            ['vnf1', 'start'],
-            ['vnf2', 'start'],
-            ['vnf3', 'start'],
-            ['vnf4', 'start'],
-            ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_continuous', \
-                'bidir' : 'True'}],
-            ['vnf1', 'stop'],
-            ['vnf2', 'stop'],
-            ['vnf3', 'stop'],
-            ['vnf4', 'stop'],
-        ] +
-        STEP_VSWITCH_P4VP_FLOWS_FINIT
+        "Description": "4 chained vnfs, execute RFC2544 continuous stream test, deployment pvvp4",
+        "Deployment": "pvvp4",
+        "Parameters" : {
+            "TRAFFIC" : {
+                "traffic_type" : "rfc2544_continuous",
+            },
+        },
     },
     {
         "Name": "vswitch_p4vp_all",
-        "Description": "4 chained vnfs, execute RFC2544 throughput test",
-        "Deployment": "clean",
-        "TestSteps": STEP_VSWITCH_P4VP_FLOWS_INIT +
+        "Description": "4 chained vnfs, execute RFC2544 throughput tests, deployment pvvp4",
+        "Deployment": "pvvp4",
+        "TestSteps":
         [
-            ['vnf1', 'start'],
-            ['vnf2', 'start'],
-            ['vnf3', 'start'],
-            ['vnf4', 'start'],
-            ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_throughput', \
-                'bidir' : 'True'}],
-            ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_back2back', \
-                'bidir' : 'True'}],
-            ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_continuous', \
-                'bidir' : 'True'}],
-            ['vnf1', 'stop'],
-            ['vnf2', 'stop'],
-            ['vnf3', 'stop'],
-            ['vnf4', 'stop'],
-        ] +
-        STEP_VSWITCH_P4VP_FLOWS_FINIT
+            ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_throughput'}],
+            ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_back2back'}],
+            ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_continuous'}],
+        ]
     },
     {
       # Topology: 2 Parallel PVP connections
@@ -758,25 +516,13 @@ INTEGRATION_TESTS = [
       # or add "Parameters" option to the test definition:
       #     "Parameters" : {'GUEST_LOOPBACK' : ['linux_bridge'],},
         "Name": "2pvp_udp_dest_flows",
-        "Description": "RFC2544 Continuous TC with 2 Parallel VMs, flows on UDP Dest Port",
-        "Deployment": "clean",
+        "Description": "RFC2544 Continuous TC with 2 Parallel VMs, flows on UDP Dest Port, deployment pvpv2",
+        "Deployment": "pvpv2",
         "Parameters" : {
             "TRAFFIC" : {
-                "multistream" : 2,
-                "stream_type" : "L4",
+                "traffic_type" : "rfc2544_continuous",
             },
         },
-        "TestSteps": STEP_VSWITCH_2PHY_2VM_INIT +
-            STEP_VSWITCH_2_PARALLEL_VM_FLOWS_INIT + [
-            # Start 2 VMs
-            ['vnf1', 'start'],
-            ['vnf2', 'start'],
-            ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_continuous', 'bidir' : 'False'}],
-            ['vnf1', 'stop'],
-            ['vnf2', 'stop'],
-            # Clean up
-        ] + STEP_VSWITCH_FLOWS_FINIT +
-            STEP_VSWITCH_2PHY_2VM_FINIT
     },
     {
       # Topology: 4 Parallel PVP connections
@@ -785,29 +531,13 @@ INTEGRATION_TESTS = [
       # or add "Parameters" option to the test definition:
       #     "Parameters" : {'GUEST_LOOPBACK' : ['linux_bridge'],},
         "Name": "4pvp_udp_dest_flows",
-        "Description": "RFC2544 Continuous TC with 4 Parallel VMs, flows on UDP Dest Port",
-        "Deployment": "clean",
+        "Description": "RFC2544 Continuous TC with 4 Parallel VMs, flows on UDP Dest Port, deployment pvpv4",
+        "Deployment": "pvpv4",
         "Parameters" : {
             "TRAFFIC" : {
-                "multistream" : 4,
-                "stream_type" : "L4",
+                "traffic_type" : "rfc2544_continuous",
             },
         },
-        "TestSteps": STEP_VSWITCH_2PHY_4VM_INIT +
-            STEP_VSWITCH_4_PARALLEL_VM_FLOWS_INIT + [
-            # Start 4 VMs
-            ['vnf1', 'start'],
-            ['vnf2', 'start'],
-            ['vnf3', 'start'],
-            ['vnf4', 'start'],
-            ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_continuous', 'bidir' : 'False'}],
-            ['vnf1', 'stop'],
-            ['vnf2', 'stop'],
-            ['vnf3', 'stop'],
-            ['vnf4', 'stop'],
-            # Clean up
-        ] + STEP_VSWITCH_FLOWS_FINIT +
-            STEP_VSWITCH_2PHY_4VM_FINIT
     },
     {
       # Topology: 6 Parallel PVP connections
@@ -816,32 +546,13 @@ INTEGRATION_TESTS = [
       # or add "Parameters" option to the test definition:
       #     "Parameters" : {'GUEST_LOOPBACK' : ['linux_bridge'],},
         "Name": "6pvp_udp_dest_flows",
-        "Description": "RFC2544 Continuous TC with 6 Parallel VMs, flows on UDP Dest Port",
-        "Deployment": "clean",
+        "Description": "RFC2544 Continuous TC with 6 Parallel VMs, flows on UDP Dest Port, deployment pvpv6",
+        "Deployment": "pvpv6",
         "Parameters" : {
             "TRAFFIC" : {
-                "multistream" : 6,
-                "stream_type" : "L4",
+                "traffic_type" : "rfc2544_continuous",
             },
         },
-        "TestSteps": STEP_VSWITCH_2PHY_6VM_INIT +
-            STEP_VSWITCH_6_PARALLEL_VM_FLOWS_INIT + [
-            # Start VMs
-            ['vnf1', 'start'],
-            ['vnf2', 'start'],
-            ['vnf3', 'start'],
-            ['vnf4', 'start'],
-            ['vnf5', 'start'],
-            ['vnf6', 'start'],
-            ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_continuous', 'bidir' : 'False'}],
-            ['vnf1', 'stop'],
-            ['vnf2', 'stop'],
-            ['vnf3', 'stop'],
-            ['vnf4', 'stop'],
-            ['vnf5', 'stop'],
-            ['vnf6', 'stop'],
-        ] + STEP_VSWITCH_FLOWS_FINIT +
-        STEP_VSWITCH_2PHY_6VM_FINIT
     },
     {
         # Testcase for verification of vHost User NUMA awareness feature
diff --git a/conf/integration/01a_testcases_l34_vxlan.conf b/conf/integration/01a_testcases_l34_vxlan.conf
index 17c0d6ff..cd4b9e90 100644
--- a/conf/integration/01a_testcases_l34_vxlan.conf
+++ b/conf/integration/01a_testcases_l34_vxlan.conf
@@ -1,4 +1,4 @@
-# Copyright 2017 Intel Corporation.
+# Copyright 2017-2018 Intel Corporation and Tieto.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -63,7 +63,6 @@ INTEGRATION_TESTS = INTEGRATION_TESTS + [
                  'cmds.close()'],
                 ['tools', 'exec_shell', "sudo $TOOLS['ovs-ofctl'] -O OpenFlow13 --bundle add-flows int_br0 /tmp/ovsofctl_cmds.txt"],
                 ['trafficgen', 'send_traffic', {}],
-                ['vswitch', 'del_flow', 'int_br0'],
             ] +
             STEP_VSWITCH_P2P_FINIT
     },
@@ -93,7 +92,6 @@ INTEGRATION_TESTS = INTEGRATION_TESTS + [
                   'actions': ['output:#STEP[2][1]'], 'idle_timeout': '0' }],
                 ['trafficgen', 'send_traffic', {}],
                 ['vswitch', 'dump_flows', 'int_br0'],
-                ['vswitch', 'del_flow', 'int_br0'],
             ] +
             STEP_VSWITCH_P2P_FINIT
     },
@@ -130,7 +128,6 @@ INTEGRATION_TESTS = INTEGRATION_TESTS + [
                 ['trafficgen', 'send_traffic', {}],
                 ['vswitch', 'dump_flows', 'int_br0'],
                 ['vnf', 'stop'],
-                ['vswitch', 'del_flow', 'int_br0'],
             ] +                                                                                                                          STEP_VSWITCH_PVP_FINIT
     },
     {
@@ -172,7 +169,6 @@ INTEGRATION_TESTS = INTEGRATION_TESTS + [
                 ['vswitch', 'dump_flows', 'int_br0'],
                 ['vnf2', 'stop'],
                 ['vnf1', 'stop'],
-                ['vswitch', 'del_flow', 'int_br0'],
             ] +
             STEP_VSWITCH_PVVP_FINIT
     },
@@ -213,7 +209,6 @@ INTEGRATION_TESTS = INTEGRATION_TESTS + [
                 ['tools', 'exec_shell', "sudo $TOOLS['ovs-ofctl'] -O OpenFlow13 --bundle "
                                         "add-flows int_br0 /tmp/ovsofctl_cmds.txt"],
                 ['trafficgen', 'send_traffic', {}],
-                ['vswitch', 'del_flow', 'int_br0'],
             ] +
             STEP_VSWITCH_P2P_FINIT
     },
@@ -249,7 +244,6 @@ INTEGRATION_TESTS = INTEGRATION_TESTS + [
                  'actions': ['output:#STEP[2][1]'], 'idle_timeout': '0'}],
                 ['trafficgen', 'send_traffic', {}],
                 ['vswitch', 'dump_flows', 'int_br0'],
-                ['vswitch', 'del_flow', 'int_br0'],
             ] +
             STEP_VSWITCH_P2P_FINIT
     },
@@ -293,7 +287,6 @@ INTEGRATION_TESTS = INTEGRATION_TESTS + [
                 ['trafficgen', 'send_traffic', {}],
                 ['vswitch', 'dump_flows', 'int_br0'],
                 ['vnf', 'stop'],
-                ['vswitch', 'del_flow', 'int_br0'],
             ] +
             STEP_VSWITCH_PVP_FINIT
     },
@@ -344,7 +337,6 @@ INTEGRATION_TESTS = INTEGRATION_TESTS + [
                 ['vswitch', 'dump_flows', 'int_br0'],
                 ['vnf2', 'stop'],
                 ['vnf1', 'stop'],
-                ['vswitch', 'del_flow', 'int_br0'],
             ] +
             STEP_VSWITCH_PVVP_FINIT
     },
diff --git a/conf/integration/01b_dpdk_regression_tests.conf b/conf/integration/01b_dpdk_regression_tests.conf
index 7e4fe74f..ed9c1e60 100644
--- a/conf/integration/01b_dpdk_regression_tests.conf
+++ b/conf/integration/01b_dpdk_regression_tests.conf
@@ -170,9 +170,6 @@ INTEGRATION_TESTS = INTEGRATION_TESTS + [
                         ['tools', 'exec_shell', 'sudo $TOOLS["ovs-vsctl"] show',
                                                 '|Error attaching device.*$NICS[0]["pci"]'],
                         ['tools', 'assert', 'not len(#STEP[-1])'],
-                        # clean up
-                        ['vswitch', 'del_port', 'int_br0', '#STEP[port2][0]'],
-                        ['vswitch', 'del_switch', 'int_br0'],
                      ]
     },
     {
diff --git a/docs/testing/user/userguide/testlist.rst b/docs/testing/user/userguide/testlist.rst
index 3d4c28cf..fe8c840a 100644
--- a/docs/testing/user/userguide/testlist.rst
+++ b/docs/testing/user/userguide/testlist.rst
@@ -68,14 +68,13 @@ vswitch_pvvp_tput                      vSwitch - configure switch, two chained v
 vswitch_pvvp_back2back                 vSwitch - configure switch, two chained vnfs and execute RFC2544 back2back test
 vswitch_pvvp_cont                      vSwitch - configure switch, two chained vnfs and execute RFC2544 continuous stream test
 vswitch_pvvp_all                       vSwitch - configure switch, two chained vnfs and execute all test types
-vswitch_p4vp                           Just configure 4 chained vnfs
-vswitch_p4vp_tput                      4 chained vnfs, execute RFC2544 throughput test
-vswitch_p4vp_back2back                 4 chained vnfs, execute RFC2544 back2back test
-vswitch_p4vp_cont                      4 chained vnfs, execute RFC2544 continuous stream test
-vswitch_p4vp_all                       4 chained vnfs, execute RFC2544 throughput test
-2pvp_udp_dest_flows                    RFC2544 Continuous TC with 2 Parallel VMs, flows on UDP Dest Port
-4pvp_udp_dest_flows                    RFC2544 Continuous TC with 4 Parallel VMs, flows on UDP Dest Port
-6pvp_udp_dest_flows                    RFC2544 Continuous TC with 6 Parallel VMs, flows on UDP Dest Port
+vswitch_p4vp_tput                      4 chained vnfs, execute RFC2544 throughput test, deployment pvvp4
+vswitch_p4vp_back2back                 4 chained vnfs, execute RFC2544 back2back test, deployment pvvp4
+vswitch_p4vp_cont                      4 chained vnfs, execute RFC2544 continuous stream test, deployment pvvp4
+vswitch_p4vp_all                       4 chained vnfs, execute RFC2544 throughput tests, deployment pvvp4
+2pvp_udp_dest_flows                    RFC2544 Continuous TC with 2 Parallel VMs, flows on UDP Dest Port, deployment pvpv2
+4pvp_udp_dest_flows                    RFC2544 Continuous TC with 4 Parallel VMs, flows on UDP Dest Port, deployment pvpv4
+6pvp_udp_dest_flows                    RFC2544 Continuous TC with 6 Parallel VMs, flows on UDP Dest Port, deployment pvpv6
 vhost_numa_awareness                   vSwitch DPDK - verify that PMD threads are served by the same NUMA slot as QEMU instances
 ixnet_pvp_tput_1nic                    PVP Scenario with 1 port towards IXIA
 vswitch_vports_add_del_connection_vpp  VPP: vSwitch - configure switch with vports, add and delete connection
diff --git a/docs/testing/user/userguide/teststeps.rst b/docs/testing/user/userguide/teststeps.rst
index e7ccce9a..3f91a9d2 100644
--- a/docs/testing/user/userguide/teststeps.rst
+++ b/docs/testing/user/userguide/teststeps.rst
@@ -764,6 +764,8 @@ destination UDP port.
         ]
     },
 
+The same test can be written in a shorter form using "Deployment" : "pvpv".
+
 To run the test:
 
   .. code-block:: console