pkt_gen: update testcenter implementation

Update testcenter implementation to move settings to
generic settings file and change windows line endings.
JIRA: VSPERF-126
Change-Id: I156005f261bc0df6c3d8009db72ba2d5991c6166

Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
Reviewed-by: Martin Klozik <martinx.klozik@intel.com>
Reviewed-by: Billy O Mahony <billy.o.mahony@intel.com>
Reviewed-by: Al Morton <acmorton@att.com>
Reviewed-by: Brian Castelli <brian.castelli@spirent.com>
Reviewed-by: Gene Snider <eugene.snider@huawei.com>

2 files changed, 112 insertions, 55 deletions

diff --git a/conf/03_traffic.conf b/conf/03_traffic.conf
index efc1b2f6..7e3019a0 100644
--- a/conf/03_traffic.conf
+++ b/conf/03_traffic.conf
@@ -23,7 +23,10 @@ LOG_FILE_TRAFFIC_GEN = 'traffic-gen.log'
 TRAFFICGEN_DIR = os.path.join(ROOT_DIR, 'tools/pkt_gen')
 
 # traffic generator to use in tests
-TRAFFICGEN = 'IxNet'
+#TRAFFICGEN = 'TestCenter'
+TRAFFICGEN = 'Dummy'
+#TRAFFICGEN = 'IxNet'
+#TRAFFICGEN = 'Ixia'
 
 # List of packet sizes to send.
 # Expand like this: (64, 128, 256, 512, 1024)
@@ -55,3 +58,103 @@ TRAFFICGEN_IXNET_TESTER_RESULT_DIR = ''
 # The result directory on DUT. This needs to map to the same directory
 # as the previous one
 TRAFFICGEN_IXNET_DUT_RESULT_DIR = ''
