X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=resources%2Flibraries%2Fpython%2FIPUtil.py;h=6a8e1a240179990a7070cd6350231b4d0e3b5198;hb=refs%2Fchanges%2F70%2F20170%2F50;hp=b78450a9f8c110aebb11fc0e347de73f59a17c29;hpb=56c1c013bd0d632256efa4cb6b0224bf9c608afa;p=csit.git diff --git a/resources/libraries/python/IPUtil.py b/resources/libraries/python/IPUtil.py index b78450a9f8..6a8e1a2401 100644 --- a/resources/libraries/python/IPUtil.py +++ b/resources/libraries/python/IPUtil.py @@ -15,17 +15,15 @@ import re -from socket import AF_INET, AF_INET6, inet_pton - from enum import IntEnum -from ipaddress import ip_address -from ipaddress import IPv4Network, IPv6Network +from ipaddress import ip_address, 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 Topology +from resources.libraries.python.VatExecutor import VatTerminal # from vpp/src/vnet/vnet/mpls/mpls_types.h @@ -114,34 +112,58 @@ class IPUtil(object): """ sw_if_index = InterfaceUtil.get_interface_index(node, interface) - data = list() 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'] = \ + 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[cmd_reply]['prefix_length']))).netmask) \ + pl=item['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]) + pl=item['prefix_length']))).netmask) + + return details + + @staticmethod + def vpp_get_ip_tables(node): + """Get dump of all IP FIB tables on a VPP node. + + :param node: VPP node. + :type node: dict + """ + + 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_tables_prefix(node, address): + """Get dump of all IP FIB tables on a VPP node. + + :param node: VPP node. + :type node: dict + """ + addr = ip_address(unicode(address)) - return data + 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)) @staticmethod def get_interface_vrf_table(node, interface, ip_version='ipv4'): @@ -167,10 +189,9 @@ class IPUtil(object): ifc=interface) with PapiExecutor(node) as papi_exec: - papi_resp = papi_exec.add(cmd, **args).get_replies(err_msg). \ - verify_reply(err_msg=err_msg) + reply = papi_exec.add(cmd, **args).get_reply(err_msg) - return papi_resp['vrf_id'] + return reply['vrf_id'] @staticmethod def vpp_ip_source_check_setup(node, if_name): @@ -189,8 +210,7 @@ class IPUtil(object): err_msg = 'Failed to enable source check on interface {ifc}'.format( ifc=if_name) with PapiExecutor(node) as papi_exec: - papi_exec.add(cmd, **args).get_replies(err_msg). \ - verify_reply(err_msg=err_msg) + papi_exec.add(cmd, **args).get_reply(err_msg) @staticmethod def vpp_ip_probe(node, interface, addr): @@ -204,7 +224,6 @@ class IPUtil(object): :type addr: str """ cmd = 'ip_probe_neighbor' - cmd_reply = 'proxy_arp_intfc_enable_disable_reply' args = dict( sw_if_index=InterfaceUtil.get_interface_index(node, interface), dst=str(addr)) @@ -212,8 +231,7 @@ class IPUtil(object): dev=interface, ip=addr, h=node['host']) with PapiExecutor(node) as papi_exec: - papi_exec.add(cmd, **args).get_replies(err_msg). \ - verify_reply(cmd_reply=cmd_reply, err_msg=err_msg) + papi_exec.add(cmd, **args).get_reply(err_msg) @staticmethod def ip_addresses_should_be_equal(ip1, ip2): @@ -386,13 +404,11 @@ class IPUtil(object): del_all=0, address_length=int(prefix_length) if prefix_length else 128 if ip_addr.version == 6 else 32, - address=inet_pton( - AF_INET6 if ip_addr.version == 6 else AF_INET, str(ip_addr))) + address=ip_addr.packed) err_msg = 'Failed to add IP address on interface {ifc}'.format( ifc=interface) with PapiExecutor(node) as papi_exec: - papi_exec.add(cmd, **args).get_replies(err_msg). \ - verify_reply(err_msg=err_msg) + papi_exec.add(cmd, **args).get_reply(err_msg) @staticmethod def vpp_add_ip_neighbor(node, iface_key, ip_addr, mac_address): @@ -421,12 +437,23 @@ class IPUtil(object): err_msg = 'Failed to add IP neighbor on interface {ifc}'.format( ifc=iface_key) with PapiExecutor(node) as papi_exec: - papi_exec.add(cmd, **args).get_replies(err_msg). \ - verify_reply(err_msg=err_msg) + papi_exec.add(cmd, **args).get_reply(err_msg) @staticmethod - def vpp_route_add(node, network, prefix_len, **kwargs): - """Add route to the VPP node. + 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=ip_addr.packed) if ip_addr.version == 6 \ + else dict(ip4=ip_addr.packed) + + @staticmethod + def compose_vpp_route_structure(node, network, prefix_len, **kwargs): + """Create route object for ip_route_add_del api call. :param node: VPP node. :param network: Route destination network address. @@ -447,33 +474,27 @@ class IPUtil(object): :type network: str :type prefix_len: int :type kwargs: dict + :returns: route parameter basic structure + :rtype: dict """ 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)) + else 'ADDRESS_IP4').value, + un=None) + prefix = dict( + len=int(prefix_len), + address=addr) paths = list() n_hop = dict( - address=union_addr(ip_address(unicode(gateway))) if gateway else 0, + address=IPUtil.union_addr(ip_address(unicode(gateway))) if gateway + else 0, via_label=MPLS_LABEL_INVALID, obj_id=Constants.BITWISE_NON_ZERO) path = dict( @@ -499,26 +520,78 @@ class IPUtil(object): route = dict( table_id=int(kwargs.get('vrf', 0)), + prefix=prefix, n_paths=len(paths), paths=paths) + + return route + + @staticmethod + def vpp_route_add(node, network, prefix_len, **kwargs): + """Add route to the VPP node. + + :param node: VPP node. + :param network: Route destination network address. + :param prefix_len: Route destination network prefix length. + :param kwargs: Optional key-value arguments: + + gateway: Route gateway address. (str) + interface: Route interface. (str) + vrf: VRF table ID. (int) + count: number of IP addresses to add starting from network IP (int) + local: The route is local with same prefix (increment is 1). + If None, then is not used. (bool) + lookup_vrf: VRF table ID for lookup. (int) + multipath: Enable multipath routing. (bool) + weight: Weight value for unequal cost multipath routing. (int) + + :type node: dict + :type network: str + :type prefix_len: int + :type kwargs: dict + """ + count = kwargs.get("count", 1) + + if count > 100: + gateway = kwargs.get("gateway", '') + interface = kwargs.get("interface", '') + vrf = kwargs.get("vrf", None) + multipath = kwargs.get("multipath", False) + + with VatTerminal(node, json_param=False) as vat: + vat.vat_terminal_exec_cmd_from_template( + '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 '') + return + + net_addr = ip_address(unicode(network)) cmd = 'ip_route_add_del' + route = IPUtil.compose_vpp_route_structure( + node, network, prefix_len, **kwargs) args = dict( is_add=1, - is_multipath=int(kwargs.get('multipath', False))) + 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)): - addr['un'] = union_addr(net_addr + i) - prefix['address'] = addr - route['prefix'] = prefix + args['route']['prefix']['address']['un'] = \ + IPUtil.union_addr(net_addr + i) history = False if 1 < i < kwargs.get('count', 1) else True - papi_exec.add(cmd, history=history, route=route, **args) + papi_exec.add(cmd, history=history, **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) + papi_exec.get_replies(err_msg) + papi_exec.get_replies(err_msg) @staticmethod def flush_ip_addresses(node, interface): @@ -536,8 +609,7 @@ class IPUtil(object): err_msg = 'Failed to flush IP address on interface {ifc}'.format( ifc=interface) with PapiExecutor(node) as papi_exec: - papi_exec.add(cmd, **args).get_replies(err_msg). \ - verify_reply(err_msg=err_msg) + papi_exec.add(cmd, **args).get_reply(err_msg) @staticmethod def add_fib_table(node, table_id, ipv6=False): @@ -560,5 +632,4 @@ class IPUtil(object): err_msg = 'Failed to add FIB table on host {host}'.format( host=node['host']) with PapiExecutor(node) as papi_exec: - papi_exec.add(cmd, **args).get_replies(err_msg). \ - verify_reply(err_msg=err_msg) + papi_exec.add(cmd, **args).get_reply(err_msg)