From: pmikus <pmikus@cisco.com>
Date: Thu, 30 Mar 2017 09:22:38 +0000 (+0200)
Subject: Upgrade T-rex to v2.22
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=b2f75ec0f52110c267b90372e657b664417c1f4b;hp=c756b657f5fd3423b95c98d41c6fb0c007cbed08

Upgrade T-rex to v2.22

Change-Id: I2029ba77a1c3c9ba6e128f816a353769a2cd5c8e
Signed-off-by: pmikus <pmikus@cisco.com>
---

diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py
index 47008bc22a..52b5247dfd 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.17"
+            trex_path = "/opt/trex-core-2.22"
 
             ssh = SSH()
             ssh.connect(tg_node)
diff --git a/resources/tools/t-rex/t-rex-installer.sh b/resources/tools/t-rex/t-rex-installer.sh
index d21852c0f7..8090b75683 100755
--- a/resources/tools/t-rex/t-rex-installer.sh
+++ b/resources/tools/t-rex/t-rex-installer.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-TREX_VERSION="2.17"
+TREX_VERSION="2.22"
 
 TREX_DOWNLOAD_REPO="https://github.com/cisco-system-traffic-generator/trex-core/archive/"
 TREX_DOWNLOAD_PACKAGE="v${TREX_VERSION}.zip"
diff --git a/resources/tools/t-rex/t-rex-server-info.py b/resources/tools/t-rex/t-rex-server-info.py
index 891e4312db..0ec447b726 100755
--- a/resources/tools/t-rex/t-rex-server-info.py
+++ b/resources/tools/t-rex/t-rex-server-info.py
@@ -28,7 +28,7 @@ Functionality:
 
 import sys
 
-sys.path.insert(0, "/opt/trex-core-2.17/scripts/automation/"+\
+sys.path.insert(0, "/opt/trex-core-2.22/scripts/automation/"+\
                    "trex_control_plane/stl/")
 from trex_stl_lib.api import *
 
diff --git a/resources/tools/t-rex/t-rex-stateless-stop.py b/resources/tools/t-rex/t-rex-stateless-stop.py
index 7fe4ab5432..a7066293a9 100755
--- a/resources/tools/t-rex/t-rex-stateless-stop.py
+++ b/resources/tools/t-rex/t-rex-stateless-stop.py
@@ -28,7 +28,7 @@ Functionality:
 
 import sys
 
-sys.path.insert(0, "/opt/trex-core-2.17/scripts/automation/"+\
+sys.path.insert(0, "/opt/trex-core-2.22/scripts/automation/"+\
                    "trex_control_plane/stl/")
 from trex_stl_lib.api import *
 
diff --git a/resources/tools/t-rex/t-rex-stateless.py b/resources/tools/t-rex/t-rex-stateless.py
index 0a2d7df1f5..504ef50eef 100755
--- a/resources/tools/t-rex/t-rex-stateless.py
+++ b/resources/tools/t-rex/t-rex-stateless.py
@@ -48,7 +48,7 @@ import string
 import struct
 import sys
 
-sys.path.insert(0, "/opt/trex-core-2.17/scripts/automation/"+\
+sys.path.insert(0, "/opt/trex-core-2.22/scripts/automation/"+\
                    "trex_control_plane/stl/")
 from trex_stl_lib.api import *