X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FVPPUtil.py;h=432a589cd35c5fa932cdbf585ea7285953a1cc19;hp=4e2b2373c45fa4fc1432d2fa2147c4cff80dd149;hb=b38e5bc9f01528a7633a3132d7d5c8e12d4cbf88;hpb=9efba1d574916eded1a6d4d8580e092a8831033b diff --git a/resources/libraries/python/VPPUtil.py b/resources/libraries/python/VPPUtil.py index 4e2b2373c4..432a589cd3 100644 --- a/resources/libraries/python/VPPUtil.py +++ b/resources/libraries/python/VPPUtil.py @@ -112,6 +112,10 @@ class VPPUtil(object): :param node: Topology node. :type node: dict """ + cmd = 'echo "show pci" | sudo socat - UNIX-CONNECT:/run/vpp/cli.sock' + exec_cmd_no_error( + node, cmd, sudo=False, message='VPP failed to start!', retries=120) + cmd = ('vppctl show pci 2>&1 | ' 'fgrep -v "Connection refused" | ' 'fgrep -v "No such file or directory"') @@ -160,8 +164,9 @@ class VPPUtil(object): :returns: VPP version. :rtype: str """ + cmd = 'show_version' with PapiSocketExecutor(node) as papi_exec: - reply = papi_exec.add('show_version').get_reply() + reply = papi_exec.add(cmd).get_reply() return_version = reply['version'].rstrip('\0x00') version = 'VPP version: {ver}\n'.format(ver=return_version) if verbose: @@ -313,8 +318,9 @@ class VPPUtil(object): :returns: VPP thread data. :rtype: list """ + cmd = 'show_threads' with PapiSocketExecutor(node) as papi_exec: - reply = papi_exec.add('show_threads').get_reply() + reply = papi_exec.add(cmd).get_reply() threads_data = list() for thread in reply["thread_data"]: