PapiExecutor always verifies

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

diff --git a/resources/libraries/python/TestConfig.py b/resources/libraries/python/TestConfig.py
index 1f8af5d..284b2e8 100644 (file)
--- a/resources/libraries/python/TestConfig.py
+++ b/resources/libraries/python/TestConfig.py
@@ -132,11 +132,11 @@ class TestConfig(object):
                         ip=src_ip,
                         ip_len=128 if src_ip.version == 6 else 32))
                 commands.append(
-                    'vxlan_add_del_tunnel src {src_ip} dst {dst_ip} vni {vni}\n'
-                        .format(src_ip=src_ip, dst_ip=dst_ip,
+                    'vxlan_add_del_tunnel src {srcip} dst {dstip} vni {vni}\n'\
+                        .format(srcip=src_ip, dstip=dst_ip,
                                 vni=vni_start + i))
                 commands.append(
-                    'create_vlan_subif sw_if_index {sw_idx} vlan {vlan}\n'
+                    'create_vlan_subif sw_if_index {sw_idx} vlan {vlan}\n'\
                         .format(sw_idx=Topology.get_interface_sw_index(
                             node, node_vlan_if), vlan=i + 1))
             VatExecutor().write_and_execute_script(node, tmp_fn, commands)
@@ -189,9 +189,8 @@ class TestConfig(object):
                     add(cmd2, history=history, **args2).\
                     add(cmd3, history=history, **args3)
                 if i > 0 and i % (Constants.PAPI_MAX_API_BULK / 3) == 0:
-                    papi_exec.get_replies(err_msg).verify_replies(
-                        err_msg=err_msg)
-            papi_exec.get_replies().verify_replies()
+                    papi_exec.get_replies(err_msg)
+            papi_exec.get_replies()
 
         return vxlan_count
 
@@ -298,10 +297,9 @@ class TestConfig(object):
                 papi_exec.add(cmd, history=history, **args1). \
                     add(cmd, history=history, **args2)
                 if i > 0 and i % (Constants.PAPI_MAX_API_BULK / 2) == 0:
-                    papi_exec.get_replies(err_msg).verify_replies(
-                        err_msg=err_msg)
+                    papi_exec.get_replies(err_msg)
                 papi_exec.add(cmd, **args1).add(cmd, **args2)
-            papi_exec.get_replies().verify_replies()
+            papi_exec.get_replies()
 
     @staticmethod
     def vpp_put_vxlan_and_vlan_interfaces_to_bridge_domain(
@@ -423,6 +421,5 @@ class TestConfig(object):
                     add(cmd3, history=history, **args3). \
                     add(cmd3, history=history, **args4)
                 if i > 0 and i % (Constants.PAPI_MAX_API_BULK / 4) == 0:
-                    papi_exec.get_replies(err_msg).verify_replies(
-                        err_msg=err_msg)
-            papi_exec.get_replies().verify_replies()
+                    papi_exec.get_replies(err_msg)
+            papi_exec.get_replies()