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/Memif.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'resources/libraries/python/Memif.py') diff --git a/resources/libraries/python/Memif.py b/resources/libraries/python/Memif.py index 5c38ec46f5..34cf6ce9c3 100644 --- a/resources/libraries/python/Memif.py +++ b/resources/libraries/python/Memif.py @@ -18,7 +18,7 @@ from enum import IntEnum from robot.api import logger from resources.libraries.python.topology import NodeType, Topology -from resources.libraries.python.PapiExecutor import PapiExecutor +from resources.libraries.python.PapiExecutor import PapiSocketExecutor from resources.libraries.python.L2Util import L2Util @@ -43,7 +43,7 @@ class Memif(object): :returns: List of memif interfaces extracted from Papi response. :rtype: list """ - with PapiExecutor(node) as papi_exec: + with PapiSocketExecutor(node) as papi_exec: details = papi_exec.add("memif_dump").get_details() for memif in details: @@ -78,7 +78,7 @@ class Memif(object): socket_id=int(sid), socket_filename=str('/tmp/' + filename) ) - with PapiExecutor(node) as papi_exec: + with PapiSocketExecutor(node) as papi_exec: return papi_exec.add(cmd, **args).get_reply(err_msg) @staticmethod @@ -110,7 +110,7 @@ class Memif(object): socket_id=int(sid), id=int(mid) ) - with PapiExecutor(node) as papi_exec: + with PapiSocketExecutor(node) as papi_exec: return papi_exec.add(cmd, **args).get_sw_if_index(err_msg) @staticmethod -- cgit 1.2.3-korg