+
+###########################################
+# Spirent TestCenter Configuration -- BEGIN
+
+# Path to Python 2 executable
+TRAFFICGEN_STC_PYTHON2_PATH = "/bin/python2.7"
+
+# Path to the location of the TestCenter files
+TRAFFICGEN_STC_TESTCENTER_PATH = os.path.join(ROOT_DIR, 'tools/pkt_gen/testcenter')
+
+# Name of the TestCenter RFC2544 Tput helper python script
+TRAFFICGEN_STC_RFC2544_TPUT_TEST_FILE_NAME = "testcenter-rfc2544-throughput.py"
+
+# The address of the Spirent Lab Server to use
+TRAFFICGEN_STC_LAB_SERVER_ADDR = ""
+
+# The address of the Spirent License Server in your environment
+TRAFFICGEN_STC_LICENSE_SERVER_ADDR = ""
+
+# The address of the TestCenter chassis that holds the east port
+TRAFFICGEN_STC_EAST_CHASSIS_ADDR = ""
+
+# The slot number of the card that holds the east port
+TRAFFICGEN_STC_EAST_SLOT_NUM = ""
+
+# The port number on the card that holds the east port
+TRAFFICGEN_STC_EAST_PORT_NUM = ""
+
+# The address of the TestCenter chassis that holds the west port
+TRAFFICGEN_STC_WEST_CHASSIS_ADDR = ""
+
+# The slot number of the card that holds the west port
+TRAFFICGEN_STC_WEST_SLOT_NUM = ""
+
+# The port number on the card that holds the west port
+TRAFFICGEN_STC_WEST_PORT_NUM = ""
+
+# The friendly name to identify the Spirent Lab Server test session
+TRAFFICGEN_STC_TEST_SESSION_NAME = "RFC2544 Tput"
+# The directory to copy results to
+
+TRAFFICGEN_STC_RESULTS_DIR = "./Results"
+#  The prefix for the CSV results file
+
+TRAFFICGEN_STC_CSV_RESULTS_FILE_PREFIX = "RFC2544_tput"
+# The number of trials to execute during the test
+
+TRAFFICGEN_STC_NUMBER_OF_TRIALS = "1"
+
+# The duration of each trial executed during the test, in seconds
+TRAFFICGEN_STC_TRIAL_DURATION_SEC = "60"
+
+# The traffic pattern between endpoints, BACKBONE, MESH or PAIR
+TRAFFICGEN_STC_TRAFFIC_PATTERN = "PAIR"
+
+# The search mode used to find the throughput rate, COMBO, STEP or BINARY
+TRAFFICGEN_STC_SEARCH_MODE = "BINARY"
+
+# The learning mode used during the test, AUTO, L2_LEARNING, L3_LERNING, or NONE
+TRAFFICGEN_STC_LEARNING_MODE = "AUTO"
+
+# The minimum percent line rate that will be used during the test
+TRAFFICGEN_STC_RATE_LOWER_LIMIT_PCT = "1.0"
+
+# The maximum percent line rate that will be used during the test
+TRAFFICGEN_STC_RATE_UPPER_LIMIT_PCT = "99.0"
+
+# If SearchMode is BINARY, the percent line rate that will be used at the start of the test
+TRAFFICGEN_STC_RATE_INITIAL_PCT = "99.0"
+
+# When SearchMode is STEP, the percent increase in load per step
+TRAFFICGEN_STC_RATE_STEP_PCT = "10.0"
+
+# The minimum percentage of load adjustment between iterations
+TRAFFICGEN_STC_RESOLUTION_PCT = "1.0"
+
+# The frame size, in bytes
+TRAFFICGEN_STC_FRAME_SIZE = "256"
+
+# The maximum acceptable frame loss percent in any iteration
+TRAFFICGEN_STC_ACCEPTABLE_FRAME_LOSS_PCT = "0.0"
+
+# The address to assign to the first emulated device interface on the first east port
+TRAFFICGEN_STC_EAST_INTF_ADDR = ""
+
+# The gateway address to assign to the first emulated device interface on the first east port
+TRAFFICGEN_STC_EAST_INTF_GATEWAY_ADDR = ""
+
+# The address to assign to the first emulated device interface on the first west port
+TRAFFICGEN_STC_WEST_INTF_ADDR = ""
+
+# The gateway address to assign to the first emulated device interface on the first west port
+TRAFFICGEN_STC_WEST_INTF_GATEWAY_ADDR = ""
+
+# Print additional information to the terminal during the test
+TRAFFICGEN_STC_VERBOSE = "True"
+
+# Spirent TestCenter Configuration -- END
+#########################################
+
diff --git a/conf/10_custom.conf b/conf/10_custom.conf
index 3f98d543..8883cb7c 100644
--- a/conf/10_custom.conf
+++ b/conf/10_custom.conf
@@ -15,78 +15,32 @@
 RTE_TARGET = '' # the relevant DPDK build target
 
 # traffic generator to use in tests
-TRAFFICGEN = 'TestCenter'
-#TRAFFICGEN = 'Dummy'
+#TRAFFICGEN = 'TestCenter'
+TRAFFICGEN = 'Dummy'
 #TRAFFICGEN = 'IxNet'
 #TRAFFICGEN = 'Ixia'
 
 ###########################################
 # Spirent TestCenter Configuration -- BEGIN
-# Path to Python 2 executable
-TRAFFICGEN_STC_PYTHON2_PATH = "/usr/local/bin/python2.7"
-# Path to the location of the TestCenter files
-TRAFFICGEN_STC_TESTCENTER_PATH = "./tools/pkt_gen/testcenter"
-# Name of the TestCenter RFC2544 Tput helper python script
-TRAFFICGEN_STC_RFC2544_TPUT_TEST_FILE_NAME = "testcenter-rfc2544-throughput.py"
-# The address of the Spirent Lab Server to use
 TRAFFICGEN_STC_LAB_SERVER_ADDR = "10.134.156.93"
-# The address of the Spirent License Server in your environment
+
 TRAFFICGEN_STC_LICENSE_SERVER_ADDR = "10.134.156.96"
-# The address of the TestCenter chassis that holds the east port
+
 TRAFFICGEN_STC_EAST_CHASSIS_ADDR = "10.134.156.70"
