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 <vrpolak@cisco.com>

diff --git a/resources/libraries/python/NATUtil.py b/resources/libraries/python/NATUtil.py
index 8a5d8c1..e771637 100644 (file)
--- 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 bc599c0..757da06 100644 (file)
--- 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"