API: Remove old_cmd support

[csit.git] / resources / libraries / python / NATUtil.py

diff --git a/resources/libraries/python/NATUtil.py b/resources/libraries/python/NATUtil.py
index 0f8e746..e771637 100644 (file)
--- a/resources/libraries/python/NATUtil.py
+++ b/resources/libraries/python/NATUtil.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -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)}")
 
@@ -288,7 +282,7 @@ class NATUtil:
         :rtype: int
         """
         # vpp-device tests have not dedicated physical core so
-        # ${thr_count_int} == 0 but we need to use one thread
+        # ${dp_count_int} == 0 but we need to use one thread
         threads = 1 if not int(threads) else int(threads)
         rest, mult = modf(log2(sessions/(10*threads)))
         return 2 ** (int(mult) + (1 if rest else 0)) * 10