X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FTrafficGenerator.py;h=52b5247dfd52b9741deb708de61c221fb0f55f08;hp=8d187c92dcd21c7ef2791dc32df3ed2af6c94c89;hb=b2f75ec0f52110c267b90372e657b664417c1f4b;hpb=cf561a6e3d4c4fbd78ab6c9d0a9aa817bb3300fc

diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py
index 8d187c92dc..52b5247dfd 100644
--- a/resources/libraries/python/TrafficGenerator.py
+++ b/resources/libraries/python/TrafficGenerator.py
@@ -149,7 +149,8 @@ class TrafficGenerator(object):
     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.
@@ -160,6 +161,8 @@ class TrafficGenerator(object):
         :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
@@ -168,6 +171,8 @@ class TrafficGenerator(object):
         :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.
         """
@@ -179,7 +184,7 @@ class TrafficGenerator(object):
         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)
@@ -207,7 +212,11 @@ class TrafficGenerator(object):
                 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
@@ -243,7 +252,7 @@ class TrafficGenerator(object):
             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(
@@ -489,6 +498,21 @@ class TrafficGenerator(object):
                                                     _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')