Revert "Tweak TRex cores and RDMA pps limit"

This reverts commit 925c5bfcffb2bc6b833a8e64b7f3a06bbca52197.
It was affecting 2005 performance, confusing comparisons.

The revert includes the RDMA limit.

Change-Id: I9c31b061ee59bc5cb14d623ac98a65763ef75f1c
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py
index de7a120..ac3715b 100644 (file)
--- a/resources/libraries/python/Constants.py
+++ b/resources/libraries/python/Constants.py
@@ -194,7 +194,7 @@ class Constants:
     TREX_LIMIT_MEMORY = get_int_from_env(u"TREX_LIMIT_MEMORY", 8192)
 
     # TRex number of cores
-    TREX_CORE_COUNT = get_int_from_env(u"TREX_CORE_COUNT", 15)
+    TREX_CORE_COUNT = get_int_from_env(u"TREX_CORE_COUNT", 7)
 
     # Trex force start regardles ports state
     TREX_SEND_FORCE = get_pessimistic_bool_from_env(u"TREX_SEND_FORCE")
@@ -259,8 +259,6 @@ class Constants:
     }
 
     # Mapping from NIC name to its pps limit.
-    # The values are unidirectional, assuming the test
-    # uses two ports on the same NIC.
     NIC_NAME_TO_PPS_LIMIT = {
         u"Cisco-VIC-1227": 14880952,
         u"Cisco-VIC-1385": 18750000,
@@ -269,9 +267,7 @@ class Constants:
         u"Intel-X710": 14880952,
         u"Intel-XL710": 18750000,
         u"Intel-XXV710": 18750000,
-        # The Mellanox card is able to do more, but the current TRex version
-        # shows non-negligible duration stretching, depending on cores used.
-        u"Mellanox-CX556A": 47000000,  # 148809523,
+        u"Mellanox-CX556A": 60000000, # 148809523,
         u"Amazon-Nitro-50G": 1500000,
         u"virtual": 14880952,
     }