aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries/python/NATUtil.py
diff options
context:
space:
mode:
authorJan Gelety <jgelety@cisco.com>2020-11-25 21:49:11 +0100
committerVratko Polak <vrpolak@cisco.com>2020-12-02 13:39:48 +0000
commitd6af9d72acaca4dff70dce1b55dcc03f73061c7b (patch)
treec01328679bc1b051093d3af4e13cb9d3c240f821 /resources/libraries/python/NATUtil.py
parentb2ff2bb435a765c588b5ae9f8461bbf9b5064651 (diff)
API: deprecated NAT APIs
Jira: CSIT-1597 Change-Id: Ib48d20ba087bc9828970c3acc081ac6e4447c20c Signed-off-by: Jan Gelety <jgelety@cisco.com>
Diffstat (limited to 'resources/libraries/python/NATUtil.py')
-rw-r--r--resources/libraries/python/NATUtil.py20
1 files changed, 13 insertions, 7 deletions
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):