tests: remove svs, proxy_arp and gso from vpp_papi_provider

Type: refactor
Signed-off-by: Ole Troan <ot@cisco.com>
Change-Id: I916a386af48fd558b4749e206b2bc4b82a888512
Signed-off-by: Ole Troan <ot@cisco.com>

3 files changed, 13 insertions, 85 deletions

diff --git a/test/test_neighbor.py b/test/test_neighbor.py
index 9f0f97c8cbb..d81fe1b3f80 100644
--- a/test/test_neighbor.py
+++ b/test/test_neighbor.py
@@ -763,8 +763,10 @@ class ARPTestCase(VppTestCase):
         #
         # Configure Proxy ARP for the subnet on PG0addresses on pg0
         #
-        self.vapi.proxy_arp_add_del(self.pg0._local_ip4_subnet,
-                                    self.pg0._local_ip4_bcast)
+        self.vapi.proxy_arp_add_del(proxy={'table_id': 0,
+                                           'low': self.pg0._local_ip4_subnet,
+                                           'hi': self.pg0._local_ip4_bcast},
+                                    is_add=1)
 
         # Make pg2 un-numbered to pg0
         #
@@ -838,9 +840,9 @@ class ARPTestCase(VppTestCase):
         #
         # cleanup
         #
-        self.pg2.set_proxy_arp(0)
-        self.vapi.proxy_arp_add_del(self.pg0._local_ip4_subnet,
-                                    self.pg0._local_ip4_bcast,
+        self.vapi.proxy_arp_add_del(proxy={'table_id': 0,
+                                           'low': self.pg0._local_ip4_subnet,
+                                           'hi': self.pg0._local_ip4_bcast},
                                     is_add=0)
 
     def test_proxy_arp(self):
@@ -886,8 +888,10 @@ class ARPTestCase(VppTestCase):
         #
         # Configure Proxy ARP for 10.10.10.0 -> 10.10.10.124
         #
-        self.vapi.proxy_arp_add_del(inet_pton(AF_INET, "10.10.10.2"),
-                                    inet_pton(AF_INET, "10.10.10.124"))
+        self.vapi.proxy_arp_add_del(proxy={'table_id': 0,
+                                           'low': "10.10.10.2",
+                                           'hi': "10.10.10.124"},
+                                    is_add=1)
 
         #
         # No responses are sent when the interfaces are not enabled for proxy
diff --git a/test/vpp_interface.py b/test/vpp_interface.py
index 2d991ede06c..cb1fbafce48 100644
--- a/test/vpp_interface.py
+++ b/test/vpp_interface.py
@@ -438,8 +438,8 @@ class VppInterface(object):
     def set_proxy_arp(self, enable=1):
         """ Set the interface to enable/disable Proxy ARP """
         self.test.vapi.proxy_arp_intfc_enable_disable(
-            self.sw_if_index,
-            enable)
+            sw_if_index=self.sw_if_index,
+            enable=enable)
         return self
 
     def query_vpp_config(self):
diff --git a/test/vpp_papi_provider.py b/test/vpp_papi_provider.py
index 6e5ebc25fb4..c4328a0e833 100644
--- a/test/vpp_papi_provider.py
+++ b/test/vpp_papi_provider.py
@@ -84,15 +84,10 @@ defaultmapping = {
                                  'l2_table_index': 4294967295, },
     'pppoe_add_del_session': {'is_add': 1, },
     'policer_add_del': {'is_add': 1, 'conform_action': {'type': 1}, },
-    'proxy_arp_add_del': {'is_add': 1, },
-    'proxy_arp_intfc_enable_disable': {'is_enable': 1, },
     'set_ip_flow_hash': {'src': 1, 'dst': 1, 'sport': 1, 'dport': 1,
                          'proto': 1, },
     'set_ipfix_exporter': {'collector_port': 4739, },
     'sr_policy_add': {'weight': 1, 'is_encap': 1, },
-    'svs_enable_disable': {'is_enable': 1, },
-    'svs_route_add_del': {'is_add': 1, },
-    'svs_table_add_del': {'is_add': 1, },
     'sw_interface_add_del_address': {'is_add': 1, },
     'sw_interface_ip6nd_ra_prefix': {'val_lifetime': 4294967295,
                                      'pref_lifetime': 4294967295, },
@@ -449,44 +444,6 @@ class VppPapiProvider(object):
             }
         )
 
-    def proxy_arp_add_del(self,
-                          low,
-                          hi,
-                          table_id=0,
-                          is_add=1):
-        """ Config Proxy Arp Range.
-
-        :param low_address: Start address in the rnage to Proxy for
-        :param hi_address: End address in the rnage to Proxy for
-        :param vrf_id: The VRF/table in which to proxy
-        """
-
-        return self.api(
-            self.papi.proxy_arp_add_del,
-            {'proxy':
-                {
-                    'table_id': table_id,
-                    'low': low,
-                    'hi': hi,
-                },
-                'is_add': is_add})
-
-    def proxy_arp_intfc_enable_disable(self,
-                                       sw_if_index,
-                                       is_enable=1):
-        """ Enable/Disable an interface for proxy ARP requests
-
-        :param sw_if_index: Interface
-        :param enable_disable: Enable/Disable
-        """
-
-        return self.api(
-            self.papi.proxy_arp_intfc_enable_disable,
-            {'sw_if_index': sw_if_index,
-             'enable': is_enable
-             }
-        )
-
     def udp_encap_add(self,
                       src_ip,
                       dst_ip,
@@ -1319,36 +1276,3 @@ class VppPapiProvider(object):
     def pipe_delete(self, parent_sw_if_index):
         return self.api(self.papi.pipe_delete,
                         {'parent_sw_if_index': parent_sw_if_index})
-
-    def svs_table_add_del(self, af, table_id, is_add=1):
-        return self.api(self.papi.svs_table_add_del,
-                        {
-                            'table_id': table_id,
-                            'is_add': is_add,
-                            'af': af,
-                        })
-
-    def svs_route_add_del(self, table_id, prefix, src_table_id, is_add=1):
-        return self.api(self.papi.svs_route_add_del,
-                        {
-                            'table_id': table_id,
-                            'source_table_id': src_table_id,
-                            'prefix': prefix,
-                            'is_add': is_add,
-                        })
-
-    def svs_enable_disable(self, af, table_id, sw_if_index, is_enable=1):
-        return self.api(self.papi.svs_enable_disable,
-                        {
-                            'af': af,
-                            'table_id': table_id,
-                            'sw_if_index': sw_if_index,
-                            'is_enable': is_enable,
-                        })
-
-    def feature_gso_enable_disable(self, sw_if_index, enable_disable=1):
-        return self.api(self.papi.feature_gso_enable_disable,
-                        {
-                            'sw_if_index': sw_if_index,
-                            'enable_disable': enable_disable,
-                        })