diff options
| author |   imarom <imarom@cisco.com> | 2015-09-21 18:55:15 +0300 |
|---|---|---|
| committer | imarom <imarom@cisco.com> | 2015-09-21 18:55:15 +0300 |
| commit | 14006b519bfd679227a87d0e6a2be9726774aafc (patch) | |
| tree | 88b8eed17c52d3460291248cfd807a19c592ea3b /scripts/automation/trex_control_plane/server | |
| parent | d9e1cc14540431aa8baf8480625aa54c2a7c7175 (diff) | |
| parent | dbeb7ecc059bb78db54ec285a4216a661bbedd23 (diff) | |
Merge branch 'master' into rpc
Conflicts:
scripts/automation/trex_control_plane/client_utils/jsonrpc_client.py
Diffstat (limited to 'scripts/automation/trex_control_plane/server')
| -rwxr-xr-x | scripts/automation/trex_control_plane/server/extended_daemon_runner.py | 2 | ||||
| -rwxr-xr-x | scripts/automation/trex_control_plane/server/trex_server.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/automation/trex_control_plane/server/extended_daemon_runner.py b/scripts/automation/trex_control_plane/server/extended_daemon_runner.py index 2ce1eb06..1813ed48 100755 --- a/scripts/automation/trex_control_plane/server/extended_daemon_runner.py +++ b/scripts/automation/trex_control_plane/server/extended_daemon_runner.py @@ -35,7 +35,7 @@ class ExtendedDaemonRunner(runner.DaemonRunner): help_menu = """Specify action command to be applied on server.
(*) start : start the application in as a daemon process.
- (*) show : prompt a updated status of daemon process (running/ not running).
+ (*) show : prompt an updated status of daemon process (running/ not running).
(*) stop : exit the daemon process.
(*) restart : stop, then start again the application as daemon process
(*) start-live : start the application in live mode (no daemon process).
diff --git a/scripts/automation/trex_control_plane/server/trex_server.py b/scripts/automation/trex_control_plane/server/trex_server.py index 992a1d5f..35b2669a 100755 --- a/scripts/automation/trex_control_plane/server/trex_server.py +++ b/scripts/automation/trex_control_plane/server/trex_server.py @@ -53,7 +53,7 @@ class CTRexServer(object): the port number on which trex's zmq module will interact with daemon server default value: 4500 - Instatiate a T-Rex client object, and connecting it to listening daemon-server + Instantiate a T-Rex client object, and connecting it to listening daemon-server """ self.TREX_PATH = os.path.abspath(os.path.dirname(trex_path+'/')) self.trex_files_path = os.path.abspath(os.path.dirname(trex_files_path+'/')) |