From f88a3d9178dfbd73d0479f9aa2f5224e0c89ca1f Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Wed, 17 Jul 2019 12:40:49 +0200 Subject: Use PapiSocketProvider for most PAPI calls Ticket: CSIT-1541 Ticket: VPP-1722 Ticket: CSIT-1546 + Increase timeout to hide x520 slownes of show hardware detail. - Install sshpass and update ssh client in virl bootstrap. + Added TODOs to remove when CSIT-1546 is fixed. + Enable default socksvr on any startup conf. + Improve OptionString init and repr. - The non-socket executor still kept for stats. + Remove everything unrelated to stats from non-socket executor. - Remove some debug-loooking calls to avoid failures. TODO: Introduce proper parsing to the affected keywords. + Reduce logging from PAPI code to level INFO. - Needs https://gerrit.fd.io/r/20660 to fully work. + Change default values for LocalExecution.run() + Return code check enabled by default. Code is more readable when rc!=0 is allowed explicitly, and the test code will now detect unexpected failures. + Logging disabled by default. Output XML is large already. Important logging can be enabled explicitly. + Restore alphabetical order in common.sh functions. Change-Id: I05882cb6b620ad14638f7404b5ad38c7a5de9e6c Signed-off-by: Vratko Polak --- resources/libraries/python/NATUtil.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'resources/libraries/python/NATUtil.py') diff --git a/resources/libraries/python/NATUtil.py b/resources/libraries/python/NATUtil.py index 5c0278db90..f018d38335 100644 --- a/resources/libraries/python/NATUtil.py +++ b/resources/libraries/python/NATUtil.py @@ -21,7 +21,7 @@ from enum import IntEnum from robot.api import logger from resources.libraries.python.InterfaceUtil import InterfaceUtil -from resources.libraries.python.PapiExecutor import PapiExecutor +from resources.libraries.python.PapiExecutor import PapiSocketExecutor class NATConfigFlags(IntEnum): @@ -65,7 +65,7 @@ class NATUtil(object): is_add=1, flags=getattr(NATConfigFlags, "NAT_IS_INSIDE").value ) - with PapiExecutor(node) as papi_exec: + with PapiSocketExecutor(node) as papi_exec: papi_exec.add(cmd, **args_in).get_reply(err_msg) int_out_idx = InterfaceUtil.get_sw_if_index(node, int_out) @@ -76,7 +76,7 @@ class NATUtil(object): is_add=1, flags=getattr(NATConfigFlags, "NAT_IS_OUTSIDE").value ) - with PapiExecutor(node) as papi_exec: + with PapiSocketExecutor(node) as papi_exec: papi_exec.add(cmd, **args_in).get_reply(err_msg) @staticmethod @@ -105,7 +105,7 @@ class NATUtil(object): out_addr=inet_pton(AF_INET, str(ip_out)), out_plen=int(subnet_out) ) - with PapiExecutor(node) as papi_exec: + with PapiSocketExecutor(node) as papi_exec: papi_exec.add(cmd, **args_in).get_reply(err_msg) @staticmethod @@ -131,7 +131,7 @@ class NATUtil(object): cmd = 'nat_show_config' err_msg = 'Failed to get NAT configuration on host {host}'.\ format(host=node['host']) - with PapiExecutor(node) as papi_exec: + with PapiSocketExecutor(node) as papi_exec: reply = papi_exec.add(cmd).get_reply(err_msg) logger.debug("NAT Configuration:\n{reply}".format(reply=pformat(reply))) @@ -145,4 +145,4 @@ class NATUtil(object): "nat44_user_session_dump", "nat_det_map_dump" ] - PapiExecutor.dump_and_log(node, cmds) + PapiSocketExecutor.dump_and_log(node, cmds) -- cgit 1.2.3-korg