X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=conf%2F01_testcases.conf;h=b9c59a118f549b9b7d83e98396a20e6c26db27b5;hb=c9cd093f2f441adc9dd33627255326008e021a67;hp=b855405d80eeb178501fbc5d16c206067b46490f;hpb=7caf7a6be0fae6b341181b3e6286372e2e93b4b8;p=vswitchperf.git

diff --git a/conf/01_testcases.conf b/conf/01_testcases.conf
index b855405d..b9c59a11 100755
--- a/conf/01_testcases.conf
+++ b/conf/01_testcases.conf
@@ -1,4 +1,4 @@
-# Copyright 2015 Intel Corporation.
+# Copyright 2015-2016 Intel Corporation.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,14 +20,20 @@
 # "Name": "phy2phy_burst",         # A human-readable string identifying the
 #                                  # test.
 # "Traffic Type": "rfc2544",       # 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.
 # "Frame Modification": "vlan"     # One of the supported frame modifications:
 #                                  # vlan, mpls, mac, dscp, ttl, ip_addr,
 #                                  # ip_port.
-# "biDirectional": [true|false],   # Specifies if genearted traffic will be
-#                                  # full-duplex (true) or half-duplex (false)
+# "biDirectional": ["True"|"False"]
+#                                  # Specifies if generated traffic will be
+#                                  # full-duplex (True) or half-duplex (False)
+#                                  # It can be overridden by cli option bidirectional.
+#                                  # Default value is "False". Must be of type
+#                                  # string.
 # "MultiStream": 0-65535           # Optional. Defines number of flows simulated
 #                                  # by traffic generator. Value 0 disables
 #                                  # MultiStream feature
@@ -41,7 +47,8 @@
 #                                  # Values:
 #                                  #    "L2" - iteration of destination MAC address
 #                                  #    "L3" - iteration of destination IP address
-#                                  #    "L4" - iteration of destination UDP port
+#                                  #    "L4" - iteration of destination port
+#                                  #           of selected transport protocol
 #                                  # Default value is "L4".
 # "Pre-installed Flows": ["Yes"|"No"]
 #                                  # Optional. Pre-installed Flows is an extension
@@ -65,6 +72,7 @@
 #                                  # of frame rate used during continuous stream
 #                                  # tests. Can be overridden by cli option
 #                                  # iload.
+#                                  # Default value is 100.
 # "Load": dictionary               # Optional. Configures background load
 #                                  # during testcase execution.
 #   Description of "Load" dictionary keys, their meanings and available values:
@@ -94,6 +102,24 @@
 #                                  # value will be used
 #   "options": ""                  # Optional. Additional command line options
 #                                  # to be passed to the load generator.
+# "vSwitch" : "OvsVanilla"         # Defines vSwitch to be used for test execution.
+#                                  # It will override any VSWITCH option stated
+#                                  # in configuration files or value specified
+#                                  # on command line through --vswitch parameter.
+# "VNF" : "QemuVirtioNet"          # Defines VNF to be used for test execution.
+#                                  # It will override any VNF option stated
+#                                  # in configuration files or value specified
+#                                  # on command line through --vnf parameter.
+# "Trafficgen" : "Dummy"           # Defines traffic generator to be used for test
+#                                  # execution. It will override any VNF option
+#                                  # stated in configuration files or value
+#                                  # specified on command line through --trafficgen
+#                                  # parameter.
+# "Parameters" : "pkt_sizes=512"   # Defines list of test parameters used for test
+#                                  # execution. It will override any values defined
+#                                  # by TEST_PARAMS option stated in configuration
+#                                  # files or values specified on command line through
+#                                  # --test-params parameter.
 # "Test Modifier": [FrameMod|Other],
 # "Dependency": [Test_Case_Name |None],
 
@@ -126,7 +152,7 @@ PERFORMANCE_TESTS = [
         "Deployment": "p2p",
         "Description": "Phy2Phy Continuous Stream",
         "biDirectional": "True",
-        "iLoad": "90",
+        "iLoad": "100",
     },
     {
         "Name": "pvp_cont",
@@ -134,7 +160,7 @@ PERFORMANCE_TESTS = [
         "Deployment": "pvp",
         "Description": "PVP Continuous Stream",
         "biDirectional": "True",
-        "iLoad": "90",
+        "iLoad": "100",
     },
     {
         "Name": "pvvp_cont",
@@ -142,14 +168,22 @@ PERFORMANCE_TESTS = [
         "Deployment": "pvvp",
         "Description": "PVVP Continuous Stream",
         "biDirectional": "True",
-        "iLoad": "90",
+        "iLoad": "100",
+    },
+    {
+        "Name": "pvpv_cont",
+        "Traffic Type": "continuous",
+        "Deployment": "pvpv",
+        "Description": "Two VMs in parallel with Continuous Stream",
+        "biDirectional": "True",
+        "iLoad": "100",
     },
     {
         "Name": "phy2phy_scalability",
         "Traffic Type": "rfc2544",
         "Deployment": "p2p",
         "biDirectional": "True",
-        "Description": "LTD.Scalability.RFC2544.0PacketLoss",
+        "Description": "LTD.Scalability.Flows.RFC2544.0PacketLoss",
         "MultiStream": "8000",
     },
     {