X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FTrafficGenerator.py;h=fd68fee71fadb0e6faf809e5778fd1a9b0d5fb75;hb=c475c56b3125b6214ed02e5c1335661ef191ebda;hp=da364cbdedec755f32f0f31d1992c1bc764a5c43;hpb=0917531dd5b62f1ba6322e8019ee74ab9b25109a;p=csit.git diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py index da364cbded..fd68fee71f 100644 --- a/resources/libraries/python/TrafficGenerator.py +++ b/resources/libraries/python/TrafficGenerator.py @@ -300,16 +300,16 @@ class TrafficGenerator(AbstractMeasurer): # start TRex if test_type == 'L2' or test_type == 'L3': - (ret, _, _) = ssh.exec_command( + (ret, _, _) = ssh.exec_command_sudo( "sh -c 'cd {0}/scripts/ && " "sudo nohup ./t-rex-64 -i -c 7 --iom 0 > /tmp/trex.log " - "2>&1 &' > /dev/null"\ + "2>&1 &' > /dev/null" .format(Constants.TREX_INSTALL_DIR)) elif test_type == 'L7': - (ret, _, _) = ssh.exec_command( + (ret, _, _) = ssh.exec_command_sudo( "sh -c 'cd {0}/scripts/ && " "sudo nohup ./t-rex-64 --astf -i -c 7 --iom 0 > " - "/tmp/trex.log 2>&1 &' > /dev/null"\ + "/tmp/trex.log 2>&1 &' > /dev/null" .format(Constants.TREX_INSTALL_DIR)) else: raise ValueError("Unknown Test Type") @@ -320,7 +320,7 @@ class TrafficGenerator(AbstractMeasurer): # get TRex server info (ret, _, _) = ssh.exec_command( "sh -c 'sleep 3; " - "{0}/resources/tools/trex/trex_server_info.py'"\ + "{0}/resources/tools/trex/trex_server_info.py'" .format(Constants.REMOTE_FW_DIR), timeout=120) if int(ret) == 0: @@ -425,8 +425,8 @@ class TrafficGenerator(AbstractMeasurer): command = ( "sh -c '{tool}/resources/tools/trex/trex_stateless_profile.py" " --profile {prof}/resources/traffic_profiles/trex/{traffic}.py" - " --duration {duration!r} --frame_size {frame_size} --rate {rate!r}" - " --warmup_time {warmup!r} --port_0 {p_0} --port_1 {p_1}").format( + " --duration {duration} --frame_size {frame_size} --rate {rate}" + " --warmup_time {warmup} --port_0 {p_0} --port_1 {p_1}").format( tool=Constants.REMOTE_FW_DIR, prof=Constants.REMOTE_FW_DIR, traffic=traffic_profile, duration=duration, frame_size=frame_size, rate=rate, warmup=warmup_time, p_0=p_0,