diff options
author | 2015-12-16 20:54:04 +0200 | |
---|---|---|
committer | 2015-12-16 20:54:04 +0200 | |
commit | 3f6e247e9ed29e9dbf61dffadfb2a86c2284987e (patch) | |
tree | 37d6f894ba5714fc261090f318959f076c1fe4ca /scripts/automation/trex_control_plane | |
parent | 9c225132ef8dcbb6dff9aa0221a5b76328a7f75f (diff) |
add tuple gen command and yaml example
Diffstat (limited to 'scripts/automation/trex_control_plane')
-rwxr-xr-x | scripts/automation/trex_control_plane/client/trex_stateless_client.py | 11 | ||||
-rwxr-xr-x | scripts/automation/trex_control_plane/console/trex_console.py | 6 |
2 files changed, 14 insertions, 3 deletions
diff --git a/scripts/automation/trex_control_plane/client/trex_stateless_client.py b/scripts/automation/trex_control_plane/client/trex_stateless_client.py index 75c1c06f..a76b1f9f 100755 --- a/scripts/automation/trex_control_plane/client/trex_stateless_client.py +++ b/scripts/automation/trex_control_plane/client/trex_stateless_client.py @@ -899,6 +899,7 @@ class CTRexStatelessClient(object): opts = parser.parse_args(line.split()) + if opts is None: return RC_ERR("bad command line parameters") @@ -915,7 +916,15 @@ class CTRexStatelessClient(object): else: # load streams from file - stream_list = self.streams_db.load_yaml_file(opts.file[0]) + stream_list = None; + try: + stream_list = self.streams_db.load_yaml_file(opts.file[0]) + except Exception as e: + s = str(e) + rc=RC_ERR("Failed to load stream pack") + rc.annotate() + return rc + rc = RC(stream_list != None) rc.annotate("Load stream pack (from file):") if stream_list == None: diff --git a/scripts/automation/trex_control_plane/console/trex_console.py b/scripts/automation/trex_control_plane/console/trex_console.py index 1d94afb7..a3ea6693 100755 --- a/scripts/automation/trex_control_plane/console/trex_console.py +++ b/scripts/automation/trex_control_plane/console/trex_console.py @@ -164,8 +164,8 @@ class TRexConsole(TRexGeneralCmd): print format_text("\n'{0}' cannot be executed on read only mode\n".format(func_name), 'bold') return - ret = f(*args) - return ret + rc = f(*args) + return rc return wrap @@ -349,6 +349,8 @@ class TRexConsole(TRexGeneralCmd): self.stateless_client.cmd_start_line(line) + + def help_start(self): self.do_start("-h") |