X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FTrafficGenerator.py;h=8fb91910637e50048d5b6043d72556f038a6d86d;hp=8387ce2b3c6ae58a504693df5a7d21e48e1b352a;hb=afa3def247a11985b17f310e58b6f5fae16dc306;hpb=28bab4e715a123199972bdc5f79f6a508a879fd6

diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py
index 8387ce2b3c..8fb9191063 100644
--- a/resources/libraries/python/TrafficGenerator.py
+++ b/resources/libraries/python/TrafficGenerator.py
@@ -184,7 +184,7 @@ class TrafficGenerator(object):
         self._node = tg_node
 
         if tg_node['subtype'] == NodeSubTypeTG.TREX:
-            trex_path = "/opt/trex-core-2.22"
+            trex_path = "/opt/trex-core-2.25"
 
             ssh = SSH()
             ssh.connect(tg_node)
@@ -322,9 +322,6 @@ class TrafficGenerator(object):
         (ret, stdout, stderr) = ssh.exec_command(
             "sh -c '{}/resources/tools/t-rex/"
             "t-rex-stateless-stop.py'".format(Constants.REMOTE_FW_DIR))
-        logger.trace(ret)
-        logger.trace(stdout)
-        logger.trace(stderr)
 
         if int(ret) != 0:
             raise RuntimeError('T-rex stateless runtime error')
@@ -713,13 +710,26 @@ class TrafficGenerator(object):
                                                     _p0, _p1, _async, _latency,
                                                     warmup_time),
                 timeout = int(duration) + 60)
+        elif traffic_type in ["3-node-IPv4-l3fwd"]:
+            # add for the DPDK l3fwd routing test
+            # please make sure the TG port 0 connect to the DUT port 0
+            (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}_dst_start_ip 2.1.1.2 "
+                "--p{4}_dst_end_ip 2.1.1.254 "
+                "--p{4}_src_start_ip 20.20.20.2 "
+                "--p{5}_dst_start_ip 1.1.1.2 "
+                "--p{5}_dst_end_ip 1.1.1.254 "
+                "--p{5}_src_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')
 
-        logger.trace(ret)
-        logger.trace(stdout)
-        logger.trace(stderr)
-
         if int(ret) != 0:
             raise RuntimeError('T-rex stateless runtime error')
         elif async_call: