aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorJan Gelety <jgelety@cisco.com>2019-09-26 09:23:57 +0200
committerJan Gelety <jgelety@cisco.com>2019-10-04 01:41:43 +0200
commitb38e5bc9f01528a7633a3132d7d5c8e12d4cbf88 (patch)
tree9c0e8f9c39f75691cac737be85d230fac711986e /resources
parentfde4045be8beb74a6353443dd525ecfa46f05184 (diff)
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 <jgelety@cisco.com>
Diffstat (limited to 'resources')
-rw-r--r--resources/libraries/python/Constants.py3
-rw-r--r--resources/libraries/python/VPPUtil.py4
2 files changed, 6 insertions, 1 deletions
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"')