X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FInterfaceUtil.py;h=bfc0ba7a0838fac889eb766f8d241d9507e3b7dd;hb=79f5ba9bf7656972dd988508eff9465562dde42c;hp=ad76eac4f8fbf383a539fd40ef14f5ac41fa3506;hpb=256743b509bec8dec3075d91e384b3e6bb01cf77;p=csit.git diff --git a/resources/libraries/python/InterfaceUtil.py b/resources/libraries/python/InterfaceUtil.py index ad76eac4f8..bfc0ba7a08 100644 --- a/resources/libraries/python/InterfaceUtil.py +++ b/resources/libraries/python/InterfaceUtil.py @@ -20,12 +20,12 @@ from ipaddress import ip_address from robot.api import logger from resources.libraries.python.Constants import Constants -from resources.libraries.python.CpuUtils import CpuUtils from resources.libraries.python.DUTSetup import DUTSetup +from resources.libraries.python.IPAddress import IPAddress from resources.libraries.python.L2Util import L2Util from resources.libraries.python.PapiExecutor import PapiSocketExecutor from resources.libraries.python.parsers.JsonParser import JsonParser -from resources.libraries.python.ssh import SSH, exec_cmd_no_error +from resources.libraries.python.ssh import SSH, exec_cmd, exec_cmd_no_error from resources.libraries.python.topology import NodeType, Topology from resources.libraries.python.VPPUtil import VPPUtil @@ -228,45 +228,59 @@ class InterfaceUtil: ) @staticmethod - def set_interface_ethernet_mtu(node, iface_key, mtu): - """Set Ethernet MTU for specified interface. + def set_interface_mtu(node, pf_pcis, mtu=9200): + """Set Ethernet MTU for specified interfaces. - Function can be used only for TGs. - - :param node: Node where the interface is. - :param iface_key: Interface key from topology file. - :param mtu: MTU to set. - :type node: dict - :type iface_key: str + :param node: Topology node. + :param pf_pcis: List of node's interfaces PCI addresses. + :param mtu: MTU to set. Default: 9200. + :type nodes: dict + :type pf_pcis: list :type mtu: int - :returns: Nothing. - :raises ValueError: If the node type is "DUT". - :raises ValueError: If the node has an unknown node type. + :raises RuntimeError: If failed to set MTU on interface. """ - if node[u"type"] == NodeType.DUT: - msg = f"Node {node[u'host']}: Setting Ethernet MTU for interface " \ - f"on DUT nodes not supported" - elif node[u"type"] != NodeType.TG: - msg = f"Node {node[u'host']} has unknown NodeType: {node[u'type']}" - else: - iface_name = Topology.get_interface_name(node, iface_key) - cmd = f"ip link set {iface_name} mtu {mtu}" + for pf_pci in pf_pcis: + pf_eth = InterfaceUtil.pci_to_eth(node, pf_pci) + cmd = f"ip link set {pf_eth} mtu {mtu}" exec_cmd_no_error(node, cmd, sudo=True) - return - raise ValueError(msg) @staticmethod - def set_default_ethernet_mtu_on_all_interfaces_on_node(node): - """Set default Ethernet MTU on all interfaces on node. + def set_interface_flow_control(node, pf_pcis, rx=u"off", tx=u"off"): + """Set Ethernet flow control for specified interfaces. - Function can be used only for TGs. + :param node: Topology node. + :param pf_pcis: List of node's interfaces PCI addresses. + :param rx: RX flow. Default: off. + :param tx: TX flow. Default: off. + :type nodes: dict + :type pf_pcis: list + :type rx: str + :type tx: str + """ + for pf_pci in pf_pcis: + pf_eth = InterfaceUtil.pci_to_eth(node, pf_pci) + cmd = f"ethtool -A {pf_eth} rx off tx off" + ret_code, _, _ = exec_cmd(node, cmd, sudo=True) + if int(ret_code) not in (0, 78): + raise RuntimeError("Failed to set MTU on {pf_eth}!") - :param node: Node where to set default MTU. - :type node: dict - :returns: Nothing. + + @staticmethod + def set_pci_parameter(node, pf_pcis, key, value): + """Set PCI parameter for specified interfaces. + + :param node: Topology node. + :param pf_pcis: List of node's interfaces PCI addresses. + :param key: Key to set. + :param value: Value to set. + :type nodes: dict + :type pf_pcis: list + :type key: str + :type value: str """ - for ifc in node[u"interfaces"]: - InterfaceUtil.set_interface_ethernet_mtu(node, ifc, 1500) + for pf_pci in pf_pcis: + cmd = f"setpci -s {pf_pci} {key}={value}" + exec_cmd_no_error(node, cmd, sudo=True) @staticmethod def vpp_set_interface_mtu(node, interface, mtu=9200): @@ -695,14 +709,6 @@ class InterfaceUtil: :raises ValueError: If numa node ia less than 0. :raises RuntimeError: If update of numa node failed. """ - def check_cpu_node_count(node_n, val): - val = int(val) - if val < 0: - if CpuUtils.cpu_node_count(node_n) == 1: - val = 0 - else: - raise ValueError - return val ssh = SSH() for if_key in Topology.get_node_interfaces(node): if_pci = Topology.get_interface_pci_addr(node, if_key) @@ -712,7 +718,7 @@ class InterfaceUtil: ret, out, _ = ssh.exec_command(cmd) if ret == 0: try: - numa_node = check_cpu_node_count(node, out) + numa_node = 0 if int(out) < 0 else int(out) except ValueError: logger.trace( f"Reading numa location failed for: {if_pci}" @@ -799,16 +805,16 @@ class InterfaceUtil: :raises RuntimeError: if it is unable to create VxLAN interface on the node. """ - src_address = ip_address(source_ip) - dst_address = ip_address(destination_ip) - cmd = u"vxlan_add_del_tunnel" args = dict( - is_add=1, - is_ipv6=1 if src_address.version == 6 else 0, + is_add=True, instance=Constants.BITWISE_NON_ZERO, - src_address=src_address.packed, - dst_address=dst_address.packed, + src_address=IPAddress.create_ip_address_object( + ip_address(source_ip) + ), + dst_address=IPAddress.create_ip_address_object( + ip_address(destination_ip) + ), mcast_sw_if_index=Constants.BITWISE_NON_ZERO, encap_vrf_id=0, decap_next_index=Constants.BITWISE_NON_ZERO, @@ -846,9 +852,9 @@ class InterfaceUtil: cmd = u"sw_interface_set_vxlan_bypass" args = dict( - is_ipv6=0, + is_ipv6=False, sw_if_index=sw_if_index, - enable=1 + enable=True ) err_msg = f"Failed to set VXLAN bypass on interface " \ f"on host {node[u'host']}" @@ -878,16 +884,8 @@ class InterfaceUtil: :returns: Processed vxlan interface dump. :rtype: dict """ - if vxlan_dump[u"is_ipv6"]: - vxlan_dump[u"src_address"] = \ - ip_address(vxlan_dump[u"src_address"]) - vxlan_dump[u"dst_address"] = \ - ip_address(vxlan_dump[u"dst_address"]) - else: - vxlan_dump[u"src_address"] = \ - ip_address(vxlan_dump[u"src_address"][0:4]) - vxlan_dump[u"dst_address"] = \ - ip_address(vxlan_dump[u"dst_address"][0:4]) + vxlan_dump[u"src_address"] = str(vxlan_dump[u"src_address"]) + vxlan_dump[u"dst_address"] = str(vxlan_dump[u"dst_address"]) return vxlan_dump if interface is not None: @@ -1132,16 +1130,21 @@ class InterfaceUtil: ) @staticmethod - def vpp_create_avf_interface(node, if_key, num_rx_queues=None): + def vpp_create_avf_interface( + node, if_key, num_rx_queues=None, rxq_size=0, txq_size=0): """Create AVF interface on VPP node. :param node: DUT node from topology. :param if_key: Interface key from topology file of interface to be bound to i40evf driver. :param num_rx_queues: Number of RX queues. + :param rxq_size: Size of RXQ (0 = Default API; 512 = Default VPP). + :param txq_size: Size of TXQ (0 = Default API; 512 = Default VPP). :type node: dict :type if_key: str :type num_rx_queues: int + :type rxq_size: int + :type txq_size: int :returns: AVF interface key (name) in topology. :rtype: str :raises RuntimeError: If it is not possible to create AVF interface on @@ -1157,8 +1160,8 @@ class InterfaceUtil: pci_addr=InterfaceUtil.pci_to_int(vf_pci_addr), enable_elog=0, rxq_num=int(num_rx_queues) if num_rx_queues else 0, - rxq_size=0, - txq_size=0 + rxq_size=rxq_size, + txq_size=txq_size ) err_msg = f"Failed to create AVF interface on host {node[u'host']}" with PapiSocketExecutor(node) as papi_exec: @@ -1173,32 +1176,41 @@ class InterfaceUtil: @staticmethod def vpp_create_rdma_interface( - node, if_key, num_rx_queues=None, mode=u"auto"): + node, if_key, num_rx_queues=None, rxq_size=0, txq_size=0, + mode=u"auto"): """Create RDMA interface on VPP node. :param node: DUT node from topology. :param if_key: Physical interface key from topology file of interface to be bound to rdma-core driver. :param num_rx_queues: Number of RX queues. + :param rxq_size: Size of RXQ (0 = Default API; 512 = Default VPP). + :param txq_size: Size of TXQ (0 = Default API; 512 = Default VPP). :param mode: RDMA interface mode - auto/ibv/dv. :type node: dict :type if_key: str :type num_rx_queues: int + :type rxq_size: int + :type txq_size: int :type mode: str :returns: Interface key (name) in topology file. :rtype: str :raises RuntimeError: If it is not possible to create RDMA interface on the node. """ + PapiSocketExecutor.run_cli_cmd( + node, u"set logging class rdma level debug" + ) + cmd = u"rdma_create" pci_addr = Topology.get_interface_pci_addr(node, if_key) args = dict( name=InterfaceUtil.pci_to_eth(node, pci_addr), host_if=InterfaceUtil.pci_to_eth(node, pci_addr), rxq_num=int(num_rx_queues) if num_rx_queues else 0, - rxq_size=1024, - txq_size=1024, - mode=getattr(RdmaMode,f"RDMA_API_MODE_{mode.upper()}").value, + rxq_size=rxq_size, + txq_size=txq_size, + mode=getattr(RdmaMode, f"RDMA_API_MODE_{mode.upper()}").value, ) err_msg = f"Failed to create RDMA interface on host {node[u'host']}" with PapiSocketExecutor(node) as papi_exec: