X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FIPUtil.py;h=4d5753ea9267488729223fed3ab34c9a89636b66;hp=6a8e1a240179990a7070cd6350231b4d0e3b5198;hb=6b40a760505ae11c896deb68f92775cdf04ba965;hpb=33fb34665214bbbd0a4b3154169b21c2da01f69b diff --git a/resources/libraries/python/IPUtil.py b/resources/libraries/python/IPUtil.py index 6a8e1a2401..4d5753ea92 100644 --- a/resources/libraries/python/IPUtil.py +++ b/resources/libraries/python/IPUtil.py @@ -1,4 +1,4 @@ -# Copyright (c) 2019 Cisco and/or its affiliates. +# Copyright (c) 2020 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -12,18 +12,20 @@ # limitations under the License. """Common IP utilities library.""" - import re from enum import IntEnum -from ipaddress import ip_address, IPv4Network, IPv6Network + +from ipaddress import ip_address 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.IPAddress import IPAddress +from resources.libraries.python.PapiExecutor import PapiSocketExecutor from resources.libraries.python.ssh import exec_cmd_no_error, exec_cmd from resources.libraries.python.topology import Topology from resources.libraries.python.VatExecutor import VatTerminal +from resources.libraries.python.Namespaces import Namespaces # from vpp/src/vnet/vnet/mpls/mpls_types.h @@ -31,12 +33,6 @@ 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 @@ -55,6 +51,7 @@ class FibPathType(IntEnum): class FibPathFlags(IntEnum): """FIB path flags.""" FIB_PATH_FLAG_NONE = 0 + # TODO: Name too long for pylint, fix in VPP. FIB_PATH_FLAG_RESOLVE_VIA_ATTACHED = 1 FIB_PATH_FLAG_RESOLVE_VIA_HOST = 2 @@ -68,7 +65,32 @@ class FibPathNhProto(IntEnum): FIB_PATH_NH_PROTO_BIER = 4 -class IPUtil(object): +class IpDscp(IntEnum): + """DSCP code points.""" + IP_API_DSCP_CS0 = 0, + IP_API_DSCP_CS1 = 8, + IP_API_DSCP_AF11 = 10, + IP_API_DSCP_AF12 = 12, + IP_API_DSCP_AF13 = 14, + IP_API_DSCP_CS2 = 16, + IP_API_DSCP_AF21 = 18, + IP_API_DSCP_AF22 = 20, + IP_API_DSCP_AF23 = 22, + IP_API_DSCP_CS3 = 24, + IP_API_DSCP_AF31 = 26, + IP_API_DSCP_AF32 = 28, + IP_API_DSCP_AF33 = 30, + IP_API_DSCP_CS4 = 32, + IP_API_DSCP_AF41 = 34, + IP_API_DSCP_AF42 = 36, + IP_API_DSCP_AF43 = 38, + IP_API_DSCP_CS5 = 40, + IP_API_DSCP_EF = 46, + IP_API_DSCP_CS6 = 48, + IP_API_DSCP_CS7 = 50 + + +class IPUtil: """Common IP utilities""" @staticmethod @@ -81,7 +103,7 @@ class IPUtil(object): :returns: Integer representation of IP address. :rtype: int """ - return int(ip_address(unicode(ip_str))) + return int(ip_address(ip_str)) @staticmethod def int_to_ip(ip_int): @@ -112,28 +134,21 @@ class IPUtil(object): """ sw_if_index = InterfaceUtil.get_interface_index(node, interface) - if sw_if_index: - is_ipv6 = 1 if ip_version == 'ipv6' else 0 - - cmd = 'ip_address_dump' - 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: - details = papi_exec.add(cmd, **args).get_details(err_msg) - - for item in details: - item['ip'] = item['prefix'].split('/')[0] - item['prefix_length'] = int(item['prefix'].split('/')[1]) - item['is_ipv6'] = is_ipv6 - item['netmask'] = \ - str(IPv6Network(unicode('::/{pl}'.format( - pl=item['prefix_length']))).netmask) \ - if is_ipv6 \ - else str(IPv4Network(unicode('0.0.0.0/{pl}'.format( - pl=item['prefix_length']))).netmask) + if not sw_if_index: + return list() + + cmd = u"ip_address_dump" + args = dict( + sw_if_index=sw_if_index, + is_ipv6=bool(ip_version == u"ipv6") + ) + err_msg = f"Failed to get L2FIB dump on host {node[u'host']}" + + with PapiSocketExecutor(node) as papi_exec: + details = papi_exec.add(cmd, **args).get_details(err_msg) + + # TODO: CSIT currently looks only whether the list is empty. + # Add proper value processing if values become important. return details @@ -144,26 +159,44 @@ class IPUtil(object): :param node: VPP node. :type node: dict """ + PapiSocketExecutor.run_cli_cmd(node, u"show ip fib") + PapiSocketExecutor.run_cli_cmd(node, u"show ip fib summary") + PapiSocketExecutor.run_cli_cmd(node, u"show ip6 fib") + PapiSocketExecutor.run_cli_cmd(node, u"show ip6 fib summary") + + @staticmethod + def vpp_get_ip_table_summary(node): + """Get IPv4 FIB table summary on a VPP node. + + :param node: VPP node. + :type node: dict + """ + PapiSocketExecutor.run_cli_cmd(node, u"show ip fib summary") - PapiExecutor.run_cli_cmd(node, 'show ip fib') - PapiExecutor.run_cli_cmd(node, 'show ip fib summary') - PapiExecutor.run_cli_cmd(node, 'show ip6 fib') - PapiExecutor.run_cli_cmd(node, 'show ip6 fib summary') + @staticmethod + def vpp_get_ip_table(node): + """Get IPv4 FIB table on a VPP node. + + :param node: VPP node. + :type node: dict + """ + PapiSocketExecutor.run_cli_cmd(node, u"show ip fib") @staticmethod def vpp_get_ip_tables_prefix(node, address): """Get dump of all IP FIB tables on a VPP node. :param node: VPP node. + :param address: IP address. :type node: dict + :type address: str """ - addr = ip_address(unicode(address)) + addr = ip_address(address) + ip_ver = u"ip6" if addr.version == 6 else u"ip" - PapiExecutor.run_cli_cmd( - node, 'show {ip_ver} fib {addr}/{addr_len}'.format( - ip_ver='ip6' if addr.version == 6 else 'ip', - addr=addr, - addr_len=addr.max_prefixlen)) + PapiSocketExecutor.run_cli_cmd( + node, f"show {ip_ver} fib {addr}/{addr.max_prefixlen}" + ) @staticmethod def get_interface_vrf_table(node, interface, ip_version='ipv4'): @@ -180,18 +213,17 @@ class IPUtil(object): """ sw_if_index = InterfaceUtil.get_interface_index(node, interface) - is_ipv6 = 1 if ip_version == 'ipv6' else 0 - - cmd = 'sw_interface_get_table' - args = dict(sw_if_index=sw_if_index, - is_ipv6=is_ipv6) - err_msg = 'Failed to get VRF id assigned to interface {ifc}'.format( - ifc=interface) + cmd = u"sw_interface_get_table" + args = dict( + sw_if_index=sw_if_index, + is_ipv6=bool(ip_version == u"ipv6") + ) + err_msg = f"Failed to get VRF id assigned to interface {interface}" - with PapiExecutor(node) as papi_exec: + with PapiSocketExecutor(node) as papi_exec: reply = papi_exec.add(cmd, **args).get_reply(err_msg) - return reply['vrf_id'] + return reply[u"vrf_id"] @staticmethod def vpp_ip_source_check_setup(node, if_name): @@ -202,14 +234,14 @@ class IPUtil(object): :type node: dict :type if_name: str """ - cmd = 'ip_source_check_interface_add_del' + cmd = u"ip_source_check_interface_add_del" args = dict( sw_if_index=InterfaceUtil.get_interface_index(node, if_name), is_add=1, - loose=0) - err_msg = 'Failed to enable source check on interface {ifc}'.format( - ifc=if_name) - with PapiExecutor(node) as papi_exec: + loose=0 + ) + err_msg = f"Failed to enable source check on interface {if_name}" + with PapiSocketExecutor(node) as papi_exec: papi_exec.add(cmd, **args).get_reply(err_msg) @staticmethod @@ -223,14 +255,14 @@ class IPUtil(object): :type interface: str :type addr: str """ - cmd = 'ip_probe_neighbor' + cmd = u"ip_probe_neighbor" args = dict( sw_if_index=InterfaceUtil.get_interface_index(node, interface), - dst=str(addr)) - err_msg = 'VPP ip probe {dev} {ip} failed on {h}'.format( - dev=interface, ip=addr, h=node['host']) + dst=str(addr) + ) + err_msg = f"VPP ip probe {interface} {addr} failed on {node[u'host']}" - with PapiExecutor(node) as papi_exec: + with PapiSocketExecutor(node) as papi_exec: papi_exec.add(cmd, **args).get_reply(err_msg) @staticmethod @@ -242,43 +274,41 @@ class IPUtil(object): :type ip1: str :type ip2: str """ - addr1 = ip_address(unicode(ip1)) - addr2 = ip_address(unicode(ip2)) + addr1 = ip_address(ip1) + addr2 = ip_address(ip2) if addr1 != addr2: - raise AssertionError('IP addresses are not equal: {0} != {1}'. - format(ip1, ip2)) + raise AssertionError(f"IP addresses are not equal: {ip1} != {ip2}") @staticmethod def setup_network_namespace(node, namespace_name, interface_name, - ip_addr, prefix): + ip_addr_list, prefix_length): """Setup namespace on given node and attach interface and IP to this namespace. Applicable also on TG node. :param node: VPP node. :param namespace_name: Namespace name. :param interface_name: Interface name. - :param ip_addr: IP address of namespace's interface. - :param prefix: IP address prefix length. + :param ip_addr_list: List of IP addresses of namespace's interface. + :param prefix_length: IP address prefix length. :type node: dict :type namespace_name: str :type interface_name: str - :type ip_addr: str - :type prefix: int + :type ip_addr_list: list + :type prefix_length: int """ - cmd = ('ip netns add {0}'.format(namespace_name)) - exec_cmd_no_error(node, cmd, sudo=True) + Namespaces.create_namespace(node, namespace_name) - cmd = ('ip link set dev {0} up netns {1}'.format(interface_name, - namespace_name)) + cmd = f"ip netns exec {namespace_name} ip link set {interface_name} up" exec_cmd_no_error(node, cmd, sudo=True) - cmd = ('ip netns exec {0} ip addr add {1}/{2} dev {3}'.format( - namespace_name, ip_addr, prefix, interface_name)) - exec_cmd_no_error(node, cmd, sudo=True) + for ip_addr in ip_addr_list: + cmd = f"ip netns exec {namespace_name} ip addr add " \ + f"{ip_addr}/{prefix_length} dev {interface_name}" + exec_cmd_no_error(node, cmd, sudo=True) @staticmethod - def linux_enable_forwarding(node, ip_ver='ipv4'): + def linux_enable_forwarding(node, ip_ver=u"ipv4"): """Enable forwarding on a Linux node, e.g. VM. :param node: VPP node. @@ -286,7 +316,7 @@ class IPUtil(object): :type node: dict :type ip_ver: str """ - cmd = 'sysctl -w net.{0}.ip_forward=1'.format(ip_ver) + cmd = f"sysctl -w net.{ip_ver}.ip_forward=1" exec_cmd_no_error(node, cmd, sudo=True) @staticmethod @@ -301,15 +331,16 @@ class IPUtil(object): :rtype: str :raises RuntimeError: If cannot get the information about interfaces. """ - regex_intf_info = r"pci@" \ - r"([0-9a-f]{4}:[0-9a-f]{2}:[0-9a-f]{2}.[0-9a-f])\s*" \ - r"([a-zA-Z0-9]*)\s*network" + regex_intf_info = \ + r"pci@([0-9a-f]{4}:[0-9a-f]{2}:[0-9a-f]{2}.[0-9a-f])\s" \ + r"*([a-zA-Z0-9]*)\s*network" - cmd = "lshw -class network -businfo" + cmd = u"lshw -class network -businfo" ret_code, stdout, stderr = exec_cmd(node, cmd, timeout=30, sudo=True) if ret_code != 0: - raise RuntimeError('Could not get information about interfaces:\n' - '{err}'.format(err=stderr)) + raise RuntimeError( + f"Could not get information about interfaces:\n{stderr}" + ) for line in stdout.splitlines()[2:]: try: @@ -320,21 +351,27 @@ class IPUtil(object): return None @staticmethod - def set_linux_interface_up(node, interface): + def set_linux_interface_up( + node, interface, namespace=None): """Set the specified interface up. - :param node: VPP/TG node. :param interface: Interface in namespace. + :param namespace: Execute command in namespace. Optional :type node: dict :type interface: str + :type namespace: str :raises RuntimeError: If the interface could not be set up. """ - cmd = "ip link set {0} up".format(interface) + if namespace is not None: + cmd = f"ip netns exec {namespace} ip link set dev {interface} up" + else: + cmd = f"ip link set dev {interface} up" exec_cmd_no_error(node, cmd, timeout=30, sudo=True) + @staticmethod - def set_linux_interface_ip(node, interface, ip_addr, prefix, - namespace=None): + def set_linux_interface_ip( + node, interface, ip_addr, prefix, namespace=None): """Set IP address to interface in linux. :param node: VPP/TG node. @@ -350,14 +387,71 @@ class IPUtil(object): :raises RuntimeError: IP could not be set. """ if namespace is not None: - cmd = 'ip netns exec {ns} ip addr add {ip}/{p} dev {dev}'.format( - ns=namespace, ip=ip_addr, p=prefix, dev=interface) + cmd = f"ip netns exec {namespace} ip addr add {ip_addr}/{prefix}" \ + f" dev {interface}" + else: + cmd = f"ip addr add {ip_addr}/{prefix} dev {interface}" + + exec_cmd_no_error(node, cmd, timeout=5, sudo=True) + + @staticmethod + def delete_linux_interface_ip( + node, interface, ip_addr, prefix_length, namespace=None): + """Delete IP address from interface in linux. + + :param node: VPP/TG node. + :param interface: Interface in namespace. + :param ip_addr: IP to be deleted from interface. + :param prefix_length: IP prefix length. + :param namespace: Execute command in namespace. Optional + :type node: dict + :type interface: str + :type ip_addr: str + :type prefix_length: int + :type namespace: str + :raises RuntimeError: IP could not be deleted. + """ + # TODO: Refactor command execution in namespaces into central + # methods (e.g. Namespace.exec_cmd_in_namespace) + if namespace is not None: + cmd = f"ip netns exec {namespace} ip addr del " \ + f"{ip_addr}/{prefix_length} dev {interface}" else: - cmd = 'ip addr add {ip}/{p} dev {dev}'.format( - ip=ip_addr, p=prefix, dev=interface) + cmd = f"ip addr del {ip_addr}/{prefix_length} dev {interface}" exec_cmd_no_error(node, cmd, timeout=5, sudo=True) + @staticmethod + def linux_interface_has_ip( + node, interface, ip_addr, prefix_length, namespace=None): + """Return True if interface in linux has IP address. + + :param node: VPP/TG node. + :param interface: Interface in namespace. + :param ip_addr: IP to be queried on interface. + :param prefix_length: IP prefix length. + :param namespace: Execute command in namespace. Optional + :type node: dict + :type interface: str + :type ip_addr: str + :type prefix_length: int + :type namespace: str + :rtype boolean + :raises RuntimeError: Request fails. + """ + ip_addr_with_prefix = f"{ip_addr}/{prefix_length}" + if namespace is not None: + cmd = f"ip netns exec {namespace} ip addr show dev {interface}" + else: + cmd = f"ip addr show dev {interface}" + + cmd += u" | grep 'inet ' | awk -e '{print $2}'" + cmd += f" | grep '{ip_addr_with_prefix}'" + _, stdout, _ = exec_cmd(node, cmd, timeout=5, sudo=True) + + has_ip = stdout.rstrip() + return bool(has_ip == ip_addr_with_prefix) + @staticmethod def add_linux_route(node, ip_addr, prefix, gateway, namespace=None): """Add linux route in namespace. @@ -374,15 +468,16 @@ class IPUtil(object): :type namespace: str """ if namespace is not None: - cmd = 'ip netns exec {} ip route add {}/{} via {}'.format( - namespace, ip_addr, prefix, gateway) + cmd = f"ip netns exec {namespace} ip route add {ip_addr}/{prefix}" \ + f" via {gateway}" else: - cmd = 'ip route add {}/{} via {}'.format(ip_addr, prefix, gateway) + cmd = f"ip route add {ip_addr}/{prefix} via {gateway}" + exec_cmd_no_error(node, cmd, sudo=True) @staticmethod - def vpp_interface_set_ip_address(node, interface, address, - prefix_length=None): + def vpp_interface_set_ip_address( + node, interface, address, prefix_length=None): """Set IP address to VPP interface. :param node: VPP node. @@ -394,22 +489,42 @@ class IPUtil(object): :type address: str :type prefix_length: int """ - ip_addr = ip_address(unicode(address)) + ip_addr = ip_address(address) - cmd = 'sw_interface_add_del_address' + cmd = u"sw_interface_add_del_address" args = dict( sw_if_index=InterfaceUtil.get_interface_index(node, interface), - is_add=1, - is_ipv6=1 if ip_addr.version == 6 else 0, - del_all=0, - address_length=int(prefix_length) if prefix_length else 128 - if ip_addr.version == 6 else 32, - address=ip_addr.packed) - err_msg = 'Failed to add IP address on interface {ifc}'.format( - ifc=interface) - with PapiExecutor(node) as papi_exec: + is_add=True, + del_all=False, + prefix=IPUtil.create_prefix_object( + ip_addr, + prefix_length if prefix_length else 128 + if ip_addr.version == 6 else 32 + ) + ) + err_msg = f"Failed to add IP address on interface {interface}" + + with PapiSocketExecutor(node) as papi_exec: papi_exec.add(cmd, **args).get_reply(err_msg) + @staticmethod + def vpp_interface_set_ip_addresses(node, interface, ip_addr_list, + prefix_length=None): + """Set IP addresses to VPP interface. + + :param node: VPP node. + :param interface: Interface name. + :param ip_addr_list: IP addresses. + :param prefix_length: Prefix length. + :type node: dict + :type interface: str + :type ip_addr_list: list + :type prefix_length: int + """ + for ip_addr in ip_addr_list: + IPUtil.vpp_interface_set_ip_address(node, interface, ip_addr, + prefix_length) + @staticmethod def vpp_add_ip_neighbor(node, iface_key, ip_addr, mac_address): """Add IP neighbor on DUT node. @@ -423,33 +538,41 @@ class IPUtil(object): :type ip_addr: str :type mac_address: str """ - dst_ip = ip_address(unicode(ip_addr)) + dst_ip = ip_address(ip_addr) neighbor = dict( sw_if_index=Topology.get_interface_sw_index(node, iface_key), flags=0, mac_address=str(mac_address), - ip_address=str(dst_ip)) - cmd = 'ip_neighbor_add_del' + ip_address=str(dst_ip) + ) + cmd = u"ip_neighbor_add_del" args = dict( - is_add=1, - neighbor=neighbor) - err_msg = 'Failed to add IP neighbor on interface {ifc}'.format( - ifc=iface_key) - with PapiExecutor(node) as papi_exec: + is_add=True, + neighbor=neighbor + ) + err_msg = f"Failed to add IP neighbor on interface {iface_key}" + + with PapiSocketExecutor(node) as papi_exec: papi_exec.add(cmd, **args).get_reply(err_msg) @staticmethod - def union_addr(ip_addr): - """Creates union IP address. + def create_prefix_object(ip_addr, addr_len): + """Create prefix object. :param ip_addr: IPv4 or IPv6 address. + :param addr_len: Length of IP address. :type ip_addr: IPv4Address or IPv6Address - :returns: Union IP address. + :type addr_len: int + :returns: Prefix object. :rtype: dict """ - return dict(ip6=ip_addr.packed) if ip_addr.version == 6 \ - else dict(ip4=ip_addr.packed) + addr = IPAddress.create_ip_address_object(ip_addr) + + return dict( + len=int(addr_len), + address=addr + ) @staticmethod def compose_vpp_route_structure(node, network, prefix_len, **kwargs): @@ -477,53 +600,49 @@ class IPUtil(object): :returns: route parameter basic structure :rtype: dict """ - interface = kwargs.get('interface', '') - gateway = kwargs.get('gateway', '') + interface = kwargs.get(u"interface", u"") + gateway = kwargs.get(u"gateway", u"") - net_addr = ip_address(unicode(network)) + net_addr = ip_address(network) - addr = dict( - af=getattr( - AddressFamily, 'ADDRESS_IP6' if net_addr.version == 6 - else 'ADDRESS_IP4').value, - un=None) - prefix = dict( - len=int(prefix_len), - address=addr) + prefix = IPUtil.create_prefix_object(net_addr, prefix_len) paths = list() n_hop = dict( - address=IPUtil.union_addr(ip_address(unicode(gateway))) if gateway - else 0, + address=IPAddress.union_addr(ip_address(gateway)) if gateway else 0, via_label=MPLS_LABEL_INVALID, - obj_id=Constants.BITWISE_NON_ZERO) + 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)), + table_id=int(kwargs.get(u"lookup_vrf", 0)), rpf_id=Constants.BITWISE_NON_ZERO, - weight=int(kwargs.get('weight', 1)), + weight=int(kwargs.get(u"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, + FibPathType, u"FIB_PATH_TYPE_LOCAL" + if kwargs.get(u"local", False) + else u"FIB_PATH_TYPE_NORMAL" + ).value, + flags=getattr(FibPathFlags, u"FIB_PATH_FLAG_NONE").value, proto=getattr( - FibPathNhProto, 'FIB_PATH_NH_PROTO_IP6' + FibPathNhProto, u"FIB_PATH_NH_PROTO_IP6" if net_addr.version == 6 - else 'FIB_PATH_NH_PROTO_IP4').value, + else u"FIB_PATH_NH_PROTO_IP4" + ).value, nh=n_hop, n_labels=0, - label_stack=list(0 for _ in range(16))) + label_stack=list(0 for _ in range(16)) + ) paths.append(path) route = dict( - table_id=int(kwargs.get('vrf', 0)), + table_id=int(kwargs.get(u"vrf", 0)), prefix=prefix, n_paths=len(paths), - paths=paths) - + paths=paths + ) return route @staticmethod @@ -550,47 +669,46 @@ class IPUtil(object): :type prefix_len: int :type kwargs: dict """ - count = kwargs.get("count", 1) + count = kwargs.get(u"count", 1) if count > 100: - gateway = kwargs.get("gateway", '') - interface = kwargs.get("interface", '') - vrf = kwargs.get("vrf", None) - multipath = kwargs.get("multipath", False) + gateway = kwargs.get(u"gateway", '') + interface = kwargs.get(u"interface", '') + vrf = kwargs.get(u"vrf", None) + multipath = kwargs.get(u"multipath", False) with VatTerminal(node, json_param=False) as vat: + vat.vat_terminal_exec_cmd_from_template( - 'vpp_route_add.vat', + u"vpp_route_add.vat", network=network, prefix_length=prefix_len, - via='via {}'.format(gateway) if gateway else '', - sw_if_index='sw_if_index {}'.format( - InterfaceUtil.get_interface_index(node, interface)) - if interface else '', - vrf='vrf {}'.format(vrf) if vrf else '', - count='count {}'.format(count) if count else '', - multipath='multipath' if multipath else '') + via=f"via {gateway}" if gateway else u"", + sw_if_index=f"sw_if_index " + f"{InterfaceUtil.get_interface_index(node, interface)}" + if interface else u"", + vrf=f"vrf {vrf}" if vrf else u"", + count=f"count {count}" if count else u"", + multipath=u"multipath" if multipath else u"" + ) return - net_addr = ip_address(unicode(network)) - cmd = 'ip_route_add_del' - route = IPUtil.compose_vpp_route_structure( - node, network, prefix_len, **kwargs) + net_addr = ip_address(network) + cmd = u"ip_route_add_del" args = dict( - is_add=1, - is_multipath=int(kwargs.get('multipath', False)), - route=route) - - 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)): - args['route']['prefix']['address']['un'] = \ - IPUtil.union_addr(net_addr + i) - history = False if 1 < i < kwargs.get('count', 1) else True + is_add=True, + is_multipath=kwargs.get(u"multipath", False), + route=None + ) + err_msg = f"Failed to add route(s) on host {node[u'host']}" + + with PapiSocketExecutor(node) as papi_exec: + for i in range(kwargs.get(u"count", 1)): + args[u"route"] = IPUtil.compose_vpp_route_structure( + node, net_addr + i, prefix_len, **kwargs + ) + history = bool(not 1 < i < kwargs.get(u"count", 1)) papi_exec.add(cmd, history=history, **args) - if i > 0 and i % Constants.PAPI_MAX_API_BULK == 0: - papi_exec.get_replies(err_msg) papi_exec.get_replies(err_msg) @staticmethod @@ -602,13 +720,15 @@ class IPUtil(object): :type node: dict :type interface: str """ - cmd = 'sw_interface_add_del_address' + cmd = u"sw_interface_add_del_address" args = dict( sw_if_index=InterfaceUtil.get_interface_index(node, interface), - del_all=1) - err_msg = 'Failed to flush IP address on interface {ifc}'.format( - ifc=interface) - with PapiExecutor(node) as papi_exec: + is_add=False, + del_all=True + ) + err_msg = f"Failed to flush IP address on interface {interface}" + + with PapiSocketExecutor(node) as papi_exec: papi_exec.add(cmd, **args).get_reply(err_msg) @staticmethod @@ -622,14 +742,16 @@ class IPUtil(object): :type table_id: int :type ipv6: bool """ - cmd = 'ip_table_add_del' + cmd = u"ip_table_add_del" table = dict( table_id=int(table_id), - is_ip6=int(ipv6)) + is_ip6=ipv6 + ) args = dict( table=table, - is_add=1) - err_msg = 'Failed to add FIB table on host {host}'.format( - host=node['host']) - with PapiExecutor(node) as papi_exec: + is_add=True + ) + err_msg = f"Failed to add FIB table on host {node[u'host']}" + + with PapiSocketExecutor(node) as papi_exec: papi_exec.add(cmd, **args).get_reply(err_msg)