diff options
| author |   Peter Mikus <pmikus@cisco.com> | 2019-10-25 12:41:10 +0000 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2019-10-25 14:26:26 +0000 |
| commit | eaf3cde2f590ba2da28b415c5f7463af8827b1d4 (patch) | |
| tree | db822046362921a4de35c8ef17900aedcba49b1a | |
| parent | 909a91c2a2b08a85d700542a77f8b69434f5ded1 (diff) | |
FIX: Limitation for NICs
Change-Id: I8e0a14f59e20d61096e069bb80a0e2c00977ac5c
Signed-off-by: Peter Mikus <pmikus@cisco.com>
| -rw-r--r-- | resources/libraries/python/Constants.py | 19 | ||||
| -rw-r--r-- | resources/libraries/robot/performance/performance_limits.robot | 6 |
2 files changed, 20 insertions, 5 deletions
diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py index 71d5074334..0b0d6f866e 100644 --- a/resources/libraries/python/Constants.py +++ b/resources/libraries/python/Constants.py @@ -232,8 +232,7 @@ class Constants(object): FAIL_ON_CRC_MISMATCH = get_pessimistic_bool_from_env("FAIL_ON_CRC_MISMATCH") # Mapping from NIC name to its bps limit. - # TODO: Implement logic to lower limits to TG NIC or software. Or PCI. - NIC_NAME_TO_LIMIT = { + NIC_NAME_TO_BPS_LIMIT = { "Cisco-VIC-1227": 10000000000, "Cisco-VIC-1385": 24500000000, "Intel-X520-DA2": 10000000000, @@ -245,7 +244,20 @@ class Constants(object): "virtual": 100000000, } - # Suite file names use somewhat more rich (less readable) codes for NICs. + # Mapping from NIC name to its pps limit. + NIC_NAME_TO_PPS_LIMIT = { + "Cisco-VIC-1227": 14880952, + "Cisco-VIC-1385": 18750000, + "Intel-X520-DA2": 14880952, + "Intel-X553": 14880952, + "Intel-X710": 14880952, + "Intel-XL710": 18750000, + "Intel-XXV710": 18750000, + "Mellanox-CX556A": 60000000, #148809523, + "virtual": 14880952, + } + + # Suite file names use codes for NICs. NIC_NAME_TO_CODE = { "Cisco-VIC-1227": "10ge2p1vic1227", "Cisco-VIC-1385": "40ge2p1vic1385", @@ -293,3 +305,4 @@ class Constants(object): "ndrpdr": '''Measure NDR and PDR values using MLRsearch algorithm.\\''', "soak": '''Estimate critical rate using PLRsearch algorithm.\\''', } + diff --git a/resources/libraries/robot/performance/performance_limits.robot b/resources/libraries/robot/performance/performance_limits.robot index 3483311abb..a80ca2f8d5 100644 --- a/resources/libraries/robot/performance/performance_limits.robot +++ b/resources/libraries/robot/performance/performance_limits.robot @@ -80,8 +80,10 @@ | | # TODO: Re-check overhead values in suites with both traffics encapsulated. | | # TODO: Improve layered setup to detect encap/decap and update overhead. | | ${overhead} = | Set Variable If | ${overhead} >= 0 | ${overhead} | ${0} -| | ${pps_limit} = | Set Variable | ${18750000.0} -| | ${bps_limit} = | Get From Dictionary | ${NIC_NAME_TO_LIMIT} | ${nic_name} +| | ${pps_limit} = | Get From Dictionary +| | ... | ${NIC_NAME_TO_PPS_LIMIT} | ${nic_name} +| | ${bps_limit} = | Get From Dictionary +| | ... | ${NIC_NAME_TO_BPS_LIMIT} | ${nic_name} | | ${avg_size} = | Get Average Frame Size | ${frame_size} | | ${max_size} = | Set Variable If | '${frame_size}' == 'IMIX_v4_1' | | ... | ${1518} | ${frame_size} |