diff options
| author |   Jan Gelety <jgelety@cisco.com> | 2019-10-24 01:11:09 +0200 |
|---|---|---|
| committer | Jan Gelety <jgelety@cisco.com> | 2019-10-25 14:19:21 +0000 |
| commit | 43de22c850da9c7a74776e162946639196468333 (patch) | |
| tree | 4af7a336d5d7822758ed3183894c8ba04346ee38 | |
| parent | 3719a3d38bd3462772e2c6be10a8ff0ca1860533 (diff) | |
FIX: Start T-Rex with sudorls1904_2
The reason is that later there was introduced change and T-Rex is started
with sudo. Without this change the T-Rex cannot be started under csit 19.04
branch.
Change-Id: Ia111d14bf5af4483d825f5433712a3865e5a9a48
Signed-off-by: Jan Gelety <jgelety@cisco.com>
(cherry picked from commit c475c56b3125b6214ed02e5c1335661ef191ebda)
(cherry picked from commit a3f43d577a05deb1275737d15ca0d5949a9f2eb5)
| -rw-r--r-- | resources/libraries/python/TrafficGenerator.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py index 270c2403af..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: |