VAT-to-PAPI: LISPSetup

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

diff --git a/resources/libraries/python/Classify.py b/resources/libraries/python/Classify.py
index 2b9ab3d..62508e1 100644 (file)
--- a/resources/libraries/python/Classify.py
+++ b/resources/libraries/python/Classify.py
@@ -21,7 +21,7 @@ from ipaddress import ip_address
 from robot.api import logger
 
 from resources.libraries.python.topology import Topology
-from resources.libraries.python.PapiExecutor import PapiExecutor
+from resources.libraries.python.PapiExecutor import PapiSocketExecutor
 
 
 class Classify(object):
@@ -289,12 +289,11 @@ class Classify(object):
         err_msg = "Failed to create a classify table on host {host}".format(
             host=node['host'])
 
-        with PapiExecutor(node) as papi_exec:
-            data = papi_exec.add(cmd, **args).get_replies(err_msg).\
-                verify_reply(err_msg=err_msg)
+        with PapiSocketExecutor(node) as papi_exec:
+            reply = papi_exec.add(cmd, **args).get_reply(err_msg)
 
-        return int(data["new_table_index"]), int(data["skip_n_vectors"]),\
-            int(data["match_n_vectors"])
+        return int(reply["new_table_index"]), int(reply["skip_n_vectors"]),\
+            int(reply["match_n_vectors"])
 
     @staticmethod
     def _classify_add_del_session(node, is_add, table_index, match,
@@ -356,9 +355,8 @@ class Classify(object):
         err_msg = "Failed to create a classify session on host {host}".format(
             host=node['host'])
 
-        with PapiExecutor(node) as papi_exec:
-            papi_exec.add(cmd, **args).get_replies(err_msg). \
-                verify_reply(err_msg=err_msg)
+        with PapiSocketExecutor(node) as papi_exec:
+            papi_exec.add(cmd, **args).get_reply(err_msg)
 
     @staticmethod
     def _macip_acl_add(node, rules, tag=""):
@@ -381,9 +379,8 @@ class Classify(object):
         err_msg = "Failed to create a classify session on host {host}".format(
             host=node['host'])
 
-        with PapiExecutor(node) as papi_exec:
-            papi_exec.add(cmd, **args).get_replies(err_msg). \
-                verify_reply(err_msg=err_msg)
+        with PapiSocketExecutor(node) as papi_exec:
+            papi_exec.add(cmd, **args).get_reply(err_msg)
 
     @staticmethod
     def _acl_interface_set_acl_list(node, sw_if_index, acl_type, acls):
@@ -410,9 +407,8 @@ class Classify(object):
         err_msg = "Failed to set acl list for interface {idx} on host {host}".\
             format(idx=sw_if_index, host=node['host'])
 
-        with PapiExecutor(node) as papi_exec:
-            papi_exec.add(cmd, **args).get_replies(err_msg). \
-                verify_reply(err_msg=err_msg)
+        with PapiSocketExecutor(node) as papi_exec:
+            papi_exec.add(cmd, **args).get_reply(err_msg)
 
     @staticmethod
     def _acl_add_replace(node, acl_idx, rules, tag=""):
@@ -438,9 +434,8 @@ class Classify(object):
         err_msg = "Failed to add/replace acls on host {host}".format(
             host=node['host'])
 
-        with PapiExecutor(node) as papi_exec:
-            papi_exec.add(cmd, **args).get_replies(err_msg). \
-                verify_reply(err_msg=err_msg)
+        with PapiSocketExecutor(node) as papi_exec:
+            papi_exec.add(cmd, **args).get_reply(err_msg)
 
     @staticmethod
     def vpp_creates_classify_table_l3(node, ip_version, direction, ip_addr):
@@ -737,11 +732,9 @@ class Classify(object):
         args = dict(
             table_id=int(table_index)
         )
-        with PapiExecutor(node) as papi_exec:
-            data = papi_exec.add(cmd, **args).get_replies(err_msg).\
-                verify_reply(err_msg=err_msg)
-
-        return data
+        with PapiSocketExecutor(node) as papi_exec:
+            reply = papi_exec.add(cmd, **args).get_reply(err_msg)
+        return reply
 
     @staticmethod
     def get_classify_session_data(node, table_index):
@@ -754,14 +747,14 @@ class Classify(object):
         :returns: List of classify session settings.
         :rtype: list or dict
         """
+        cmd = "classify_session_dump"
         args = dict(
             table_id=int(table_index)
         )
-        with PapiExecutor(node) as papi_exec:
-            dump = papi_exec.add("classify_session_dump", **args).\
-                get_dump().reply[0]["api_reply"]["classify_session_details"]
+        with PapiSocketExecutor(node) as papi_exec:
+            details = papi_exec.add(cmd, **args).get_details()
 
-        return dump
+        return details
 
     @staticmethod
     def vpp_log_plugin_acl_settings(node):
@@ -771,7 +764,7 @@ class Classify(object):
         :param node: VPP node.
         :type node: dict
         """
-        PapiExecutor.dump_and_log(node, ["acl_dump", ])
+        PapiSocketExecutor.dump_and_log(node, ["acl_dump", ])
 
     @staticmethod
     def vpp_log_plugin_acl_interface_assignment(node):
@@ -781,7 +774,7 @@ class Classify(object):
         :param node: VPP node.
         :type node: dict
         """
-        PapiExecutor.dump_and_log(node, ["acl_interface_list_dump", ])
+        PapiSocketExecutor.dump_and_log(node, ["acl_interface_list_dump", ])
 
     @staticmethod
     def set_acl_list_for_interface(node, interface, acl_type, acl_idx=None):
@@ -909,7 +902,7 @@ class Classify(object):
         :param node: VPP node.
         :type node: dict
         """
-        PapiExecutor.dump_and_log(node, ["macip_acl_dump", ])
+        PapiSocketExecutor.dump_and_log(node, ["macip_acl_dump", ])
 
     @staticmethod
     def add_del_macip_acl_interface(node, interface, action, acl_idx):
@@ -940,9 +933,8 @@ class Classify(object):
             sw_if_index=int(sw_if_index),
             acl_index=int(acl_idx)
         )
-        with PapiExecutor(node) as papi_exec:
-            papi_exec.add(cmd, **args).get_replies(err_msg).\
-                verify_reply(err_msg=err_msg)
+        with PapiSocketExecutor(node) as papi_exec:
+            papi_exec.add(cmd, **args).get_reply(err_msg)
 
     @staticmethod
     def vpp_log_macip_acl_interface_assignment(node):
@@ -954,6 +946,6 @@ class Classify(object):
         cmd = 'macip_acl_interface_get'
         err_msg = "Failed to get 'macip_acl_interface' on host {host}".format(
             host=node['host'])
-        with PapiExecutor(node) as papi_exec:
-            rpl = papi_exec.add(cmd).get_replies(err_msg).reply[0]["api_reply"]
-        logger.info(rpl["macip_acl_interface_get_reply"])
+        with PapiSocketExecutor(node) as papi_exec:
+            reply = papi_exec.add(cmd).get_reply(err_msg)
+        logger.info(reply)