Merge "connections: Introduction of generic API"

5 files changed, 149 insertions, 142 deletions

diff --git a/conf/01_testcases.conf b/conf/01_testcases.conf
index 4a68ab3f..d766df65 100755
--- a/conf/01_testcases.conf
+++ b/conf/01_testcases.conf
@@ -1,4 +1,4 @@
-# Copyright 2015-2017 Intel Corporation.
+# Copyright 2015-2018 Intel Corporation., Tieto
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -92,82 +92,6 @@
 # "Dependency": [Test_Case_Name |None],
 
 #
-# VPP specific macros used in TC defintions
-#
-VPP_P2P =   [
-                ['vswitch', 'add_switch', 'int_br0'],           # STEP 0
-                ['vswitch', 'add_phy_port', 'int_br0'],         # STEP 1
-                ['vswitch', 'add_phy_port', 'int_br0'],         # STEP 2
-                ['vswitch', 'add_connection', 'int_br0', '#STEP[1][0]', '#STEP[2][0]', True],
-                ['vswitch', 'add_connection', 'int_br0', '#STEP[2][0]', '#STEP[1][0]', True],
-                ['trafficgen', 'send_traffic', {}],
-                ['vswitch', 'dump_connections', 'int_br0'],
-                ['vswitch', 'del_connection', 'int_br0', '#STEP[1][0]', '#STEP[2][0]', True],
-                ['vswitch', 'del_connection', 'int_br0', '#STEP[2][0]', '#STEP[1][0]', True],
-                ['vswitch', 'del_port', 'int_br0', '#STEP[1][0]'],
-                ['vswitch', 'del_port', 'int_br0', '#STEP[2][0]'],
-                ['vswitch', 'del_switch', 'int_br0'],
-            ]
-VPP_PVP =   [
-                ['vswitch', 'add_switch', 'int_br0'],           # STEP 0
-                ['vswitch', 'add_phy_port', 'int_br0'],         # STEP 1
-                ['vswitch', 'add_phy_port', 'int_br0'],         # STEP 2
-                ['vswitch', 'add_vport', 'int_br0'],            # STEP 3
-                ['vswitch', 'add_vport', 'int_br0'],            # STEP 4
-                ['vswitch', 'add_connection', 'int_br0', '#STEP[1][0]', '#STEP[3][0]', True],
-                ['vswitch', 'add_connection', 'int_br0', '#STEP[4][0]', '#STEP[2][0]', True],
-                ['vswitch', 'add_connection', 'int_br0', '#STEP[2][0]', '#STEP[4][0]', True],
-                ['vswitch', 'add_connection', 'int_br0', '#STEP[3][0]', '#STEP[1][0]', True],
-                ['vnf', 'start'],
-                ['trafficgen', 'send_traffic', {}],
-                ['vnf', 'stop'],
-                ['vswitch', 'dump_connections', 'int_br0'],
-                ['vswitch', 'del_connection', 'int_br0', '#STEP[1][0]', '#STEP[3][0]', True],
-                ['vswitch', 'del_connection', 'int_br0', '#STEP[4][0]', '#STEP[2][0]', True],
-                ['vswitch', 'del_connection', 'int_br0', '#STEP[2][0]', '#STEP[4][0]', True],
-                ['vswitch', 'del_connection', 'int_br0', '#STEP[3][0]', '#STEP[1][0]', True],
-                ['vswitch', 'del_port', 'int_br0', '#STEP[1][0]'],
-                ['vswitch', 'del_port', 'int_br0', '#STEP[2][0]'],
-                ['vswitch', 'del_port', 'int_br0', '#STEP[3][0]'],
-                ['vswitch', 'del_port', 'int_br0', '#STEP[4][0]'],
-                ['vswitch', 'del_switch', 'int_br0'],
-            ]
-VPP_PVVP =   [
-                ['vswitch', 'add_switch', 'int_br0'],           # STEP 0
-                ['vswitch', 'add_phy_port', 'int_br0'],         # STEP 1
-                ['vswitch', 'add_phy_port', 'int_br0'],         # STEP 2
-                ['vswitch', 'add_vport', 'int_br0'],            # STEP 3
-                ['vswitch', 'add_vport', 'int_br0'],            # STEP 4
-                ['vswitch', 'add_vport', 'int_br0'],            # STEP 5
-                ['vswitch', 'add_vport', 'int_br0'],            # STEP 6
-                ['vswitch', 'add_connection', 'int_br0', '#STEP[1][0]', '#STEP[3][0]', True],
-                ['vswitch', 'add_connection', 'int_br0', '#STEP[4][0]', '#STEP[5][0]', True],
-                ['vswitch', 'add_connection', 'int_br0', '#STEP[6][0]', '#STEP[2][0]', True],
-                ['vswitch', 'add_connection', 'int_br0', '#STEP[2][0]', '#STEP[6][0]', True],
-                ['vswitch', 'add_connection', 'int_br0', '#STEP[5][0]', '#STEP[4][0]', True],
-                ['vswitch', 'add_connection', 'int_br0', '#STEP[3][0]', '#STEP[1][0]', True],
-                ['vnf1', 'start'],
-                ['vnf2', 'start'],
-                ['trafficgen', 'send_traffic', {}],
-                ['vnf2', 'stop'],
-                ['vnf1', 'stop'],
-                ['vswitch', 'dump_connections', 'int_br0'],
-                ['vswitch', 'del_connection', 'int_br0', '#STEP[1][0]', '#STEP[3][0]', True],
-                ['vswitch', 'del_connection', 'int_br0', '#STEP[4][0]', '#STEP[5][0]', True],
-                ['vswitch', 'del_connection', 'int_br0', '#STEP[6][0]', '#STEP[2][0]', True],
-                ['vswitch', 'del_connection', 'int_br0', '#STEP[2][0]', '#STEP[6][0]', True],
-                ['vswitch', 'del_connection', 'int_br0', '#STEP[5][0]', '#STEP[4][0]', True],
-                ['vswitch', 'del_connection', 'int_br0', '#STEP[3][0]', '#STEP[1][0]', True],
-                ['vswitch', 'del_port', 'int_br0', '#STEP[1][0]'],
-                ['vswitch', 'del_port', 'int_br0', '#STEP[2][0]'],
-                ['vswitch', 'del_port', 'int_br0', '#STEP[3][0]'],
-                ['vswitch', 'del_port', 'int_br0', '#STEP[4][0]'],
-                ['vswitch', 'del_port', 'int_br0', '#STEP[5][0]'],
-                ['vswitch', 'del_port', 'int_br0', '#STEP[6][0]'],
-                ['vswitch', 'del_switch', 'int_br0'],
-            ]
-
-#
 # Generic performance TC definitions
 #
 PERFORMANCE_TESTS = [
@@ -397,9 +321,14 @@ PERFORMANCE_TESTS = [
             },
         },
     },
