X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fperformance%2Fperformance_limits.robot;h=332ed9368b2de9b1fe8b74ccdac5a6b4c2659bdc;hb=97e6988950559e98b5abfd73458dfa830727e16b;hp=759ee5c28f2620de9f0d104dccc4a76710e10c4b;hpb=5e6145a4260ffce1c302e94b9b241851f90838e1;p=csit.git

diff --git a/resources/libraries/robot/performance/performance_limits.robot b/resources/libraries/robot/performance/performance_limits.robot
index 759ee5c28f..332ed9368b 100644
--- a/resources/libraries/robot/performance/performance_limits.robot
+++ b/resources/libraries/robot/performance/performance_limits.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2020 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:
@@ -21,22 +21,51 @@
 | | [Documentation]
 | | ... | Framesize can be either integer in case of a single packet
 | | ... | in stream, or set of packets in case of IMIX type or simmilar.
-| | ...
+| |
 | | ... | *Arguments:*
 | | ... | - frame_size - Framesize. Type: integer or string
-| | ...
+| | ... | - overhead - Overhead in bytes; default value: ${0}. Type: integer
+| |
 | | ... | *Returns:*
-| | ... | Average frame size. Type: float
-| | ...
+| | ... | Average frame size including overhead. Type: float
+| |
 | | ... | *Example:*
-| | ...
+| |
 | | ... | \| Get Average Frame Size \| IMIX_v4_1 \|
-| | ...
-| | [Arguments] | ${frame_size}
-| | ...
-| | Return From Keyword If | '${frame_size}' == 'IMIX_v4_1' | ${353.83333}
-| | ${frame_size} = | Convert To Number | ${frame_size}
-| | Return From Keyword | ${frame_size}
+| |
+| | [Arguments] | ${frame_size} | ${overhead}=${0}
+| |
+| | ${frame_size} = | Run Keyword If | '${frame_size}' == 'IMIX_v4_1'
+| | ... | Set Variable | ${353.83333}
+| | ... | ELSE
+| | ... | Convert To Number | ${frame_size}
+| | ${avg_frame_size} = | Evaluate | ${frame_size} + ${overhead}
+| | Return From Keyword | ${avg_frame_size}
+
+| Get Maximum Frame Size
+| | [Documentation]
+| | ... | Framesize can be either integer in case of a single packet
+| | ... | in stream, or set of packets in case of IMIX type or simmilar.
+| |
+| | ... | *Arguments:*
+| | ... | - frame_size - Framesize. Type: integer or string
+| | ... | - overhead - Overhead in bytes; default value: ${0}. Type: integer
+| |
+| | ... | *Returns:*
+| | ... | Maximum frame size including overhead. Type: float
+| |
+| | ... | *Example:*
+| |
+| | ... | \| Get Maximum Frame Size \| IMIX_v4_1 \|
+| |
+| | [Arguments] | ${frame_size} | ${overhead}=${0}
+| |
+| | ${frame_size} = | Run Keyword If | '${frame_size}' == 'IMIX_v4_1'
+| | ... | Set Variable | ${1518}
+| | ... | ELSE
+| | ... | Convert To Number | ${frame_size}
+| | ${max_frame_size} = | Evaluate | ${frame_size} + ${overhead}
+| | Return From Keyword | ${max_frame_size}
 
 | Set Max Rate And Jumbo
 | | [Documentation]
@@ -50,68 +79,75 @@
 | | ... | whitelisted NIC names.
 | | ... | The mapping is hardcoded in nic_limits.yaml
 | | ... | TODO: Make the mapping from NIC names case insensistive.
-| | ...
+| |
 | | ... | TODO: Make pps limit also definable per NIC.
-| | ...
+| |
 | | ... | This keyword computes maximal unidirectional transmit rate
 | | ... | and jumbo boolean (some suites need that for configuration decisions).
 | | ... | To streamline suite autogeneration, both input and output values
 | | ... | are communicated as test (or broader scope) variables,
 | | ... | instead of explicit arguments and return values.
-| | ...
+| |
 | | ... | *Test (or broader scope) variables read:*
-| | ... |   - nic_name - Name of bottleneck NIC. Type: string
-| | ... |   - overhead - Overhead in bytes. Default: 0. Type: integer
-| | ... |   - frame_size - L2 Frame Size [B] or IMIX string. Type: int or str
-| | ...
+| | ... | - nic_name - Name of bottleneck NIC. Type: string
+| | ... | - overhead - Overhead in bytes; default value: 0. Type: integer
+| | ... | - frame_size - L2 Frame Size [B] or IMIX string. Type: integer or
+| | ... | string
+| |
 | | ... | *Test variables set:*
