X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_papi_provider.py;h=d29f90c1789bf8ca16a4821a77f365cfbc69aaba;hb=9dd34e00ede6e5d0b32e8e0c0b26b03dee468549;hp=23a108d9ca22febf371b60206a518726f22406a0;hpb=177bbdcd8fa4e7621c5bdd3afd8c6e74b603e096;p=vpp.git diff --git a/test/vpp_papi_provider.py b/test/vpp_papi_provider.py index 23a108d9ca2..d29f90c1789 100644 --- a/test/vpp_papi_provider.py +++ b/test/vpp_papi_provider.py @@ -1,4 +1,5 @@ import os +import array from logging import error from hook import Hook @@ -21,6 +22,7 @@ MPLS_LABEL_INVALID = MPLS_IETF_MAX_LABEL + 1 class L2_VTR_OP: L2_POP_1 = 3 +need_swap = True if os.sys.byteorder == 'little' else False class VppPapiProvider(object): """VPP-api provider using vpp-papi @@ -93,7 +95,10 @@ class VppPapiProvider(object): :param cli: CLI to execute :returns: CLI output """ - return cli + "\n" + self.cli(cli) + return cli + "\n" + str(self.cli(cli)) + + def _convert_mac(self, mac): + return int(mac.replace(":", ""), 16) << 16 def show_version(self): """ """ @@ -182,6 +187,7 @@ class VppPapiProvider(object): self, src_addr, dst_addr, + mcast_sw_if_index=0xFFFFFFFF, is_add=1, is_ipv6=0, encap_vrf_id=0, @@ -195,23 +201,65 @@ class VppPapiProvider(object): :param is_ipv6: (Default value = 0) :param encap_vrf_id: (Default value = 0) :param decap_next_index: (Default value = 0xFFFFFFFF) + :param mcast_sw_if_index: (Default value = 0xFFFFFFFF) :param vni: (Default value = 0) """ return self.api(vpp_papi.vxlan_add_del_tunnel, - (is_add, is_ipv6, src_addr, dst_addr, encap_vrf_id, - decap_next_index, vni)) + (is_add, is_ipv6, src_addr, dst_addr, mcast_sw_if_index, + encap_vrf_id, decap_next_index, vni)) + + def bridge_domain_add_del(self, bd_id, flood=1, uu_flood=1, forward=1, + learn=1, arp_term=0, is_add=1): + """Create/delete bridge domain. + + :param int bd_id: Bridge domain index. + :param int flood: Enable/disable bcast/mcast flooding in the BD. + (Default value = 1) + :param int uu_flood: Enable/disable unknown unicast flood in the BD. + (Default value = 1) + :param int forward: Enable/disable forwarding on all interfaces in + the BD. (Default value = 1) + :param int learn: Enable/disable learning on all interfaces in the BD. + (Default value = 1) + :param int arp_term: Enable/disable arp termination in the BD. + (Default value = 1) + :param int is_add: Add or delete flag. (Default value = 1) + """ + return self.api(vpp_papi.bridge_domain_add_del, + (bd_id, flood, uu_flood, forward, learn, arp_term, + is_add)) + + def l2fib_add_del(self, mac, bd_id, sw_if_index, is_add=1, static_mac=0, + filter_mac=0, bvi_mac=0): + """Create/delete L2 FIB entry. + + :param str mac: MAC address to create FIB entry for. + :param int bd_id: Bridge domain index. + :param int sw_if_index: Software interface index of the interface. + :param int is_add: Add or delete flag. (Default value = 1) + :param int static_mac: Set to 1 to create static MAC entry. + (Default value = 0) + :param int filter_mac: Set to 1 to drop packet that's source or + destination MAC address contains defined MAC address. + (Default value = 0) + :param int bvi_mac: Set to 1 to create entry that points to BVI + interface. (Default value = 0) + """ + return self.api(vpp_papi.l2fib_add_del, + (self._convert_mac(mac), bd_id, sw_if_index, is_add, + static_mac, filter_mac, bvi_mac)) def sw_interface_set_l2_bridge(self, sw_if_index, bd_id, shg=0, bvi=0, enable=1): - """ - - :param bd_id: - :param sw_if_index: - :param shg: (Default value = 0) - :param bvi: (Default value = 0) - :param enable: (Default value = 1) + """Add/remove interface to/from bridge domain. + :param int sw_if_index: Software interface index of the interface. + :param int bd_id: Bridge domain index. + :param int shg: Split-horizon group index. (Default value = 0) + :param int bvi: Set interface as a bridge group virtual interface. + (Default value = 0) + :param int enable: Add or remove interface. (Default value = 1) """ return self.api(vpp_papi.sw_interface_set_l2_bridge, (sw_if_index, bd_id, shg, bvi, enable)) @@ -221,13 +269,10 @@ class VppPapiProvider(object): """Create or delete unidirectional cross-connect from Tx interface to Rx interface. - :param rx_sw_if_index: Software interface index of Rx interface. - :param tx_sw_if_index: Software interface index of Tx interface. - :param enable: Create cross-connect if equal to 1, delete cross-connect - if equal to 0. - :type rx_sw_if_index: str or int - :type rx_sw_if_index: str or int - :type enable: int + :param int rx_sw_if_index: Software interface index of Rx interface. + :param int tx_sw_if_index: Software interface index of Tx interface. + :param int enable: Create cross-connect if equal to 1, delete + cross-connect if equal to 0. """ return self.api(vpp_papi.sw_interface_set_l2_xconnect, @@ -325,12 +370,15 @@ class VppPapiProvider(object): next_hop_address, next_hop_sw_if_index=0xFFFFFFFF, table_id=0, - resolve_attempts=0, - classify_table_index=0xFFFFFFFF, - next_hop_out_label=MPLS_LABEL_INVALID, next_hop_table_id=0, + next_hop_weight=1, + next_hop_n_out_labels = 0, + next_hop_out_label_stack = [], + next_hop_via_label = MPLS_LABEL_INVALID, create_vrf_if_needed=0, - resolve_if_needed=0, + is_resolve_host=0, + is_resolve_attached=0, + classify_table_index=0xFFFFFFFF, is_add=1, is_drop=0, is_unreach=0, @@ -339,10 +387,7 @@ class VppPapiProvider(object): is_local=0, is_classify=0, is_multipath=0, - is_resolve_host=0, - is_resolve_attached=0, - not_last=0, - next_hop_weight=1): + not_last=0): """ :param dst_address_length: @@ -352,10 +397,8 @@ class VppPapiProvider(object): :param next_hop_sw_if_index: (Default value = 0xFFFFFFFF) :param vrf_id: (Default value = 0) :param lookup_in_vrf: (Default value = 0) - :param resolve_attempts: (Default value = 0) :param classify_table_index: (Default value = 0xFFFFFFFF) :param create_vrf_if_needed: (Default value = 0) - :param resolve_if_needed: (Default value = 0) :param is_add: (Default value = 1) :param is_drop: (Default value = 0) :param is_ipv6: (Default value = 0) @@ -368,16 +411,18 @@ class VppPapiProvider(object): :param next_hop_weight: (Default value = 1) """ + stack = array.array('I', next_hop_out_label_stack) + if need_swap: + stack.byteswap() + stack = stack.tostring() + return self.api( vpp_papi.ip_add_del_route, (next_hop_sw_if_index, table_id, - resolve_attempts, classify_table_index, - next_hop_out_label, next_hop_table_id, create_vrf_if_needed, - resolve_if_needed, is_add, is_drop, is_unreach, @@ -392,7 +437,10 @@ class VppPapiProvider(object): next_hop_weight, dst_address_length, dst_address, - next_hop_address)) + next_hop_address, + next_hop_n_out_labels, + next_hop_via_label, + stack)) def ip_neighbor_add_del(self, sw_if_index, @@ -462,3 +510,153 @@ class VppPapiProvider(object): dst_address, outer_fib_id) ) + + def mpls_route_add_del( + self, + label, + eos, + next_hop_proto_is_ip4, + next_hop_address, + next_hop_sw_if_index=0xFFFFFFFF, + table_id=0, + next_hop_table_id=0, + next_hop_weight=1, + next_hop_n_out_labels = 0, + next_hop_out_label_stack = [], + next_hop_via_label = MPLS_LABEL_INVALID, + create_vrf_if_needed=0, + is_resolve_host=0, + is_resolve_attached=0, + is_add=1, + is_drop=0, + is_multipath=0, + classify_table_index=0xFFFFFFFF, + is_classify=0, + not_last=0): + """ + + :param dst_address_length: + :param next_hop_sw_if_index: (Default value = 0xFFFFFFFF) + :param dst_address: + :param next_hop_address: + :param next_hop_sw_if_index: (Default value = 0xFFFFFFFF) + :param vrf_id: (Default value = 0) + :param lookup_in_vrf: (Default value = 0) + :param classify_table_index: (Default value = 0xFFFFFFFF) + :param create_vrf_if_needed: (Default value = 0) + :param is_add: (Default value = 1) + :param is_drop: (Default value = 0) + :param is_ipv6: (Default value = 0) + :param is_local: (Default value = 0) + :param is_classify: (Default value = 0) + :param is_multipath: (Default value = 0) + :param is_resolve_host: (Default value = 0) + :param is_resolve_attached: (Default value = 0) + :param not_last: (Default value = 0) + :param next_hop_weight: (Default value = 1) + + """ + stack = array.array('I', next_hop_out_label_stack) + if need_swap: + stack.byteswap() + stack = stack.tostring() + + return self.api( + vpp_papi.mpls_route_add_del, + (label, + eos, + table_id, + classify_table_index, + create_vrf_if_needed, + is_add, + is_classify, + is_multipath, + is_resolve_host, + is_resolve_attached, + next_hop_proto_is_ip4, + next_hop_weight, + next_hop_address, + next_hop_n_out_labels, + next_hop_sw_if_index, + next_hop_table_id, + next_hop_via_label, + stack)) + + def mpls_ip_bind_unbind( + self, + label, + dst_address, + dst_address_length, + table_id=0, + ip_table_id=0, + is_ip4=1, + create_vrf_if_needed=0, + is_bind=1): + """ + """ + return self.api( + vpp_papi.mpls_ip_bind_unbind, + (table_id, + label, + ip_table_id, + create_vrf_if_needed, + is_bind, + is_ip4, + dst_address_length, + dst_address)) + + def mpls_tunnel_add_del( + self, + tun_sw_if_index, + next_hop_proto_is_ip4, + next_hop_address, + next_hop_sw_if_index=0xFFFFFFFF, + next_hop_table_id=0, + next_hop_weight=1, + next_hop_n_out_labels = 0, + next_hop_out_label_stack = [], + next_hop_via_label = MPLS_LABEL_INVALID, + create_vrf_if_needed=0, + is_add=1, + l2_only=0): + """ + + :param dst_address_length: + :param next_hop_sw_if_index: (Default value = 0xFFFFFFFF) + :param dst_address: + :param next_hop_address: + :param next_hop_sw_if_index: (Default value = 0xFFFFFFFF) + :param vrf_id: (Default value = 0) + :param lookup_in_vrf: (Default value = 0) + :param classify_table_index: (Default value = 0xFFFFFFFF) + :param create_vrf_if_needed: (Default value = 0) + :param is_add: (Default value = 1) + :param is_drop: (Default value = 0) + :param is_ipv6: (Default value = 0) + :param is_local: (Default value = 0) + :param is_classify: (Default value = 0) + :param is_multipath: (Default value = 0) + :param is_resolve_host: (Default value = 0) + :param is_resolve_attached: (Default value = 0) + :param not_last: (Default value = 0) + :param next_hop_weight: (Default value = 1) + + """ + stack = array.array('I', next_hop_out_label_stack) + if need_swap: + stack.byteswap() + stack = stack.tostring() + + return self.api( + vpp_papi.mpls_tunnel_add_del, + (tun_sw_if_index, + is_add, + l2_only, + next_hop_proto_is_ip4, + next_hop_weight, + next_hop_address, + next_hop_n_out_labels, + next_hop_sw_if_index, + next_hop_table_id, + stack)) +