+    #
+    # Backward compatible definition of VPP TCs.
+    # It will be removed after CI reporting will be fixed to use
+    # default TCs for VPP reporting.
+    #
     {
         "Name": "phy2phy_tput_vpp",
-        "Deployment": "clean",
+        "Deployment": "p2p",
         "Description": "VPP: LTD.Throughput.RFC2544.PacketLossRatio",
         "vSwitch" : "VppDpdkVhost",
         "Parameters" : {
@@ -407,11 +336,10 @@ PERFORMANCE_TESTS = [
                 "traffic_type" : "rfc2544_throughput",
             },
         },
-        "TestSteps": VPP_P2P,
     },
     {
         "Name": "phy2phy_cont_vpp",
-        "Deployment": "clean",
+        "Deployment": "p2p",
         "Description": "VPP: Phy2Phy Continuous Stream",
         "vSwitch" : "VppDpdkVhost",
         "Parameters" : {
@@ -420,11 +348,10 @@ PERFORMANCE_TESTS = [
                 "frame_rate" : 100,
             },
         },
-        "TestSteps": VPP_P2P,
     },
     {
         "Name": "phy2phy_back2back_vpp",
-        "Deployment": "clean",
+        "Deployment": "p2p",
         "Description": "VPP: LTD.Throughput.RFC2544.BackToBackFrames",
         "vSwitch" : "VppDpdkVhost",
         "Parameters" : {
@@ -432,11 +359,10 @@ PERFORMANCE_TESTS = [
                 "traffic_type" : "rfc2544_back2back",
             },
         },
-        "TestSteps": VPP_P2P,
     },
     {
         "Name": "pvp_tput_vpp",
-        "Deployment": "clean",
+        "Deployment": "pvp",
         "Description": "VPP: LTD.Throughput.RFC2544.PacketLossRatio",
         "vSwitch" : "VppDpdkVhost",
         "Parameters" : {
@@ -444,11 +370,10 @@ PERFORMANCE_TESTS = [
                 "traffic_type" : "rfc2544_throughput",
             },
         },
-        "TestSteps": VPP_PVP,
     },
     {
         "Name": "pvp_cont_vpp",
-        "Deployment": "clean",
+        "Deployment": "pvp",
         "Description": "VPP: PVP Continuous Stream",
         "vSwitch" : "VppDpdkVhost",
         "Parameters" : {
@@ -456,11 +381,10 @@ PERFORMANCE_TESTS = [
                 "traffic_type" : "rfc2544_continuous",
             },
         },
-        "TestSteps": VPP_PVP,
     },
     {
         "Name": "pvp_back2back_vpp",
-        "Deployment": "clean",
+        "Deployment": "pvp",
         "Description": "VPP: LTD.Throughput.RFC2544.BackToBackFrames",
         "vSwitch" : "VppDpdkVhost",
         "Parameters" : {
@@ -468,11 +392,10 @@ PERFORMANCE_TESTS = [
                 "traffic_type" : "rfc2544_back2back",
             },
         },
-        "TestSteps": VPP_PVP,
     },
     {
         "Name": "pvvp_tput_vpp",
-        "Deployment": "clean",
+        "Deployment": "pvvp",
         "Description": "VPP: LTD.Throughput.RFC2544.PacketLossRatio",
         "vSwitch" : "VppDpdkVhost",
         "Parameters" : {
@@ -480,11 +403,10 @@ PERFORMANCE_TESTS = [
                 "traffic_type" : "rfc2544_throughput",
             },
         },
-        "TestSteps": VPP_PVVP,
     },
     {
         "Name": "pvvp_cont_vpp",
-        "Deployment": "clean",
+        "Deployment": "pvvp",
         "Description": "VPP: PVP Continuous Stream",
         "vSwitch" : "VppDpdkVhost",
         "Parameters" : {
@@ -492,11 +414,10 @@ PERFORMANCE_TESTS = [
                 "traffic_type" : "rfc2544_continuous",
             },
         },
-        "TestSteps": VPP_PVVP,
     },
     {
         "Name": "pvvp_back2back_vpp",
-        "Deployment": "clean",
+        "Deployment": "pvvp",
         "Description": "VPP: LTD.Throughput.RFC2544.BackToBackFrames",
         "vSwitch" : "VppDpdkVhost",
         "Parameters" : {
@@ -504,6 +425,5 @@ PERFORMANCE_TESTS = [
                 "traffic_type" : "rfc2544_back2back",
             },
         },
-        "TestSteps": VPP_PVVP,
     },
 ]
