summaryrefslogtreecommitdiffstats
path: root/scripts/automation/trex_control_plane/client
diff options
context:
space:
mode:
authorHanoh Haim <hhaim@cisco.com>2016-02-04 10:31:04 +0200
committerHanoh Haim <hhaim@cisco.com>2016-02-04 10:31:04 +0200
commiteaa1928aebec0d8069a1466e2c421d3dfb5b16f0 (patch)
tree7ba4f23c5308aad0102b1d6e106f2390bc1a19f8 /scripts/automation/trex_control_plane/client
parentd95c37b1d2b3c9d7c2e1942b4b8ee18f22464f72 (diff)
parent51f3f97dfcd156b79b10331312d238775443e23c (diff)
Merge simulation fix
Diffstat (limited to 'scripts/automation/trex_control_plane/client')
-rwxr-xr-xscripts/automation/trex_control_plane/client/trex_stateless_client.py3
-rw-r--r--scripts/automation/trex_control_plane/client/trex_stateless_sim.py4
2 files changed, 3 insertions, 4 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 506decfe..ebc9a6ad 100755
--- a/scripts/automation/trex_control_plane/client/trex_stateless_client.py
+++ b/scripts/automation/trex_control_plane/client/trex_stateless_client.py
@@ -929,7 +929,7 @@ class STLClient(object):
def get_stats (self, ports = None, async_barrier = True):
# by default use all ports
if ports == None:
- ports = self.get_all_ports()
+ ports = self.get_acquired_ports()
else:
ports = self.__ports(ports)
@@ -1306,7 +1306,6 @@ class STLClient(object):
try:
streams_db = CStreamsDB()
stream_list = streams_db.load_yaml_file(filename)
-
# convert to new style stream object
streams = [HACKSTLStream(stream) for stream in stream_list.compiled]
except YAMLError:
diff --git a/scripts/automation/trex_control_plane/client/trex_stateless_sim.py b/scripts/automation/trex_control_plane/client/trex_stateless_sim.py
index bfc3a932..d980932a 100644
--- a/scripts/automation/trex_control_plane/client/trex_stateless_sim.py
+++ b/scripts/automation/trex_control_plane/client/trex_stateless_sim.py
@@ -116,8 +116,8 @@ class STLSim(object):
return module.register().get_streams()
- except (AttributeError, ImportError):
- pass
+ except (AttributeError, ImportError) as e:
+ print "specific error: {0}".format(e)
raise STLError("bad format input file '{0}'".format(input_file))