diff options
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/libraries/python/NATUtil.py | 34 | ||||
| -rw-r--r-- | resources/libraries/robot/ip/nat.robot | 17 | ||||
| -rw-r--r-- | resources/libraries/robot/performance/performance_utils.robot | 22 | ||||
| -rw-r--r-- | resources/libraries/robot/shared/default.robot | 2 |
4 files changed, 70 insertions, 5 deletions
diff --git a/resources/libraries/python/NATUtil.py b/resources/libraries/python/NATUtil.py index 4ce72d84b4..857870393e 100644 --- a/resources/libraries/python/NATUtil.py +++ b/resources/libraries/python/NATUtil.py @@ -186,7 +186,7 @@ class NATUtil: PapiSocketExecutor.dump_and_log(node, cmds) # DET44 PAPI calls - # DET44 means deterministic mode of NAT + # DET44 means deterministic mode of NAT44 @staticmethod def enable_det44_plugin(node, inside_vrf=0, outside_vrf=0): """Enable DET44 plugin. @@ -262,6 +262,38 @@ class NATUtil: papi_exec.add(cmd, **args_in).get_reply(err_msg) @staticmethod + def get_det44_mapping(node): + """Get DET44 mapping data. + + :param node: DUT node. + :type node: dict + :returns: Dictionary of DET44 mapping data. + :rtype: dict + """ + cmd = u"det44_map_dump" + err_msg = f"Failed to get DET44 mapping data on the host " \ + f"{node[u'host']}!" + args_in = dict() + with PapiSocketExecutor(node) as papi_exec: + details = papi_exec.add(cmd, **args_in).get_reply(err_msg) + + return details + + @staticmethod + def get_det44_sessions_number(node): + """Get number of established DET44 sessions from actual DET44 mapping + data. + + :param node: DUT node. + :type node: dict + :returns: Number of established DET44 sessions. + :rtype: int + """ + det44_data = NATUtil.get_det44_mapping(node) + + return det44_data.get(u"ses_num", 0) + + @staticmethod def show_det44(node): """Show DET44 data. diff --git a/resources/libraries/robot/ip/nat.robot b/resources/libraries/robot/ip/nat.robot index 25218af456..2c88cbb294 100644 --- a/resources/libraries/robot/ip/nat.robot +++ b/resources/libraries/robot/ip/nat.robot @@ -190,3 +190,20 @@ | | [Arguments] | ${node} | | | | Show DET44 | ${node} + +| Verify DET44 sessions number +| | [Documentation] | Verify that all required DET44 sessions are established. +| | +| | ... | *Arguments:* +| | ... | - node - DUT node. Type: dictionary +| | ... | - exp_n_sessions - Expected number of DET44 sessions. Type: integer +| | +| | ... | *Example:* +| | +| | ... | \| Verify DET44 sessions number \| ${nodes['DUT1']} \| ${64512} \| +| | +| | [Arguments] | ${node} | ${exp_n_sessions} +| | +| | ${det44_sessions}= | Get DET44 Sessions Number | ${node} +| | Should Be Equal As Integers | ${det44_sessions} | ${exp_n_sessions} +| | ... | Not all DET44 sessions have been established diff --git a/resources/libraries/robot/performance/performance_utils.robot b/resources/libraries/robot/performance/performance_utils.robot index af58da07e0..d820d5c187 100644 --- a/resources/libraries/robot/performance/performance_utils.robot +++ b/resources/libraries/robot/performance/performance_utils.robot @@ -30,6 +30,11 @@ | ${trial_duration}= | ${PERF_TRIAL_DURATION} | ${trial_multiplicity}= | ${PERF_TRIAL_MULTIPLICITY} | ${extended_debug}= | ${EXTENDED_DEBUG} +| # Variable holding trial duration extension [s] used in pre_stats action +| # clear-show-runtime-with-traffic. By default it is set to 0 but some +| # tests (e.g. NAT) needs this duration extension in ramp up phase (e.g. to +| # create all required nat sessions). +| ${pre_stats_duration_ext}= | ${0} *** Keywords *** | Find NDR and PDR intervals using optimized search @@ -681,12 +686,23 @@ | | ... | Additional Statistics Action for clear and show runtime counters with | | ... | running traffic. | | +| | ${trial_duration}= | Evaluate +| | ... | ${trial_duration} + ${pre_stats_duration_ext} +| | ${rate}= | Get Variable Value | ${pre_stats_rate} | ${rate} | | Clear and show runtime counters with running traffic -| | ... | ${trial_duration} | ${rate} | ${frame_size} | ${traffic_profile} -| | ... | ${traffic_directions} | ${tx_port} | ${rx_port} +| | ... | ${trial_duration} | ${rate} +| | ... | ${frame_size} | ${traffic_profile} | ${traffic_directions} +| | ... | ${tx_port} | ${rx_port} + +| Additional Statistics Action For vpp-det44-verify-sessions +| | [Documentation] +| | ... | Additional Statistics Action to verify that all required DET44 +| | ... | sessions are established. +| | +| | Verify DET44 sessions number | ${nodes['DUT1']} | ${n_sessions} | Additional Statistics Action For noop | | [Documentation] | | ... | Additional Statistics Action for no operation. | | -| | No operation
\ No newline at end of file +| | No operation diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot index c9d924edc1..f3d7ed47dd 100644 --- a/resources/libraries/robot/shared/default.robot +++ b/resources/libraries/robot/shared/default.robot @@ -151,7 +151,7 @@ | | | Run Keyword | ${dut}.Add Unix Nodaemon | | | Run Keyword | ${dut}.Add Unix Coredump | | | Run Keyword | ${dut}.Add Socksvr | ${SOCKSVR_PATH} -| | | Run Keyword | ${dut}.Add Main Heap Size | 2G +| | | Run Keyword | ${dut}.Add Main Heap Size | 6G | | | Run Keyword | ${dut}.Add Main Heap Page Size | 2M | | | Run Keyword | ${dut}.Add Statseg Size | 2G | | | Run Keyword | ${dut}.Add Statseg Page Size | 2M |