acl: API cleanup

Use consistent API types.

Type: fix

Signed-off-by: Jakub Grajciar <jgrajcia@cisco.com>
Change-Id: If90d753f129312400c4c3669bb86289d0c3e0d99
Signed-off-by: Jakub Grajciar <jgrajcia@cisco.com>

1 files changed, 0 insertions, 120 deletions

diff --git a/test/vpp_papi_provider.py b/test/vpp_papi_provider.py
index 651e07a98b1..1e0226c878e 100644
--- a/test/vpp_papi_provider.py
+++ b/test/vpp_papi_provider.py
@@ -925,126 +925,6 @@ class VppPapiProvider(object):
         return self.api(self.papi.sr_mpls_policy_del,
                         {'bsid': bsid})
 
-    def acl_add_replace(self, acl_index, r, tag='',
-                        expected_retval=0):
-        """Add/replace an ACL
-        :param int acl_index: ACL index to replace, 2^32-1 to create new ACL.
-        :param acl_rule r: ACL rules array.
-        :param str tag: symbolic tag (description) for this ACL.
-        :param int count: number of rules.
-        """
-        return self.api(self.papi.acl_add_replace,
-                        {'acl_index': acl_index,
-                         'r': r,
-                         'count': len(r),
-                         'tag': tag},
-                        expected_retval=expected_retval)
-
-    def acl_del(self, acl_index, expected_retval=0):
-        """
-
-        :param acl_index:
-        :return:
-        """
-        return self.api(self.papi.acl_del,
-                        {'acl_index': acl_index},
-                        expected_retval=expected_retval)
-
-    def acl_interface_set_acl_list(self, sw_if_index, n_input, acls,
-                                   expected_retval=0):
-        return self.api(self.papi.acl_interface_set_acl_list,
-                        {'sw_if_index': sw_if_index,
-                         'count': len(acls),
-                         'n_input': n_input,
-                         'acls': acls},
-                        expected_retval=expected_retval)
-
-    def acl_interface_set_etype_whitelist(self, sw_if_index,
-                                          n_input, whitelist,
-                                          expected_retval=0):
-        return self.api(self.papi.acl_interface_set_etype_whitelist,
-                        {'sw_if_index': sw_if_index,
-                         'count': len(whitelist),
-                         'n_input': n_input,
-                         'whitelist': whitelist},
-                        expected_retval=expected_retval)
-
-    def acl_interface_add_del(self,
-                              sw_if_index,
-                              acl_index,
-                              is_add=1):
-        """ Add/Delete ACL to/from interface
-
-        :param sw_if_index:
-        :param acl_index:
-        :param is_add:  (Default value = 1)
-        """
-
-        return self.api(self.papi.acl_interface_add_del,
-                        {'is_add': is_add,
-                         'is_input': 1,
-                         'sw_if_index': sw_if_index,
-                         'acl_index': acl_index})
-
-    def acl_dump(self, acl_index, expected_retval=0):
-        return self.api(self.papi.acl_dump,
-                        {'acl_index': acl_index},
-                        expected_retval=expected_retval)
-
-    def acl_interface_list_dump(self, sw_if_index=0xFFFFFFFF,
-                                expected_retval=0):
-        return self.api(self.papi.acl_interface_list_dump,
-                        {'sw_if_index': sw_if_index},
-                        expected_retval=expected_retval)
-
-    def macip_acl_add(self, rules, tag=""):
-        """ Add MACIP acl
-
-        :param rules: list of rules for given acl
-        :param tag: acl tag
-        """
-
-        return self.api(self.papi.macip_acl_add,
-                        {'r': rules,
-                         'count': len(rules),
-                         'tag': tag})
-
-    def macip_acl_add_replace(self, rules, acl_index=0xFFFFFFFF, tag=""):
-        """ Add MACIP acl
-
-        :param rules: list of rules for given acl
-        :param tag: acl tag
-        """
-
-        return self.api(self.papi.macip_acl_add_replace,
-                        {'acl_index': acl_index,
-                         'r': rules,
-                         'count': len(rules),
-                         'tag': tag})
-
-    def macip_acl_interface_add_del(self,
-                                    sw_if_index,
-                                    acl_index,
-                                    is_add=1):
-        """ Add MACIP acl to interface
-
-        :param sw_if_index:
-        :param acl_index:
-        :param is_add:  (Default value = 1)
-        """
-
-        return self.api(self.papi.macip_acl_interface_add_del,
-                        {'is_add': is_add,
-                         'sw_if_index': sw_if_index,
-                         'acl_index': acl_index})
-
-    def macip_acl_dump(self, acl_index=4294967295):
-        """ Return MACIP acl dump
-        """
-
-        return self.api(
-            self.papi.macip_acl_dump, {'acl_index': acl_index})
-
     def ip_punt_police(self,
                        policer_index,
                        is_ip6=0,