Merge "Openstack: Using VSPERF to Test on Openstack."

[vswitchperf.git] / conf / 03_traffic.conf

diff --git a/conf/03_traffic.conf b/conf/03_traffic.conf
index 486ab2c..01747a3 100644 (file)
--- a/conf/03_traffic.conf
+++ b/conf/03_traffic.conf
@@ -209,6 +209,20 @@ LOG_FILE_TRAFFIC_GEN = 'traffic-gen.log'
 #        'enabled'   - Specifies if the histogram provisioning is enabled or not.
 #        'type'      - Defines how histogram is provided. Currenty only 'Default' is defined.
 #                         'Default' - Default histogram as provided by the Traffic-generator.
+#    'imix'          - A dictionary for IMIX Specification.
+#        'enabled'   - Specifies if IMIX is enabled or NOT.
+#        'type'      - The specification type - denotes how IMIX is specified.
+#                      Currently only 'genome' type is defined.
+#                      Other types (ex: table-of-proportions) can be added in future.
+#        'genome'    - The Genome Encoding of Pkt-Sizes and Ratio for IMIX.
+#                      The ratio is inferred from the number of particular geneome characters.
+#                      Genome encoding is described in RFC 6985. This specification is closest
+#                      to the method described in section 6.2 of RFC 6985.
+#                      Ex: 'aaaaaaaddddg' denotes ratio of 7:4:1 of packets sizes 64:512:1518.
+#                      Note: Exact-sequence is not maintained, only the ratio of packets
+#                      is ensured.
+#                      Data type: str
+#                      Default Value: 'aaaaaaaddddg'
 TRAFFIC = {
     'traffic_type' : 'rfc2544_throughput',
     'frame_rate' : 100,
@@ -264,6 +278,11 @@ TRAFFIC = {
         'enabled': False,
         'type': 'Default',
     },
+    'imix': {
+        'enabled': False,
+        'type': 'genome',
+        'genome': 'aaaaaaaddddg',
+    },
 }
 
 #path to traffic generators directory.
@@ -453,6 +472,12 @@ TRAFFICGEN_STC_WEST_INTF_GATEWAY_ADDR = ""
 # Print additional information to the terminal during the test
 TRAFFICGEN_STC_VERBOSE = "True"
 
+# Live Results Required?
+TRAFFICGEN_STC_LIVE_RESULTS = "True"
+
+# Live results file name
+TRAFFICGEN_STC_LIVERESULTS_FILE = "stc-liveresults.dat"
+
 # Spirent TestCenter Configuration -- END
 #########################################
 
@@ -545,12 +570,16 @@ TRAFFICGEN_TREX_PROMISCUOUS = False
 # side when pushing traffic. For 40G use 40000. For 25G use 25000.
 TRAFFICGEN_TREX_FORCE_PORT_SPEED = False
 TRAFFICGEN_TREX_PORT_SPEED = 10000 # 10G
+TRAFFICGEN_TREX_LIVE_RESULTS = True
+TRAFFICGEN_TREX_LC_FILE = "trex-liveresults-counts.dat"
+TRAFFICGEN_TREX_LE_FILE = "trex-liveresults-errors.dat"
+
 
 PATHS['trafficgen'] = {
     'Trex': {
         'type' : 'src',
         'src': {
-            'path': os.path.join(ROOT_DIR, 'src/trex/trex/scripts/automation/trex_control_plane/stl')
+            'path': os.path.join(ROOT_DIR, 'src/trex/trex/scripts/automation/trex_control_plane/interactive')
     }
   }
 }