diff options
author | Vratko Polak <vrpolak@cisco.com> | 2023-01-16 12:45:25 +0100 |
---|---|---|
committer | Vratko Polak <vrpolak@cisco.com> | 2023-01-16 12:45:25 +0100 |
commit | 5302eeabb757ccf710568a66b8f6435c1894cd4d (patch) | |
tree | 608819c1937f532d50fa02efaa1ea9a82a4cda9d /resources/libraries/python/L2Util.py | |
parent | bea132b6da5c016a18755a90151caf100c2a8568 (diff) |
feat(papi): add async mode, use it in scale calls
+ Introduce two explicit handling modes to save memory in scale test.
+ Connect in async mode for both handling modes (to avoid reconnects).
+ Support both pre- and post-37758 VPP PAPI async behavior.
+ Use control-ping in dumps to emulate sync mode.
+ Do not use it for single reply to avoid VPP-2033.
+ Fix call sites to get their replies with correct handling mode.
+ Drain enqueued replies to avoid subsequent errors.
+ Retry if read returns None too early.
+ Update docstrings.
- Complexity issues reported by pylint postponed, needs larger refactor.
- Explicit replace of VAT is done in subsequent changes.
Ticket: CSIT-1547 CSIT-1671
Change-Id: I3c63fa5c578975cc4dd7fce0babe3ab04ec15ed3
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
Diffstat (limited to 'resources/libraries/python/L2Util.py')
-rw-r--r-- | resources/libraries/python/L2Util.py | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/resources/libraries/python/L2Util.py b/resources/libraries/python/L2Util.py index 0f00787bd4..b951e6257a 100644 --- a/resources/libraries/python/L2Util.py +++ b/resources/libraries/python/L2Util.py @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Cisco and/or its affiliates. +# Copyright (c) 2023 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: @@ -254,8 +254,10 @@ class L2Util: f"on host {node[u'host']}" with PapiSocketExecutor(node) as papi_exec: - papi_exec.add(cmd1, **args1).add(cmd2, **args2).add(cmd2, **args3) - papi_exec.get_replies(err_msg) + # Cannot use get_replies due to VPP-2203. + papi_exec.add(cmd1, **args1).get_reply(err_msg) + papi_exec.add(cmd2, **args2).get_reply(err_msg) + papi_exec.add(cmd2, **args3).get_reply(err_msg) @staticmethod def vpp_setup_bidirectional_cross_connect(node, interface1, interface2): @@ -293,7 +295,9 @@ class L2Util: f"on host {node['host']}" with PapiSocketExecutor(node) as papi_exec: - papi_exec.add(cmd, **args1).add(cmd, **args2).get_replies(err_msg) + # Cannot use get_replies due to VPP-2203. + papi_exec.add(cmd, **args1).get_reply(err_msg) + papi_exec.add(cmd, **args2).get_reply(err_msg) @staticmethod def vpp_setup_bidirectional_l2_patch(node, interface1, interface2): @@ -331,7 +335,9 @@ class L2Util: f"on host {node['host']}" with PapiSocketExecutor(node) as papi_exec: - papi_exec.add(cmd, **args1).add(cmd, **args2).get_replies(err_msg) + # Cannot use get_replies due to VPP-2203. + papi_exec.add(cmd, **args1).get_reply(err_msg) + papi_exec.add(cmd, **args2).get_reply(err_msg) @staticmethod def linux_add_bridge(node, br_name, if_1, if_2, set_up=True): |