From d6af9d72acaca4dff70dce1b55dcc03f73061c7b Mon Sep 17 00:00:00 2001 From: Jan Gelety Date: Wed, 25 Nov 2020 21:49:11 +0100 Subject: API: deprecated NAT APIs Jira: CSIT-1597 Change-Id: Ib48d20ba087bc9828970c3acc081ac6e4447c20c Signed-off-by: Jan Gelety --- resources/libraries/python/NATUtil.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'resources/libraries/python') diff --git a/resources/libraries/python/NATUtil.py b/resources/libraries/python/NATUtil.py index 422feaedb8..0f8e746663 100644 --- a/resources/libraries/python/NATUtil.py +++ b/resources/libraries/python/NATUtil.py @@ -202,19 +202,25 @@ class NATUtil: return resetter @staticmethod - def show_nat_config(node): - """Show the NAT configuration. + def show_nat44_config(node): + """Show the NAT44 plugin running configuration. :param node: DUT node. :type node: dict """ - cmd = u"nat_show_config" - err_msg = f"Failed to get NAT configuration on host {node[u'host']}" + cmd = u"nat44_show_running_config" + err_msg = f"Failed to get NAT44 configuration on host {node[u'host']}" - with PapiSocketExecutor(node) as papi_exec: - reply = papi_exec.add(cmd).get_reply(err_msg) + 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) - logger.debug(f"NAT Configuration:\n{pformat(reply)}") + logger.debug(f"NAT44 Configuration:\n{pformat(reply)}") @staticmethod def show_nat44_summary(node): -- cgit 1.2.3-korg