Merge "trex: Add support Trex traffic generator"

2 files changed, 57 insertions, 1 deletions

diff --git a/conf/03_traffic.conf b/conf/03_traffic.conf
index 764fd731..179ff3e2 100644
--- a/conf/03_traffic.conf
+++ b/conf/03_traffic.conf
@@ -178,6 +178,7 @@ TRAFFICGEN = 'Dummy'
 #TRAFFICGEN = 'Ixia'
 #TRAFFICGEN = 'Xena'
 #TRAFFICGEN = 'Moongen'
+#TRAFFICGEN = 'Trex'
 
 # List of packet sizes to send.
 # Expand like this: (64, 128, 256, 512, 1024)
@@ -415,4 +416,34 @@ TRAFFICGEN_MOONGEN_PORTS = ''
 TRAFFICGEN_MOONGEN_LINE_SPEED_GBPS = ''
 
 # MoonGen Configuration and Connection Info-- END
-###################################################
+#################################################
+
+################################################
+# Trex Configuration and Connection Info-- BEGIN
+
+# Example: TRAFFICGEN_TREX_HOST_IP_ADDR = "192.10.1.1"
+# Example: TRAFFICGEN_TREX_USER = 'root'
+# Example: TRAFFICGEN_TREX_BASE_DIR = '/traffic_gen/trex/'
+# Example: TRAFFICGEN_TREX_PORT1 = '00:00:00:00:00:00'
+TRAFFICGEN_TREX_HOST_IP_ADDR = ''
+TRAFFICGEN_TREX_USER = ''
+TRAFFICGEN_TREX_BASE_DIR = ''
+TRAFFICGEN_TREX_PORT1 = ''
+TRAFFICGEN_TREX_PORT2 = ''
+# Latency statistics are collected by separate stream created for each interface.
+# Parameter below defines frequency of packets used for latency measurement in PPS.
+# Value 0 will disable latency specific streams.
+TRAFFICGEN_TREX_LATENCY_PPS = 1000
+# Example 10 Gbps: TRAFFICGEN_TREXINE_SPEED_GBPS = '10'
+# Today only 10 Gbps is supported
+TRAFFICGEN_TREX_LINE_SPEED_GBPS = '10'
+PATHS['trafficgen'] = {
+    'trex': {
+        'type' : 'src',
+        'src': {
+            'path': os.path.join(ROOT_DIR, 'src/trex/trex/scripts/automation/trex_control_plane/stl')
+    }
+  }
+}
+# TREX Configuration and Connection Info-- END
+##############################################
diff --git a/conf/10_custom.conf b/conf/10_custom.conf
index 9622fd71..6011e6a8 100644
--- a/conf/10_custom.conf
+++ b/conf/10_custom.conf
@@ -21,6 +21,7 @@ TRAFFICGEN = 'Dummy'
 #TRAFFICGEN = 'Ixia'
 #TRAFFICGEN = 'Xena'
 #TRAFFICGEN = 'Moongen'
+#TRAFFICGEN = 'Trex'
 
 ###########################################
 # Spirent TestCenter Configuration -- BEGIN
@@ -116,6 +117,30 @@ TRAFFICGEN_MOONGEN_LINE_SPEED_GBPS = '10'
 # MoonGen Configuration and Connection Info-- END
 ###################################################
 
+###################################################
+# TREX Configuration and Connection Info-- BEGIN
+
+# Example: TRAFFICGEN_TREX_HOST_IP_ADDR = "192.10.1.1"
+# Example: TRAFFICGEN_TREX_USER = 'root'
+# Example: TRAFFICGEN_TREX_BASE_DIR = '/traffic_gen/trex/'
+# Example: TRAFFICGEN_TREX_PORT1 = '00:00:00:00:00:00'
+TRAFFICGEN_TREX_HOST_IP_ADDR = ''
+TRAFFICGEN_TREX_USER = ''
+TRAFFICGEN_TREX_BASE_DIR = ''
+TRAFFICGEN_TREX_PORT1 = ''
+TRAFFICGEN_TREX_PORT2 = ''
+# Latency statistics are collected by separate stream created for each interface.
+# Parameter below defines frequency of packets used for latency measurement in PPS.
+# Value 0 will disable latency specific streams.
+TRAFFICGEN_TREX_LATENCY_PPS = 1000
+# Example 10 Gbps: TRAFFICGEN_TREXINE_SPEED_GBPS = '10'
+# Today only 10 Gbps is supported
+TRAFFICGEN_TREX_LINE_SPEED_GBPS = '10'
+
+# TREX Configuration and Connection Info-- END
+####################################################
+
+####################################################
 #TEST_PARAMS = {'TRAFFICGEN_PKT_SIZES':(64,)}
 OPNFV_INSTALLER = "Fuel"
 OPNFV_URL = "http://testresults.opnfv.org/test/api/v1"