[dts] [PATCH for-next v2 5/5] framework/pktgen: Start T-Rex during prepare_generator()
Patrick MacArthur
pmacarth at iol.unh.edu
Tue Mar 20 23:20:41 CET 2018
The currently merged patchset for T-Rex does not actually start T-Rex.
Add a configuration option "start_trex" and start T-Rex during the
prepare_generator() step if this is set to a non-empty string. We need
T-Rex running during this step so we can determine which ports the T-Rex
API is making available to the DUT before we set up the DUT's network
interfaces accordingly.
This configuration option assumes that T-Rex will always be run on the
tester node.
Signed-off-by: Patrick MacArthur <pmacarth at iol.unh.edu>
---
conf/pktgen.cfg | 2 ++
framework/pktgen.py | 47 ++++++++++++++++++++++++++++++++---------------
framework/tester.py | 1 +
3 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/conf/pktgen.cfg b/conf/pktgen.cfg
index 1f3c7952f7f8..cc3fe61356b1 100644
--- a/conf/pktgen.cfg
+++ b/conf/pktgen.cfg
@@ -9,6 +9,7 @@
# socket_memory --socket-mem: Memory to allocate on specific sockets
# mapping_ports -m: Matrix for mapping ports to logical cores.
# pcap_port_num -s P:file: The PCAP packet file to stream. P is the port number.
+# start_trex: Set to a nonempty value to start trex ourselves.
[TREX]
trex_root_path=/opt/trex-core-2.26
config_file=/etc/trex_cfg.yaml
@@ -20,3 +21,4 @@ ip_src=16.0.0.1
ip_dst=10.0.0.1
warmup=15
duration=-1
+#start_trex=yes
diff --git a/framework/pktgen.py b/framework/pktgen.py
index 9e052c832da9..cffa7191da6d 100644
--- a/framework/pktgen.py
+++ b/framework/pktgen.py
@@ -204,6 +204,7 @@ class TrexPacketGenerator(PacketGenerator):
def __init__(self, tester):
self.pktgen_type = "trex"
self._conn = None
+ self.control_session = None
self._ports = []
self._traffic_ports = []
self._transmit_streams = {}
@@ -218,7 +219,6 @@ class TrexPacketGenerator(PacketGenerator):
def connect(self):
self._conn = self.trex_client(server=self.conf["server"])
- time.sleep(30)
self._conn.connect()
for p in self._conn.get_all_ports():
self._ports.append(p)
@@ -287,15 +287,20 @@ class TrexPacketGenerator(PacketGenerator):
return vm
def _prepare_generator(self):
- app_param_temp = "-i"
-
- for key in self.conf:
- #key, value = pktgen_conf
- if key == 'config_file':
- app_param_temp = app_param_temp + " --cfg " + self.conf[key]
- elif key == 'core_num':
- app_param_temp = app_param_temp + " -c " + self.conf[key]
-
+ if self.conf.has_key('start_trex') and self.conf['start_trex']:
+ app_param_temp = "-i"
+
+ for key in self.conf:
+ #key, value = pktgen_conf
+ if key == 'config_file':
+ app_param_temp = app_param_temp + " --cfg " + self.conf[key]
+ elif key == 'core_num':
+ app_param_temp = app_param_temp + " -c " + self.conf[key]
+ app = self.conf['trex_root_path'] + os.sep + self.trex_app
+ cmd = app + " " + app_param_temp
+ self.control_session = self.tester.create_session('trex_control_session')
+ self.control_session.send_expect('cd ' + self.conf['trex_root_path'] + os.sep + 'scripts', '# ')
+ self.control_session.send_expect(app + " " + app_param_temp, '-Per port stats table', 30)
# Insert Trex api library
sys.path.insert(0, "{0}/scripts/automation/trex_control_plane/stl".format(self.conf['trex_root_path']))
@@ -377,16 +382,22 @@ class TrexPacketGenerator(PacketGenerator):
if self.conf.has_key("warmup"):
warmup = int(self.conf["warmup"])
+ self._traffic_ports = list()
+ for stream_id in stream_ids:
+ self._traffic_ports.append(self._ports[self._get_stream(stream_id)['tx_port']])
+
+ print self._traffic_ports
+ self._conn.set_service_mode(ports=self._traffic_ports, enabled=True)
+ self._conn.resolve(ports=self._traffic_ports)
+ self._conn.set_service_mode(ports=self._traffic_ports, enabled=False)
+
for stream_id in stream_ids:
stream = self._get_stream(stream_id)
# tester port to Trex port
tx_port = stream["tx_port"]
p = self._ports[tx_port]
- self._conn.add_streams(self._transmit_streams[stream_id], ports=[p])
+ sid = self._conn.add_streams(self._transmit_streams[stream_id], ports=[p])
rate = stream["options"]["rate"]
- self._traffic_ports.append(p)
-
- print self._traffic_ports
if self.conf.has_key("core_mask"):
self._conn.start(ports=self._traffic_ports, mult=rate, duration=warmup, core_mask=self.conf["core_mask"])
@@ -421,7 +432,13 @@ class TrexPacketGenerator(PacketGenerator):
return rate_rx_bits, rate_rx_pkts
def quit_generator(self):
- self.disconnect()
+ if self._conn is not None:
+ self.disconnect()
+ self.tester.send_expect('pkill -f _t-rex-64', '# ')
+ time.sleep(5)
+ if self.control_session is not None:
+ self.tester.destroy_session(self.control_session)
+ self.control_session = None
def getPacketGenerator(tester, pktgen_type="trex"):
"""
diff --git a/framework/tester.py b/framework/tester.py
index be5b0e13897c..e20c4f8ffcf7 100755
--- a/framework/tester.py
+++ b/framework/tester.py
@@ -743,5 +743,6 @@ class Tester(Crb):
"""
Close all resource before crb exit
"""
+ self.pktgen.quit_generator()
self.logger.logger_exit()
self.close()
--
2.14.1
More information about the dts
mailing list