T-Rex: Upgrade to 2.73 with DDP profile fix

Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: Icaa99e0a71a19ba23697c21a4b5aa046813a718a

diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py
index d6a94ab..0a8470e 100644 (file)
--- a/resources/libraries/python/Constants.py
+++ b/resources/libraries/python/Constants.py
@@ -182,10 +182,9 @@ class Constants:
     DOCKER_SUT_IMAGE_UBUNTU_ARM = u"snergster/csit-arm-sut:latest"
 
     # TRex install directory
-    TREX_INSTALL_DIR = u"/opt/trex-core-2.61"
+    TREX_INSTALL_DIR = u"/opt/trex-core-2.73"
 
     # TRex limit memory.
-    # 4096 pages (4 GB) is used just due to the current testbed settings.
     TREX_LIMIT_MEMORY = get_int_from_env(u"TREX_LIMIT_MEMORY ", 4096)
 
     # TRex number of cores

diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/group_vars/all.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/group_vars/all.yaml
index f2e76a7..ca0d2d9 100644 (file)
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/group_vars/all.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/group_vars/all.yaml
@@ -25,7 +25,7 @@ name_servers: "1.1.1.1, 8.8.8.8"
 # TRex settings.
 trex:
   target_dir: '/opt'
-  version: '2.61'
+  version: '2.73'
 
 # DPDK settings.
 dpdk:

diff --git a/resources/tools/testbed-setup/ansible/roles/tg/tasks/trex.yaml b/resources/tools/testbed-setup/ansible/roles/tg/tasks/trex.yaml
index 03f7d6d..dc86ec3 100644 (file)
--- a/resources/tools/testbed-setup/ansible/roles/tg/tasks/trex.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/tg/tasks/trex.yaml
@@ -27,15 +27,11 @@
   tags: install-trex
 
 - name: T-Rex Install - Compile Release I
-  command: './b configure; ./b build'
-  args:
-    chdir: '{{ trex.target_dir }}/trex-core-{{ trex.version }}/linux_dpdk/'
+  raw: 'cd {{ trex.target_dir }}/trex-core-{{ trex.version }}/linux_dpdk/; ./b configure; ./b build'
   when: trex_extracted
   tags: install-trex
 
 - name: T-Rex Install - Compile Release II
-  command: 'make; make install'
-  args:
-    chdir: '{{ trex.target_dir }}/trex-core-{{ trex.version }}/scripts/ko/src'
+  raw: 'cd {{ trex.target_dir }}/trex-core-{{ trex.version }}/scripts/ko/src; make; make install'
   when: trex_extracted
   tags: install-trex

diff --git a/resources/tools/trex/trex_server_info.py b/resources/tools/trex/trex_server_info.py
index e74a63e..b34709b 100755 (executable)
--- a/resources/tools/trex/trex_server_info.py
+++ b/resources/tools/trex/trex_server_info.py
@@ -29,7 +29,7 @@ Functionality:
 import sys
 
 sys.path.insert(
-    0, u"/opt/trex-core-2.61/scripts/automation/trex_control_plane/interactive/"
+    0, u"/opt/trex-core-2.73/scripts/automation/trex_control_plane/interactive/"
 )
 from trex.stl.api import *
 

diff --git a/resources/tools/trex/trex_stateless_profile.py b/resources/tools/trex/trex_stateless_profile.py
index 9233f6a..90a4cf0 100755 (executable)
--- a/resources/tools/trex/trex_stateless_profile.py
+++ b/resources/tools/trex/trex_stateless_profile.py
@@ -23,7 +23,7 @@ import json
 import sys
 
 sys.path.insert(
-    0, "/opt/trex-core-2.61/scripts/automation/trex_control_plane/interactive/"
+    0, u"/opt/trex-core-2.73/scripts/automation/trex_control_plane/interactive/"
 )
 from trex.stl.api import *
 

diff --git a/resources/tools/trex/trex_stateless_stop.py b/resources/tools/trex/trex_stateless_stop.py
index 45f4838..d4461ff 100755 (executable)
--- a/resources/tools/trex/trex_stateless_stop.py
+++ b/resources/tools/trex/trex_stateless_stop.py
@@ -34,7 +34,7 @@ import sys
 from collections import OrderedDict  # Needed to parse xstats representation.
 
 sys.path.insert(
-    0, u"/opt/trex-core-2.61/scripts/automation/trex_control_plane/interactive/"
+    0, u"/opt/trex-core-2.73/scripts/automation/trex_control_plane/interactive/"
 )
 from trex.stl.api import *