X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FTrafficGenerator.py;h=6d90fe41b7af2c89cc7ea1bf319c35f2d23f1373;hp=3f5cbe6675a19fe4fdf28d18fe7ae2589035791b;hb=f54659a337045921002d508c48696359d913b044;hpb=986a656c8ab1581a14a94d3dadf7bb7fc87764e5 diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py index 3f5cbe6675..6d90fe41b7 100644 --- a/resources/libraries/python/TrafficGenerator.py +++ b/resources/libraries/python/TrafficGenerator.py @@ -16,6 +16,7 @@ from robot.api import logger from robot.libraries.BuiltIn import BuiltIn +from resources.libraries.python.constants import Constants from resources.libraries.python.ssh import SSH from resources.libraries.python.topology import NodeType from resources.libraries.python.topology import NodeSubTypeTG @@ -145,8 +146,9 @@ class TrafficGenerator(object): ssh.connect(tg_node) (ret, stdout, stderr) = ssh.exec_command( - "sudo sh -c '/tmp/openvpp-testing/resources/tools/t-rex/" - "t-rex-installer.sh'", timeout=300) + "sudo sh -c '{}/resources/tools/t-rex/" + "t-rex-installer.sh'".format(Constants.REMOTE_FW_DIR), + timeout=1800) if int(ret) != 0: logger.error('trex installation failed: {0}'.format( stdout + stderr)) @@ -198,23 +200,40 @@ class TrafficGenerator(object): raise RuntimeError('trex config generation error') (ret, stdout, stderr) = ssh.exec_command( - "sh -c 'cd {0}/scripts/ && " - "sudo ./trex-cfg'"\ - .format(trex_path)) + "sh -c 'cd {0}/scripts/ && sudo ./trex-cfg'".format(trex_path)) if int(ret) != 0: logger.error('trex-cfg failed: {0}'.format(stdout + stderr)) raise RuntimeError('trex-cfg failed') - (ret, _, _) = ssh.exec_command( - "sh -c 'pgrep t-rex && sudo pkill t-rex'") + max_startup_retries = 3 + while max_startup_retries > 0: + # kill T-rex only if it is already running + (ret, _, _) = ssh.exec_command( + "sh -c 'pgrep t-rex && sudo pkill t-rex'") + + # start T-rex + (ret, _, _) = ssh.exec_command( + "sh -c 'cd {0}/scripts/ && " + "sudo nohup ./t-rex-64 -i -c 7 --iom 0 > /dev/null 2>&1 &'" + "> /dev/null"\ + .format(trex_path)) + if int(ret) != 0: + raise RuntimeError('t-rex-64 startup failed') + + # get T-rex server info + (ret, _, _) = ssh.exec_command( + "sh -c '{0}/resources/tools/t-rex/t-rex-server-info.py'"\ + .format(Constants.REMOTE_FW_DIR), + timeout=120) + if int(ret) == 0: + # If we get info T-rex is running + return + # try again + max_startup_retries -= 1 + # after max retries T-rex is still not responding to API + # critical error occured + raise RuntimeError('t-rex-64 startup failed') - (ret, _, _) = ssh.exec_command( - "sh -c 'cd {0}/scripts/ && " - "sudo nohup ./t-rex-64 -i -c 7 --iom 0 > /dev/null 2>&1 &'" - "> /dev/null"\ - .format(trex_path)) - if int(ret) != 0: - raise RuntimeError('t-rex-64 startup failed') @staticmethod def teardown_traffic_generator(node): @@ -247,8 +266,8 @@ class TrafficGenerator(object): ssh.connect(node) (ret, stdout, stderr) = ssh.exec_command( - "sh -c '/tmp/openvpp-testing/resources/tools/t-rex/" - "t-rex-stateless-stop.py'") + "sh -c '{}/resources/tools/t-rex/" + "t-rex-stateless-stop.py'".format(Constants.REMOTE_FW_DIR)) logger.trace(ret) logger.trace(stdout) logger.trace(stderr) @@ -288,44 +307,44 @@ class TrafficGenerator(object): if traffic_type in ["3-node-xconnect", "3-node-bridge"]: (ret, stdout, stderr) = ssh.exec_command( - "sh -c '/tmp/openvpp-testing/resources/tools/t-rex/" - "t-rex-stateless.py " - "--duration={0} -r {1} -s {2} " - "--p{3}_src_start_ip 10.10.10.1 " - "--p{3}_src_end_ip 10.10.10.254 " - "--p{3}_dst_start_ip 20.20.20.1 " - "--p{4}_src_start_ip 20.20.20.1 " - "--p{4}_src_end_ip 20.20.20.254 " - "--p{4}_dst_start_ip 10.10.10.1 " - "{5} --warmup_time={6}'".format(duration, rate, framesize, _p0, + "sh -c '{0}/resources/tools/t-rex/t-rex-stateless.py " + "--duration={1} -r {2} -s {3} " + "--p{4}_src_start_ip 10.10.10.1 " + "--p{4}_src_end_ip 10.10.10.254 " + "--p{4}_dst_start_ip 20.20.20.1 " + "--p{5}_src_start_ip 20.20.20.1 " + "--p{5}_src_end_ip 20.20.20.254 " + "--p{5}_dst_start_ip 10.10.10.1 " + "{6} --warmup_time={7}'".format(Constants.REMOTE_FW_DIR, + duration, rate, framesize, _p0, _p1, _async, warmup_time), timeout=int(duration)+60) elif traffic_type in ["3-node-IPv4"]: (ret, stdout, stderr) = ssh.exec_command( - "sh -c '/tmp/openvpp-testing/resources/tools/t-rex/" - "t-rex-stateless.py " - "--duration={0} -r {1} -s {2} " - "--p{3}_src_start_ip 10.10.10.2 " - "--p{3}_src_end_ip 10.10.10.254 " - "--p{3}_dst_start_ip 20.20.20.2 " - "--p{4}_src_start_ip 20.20.20.2 " - "--p{4}_src_end_ip 20.20.20.254 " - "--p{4}_dst_start_ip 10.10.10.2 " - "{5} --warmup_time={6}'".format(duration, rate, framesize, _p0, + "sh -c '{0}/resources/tools/t-rex/t-rex-stateless.py " + "--duration={1} -r {2} -s {3} " + "--p{4}_src_start_ip 10.10.10.2 " + "--p{4}_src_end_ip 10.10.10.254 " + "--p{4}_dst_start_ip 20.20.20.2 " + "--p{5}_src_start_ip 20.20.20.2 " + "--p{5}_src_end_ip 20.20.20.254 " + "--p{5}_dst_start_ip 10.10.10.2 " + "{6} --warmup_time={7}'".format(Constants.REMOTE_FW_DIR, + duration, rate, framesize, _p0, _p1, _async, warmup_time), timeout=int(duration)+60) elif traffic_type in ["3-node-IPv6"]: (ret, stdout, stderr) = ssh.exec_command( - "sh -c '/tmp/openvpp-testing/resources/tools/t-rex/" - "t-rex-stateless.py " - "--duration={0} -r {1} -s {2} -6 " - "--p{3}_src_start_ip 2001:1::2 " - "--p{3}_src_end_ip 2001:1::FE " - "--p{3}_dst_start_ip 2001:2::2 " - "--p{4}_src_start_ip 2001:2::2 " - "--p{4}_src_end_ip 2001:2::FE " - "--p{4}_dst_start_ip 2001:1::2 " - "{5} --warmup_time={6}'".format(duration, rate, framesize, _p0, + "sh -c '{0}/resources/tools/t-rex/t-rex-stateless.py " + "--duration={1} -r {2} -s {3} -6 " + "--p{4}_src_start_ip 2001:1::2 " + "--p{4}_src_end_ip 2001:1::FE " + "--p{4}_dst_start_ip 2001:2::2 " + "--p{5}_src_start_ip 2001:2::2 " + "--p{5}_src_end_ip 2001:2::FE " + "--p{5}_dst_start_ip 2001:1::2 " + "{6} --warmup_time={7}'".format(Constants.REMOTE_FW_DIR, + duration, rate, framesize, _p0, _p1, _async, warmup_time), timeout=int(duration)+60) else: