diff options
author | imarom <imarom@cisco.com> | 2016-02-11 10:24:52 -0500 |
---|---|---|
committer | imarom <imarom@cisco.com> | 2016-02-11 10:29:58 -0500 |
commit | e93926178b4a510bd1bec776d69cc77eb7e16aff (patch) | |
tree | c94c290ffdb75d5e8bed13c98375f584f5b5a833 /scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_sim.py | |
parent | b136fa9aa47aa0623683bfe733b46e28eeccd1da (diff) |
YAML support for simulator
Diffstat (limited to 'scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_sim.py')
-rw-r--r-- | scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_sim.py | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_sim.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_sim.py index 357f54bd..4d720aac 100644 --- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_sim.py +++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_sim.py @@ -124,7 +124,7 @@ class STLSim(object): duration = -1, mode = 'none'): - if not mode in ['none', 'gdb', 'valgrind', 'json']: + if not mode in ['none', 'gdb', 'valgrind', 'json', 'yaml']: raise STLArgumentError('mode', mode) # listify @@ -173,16 +173,20 @@ class STLSim(object): raise STLError("stream dependency error - unable to find '{0}'".format(next)) next_id = lookup[next] - stream.fields['next_stream_id'] = next_id + stream.set_next_id(next_id) for stream in stream_list: + + stream_json = stream.to_json() + stream_json['next_stream_id'] = stream.get_next_id() + cmd = {"id":1, "jsonrpc": "2.0", "method": "add_stream", "params": {"handler": self.handler, "port_id": self.port_id, "stream_id": stream.get_id(), - "stream": stream.to_json()} + "stream": stream_json} } cmds_json.append(cmd) @@ -195,6 +199,9 @@ class STLSim(object): if mode == 'json': print json.dumps(cmds_json, indent = 4, separators=(',', ': '), sort_keys = True) return + elif mode == 'yaml': + print STLProfile(stream_list).dump_to_yaml() + return # start simulation self.outfile = outfile @@ -376,6 +383,11 @@ def setParserOptions(): action = "store_true", default = False) + group.add_argument("--yaml", + help = "generate YAML from input file [default is False]", + action = "store_true", + default = False) + return parser @@ -404,6 +416,8 @@ def main (): mode = 'gdb' elif options.json: mode = 'json' + elif options.yaml: + mode = 'yaml' else: mode = 'none' |