-# The slot number of the card that holds the east port
 TRAFFICGEN_STC_EAST_SLOT_NUM = "1"
-# The port number on the card that holds the east port
 TRAFFICGEN_STC_EAST_PORT_NUM = "1"
-# The address of the TestCenter chassis that holds the west port
+TRAFFICGEN_STC_EAST_INTF_ADDR = "192.85.1.3"
+TRAFFICGEN_STC_EAST_INTF_GATEWAY_ADDR = "192.85.1.103"
+
 TRAFFICGEN_STC_WEST_CHASSIS_ADDR = "10.134.156.70"
-# The slot number of the card that holds the west port
 TRAFFICGEN_STC_WEST_SLOT_NUM = "1"
-# The port number on the card that holds the west port
 TRAFFICGEN_STC_WEST_PORT_NUM = "2"
-# The friendly name to identify the Spirent Lab Server test session
-TRAFFICGEN_STC_TEST_SESSION_NAME = "RFC2544 Tput"
-# The directory to copy results to
-TRAFFICGEN_STC_RESULTS_DIR = "./Results"
-#  The prefix for the CSV results file
-TRAFFICGEN_STC_CSV_RESULTS_FILE_PREFIX = "RFC2544_tput"
-# The number of trials to execute during the test
-TRAFFICGEN_STC_NUMBER_OF_TRIALS = "1"
-# The duration of each trial executed during the test, in seconds
-TRAFFICGEN_STC_TRIAL_DURATION_SEC = "60"
-# The traffic pattern between endpoints, BACKBONE, MESH or PAIR
-TRAFFICGEN_STC_TRAFFIC_PATTERN = "PAIR"
-# The search mode used to find the throughput rate, COMBO, STEP or BINARY
-TRAFFICGEN_STC_SEARCH_MODE = "BINARY"
-# The learning mode used during the test, AUTO, L2_LEARNING, L3_LERNING, or NONE
-TRAFFICGEN_STC_LEARNING_MODE = "AUTO"
-# The minimum percent line rate that will be used during the test
-TRAFFICGEN_STC_RATE_LOWER_LIMIT_PCT = "1.0"
-# The maximum percent line rate that will be used during the test
-TRAFFICGEN_STC_RATE_UPPER_LIMIT_PCT = "99.0"
-# If SearchMode is BINARY, the percent line rate that will be used at the start of the test
-TRAFFICGEN_STC_RATE_INITIAL_PCT = "99.0"
-# When SearchMode is STEP, the percent increase in load per step
-TRAFFICGEN_STC_RATE_STEP_PCT = "10.0"
-# The minimum percentage of load adjustment between iterations
-TRAFFICGEN_STC_RESOLUTION_PCT = "1.0"
-# The frame size, in bytes
-TRAFFICGEN_STC_FRAME_SIZE = "256"
-# The maximum acceptable frame loss percent in any iteration
-TRAFFICGEN_STC_ACCEPTABLE_FRAME_LOSS_PCT = "0.0"
-# The address to assign to the first emulated device interface on the first east port
-TRAFFICGEN_STC_EAST_INTF_ADDR = "192.85.1.3"
-# The gateway address to assign to the first emulated device interface on the first east port
-TRAFFICGEN_STC_EAST_INTF_GATEWAY_ADDR = "192.85.1.103"
-# The address to assign to the first emulated device interface on the first west port
 TRAFFICGEN_STC_WEST_INTF_ADDR = "192.85.1.103"
-# The gateway address to assign to the first emulated device interface on the first west port
 TRAFFICGEN_STC_WEST_INTF_GATEWAY_ADDR = "192.85.1.3"
-# Print additional information to the terminal during the test
-TRAFFICGEN_STC_VERBOSE = "True"
 # Spirent TestCenter Configuration -- END
 #########################################
 
+
 # Ixia/IxNet configuration
 TRAFFICGEN_IXIA_CARD = ''
 TRAFFICGEN_IXIA_PORT1 = ''