diff options
| -rwxr-xr-x | ci/envs/data_publish.py | 3 | ||||
| -rwxr-xr-x | ci/envs/packet_forwarding.sh | 6 | ||||
| -rwxr-xr-x | tests/vsperf.conf | 9 | ||||
| -rwxr-xr-x | tests/vsperf.conf.sriov | 7 |
4 files changed, 20 insertions, 5 deletions
diff --git a/ci/envs/data_publish.py b/ci/envs/data_publish.py index 67b3054e7..009f6e4e1 100755 --- a/ci/envs/data_publish.py +++ b/ci/envs/data_publish.py @@ -34,7 +34,8 @@ def publish_results(testtype): "fields": { "min_value": i['min_latency_ns'], "avg_value": i['avg_latency_ns'], - "max_value": i['max_latency_ns'] + "max_value": i['max_latency_ns'], + "throughput": i['throughput_rx_mbps'] } } ] diff --git a/ci/envs/packet_forwarding.sh b/ci/envs/packet_forwarding.sh index cdfed74b1..1ec636511 100755 --- a/ci/envs/packet_forwarding.sh +++ b/ci/envs/packet_forwarding.sh @@ -12,9 +12,9 @@ EXIT=0 EXIT_TC_FAILED=1 # DAILY - run selected TCs for defined packet sizes -TESTCASES_DAILY='phy2phy_tput pvp_tput pvvp_tput' +TESTCASES_DAILY='phy2phy_tput pvp_tput pvvp_tput pvpv_cont' TESTPARAM_DAILY='--test-params TRAFFICGEN_PKT_SIZES=(64,128,512,1024,1518)' -TESTCASES_SRIOV='pvp_tput pvvp_tput' +TESTCASES_SRIOV='pvp_tput' TESTPARAM_SRIOV='--test-params TRAFFICGEN_PKT_SIZES=(64,128,512,1024,1518)' #mounting shared directory for collecting ixia test results. @@ -102,6 +102,7 @@ function execute_vsperf() { echo -e "\nExecution of VSPERF for $1" DATE_SUFFIX=$(date -u +"%Y-%m-%d_%H-%M-%S") source "$VSPERFENV_DIR"/bin/activate + cd $HOME/vswitchperf case $1 in "SRIOV") # use SRIOV specific TCs and configuration @@ -117,7 +118,6 @@ function execute_vsperf() { # figure out log file name LOG_SUBDIR="OvsDpdkVhost" LOG_FILE="${LOG_FILE_PREFIX}_${LOG_SUBDIR}_${DATE_SUFFIX}.log" - cd $HOME/vswitchperf $VSPERF_BIN --list echo "daily test cases started" echo " $VSPERF_BIN --vswitch OvsDpdkVhost --vnf QemuDpdkVhostUser $CONF_FILE $TESTPARAM $TESTCASES > $LOG_FILE" diff --git a/tests/vsperf.conf b/tests/vsperf.conf index a5055e770..ac5505261 100755 --- a/tests/vsperf.conf +++ b/tests/vsperf.conf @@ -26,7 +26,14 @@ WHITELIST_NICS = ['02:00.0', '02:00.1'] ############################## # VNF configuration ############################## -GUEST_IMAGE = ['/home/jenkins/vloop-vnf-ubuntu-14.04_20160804.qcow2'] +GUEST_IMAGE = ['/home/jenkins/vloop-vnf-ubuntu-14.04_20160804.qcow2','/home/jenkins/vloop-vnf-ubuntu-14.04_20160823.qcow2'] +GUEST_SMP = ['2'] +GUEST_CORE_BINDING = [('27','28'),('29','30')] +GUEST_THREAD_BINDING = [('33','34'),('35','36')] +VNF_AFFINITIZATION_ON = True +# loopback application for tests with VMs +GUEST_LOOPBACK=['testpmd','testpmd'] +TESTPMD_FWD_MODE = 'io' #Using kvmfornfv built qemu for launching guest vms. PATHS['qemu'] = { 'type' : 'bin', diff --git a/tests/vsperf.conf.sriov b/tests/vsperf.conf.sriov index c37414c1b..f476848b7 100755 --- a/tests/vsperf.conf.sriov +++ b/tests/vsperf.conf.sriov @@ -28,6 +28,13 @@ PATHS['dpdk']['src']['modules'] = ['uio', 'vfio-pci'] # VNF configuration ############################# GUEST_IMAGE = ['/home/jenkins/vloop-vnf-ubuntu-14.04_20160804.qcow2'] +GUEST_SMP = ['2'] +GUEST_CORE_BINDING = [('27','28'),('29','30')] +GUEST_THREAD_BINDING = [('33','34'),('35','36')] +VNF_AFFINITIZATION_ON = True +# loopback application for tests with VMs +GUEST_LOOPBACK=['testpmd','testpmd'] +TESTPMD_FWD_MODE = 'io' #Using kvmfornfv built qemu for launching guest vms. PATHS['qemu'] = { 'type' : 'bin', |