From: Miroslav Miklus Date: Wed, 27 Apr 2016 15:38:41 +0000 (+0200) Subject: Topo installation script fix X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=b9f10c3229e113bd2b6d7e98594ce96eff8414a9 Topo installation script fix -more logging -use single SSH instance -dpkg --force-all -update referece vpp version and reference short test threshold Change-Id: Ie67633755f451dba9d6a3ee1fc431d2c3f3b506f Signed-off-by: Miroslav Miklus --- diff --git a/bootstrap-verify-perf.sh b/bootstrap-verify-perf.sh index 739cda45e7..f1b58ab489 100755 --- a/bootstrap-verify-perf.sh +++ b/bootstrap-verify-perf.sh @@ -16,14 +16,14 @@ set -x # Space separated list of available testbeds, described by topology files TOPOLOGIES="topologies/available/lf_testbed2-710-520.yaml" -VPP_STABLE_VER="1.0.0-304~gd530445_amd64" +VPP_STABLE_VER="1.0.0-369~g106f0ed_amd64" VPP_REPO_URL="https://nexus.fd.io/service/local/repositories/fd.io.dev/content/io/fd/vpp" # Reservation dir RESERVATION_DIR="/tmp/reservation_dir" INSTALLATION_DIR="/tmp/install_dir" -PYBOT_ARGS="" +PYBOT_ARGS="--noncritical MULTI_THREAD" # If we run this script from CSIT jobs we want to use stable vpp version if [[ ${JOB_NAME} == csit-* ]] ; diff --git a/resources/tools/topo_installation.py b/resources/tools/topo_installation.py index f445a965cf..dc45d23b71 100755 --- a/resources/tools/topo_installation.py +++ b/resources/tools/topo_installation.py @@ -22,6 +22,32 @@ from yaml import load from resources.libraries.python.ssh import SSH +def ssh_no_error(ssh, cmd, sudo=False): + """Execute a command over ssh channel, and log and exit if the command + fails. + + :param ssh: SSH() object connected to a node. + :param cmd: Command line to execute on remote node. + :type ssh: SSH() object + :type cmd: str + :return: stdout from the SSH command. + :rtype: str + """ + + if sudo == True: + ret, stdo, stde = ssh.exec_command_sudo(cmd) + else: + ret, stdo, stde = ssh.exec_command(cmd) + + if 0 != ret: + print 'Command execution failed: "{}"'.format(cmd) + print 'stdout: {0}'.format(stdo) + print 'stderr: {0}'.format(stde) + raise RuntimeError('Unexpected ssh command failure') + + return stdo + + def main(): """Copy and installation of VPP packages.""" @@ -43,32 +69,32 @@ def main(): work_file = open(topology_file) topology = load(work_file.read())['nodes'] + ssh = SSH() for node in topology: if topology[node]['type'] == "DUT": - ssh = SSH() + print "###TI host: {}".format(topology[node]['host']) ssh.connect(topology[node]) if cancel_installation: - ret, _, err = ssh.exec_command("rm -r {}".format(install_dir)) - if ret != 0: - print "Cancel unsuccessful:\n{}".format(err) - return ret + # Remove installation directory on DUT + cmd = "rm -r {}".format(install_dir) + stdout = ssh_no_error(ssh, cmd) + print "###TI {}".format(stdout) else: - ret, _, err = ssh.exec_command("mkdir {}".format(install_dir)) - if ret != 0: - print "Mkdir unsuccessful:\n{}".format(err) - return ret + # Create installation directory on DUT + cmd = "mkdir {}".format(install_dir) + stdout = ssh_no_error(ssh, cmd) + print "###TI {}".format(stdout) # Copy packages from local path to installation dir for deb in packages: + print "###TI scp: {}".format(deb) ssh.scp(local_path=deb, remote_path=install_dir) # Installation of VPP deb packages - ret, _, err = ssh.exec_command_sudo( - "dpkg -i {}/*.deb".format(install_dir)) - if ret != 0: - print "Installation unsuccessful:\n{}".format(err) - return ret + cmd = "dpkg -i --force-all {}/*.deb".format(install_dir) + stdout = ssh_no_error(ssh, cmd, sudo=True) + print "###TI {}".format(stdout) if __name__ == "__main__": sys.exit(main()) diff --git a/resources/tools/topo_reservation.py b/resources/tools/topo_reservation.py old mode 100644 new mode 100755 diff --git a/tests/suites/performance/short_bridge_domain.robot b/tests/suites/performance/short_bridge_domain.robot index 81ba0319d8..b4ac600dbb 100644 --- a/tests/suites/performance/short_bridge_domain.robot +++ b/tests/suites/performance/short_bridge_domain.robot @@ -100,14 +100,14 @@ | | Then Traffic should pass with no loss | ${duration} | ${rate} | | ... | ${framesize} | 3-node-bridge -| 4core VPP with rss 2 passes 64B frames through bridge domain at 2x 7.9Mpps in 3-node topology +| 4core VPP with rss 2 passes 64B frames through bridge domain at 2x 7.4Mpps in 3-node topology | | [Documentation] | | ... | VPP with 4 cores and rss 2 should pass 64B frames through bridge -| | ... | domain at 2x7.9Mpps in 3-node topology +| | ... | domain at 2x7.4Mpps in 3-node topology | | [Tags] | 4_THREAD_NOHTT_RSS_2 | MULTI_THREAD | | ${framesize}= | Set Variable | 64 | | ${duration}= | Set Variable | 10 -| | ${rate}= | Set Variable | 7.9mpps +| | ${rate}= | Set Variable | 7.4mpps | | Given Setup '4' worker threads and rss '2' without HTT on all DUTs | | AND L2 bridge domain initialized in a 3-node circular topology | | Then Traffic should pass with no loss | ${duration} | ${rate} diff --git a/tests/suites/performance/short_xconnect_Intel-X520-DA2.robot b/tests/suites/performance/short_xconnect_Intel-X520-DA2.robot index 8a59d8122d..7655458923 100644 --- a/tests/suites/performance/short_xconnect_Intel-X520-DA2.robot +++ b/tests/suites/performance/short_xconnect_Intel-X520-DA2.robot @@ -25,14 +25,14 @@ | Documentation | Minimal throughput acceptance test cases *** Test Cases *** -| 1core VPP passes 64B frames through L2 cross connect at 2x 3.8Mpps in 3-node topology +| 1core VPP passes 64B frames through L2 cross connect at 2x 3.6Mpps in 3-node topology | | [Documentation] | | ... | VPP with 1 core should pass 64B frames through L2 cross connect -| | ... | at 2x3.8Mpps in 3-node topology +| | ... | at 2x3.6Mpps in 3-node topology | | [Tags] | 1_THREAD_NOHTT_RSS_1 | SINGLE_THREAD | | ${framesize}= | Set Variable | 64 | | ${duration}= | Set Variable | 10 -| | ${rate}= | Set Variable | 3.8mpps +| | ${rate}= | Set Variable | 3.6mpps | | Given Setup '1' worker threads and rss '1' without HTT on all DUTs | | AND L2 xconnect initialized in a 3-node circular topology | | Then Traffic should pass with no loss | ${duration} | ${rate} @@ -103,14 +103,14 @@ | | Then Traffic should pass with no loss | ${duration} | ${rate} | | ... | ${framesize} | 3-node-xconnect -| 4core VPP with rss 2 passes 64B frames through L2 cross connect at 2x 9.9Mpps in 3-node topology +| 4core VPP with rss 2 passes 64B frames through L2 cross connect at 2x 9.3Mpps in 3-node topology | | [Documentation] | | ... | VPP with 4 cores and rss 2 should pass 64B frames through L2 cross -| | ... | connect at 2x9.9Mpps in 3-node topology +| | ... | connect at 2x9.3Mpps in 3-node topology | | [Tags] | 4_THREAD_NOHTT_RSS_2 | MULTI_THREAD | | ${framesize}= | Set Variable | 64 | | ${duration}= | Set Variable | 10 -| | ${rate}= | Set Variable | 9.9mpps +| | ${rate}= | Set Variable | 9.3mpps | | Given Setup '4' worker threads and rss '2' without HTT on all DUTs | | AND L2 xconnect initialized in a 3-node circular topology | | Then Traffic should pass with no loss | ${duration} | ${rate}