'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, },
'vxlan_add_del_tunnel': {'mcast_sw_if_index': 4294967295, 'is_add': 1,
'decap_next_index': 4294967295,
'instance': 4294967295, },
- 'vxlan_gbp_tunnel_add_del': {'mcast_sw_if_index': 4294967295, 'is_add': 1,
- 'instance': 4294967295, },
'vxlan_gbp_tunnel_dump': {'sw_if_index': 4294967295, },
'vxlan_gpe_add_del_tunnel': {'mcast_sw_if_index': 4294967295, 'is_add': 1,
'protocol': 3, },
if hasattr(reply, 'retval') and reply.retval != expected_retval:
msg = "API call failed, expected %d return value instead " \
"of %d in %s" % (expected_retval, reply.retval,
- moves.reprlib.repr(reply))
+ repr(reply))
self.test_class.logger.info(msg)
raise UnexpectedApiReturnValueError(msg)
else:
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,
{
'id': client_id,
'want_dhcp_event': want_dhcp_events,
'set_broadcast_flag': set_broadcast_flag,
+ 'dscp': dscp,
'pid': os.getpid()}
})
'protocol': protocol,
'vni': vni})
- def vxlan_gbp_tunnel_add_del(
- self,
- src,
- dst,
- mcast_sw_if_index=0xFFFFFFFF,
- is_add=1,
- is_ipv6=0,
- encap_table_id=0,
- vni=0,
- mode=1,
- instance=0xFFFFFFFF):
- """
-
- :param dst_addr:
- :param src_addr:
- :param is_add: (Default value = 1)
- :param is_ipv6: (Default value = 0)
- :param encap_table_id: (Default value = 0)
- :param decap_next_index: (Default value = 0xFFFFFFFF)
- :param mcast_sw_if_index: (Default value = 0xFFFFFFFF)
- :param vni: (Default value = 0)
- :param instance: (Default value = 0xFFFFFFFF)
-
- """
- return self.api(self.papi.vxlan_gbp_tunnel_add_del,
- {'is_add': is_add,
- 'tunnel': {
- 'src': src,
- 'dst': dst,
- 'mcast_sw_if_index': mcast_sw_if_index,
- 'encap_table_id': encap_table_id,
- 'vni': vni,
- 'instance': instance,
- "mode": mode}})
-
def vxlan_gbp_tunnel_dump(self, sw_if_index=0xffffffff):
return self.api(self.papi.vxlan_gbp_tunnel_dump,
{'sw_if_index': sw_if_index,
'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}],
'policy': policy,
'priority': priority,
'is_outbound': is_outbound,
- 'is_ip_any': is_ip_any
}
})
return self.api(self.papi.gbp_endpoint_group_del,
{'sclass': sclass})
- def gbp_bridge_domain_add(self, bd_id, flags,
+ def gbp_bridge_domain_add(self, bd_id, rd_id, flags,
bvi_sw_if_index,
uu_fwd_sw_if_index,
bm_flood_sw_if_index):
'bvi_sw_if_index': bvi_sw_if_index,
'uu_fwd_sw_if_index': uu_fwd_sw_if_index,
'bm_flood_sw_if_index': bm_flood_sw_if_index,
- 'bd_id': bd_id
+ 'bd_id': bd_id,
+ 'rd_id': rd_id
}})
def gbp_bridge_domain_del(self, bd_id):
{'bd_id': bd_id})
def gbp_route_domain_add(self, rd_id,
+ scope,
ip4_table_id,
ip6_table_id,
ip4_uu_sw_if_index,
return self.api(self.papi.gbp_route_domain_add,
{'rd':
{
+ 'scope': scope,
'ip4_table_id': ip4_table_id,
'ip6_table_id': ip6_table_id,
'ip4_uu_sw_if_index': ip4_uu_sw_if_index,
""" GBP recirc Dump """
return self.api(self.papi.gbp_recirc_dump, {})
- def gbp_ext_itf_add_del(self, is_add, sw_if_index, bd_id, rd_id):
+ def gbp_ext_itf_add_del(self, is_add, sw_if_index, bd_id, rd_id, flags):
""" GBP recirc Add/Del """
return self.api(self.papi.gbp_ext_itf_add_del,
{'is_add': is_add,
'ext_itf': {
'sw_if_index': sw_if_index,
'bd_id': bd_id,
- 'rd_id': rd_id}})
+ 'rd_id': rd_id,
+ 'flags': flags}})
def gbp_ext_itf_dump(self):
""" GBP recirc Dump """
return self.api(self.papi.gbp_subnet_dump,
{'_no_type_conversion': True})
- def gbp_contract_add_del(self, is_add, sclass, dclass, acl_index,
- rules, allowed_ethertypes):
- """ GBP contract Add/Del """
- return self.api(self.papi.gbp_contract_add_del,
- {'is_add': is_add,
- 'contract': {
- 'acl_index': acl_index,
- 'sclass': sclass,
- 'dclass': dclass,
- 'n_rules': len(rules),
- 'rules': rules,
- 'n_ether_types': len(allowed_ethertypes),
- 'allowed_ethertypes': allowed_ethertypes}})
-
def gbp_contract_dump(self):
""" GBP contract Dump """
return self.api(self.papi.gbp_contract_dump, {})
""" 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,
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
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
Code Review / vpp.git / blobdiff