From b38e5bc9f01528a7633a3132d7d5c8e12d4cbf88 Mon Sep 17 00:00:00 2001 From: Jan Gelety Date: Thu, 26 Sep 2019 09:23:57 +0200 Subject: Update of VPP_STABLE_VER files - use new vpp ref build - ubuntu 16.04: 20.01-rc0~324-g66a332c~b8122 - use new vpp ref build - ubuntu 18.04: 20.01-rc0~324-g66a332cf1 - use new vpp ref build - centos7: 20.01-rc0~324_g66a332c~b7936 Change-Id: I82c6032742939417914f5210b1fba4464ab1e70d Signed-off-by: Jan Gelety --- resources/libraries/python/Constants.py | 3 ++- resources/libraries/python/VPPUtil.py | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'resources') diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py index 57176662eb..5b7e1cda57 100644 --- a/resources/libraries/python/Constants.py +++ b/resources/libraries/python/Constants.py @@ -229,7 +229,8 @@ class Constants(object): SOCKSTAT_PATH = "/run/vpp/stats.sock" # Global "kill switch" for CRC checking during runtime. - FAIL_ON_CRC_MISMATCH = get_pessimistic_bool_from_env("FAIL_ON_CRC_MISMATCH") + # FAIL_ON_CRC_MISMATCH = get_pessimistic_bool_from_env("FAIL_ON_CRC_MISMATCH") + FAIL_ON_CRC_MISMATCH = False # Mapping from NIC name to its bps limit. # TODO: Implement logic to lower limits to TG NIC or software. Or PCI. diff --git a/resources/libraries/python/VPPUtil.py b/resources/libraries/python/VPPUtil.py index 6e3ff707ea..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"') -- cgit 1.2.3-korg