ip: use IPv6 flowlabel in flow hash computation

[vpp.git] / test / vpp_papi_provider.py

diff --git a/test/vpp_papi_provider.py b/test/vpp_papi_provider.py
index c4328a0..81e25ec 100644 (file)
--- a/test/vpp_papi_provider.py
+++ b/test/vpp_papi_provider.py
@@ -49,8 +49,6 @@ defaultmapping = {
                          'classify_table_index': 4294967295, 'is_add': 1, },
     'ip_mroute_add_del': {'is_add': 1, },
     'ip_neighbor_add_del': {'is_add': 1, },
-    'ip_punt_police': {'is_add': 1, },
-    'ip_punt_redirect': {'is_add': 1, },
     'ip_route_add_del': {'is_add': 1, },
     'ipsec_interface_add_del_spd': {'is_add': 1, },
     'ipsec_spd_add_del': {'is_add': 1, },
@@ -84,8 +82,6 @@ defaultmapping = {
                                  'l2_table_index': 4294967295, },
     'pppoe_add_del_session': {'is_add': 1, },
     'policer_add_del': {'is_add': 1, 'conform_action': {'type': 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, },
     'sw_interface_add_del_address': {'is_add': 1, },
@@ -106,6 +102,7 @@ defaultmapping = {
     'want_igmp_events': {'enable': 1, },
     'want_interface_events': {'enable_disable': 1, },
     'want_l2_macs_events': {'enable_disable': 1, 'pid': os.getpid(), },
+    'want_l2_macs_events2': {'enable_disable': 1, 'pid': os.getpid(), },
 }
 
 
@@ -724,31 +721,6 @@ class VppPapiProvider(object):
         return self.api(self.papi.sr_mpls_policy_del,
                         {'bsid': bsid})
 
-    def ip_punt_police(self,
-                       policer_index,
-                       is_ip6=0,
-                       is_add=1):
-        return self.api(self.papi.ip_punt_police,
-                        {'policer_index': policer_index,
-                         'is_add': is_add,
-                         'is_ip6': is_ip6})
-
-    def ip_punt_redirect(self,
-                         rx_sw_if_index,
-                         tx_sw_if_index,
-                         address,
-                         is_add=1):
-        return self.api(self.papi.ip_punt_redirect,
-                        {'punt': {'rx_sw_if_index': rx_sw_if_index,
-                                  'tx_sw_if_index': tx_sw_if_index,
-                                  'nh': address},
-                         'is_add': is_add})
-
-    def ip_punt_redirect_dump(self, sw_if_index, is_ipv6=0):
-        return self.api(self.papi.ip_punt_redirect_dump,
-                        {'sw_if_index': sw_if_index,
-                         'is_ipv6': is_ipv6})
-
     def bier_table_add_del(self,
                            bti,
                            mpls_label,
@@ -861,11 +833,6 @@ class VppPapiProvider(object):
             self.papi.bier_disp_entry_dump,
             {'bde_tbl_id': bdti})
 
-    def session_enable_disable(self, is_enabled):
-        return self.api(
-            self.papi.session_enable_disable,
-            {'is_enable': is_enabled})
-
     def ipsec_spd_add_del(self, spd_id, is_add=1):
         """ SPD add/del - Wrapper to add or del ipsec SPD
         Sample CLI : 'ipsec spd add 1'
@@ -1008,20 +975,6 @@ class VppPapiProvider(object):
     def ipsec_backend_dump(self):
         return self.api(self.papi.ipsec_backend_dump, {})
 
-    def app_namespace_add_del(self,
-                              namespace_id,
-                              ip4_fib_id=0,
-                              ip6_fib_id=0,
-                              sw_if_index=0xFFFFFFFF,
-                              secret=0):
-        return self.api(
-            self.papi.app_namespace_add_del,
-            {'secret': secret,
-             'sw_if_index': sw_if_index,
-             'ip4_fib_id': ip4_fib_id,
-             'ip6_fib_id': ip6_fib_id,
-             'namespace_id': namespace_id})
-
     def punt_socket_register(self, reg, pathname,
                              header_version=1):
         """ Register punt socket """
@@ -1246,33 +1199,3 @@ class VppPapiProvider(object):
     def want_igmp_events(self, enable=1):
         return self.api(self.papi.want_igmp_events, {'enable': enable,
                                                      'pid': os.getpid()})
-
-    def bond_create(
-            self,
-            mode,
-            lb,
-            numa_only,
-            use_custom_mac,
-            mac_address='',
-            interface_id=0xFFFFFFFF):
-        """
-        :param mode: mode
-        :param lb: load balance
-        :param numa_only: tx on local numa node for lacp mode
-        :param use_custom_mac: use custom mac
-        :param mac_address: mac address
-        :param interface_id: custom interface ID
-        """
-        return self.api(
-            self.papi.bond_create,
-            {'mode': mode,
-             'lb': lb,
-             'numa_only': numa_only,
-             'use_custom_mac': use_custom_mac,
-             'mac_address': mac_address,
-             'id': interface_id
-             })
-
-    def pipe_delete(self, parent_sw_if_index):
-        return self.api(self.papi.pipe_delete,
-                        {'parent_sw_if_index': parent_sw_if_index})