diff --git a/conf/02_vswitch.conf b/conf/02_vswitch.conf
index 61131a77..84ef71cb 100644
--- a/conf/02_vswitch.conf
+++ b/conf/02_vswitch.conf
@@ -210,6 +210,15 @@ OVS_VSCTL_ARGS = []
 OVS_OFCTL_ARGS = ['-O', 'OpenFlow13']   # backward compatible default value
 OVS_APPCTL_ARGS = []
 
+# default flow template to be used by OVS classes
+OVS_FLOW_TEMPLATE = {
+    'idle_timeout': '0'
+}
+
+# enable or disable configuration of routing tables; See vswitchperf_design.rst
+# for details.
+OVS_ROUTING_TABLES = False
+
 #########################
 ## VPP
 #########################
diff --git a/conf/03_traffic.conf b/conf/03_traffic.conf
index f043b4ca..597f2ceb 100644
--- a/conf/03_traffic.conf
+++ b/conf/03_traffic.conf
@@ -1,4 +1,4 @@
-# Copyright 2015-2017 Intel Corporation.
+# Copyright 2015-2018 Intel Corporation., Tieto
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -64,7 +64,6 @@ LOG_FILE_TRAFFIC_GEN = 'traffic-gen.log'
 #                      feature. If enabled, it will implicitly insert a flow
 #                      for each stream. If multistream is disabled, then
 #                      pre-installed flows will be ignored.
