Merge "connections: Introduction of generic API"

1 files changed, 15 insertions, 95 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,
     },
 ]