devices: af_packet API cleanup
[vpp.git] / test / vpp_papi_provider.py
index 31db0e6..e38b262 100644 (file)
@@ -27,12 +27,17 @@ defaultmapping = {
     'acl_interface_list_dump': {'sw_if_index': 4294967295, },
     'app_namespace_add_del': {'sw_if_index': 4294967295, },
     'bd_ip_mac_add_del': {'is_add': 1, },
+    'bfd_udp_add': {'is_authenticated': False, 'bfd_key_id': None,
+                    'conf_key_id': None},
+    'bfd_udp_auth_activate': {'bfd_key_id': None, 'conf_key_id': None,
+                              'is_delayed': False},
     'bier_disp_entry_add_del': {'next_hop_rpf_id': -1, 'next_hop_is_ip4': 1,
                                 'is_add': 1, },
     'bier_disp_table_add_del': {'is_add': 1, },
     'bier_imp_add': {'is_add': 1, },
     'bier_route_add_del': {'is_add': 1, },
     'bier_table_add_del': {'is_add': 1, },
+    'bond_create': {'mac_address': '', 'id': 0xFFFFFFFF},
     'bridge_domain_add_del': {'flood': 1, 'uu_flood': 1, 'forward': 1,
                               'learn': 1, 'is_add': 1, },
     'bvi_create': {'user_instance': 4294967295, },
@@ -61,7 +66,6 @@ defaultmapping = {
     'ip6nd_send_router_solicitation': {'irt': 1, 'mrt': 120, },
     'ip_add_del_route': {'next_hop_sw_if_index': 4294967295,
                          'next_hop_weight': 1, 'next_hop_via_label': 1048576,
-                         'next_hop_id': 4294967295,
                          'classify_table_index': 4294967295, 'is_add': 1, },
     'ip_mroute_add_del': {'is_add': 1, },
     'ip_neighbor_add_del': {'is_add': 1, },
@@ -273,7 +277,7 @@ class VppPapiProvider(object):
             for i, o in enumerate(fields[3:]):
                 try:
                     d[o] = a[i]
-                except:
+                except BaseException:
                     break
 
             # Default override
@@ -763,86 +767,6 @@ class VppPapiProvider(object):
                  'mt_paths': paths,
              }})
 
