summaryrefslogtreecommitdiffstats
path: root/scripts/automation/trex_control_plane/common
diff options
context:
space:
mode:
authorDan Klein <danklei@cisco.com>2015-10-20 09:12:33 +0300
committerDan Klein <danklei@cisco.com>2015-10-20 09:12:33 +0300
commit5abe21ffb26a15c2a63e90b5628d704e8211b599 (patch)
tree202fe09b0070f962da1e996673d7db21005a94d8 /scripts/automation/trex_control_plane/common
parentcf753587ffb7b89cff1863c74ca334b8c41fd0c0 (diff)
+ Added traffic options at stl directory
+ updated console to support multiplier on loading + fixed minor issues at yaml_utils and trex_streams objects + console not stable, YET
Diffstat (limited to 'scripts/automation/trex_control_plane/common')
-rwxr-xr-xscripts/automation/trex_control_plane/common/trex_streams.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/automation/trex_control_plane/common/trex_streams.py b/scripts/automation/trex_control_plane/common/trex_streams.py
index 1aeb46b0..783f2769 100755
--- a/scripts/automation/trex_control_plane/common/trex_streams.py
+++ b/scripts/automation/trex_control_plane/common/trex_streams.py
@@ -43,7 +43,7 @@ class CStreamList(object):
def export_to_yaml(self, file_path):
raise NotImplementedError("export_to_yaml method is not implemented, yet")
- def load_yaml(self, file_path, multiplier_dict={}):
+ def load_yaml(self, file_path, multiplier=1):
# clear all existing streams linked to this object
self.streams_list.clear()
streams_data = load_yaml_to_obj(file_path)
@@ -57,11 +57,11 @@ class CStreamList(object):
"Provided item was:\n {stream}".format(stream))
new_stream_data = self.yaml_loader.validate_yaml(raw_stream,
"stream",
- multiplier= multiplier_dict.get(stream_name, 1))
+ multiplier= multiplier)
new_stream_obj = CStream()
new_stream_obj.load_data(**new_stream_data)
self.append_stream(stream_name, new_stream_obj)
- return streams_data
+ return new_stream_data
def compile_streams(self):
# first, assign an id to each stream