From e362a2ac7763d586cebc34bd0fc121212b9b4c95 Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Fri, 17 Sep 2021 14:44:06 +0200 Subject: [PATCH] API: Remove old_cmd support Master branch is no longer expected to work with such old VPP builds, and CRC values were removed already anyway. Change-Id: I707a61bc82d7d8998100fcd9fe78b90e7b074675 Signed-off-by: Vratko Polak --- resources/libraries/python/NATUtil.py | 10 ++-------- resources/libraries/python/NsimUtil.py | 11 ++--------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/resources/libraries/python/NATUtil.py b/resources/libraries/python/NATUtil.py index 8a5d8c1404..e771637b37 100644 --- a/resources/libraries/python/NATUtil.py +++ b/resources/libraries/python/NATUtil.py @@ -211,14 +211,8 @@ class NATUtil: cmd = u"nat44_show_running_config" err_msg = f"Failed to get NAT44 configuration on host {node[u'host']}" - try: - with PapiSocketExecutor(node) as papi_exec: - reply = papi_exec.add(cmd).get_reply(err_msg) - except AssertionError: - # Perhaps VPP is an older version - old_cmd = u"nat_show_config" - with PapiSocketExecutor(node) as papi_exec: - reply = papi_exec.add(old_cmd).get_reply(err_msg) + with PapiSocketExecutor(node) as papi_exec: + reply = papi_exec.add(cmd).get_reply(err_msg) logger.debug(f"NAT44 Configuration:\n{pformat(reply)}") diff --git a/resources/libraries/python/NsimUtil.py b/resources/libraries/python/NsimUtil.py index bc599c090a..757da067cb 100644 --- a/resources/libraries/python/NsimUtil.py +++ b/resources/libraries/python/NsimUtil.py @@ -51,15 +51,8 @@ class NsimUtil(): packets_per_reorder=vpp_nsim_attr.get(u"packets_per_reorder", 0) ) err_msg = f"Failed to configure NSIM on host {host}" - try: - with PapiSocketExecutor(node) as papi_exec: - papi_exec.add(cmd, **args).get_reply(err_msg) - except AssertionError: - # Perhaps VPP is an older version - old_cmd = u"nsim_configure" - args.pop(u"packets_per_reorder") - with PapiSocketExecutor(node) as papi_exec: - papi_exec.add(old_cmd, **args).get_reply(err_msg) + with PapiSocketExecutor(node) as papi_exec: + papi_exec.add(cmd, **args).get_reply(err_msg) if vpp_nsim_attr[u"output_nsim_enable"]: cmd = u"nsim_output_feature_enable_disable" -- 2.16.6