X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=conf%2F03_traffic.conf;h=23f562b0e27e480745b2b46b73e1a91359c2cdf6;hb=94ebcf4df013c7b6a7003ac22c4799fbefb185e6;hp=597f2ceb3812c56fd288c3d4dc5e1101ed118fae;hpb=46f9a4b70bcff0374be6e9c943987efead1915e6;p=vswitchperf.git

diff --git a/conf/03_traffic.conf b/conf/03_traffic.conf
index 597f2ceb..23f562b0 100644
--- a/conf/03_traffic.conf
+++ b/conf/03_traffic.conf
@@ -204,6 +204,25 @@ LOG_FILE_TRAFFIC_GEN = 'traffic-gen.log'
 #                                     'Dot1Q(prio={Dot1Q_prio}, id={Dot1Q_id}, vlan={Dot1Q_vlan})/'
 #                                     'IP(proto={IP_proto}, src={IP_dst}, dst={IP_src})/'
 #                                     '{IP_PROTO}(sport={IP_PROTO_dport}, dport={IP_PROTO_sport})',
+#    'latency_histogram'
+#                    - A dictionary with definition of a latency histogram provision in results.
+#        '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,
@@ -254,7 +273,16 @@ TRAFFIC = {
               'Dot1Q(prio={Dot1Q_prio}, id={Dot1Q_id}, vlan={Dot1Q_vlan})/'
               'IP(proto={IP_proto}, src={IP_dst}, dst={IP_src})/'
               '{IP_PROTO}(sport={IP_PROTO_dport}, dport={IP_PROTO_sport})',
-    }
+    },
+    'latency_histogram': {
+        'enabled': False,
+        'type': 'Default',
+    },
+    'imix': {
+        'enabled': False,
+        'type': 'genome',
+        'genome': 'aaaaaaaddddg',
+    },
 }
 
 #path to traffic generators directory.
@@ -536,6 +564,10 @@ 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': {