-    def bfd_udp_add(self, sw_if_index, desired_min_tx, required_min_rx,
-                    detect_mult, local_addr, peer_addr, is_ipv6=0,
-                    bfd_key_id=None, conf_key_id=None):
-        if bfd_key_id is None:
-            return self.api(self.papi.bfd_udp_add,
-                            {
-                                'sw_if_index': sw_if_index,
-                                'desired_min_tx': desired_min_tx,
-                                'required_min_rx': required_min_rx,
-                                'local_addr': local_addr,
-                                'peer_addr': peer_addr,
-                                'is_ipv6': is_ipv6,
-                                'detect_mult': detect_mult,
-                            })
-        else:
-            return self.api(self.papi.bfd_udp_add,
-                            {
-                                'sw_if_index': sw_if_index,
-                                'desired_min_tx': desired_min_tx,
-                                'required_min_rx': required_min_rx,
-                                'local_addr': local_addr,
-                                'peer_addr': peer_addr,
-                                'is_ipv6': is_ipv6,
-                                'detect_mult': detect_mult,
-                                'is_authenticated': 1,
-                                'bfd_key_id': bfd_key_id,
-                                'conf_key_id': conf_key_id,
-                            })
-
-    def bfd_udp_mod(self, sw_if_index, desired_min_tx, required_min_rx,
-                    detect_mult, local_addr, peer_addr, is_ipv6=0):
-        return self.api(self.papi.bfd_udp_mod,
-                        {
-                            'sw_if_index': sw_if_index,
-                            'desired_min_tx': desired_min_tx,
-                            'required_min_rx': required_min_rx,
-                            'local_addr': local_addr,
-                            'peer_addr': peer_addr,
-                            'is_ipv6': is_ipv6,
-                            'detect_mult': detect_mult,
-                        })
-
-    def bfd_udp_auth_activate(self, sw_if_index, local_addr, peer_addr,
-                              is_ipv6=0, bfd_key_id=None, conf_key_id=None,
-                              is_delayed=False):
-        return self.api(self.papi.bfd_udp_auth_activate,
-                        {
-                            'sw_if_index': sw_if_index,
-                            'local_addr': local_addr,
-                            'peer_addr': peer_addr,
-                            'is_ipv6': is_ipv6,
-                            'is_delayed': 1 if is_delayed else 0,
-                            'bfd_key_id': bfd_key_id,
-                            'conf_key_id': conf_key_id,
-                        })
-
-    def bfd_udp_session_set_flags(self, admin_up_down, sw_if_index, local_addr,
-                                  peer_addr, is_ipv6=0):
-        return self.api(self.papi.bfd_udp_session_set_flags, {
-            'admin_up_down': admin_up_down,
-            'sw_if_index': sw_if_index,
-            'local_addr': local_addr,
-            'peer_addr': peer_addr,
-            'is_ipv6': is_ipv6,
-        })
-
-    def want_bfd_events(self, enable_disable=1):
-        return self.api(self.papi.want_bfd_events, {
-            'enable_disable': enable_disable,
-            'pid': os.getpid(),
-        })
-
-    def bfd_auth_set_key(self, conf_key_id, auth_type, key):
-        return self.api(self.papi.bfd_auth_set_key, {
-            'conf_key_id': conf_key_id,
-            'auth_type': auth_type,
-            'key': key,
-            'key_len': len(key),
-        })
-
     def classify_add_del_table(
             self,
             is_add,
@@ -1033,7 +957,8 @@ class VppPapiProvider(object):
                            client_id='',
                            is_add=1,
                            set_broadcast_flag=1,
-                           want_dhcp_events=0):
+                           want_dhcp_events=0,
+                           dscp=0):
         return self.api(
             self.papi.dhcp_client_config,
             {
@@ -1044,6 +969,7 @@ class VppPapiProvider(object):
                     'id': client_id,
                     'want_dhcp_event': want_dhcp_events,
                     'set_broadcast_flag': set_broadcast_flag,
+                    'dscp': dscp,
                     'pid': os.getpid()}
             })
 
@@ -1719,9 +1645,7 @@ class VppPapiProvider(object):
              'bde_bp': bp,
              'bde_payload_proto': payload_proto,
              'bde_n_paths': 1,
-             'bde_paths': [{'next_hop': next_hop,
-                            'table_id': next_hop_tbl_id,
-                            'afi': next_hop_afi,
+             'bde_paths': [{'table_id': next_hop_tbl_id,
                             'rpf_id': next_hop_rpf_id,
                             'n_labels': 0,
                             'label_stack': lstack}],
@@ -1890,7 +1814,6 @@ class VppPapiProvider(object):
                         'policy': policy,
                         'priority': priority,
                         'is_outbound': is_outbound,
-                        'is_ip_any': is_ip_any
                     }
             })
 
@@ -2129,28 +2052,6 @@ class VppPapiProvider(object):
         """ GBP VXLAN tunnel add/del """
         return self.api(self.papi.gbp_vxlan_tunnel_dump, {})
 
-    def qos_egress_map_update(self, id, outputs):
-        """ QOS egress map update """
-        return self.api(self.papi.qos_egress_map_update,
-                        {'map_id': id,
-                         'rows': outputs})
-
-    def qos_egress_map_delete(self, id):
-        """ QOS egress map delete """
-        return self.api(self.papi.qos_egress_map_delete,
-                        {'map_id': id})
-
-    def qos_mark_enable_disable(self, sw_if_index,
-                                output_source,
-                                map_id,
-                                enable):
-        """ QOS Mark Enable/Disable """
-        return self.api(self.papi.qos_mark_enable_disable,
-                        {'map_id': map_id,
-                         'sw_if_index': sw_if_index,
-                         'output_source': output_source,
-                         'enable': enable})
-
     def igmp_enable_disable(self, sw_if_index, enable, host):
         """ Enable/disable IGMP on a given interface """
         return self.api(self.papi.igmp_enable_disable,
@@ -2206,12 +2107,14 @@ class VppPapiProvider(object):
             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
@@ -2220,6 +2123,7 @@ class VppPapiProvider(object):
             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