console push was broken
authorimarom <[email protected]>
Tue, 22 Mar 2016 08:53:23 +0000 (10:53 +0200)
committerimarom <[email protected]>
Tue, 22 Mar 2016 08:54:27 +0000 (10:54 +0200)
scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py
scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/parsing_opts.py

index d307a38..0f3cd65 100644 (file)
@@ -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)
 
     
 
index c4f2b35..6ec2d18 100755 (executable)
@@ -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}),