-#                      Note: It is supported only for p2p deployment scenario.
 #                      Data type: str
 #                      Supported values:
 #                         "Yes" - flows will be inserted into OVS
diff --git a/conf/integration/01_testcases.conf b/conf/integration/01_testcases.conf
index 945b36f7..7daff217 100644
--- a/conf/integration/01_testcases.conf
+++ b/conf/integration/01_testcases.conf
@@ -35,7 +35,9 @@
 # Common TestSteps parts ("macros")
 #
 
+#
 # P2P macros
+#
 STEP_VSWITCH_P2P_INIT = [
     ['vswitch', 'add_switch', 'int_br0'],           # STEP 0
     ['vswitch', 'add_phy_port', 'int_br0'],         # STEP 1
@@ -48,6 +50,18 @@ STEP_VSWITCH_P2P_FINIT = [
     ['vswitch', 'del_switch', 'int_br0'],
 ]
 
+STEP_VSWITCH_P2P_CONNECTIONS_INIT = STEP_VSWITCH_P2P_INIT + [
+    ['vswitch', 'add_connection', 'int_br0', '#STEP[1][0]', '#STEP[2][0]'],
+    ['vswitch', 'add_connection', 'int_br0', '#STEP[2][0]', '#STEP[1][0]'],
+]
+
+STEP_VSWITCH_P2P_CONNECTIONS_FINIT = [
+    ['vswitch', 'dump_connections', 'int_br0'],
+    ['vswitch', 'del_connection', 'int_br0', '#STEP[1][0]', '#STEP[2][0]'],
+    ['vswitch', 'del_connection', 'int_br0', '#STEP[2][0]', '#STEP[1][0]'],
+] + STEP_VSWITCH_P2P_FINIT
+
+# P2P OVS specific macros
 STEP_VSWITCH_P2P_FLOWS_INIT = STEP_VSWITCH_P2P_INIT + [
     ['vswitch', 'add_flow', 'int_br0', {'in_port': '#STEP[1][1]', 'actions': ['output:#STEP[2][1]'], 'idle_timeout': '0'}],
     ['vswitch', 'add_flow', 'int_br0', {'in_port': '#STEP[2][1]', 'actions': ['output:#STEP[1][1]'], 'idle_timeout': '0'}],
@@ -59,7 +73,9 @@ STEP_VSWITCH_P2P_FLOWS_FINIT = [
     ['vswitch', 'del_flow', 'int_br0', {'in_port': '#STEP[2][1]'}],
 ] + STEP_VSWITCH_P2P_FINIT
 
-# PVP and PVVP macros
+#
+# PVP macros
+#
 STEP_VSWITCH_PVP_INIT = STEP_VSWITCH_P2P_INIT + [
     ['vswitch', 'add_vport', 'int_br0'],            # STEP 3    vm1 ports
     ['vswitch', 'add_vport', 'int_br0'],            # STEP 4
@@ -70,6 +86,22 @@ STEP_VSWITCH_PVP_FINIT = [
     ['vswitch', 'del_port', 'int_br0', '#STEP[4][0]'],
 ] + STEP_VSWITCH_P2P_FINIT
 
+STEP_VSWITCH_PVP_CONNECTIONS_INIT = STEP_VSWITCH_PVP_INIT + [
+    ['vswitch', 'add_connection', 'int_br0', '#STEP[1][0]', '#STEP[3][0]'],
+    ['vswitch', 'add_connection', 'int_br0', '#STEP[4][0]', '#STEP[2][0]'],
+    ['vswitch', 'add_connection', 'int_br0', '#STEP[2][0]', '#STEP[4][0]'],
+    ['vswitch', 'add_connection', 'int_br0', '#STEP[3][0]', '#STEP[1][0]'],
+]
+
+STEP_VSWITCH_PVP_CONNECTIONS_FINIT = [
+    ['vswitch', 'dump_connections', 'int_br0'],
+    ['vswitch', 'del_connection', 'int_br0', '#STEP[1][0]', '#STEP[3][0]'],
+    ['vswitch', 'del_connection', 'int_br0', '#STEP[4][0]', '#STEP[2][0]'],
+    ['vswitch', 'del_connection', 'int_br0', '#STEP[2][0]', '#STEP[4][0]'],
+    ['vswitch', 'del_connection', 'int_br0', '#STEP[3][0]', '#STEP[1][0]'],
+] + STEP_VSWITCH_PVP_FINIT
+
+# PVP OVS specific macros
 STEP_VSWITCH_PVP_FLOWS_INIT = STEP_VSWITCH_PVP_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[2][1]'], 'idle_timeout': '0'}],
@@ -85,6 +117,9 @@ STEP_VSWITCH_PVP_FLOWS_FINIT = [
     ['vswitch', 'del_flow', 'int_br0', {'in_port': '#STEP[3][1]'}],
 ] + STEP_VSWITCH_PVP_FINIT
 
+#
+# PVVP macros
+#
 STEP_VSWITCH_PVVP_INIT = STEP_VSWITCH_PVP_INIT + [
     ['vswitch', 'add_vport', 'int_br0'],            # STEP 5    vm2 ports
     ['vswitch', 'add_vport', 'int_br0'],            # STEP 6
@@ -95,6 +130,26 @@ STEP_VSWITCH_PVVP_FINIT = [
     ['vswitch', 'del_port', 'int_br0', '#STEP[6][0]'],
 ] + STEP_VSWITCH_PVP_FINIT
 
+STEP_VSWITCH_PVVP_CONNECTIONS_INIT = STEP_VSWITCH_PVVP_INIT + [
+    ['vswitch', 'add_connection', 'int_br0', '#STEP[1][0]', '#STEP[3][0]'],
+    ['vswitch', 'add_connection', 'int_br0', '#STEP[4][0]', '#STEP[5][0]'],
+    ['vswitch', 'add_connection', 'int_br0', '#STEP[6][0]', '#STEP[2][0]'],
+    ['vswitch', 'add_connection', 'int_br0', '#STEP[2][0]', '#STEP[6][0]'],
+    ['vswitch', 'add_connection', 'int_br0', '#STEP[5][0]', '#STEP[4][0]'],
+    ['vswitch', 'add_connection', 'int_br0', '#STEP[3][0]', '#STEP[1][0]'],
+]
+
+STEP_VSWITCH_PVVP_CONNECTIONS_FINIT = [
+    ['vswitch', 'dump_connections', 'int_br0'],
+    ['vswitch', 'del_connection', 'int_br0', '#STEP[1][0]', '#STEP[3][0]'],
+    ['vswitch', 'del_connection', 'int_br0', '#STEP[4][0]', '#STEP[5][0]'],
+    ['vswitch', 'del_connection', 'int_br0', '#STEP[6][0]', '#STEP[2][0]'],
+    ['vswitch', 'del_connection', 'int_br0', '#STEP[2][0]', '#STEP[6][0]'],
+    ['vswitch', 'del_connection', 'int_br0', '#STEP[5][0]', '#STEP[4][0]'],
+    ['vswitch', 'del_connection', 'int_br0', '#STEP[3][0]', '#STEP[1][0]'],
+] + STEP_VSWITCH_PVVP_FINIT
+
+# PVVP OVS specific macros
 STEP_VSWITCH_PVVP_FLOWS_INIT = STEP_VSWITCH_PVVP_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'}],
@@ -255,9 +310,49 @@ INTEGRATION_TESTS = [
                      ]
     },
     {
+        "Name": "vswitch_add_del_connection",
+        "Deployment": "clean",
+        "Description": "vSwitch - add and delete connection",
+        "TestSteps": [
+                        ['vswitch', 'add_switch', 'int_br0'],
+                        ['vswitch', 'add_phy_port', 'int_br0'],
+                        ['vswitch', 'add_phy_port', 'int_br0'],
+                        ['vswitch', 'add_connection', 'int_br0', '#STEP[1][0]', '#STEP[2][0]'],
+                        ['vswitch', 'dump_connections', 'int_br0'],
+                        ['vswitch', 'del_connection', 'int_br0', '#STEP[1][0]', '#STEP[2][0]'],
+                        ['vswitch', 'del_port', 'int_br0', '#STEP[1][0]'],
+                        ['vswitch', 'del_port', 'int_br0', '#STEP[2][0]'],
+                        ['vswitch', 'del_switch', 'int_br0'],
+                     ]
+    },
+    {
+        "Name": "vswitch_vports_add_del_connection",
+        "Deployment": "clean",
+        "Description": "vSwitch - add and delete connection",
+        "Description": "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]'],
+                        ['vswitch', 'dump_connections', 'int_br0'],
+                        ['vswitch', 'del_connection', 'int_br0', '#STEP[1][0]', '#STEP[2][0]'],
+                        ['vswitch', 'del_port', 'int_br0', '#STEP[1][0]'],
+                        ['vswitch', 'del_port', 'int_br0', '#STEP[2][0]'],
+                        ['vswitch', 'del_switch', 'int_br0'],
+                     ]
+    },
+    {
+        "Name": "vswitch_add_del_connections",
+        "Deployment": "clean",
+        "Description": "vSwitch - add and delete connections",
+        "TestSteps": STEP_VSWITCH_P2P_CONNECTIONS_INIT +
+                     STEP_VSWITCH_P2P_CONNECTIONS_FINIT
+    },
+    {
         "Name": "vswitch_add_del_flow",
         "Deployment": "clean",
-        "Description": "vSwitch - add and delete flow",
+        "Description": "OVS: vSwitch - add and delete flow",
         "TestSteps": [
                         ['vswitch', 'add_switch', 'int_br0'],
                         ['vswitch', 'add_phy_port', 'int_br0'],
@@ -272,7 +367,7 @@ INTEGRATION_TESTS = [
     {
         "Name": "vswitch_vports_add_del_flow",
         "Deployment": "clean",
-        "Description": "vSwitch - configure switch with vports, add and delete flow",
+        "Description": "OVS: vSwitch - configure switch with vports, add and delete flow",
         "TestSteps": [
                         ['vswitch', 'add_switch', 'int_br0'],
                         ['vswitch', 'add_vport', 'int_br0'],
@@ -287,7 +382,7 @@ INTEGRATION_TESTS = [
     {
         "Name": "vswitch_add_del_flows",
         "Deployment": "clean",
-        "Description": "vSwitch - add and delete flows",
+        "Description": "OVS: vSwitch - add and delete flows",
         "TestSteps": STEP_VSWITCH_P2P_FLOWS_INIT +
                      STEP_VSWITCH_P2P_FLOWS_FINIT
     },
@@ -295,31 +390,31 @@ INTEGRATION_TESTS = [
         "Name": "vswitch_p2p_tput",
         "Deployment": "clean",
         "Description": "vSwitch - configure switch and execute RFC2544 throughput test",
-        "TestSteps": STEP_VSWITCH_P2P_FLOWS_INIT +
+        "TestSteps": STEP_VSWITCH_P2P_CONNECTIONS_INIT +
                      [
                         ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_throughput', 'bidir' : 'True'}],
                      ] +
-                     STEP_VSWITCH_P2P_FLOWS_FINIT
+                     STEP_VSWITCH_P2P_CONNECTIONS_FINIT
     },
     {
         "Name": "vswitch_p2p_back2back",
         "Deployment": "clean",
         "Description": "vSwitch - configure switch and execute RFC2544 back2back test",
-        "TestSteps": STEP_VSWITCH_P2P_FLOWS_INIT +
+        "TestSteps": STEP_VSWITCH_P2P_CONNECTIONS_INIT +
                      [
                         ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_back2back', 'bidir' : 'True'}],
                      ] +
-                     STEP_VSWITCH_P2P_FLOWS_FINIT
+                     STEP_VSWITCH_P2P_CONNECTIONS_FINIT
     },
     {
         "Name": "vswitch_p2p_cont",
         "Deployment": "clean",
         "Description": "vSwitch - configure switch and execute RFC2544 continuous stream test",
-        "TestSteps": STEP_VSWITCH_P2P_FLOWS_INIT +
+        "TestSteps": STEP_VSWITCH_P2P_CONNECTIONS_INIT +
                      [
                         ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_continuous', 'bidir' : 'True'}],
                      ] +
-                     STEP_VSWITCH_P2P_FLOWS_FINIT
+                     STEP_VSWITCH_P2P_CONNECTIONS_FINIT
     },
     {
         "Name": "vswitch_pvp",
@@ -351,43 +446,43 @@ INTEGRATION_TESTS = [
         "Name": "vswitch_pvp_tput",
         "Deployment": "clean",
         "Description": "vSwitch - configure switch, vnf and execute RFC2544 throughput test",
-        "TestSteps": STEP_VSWITCH_PVP_FLOWS_INIT +
+        "TestSteps": STEP_VSWITCH_PVP_CONNECTIONS_INIT +
                      [
                         ['vnf', 'start'],
                         ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_throughput', 'bidir' : 'True'}],
                         ['vnf', 'stop'],
                      ] +
-                     STEP_VSWITCH_PVP_FLOWS_FINIT
+                     STEP_VSWITCH_PVP_CONNECTIONS_FINIT
     },
     {
         "Name": "vswitch_pvp_back2back",
         "Deployment": "clean",
         "Description": "vSwitch - configure switch, vnf and execute RFC2544 back2back test",
-        "TestSteps": STEP_VSWITCH_PVP_FLOWS_INIT +
+        "TestSteps": STEP_VSWITCH_PVP_CONNECTIONS_INIT +
                      [
                         ['vnf', 'start'],
                         ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_back2back', 'bidir' : 'True'}],
                         ['vnf', 'stop'],
                      ] +
-                     STEP_VSWITCH_PVP_FLOWS_FINIT
+                     STEP_VSWITCH_PVP_CONNECTIONS_FINIT
     },
     {
         "Name": "vswitch_pvp_cont",
         "Deployment": "clean",
         "Description": "vSwitch - configure switch, vnf and execute RFC2544 continuous stream test",
-        "TestSteps": STEP_VSWITCH_PVP_FLOWS_INIT +
+        "TestSteps": STEP_VSWITCH_PVP_CONNECTIONS_INIT +
                      [
                         ['vnf', 'start'],
                         ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_continuous', 'bidir' : 'True'}],
                         ['vnf', 'stop'],
                      ] +
-                     STEP_VSWITCH_PVP_FLOWS_FINIT
+                     STEP_VSWITCH_PVP_CONNECTIONS_FINIT
     },
     {
         "Name": "vswitch_pvp_all",
         "Deployment": "clean",
         "Description": "vSwitch - configure switch, vnf and execute all test types",
-        "TestSteps": STEP_VSWITCH_PVP_FLOWS_INIT +
+        "TestSteps": STEP_VSWITCH_PVP_CONNECTIONS_INIT +
                      [
                         ['vnf', 'start'],
                         ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_throughput', 'bidir' : 'True'}],
@@ -395,7 +490,7 @@ INTEGRATION_TESTS = [
                         ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_continuous', 'bidir' : 'True'}],
                         ['vnf', 'stop'],
                      ] +
-                     STEP_VSWITCH_PVP_FLOWS_FINIT
+                     STEP_VSWITCH_PVP_CONNECTIONS_FINIT
     },
     {
         "Name": "vswitch_pvvp",
@@ -414,7 +509,7 @@ INTEGRATION_TESTS = [
         "Name": "vswitch_pvvp_tput",
         "Deployment": "clean",
         "Description": "vSwitch - configure switch, two chained vnfs and execute RFC2544 throughput test",
-        "TestSteps": STEP_VSWITCH_PVVP_FLOWS_INIT +
+        "TestSteps": STEP_VSWITCH_PVVP_CONNECTIONS_INIT +
                      [
                         ['vnf1', 'start'],
                         ['vnf2', 'start'],
@@ -422,13 +517,13 @@ INTEGRATION_TESTS = [
                         ['vnf1', 'stop'],
                         ['vnf2', 'stop'],
                      ] +
-                     STEP_VSWITCH_PVVP_FLOWS_FINIT
+                     STEP_VSWITCH_PVVP_CONNECTIONS_FINIT
     },
     {
         "Name": "vswitch_pvvp_back2back",
         "Deployment": "clean",
         "Description": "vSwitch - configure switch, two chained vnfs and execute RFC2544 back2back test",
-        "TestSteps": STEP_VSWITCH_PVVP_FLOWS_INIT +
+        "TestSteps": STEP_VSWITCH_PVVP_CONNECTIONS_INIT +
                      [
                         ['vnf1', 'start'],
                         ['vnf2', 'start'],
@@ -436,13 +531,13 @@ INTEGRATION_TESTS = [
                         ['vnf1', 'stop'],
                         ['vnf2', 'stop'],
                      ] +
-                     STEP_VSWITCH_PVVP_FLOWS_FINIT
+                     STEP_VSWITCH_PVVP_CONNECTIONS_FINIT
     },
     {
         "Name": "vswitch_pvvp_cont",
         "Deployment": "clean",
         "Description": "vSwitch - configure switch, two chained vnfs and execute RFC2544 continuous stream test",
-        "TestSteps": STEP_VSWITCH_PVVP_FLOWS_INIT +
+        "TestSteps": STEP_VSWITCH_PVVP_CONNECTIONS_INIT +
                      [
                         ['vnf1', 'start'],
                         ['vnf2', 'start'],
@@ -450,13 +545,13 @@ INTEGRATION_TESTS = [
                         ['vnf1', 'stop'],
                         ['vnf2', 'stop'],
                      ] +
-                     STEP_VSWITCH_PVVP_FLOWS_FINIT
+                     STEP_VSWITCH_PVVP_CONNECTIONS_FINIT
     },
     {
         "Name": "vswitch_pvvp_all",
         "Deployment": "clean",
         "Description": "vSwitch - configure switch, two chained vnfs and execute all test types",
-        "TestSteps": STEP_VSWITCH_PVVP_FLOWS_INIT +
+        "TestSteps": STEP_VSWITCH_PVVP_CONNECTIONS_INIT +
                      [
                         ['vnf1', 'start'],
                         ['vnf2', 'start'],
@@ -466,7 +561,7 @@ INTEGRATION_TESTS = [
                         ['vnf1', 'stop'],
                         ['vnf2', 'stop'],
                      ] +
-                     STEP_VSWITCH_PVVP_FLOWS_FINIT
+                     STEP_VSWITCH_PVVP_CONNECTIONS_FINIT
     },
     {
         "Name": "vswitch_p4vp_tput",
@@ -682,23 +777,6 @@ INTEGRATION_TESTS = [
                         ['tools', 'assert', 'len(#STEP[-1][0])'],
                      ]
     },
-    {
-        "Name": "vswitch_vports_add_del_connection_vpp",
-        "Deployment": "clean",
-        "Description": "VPP: vSwitch - configure switch with vports, add and delete connection",
-        "vSwitch" : "VppDpdkVhost",
-        "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
     #
@@ -874,11 +952,11 @@ INTEGRATION_TESTS += [
 #        "VNF" : "QemuVirtioNet",
 #        "Trafficgen": "IxNet",
 #        "Parameters": {"GUEST_LOOPBACK" : ["linux_bridge"],},
-#        "TestSteps": STEP_VSWITCH_PVP_FLOWS_INIT +
+#        "TestSteps": STEP_VSWITCH_PVP_CONNECTIONS_INIT +
 #                     [
 #                        ['vnf', 'start'],
 #                        ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_continuous', 'bidir' : 'True'}],
 #                        ['vnf', 'stop'],
 #                     ] +
-#                     STEP_VSWITCH_PVP_FLOWS_FINIT
+#                     STEP_VSWITCH_PVP_CONNECTIONS_FINIT
 #    },
diff --git a/conf/integration/01c_trex_vm_tests.conf b/conf/integration/01c_trex_vm_tests.conf
index 50982bea..1bec4efd 100644
--- a/conf/integration/01c_trex_vm_tests.conf
+++ b/conf/integration/01c_trex_vm_tests.conf
@@ -30,6 +30,7 @@ TREX_VM_INIT = [
     ['#trex_p2', 'vswitch', 'add_vport', 'int_br0'],
     # configure IP access to T-Rex VM
     ['vswitch', 'add_switch', 'trex_br'],
+    ['vswitch', 'add_flow', 'trex_br', {'actions': ['NORMAL']}], # turn on MAC learning mode
     ['#trex_admin', 'vswitch', 'add_vport', 'trex_br'],
     ['#trex_spare', 'vswitch', 'add_vport', 'trex_br'],    # spare to have even number of NICs
     ['tools', 'exec_shell', 'sudo ip addr flush dev trex_br'],