summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorimarom <imarom@cisco.com>2016-03-22 10:53:23 +0200
committerimarom <imarom@cisco.com>2016-03-22 10:54:27 +0200
commit64dd1f33ad253014d70db8f440bd2e9f7b7e9faf (patch)
treeeb2503dc40830dceda290e951ec5217c390b7278
parentbe0934dd3cb40c1d39fd9a54c982982d22ae2adc (diff)
console push was broken
-rw-r--r--scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py27
-rwxr-xr-xscripts/automation/trex_control_plane/stl/trex_stl_lib/utils/parsing_opts.py2
2 files changed, 10 insertions, 19 deletions
diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py
index d307a383..0f3cd65c 100644
--- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py
+++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py
@@ -2234,21 +2234,16 @@ class STLClient(object):
else:
self.stop(active_ports)
- try:
- # pcap injection removes all previous streams from the ports
- self.remove_all_streams(ports = opts.ports)
+ # pcap injection removes all previous streams from the ports
+ self.remove_all_streams(ports = opts.ports)
- profile = STLProfile.load_pcap(opts.file[0],
- opts.ipg_usec,
- opts.speedup,
- opts.count)
-
- id_list = self.add_streams(profile.get_streams(), opts.ports)
- self.start(ports = opts.ports, duration = opts.duration, force = opts.force)
+ profile = STLProfile.load_pcap(opts.file[0],
+ opts.ipg_usec,
+ opts.speedup,
+ opts.count)
- except STLError as e:
- stl.logger.log(e.brief())
- return
+ id_list = self.add_streams(profile.get_streams(), opts.ports)
+ self.start(ports = opts.ports, duration = opts.duration, force = opts.force)
return True
@@ -2268,11 +2263,7 @@ class STLClient(object):
if opts is None:
return
- try:
- self.set_port_attr(opts.ports, opts.prom)
- except STLError as e:
- stl.logger.log(brief())
- return
+ self.set_port_attr(opts.ports, opts.prom)
diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/parsing_opts.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/parsing_opts.py
index c4f2b358..6ec2d189 100755
--- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/parsing_opts.py
+++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/parsing_opts.py
@@ -225,7 +225,7 @@ OPTIONS_DB = {MULTIPLIER: ArgumentPack(['-m', '--multiplier'],
IPG: ArgumentPack(['-i', '--ipg'],
{'help': "IPG value in usec between packets. default will be from the pcap",
'dest': "ipg_usec",
- 'default': None,
+ 'default': 100.0,
'type': float}),