-| | ... |   - max_rate - Calculated unidirectional maximal transmit rate [pps].
-| | ... |     Type: float
-| | ... |   - jumbo - Jumbo boolean, true if jumbo packet support
-| | ... |     has to be enabled. Type: boolean
-| | ...
+| | ... | - max_rate - Calculated unidirectional maximal transmit rate [pps].
+| | ... | Type: float
+| | ... | - jumbo - Jumbo boolean, true if jumbo packet support has to be
+| | ... | enabled. Type: boolean
+| |
 | | ... | *Example:*
-| | ...
-| | ... | \| Set test Variable \| \${frame_size} \| IMIX_v4_1 \|
+| |
+| | ... | \| Set Test Variable \| \${frame_size} \| IMIX_v4_1 \|
 | | ... | \| Set Max Rate And Jumbo \|
-| | ...
-| | ${pps_limit} = | Set Variable | ${18750000.0}
-| | ${bps_limit} = | Get From Dictionary | ${NIC_NAME_TO_LIMIT} | ${nic_name}
-| | ${avg_size} = | Get Average Frame Size | ${frame_size}
-| | ${max_size} = | Set Variable If | '${frame_size}' == 'IMIX_v4_1'
-| | ... | ${1518} | ${frame_size}
+| |
+| | # Negative overhead is possible, if DUT-DUT traffic is less encapsulated
+| | # than TG-DUT traffic.
+| | # 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} = | Get From Dictionary
+| | ... | ${NIC_NAME_TO_PPS_LIMIT} | ${nic_name}
+| | ${bps_limit} = | Get From Dictionary
+| | ... | ${NIC_NAME_TO_BPS_LIMIT} | ${nic_name}
 | | # swo := size_with_overhead
-| | ${avg_swo} = | Evaluate | ${avg_size} + ${overhead}
-| | ${max_swo} = | Evaluate | ${max_size} + ${overhead}
-| | ${jumbo} = | Set Variable If | ${max_swo} < 1522
-| | ... | ${False} | ${True}
+| | ${avg_swo} = | Get Average Frame Size | ${frame_size} | ${overhead}
 | | ${rate} = | Evaluate | ${bps_limit} / ((${avg_swo} + 20.0) * 8)
 | | ${max_rate} = | Set Variable If | ${rate} > ${pps_limit}
 | | ... | ${pps_limit} | ${rate}
-| | Set Test Variable | \${jumbo}
 | | Set Test Variable | \${max_rate}
+| | Set Jumbo
 
-| Set Max Rate And Jumbo And Handle Multi Seg
+| Set Jumbo
 | | [Documentation]
-| | ... | This keyword starts with Get Max Rate And Jumbo keyword,
-| | ... | then adds correct multi seg VPP configuration.
-| | ...
-| | ... | See Documentation of Set Max Rate And Jumbo for more details.
-| | ...
+| | ... | For jumbo frames detection, the maximal packet size is relevant,
+| | ... | encapsulation overhead (if any) has effect.
+| |
+| | ... | This keyword computes jumbo boolean (some suites need that for
+| | ... | configuration decisions).
+| | ... | To streamline suite autogeneration, both input and output values
+| | ... | are communicated as test (or broader scope) variables,
+| | ... | instead of explicit arguments and return values.
+| |
 | | ... | *Test (or broader scope) variables read:*
-| | ... |   - nic_name - Name of bottleneck NIC. Type: string
-| | ... |   - overhead - Overhead in bytes. Default: 0. Type: integer
-| | ... |   - frame_size - L2 Frame Size [B] or IMIX string. Type: int or str
-| | ...
+| | ... | - overhead - Overhead in bytes; default value: 0. Type: integer
+| | ... | - frame_size - L2 Frame Size [B] or IMIX string. Type: integer or
+| | ... | string
+| |
 | | ... | *Test variables set:*
-| | ... |   - max_rate - Calculated unidirectional maximal transmit rate [pps].
-| | ... |     Type: float
-| | ... |   - jumbo - Jumbo boolean, true if jumbo packet support
-| | ... |     has to be enabled. Type: boolean
-| | ...
+| | ... | - jumbo - Jumbo boolean, true if jumbo packet support has to be
+| | ... | enabled. Type: boolean
+| |
 | | ... | *Example:*
-| | ...
-| | ... | \| Set Max Rate And Jumbo And Handle Multi Seg \|
-| | ...
-| | Set Max Rate And Jumbo
-| | Run Keyword If | not ${jumbo} | Add no multi seg to all DUTs
+| |
+| | ... | \| Set Jumnbo \|
+| |
+| | ${overhead} = | Set Variable If | ${overhead} >= 0 | ${overhead} | ${0}
+| | ${max_swo} = | Get Maximum Frame Size | ${frame_size} | ${overhead}
+| | ${jumbo} = | Set Variable If | ${max_swo} < 1522
+| | ... | ${False} | ${True}
+| | Set Test Variable | \${jumbo}