From dba37f2ec6b915649a10d8dae550bfd0291e4584 Mon Sep 17 00:00:00 2001 From: "Sridhar K. N. Rao" Date: Wed, 23 Nov 2016 20:28:13 +0530 Subject: conf:Traffic-type naming convention and consistency Following changes are added following first review 1. Descriptions in integration/01_testcases.conf 2. Comment in conf/01_testcases.conf 3. Checking all cases of traffic types in traffic_controller_rfc2544.py 4. Removing whitespaces 5. Missing changes (throughput->rfc2544_throughput) 6. Syntax error in core/traffic_controller_rfc2544.py Currently the traffic-type values that are provided as part of the test case definition needs some fix to support additional traffic - apart from rfc2544. The Current and the proposed changed is summarized in the below table: |--------------------------------------------------------------------| | Parameter | Existing traffic_type value | Changed to | ---------------------------------------------------------------------- | Throughput | rfc2544 OR throughput | rfc2544_throughput | ---------------------------------------------------------------------- | Back2Back | back2back | rfc2544_back2back | ---------------------------------------------------------------------- | Continuous | continuous | rfc2544_continuous | ---------------------------------------------------------------------- JIRA: VSPERF-420 Change-Id: I22bd897f6389d2b568a6a3735c67f0003e813445 Signed-off-by: Sridhar K. N. Rao --- conf/01_testcases.conf | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'conf/01_testcases.conf') diff --git a/conf/01_testcases.conf b/conf/01_testcases.conf index f30c1912..a8d7a136 100755 --- a/conf/01_testcases.conf +++ b/conf/01_testcases.conf @@ -19,9 +19,9 @@ # # "Name": "phy2phy_burst", # A human-readable string identifying the # # test. -# "Traffic Type": "rfc2544", # One of the supported traffic types. +# "Traffic Type": "rfc2544_throughput", +# # One of the supported traffic types. # # It can be overridden by cli option traffic_type. -# # Default value is "rfc2544". # "Deployment": "p2p", # One of the supported deployment scenarios. # "Description": "Lorem ipsum..." # Optional. A human-readable string # # describing the test. @@ -129,7 +129,7 @@ PERFORMANCE_TESTS = [ { "Name": "phy2phy_tput", - "Traffic Type": "rfc2544", + "Traffic Type": "rfc2544_throughput", "Deployment": "p2p", "biDirectional": "True", "Description": "LTD.Throughput.RFC2544.PacketLossRatio", @@ -143,14 +143,14 @@ PERFORMANCE_TESTS = [ }, { "Name": "back2back", - "Traffic Type": "back2back", + "Traffic Type": "rfc2544_back2back", "Deployment": "p2p", "biDirectional": "True", "Description": "LTD.Throughput.RFC2544.BackToBackFrames", }, { "Name": "phy2phy_tput_mod_vlan", - "Traffic Type": "rfc2544", + "Traffic Type": "rfc2544_throughput", "Deployment": "p2p", "Frame Modification": "vlan", "biDirectional": "False", @@ -158,7 +158,7 @@ PERFORMANCE_TESTS = [ }, { "Name": "phy2phy_cont", - "Traffic Type": "continuous", + "Traffic Type": "rfc2544_continuous", "Deployment": "p2p", "Description": "Phy2Phy Continuous Stream", "biDirectional": "True", @@ -166,7 +166,7 @@ PERFORMANCE_TESTS = [ }, { "Name": "pvp_cont", - "Traffic Type": "continuous", + "Traffic Type": "rfc2544_continuous", "Deployment": "pvp", "Description": "PVP Continuous Stream", "biDirectional": "True", @@ -174,7 +174,7 @@ PERFORMANCE_TESTS = [ }, { "Name": "pvvp_cont", - "Traffic Type": "continuous", + "Traffic Type": "rfc2544_continuous", "Deployment": "pvvp", "Description": "PVVP Continuous Stream", "biDirectional": "True", @@ -182,7 +182,7 @@ PERFORMANCE_TESTS = [ }, { "Name": "pvpv_cont", - "Traffic Type": "continuous", + "Traffic Type": "rfc2544_continuous", "Deployment": "pvpv", "Description": "Two VMs in parallel with Continuous Stream", "biDirectional": "True", @@ -190,7 +190,7 @@ PERFORMANCE_TESTS = [ }, { "Name": "phy2phy_scalability", - "Traffic Type": "rfc2544", + "Traffic Type": "rfc2544_throughput", "Deployment": "p2p", "biDirectional": "True", "Description": "LTD.Scalability.Flows.RFC2544.0PacketLoss", @@ -198,21 +198,21 @@ PERFORMANCE_TESTS = [ }, { "Name": "pvp_tput", - "Traffic Type": "rfc2544", + "Traffic Type": "rfc2544_throughput", "Deployment": "pvp", "Description": "LTD.Throughput.RFC2544.PacketLossRatio", "biDirectional": "True", }, { "Name": "pvp_back2back", - "Traffic Type": "back2back", + "Traffic Type": "rfc2544_back2back", "Deployment": "pvp", "Description": "LTD.Throughput.RFC2544.BackToBackFrames", "biDirectional": "True", }, { "Name": "pvvp_tput", - "Traffic Type": "rfc2544", + "Traffic Type": "rfc2544_throughput", "Collector": "cpu", "Deployment": "pvvp", "Description": "LTD.Throughput.RFC2544.PacketLossRatio", @@ -220,7 +220,7 @@ PERFORMANCE_TESTS = [ }, { "Name": "pvvp_back2back", - "Traffic Type": "back2back", + "Traffic Type": "rfc2544_back2back", "Collector": "cpu", "Deployment": "pvvp", "Description": "LTD.Throughput.RFC2544.BackToBackFrames", @@ -228,7 +228,7 @@ PERFORMANCE_TESTS = [ }, { "Name": "phy2phy_cpu_load", - "Traffic Type": "rfc2544", + "Traffic Type": "rfc2544_throughput", "Deployment": "p2p", "biDirectional": "True", "Description": "LTD.CPU.RFC2544.0PacketLoss", @@ -241,7 +241,7 @@ PERFORMANCE_TESTS = [ }, { "Name": "phy2phy_mem_load", - "Traffic Type": "rfc2544", + "Traffic Type": "rfc2544_throughput", "Deployment": "p2p", "biDirectional": "True", "Description": "LTD.Memory.RFC2544.0PacketLoss", -- cgit 1.2.3-korg