From 77aa724da2c879e1af079daae340d17e01b85601 Mon Sep 17 00:00:00 2001 From: Christian Trautman Date: Fri, 1 Apr 2016 17:31:14 -0400 Subject: xena: Throughput method implementation for Xena Networks Add files for Xena Networks 2544 throughput implementation. This allows for Xena to execute tput tests from VSPerf. For information on how this works please see the JIRA ticket. Modify traffic gen guide on install instructions for Xena. Add in scapy to requirements file. Modify conf file for Xena chassis connection information. * Added license info to __init__.py / baseconfig.x2544 * Set initial rate to 10% line rate for tput testing * Modified default mac address xena_json->set_header_layer2 from aa:aa:aa:aa:aa:aa to cc:cc:cc:cc:cc:cc * Removed obsolete multistream params * Added traffic params to 03_traffic.conf * Comments to explain try/catch for latency values * Removed unused import * Rebased to fix merge conflict * Added Xena to available traffic gen list in conf files JIRA: VSPERF-261 Change-Id: I3c4b4a332fd532e10b6096e9ed97a4a39d410839 Signed-off-by: Christian Trautman --- conf/03_traffic.conf | 9 +++++++++ conf/10_custom.conf | 10 ++++++++++ 2 files changed, 19 insertions(+) (limited to 'conf') diff --git a/conf/03_traffic.conf b/conf/03_traffic.conf index eb09bf09..9dc03a46 100644 --- a/conf/03_traffic.conf +++ b/conf/03_traffic.conf @@ -27,6 +27,7 @@ TRAFFICGEN_DIR = os.path.join(ROOT_DIR, 'tools/pkt_gen') TRAFFICGEN = 'Dummy' #TRAFFICGEN = 'IxNet' #TRAFFICGEN = 'Ixia' +#TRAFFICGEN = 'Xena' # List of packet sizes to send. # Expand like this: (64, 128, 256, 512, 1024) @@ -160,3 +161,11 @@ TRAFFICGEN_STC_VERBOSE = "True" # Spirent TestCenter Configuration -- END ######################################### +# Xena traffic generator connection info +TRAFFICGEN_XENA_IP = '' +TRAFFICGEN_XENA_PORT1 = '' +TRAFFICGEN_XENA_PORT2 = '' +TRAFFICGEN_XENA_USER = '' +TRAFFICGEN_XENA_PASSWORD = '' +TRAFFICGEN_XENA_MODULE1 = '' +TRAFFICGEN_XENA_MODULE2 = '' diff --git a/conf/10_custom.conf b/conf/10_custom.conf index 1f77895d..63c75d39 100644 --- a/conf/10_custom.conf +++ b/conf/10_custom.conf @@ -19,6 +19,7 @@ RTE_TARGET = '' # the relevant DPDK build target TRAFFICGEN = 'Dummy' #TRAFFICGEN = 'IxNet' #TRAFFICGEN = 'Ixia' +#TRAFFICGEN = 'Xena' ########################################### # Spirent TestCenter Configuration -- BEGIN @@ -60,6 +61,15 @@ TRAFFICGEN_IXNET_USER = '' TRAFFICGEN_IXNET_TESTER_RESULT_DIR = '' TRAFFICGEN_IXNET_DUT_RESULT_DIR = '' +# Xena traffic generator connection info +TRAFFICGEN_XENA_IP = '' +TRAFFICGEN_XENA_PORT1 = '' +TRAFFICGEN_XENA_PORT2 = '' +TRAFFICGEN_XENA_USER = '' +TRAFFICGEN_XENA_PASSWORD = '' +TRAFFICGEN_XENA_MODULE1 = '' +TRAFFICGEN_XENA_MODULE2 = '' + TEST_PARAMS = {'pkt_sizes':'64'} OPNFV_INSTALLER = "Fuel" -- cgit 1.2.3-korg