FIX: Start T-Rex with sudo

[csit.git] / resources / libraries / python / TrafficGenerator.py

diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py
index da364cb..fd68fee 100644 (file)
--- 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,