remove STLSim from pcap example, remove search of BP-sim path

2 files changed, 5 insertions, 14 deletions

diff --git a/scripts/automation/trex_control_plane/stl/examples/stl_pcap.py b/scripts/automation/trex_control_plane/stl/examples/stl_pcap.py
index eae0f18b..98af6134 100644
--- a/scripts/automation/trex_control_plane/stl/examples/stl_pcap.py
+++ b/scripts/automation/trex_control_plane/stl/examples/stl_pcap.py
@@ -39,14 +39,12 @@ def inject_pcap (pcap_file, server, port, loop_count, ipg_usec, use_vm, remove_f
         c.reset(ports = [port])
 
         c.clear_stats()
-        d = c.push_pcap(pcap_file,
+        c.push_pcap(pcap_file,
                         ipg_usec = ipg_usec,
                         count = loop_count,
                         vm = vm,
                         packet_hook = packet_hook)
 
-        STLSim().run(d, outfile = 'test.cap')
-
         c.wait_on_traffic()
 
 
diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_sim.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_sim.py
index 11e80b9a..62724e64 100644
--- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_sim.py
+++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_sim.py
@@ -40,18 +40,11 @@ class BpSimException(Exception):
 
 # stateless simulation
 class STLSim(object):
-    def __init__ (self, bp_sim_path = None, handler = 0, port_id = 0, api_h = "dummy"):
+    def __init__ (self, bp_sim_path, handler = 0, port_id = 0, api_h = "dummy"):
 
-        if not bp_sim_path:
-            # auto find scripts
-            m = re.match(".*/trex-core", os.getcwd())
-            if not m:
-                raise STLError('cannot find BP sim path, please provide it')
-
-            self.bp_sim_path = os.path.join(m.group(0), 'scripts')
-
-        else:
-            self.bp_sim_path = bp_sim_path
+        self.bp_sim_path = os.path.abspath(bp_sim_path)
+        if not os.path.exists(self.bp_sim_path):
+            raise STLError('BP sim path %s does not exist' % self.bp_sim_path)
 
         # dummies
         self.handler = handler