diff options
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/libraries/python/Constants.py | 3 | ||||
| -rw-r--r-- | resources/libraries/python/IPUtil.py | 271 | ||||
| -rw-r--r-- | resources/libraries/python/PapiExecutor.py | 41 | ||||
| -rw-r--r-- | resources/libraries/robot/performance/performance_configuration.robot | 8 | ||||
| -rw-r--r-- | resources/libraries/robot/shared/container.robot | 2 | ||||
| -rwxr-xr-x | resources/tools/papi/vpp_papi_provider.py | 28 |
6 files changed, 211 insertions, 142 deletions
diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py index 62c5693314..da61f539da 100644 --- a/resources/libraries/python/Constants.py +++ b/resources/libraries/python/Constants.py @@ -97,6 +97,9 @@ class Constants(object): # Equivalent to ~0 used in vpp code BITWISE_NON_ZERO = 0xffffffff + # Maximum number of API calls per PapiExecutor execution + PAPI_MAX_API_BULK = 250 + # Mapping from NIC name to its bps limit. # TODO: Implement logic to lower limits to TG NIC or software. Or PCI. NIC_NAME_TO_LIMIT = { diff --git a/resources/libraries/python/IPUtil.py b/resources/libraries/python/IPUtil.py index 52640d1658..b78450a9f8 100644 --- a/resources/libraries/python/IPUtil.py +++ b/resources/libraries/python/IPUtil.py @@ -15,17 +15,59 @@ import re -from socket import AF_INET, AF_INET6, inet_ntop, inet_pton +from socket import AF_INET, AF_INET6, inet_pton +from enum import IntEnum from ipaddress import ip_address -from ipaddress import IPv4Network, IPv6Network, IPv4Address, IPv6Address -from ipaddress import AddressValueError, NetmaskValueError +from ipaddress import IPv4Network, IPv6Network from resources.libraries.python.Constants import Constants from resources.libraries.python.InterfaceUtil import InterfaceUtil from resources.libraries.python.PapiExecutor import PapiExecutor from resources.libraries.python.ssh import exec_cmd_no_error, exec_cmd -from resources.libraries.python.topology import NodeType, Topology +from resources.libraries.python.topology import Topology + + +# from vpp/src/vnet/vnet/mpls/mpls_types.h +MPLS_IETF_MAX_LABEL = 0xfffff +MPLS_LABEL_INVALID = MPLS_IETF_MAX_LABEL + 1 + + +class AddressFamily(IntEnum): + """IP address family.""" + ADDRESS_IP4 = 0 + ADDRESS_IP6 = 1 + + +class FibPathType(IntEnum): + """FIB path types.""" + FIB_PATH_TYPE_NORMAL = 0 + FIB_PATH_TYPE_LOCAL = 1 + FIB_PATH_TYPE_DROP = 2 + FIB_PATH_TYPE_UDP_ENCAP = 3 + FIB_PATH_TYPE_BIER_IMP = 4 + FIB_PATH_TYPE_ICMP_UNREACH = 5 + FIB_PATH_TYPE_ICMP_PROHIBIT = 6 + FIB_PATH_TYPE_SOURCE_LOOKUP = 7 + FIB_PATH_TYPE_DVR = 8 + FIB_PATH_TYPE_INTERFACE_RX = 9 + FIB_PATH_TYPE_CLASSIFY = 10 + + +class FibPathFlags(IntEnum): + """FIB path flags.""" + FIB_PATH_FLAG_NONE = 0 + FIB_PATH_FLAG_RESOLVE_VIA_ATTACHED = 1 + FIB_PATH_FLAG_RESOLVE_VIA_HOST = 2 + + +class FibPathNhProto(IntEnum): + """FIB path next-hop protocol.""" + FIB_PATH_NH_PROTO_IP4 = 0 + FIB_PATH_NH_PROTO_IP6 = 1 + FIB_PATH_NH_PROTO_MPLS = 2 + FIB_PATH_NH_PROTO_ETHERNET = 3 + FIB_PATH_NH_PROTO_BIER = 4 class IPUtil(object): @@ -70,37 +112,34 @@ class IPUtil(object): Note: A single interface may have multiple IP addresses assigned. :rtype: list """ - try: - sw_if_index = Topology.convert_interface_reference( - node, interface, 'sw_if_index') - except RuntimeError: - if isinstance(interface, basestring): - sw_if_index = InterfaceUtil.get_sw_if_index(node, interface) - else: - raise - - is_ipv6 = 1 if ip_version == 'ipv6' else 0 - - cmd = 'ip_address_dump' - cmd_reply = 'ip_address_details' - args = dict(sw_if_index=sw_if_index, - is_ipv6=is_ipv6) - err_msg = 'Failed to get L2FIB dump on host {host}'.format( - host=node['host']) - - with PapiExecutor(node) as papi_exec: - papi_resp = papi_exec.add(cmd, **args).get_dump(err_msg) + sw_if_index = InterfaceUtil.get_interface_index(node, interface) data = list() - for item in papi_resp.reply[0]['api_reply']: - item[cmd_reply]['ip'] = inet_ntop(AF_INET6, item[cmd_reply]['ip']) \ - if is_ipv6 else inet_ntop(AF_INET, item[cmd_reply]['ip'][0:4]) - item[cmd_reply]['netmask'] = str( - IPv6Network(unicode('::/{pl}'.format( - pl=item[cmd_reply]['prefix_length']))).netmask) if is_ipv6 \ - else str(IPv4Network(unicode('0.0.0.0/{pl}'.format( - pl=item[cmd_reply]['prefix_length']))).netmask) - data.append(item[cmd_reply]) + if sw_if_index: + is_ipv6 = 1 if ip_version == 'ipv6' else 0 + + cmd = 'ip_address_dump' + cmd_reply = 'ip_address_details' + args = dict(sw_if_index=sw_if_index, + is_ipv6=is_ipv6) + err_msg = 'Failed to get L2FIB dump on host {host}'.format( + host=node['host']) + + with PapiExecutor(node) as papi_exec: + papi_resp = papi_exec.add(cmd, **args).get_dump(err_msg) + + for item in papi_resp.reply[0]['api_reply']: + item[cmd_reply]['ip'] = item[cmd_reply]['prefix'].split('/')[0] + item[cmd_reply]['prefix_length'] = int( + item[cmd_reply]['prefix'].split('/')[1]) + item[cmd_reply]['is_ipv6'] = is_ipv6 + item[cmd_reply]['netmask'] = \ + str(IPv6Network(unicode('::/{pl}'.format( + pl=item[cmd_reply]['prefix_length']))).netmask) \ + if is_ipv6 \ + else str(IPv4Network(unicode('0.0.0.0/{pl}'.format( + pl=item[cmd_reply]['prefix_length']))).netmask) + data.append(item[cmd_reply]) return data @@ -117,10 +156,7 @@ class IPUtil(object): :returns: vrf ID of the specified interface. :rtype: int """ - if isinstance(interface, basestring): - sw_if_index = InterfaceUtil.get_sw_if_index(node, interface) - else: - sw_if_index = interface + sw_if_index = InterfaceUtil.get_interface_index(node, interface) is_ipv6 = 1 if ip_version == 'ipv6' else 0 @@ -340,24 +376,18 @@ class IPUtil(object): :type address: str :type prefix_length: int """ - try: - ip_addr = IPv6Address(unicode(address)) - af_inet = AF_INET6 - is_ipv6 = 1 - except (AddressValueError, NetmaskValueError): - ip_addr = IPv4Address(unicode(address)) - af_inet = AF_INET - is_ipv6 = 0 + ip_addr = ip_address(unicode(address)) cmd = 'sw_interface_add_del_address' args = dict( sw_if_index=InterfaceUtil.get_interface_index(node, interface), is_add=1, - is_ipv6=is_ipv6, + is_ipv6=1 if ip_addr.version == 6 else 0, del_all=0, address_length=int(prefix_length) if prefix_length else 128 - if is_ipv6 else 32, - address=inet_pton(af_inet, str(ip_addr))) + if ip_addr.version == 6 else 32, + address=inet_pton( + AF_INET6 if ip_addr.version == 6 else AF_INET, str(ip_addr))) err_msg = 'Failed to add IP address on interface {ifc}'.format( ifc=interface) with PapiExecutor(node) as papi_exec: @@ -377,14 +407,10 @@ class IPUtil(object): :type ip_addr: str :type mac_address: str """ - try: - dst_ip = IPv6Address(unicode(ip_addr)) - except (AddressValueError, NetmaskValueError): - dst_ip = IPv4Address(unicode(ip_addr)) + dst_ip = ip_address(unicode(ip_addr)) neighbor = dict( - sw_if_index=Topology.get_interface_sw_index( - node, iface_key), + sw_if_index=Topology.get_interface_sw_index(node, iface_key), flags=0, mac_address=str(mac_address), ip_address=str(dst_ip)) @@ -422,82 +448,81 @@ class IPUtil(object): :type prefix_len: int :type kwargs: dict """ - interface = kwargs.get('interface', None) - gateway = kwargs.get('gateway', None) - - try: - net_addr = IPv6Address(unicode(network)) - af_inet = AF_INET6 - is_ipv6 = 1 - except (AddressValueError, NetmaskValueError): - net_addr = IPv4Address(unicode(network)) - af_inet = AF_INET - is_ipv6 = 0 - - if gateway: - try: - gt_addr = IPv6Address(unicode(gateway)) - af_inet_gt = AF_INET6 - except (AddressValueError, NetmaskValueError): - gt_addr = IPv4Address(unicode(gateway)) - af_inet_gt = AF_INET - - cmd = 'ip_add_del_route' - args = dict( - next_hop_sw_if_index=InterfaceUtil.get_interface_index( - node, interface) if interface else Constants.BITWISE_NON_ZERO, + interface = kwargs.get('interface', '') + gateway = kwargs.get('gateway', '') + + net_addr = ip_address(unicode(network)) + + def union_addr(ip_addr): + """Creates union IP address. + + :param ip_addr: IPv4 or IPv6 address. + :type ip_addr: IPv4Address or IPv6Address + :returns: Union IP address. + :rtype: dict + """ + return dict(ip6=inet_pton(AF_INET6, str(ip_addr))) \ + if ip_addr.version == 6 \ + else dict(ip4=inet_pton(AF_INET, str(ip_addr))) + + addr = dict( + af=getattr( + AddressFamily, 'ADDRESS_IP6' if net_addr.version == 6 + else 'ADDRESS_IP4').value) + prefix = dict(address_length=int(prefix_len)) + + paths = list() + n_hop = dict( + address=union_addr(ip_address(unicode(gateway))) if gateway else 0, + via_label=MPLS_LABEL_INVALID, + obj_id=Constants.BITWISE_NON_ZERO) + path = dict( + sw_if_index=InterfaceUtil.get_interface_index(node, interface) + if interface else Constants.BITWISE_NON_ZERO, + table_id=int(kwargs.get('lookup_vrf', 0)), + rpf_id=Constants.BITWISE_NON_ZERO, + weight=int(kwargs.get('weight', 1)), + preference=1, + type=getattr( + FibPathType, 'FIB_PATH_TYPE_LOCAL' + if kwargs.get('local', False) + else 'FIB_PATH_TYPE_NORMAL').value, + flags=getattr(FibPathFlags, 'FIB_PATH_FLAG_NONE').value, + proto=getattr( + FibPathNhProto, 'FIB_PATH_NH_PROTO_IP6' + if net_addr.version == 6 + else 'FIB_PATH_NH_PROTO_IP4').value, + nh=n_hop, + n_labels=0, + label_stack=list(0 for _ in range(16))) + paths.append(path) + + route = dict( table_id=int(kwargs.get('vrf', 0)), + n_paths=len(paths), + paths=paths) + cmd = 'ip_route_add_del' + args = dict( is_add=1, - is_ipv6=is_ipv6, - is_local=int(kwargs.get('local', False)), - is_multipath=int(kwargs.get('multipath', False)), - next_hop_weight=int(kwargs.get('weight', 1)), - next_hop_proto=1 if is_ipv6 else 0, - dst_address_length=int(prefix_len), - next_hop_address=inet_pton(af_inet_gt, str(gt_addr)) if gateway - else 0, - next_hop_table_id=int(kwargs.get('lookup_vrf', 0))) + is_multipath=int(kwargs.get('multipath', False))) + err_msg = 'Failed to add route(s) on host {host}'.format( host=node['host']) with PapiExecutor(node) as papi_exec: for i in xrange(kwargs.get('count', 1)): - papi_exec.add(cmd, dst_address=inet_pton( - af_inet, str(net_addr+i)), **args) + addr['un'] = union_addr(net_addr + i) + prefix['address'] = addr + route['prefix'] = prefix + history = False if 1 < i < kwargs.get('count', 1) else True + papi_exec.add(cmd, history=history, route=route, **args) + if i > 0 and i % Constants.PAPI_MAX_API_BULK == 0: + papi_exec.get_replies(err_msg).verify_replies( + err_msg=err_msg) papi_exec.get_replies(err_msg).verify_replies(err_msg=err_msg) @staticmethod - def vpp_nodes_set_ipv4_addresses(nodes, nodes_addr): - """Set IPv4 addresses on all VPP nodes in topology. - - :param nodes: Nodes of the test topology. - :param nodes_addr: Available nodes IPv4 addresses. - :type nodes: dict - :type nodes_addr: dict - :returns: Affected interfaces as list of (node, interface) tuples. - :rtype: list - """ - interfaces = [] - for net in nodes_addr.values(): - for port in net['ports'].values(): - host = port.get('node') - if host is None: - continue - topo = Topology() - node = topo.get_node_by_hostname(nodes, host) - if node is None: - continue - if node['type'] != NodeType.DUT: - continue - iface_key = topo.get_interface_by_name(node, port['if']) - IPUtil.vpp_interface_set_ip_address( - node, iface_key, port['addr'], net['prefix']) - interfaces.append((node, port['if'])) - - return interfaces - - @staticmethod def flush_ip_addresses(node, interface): - """Flush all IPv4addresses from specified interface. + """Flush all IP addresses from specified interface. :param node: VPP node. :param interface: Interface name. @@ -526,9 +551,11 @@ class IPUtil(object): :type ipv6: bool """ cmd = 'ip_table_add_del' - args = dict( + table = dict( table_id=int(table_id), - is_ipv6=int(ipv6), + is_ip6=int(ipv6)) + args = dict( + table=table, is_add=1) err_msg = 'Failed to add FIB table on host {host}'.format( host=node['host']) diff --git a/resources/libraries/python/PapiExecutor.py b/resources/libraries/python/PapiExecutor.py index 5e35422a1b..30a90473f5 100644 --- a/resources/libraries/python/PapiExecutor.py +++ b/resources/libraries/python/PapiExecutor.py @@ -290,20 +290,24 @@ class PapiExecutor(object): def __exit__(self, exc_type, exc_val, exc_tb): self._ssh.disconnect(self._node) - def add(self, csit_papi_command="vpp-stats", **kwargs): + def add(self, csit_papi_command="vpp-stats", history=True, **kwargs): """Add next command to internal command list; return self. The argument name 'csit_papi_command' must be unique enough as it cannot be repeated in kwargs. :param csit_papi_command: VPP API command. + :param history: Enable/disable adding command to PAPI command history. :param kwargs: Optional key-value arguments. :type csit_papi_command: str + :type history: bool :type kwargs: dict :returns: self, so that method chaining is possible. :rtype: PapiExecutor """ - PapiHistory.add_to_papi_history(self._node, csit_papi_command, **kwargs) + if history: + PapiHistory.add_to_papi_history( + self._node, csit_papi_command, **kwargs) self._api_command_list.append(dict(api_name=csit_papi_command, api_args=kwargs)) return self @@ -480,10 +484,13 @@ class PapiExecutor(object): :rtype: dict or str or int """ if isinstance(val, dict): - val_dict = dict() for val_k, val_v in val.iteritems(): - val_dict[str(val_k)] = process_value(val_v) - return val_dict + val[str(val_k)] = process_value(val_v) + return val + elif isinstance(val, list): + for idx, val_l in enumerate(val): + val[idx] = process_value(val_l) + return val else: return binascii.hexlify(val) if isinstance(val, str) else val @@ -509,12 +516,32 @@ class PapiExecutor(object): :returns: Processed API reply / a part of API reply. :rtype: dict """ + def process_value(val): + """Process value. + + :param val: Value to be processed. + :type val: object + :returns: Processed value. + :rtype: dict or str or int + """ + if isinstance(val, dict): + for val_k, val_v in val.iteritems(): + val[str(val_k)] = process_value(val_v) + return val + elif isinstance(val, list): + for idx, val_l in enumerate(val): + val[idx] = process_value(val_l) + return val + elif isinstance(val, unicode): + return binascii.unhexlify(val) + else: + return val + reply_dict = dict() reply_value = dict() for reply_key, reply_v in api_r.iteritems(): for a_k, a_v in reply_v.iteritems(): - reply_value[a_k] = binascii.unhexlify(a_v) \ - if isinstance(a_v, unicode) else a_v + reply_value[a_k] = process_value(a_v) reply_dict[reply_key] = reply_value return reply_dict diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot index 47dec46d49..32320788f3 100644 --- a/resources/libraries/robot/performance/performance_configuration.robot +++ b/resources/libraries/robot/performance/performance_configuration.robot @@ -918,17 +918,17 @@ | | VPP Interface Set IP Address | | ... | ${dut1} | ${dut1_if2} | ${dut1_if2_ip6} | ${prefix} | | VPP Interface Set IP Address | ${dut1} | ${dut1-memif-1-if1} -| | ... | ${dut1-memif-1-if1_ip6} | ${prefix} +| | ... | ${dut1-memif-1-if1_ip6} | ${mem_prefix} | | VPP Interface Set IP Address | ${dut1} | ${dut1-memif-1-if2} -| | ... | ${dut1-memif-1-if2_ip6} | ${prefix} +| | ... | ${dut1-memif-1-if2_ip6} | ${mem_prefix} | | VPP Interface Set IP Address | | ... | ${dut2} | ${dut2_if1} | ${dut2_if1_ip6} | ${prefix} | | VPP Interface Set IP Address | | ... | ${dut2} | ${dut2_if2} | ${dut2_if2_ip6} | ${prefix} | | VPP Interface Set IP Address | ${dut2} | ${dut2-memif-1-if1} -| | ... | ${dut2-memif-1-if1_ip6} | ${prefix} +| | ... | ${dut2-memif-1-if1_ip6} | ${mem_prefix} | | VPP Interface Set IP Address | ${dut2} | ${dut2-memif-1-if2} -| | ... | ${dut2-memif-1-if2_ip6} | ${prefix} +| | ... | ${dut2-memif-1-if2_ip6} | ${mem_prefix} | | Suppress ICMPv6 router advertisement message | ${nodes} | | VPP Add IP Neighbor | | ... | ${dut1} | ${dut1_if2} | ${dut2_if1_ip6} | ${dut2_if1_mac} diff --git a/resources/libraries/robot/shared/container.robot b/resources/libraries/robot/shared/container.robot index 0b2fcd489b..c8320b7508 100644 --- a/resources/libraries/robot/shared/container.robot +++ b/resources/libraries/robot/shared/container.robot @@ -195,7 +195,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Set up performance test with containers \| 1 \| 1 \| +| | ... | \| Start containers for performance test \| 1 \| 1 \| | | ... | | [Arguments] | ${nf_chains}=${1} | ${nf_nodes}=${1} | ${auto_scale}=${True} | | ... diff --git a/resources/tools/papi/vpp_papi_provider.py b/resources/tools/papi/vpp_papi_provider.py index 1136be52dd..676f5491dd 100755 --- a/resources/tools/papi/vpp_papi_provider.py +++ b/resources/tools/papi/vpp_papi_provider.py @@ -92,11 +92,17 @@ def _convert_reply(api_r): unwanted_fields = ['count', 'index', 'context'] def process_value(val): + """Process value. + + :param val: Value to be processed. + :type val: object + :returns: Processed value. + :rtype: dict or str or int + """ if isinstance(val, dict): - val_dict = dict() for val_k, val_v in val.iteritems(): - val_dict[str(val_k)] = process_value(val_v) - return val_dict + val[str(val_k)] = process_value(val_v) + return val elif isinstance(val, list): for idx, val_l in enumerate(val): val[idx] = process_value(val_l) @@ -140,14 +146,20 @@ def process_json_request(args): reply = list() def process_value(val): + """Process value. + + :param val: Value to be processed. + :type val: object + :returns: Processed value. + :rtype: dict or str or int + """ if isinstance(val, dict): - val_dict = dict() for val_k, val_v in val.iteritems(): - val_dict[str(val_k)] = process_value(val_v) - return val_dict + val[str(val_k)] = process_value(val_v) + return val elif isinstance(val, list): - for idx, item in enumerate(val): - val[idx] = process_value(item) + for idx, val_l in enumerate(val): + val[idx] = process_value(val_l) return val elif isinstance(val, unicode): return binascii.unhexlify(val) |