diff options
author | imarom <imarom@cisco.com> | 2015-12-01 03:46:21 -0500 |
---|---|---|
committer | imarom <imarom@cisco.com> | 2015-12-01 03:47:51 -0500 |
commit | a48cd6471a2d82e5d78e8abe85b065f66a388e11 (patch) | |
tree | 1de45ed312a00790d3d8d741d8d51d4f94ac4202 /scripts/automation/trex_control_plane/common | |
parent | f2f7a6d3126044ac58f24ab8b07d4cba092554ca (diff) |
1. fixed ZMQ message limitation
2. added some scale yamls for IMIX (300 streams, 1000 streams)
3. return objects are always complex objects (not strings) - for backward compatability
4. some minor adjustments to ZMQ socket timeouts
Diffstat (limited to 'scripts/automation/trex_control_plane/common')
-rwxr-xr-x | scripts/automation/trex_control_plane/common/trex_streams.py | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/scripts/automation/trex_control_plane/common/trex_streams.py b/scripts/automation/trex_control_plane/common/trex_streams.py index bb4c72ca..c2823445 100755 --- a/scripts/automation/trex_control_plane/common/trex_streams.py +++ b/scripts/automation/trex_control_plane/common/trex_streams.py @@ -18,10 +18,22 @@ class CStreamList(object): self.yaml_loader = CTRexYAMLLoader(os.path.join(os.path.dirname(os.path.realpath(__file__)), "rpc_defaults.yaml")) + def generate_numbered_name (self, name): + prefix = name.rstrip('01234567890') + suffix = name[len(prefix):] + if suffix == "": + n = "_1" + else: + n = int(suffix) + 1 + return prefix + str(n) + def append_stream(self, name, stream_obj): assert isinstance(stream_obj, CStream) - if name in self.streams_list: - raise NameError("A stream with this name already exists on this list.") + + # if name exists simply add numbered suffix to it + while name in self.streams_list: + name = self.generate_numbered_name(name) + self.streams_list[name]=stream_obj return name |