merge cleanup

diff --cc scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py
Simple merge

diff --cc scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_hltapi.py
Simple merge

diff --cc scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_port.py
Simple merge

diff --cc scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_std.py
index 8596bbf,6c101fb..2060079
--- 1/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_std.py
--- 2/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_std.py
+++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_std.py
@@@ -25,6 -12,8 +12,8 @@@ def stl_map_ports (client, ports = None
  
      tx_pkts = {}
      pkts = 1
 -    base_pkt = CScapyTRexPktBuilder(pkt = Ether()/IP())
++    base_pkt = STLPktBuilder(pkt = Ether()/IP())
+ 
      for port in ports:
          tx_pkts[pkts] = port
          stream = STLStream(packet = base_pkt,
@@@ -75,3 -64,15 +64,15 @@@
  
      return table
  
 -    base_pkt = CScapyTRexPktBuilder(pkt = Ether()/IP())
+ # reset ports and send 3 packets from each acquired port
+ def stl_send_3_pkts(client, ports = None):
+ 
++    base_pkt = STLPktBuilder(pkt = Ether()/IP())
+     stream = STLStream(packet = base_pkt,
+                        mode = STLTXSingleBurst(pps = 100000, total_pkts = 3))
+ 
+     client.reset(ports)
+     client.add_streams(stream, ports)
+     client.start(ports, mult = "50%")
+     client.wait_on_traffic(ports)
+     client.reset(ports)