From cb24a6c00f014baac41f3e24a9e1891d8d04d14d Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Thu, 26 Nov 2020 10:39:01 +0100 Subject: [PATCH] Support CLI command change for event logger + The old command is tried if the new one fails. Change-Id: I0afdcd7ac699595347b42f3a7d34e1281bb0dc0e Signed-off-by: Vratko Polak --- resources/libraries/python/VPPUtil.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/resources/libraries/python/VPPUtil.py b/resources/libraries/python/VPPUtil.py index 3c7894988b..c735494282 100644 --- a/resources/libraries/python/VPPUtil.py +++ b/resources/libraries/python/VPPUtil.py @@ -284,8 +284,13 @@ class VPPUtil: :param node: Topology node. :type node: dict """ - PapiSocketExecutor.run_cli_cmd_on_all_sockets( - node, u"elog trace api cli barrier") + try: + PapiSocketExecutor.run_cli_cmd_on_all_sockets( + node, u"event-logger trace api cli barrier") + except AssertionError: + # Perhaps an older VPP build is tested. + PapiSocketExecutor.run_cli_cmd_on_all_sockets( + node, u"elog trace api cli barrier") @staticmethod def vpp_enable_elog_traces_on_all_duts(nodes): -- 2.16.6