diff options
| author |   Tibor Frank <tifrank@cisco.com> | 2017-06-20 13:57:08 +0200 |
|---|---|---|
| committer | Tibor Frank <tifrank@cisco.com> | 2017-06-29 12:17:28 +0000 |
| commit | 6721e7f09aa95bff6622068332a3f56afad9c87b (patch) | |
| tree | 37ef7f40e53f740a62830ab46142aa87342dc56b /resources/libraries/python/TrafficGenerator.py | |
| parent | 859157b5db45927c7b4bb0b2d575e68805777a86 (diff) | |
CSIT-687: Directory structure reorganization
Change-Id: I772c9e214be2461adf58124998d272e7d795220f
Signed-off-by: Tibor Frank <tifrank@cisco.com>
Signed-off-by: Maciek Konstantynowicz <mkonstan@cisco.com>
Diffstat (limited to 'resources/libraries/python/TrafficGenerator.py')
| -rw-r--r-- | resources/libraries/python/TrafficGenerator.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py index 0f25ebe42e..ca63efef56 100644 --- a/resources/libraries/python/TrafficGenerator.py +++ b/resources/libraries/python/TrafficGenerator.py @@ -190,11 +190,11 @@ class TrafficGenerator(object): ssh.connect(tg_node) (ret, stdout, stderr) = ssh.exec_command( - "sudo -E sh -c '{}/resources/tools/t-rex/" - "t-rex-installer.sh'".format(Constants.REMOTE_FW_DIR), + "sudo -E sh -c '{}/resources/tools/trex/" + "trex_installer.sh'".format(Constants.REMOTE_FW_DIR), timeout=1800) if int(ret) != 0: - logger.error('trex installation failed: {0}'.format( + logger.error('TRex installation failed: {0}'.format( stdout + stderr)) raise RuntimeError('Installation of TG failed') @@ -274,7 +274,7 @@ class TrafficGenerator(object): # get T-rex server info (ret, _, _) = ssh.exec_command( "sh -c 'sleep 3; " - "{0}/resources/tools/t-rex/t-rex-server-info.py'"\ + "{0}/resources/tools/trex/trex_server_info.py'"\ .format(Constants.REMOTE_FW_DIR), timeout=120) if int(ret) == 0: @@ -320,8 +320,8 @@ class TrafficGenerator(object): ssh.connect(node) (ret, _, _) = ssh.exec_command( - "sh -c '{}/resources/tools/t-rex/" - "t-rex-stateless-stop.py'".format(Constants.REMOTE_FW_DIR)) + "sh -c '{}/resources/tools/trex/" + "trex_stateless_stop.py'".format(Constants.REMOTE_FW_DIR)) if int(ret) != 0: raise RuntimeError('T-rex stateless runtime error') @@ -355,12 +355,12 @@ class TrafficGenerator(object): _latency = "--latency" if latency else "" _p0, _p1 = (2, 1) if self._ifaces_reordered else (1, 2) - profile_path = ("{0}/resources/tools/t-rex/stream_profiles/" + profile_path = ("{0}/resources/traffic_profiles/trex/" "{1}.py".format(Constants.REMOTE_FW_DIR, traffic_type)) (ret, stdout, _) = ssh.exec_command( "sh -c " - "'{0}/resources/tools/t-rex/t-rex-stateless-profile.py " + "'{0}/resources/tools/trex/trex_stateless_profile.py " "--profile {1} " "--duration {2} " "--frame_size {3} " |