tg_instance = BuiltIn().get_library_instance(
'resources.libraries.python.TrafficGenerator')
- if tg_instance._node['subtype'] is None:
+ if tg_instance.node['subtype'] is None:
raise RuntimeError('TG subtype not defined')
- elif tg_instance._node['subtype'] == NodeSubTypeTG.TREX:
+ elif tg_instance.node['subtype'] == NodeSubTypeTG.TREX:
unit_rate = str(rate) + self.get_rate_type_str()
tg_instance.trex_stl_start_remote_exec(self.get_duration(),
unit_rate, frame_size,
'resources.libraries.python.TrafficGenerator')
return tg_instance.get_latency_int()
+
class TrafficGenerator(object):
"""Traffic Generator."""
# T-REX interface order mapping
self._ifaces_reordered = 0
+ @property
+ def node(self):
+ """Getter.
+
+ :returns: Traffic generator node.
+ :rtype: dict
+ """
+ return self._node
+
def get_loss(self):
"""Return number of lost packets.
def initialize_traffic_generator(self, tg_node, tg_if1, tg_if2,
tg_if1_adj_node, tg_if1_adj_if,
tg_if2_adj_node, tg_if2_adj_if,
- test_type):
+ test_type,
+ tg_if1_dst_mac=None, tg_if2_dst_mac=None):
"""TG initialization.
:param tg_node: Traffic generator node.
:param tg_if2_adj_node: TG if2 adjecent node.
:param tg_if2_adj_if: TG if2 adjecent interface.
:param test_type: 'L2' or 'L3' - src/dst MAC address.
+ :param tg_if1_dst_mac: Interface 1 destination MAC address.
+ :param tg_if2_dst_mac: Interface 2 destination MAC address.
:type tg_node: dict
:type tg_if1: str
:type tg_if2: str
:type tg_if2_adj_node: dict
:type tg_if2_adj_if: str
:type test_type: str
+ :type tg_if1_dst_mac: str
+ :type tg_if2_dst_mac: str
:returns: nothing
:raises: RuntimeError in case of issue during initialization.
"""
self._node = tg_node
if tg_node['subtype'] == NodeSubTypeTG.TREX:
- trex_path = "/opt/trex-core-2.09"
+ trex_path = "/opt/trex-core-2.22"
ssh = SSH()
ssh.connect(tg_node)
if2_adj_mac = topo.get_interface_mac(tg_if2_adj_node,
tg_if2_adj_if)
else:
- raise Exception("test_type unknown")
+ raise ValueError("test_type unknown")
+
+ if tg_if1_dst_mac is not None and tg_if2_dst_mac is not None:
+ if1_adj_mac = tg_if1_dst_mac
+ if2_adj_mac = tg_if2_dst_mac
if min(if1_pci, if2_pci) != if1_pci:
if1_mac, if2_mac = if2_mac, if1_mac
while max_startup_retries > 0:
# kill T-rex only if it is already running
(ret, _, _) = ssh.exec_command(
- "sh -c 'pgrep t-rex && sudo pkill t-rex'")
+ "sh -c 'pgrep t-rex && sudo pkill t-rex && sleep 3'")
# configure T-rex
(ret, stdout, stderr) = ssh.exec_command(
# get T-rex server info
(ret, _, _) = ssh.exec_command(
- "sh -c '{0}/resources/tools/t-rex/t-rex-server-info.py'"\
+ "sh -c 'sleep 3; "
+ "{0}/resources/tools/t-rex/t-rex-server-info.py'"\
.format(Constants.REMOTE_FW_DIR),
timeout=120)
if int(ret) == 0:
ssh = SSH()
ssh.connect(node)
(ret, stdout, stderr) = ssh.exec_command(
- "sh -c 'sudo pkill t-rex'")
+ "sh -c 'sudo pkill t-rex && sleep 3'")
if int(ret) != 0:
logger.error('pkill t-rex failed: {0}'.format(stdout + stderr))
raise RuntimeError('pkill t-rex failed')
_p0, _p1, _async, _latency,
warmup_time),
timeout=int(duration)+60)
+ elif traffic_type in ["2-node-bridge"]:
+ (ret, stdout, stderr) = ssh.exec_command(
+ "sh -c '{0}/resources/tools/t-rex/t-rex-stateless.py "
+ "--duration={1} -r {2} -s {3} "
+ "--p{4}_src_start_ip 10.10.10.2 "
+ "--p{4}_src_end_ip 10.10.10.254 "
+ "--p{4}_dst_start_ip 20.20.20.2 "
+ "--p{5}_src_start_ip 20.20.20.2 "
+ "--p{5}_src_end_ip 20.20.20.254 "
+ "--p{5}_dst_start_ip 10.10.10.2 "
+ "{6} {7} --warmup_time={8}'".format(Constants.REMOTE_FW_DIR,
+ duration, rate, framesize,
+ _p0, _p1, _async, _latency,
+ warmup_time),
+ timeout = int(duration) + 60)
else:
raise NotImplementedError('Unsupported traffic type')