From: pmikus <pmikus@cisco.com>
Date: Mon, 15 Mar 2021 19:45:04 +0000 (+0000)
Subject: Perf: Bump T-Rex to 2.88
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=6ec31b8aa67f4af2b963b3984f047e94ba790b3d

Perf: Bump T-Rex to 2.88

+ Mellanox 4.6 is not for Ubuntu 20.04
+ Mellanox for ubuntu 20.04 is 4.9+
+ T-Rex 2.86 is not for Mellanox 4.6+
+ T-Rex for Mellanox 5.2 is 2.88+
==================================
= Bump

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

diff --git a/GPL/tools/trex/trex_astf_assert.py b/GPL/tools/trex/trex_astf_assert.py
index 3824fa12df..e983f598b9 100644
--- a/GPL/tools/trex/trex_astf_assert.py
+++ b/GPL/tools/trex/trex_astf_assert.py
@@ -38,7 +38,7 @@ Functionality:
 import sys
 
 sys.path.insert(
-    0, u"/opt/trex-core-2.86/scripts/automation/trex_control_plane/interactive/"
+    0, u"/opt/trex-core-2.88/scripts/automation/trex_control_plane/interactive/"
 )
 from trex.astf.api import *
 
diff --git a/GPL/tools/trex/trex_astf_profile.py b/GPL/tools/trex/trex_astf_profile.py
index 6faa2c008f..3f244ecf09 100644
--- a/GPL/tools/trex/trex_astf_profile.py
+++ b/GPL/tools/trex/trex_astf_profile.py
@@ -34,7 +34,7 @@ import sys
 import time
 
 sys.path.insert(
-    0, u"/opt/trex-core-2.86/scripts/automation/trex_control_plane/interactive/"
+    0, u"/opt/trex-core-2.88/scripts/automation/trex_control_plane/interactive/"
 )
 from trex.astf.api import *
 
diff --git a/GPL/tools/trex/trex_astf_stop.py b/GPL/tools/trex/trex_astf_stop.py
index 820905ec6c..b214d58a2f 100644
--- a/GPL/tools/trex/trex_astf_stop.py
+++ b/GPL/tools/trex/trex_astf_stop.py
@@ -44,7 +44,7 @@ import sys
 from collections import OrderedDict  # Needed to parse xstats representation.
 
 sys.path.insert(
-    0, u"/opt/trex-core-2.86/scripts/automation/trex_control_plane/interactive/"
+    0, u"/opt/trex-core-2.88/scripts/automation/trex_control_plane/interactive/"
 )
 from trex.astf.api import *
 
diff --git a/GPL/tools/trex/trex_stl_assert.py b/GPL/tools/trex/trex_stl_assert.py
index 1bd428dc12..eef06be49f 100644
--- a/GPL/tools/trex/trex_stl_assert.py
+++ b/GPL/tools/trex/trex_stl_assert.py
@@ -38,7 +38,7 @@ Functionality:
 import sys
 
 sys.path.insert(
-    0, u"/opt/trex-core-2.86/scripts/automation/trex_control_plane/interactive/"
+    0, u"/opt/trex-core-2.88/scripts/automation/trex_control_plane/interactive/"
 )
 from trex.stl.api import *
 
diff --git a/GPL/tools/trex/trex_stl_profile.py b/GPL/tools/trex/trex_stl_profile.py
index ba2fc7c6db..8dbc046482 100644
--- a/GPL/tools/trex/trex_stl_profile.py
+++ b/GPL/tools/trex/trex_stl_profile.py
@@ -34,7 +34,7 @@ import sys
 import time
 
 sys.path.insert(
-    0, u"/opt/trex-core-2.86/scripts/automation/trex_control_plane/interactive/"
+    0, u"/opt/trex-core-2.88/scripts/automation/trex_control_plane/interactive/"
 )
 from trex.stl.api import *
 
diff --git a/GPL/tools/trex/trex_stl_stop.py b/GPL/tools/trex/trex_stl_stop.py
index 9d09f28601..1704a89220 100644
--- a/GPL/tools/trex/trex_stl_stop.py
+++ b/GPL/tools/trex/trex_stl_stop.py
@@ -44,7 +44,7 @@ import sys
 from collections import OrderedDict  # Needed to parse xstats representation.
 
 sys.path.insert(
-    0, u"/opt/trex-core-2.86/scripts/automation/trex_control_plane/interactive/"
+    0, u"/opt/trex-core-2.88/scripts/automation/trex_control_plane/interactive/"
 )
 from trex.stl.api import *
 
diff --git a/GPL/traffic_profiles/trex/profile_trex_astf_base_class.py b/GPL/traffic_profiles/trex/profile_trex_astf_base_class.py
index 427060ffee..80ae78fc5a 100644
--- a/GPL/traffic_profiles/trex/profile_trex_astf_base_class.py
+++ b/GPL/traffic_profiles/trex/profile_trex_astf_base_class.py
@@ -133,7 +133,7 @@ class TrafficProfileBaseClass:
         """
         self.framesize = kwargs[u"framesize"]
         self._pcap_dir = kwargs.get(
-            u"pcap_dir",u"/opt/trex-core-2.86/scripts/avl"
+            u"pcap_dir",u"/opt/trex-core-2.88/scripts/avl"
         )
 
         return self.create_profile()
diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py
index 1a548f45d5..0e8ac42638 100644
--- a/resources/libraries/python/Constants.py
+++ b/resources/libraries/python/Constants.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -185,7 +185,7 @@ class Constants:
     DOCKER_SUT_IMAGE_UBUNTU_ARM = u"csit_sut-ubuntu1804:local"
 
     # TRex install directory
-    TREX_INSTALL_DIR = u"/opt/trex-core-2.86"
+    TREX_INSTALL_DIR = u"/opt/trex-core-2.88"
 
     # TODO: Find the right way how to use it in trex profiles
     # TRex pcap files directory
diff --git a/resources/tools/presentation/conf.py b/resources/tools/presentation/conf.py
index b9de3b9d00..0533f23c67 100644
--- a/resources/tools/presentation/conf.py
+++ b/resources/tools/presentation/conf.py
@@ -115,7 +115,7 @@ rst_epilog = u"""
            dpdkrelease=u'20.11',
            dpdk_prev_release=u'20.08',
            sdpdkrelease=u'2011',
-           trex_version=u'v2.86',
+           trex_version=u'v2.88',
            vpp_release_commit_id=u'3d2d96e5547484290c9368bac0a420afa8c4c068')
 
 # The language for content autogenerated by Sphinx. Refer to documentation