diff options
36 files changed, 831 insertions, 1082 deletions
diff --git a/fdio.infra.ansible/inventories/lf_inventory/hosts b/fdio.infra.ansible/inventories/lf_inventory/hosts index 6f75cf80f9..288fe98e77 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/hosts +++ b/fdio.infra.ansible/inventories/lf_inventory/hosts @@ -15,7 +15,7 @@ all: 10.30.51.82: #s82-t212-tg1 - icelake 10.30.51.84: #s84-t213-tg1 - icelake 10.30.51.86: #s86-t214-tg1 - icelake - 10.30.51.88: #s88-t215-tg1 - octeon + 10.30.51.88: #s88-t215-tg1 - icelake-octeon 10.30.51.89: #s89-t39t310-tg1 - cascadelake 10.30.51.90: #s90-t31t32-tg1 - icelake 10.30.51.61: #s61-t210-tg1 - epyc diff --git a/fdio.infra.terraform/terraform-aws-1n-aws-c5n/topology-1n-aws-c5n.tftpl b/fdio.infra.terraform/terraform-aws-1n-aws-c5n/topology-1n-aws-c5n.tftpl index 9233b7852b..22b60b3184 100644 --- a/fdio.infra.terraform/terraform-aws-1n-aws-c5n/topology-1n-aws-c5n.tftpl +++ b/fdio.infra.terraform/terraform-aws-1n-aws-c5n/topology-1n-aws-c5n.tftpl @@ -10,6 +10,7 @@ nodes: TG: type: TG subtype: TREX + model: AWS host: "${tg_public_ip}" arch: x86_64 port: 6001 diff --git a/fdio.infra.terraform/terraform-aws-1n-c6in/topology-1n-c6in.tftpl b/fdio.infra.terraform/terraform-aws-1n-c6in/topology-1n-c6in.tftpl index 148be5c077..f5eb247687 100644 --- a/fdio.infra.terraform/terraform-aws-1n-c6in/topology-1n-c6in.tftpl +++ b/fdio.infra.terraform/terraform-aws-1n-c6in/topology-1n-c6in.tftpl @@ -10,6 +10,7 @@ nodes: TG: type: TG subtype: TREX + model: AWS host: "${tg_public_ip}" arch: x86_64 port: 6001 diff --git a/fdio.infra.terraform/terraform-aws-2n-aws-c5n/topology-2n-aws-c5n.tftpl b/fdio.infra.terraform/terraform-aws-2n-aws-c5n/topology-2n-aws-c5n.tftpl index ccd40d5f95..9673380e1d 100644 --- a/fdio.infra.terraform/terraform-aws-2n-aws-c5n/topology-2n-aws-c5n.tftpl +++ b/fdio.infra.terraform/terraform-aws-2n-aws-c5n/topology-2n-aws-c5n.tftpl @@ -10,6 +10,7 @@ nodes: TG: type: TG subtype: TREX + model: AWS host: "${tg_public_ip}" arch: x86_64 port: 6001 @@ -30,6 +31,7 @@ nodes: model: Amazon-Nitro-50G DUT1: type: DUT + model: AWS host: ${dut1_public_ip} arch: x86_64 port: 22 diff --git a/fdio.infra.terraform/terraform-aws-2n-c6in/topology-2n-c6in.tftpl b/fdio.infra.terraform/terraform-aws-2n-c6in/topology-2n-c6in.tftpl index c5d1d0cdae..cfef304b2c 100644 --- a/fdio.infra.terraform/terraform-aws-2n-c6in/topology-2n-c6in.tftpl +++ b/fdio.infra.terraform/terraform-aws-2n-c6in/topology-2n-c6in.tftpl @@ -10,6 +10,7 @@ nodes: TG: type: TG subtype: TREX + model: AWS host: "${tg_public_ip}" arch: x86_64 port: 6001 @@ -30,6 +31,7 @@ nodes: model: Amazon-Nitro-200G DUT1: type: DUT + model: AWS host: ${dut1_public_ip} arch: x86_64 port: 22 diff --git a/fdio.infra.terraform/terraform-aws-2n-c7gn/topology-2n-c7gn.tftpl b/fdio.infra.terraform/terraform-aws-2n-c7gn/topology-2n-c7gn.tftpl index 986157dc48..50a61ccb99 100644 --- a/fdio.infra.terraform/terraform-aws-2n-c7gn/topology-2n-c7gn.tftpl +++ b/fdio.infra.terraform/terraform-aws-2n-c7gn/topology-2n-c7gn.tftpl @@ -10,6 +10,7 @@ nodes: TG: type: TG subtype: TREX + model: AWS host: "${tg_public_ip}" arch: x86_64 port: 6001 @@ -30,6 +31,7 @@ nodes: model: Amazon-Nitro-100G DUT1: type: DUT + model: AWS host: "${dut1_public_ip}" arch: x86_64 port: 22 diff --git a/resources/libraries/python/topology.py b/resources/libraries/python/topology.py index 22ed3666c3..5a3dc2ae6f 100644 --- a/resources/libraries/python/topology.py +++ b/resources/libraries/python/topology.py @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Cisco and/or its affiliates. +# Copyright (c) 2025 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: @@ -25,7 +25,7 @@ from robot.libraries.BuiltIn import BuiltIn, RobotNotRunningError from resources.libraries.python.Constants import Constants __all__ = [ - u"DICT__nodes", u"Topology", u"NodeType", u"SocketType", u"NodeSubTypeTG" + "DICT__nodes", "Topology", "NodeType", "SocketType", "NodeSubTypeTG" ] @@ -35,44 +35,44 @@ def load_topo_from_yaml(): :returns: Nodes from loaded topology. """ try: - topo_path = BuiltIn().get_variable_value(u"${TOPOLOGY_PATH}") + topo_path = BuiltIn().get_variable_value("${TOPOLOGY_PATH}") except RobotNotRunningError: - return '' + return "" with open(topo_path) as work_file: - return safe_load(work_file.read())[u"nodes"] + return safe_load(work_file.read())["nodes"] class NodeType: """Defines node types used in topology dictionaries.""" # Device Under Test (this node has VPP running on it) - DUT = u"DUT" + DUT = "DUT" # Traffic Generator (this node has traffic generator on it) # pylint: disable=invalid-name - TG = u"TG" + TG = "TG" # Virtual Machine (this node running on DUT node) # pylint: disable=invalid-name - VM = u"VM" + VM = "VM" class NodeSubTypeTG: """Defines node sub-type TG - traffic generator.""" # T-Rex traffic generator - TREX = u"TREX" + TREX = "TREX" # Moongen - MOONGEN = u"MOONGEN" + MOONGEN = "MOONGEN" # IxNetwork - IXNET = u"IXNET" + IXNET = "IXNET" class SocketType: """Defines socket types used in topology dictionaries.""" # VPP Socket PAPI - PAPI = u"PAPI" + PAPI = "PAPI" # VPP PAPI Stats (legacy option until stats are migrated to Socket PAPI) - STATS = u"STATS" + STATS = "STATS" # VPP Socket CLI - CLI = u"CLI" + CLI = "CLI" DICT__nodes = load_topo_from_yaml() @@ -112,8 +112,8 @@ class Topology: if path[0] not in node: node[path[0]] = dict() elif isinstance(node[path[0]], str): - node[path[0]] = dict() if node[path[0]] == u"" \ - else {node[path[0]]: u""} + node[path[0]] = dict() if node[path[0]] == "" \ + else {node[path[0]]: ""} Topology.add_node_item(node[path[0]], value, path[1:]) @staticmethod @@ -130,9 +130,9 @@ class Topology: max_ports = 1000000 iface = None for i in range(1, max_ports): - if node[u"interfaces"].get(str(ptype) + str(i)) is None: + if node["interfaces"].get(str(ptype) + str(i)) is None: iface = str(ptype) + str(i) - node[u"interfaces"][iface] = dict() + node["interfaces"][iface] = dict() break return iface @@ -147,7 +147,7 @@ class Topology: :returns: Nothing """ try: - node[u"interfaces"].pop(iface_key) + node["interfaces"].pop(iface_key) except KeyError: pass @@ -161,9 +161,9 @@ class Topology: :type ptype: str :returns: Nothing """ - for if_key in list(node[u"interfaces"]): + for if_key in list(node["interfaces"]): if if_key.startswith(str(ptype)): - node[u"interfaces"].pop(if_key) + node["interfaces"].pop(if_key) @staticmethod def remove_all_added_ports_on_all_duts_from_topology(nodes): @@ -174,14 +174,14 @@ class Topology: :returns: Nothing """ port_types = ( - u"subinterface", u"vlan_subif", u"memif", u"tap", u"vhost", - u"loopback", u"gre_tunnel", u"vxlan_tunnel", u"eth_bond", - u"eth_avf", u"eth_rdma", u"geneve_tunnel", u"eth_af_xdp", - u"gtpu_tunnel" + "subinterface", "vlan_subif", "memif", "tap", "vhost", + "loopback", "gre_tunnel", "vxlan_tunnel", "eth_bond", + "eth_avf", "eth_rdma", "geneve_tunnel", "eth_af_xdp", + "gtpu_tunnel" ) for node_data in nodes.values(): - if node_data[u"type"] == NodeType.DUT: + if node_data["type"] == NodeType.DUT: for ptype in port_types: Topology.remove_all_ports(node_data, ptype) @@ -194,9 +194,9 @@ class Topology: :returns: Nothing """ reg_ex = re.compile(r"port\d+_vif\d+") - for if_key in list(node[u"interfaces"]): + for if_key in list(node["interfaces"]): if re.match(reg_ex, if_key): - node[u"interfaces"].pop(if_key) + node["interfaces"].pop(if_key) @staticmethod def remove_all_added_vif_ports_on_all_duts_from_topology(nodes): @@ -208,7 +208,7 @@ class Topology: :returns: Nothing """ for node_data in nodes.values(): - if node_data[u"type"] == NodeType.DUT: + if node_data["type"] == NodeType.DUT: Topology.remove_all_vif_ports(node_data) @staticmethod @@ -222,7 +222,7 @@ class Topology: :type iface_key: str :type sw_if_index: int """ - node[u"interfaces"][iface_key][u"vpp_sw_index"] = int(sw_if_index) + node["interfaces"][iface_key]["vpp_sw_index"] = int(sw_if_index) @staticmethod def update_interface_name(node, iface_key, name): @@ -235,7 +235,7 @@ class Topology: :type iface_key: str :type name: str """ - node[u"interfaces"][iface_key][u"name"] = str(name) + node["interfaces"][iface_key]["name"] = str(name) @staticmethod def update_interface_mac_address(node, iface_key, mac_address): @@ -248,7 +248,7 @@ class Topology: :type iface_key: str :type mac_address: str """ - node[u"interfaces"][iface_key][u"mac_address"] = str(mac_address) + node["interfaces"][iface_key]["mac_address"] = str(mac_address) @staticmethod def update_interface_pci_address(node, iface_key, pci_address): @@ -261,7 +261,7 @@ class Topology: :type iface_key: str :type pci_address: str """ - node[u"interfaces"][iface_key][u"pci_address"] = str(pci_address) + node["interfaces"][iface_key]["pci_address"] = str(pci_address) @staticmethod def update_interface_vlan(node, iface_key, vlan): @@ -274,7 +274,7 @@ class Topology: :type iface_key: str :type vlan: str """ - node[u"interfaces"][iface_key][u"vlan"] = int(vlan) + node["interfaces"][iface_key]["vlan"] = int(vlan) @staticmethod def update_interface_vhost_socket(node, iface_key, vhost_socket): @@ -287,7 +287,7 @@ class Topology: :type iface_key: str :type vhost_socket: str """ - node[u"interfaces"][iface_key][u"vhost_socket"] = str(vhost_socket) + node["interfaces"][iface_key]["vhost_socket"] = str(vhost_socket) @staticmethod def update_interface_memif_socket(node, iface_key, memif_socket): @@ -300,7 +300,7 @@ class Topology: :type iface_key: str :type memif_socket: str """ - node[u"interfaces"][iface_key][u"memif_socket"] = str(memif_socket) + node["interfaces"][iface_key]["memif_socket"] = str(memif_socket) @staticmethod def update_interface_memif_id(node, iface_key, memif_id): @@ -313,7 +313,7 @@ class Topology: :type iface_key: str :type memif_id: str """ - node[u"interfaces"][iface_key][u"memif_id"] = str(memif_id) + node["interfaces"][iface_key]["memif_id"] = str(memif_id) @staticmethod def update_interface_memif_role(node, iface_key, memif_role): @@ -326,7 +326,7 @@ class Topology: :type iface_key: str :type memif_role: str """ - node[u"interfaces"][iface_key][u"memif_role"] = str(memif_role) + node["interfaces"][iface_key]["memif_role"] = str(memif_role) @staticmethod def update_interface_tap_dev_name(node, iface_key, dev_name): @@ -340,7 +340,7 @@ class Topology: :type dev_name: str :returns: Nothing """ - node[u"interfaces"][iface_key][u"dev_name"] = str(dev_name) + node["interfaces"][iface_key]["dev_name"] = str(dev_name) @staticmethod def get_node_by_hostname(nodes, hostname): @@ -353,7 +353,7 @@ class Topology: :returns: Node dictionary or None if not found. """ for node in nodes.values(): - if node[u"host"] == hostname: + if node["host"] == hostname: return node return None @@ -370,8 +370,8 @@ class Topology: links = list() for node in nodes.values(): - for interface in node[u"interfaces"].values(): - link = interface.get(u"link") + for interface in node["interfaces"].values(): + link = interface.get("link") if link is not None: if link not in links: links.append(link) @@ -395,7 +395,7 @@ class Topology: :returns: Interface key from topology file :rtype: string """ - interfaces = node[u"interfaces"] + interfaces = node["interfaces"] retval = None for if_key, if_val in interfaces.items(): k_val = if_val.get(key) @@ -422,7 +422,7 @@ class Topology: :returns: Interface key. :rtype: str """ - return Topology._get_interface_by_key_value(node, u"name", iface_name) + return Topology._get_interface_by_key_value(node, "name", iface_name) @staticmethod def get_interface_by_link_name(node, link_name, subsequent=False): @@ -442,7 +442,7 @@ class Topology: :rtype: str """ return Topology._get_interface_by_key_value( - node, u"link", link_name, subsequent=subsequent + node, "link", link_name, subsequent=subsequent ) def get_interfaces_by_link_names(self, node, link_names): @@ -485,7 +485,7 @@ class Topology: :rtype: str """ return Topology._get_interface_by_key_value( - node, u"vpp_sw_index", sw_if_index + node, "vpp_sw_index", sw_if_index ) @staticmethod @@ -501,7 +501,7 @@ class Topology: """ try: if isinstance(iface_key, str): - return node[u"interfaces"][iface_key].get(u"vpp_sw_index") + return node["interfaces"][iface_key].get("vpp_sw_index") # TODO: use only iface_key, do not use integer return int(iface_key) except (KeyError, ValueError): @@ -520,9 +520,9 @@ class Topology: """ try: if not isinstance(iface_name, str): - raise TypeError(u"Interface name must be a string.") + raise TypeError("Interface name must be a string.") iface_key = Topology.get_interface_by_name(node, iface_name) - return node[u"interfaces"][iface_key].get(u"vpp_sw_index") + return node["interfaces"][iface_key].get("vpp_sw_index") except (KeyError, ValueError): return None @@ -539,7 +539,7 @@ class Topology: :rtype: int """ try: - return node[u"interfaces"][iface_key].get(u"mtu") + return node["interfaces"][iface_key].get("mt") except KeyError: return None @@ -556,90 +556,11 @@ class Topology: :rtype: str """ try: - return node[u"interfaces"][iface_key].get(u"name") + return node["interfaces"][iface_key].get("name") except KeyError: return None @staticmethod - def convert_interface_reference_to_key(node, interface): - """Takes interface reference in any format - (name, link name, interface key or sw_if_index) - and converts to interface key using Topology methods. - - :param node: Node in topology. - :param interface: Name, sw_if_index, link name or key of an interface - on the node. - :type node: dict - :type interface: str or int - - :returns: Interface key. - :rtype: str - - :raises TypeError: If provided with invalid interface argument. - :raises RuntimeError: If the interface does not exist in topology. - """ - - if isinstance(interface, int): - key = Topology.get_interface_by_sw_index(node, interface) - if key is None: - raise RuntimeError( - f"Interface with sw_if_index={interface} does not exist " - f"in topology." - ) - elif interface in Topology.get_node_interfaces(node): - key = interface - elif interface in Topology.get_links({u"dut": node}): - key = Topology.get_interface_by_link_name(node, interface) - elif isinstance(interface, str): - key = Topology.get_interface_by_name(node, interface) - if key is None: - raise RuntimeError( - f"Interface with key, name or link name \"{interface}\" " - f"does not exist in topology." - ) - else: - raise TypeError( - u"Type of interface argument must be integer or string." - ) - return key - - @staticmethod - def convert_interface_reference(node, interface, wanted_format): - """Takes interface reference in any format - (name, link name, topology key or sw_if_index) and returns - its equivalent in the desired format. - - :param node: Node in topology. - :param interface: Name, sw_if_index, link name or key of an interface - on the node. - :param wanted_format: Format of return value wanted. - Valid options are: sw_if_index, key, name. - :type node: dict - :type interface: str or int - :type wanted_format: str - :returns: Interface name, interface key or sw_if_index. - :rtype: str or int - :raises TypeError, ValueError: If provided with invalid arguments. - :raises RuntimeError: If the interface does not exist in topology. - """ - - key = Topology.convert_interface_reference_to_key(node, interface) - - conversions = { - u"key": lambda x, y: y, - u"name": Topology.get_interface_name, - u"sw_if_index": Topology.get_interface_sw_index - } - - try: - return conversions[wanted_format](node, key) - except KeyError: - raise ValueError( - f"Unrecognized return value wanted: {wanted_format}." - f"Valid options are key, name, sw_if_index" - ) - - @staticmethod def get_interface_numa_node(node, iface_key): """Get interface numa node. @@ -653,7 +574,7 @@ class Topology: :rtype: int """ try: - return node[u"interfaces"][iface_key].get(u"numa_node") + return node["interfaces"][iface_key].get("numa_node") except KeyError: return None @@ -678,7 +599,7 @@ class Topology: numa_list = [] for if_key in iface_keys: try: - numa_list.append(node[u"interfaces"][if_key].get(u"numa_node")) + numa_list.append(node["interfaces"][if_key].get("numa_node")) except KeyError: pass @@ -701,7 +622,7 @@ class Topology: :returns: Return MAC or None if not found. """ try: - return node[u"interfaces"][iface_key].get(u"mac_address") + return node["interfaces"][iface_key].get("mac_address") except KeyError: return None @@ -716,7 +637,7 @@ class Topology: :returns: Return IP4 or None if not found. """ try: - return node[u"interfaces"][iface_key].get(u"ip4_address") + return node["interfaces"][iface_key].get("ip4_address") except KeyError: return None @@ -733,7 +654,7 @@ class Topology: :rtype: int :raises: KeyError if iface_key is not found. """ - return node[u"interfaces"][iface_key].get(u"ip4_prefix_length", \ + return node["interfaces"][iface_key].get("ip4_prefix_length", \ Constants.DEFAULT_IP4_PREFIX_LENGTH) @staticmethod @@ -753,11 +674,11 @@ class Topology: """ link_name = None # get link name where the interface belongs to - for if_key, if_val in node[u"interfaces"].items(): - if if_key == u"mgmt": + for if_key, if_val in node["interfaces"].items(): + if if_key == "mgmt": continue if if_key == iface_key: - link_name = if_val[u"link"] + link_name = if_val["link"] break if link_name is None: @@ -766,15 +687,15 @@ class Topology: # find link for node_data in nodes_info.values(): # skip self - l_hash = node_data[u"host"]+str(node_data[u"port"]) - r_hash = node[u"host"]+str(node[u"port"]) + l_hash = node_data["host"]+str(node_data["port"]) + r_hash = node["host"]+str(node["port"]) if l_hash == r_hash: continue for if_key, if_val \ - in node_data[u"interfaces"].items(): - if u"link" not in if_val: + in node_data["interfaces"].items(): + if "link" not in if_val: continue - if if_val[u"link"] == link_name: + if if_val["link"] == link_name: return node_data, if_key return None @@ -789,7 +710,7 @@ class Topology: :returns: Return PCI address or None if not found. """ try: - return node[u"interfaces"][iface_key].get(u"pci_address") + return node["interfaces"][iface_key].get("pci_address") except KeyError: return None @@ -804,7 +725,7 @@ class Topology: :returns: Return interface driver or None if not found. """ try: - return node[u"interfaces"][iface_key].get(u"driver") + return node["interfaces"][iface_key].get("driver") except KeyError: return None @@ -819,7 +740,7 @@ class Topology: :returns: Return interface vlan or None if not found. """ try: - return node[u"interfaces"][iface_key].get(u"vlan") + return node["interfaces"][iface_key].get("vlan") except KeyError: return None @@ -832,7 +753,7 @@ class Topology: :returns: Return list of keys of all interfaces. :rtype: list """ - return node[u"interfaces"].keys() + return node["interfaces"].keys() @staticmethod def get_node_link_mac(node, link_name): @@ -845,9 +766,9 @@ class Topology: :returns: MAC address string. :rtype: str """ - for port in node[u"interfaces"].values(): - if port.get(u"link") == link_name: - return port.get(u"mac_address") + for port in node["interfaces"].values(): + if port.get("link") == link_name: + return port.get("mac_address") return None @staticmethod @@ -863,20 +784,20 @@ class Topology: :returns: List of link names occupied by the node. :rtype: None or list of string """ - interfaces = node[u"interfaces"] + interfaces = node["interfaces"] link_names = [] for interface in interfaces.values(): - if u"link" in interface: - if (filter_list is not None) and (u"model" in interface): + if "link" in interface: + if (filter_list is not None) and ("model" in interface): for filt in filter_list: - if filt == interface[u"model"]: - link_names.append(interface[u"link"]) - elif (filter_list is not None) and (u"model" not in interface): + if filt == interface["model"]: + link_names.append(interface["link"]) + elif (filter_list is not None) and ("model" not in interface): logger.trace( f"Cannot apply filter on interface: {str(interface)}" ) else: - link_names.append(interface[u"link"]) + link_names.append(interface["link"]) if not link_names: link_names = None if not topo_has_dut: @@ -884,7 +805,7 @@ class Topology: for link_name in link_names: count = 0 for interface in interfaces.values(): - link = interface.get(u"link", None) + link = interface.get("link", None) if link == link_name: count += 1 if count == 2: @@ -924,9 +845,9 @@ class Topology: connecting_links = None if node1_links is None: - logger.error(u"Unable to find active links for node1") + logger.error("Unable to find active links for node1") elif node2_links is None: - logger.error(u"Unable to find active links for node2") + logger.error("Unable to find active links for node2") else: # Not using set operations, as we need deterministic order. connecting_links = [ @@ -948,7 +869,7 @@ class Topology: """ connecting_links = self.get_active_connecting_links(node1, node2) if not connecting_links: - raise RuntimeError(u"No links connecting the nodes were found") + raise RuntimeError("No links connecting the nodes were found") return connecting_links[0] def get_egress_interfaces_name_for_nodes(self, node1, node2): @@ -964,14 +885,14 @@ class Topology: interfaces = list() links = self.get_active_connecting_links(node1, node2) if not links: - raise RuntimeError(u"No link between nodes") - for interface in node1[u"interfaces"].values(): - link = interface.get(u"link") + raise RuntimeError("No link between nodes") + for interface in node1["interfaces"].values(): + link = interface.get("link") if link is None: continue if link in links: continue - name = interface.get(u"name") + name = interface.get("name") if name is None: continue interfaces.append(name) @@ -989,7 +910,7 @@ class Topology: """ interfaces = self.get_egress_interfaces_name_for_nodes(node1, node2) if not interfaces: - raise RuntimeError(u"No egress interface for nodes") + raise RuntimeError("No egress interface for nodes") return interfaces[0] def get_links_dict_from_nodes(self, tgen, dut1, dut2): @@ -1026,12 +947,12 @@ class Topology: dut1_bd_links = [dut1_dut2_link, dut1_tg_link] dut2_bd_links = [dut1_dut2_link, dut2_tg_link] topology_links = { - u"DUT1_DUT2_LINK": dut1_dut2_link, - u"DUT1_TG_LINK": dut1_tg_link, - u"DUT2_TG_LINK": dut2_tg_link, - u"TG_TRAFFIC_LINKS": tg_traffic_links, - u"DUT1_BD_LINKS": dut1_bd_links, - u"DUT2_BD_LINKS": dut2_bd_links + "DUT1_DUT2_LINK": dut1_dut2_link, + "DUT1_TG_LINK": dut1_tg_link, + "DUT2_TG_LINK": dut2_tg_link, + "TG_TRAFFIC_LINKS": tg_traffic_links, + "DUT1_BD_LINKS": dut1_bd_links, + "DUT2_BD_LINKS": dut2_bd_links } return topology_links @@ -1044,7 +965,7 @@ class Topology: :returns: True if node is type of TG, otherwise False. :rtype: bool """ - return node[u"type"] == NodeType.TG + return node["type"] == NodeType.TG @staticmethod def get_node_hostname(node): @@ -1055,7 +976,7 @@ class Topology: :returns: Hostname or IP address. :rtype: str """ - return node[u"host"] + return node["host"] @staticmethod def get_node_arch(node): @@ -1068,10 +989,24 @@ class Topology: :rtype: str """ try: - return node[u"arch"] + return node["arch"] except KeyError: - node[u"arch"] = u"x86_64" - return u"x86_64" + node["arch"] = "x86_64" + return "x86_64" + + @staticmethod + def get_node_model(node): + """Get node model (vendor/type). + + :param node: Node to get model (vendor/type) from. + :type node: dict + :returns: Return model or None if not found. + :rtype: str + """ + try: + return node["model"] + except KeyError: + return None @staticmethod def get_cryptodev(node): @@ -1083,7 +1018,7 @@ class Topology: :rtype: str """ try: - return node[u"cryptodev"] + return node["cryptodev"] except KeyError: return None @@ -1096,7 +1031,7 @@ class Topology: :rtype: str """ try: - return node[u"bus"] + return node["bus"] except KeyError: return None @@ -1110,7 +1045,7 @@ class Topology: :rtype: str """ try: - return node[u"uio_driver"] + return node["uio_driver"] except KeyError: return None @@ -1127,7 +1062,7 @@ class Topology: :returns: Return iface_key or None if not found. """ try: - node[u"interfaces"][iface_key][u"numa_node"] = numa_node_id + node["interfaces"][iface_key]["numa_node"] = numa_node_id return iface_key except KeyError: return None @@ -1145,7 +1080,7 @@ class Topology: :type socket_id: str :type socket_path: str """ - path = [u"sockets", socket_type, socket_id] + path = ["sockets", socket_type, socket_id] Topology.add_node_item(node, socket_path, path) @staticmethod @@ -1159,7 +1094,7 @@ class Topology: :type socket_type: SocketType :type socket_id: str """ - node[u"sockets"][socket_type].pop(socket_id) + node["sockets"][socket_type].pop(socket_id) @staticmethod def get_node_sockets(node, socket_type=None): @@ -1174,8 +1109,8 @@ class Topology: """ try: if socket_type: - return node[u"sockets"][socket_type] - return node[u"sockets"] + return node["sockets"][socket_type] + return node["sockets"] except KeyError: return None @@ -1187,6 +1122,6 @@ class Topology: :type node: dict """ for node in nodes.values(): - if u"sockets" in list(node.keys()): + if "sockets" in list(node.keys()): # Containers are disconnected and destroyed already. - node.pop(u"sockets") + node.pop("sockets") diff --git a/topologies/available/3n_azure.template b/topologies/available/2n_azure.template index 0a4dccea9a..f55c4385fb 100644 --- a/topologies/available/3n_azure.template +++ b/topologies/available/2n_azure.template @@ -2,14 +2,14 @@ metadata: version: 0.1 schema: - - resources/topology_schemas/3_node_topology.sch.yaml + - resources/topology_schemas/2_node_topology.sch.yaml - resources/topology_schemas/topology.sch.yaml - tags: [hw, 3-node] nodes: TG: type: TG subtype: TREX + model: Azure host: "{{ tg_public_ip }}" arch: x86_64 port: 22 @@ -30,6 +30,7 @@ nodes: model: azure-mlx-40g DUT1: type: DUT + model: Azure host: "{{ dut1_public_ip }}" arch: x86_64 port: 22 @@ -47,31 +48,5 @@ nodes: # dut2_instance/p1 - 40GE port2 on Mellanox NIC. mac_address: "{{ dut1_if2_mac | lower | replace('-',':') }}" pci_address: "0003:00:02.0" - link: link21 - model: azure-mlx-40g - DUT2: - type: DUT - host: "{{ dut2_public_ip }}" - arch: x86_64 - port: 22 - username: testuser - password: Csit1234 - uio_driver: vfio-pci - honeycomb: - user: admin - passwd: admin - port: 8183 - netconf_port: 2831 - interfaces: - port1: - # dut1_instance/p1 - 40GE port1 on Mellanox NIC. - mac_address: "{{ dut2_if1_mac | lower | replace('-',':') }}" - pci_address: "0002:00:02.0" - link: link21 - model: azure-mlx-40g - port2: - # dut2_instance/p1 - 40GE port2 on Mellanox NIC. - mac_address: "{{ dut2_if2_mac | lower | replace('-',':') }}" - pci_address: "0003:00:02.0" link: link2 - model: azure-mlx-40g + model: azure-mlx-40g
\ No newline at end of file diff --git a/topologies/available/3n_aws.template b/topologies/available/2n_c5n.template index 2f80a18a67..30f99e2b34 100644 --- a/topologies/available/3n_aws.template +++ b/topologies/available/2n_c5n.template @@ -2,14 +2,14 @@ metadata: version: 0.1 schema: - - resources/topology_schemas/3_node_topology.sch.yaml + - resources/topology_schemas/2_node_topology.sch.yaml - resources/topology_schemas/topology.sch.yaml - tags: [hw, 3-node] nodes: TG: type: TG subtype: TREX + model: AWS host: "{{ tg_public_ip }}" arch: x86_64 port: 22 @@ -18,61 +18,35 @@ nodes: interfaces: port1: # tg_instance/p1 - 50GE port1 on ENA NIC. - mac_address: {{ tg_if1_mac }} + mac_address: "{{ tg_if1_mac }}" pci_address: "0000:00:06.0" link: link1 model: Amazon-Nitro-50G port2: # tg_instance/p2 - 50GE port2 on ENA NIC. - mac_address: {{ tg_if2_mac }} + mac_address: "{{ tg_if2_mac }}" pci_address: "0000:00:07.0" link: link2 model: Amazon-Nitro-50G DUT1: type: DUT + model: AWS host: "{{ dut1_public_ip }}" arch: x86_64 port: 22 username: testuser password: Csit1234 uio_driver: vfio-pci - honeycomb: - user: admin - passwd: admin - port: 8183 - netconf_port: 2831 interfaces: port1: # dut1_instance/p1 - 50GE port1 on ENA NIC. - mac_address: {{ dut1_if1_mac }} + mac_address: "{{ dut1_if1_mac }}" pci_address: "0000:00:06.0" link: link1 model: Amazon-Nitro-50G port2: # dut1_instance/p2 - 50GE port2 on ENA NIC. - mac_address: {{ dut1_if2_mac }} - pci_address: "0000:00:07.0" - link: link21 - model: Amazon-Nitro-50G - DUT2: - type: DUT - host: "{{ dut2_public_ip }}" - arch: x86_64 - port: 22 - username: testuser - password: Csit1234 - uio_driver: vfio-pci - interfaces: - port1: - # dut2_instance/p1 - 50GE port1 on ENA NIC. - mac_address: {{ dut2_if1_mac }} - pci_address: "0000:00:06.0" - link: link21 - model: Amazon-Nitro-50G - port2: - # dut2_instance/p2 - 50GE port1 on ENA NIC. - mac_address: {{ dut2_if2_mac }} + mac_address: "{{ dut1_if2_mac }}" pci_address: "0000:00:07.0" link: link2 - model: Amazon-Nitro-50G - + model: Amazon-Nitro-50G
\ No newline at end of file diff --git a/topologies/available/3n_c6gn.template b/topologies/available/2n_c6gn.template index a9245b1b46..9be609b789 100644 --- a/topologies/available/3n_c6gn.template +++ b/topologies/available/2n_c6gn.template @@ -2,14 +2,14 @@ metadata: version: 0.1 schema: - - resources/topology_schemas/3_node_topology.sch.yaml + - resources/topology_schemas/2_node_topology.sch.yaml - resources/topology_schemas/topology.sch.yaml - tags: [hw, 3-node] nodes: TG: type: TG subtype: TREX + model: AWS host: "{{ tg_public_ip }}" arch: x86_64 port: 22 @@ -30,49 +30,23 @@ nodes: model: Amazon-Nitro-100G DUT1: type: DUT + model: AWS host: "{{ dut1_public_ip }}" arch: x86_64 port: 22 username: testuser password: Csit1234 uio_driver: vfio-pci - honeycomb: - user: admin - passwd: admin - port: 8183 - netconf_port: 2831 interfaces: port1: # dut1_instance/p1 - 100GE port1 on ENA NIC. - mac_address: {{ dut1_if1_mac }} + mac_address: "{{ dut1_if1_mac }}" pci_address: "0000:00:06.0" link: link1 model: Amazon-Nitro-100G port2: # dut1_instance/p2 - 100GE port2 on ENA NIC. - mac_address: {{ dut1_if2_mac }} - pci_address: "0000:00:07.0" - link: link21 - model: Amazon-Nitro-100G - DUT2: - type: DUT - host: "{{ dut2_public_ip }}" - arch: x86_64 - port: 22 - username: testuser - password: Csit1234 - uio_driver: vfio-pci - interfaces: - port1: - # dut2_instance/p1 - 100GE port1 on ENA NIC. - mac_address: {{ dut2_if1_mac }} - pci_address: "0000:00:06.0" - link: link21 - model: Amazon-Nitro-100G - port2: - # dut2_instance/p2 - 100GE port1 on ENA NIC. - mac_address: {{ dut2_if2_mac }} + mac_address: "{{ dut1_if2_mac }}" pci_address: "0000:00:07.0" link: link2 - model: Amazon-Nitro-100G - + model: Amazon-Nitro-100G
\ No newline at end of file diff --git a/topologies/available/2n_c6in.template b/topologies/available/2n_c6in.template new file mode 100644 index 0000000000..81e8e25236 --- /dev/null +++ b/topologies/available/2n_c6in.template @@ -0,0 +1,52 @@ +--- +metadata: + version: 0.1 + schema: + - resources/topology_schemas/2_node_topology.sch.yaml + - resources/topology_schemas/topology.sch.yaml + +nodes: + TG: + type: TG + subtype: TREX + model: AWS + host: "{{ tg_public_ip }}" + arch: x86_64 + port: 22 + username: testuser + password: Csit1234 + interfaces: + port1: + # tg_instance/p1 - 200GE port1 on ENA NIC. + mac_address: "{{ tg_if1_mac }}" + pci_address: "0000:00:06.0" + link: link1 + model: Amazon-Nitro-200G + port2: + # tg_instance/p2 - 200GE port2 on ENA NIC. + mac_address: "{{ tg_if2_mac }}" + pci_address: "0000:00:07.0" + link: link2 + model: Amazon-Nitro-200G + DUT1: + type: DUT + model: AWS + host: "{{ dut1_public_ip }}" + arch: x86_64 + port: 22 + username: testuser + password: Csit1234 + uio_driver: vfio-pci + interfaces: + port1: + # dut1_instance/p1 - 100GE port1 on ENA NIC. + mac_address: "{{ dut1_if1_mac }}" + pci_address: "0000:00:06.0" + link: link1 + model: Amazon-Nitro-200G + port2: + # dut1_instance/p2 - 100GE port2 on ENA NIC. + mac_address: "{{ dut1_if2_mac }}" + pci_address: "0000:00:07.0" + link: link2 + model: Amazon-Nitro-200G
\ No newline at end of file diff --git a/topologies/available/2n_hw_testbed1.yaml.example b/topologies/available/2n_hw_testbed1.yaml.example index eb3acae3ec..c023d04145 100644 --- a/topologies/available/2n_hw_testbed1.yaml.example +++ b/topologies/available/2n_hw_testbed1.yaml.example @@ -1,61 +1,76 @@ -# Copyright (c) 2021 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: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Example file of topology - --- metadata: version: 0.1 - schema: # list of schema files against which to validate + schema: - resources/topology_schemas/2_node_topology.sch.yaml - resources/topology_schemas/topology.sch.yaml - tags: [hw, 2-node] nodes: TG: type: TG - host: 10.0.0.3 + subtype: TREX + model: Intel-Sapphirerapids + host: 10.0.0.1 arch: x86_64 port: 22 - username: lab - password: lab + username: testuser + password: Csit1234 interfaces: - port3: - mac_address: "08:00:27:35:59:04" - pci_address: "0000:00:08.0" + port1: + mac_address: "00:00:00:00:00:00" + pci_address: "0000:00:01.0" + driver: i40e link: link1 model: Intel-X710 - port5: - mac_address: "08:00:27:46:2b:4c" - pci_address: "0000:00:09.0" + port2: + mac_address: "00:00:00:00:00:00" + pci_address: "0000:00:02.0" + driver: i40e link: link2 model: Intel-X710 + port3: + mac_address: "00:00:00:00:00:00" + pci_address: "0000:00:03.0" + link: link3 + driver: e1000 + model: virtual + port4: + mac_address: "00:00:00:00:00:00" + pci_address: "0000:00:04.0" + link: link4 + driver: e1000 + model: virtual DUT1: type: DUT - host: 10.0.0.1 + model: Intel-Sapphirerapids + host: 10.0.0.2 arch: x86_64 port: 22 - username: lab - password: lab + username: testuser + password: Csit1234 uio_driver: vfio-pci interfaces: port1: - mac_address: "08:00:27:ae:29:2b" - pci_address: "0000:00:08.0" + mac_address: "00:00:00:00:00:00" + pci_address: "0000:00:01.0" + driver: i40e link: link1 model: Intel-X710 - port3: - mac_address: "08:00:27:f3:be:f0" - pci_address: "0000:00:09.0" + port2: + mac_address: "00:00:00:00:00:00" + pci_address: "0000:00:02.0" + driver: i40e link: link2 - model: Intel-X710
\ No newline at end of file + model: Intel-X710 + port3: + mac_address: "00:00:00:00:00:00" + pci_address: "0000:00:03.0" + driver: e1000 + link: link3 + model: virtual + port4: + mac_address: "00:00:00:00:00:00" + pci_address: "0000:00:04.0" + driver: e1000 + link: link4 + model: virtual
\ No newline at end of file diff --git a/topologies/available/3n_c6in.template b/topologies/available/3n_c6in.template deleted file mode 100644 index 9f289d726a..0000000000 --- a/topologies/available/3n_c6in.template +++ /dev/null @@ -1,78 +0,0 @@ ---- -metadata: - version: 0.1 - schema: - - resources/topology_schemas/3_node_topology.sch.yaml - - resources/topology_schemas/topology.sch.yaml - tags: [hw, 3-node] - -nodes: - TG: - type: TG - subtype: TREX - host: "{{ tg_public_ip }}" - arch: x86_64 - port: 22 - username: testuser - password: Csit1234 - interfaces: - port1: - # tg_instance/p1 - 200GE port1 on ENA NIC. - mac_address: {{ tg_if1_mac }} - pci_address: "0000:00:06.0" - link: link1 - model: Amazon-Nitro-200G - port2: - # tg_instance/p2 - 200GE port2 on ENA NIC. - mac_address: {{ tg_if2_mac }} - pci_address: "0000:00:07.0" - link: link2 - model: Amazon-Nitro-200G - DUT1: - type: DUT - host: "{{ dut1_public_ip }}" - arch: x86_64 - port: 22 - username: testuser - password: Csit1234 - uio_driver: vfio-pci - honeycomb: - user: admin - passwd: admin - port: 8183 - netconf_port: 2831 - interfaces: - port1: - # dut1_instance/p1 - 200GE port1 on ENA NIC. - mac_address: {{ dut1_if1_mac }} - pci_address: "0000:00:06.0" - link: link1 - model: Amazon-Nitro-200G - port2: - # dut1_instance/p2 - 200GE port2 on ENA NIC. - mac_address: {{ dut1_if2_mac }} - pci_address: "0000:00:07.0" - link: link21 - model: Amazon-Nitro-200G - DUT2: - type: DUT - host: "{{ dut2_public_ip }}" - arch: x86_64 - port: 22 - username: testuser - password: Csit1234 - uio_driver: vfio-pci - interfaces: - port1: - # dut2_instance/p1 - 200GE port1 on ENA NIC. - mac_address: {{ dut2_if1_mac }} - pci_address: "0000:00:06.0" - link: link21 - model: Amazon-Nitro-200G - port2: - # dut2_instance/p2 - 200GE port1 on ENA NIC. - mac_address: {{ dut2_if2_mac }} - pci_address: "0000:00:07.0" - link: link2 - model: Amazon-Nitro-200G - diff --git a/topologies/available/3n_hw_testbed1.yaml.example b/topologies/available/3n_hw_testbed1.yaml.example index 565b8555ab..74a394ea1d 100644 --- a/topologies/available/3n_hw_testbed1.yaml.example +++ b/topologies/available/3n_hw_testbed1.yaml.example @@ -1,80 +1,110 @@ -# Copyright (c) 2021 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: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Example file of topology - --- metadata: version: 0.1 - schema: # list of schema files against which to validate + schema: - resources/topology_schemas/3_node_topology.sch.yaml - resources/topology_schemas/topology.sch.yaml - tags: [hw, 3-node] nodes: TG: type: TG - host: 10.0.0.3 + subtype: TREX + model: Intel-Sapphirerapids + host: 10.0.0.1 arch: x86_64 port: 22 - username: lab - password: lab + username: testuser + password: Csit1234 interfaces: - port3: - mac_address: "08:00:27:35:59:04" - pci_address: "0000:00:08.0" + port1: + mac_address: "00:00:00:00:00:00" + pci_address: "0000:00:01.0" + driver: i40e link: link1 model: Intel-X710 - port5: - mac_address: "08:00:27:46:2b:4c" - pci_address: "0000:00:09.0" + port2: + mac_address: "00:00:00:00:00:00" + pci_address: "0000:00:02.0" + driver: i40e link: link2 model: Intel-X710 + port3: + mac_address: "00:00:00:00:00:00" + pci_address: "0000:00:03.0" + link: link3 + driver: e1000 + model: virtual + port4: + mac_address: "00:00:00:00:00:00" + pci_address: "0000:00:04.0" + link: link4 + driver: e1000 + model: virtual DUT1: type: DUT - host: 10.0.0.1 + model: Intel-Sapphirerapids + host: 10.0.0.2 arch: x86_64 port: 22 - username: lab - password: lab + username: testuser + password: Csit1234 uio_driver: vfio-pci interfaces: port1: - mac_address: "08:00:27:ae:29:2b" - pci_address: "0000:00:08.0" + mac_address: "00:00:00:00:00:00" + pci_address: "0000:00:01.0" + driver: i40e link: link1 model: Intel-X710 + port2: + mac_address: "00:00:00:00:00:00" + pci_address: "0000:00:02.0" + driver: i40e + link: link22 + model: Intel-X710 port3: - mac_address: "08:00:27:f3:be:f0" - pci_address: "0000:00:09.0" + mac_address: "00:00:00:00:00:00" + pci_address: "0000:00:03.0" + driver: e1000 link: link3 - model: Intel-X710 + model: virtual + port4: + mac_address: "00:00:00:00:00:00" + pci_address: "0000:00:04.0" + link: link44 + driver: e1000 + model: virtual DUT2: type: DUT - host: 10.0.0.2 + model: Intel-Sapphirerapids + host: 10.0.0.3 arch: x86_64 port: 22 - username: lab - password: lab + username: testuser + password: Csit1234 uio_driver: vfio-pci interfaces: port1: - mac_address: "08:00:27:f2:90:d8" - pci_address: "0000:00:08.0" + mac_address: "00:00:00:00:00:00" + pci_address: "0000:00:01.0" + driver: i40e + link: link22 + model: Intel-X710 + port2: + mac_address: "00:00:00:00:00:00" + pci_address: "0000:00:02.0" + driver: i40e link: link2 model: Intel-X710 port3: - mac_address: "08:00:27:14:64:e0" - pci_address: "0000:00:09.0" - link: link3 - model: Intel-X710 + mac_address: "00:00:00:00:00:00" + pci_address: "0000:00:03.0" + driver: e1000 + link: link44 + model: virtual + port4: + mac_address: "00:00:00:00:00:00" + pci_address: "0000:00:04.0" + driver: e1000 + link: link4 + model: virtual diff --git a/topologies/available/lf_2n_emr_testbed25.yaml b/topologies/available/lf_2n_emr_testbed25.yaml index aa1493d877..1c789d30b1 100644 --- a/topologies/available/lf_2n_emr_testbed25.yaml +++ b/topologies/available/lf_2n_emr_testbed25.yaml @@ -2,15 +2,15 @@ metadata: version: 0.1 schema: - - resources/topology_schemas/3_node_topology.sch.yaml + - resources/topology_schemas/2_node_topology.sch.yaml - resources/topology_schemas/topology.sch.yaml - tags: [hw, 3-node] nodes: TG: type: TG subtype: TREX - host: "10.30.51.41" + model: Intel-Sapphirerapids + host: 10.30.51.41 arch: x86_64 port: 6001 username: testuser @@ -23,16 +23,16 @@ nodes: cryptodev: device1: pci_address: "0000:70:00.0" - driver: "4xxx" - model: "HW_4xxx" - module: "qat_4xxx" + driver: 4xxx + model: HW_4xxx + module: qat_4xxx numvfs: 8 interfaces: port1: # s41-t25-tg1-c2/p1 - 100GE port1 Intel E810-2C-Q2 2p100GE. mac_address: "40:a6:b7:ca:2a:70" pci_address: "0000:38:00.0" - ip4_address: "172.16.10.1" + ip4_address: 172.16.10.1 driver: ice link: link1 model: Intel-E810CQ @@ -40,13 +40,14 @@ nodes: # s41-t25-tg1-c2/p1 - 100GE port2 Intel E810-2C-Q2 2p100GE. mac_address: "40:a6:b7:ca:2a:74" pci_address: "0000:3a:00.0" - ip4_address: "172.16.20.1" + ip4_address: 172.16.20.1 driver: ice link: link2 model: Intel-E810CQ DUT1: type: DUT - host: "10.30.51.40" + model: Intel-Emeraldrapids + host: 10.30.51.40 arch: x86_64 port: 6001 username: testuser @@ -60,16 +61,16 @@ nodes: cryptodev: device1: pci_address: "0000:70:00.0" - driver: "4xxx" - model: "HW_4xxx" - module: "qat_4xxx" + driver: 4xxx + model: HW_4xxx + module: qat_4xxx numvfs: 8 interfaces: port1: # s40-t25-sut1-c2/p1 - 100GE port1 Intel E810-2C-Q2 2p100GE. mac_address: "40:a6:b7:ca:2a:68" pci_address: "0000:38:00.0" - ip4_address: "172.16.10.2" + ip4_address: 172.16.10.2 driver: ice link: link1 model: Intel-E810CQ @@ -77,7 +78,7 @@ nodes: # s40-t25-sut1-c2/p2 - 100GE port2 Intel E810-2C-Q2 2p100GE. mac_address: "40:a6:b7:ca:2a:6c" pci_address: "0000:3a:00.0" - ip4_address: "172.16.20.2" + ip4_address: 172.16.20.2 driver: ice link: link2 model: Intel-E810CQ
\ No newline at end of file diff --git a/topologies/available/lf_2n_emr_testbed26.yaml b/topologies/available/lf_2n_emr_testbed26.yaml index 3137a52c04..2898bb0eb7 100644 --- a/topologies/available/lf_2n_emr_testbed26.yaml +++ b/topologies/available/lf_2n_emr_testbed26.yaml @@ -2,15 +2,15 @@ metadata: version: 0.1 schema: - - resources/topology_schemas/3_node_topology.sch.yaml + - resources/topology_schemas/2_node_topology.sch.yaml - resources/topology_schemas/topology.sch.yaml - tags: [hw, 3-node] nodes: TG: type: TG subtype: TREX - host: "10.30.51.43" + model: Intel-Sapphirerapids + host: 10.30.51.43 arch: x86_64 port: 6001 username: testuser @@ -23,16 +23,16 @@ nodes: cryptodev: device1: pci_address: "0000:70:00.0" - driver: "4xxx" - model: "HW_4xxx" - module: "qat_4xxx" + driver: 4xxx + model: HW_4xxx + module: qat_4xxx numvfs: 8 interfaces: port1: # s43-t26-tg1-c2/p1 - 100GE port1 Intel E810-2C-Q2 2p100GE. mac_address: "40:a6:b7:ca:2b:d8" pci_address: "0000:38:00.0" - ip4_address: "172.16.10.1" + ip4_address: 172.16.10.1 driver: ice link: link1 model: Intel-E810CQ @@ -40,13 +40,14 @@ nodes: # s43-t26-tg1-c2/p1 - 100GE port2 Intel E810-2C-Q2 2p100GE. mac_address: "40:a6:b7:ca:2b:dc" pci_address: "0000:3a:00.0" - ip4_address: "172.16.20.1" + ip4_address: 172.16.20.1 driver: ice link: link2 model: Intel-E810CQ DUT1: type: DUT - host: "10.30.51.42" + model: Intel-Emeraldrapids + host: 10.30.51.42 arch: x86_64 port: 6001 username: testuser @@ -60,16 +61,16 @@ nodes: cryptodev: device1: pci_address: "0000:70:00.0" - driver: "4xxx" - model: "HW_4xxx" - module: "qat_4xxx" + driver: 4xxx + model: HW_4xxx + module: qat_4xxx numvfs: 8 interfaces: port1: # s42-t26-sut1-c2/p1 - 100GE port1 Intel E810-2C-Q2 2p100GE. mac_address: "40:a6:b7:ca:2c:30" pci_address: "0000:38:00.0" - ip4_address: "172.16.10.2" + ip4_address: 172.16.10.2 driver: ice link: link1 model: Intel-E810CQ @@ -77,7 +78,7 @@ nodes: # s42-t26-sut1-c2/p2 - 100GE port2 Intel E810-2C-Q2 2p100GE. mac_address: "40:a6:b7:ca:2c:34" pci_address: "0000:3a:00.0" - ip4_address: "172.16.20.2" + ip4_address: 172.16.20.2 driver: ice link: link2 model: Intel-E810CQ
\ No newline at end of file diff --git a/topologies/available/lf_2n_grc_testbed27.yaml b/topologies/available/lf_2n_grc_testbed27.yaml index cf3cf83a2e..2f4d4cc0cb 100644 --- a/topologies/available/lf_2n_grc_testbed27.yaml +++ b/topologies/available/lf_2n_grc_testbed27.yaml @@ -1,16 +1,16 @@ --- metadata: version: 0.1 - schema: # list of schema files against which to validate + schema: - resources/topology_schemas/2_node_topology.sch.yaml - resources/topology_schemas/topology.sch.yaml - tags: [hw, 2-node] nodes: TG: type: TG subtype: TREX - host: "10.30.51.37" + model: Intel-Icelake + host: 10.30.51.37 arch: x86_64 port: 6001 username: testuser @@ -20,7 +20,7 @@ nodes: # s37-t27-tg1-c9/p1 - 100GE-port1 ConnectX5-2p100GE. mac_address: "0c:42:a1:0b:92:1a" pci_address: "0000:17:00.0" - ip4_address: "172.16.10.1" + ip4_address: 172.16.10.1 driver: mlx5_core link: link1 model: Mellanox-CX556A @@ -28,45 +28,14 @@ nodes: # s37-t27-tg1-c9/p2 - 100GE-port2 ConnectX5-2p100GE. mac_address: "0c:42:a1:0b:92:1b" pci_address: "0000:17:00.1" - ip4_address: "172.16.20.1" + ip4_address: 172.16.20.1 driver: mlx5_core link: link2 model: Mellanox-CX556A -# port3: -# # s37-t27-tg1-c4/p1 - 100GE-port1 ConnectX5-2p100GE. -# mac_address: "10:70:fd:15:5f:b4" -# pci_address: "0000:31:00.0" -# ip4_address: "172.16.30.1" -# driver: mlx5_core -# link: link3 -# model: Mellanox-CX556A -# port4: -# # s37-t27-tg1-c4/p2 - 100GE-port2 ConnectX5-2p100GE. -# mac_address: "10:70:fd:15:5f:b5" -# pci_address: "0000:31:00.1" -# ip4_address: "172.16.40.1" -# driver: mlx5_core -# link: link4 -# model: Mellanox-CX556A -# port5: -# # s37-t27-tg1-c2/p1 - 100GE-port1 ConnectX5-2p100GE. -# mac_address: "10:70:fd:18:44:ec" -# pci_address: "0000:4b:00.0" -# ip4_address: "172.16.50.1" -# driver: mlx5_core -# link: link5 -# model: Mellanox-CX556A -# port6: -# # s37-t27-tg1-c2/p2 - 100GE-port2 ConnectX5-2p100GE. -# mac_address: "10:70:fd:18:44:ed" -# pci_address: "0000:4b:00.1" -# ip4_address: "172.16.60.1" -# driver: mlx5_core -# link: link6 -# model: Mellanox-CX556A DUT1: type: DUT - host: "10.30.51.36" + model: Nvidia-Graceserver + host: 10.30.51.36 arch: aarch64 port: 22 uio_driver: vfio-pci @@ -77,7 +46,7 @@ nodes: # s36-t27-sut1-c1/p1 - 100GE-port1 ConnectX5-2p100GE. mac_address: "ec:0d:9a:8c:c7:f6" pci_address: "0000:01:00.0" - ip4_address: "172.16.10.2" + ip4_address: 172.16.10.2 driver: mlx5_core link: link1 model: Mellanox-CX556A @@ -85,23 +54,7 @@ nodes: # s36-t27-sut1-c1/p2 - 100GE-port2 ConnectX5-2p100GE. mac_address: "ec:0d:9a:8c:c7:f7" pci_address: "0000:01:00.1" - ip4_address: "172.16.20.2" + ip4_address: 172.16.20.2 driver: mlx5_core link: link2 - model: Mellanox-CX556A -# port3: -# # s36-t27-sut1-c2/p1 - 200GE port1 Mellanox ConnectX7-2p200GE. -# mac_address: "94:6d:ae:7e:f5:ba" -# pci_address: "0002:01:00.0" -# ip4_address: "172.16.30.2" -# driver: mlx5_core -# link: link3 -# model: Mellanox-CX7VEAT -# port4: -# # s36-t27-sut1-c2/p2 - 200GE port2 Mellanox ConnectX7-2p200GE. -# mac_address: "94:6d:ae:7e:f5:bb" -# pci_address: "0002:01:00.1" -# ip4_address: "172.16.40.2" -# driver: mlx5_core -# link: link4 -# model: Mellanox-CX7VEAT
\ No newline at end of file + model: Mellanox-CX556A
\ No newline at end of file diff --git a/topologies/available/lf_2n_icx_testbed212.yaml b/topologies/available/lf_2n_icx_testbed212.yaml index 5f225dcbb9..dc0ba30bcc 100644 --- a/topologies/available/lf_2n_icx_testbed212.yaml +++ b/topologies/available/lf_2n_icx_testbed212.yaml @@ -4,13 +4,13 @@ metadata: schema: - resources/topology_schemas/2_node_topology.sch.yaml - resources/topology_schemas/topology.sch.yaml - tags: [hw, 2-node] nodes: TG: type: TG subtype: TREX - host: "10.30.51.82" + model: Intel-Icelake + host: 10.30.51.82 arch: x86_64 port: 6001 username: testuser @@ -20,7 +20,7 @@ nodes: # s82-t212-tg1-c9/p1 - 100GE port1 Intel E810-CQDA2 2p100GE. mac_address: "b4:96:91:b2:a0:40" pci_address: "0000:17:00.0" - ip4_address: "172.16.10.2" + ip4_address: 172.16.10.2 driver: ice link: link1 model: Intel-E810CQ @@ -28,7 +28,7 @@ nodes: # s82-t212-tg1-c9/p2 - 100GE port2 Intel E810-CQDA2 2p100GE. mac_address: "b4:96:91:b2:a0:41" pci_address: "0000:17:00.1" - ip4_address: "172.16.20.2" + ip4_address: 172.16.20.2 driver: ice link: link2 model: Intel-E810CQ @@ -36,7 +36,7 @@ nodes: # s82-t212-tg1-c4/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:78:b4" pci_address: "0000:31:00.0" - ip4_address: "172.16.30.2" + ip4_address: 172.16.30.2 driver: ice link: link3 model: Intel-E810XXV @@ -44,7 +44,7 @@ nodes: # s82-t212-tg1-c4/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:78:b5" pci_address: "0000:31:00.1" - ip4_address: "172.16.40.2" + ip4_address: 172.16.40.2 driver: ice link: link4 model: Intel-E810XXV @@ -52,7 +52,7 @@ nodes: # s82-t212-tg1-c4/p3 - 25GE port3 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:78:b6" pci_address: "0000:31:00.2" - ip4_address: "172.16.50.2" + ip4_address: 172.16.50.2 driver: ice link: link5 model: Intel-E810XXV @@ -60,7 +60,7 @@ nodes: # s82-t212-tg1-c4/p4 - 25GE port4 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:78:b7" pci_address: "0000:31:00.3" - ip4_address: "172.16.60.2" + ip4_address: 172.16.60.2 driver: ice link: link6 model: Intel-E810XXV @@ -68,7 +68,7 @@ nodes: # s82-t212-tg1-c2/p1 - 25GE port1 Intel NIC xxv710 4p25GE. mac_address: "40:a6:b7:4c:34:48" pci_address: "0000:4b:00.0" - ip4_address: "172.16.70.2" + ip4_address: 172.16.70.2 driver: i40e link: link7 model: Intel-XXV710 @@ -76,7 +76,7 @@ nodes: # s82-t212-tg1-c2/p2 - 25GE port2 Intel NIC xxv710 4p25GE. mac_address: "40:a6:b7:4c:34:49" pci_address: "0000:4b:00.1" - ip4_address: "172.16.80.2" + ip4_address: 172.16.80.2 driver: i40e link: link8 model: Intel-XXV710 @@ -84,7 +84,7 @@ nodes: # s82-t212-tg1-c8/p1 - 200GE port1 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a1:18" pci_address: "0000:b1:00.0" - ip4_address: "172.16.90.2" + ip4_address: 172.16.90.2 driver: mlx5_core link: link9 model: Mellanox-CX7VEAT @@ -92,7 +92,7 @@ nodes: # s82-t212-tg1-c8/p2 - 200GE port2 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a1:19" pci_address: "0000:b1:00.1" - ip4_address: "172.16.100.2" + ip4_address: 172.16.100.2 driver: mlx5_core link: link10 model: Mellanox-CX7VEAT @@ -100,7 +100,7 @@ nodes: # s82-t212-tg1-c6/p1 - 100GE port1 Intel E810-CQDA2 2p100GE. mac_address: "b4:96:91:b2:a7:00" pci_address: "0000:ca:00.0" - ip4_address: "172.16.110.2" + ip4_address: 172.16.110.2 driver: ice link: link11 model: Intel-E810CQ @@ -108,13 +108,14 @@ nodes: # s82-t212-tg1-c6/p2 - 100GE port2 Intel E810-CQDA2 2p100GE. mac_address: "b4:96:91:b2:a7:01" pci_address: "0000:ca:00.1" - ip4_address: "172.16.120.2" + ip4_address: 172.16.120.2 driver: ice link: link11 model: Intel-E810CQ DUT1: type: DUT - host: "10.30.51.81" + model: Intel-Icelake + host: 10.30.51.81 arch: x86_64 port: 22 username: testuser @@ -125,7 +126,7 @@ nodes: # s81-t212-sut1-c9/p1 - 100GE port1 Intel E810-CQDA2 2p100GE. mac_address: "b4:96:91:b2:a8:48" pci_address: "0000:17:00.0" - ip4_address: "172.16.10.1" + ip4_address: 172.16.10.1 driver: ice link: link1 model: Intel-E810CQ @@ -133,7 +134,7 @@ nodes: # s81-t212-sut1-c9/p2 - 100GE port2 Intel E810-CQDA2 2p100GE. mac_address: "b4:96:91:b2:a8:49" pci_address: "0000:17:00.1" - ip4_address: "172.16.20.1" + ip4_address: 172.16.20.1 driver: ice link: link2 model: Intel-E810CQ @@ -141,7 +142,7 @@ nodes: # s81-t212-sut1-c4/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:79:4c" pci_address: "0000:31:00.0" - ip4_address: "172.16.30.1" + ip4_address: 172.16.30.1 driver: ice link: link3 model: Intel-E810XXV @@ -149,7 +150,7 @@ nodes: # s81-t212-sut1-c4/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:79:4d" pci_address: "0000:31:00.1" - ip4_address: "172.16.40.1" + ip4_address: 172.16.40.1 driver: ice link: link4 model: Intel-E810XXV @@ -157,7 +158,7 @@ nodes: # s81-t212-sut1-c4/p3 - 25GE port3 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:79:4e" pci_address: "0000:31:00.2" - ip4_address: "172.16.50.1" + ip4_address: 172.16.50.1 driver: ice link: link5 model: Intel-E810XXV @@ -165,7 +166,7 @@ nodes: # s81-t212-sut1-c4/p4 - 25GE port4 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:79:4f" pci_address: "0000:31:00.3" - ip4_address: "172.16.60.1" + ip4_address: 172.16.60.1 driver: ice link: link6 model: Intel-E810XXV @@ -173,7 +174,7 @@ nodes: # s81-t212-sut1-c2/p1 - 25GE port1 Intel NIC xxv710 2p25GE. mac_address: "40:a6:b7:4c:34:2c" pci_address: "0000:4b:00.0" - ip4_address: "172.16.70.1" + ip4_address: 172.16.70.1 driver: i40e link: link7 model: Intel-XXV710 @@ -181,7 +182,7 @@ nodes: # s81-t212-sut1-c2/p2 - 25GE port2 Intel NIC xxv710 2p25GE. mac_address: "40:a6:b7:4c:34:2d" pci_address: "0000:4b:00.1" - ip4_address: "172.16.80.1" + ip4_address: 172.16.80.1 driver: i40e link: link8 model: Intel-XXV710 @@ -189,7 +190,7 @@ nodes: # s81-t212-sut1-c8/p1 - 200GE port1 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a1:80" pci_address: "0000:b1:00.0" - ip4_address: "172.16.90.1" + ip4_address: 172.16.90.1 driver: mlx5_core link: link9 model: Mellanox-CX7VEAT @@ -197,7 +198,7 @@ nodes: # s81-t212-sut1-c8/p2 - 200GE port2 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a1:81" pci_address: "0000:b1:00.1" - ip4_address: "172.16.100.1" + ip4_address: 172.16.100.1 driver: mlx5_core link: link10 - model: Mellanox-CX7VEAT + model: Mellanox-CX7VEAT
\ No newline at end of file diff --git a/topologies/available/lf_2n_icx_testbed213.yaml b/topologies/available/lf_2n_icx_testbed213.yaml index e5f090b6cf..d5c5307157 100644 --- a/topologies/available/lf_2n_icx_testbed213.yaml +++ b/topologies/available/lf_2n_icx_testbed213.yaml @@ -4,13 +4,13 @@ metadata: schema: - resources/topology_schemas/2_node_topology.sch.yaml - resources/topology_schemas/topology.sch.yaml - tags: [hw, 2-node] nodes: TG: type: TG subtype: TREX - host: "10.30.51.84" + model: Intel-Icelake + host: 10.30.51.84 arch: x86_64 port: 6001 username: testuser @@ -20,7 +20,7 @@ nodes: # s84-t213-tg1-c9/p1 - 100GE port1 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:67:2b:fc" pci_address: "0000:17:00.0" - ip4_address: "172.16.10.2" + ip4_address: 172.16.10.2 driver: ice link: link1 model: Intel-E810CQ @@ -28,7 +28,7 @@ nodes: # s84-t213-tg1-c9/p2 - 100GE port2 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:67:2b:f8" pci_address: "0000:19:00.0" - ip4_address: "172.16.20.2" + ip4_address: 172.16.20.2 driver: ice link: link2 model: Intel-E810CQ @@ -36,7 +36,7 @@ nodes: # s84-t213-tg1-c4/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:7b:38" pci_address: "0000:31:00.0" - ip4_address: "172.16.30.2" + ip4_address: 172.16.30.2 driver: ice link: link3 model: Intel-E810XXV @@ -44,7 +44,7 @@ nodes: # s84-t213-tg1-c4/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:7b:39" pci_address: "0000:31:00.1" - ip4_address: "172.16.40.2" + ip4_address: 172.16.40.2 driver: ice link: link4 model: Intel-E810XXV @@ -52,7 +52,7 @@ nodes: # s84-t213-tg1-c4/p3 - 25GE port3 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:7b:3a" pci_address: "0000:31:00.2" - ip4_address: "172.16.50.2" + ip4_address: 172.16.50.2 driver: ice link: link5 model: Intel-E810XXV @@ -60,7 +60,7 @@ nodes: # s84-t213-tg1-c4/p4 - 25GE port4 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:7b:3b" pci_address: "0000:31:00.3" - ip4_address: "172.16.60.2" + ip4_address: 172.16.60.2 driver: ice link: link6 model: Intel-E810XXV @@ -68,7 +68,7 @@ nodes: # s84-t213-tg1-c2/p1 - 25GE port1 Intel NIC xxv710 4p25GE. mac_address: "40:a6:b7:40:86:e0" pci_address: "0000:4b:00.0" - ip4_address: "172.16.70.2" + ip4_address: 172.16.70.2 driver: i40e link: link7 model: Intel-XXV710 @@ -76,7 +76,7 @@ nodes: # s84-t213-tg1-c2/p2 - 25GE port2 Intel NIC xxv710 4p25GE. mac_address: "40:a6:b7:40:86:e1" pci_address: "0000:4b:00.1" - ip4_address: "172.16.80.2" + ip4_address: 172.16.80.2 driver: i40e link: link8 model: Intel-XXV710 @@ -84,7 +84,7 @@ nodes: # s84-t213-tg1-c8/p1 - 200GE port1 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a0:78" pci_address: "0000:b1:00.0" - ip4_address: "172.16.90.2" + ip4_address: 172.16.90.2 driver: mlx5_core link: link9 model: Mellanox-CX7VEAT @@ -92,7 +92,7 @@ nodes: # s84-t213-tg1-c8/p2 - 200GE port2 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a0:79" pci_address: "0000:b1:00.1" - ip4_address: "172.16.100.2" + ip4_address: 172.16.100.2 driver: mlx5_core link: link10 model: Mellanox-CX7VEAT @@ -100,7 +100,7 @@ nodes: # s84-t213-tg1-c6/p1 - 100GE port1 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:67:21:78" pci_address: "0000:ca:00.0" - ip4_address: "172.16.110.2" + ip4_address: 172.16.110.2 driver: ice link: link11 model: Intel-E810CQ @@ -108,13 +108,14 @@ nodes: # s84-t213-tg1-c6/p2 - 100GE port2 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:67:21:7c" pci_address: "0000:cc:00.0" - ip4_address: "172.16.110.2" + ip4_address: 172.16.110.2 driver: ice link: link11 model: Intel-E810CQ DUT1: type: DUT - host: "10.30.51.83" + model: Intel-Icelake + host: 10.30.51.83 arch: x86_64 port: 22 username: testuser @@ -125,7 +126,7 @@ nodes: # s83-t213-sut1-c9/p1 - 100GE port1 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:67:22:4c" pci_address: "0000:17:00.0" - ip4_address: "172.16.10.1" + ip4_address: 172.16.10.1 driver: ice link: link1 model: Intel-E810CQ @@ -133,7 +134,7 @@ nodes: # s83-t213-sut1-c9/p2 - 100GE port2 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:67:22:48" pci_address: "0000:19:00.0" - ip4_address: "172.16.20.1" + ip4_address: 172.16.20.1 driver: ice link: link2 model: Intel-E810CQ @@ -141,7 +142,7 @@ nodes: # s83-t213-sut1-c4/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:7b:d8" pci_address: "0000:31:00.0" - ip4_address: "172.16.30.1" + ip4_address: 172.16.30.1 driver: ice link: link3 model: Intel-E810XXV @@ -149,7 +150,7 @@ nodes: # s83-t213-sut1-c4/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:7b:d9" pci_address: "0000:31:00.1" - ip4_address: "172.16.40.1" + ip4_address: 172.16.40.1 driver: ice link: link4 model: Intel-E810XXV @@ -157,7 +158,7 @@ nodes: # s83-t213-sut1-c4/p3 - 25GE port3 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:7b:da" pci_address: "0000:31:00.2" - ip4_address: "172.16.50.1" + ip4_address: 172.16.50.1 driver: ice link: link5 model: Intel-E810XXV @@ -165,7 +166,7 @@ nodes: # s83-t213-sut1-c4/p4 - 25GE port4 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:7b:db" pci_address: "0000:31:00.3" - ip4_address: "172.16.60.1" + ip4_address: 172.16.60.1 driver: ice link: link6 model: Intel-E810XXV @@ -173,7 +174,7 @@ nodes: # s83-t213-sut1-c2/p1 - 25GE port1 Intel NIC xxv710 2p25GE. mac_address: "40:a6:b7:40:86:dc" pci_address: "0000:4b:00.0" - ip4_address: "172.16.70.1" + ip4_address: 172.16.70.1 driver: i40e link: link7 model: Intel-XXV710 @@ -181,7 +182,7 @@ nodes: # s83-t213-sut1-c2/p2 - 25GE port2 Intel NIC xxv710 2p25GE. mac_address: "40:a6:b7:40:86:dd" pci_address: "0000:4b:00.1" - ip4_address: "172.16.80.1" + ip4_address: 172.16.80.1 driver: i40e link: link8 model: Intel-XXV710 @@ -189,7 +190,7 @@ nodes: # s83-t213-sut1-c8/p1 - 200GE port1 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a0:40" pci_address: "0000:b1:00.0" - ip4_address: "172.16.90.1" + ip4_address: 172.16.90.1 driver: mlx5_core link: link9 model: Mellanox-CX7VEAT @@ -197,7 +198,7 @@ nodes: # s83-t213-sut1-c8/p2 - 200GE port2 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a0:41" pci_address: "0000:b1:00.1" - ip4_address: "172.16.100.1" + ip4_address: 172.16.100.1 driver: mlx5_core link: link10 model: Mellanox-CX7VEAT
\ No newline at end of file diff --git a/topologies/available/lf_2n_icx_testbed214.yaml b/topologies/available/lf_2n_icx_testbed214.yaml index 8f987af691..ce21b8f7e7 100644 --- a/topologies/available/lf_2n_icx_testbed214.yaml +++ b/topologies/available/lf_2n_icx_testbed214.yaml @@ -4,13 +4,13 @@ metadata: schema: - resources/topology_schemas/2_node_topology.sch.yaml - resources/topology_schemas/topology.sch.yaml - tags: [hw, 2-node] nodes: TG: type: TG subtype: TREX - host: "10.30.51.86" + model: Intel-Icelake + host: 10.30.51.86 arch: x86_64 port: 6001 username: testuser @@ -20,7 +20,7 @@ nodes: # s86-t214-tg1-c9/p1 - 100GE port1 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:67:1d:9c" pci_address: "0000:17:00.0" - ip4_address: "172.16.10.2" + ip4_address: 172.16.10.2 driver: ice link: link1 model: Intel-E810CQ @@ -28,7 +28,7 @@ nodes: # s86-t214-tg1-c9/p2 - 100GE port2 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:67:1d:98" pci_address: "0000:19:00.0" - ip4_address: "172.16.20.2" + ip4_address: 172.16.20.2 driver: ice link: link2 model: Intel-E810CQ @@ -36,7 +36,7 @@ nodes: # s86-t214-tg1-c4/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:78:98" pci_address: "0000:31:00.0" - ip4_address: "172.16.30.2" + ip4_address: 172.16.30.2 driver: ice link: link3 model: Intel-E810XXV @@ -44,7 +44,7 @@ nodes: # s86-t214-tg1-c4/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:78:99" pci_address: "0000:31:00.1" - ip4_address: "172.16.40.2" + ip4_address: 172.16.40.2 driver: ice link: link4 model: Intel-E810XXV @@ -52,7 +52,7 @@ nodes: # s86-t214-tg1-c4/p3 - 25GE port3 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:78:9a" pci_address: "0000:31:00.2" - ip4_address: "172.16.50.2" + ip4_address: 172.16.50.2 driver: ice link: link5 model: Intel-E810XXV @@ -60,7 +60,7 @@ nodes: # s86-t214-tg1-c4/p4 - 25GE port4 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:78:9b" pci_address: "0000:31:00.3" - ip4_address: "172.16.60.2" + ip4_address: 172.16.60.2 driver: ice link: link6 model: Intel-E810XXV @@ -68,7 +68,7 @@ nodes: # s86-t214-tg1-c2/p1 - 25GE port1 Intel NIC xxv710 4p25GE. mac_address: "40:a6:b7:40:85:98" pci_address: "0000:4b:00.0" - ip4_address: "172.16.70.2" + ip4_address: 172.16.70.2 driver: i40e link: link7 model: Intel-XXV710 @@ -76,7 +76,7 @@ nodes: # s86-t214-tg1-c2/p2 - 25GE port2 Intel NIC xxv710 4p25GE. mac_address: "40:a6:b7:40:85:99" pci_address: "0000:4b:00.1" - ip4_address: "172.16.80.2" + ip4_address: 172.16.80.2 driver: i40e link: link8 model: Intel-XXV710 @@ -84,7 +84,7 @@ nodes: # s86-t214-tg1-c8/p1 - 200GE port1 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:f9:c3:46" pci_address: "0000:b1:00.0" - ip4_address: "172.16.90.2" + ip4_address: 172.16.90.2 driver: mlx5_core link: link9 model: Mellanox-CX7VEAT @@ -92,7 +92,7 @@ nodes: # s86-t214-tg1-c8/p2 - 200GE port2 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:f9:c3:47" pci_address: "0000:b1:00.1" - ip4_address: "172.16.100.2" + ip4_address: 172.16.100.2 driver: mlx5_core link: link10 model: Mellanox-CX7VEAT @@ -100,7 +100,7 @@ nodes: # s86-t214-tg1-c6/p1 - 100GE port1 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:67:26:70" pci_address: "0000:ca:00.0" - ip4_address: "172.16.100.2" + ip4_address: 172.16.100.2 driver: ice link: link11 model: Intel-E810CQ @@ -108,13 +108,14 @@ nodes: # s86-t214-tg1-c6/p2 - 100GE port2 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:67:26:74" pci_address: "0000:cc:00.0" - ip4_address: "172.16.110.2" + ip4_address: 172.16.110.2 driver: ice link: link11 model: Intel-E810CQ DUT1: type: DUT - host: "10.30.51.85" + model: Intel-Icelake + host: 10.30.51.85 arch: x86_64 port: 22 username: testuser @@ -125,7 +126,7 @@ nodes: # s85-t214-sut1-c9/p1 - 100GE port1 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:67:19:3c" pci_address: "0000:17:00.0" - ip4_address: "172.16.10.1" + ip4_address: 172.16.10.1 driver: ice link: link2 model: Intel-E810CQ @@ -133,7 +134,7 @@ nodes: # s85-t214-sut1-c9/p2 - 100GE port2 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:67:19:38" pci_address: "0000:19:00.0" - ip4_address: "172.16.20.1" + ip4_address: 172.16.20.1 driver: ice link: link1 model: Intel-E810CQ @@ -141,7 +142,7 @@ nodes: # s85-t214-sut1-c4/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:77:54" pci_address: "0000:31:00.0" - ip4_address: "172.16.30.1" + ip4_address: 172.16.30.1 driver: ice link: link3 model: Intel-E810XXV @@ -149,7 +150,7 @@ nodes: # s85-t214-sut1-c4/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:77:55" pci_address: "0000:31:00.1" - ip4_address: "172.16.40.1" + ip4_address: 172.16.40.1 driver: ice link: link4 model: Intel-E810XXV @@ -157,7 +158,7 @@ nodes: # s85-t214-sut1-c4/p3 - 25GE port3 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:77:56" pci_address: "0000:31:00.2" - ip4_address: "172.16.50.1" + ip4_address: 172.16.50.1 driver: ice link: link5 model: Intel-E810XXV @@ -165,7 +166,7 @@ nodes: # s85-t214-sut1-c4/p4 - 25GE port4 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:77:57" pci_address: "0000:31:00.3" - ip4_address: "172.16.60.1" + ip4_address: 172.16.60.1 driver: ice link: link6 model: Intel-E810XXV @@ -173,7 +174,7 @@ nodes: # s85-t214-sut1-c2/p1 - 25GE port1 Intel NIC xxv710 2p25GE. mac_address: "40:a6:b7:40:85:e0" pci_address: "0000:4b:00.0" - ip4_address: "172.16.70.1" + ip4_address: 172.16.70.1 driver: i40e link: link7 model: Intel-XXV710 @@ -181,7 +182,7 @@ nodes: # s85-t214-sut1-c2/p2 - 25GE port2 Intel NIC xxv710 2p25GE. mac_address: "40:a6:b7:40:85:e1" pci_address: "0000:4b:00.1" - ip4_address: "172.16.80.1" + ip4_address: 172.16.80.1 driver: i40e link: link8 model: Intel-XXV710 @@ -189,7 +190,7 @@ nodes: # s85-t214-sut1-c8/p1 - 200GE port1 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a0:38" pci_address: "0000:b1:00.0" - ip4_address: "172.16.90.1" + ip4_address: 172.16.90.1 driver: mlx5_core link: link9 model: Mellanox-CX7VEAT @@ -197,7 +198,7 @@ nodes: # s85-t214-sut1-c8/p2 - 200GE port2 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a0:39" pci_address: "0000:b1:00.1" - ip4_address: "172.16.100.1" + ip4_address: 172.16.100.1 driver: mlx5_core link: link10 model: Mellanox-CX7VEAT
\ No newline at end of file diff --git a/topologies/available/lf_2n_spr_testbed23.yaml b/topologies/available/lf_2n_spr_testbed23.yaml index 3ff6fccbea..c6e42253bb 100644 --- a/topologies/available/lf_2n_spr_testbed23.yaml +++ b/topologies/available/lf_2n_spr_testbed23.yaml @@ -4,13 +4,13 @@ metadata: schema: - resources/topology_schemas/2_node_topology.sch.yaml - resources/topology_schemas/topology.sch.yaml - tags: [hw, 2-node] nodes: TG: type: TG subtype: TREX - host: "10.30.51.57" + model: Intel-Sapphirerapids + host: 10.30.51.57 arch: x86_64 port: 6001 username: testuser @@ -27,22 +27,22 @@ nodes: cryptodev: device1: pci_address: "0000:76:00.0" - driver: "4xxx" - model: "HW_4xxx" - module: "qat_4xxx" + driver: 4xxx + model: HW_4xxx + module: qat_4xxx numvfs: 8 #device2: # pci_address: "0000:7a:00.0" - # driver: "4xxx" - # model: "HW_4xxx" - # module: "qat_4xxx" + # driver: 4xxx + # model: HW_4xxx + # module: qat_4xxx # numvfs: 8 interfaces: port1: # s57-t23-tg1-c2/p1 - 200GE port1 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a0:28" pci_address: "0000:3d:00.0" - ip4_address: "172.16.10.2" + ip4_address: 172.16.10.2 driver: mlx5_core link: link1 model: Mellanox-CX7VEAT @@ -50,7 +50,7 @@ nodes: # s57-t23-tg1-c2/p2 - 200GE port2 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a0:29" pci_address: "0000:3d:00.1" - ip4_address: "172.16.20.2" + ip4_address: 172.16.20.2 driver: mlx5_core link: link2 model: Mellanox-CX7VEAT @@ -58,7 +58,7 @@ nodes: # s57-t23-tg1-c4/p1 - 100GE port1 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:9e:e9:a8" pci_address: "0000:2a:00.0" - ip4_address: "172.16.30.2" + ip4_address: 172.16.30.2 driver: ice link: link3 model: Intel-E810CQ @@ -66,7 +66,7 @@ nodes: # s57-t23-tg1-c4/p2 - 100GE port2 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:9e:e9:ac" pci_address: "0000:2c:00.0" - ip4_address: "172.16.40.2" + ip4_address: 172.16.40.2 driver: ice link: link4 model: Intel-E810CQ @@ -74,7 +74,7 @@ nodes: # s57-t23-tg1-c10/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE. mac_address: "50:7c:6f:48:4a:54" pci_address: "0000:17:00.0" - ip4_address: "172.16.50.2" + ip4_address: 172.16.50.2 driver: ice link: link5 model: Intel-E810XXV @@ -82,7 +82,7 @@ nodes: # s57-t23-tg1-c10/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE. mac_address: "50:7c:6f:48:4a:55" pci_address: "0000:17:00.1" - ip4_address: "172.16.60.2" + ip4_address: 172.16.60.2 driver: ice link: link6 model: Intel-E810XXV @@ -90,7 +90,7 @@ nodes: # s57-t23-tg1-c10/p3 - 25GE port3 Intel E810-XXVDA4 4p25GE. mac_address: "50:7c:6f:48:4a:56" pci_address: "0000:17:00.2" - ip4_address: "172.16.70.2" + ip4_address: 172.16.70.2 driver: ice link: link7 model: Intel-E810XXV @@ -98,7 +98,7 @@ nodes: # s57-t23-tg1-c10/p4 - 25GE port4 Intel E810-XXVDA4 4p25GE. mac_address: "50:7c:6f:48:4a:57" pci_address: "0000:17:00.3" - ip4_address: "172.16.80.2" + ip4_address: 172.16.80.2 driver: ice link: link8 model: Intel-E810XXV @@ -106,7 +106,7 @@ nodes: # s57-t23-tg1-c7/p1 - 200GE port1 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a0:68" pci_address: "0000:ab:00.0" - ip4_address: "172.16.90.2" + ip4_address: 172.16.90.2 driver: mlx5_core link: link9 model: Mellanox-CX7VEAT @@ -114,7 +114,7 @@ nodes: # s57-t23-tg1-c7/p2 - 200GE port2 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a0:69" pci_address: "0000:ab:00.1" - ip4_address: "172.16.100.2" + ip4_address: 172.16.100.2 driver: mlx5_core link: link9 model: Mellanox-CX7VEAT @@ -122,7 +122,7 @@ nodes: # s57-t23-tg1-c9/p1 - 100GE port1 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:9e:e2:20" pci_address: "0000:bd:00.0" - ip4_address: "172.16.110.2" + ip4_address: "172.16.110.2 driver: ice link: link10 model: Intel-E810CQ @@ -130,13 +130,14 @@ nodes: # s57-t23-tg1-c9/p2 - 100GE port2 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:9e:e2:24" pci_address: "0000:bf:00.0" - ip4_address: "172.16.120.2" + ip4_address: 172.16.120.2 driver: ice link: link10 model: Intel-E810CQ DUT1: type: DUT - host: "10.30.51.56" + model: Intel-Sapphirerapids + host: 10.30.51.56 arch: x86_64 port: 22 username: testuser @@ -160,16 +161,16 @@ nodes: numvfs: 8 #device2: # pci_address: "0000:7a:00.0" - # driver: "4xxx" - # model: "HW_4xxx" - # module: "qat_4xxx" + # driver: 4xxx + # model: HW_4xxx + # module: qat_4xxx # numvfs: 8 interfaces: port1: # s56-t23-sut1-c2/p1 - 200GE port1 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a0:30" pci_address: "0000:3d:00.0" - ip4_address: "172.16.10.1" + ip4_address: 172.16.10.1 driver: mlx5_core link: link1 model: Mellanox-CX7VEAT @@ -177,7 +178,7 @@ nodes: # s56-t23-sut1-c2/p2 - 200GE port2 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a0:31" pci_address: "0000:3d:00.1" - ip4_address: "172.16.20.1" + ip4_address: 172.16.20.1 driver: mlx5_core link: link2 model: Mellanox-CX7VEAT @@ -185,7 +186,7 @@ nodes: # s56-t23-sut1-c4/p1 - 100GE port1 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:9e:e2:70" pci_address: "0000:2a:00.0" - ip4_address: "172.16.30.1" + ip4_address: 172.16.30.1 driver: ice link: link3 model: Intel-E810CQ @@ -193,7 +194,7 @@ nodes: # s56-t23-sut1-c4/p2 - 100GE port2 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:9e:e2:74" pci_address: "0000:2c:00.0" - ip4_address: "172.16.40.1" + ip4_address: 172.16.40.1 driver: ice link: link4 model: Intel-E810CQ @@ -201,7 +202,7 @@ nodes: # s56-t23-sut1-c10/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE. mac_address: "50:7c:6f:48:45:70" pci_address: "0000:17:00.0" - ip4_address: "172.16.50.1" + ip4_address: 172.16.50.1 driver: ice link: link5 model: Intel-E810XXV @@ -209,7 +210,7 @@ nodes: # s56-t23-sut1-c10/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE. mac_address: "50:7c:6f:48:45:71" pci_address: "0000:17:00.1" - ip4_address: "172.16.60.1" + ip4_address: 172.16.60.1 driver: ice link: link6 model: Intel-E810XXV @@ -217,7 +218,7 @@ nodes: # s56-t23-sut1-c10/p3 - 25GE port3 Intel E810-XXVDA4 4p25GE. mac_address: "50:7c:6f:48:45:72" pci_address: "0000:17:00.2" - ip4_address: "172.16.70.1" + ip4_address: 172.16.70.1 driver: ice link: link7 model: Intel-E810XXV @@ -225,7 +226,7 @@ nodes: # s56-t23-sut1-c10/p4 - 25GE port4 Intel E810-XXVDA4 4p25GE. mac_address: "50:7c:6f:48:45:73" pci_address: "0000:17:00.3" - ip4_address: "172.16.80.1" + ip4_address: 172.16.80.1 driver: ice link: link8 - model: Intel-E810XXV + model: Intel-E810XXV
\ No newline at end of file diff --git a/topologies/available/lf_2n_spr_testbed24.yaml b/topologies/available/lf_2n_spr_testbed24.yaml index 4be4886837..47fe796e16 100644 --- a/topologies/available/lf_2n_spr_testbed24.yaml +++ b/topologies/available/lf_2n_spr_testbed24.yaml @@ -4,13 +4,13 @@ metadata: schema: - resources/topology_schemas/2_node_topology.sch.yaml - resources/topology_schemas/topology.sch.yaml - tags: [hw, 2-node] nodes: TG: type: TG subtype: TREX - host: "10.30.51.59" + model: Intel-Sapphirerapids + host: 10.30.51.59 arch: x86_64 port: 6001 username: testuser @@ -27,22 +27,22 @@ nodes: cryptodev: device1: pci_address: "0000:76:00.0" - driver: "4xxx" - model: "HW_4xxx" - module: "qat_4xxx" + driver: 4xxx + model: HW_4xxx + module: qat_4xxx numvfs: 8 #device2: # pci_address: "0000:7a:00.0" - # driver: "4xxx" - # model: "HW_4xxx" - # module: "qat_4xxx" + # driver: 4xxx + # model: HW_4xxx + # module: qat_4xxx # numvfs: 8 interfaces: port1: # s59-t24-tg1-c2/p1 - 200GE port1 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a0:60" pci_address: "0000:3d:00.0" - ip4_address: "172.16.10.2" + ip4_address: 172.16.10.2 driver: mlx5_core link: link1 model: Mellanox-CX7VEAT @@ -50,7 +50,7 @@ nodes: # s59-t24-tg1-c2/p2 - 200GE port2 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a0:61" pci_address: "0000:3d:00.1" - ip4_address: "172.16.20.2" + ip4_address: 172.16.20.2 driver: mlx5_core link: link2 model: Mellanox-CX7VEAT @@ -58,7 +58,7 @@ nodes: # s59-t24-tg1-c4/p1 - 100GE port1 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:9e:e3:58" pci_address: "0000:2a:00.0" - ip4_address: "172.16.30.2" + ip4_address: 172.16.30.2 driver: ice link: link3 model: Intel-E810CQ @@ -66,7 +66,7 @@ nodes: # s59-t24-tg1-c4/p2 - 100GE port2 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:9e:e3:5c" pci_address: "0000:2c:00.0" - ip4_address: "172.16.40.2" + ip4_address: 172.16.40.2 driver: ice link: link4 model: Intel-E810CQ @@ -74,7 +74,7 @@ nodes: # s59-t24-tg1-c10/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE. mac_address: "50:7c:6f:48:41:a8" pci_address: "0000:17:00.0" - ip4_address: "172.16.50.2" + ip4_address: 172.16.50.2 driver: ice link: link5 model: Intel-E810XXV @@ -82,7 +82,7 @@ nodes: # s59-t24-tg1-c10/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE. mac_address: "50:7c:6f:48:41:a9" pci_address: "0000:17:00.1" - ip4_address: "172.16.60.2" + ip4_address: 172.16.60.2 driver: ice link: link6 model: Intel-E810XXV @@ -90,7 +90,7 @@ nodes: # s59-t24-tg1-c10/p3 - 25GE port3 Intel E810-XXVDA4 4p25GE. mac_address: "50:7c:6f:48:41:aa" pci_address: "0000:17:00.2" - ip4_address: "172.16.70.2" + ip4_address: 172.16.70.2 driver: ice link: link7 model: Intel-E810XXV @@ -98,7 +98,7 @@ nodes: # s59-t24-tg1-c10/p4 - 25GE port4 Intel E810-XXVDA4 4p25GE. mac_address: "50:7c:6f:48:41:ab" pci_address: "0000:17:00.3" - ip4_address: "172.16.80.2" + ip4_address: 172.16.80.2 driver: ice link: link8 model: Intel-E810XXV @@ -106,7 +106,7 @@ nodes: # s59-t24-tg1-c7/p1 - 200GE port1 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a0:58" pci_address: "0000:ab:00.0" - ip4_address: "172.16.90.2" + ip4_address: 172.16.90.2 driver: mlx5_core link: link9 model: Mellanox-CX7VEAT @@ -114,7 +114,7 @@ nodes: # s59-t24-tg1-c7/p2 - 200GE port2 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a0:59" pci_address: "0000:ab:00.1" - ip4_address: "172.16.100.2" + ip4_address: 172.16.100.2 driver: mlx5_core link: link9 model: Mellanox-CX7VEAT @@ -122,7 +122,7 @@ nodes: # s59-t24-tg1-c9/p1 - 100GE port1 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:67:21:48" pci_address: "0000:bd:00.0" - ip4_address: "172.16.110.2" + ip4_address: 172.16.110.2 driver: ice link: link10 model: Intel-E810CQ @@ -130,13 +130,14 @@ nodes: # s59-t24-tg1-c9/p2 - 100GE port2 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:67:21:4c" pci_address: "0000:bf:00.0" - ip4_address: "172.16.120.2" + ip4_address: 172.16.120.2 driver: ice link: link10 model: Intel-E810CQ DUT1: type: DUT - host: "10.30.51.58" + model: Intel-Sapphirerapids + host: 10.30.51.58 arch: x86_64 port: 22 username: testuser @@ -154,22 +155,22 @@ nodes: cryptodev: device1: pci_address: "0000:76:00.0" - driver: "4xxx" - model: "HW_4xxx" - module: "qat_4xxx" + driver: 4xxx + model: HW_4xxx + module: qat_4xxx numvfs: 8 #device2: # pci_address: "0000:7a:00.0" - # driver: "4xxx" - # model: "HW_4xxx" - # module: "qat_4xxx" + # driver: 4xxx + # model: HW_4xxx + # module: qat_4xxx # numvfs: 8 interfaces: port1: # s58-t24-sut1-c2/p1 - 200GE port1 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a0:d0" pci_address: "0000:3d:00.0" - ip4_address: "172.16.10.1" + ip4_address: 172.16.10.1 driver: mlx5_core link: link1 model: Mellanox-CX7VEAT @@ -177,7 +178,7 @@ nodes: # s58-t24-sut1-c2/p2 - 200GE port2 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a0:d1" pci_address: "0000:3d:00.1" - ip4_address: "172.16.20.1" + ip4_address: 172.16.20.1 driver: mlx5_core link: link2 model: Mellanox-CX7VEAT @@ -185,7 +186,7 @@ nodes: # s58-t24-sut1-c4/p1 - 100GE port1 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:9e:e9:98" pci_address: "0000:2a:00.0" - ip4_address: "172.16.30.1" + ip4_address: 172.16.30.1 driver: ice link: link3 model: Intel-E810CQ @@ -193,7 +194,7 @@ nodes: # s58-t24-sut1-c4/p2 - 100GE port2 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:9e:e9:9c" pci_address: "0000:2c:00.0" - ip4_address: "172.16.40.1" + ip4_address: 172.16.40.1 driver: ice link: link4 model: Intel-E810CQ @@ -201,7 +202,7 @@ nodes: # s58-t24-sut1-c10/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE. mac_address: "50:7c:6f:48:46:44" pci_address: "0000:17:00.0" - ip4_address: "172.16.50.1" + ip4_address: 172.16.50.1 driver: ice link: link5 model: Intel-E810XXV @@ -209,7 +210,7 @@ nodes: # s58-t24-sut1-c10/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE. mac_address: "50:7c:6f:48:46:45" pci_address: "0000:17:00.1" - ip4_address: "172.16.60.1" + ip4_address: 172.16.60.1 driver: ice link: link6 model: Intel-E810XXV @@ -217,7 +218,7 @@ nodes: # s58-t24-sut1-c10/p3 - 25GE port3 Intel E810-XXVDA4 4p25GE. mac_address: "50:7c:6f:48:46:46" pci_address: "0000:17:00.2" - ip4_address: "172.16.70.1" + ip4_address: 172.16.70.1 driver: ice link: link7 model: Intel-E810XXV @@ -225,7 +226,7 @@ nodes: # s58-t24-sut1-c10/p4 - 25GE port4 Intel E810-XXVDA4 4p25GE. mac_address: "50:7c:6f:48:46:47" pci_address: "0000:17:00.3" - ip4_address: "172.16.80.1" + ip4_address: 172.16.80.1 driver: ice link: link8 - model: Intel-E810XXV + model: Intel-E810XXV
\ No newline at end of file diff --git a/topologies/available/lf_2n_zn2_testbed210.yaml b/topologies/available/lf_2n_zn2_testbed210.yaml index 7a8748f5a5..36296ae3ef 100644 --- a/topologies/available/lf_2n_zn2_testbed210.yaml +++ b/topologies/available/lf_2n_zn2_testbed210.yaml @@ -4,13 +4,13 @@ metadata: schema: - resources/topology_schemas/2_node_topology.sch.yaml - resources/topology_schemas/topology.sch.yaml - tags: [hw, 2-node] nodes: TG: type: TG subtype: TREX - host: "10.30.51.61" + model: Amd-Epyc + host: 10.30.51.61 arch: x86_64 port: 6001 username: testuser @@ -20,7 +20,7 @@ nodes: # s61-t210-tg1-c1/p1 - 100GE-port1 ConnectX5-2p100GE. mac_address: "0c:42:a1:70:b0:6a" pci_address: "0000:01:00.0" - ip4_address: "172.16.10.2" + ip4_address: 172.16.10.2 driver: mlx5_core link: link1 model: Mellanox-CX556A @@ -28,7 +28,7 @@ nodes: # s61-t210-tg1-c1/p2 - 100GE-port2 ConnectX5-2p100GE. mac_address: "0c:42:a1:70:b0:6b" pci_address: "0000:01:00.1" - ip4_address: "172.16.20.1" + ip4_address: 172.16.20.1 driver: mlx5_core link: link2 model: Mellanox-CX556A @@ -36,7 +36,7 @@ nodes: # s61-t210-tg1-c2/p1 - 25GE port1 on Intel NIC xxv710 2p25GE. mac_address: "40:a6:b7:02:89:dc" pci_address: "0000:41:00.0" - ip4_address: "172.16.30.2" + ip4_address: 172.16.30.2 driver: i40e link: link3 model: Intel-XXV710 @@ -44,7 +44,7 @@ nodes: # s61-t210-tg1-c2/p2 - 25GE port2 on Intel NIC xxv710 2p25GE. mac_address: "40:a6:b7:02:89:dd" pci_address: "0000:41:00.1" - ip4_address: "172.16.40.2" + ip4_address: 172.16.40.2 driver: i40e link: link4 model: Intel-XXV710 @@ -52,7 +52,7 @@ nodes: # s61-t210-tg1-c3/p1 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "80:61:5f:01:5a:72" pci_address: "0000:81:00.0" - ip4_address: "172.16.50.2" + ip4_address: 172.16.50.2 driver: i40e link: link5 model: Intel-X710 @@ -60,7 +60,7 @@ nodes: # s61-t210-tg1-c3/p2 - 10GE port2 on Intel NIC x710 4p10GE. mac_address: "80:61:5f:01:5a:73" pci_address: "0000:81:00.1" - ip4_address: "172.16.60.2" + ip4_address: 172.16.60.2 driver: i40e link: link6 model: Intel-X710 @@ -68,7 +68,7 @@ nodes: # s61-t210-tg1-c3/p3 - 10GE port3 on Intel NIC x710 4p10GE. mac_address: "80:61:5f:01:5a:74" pci_address: "0000:81:00.2" - ip4_address: "172.16.70.2" + ip4_address: 172.16.70.2 driver: i40e link: link7 model: Intel-X710 @@ -76,13 +76,14 @@ nodes: # s61-t210-tg1-c3/p4 - 10GE port4 on Intel NIC x710 4p10GE. mac_address: "80:61:5f:01:5a:75" pci_address: "0000:81:00.3" - ip4_address: "172.16.80.2" + ip4_address: 172.16.80.2 driver: i40e link: link8 model: Intel-X710 DUT1: type: DUT - host: "10.30.51.60" + model: Amd-Epyc + host: 10.30.51.60 arch: x86_64 port: 22 username: testuser @@ -93,7 +94,7 @@ nodes: # s60-t210-sut1-c1/p1 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "80:61:5f:03:dd:a6" pci_address: "0000:01:00.0" - ip4_address: "172.16.50.1" + ip4_address: 172.16.50.1 driver: i40e link: link5 model: Intel-X710 @@ -101,7 +102,7 @@ nodes: # s60-t210-sut1-c1/p2 - 10GE port2 on Intel NIC x710 4p10GE. mac_address: "80:61:5f:03:dd:a7" pci_address: "0000:01:00.1" - ip4_address: "172.16.60.1" + ip4_address: 172.16.60.1 driver: i40e link: link6 model: Intel-X710 @@ -109,7 +110,7 @@ nodes: # s60-t210-sut1-c1/p3 - 10GE port3 on Intel NIC x710 4p10GE. mac_address: "80:61:5f:03:dd:a8" pci_address: "0000:01:00.2" - ip4_address: "172.16.70.1" + ip4_address: 172.16.70.1 driver: i40e link: link7 model: Intel-X710 @@ -117,7 +118,7 @@ nodes: # s60-t210-sut1-c1/p4 - 10GE port4 on Intel NIC x710 4p10GE. mac_address: "80:61:5f:03:dd:a9" pci_address: "0000:01:00.3" - ip4_address: "172.16.80.1" + ip4_address: 172.16.80.1 driver: i40e link: link8 model: Intel-X710 @@ -125,7 +126,7 @@ nodes: # s60-t210-sut1-c2/p1 - 25GE port1 on Intel NIC xxv710 2p25GE. mac_address: "40:a6:b7:02:89:28" pci_address: "0000:41:00.0" - ip4_address: "172.16.30.1" + ip4_address: 172.16.30.1 driver: i40e link: link3 model: Intel-XXV710 @@ -133,7 +134,7 @@ nodes: # s60-t210-sut1-c2/p2 - 25GE port2 on Intel NIC xxv710 2p25GE. mac_address: "40:a6:b7:02:89:29" pci_address: "0000:41:00.1" - ip4_address: "172.16.40.1" + ip4_address: 172.16.40.1 driver: i40e link: link4 model: Intel-XXV710 @@ -141,7 +142,7 @@ nodes: # s60-t210-sut1-c3/p1 - 100GE-port1 ConnectX5-2p100GE. mac_address: "0c:42:a1:70:ad:ba" pci_address: "0000:81:00.0" - ip4_address: "172.16.10.2" + ip4_address: 172.16.10.2 driver: mlx5_core link: link1 model: Mellanox-CX556A @@ -149,7 +150,7 @@ nodes: # s60-t210-sut1-c3/p2 - 100GE-port2 ConnectX5-2p100GE. mac_address: "0c:42:a1:70:ad:bb" pci_address: "0000:81:00.1" - ip4_address: "172.16.20.1" + ip4_address: 172.16.20.1 driver: mlx5_core link: link2 - model: Mellanox-CX556A + model: Mellanox-CX556A
\ No newline at end of file diff --git a/topologies/available/lf_3n_alt_testbed34.yaml b/topologies/available/lf_3n_alt_testbed34.yaml index 46e09df419..a82c376af8 100644 --- a/topologies/available/lf_3n_alt_testbed34.yaml +++ b/topologies/available/lf_3n_alt_testbed34.yaml @@ -1,16 +1,16 @@ --- metadata: version: 0.1 - schema: # list of schema files against which to validate + schema: - resources/topology_schemas/3_node_topology.sch.yaml - resources/topology_schemas/topology.sch.yaml - tags: [hw, 3-node] nodes: TG: type: TG subtype: TREX - host: "10.30.51.74" + model: Intel-Icelake + host: 10.30.51.74 arch: x86_64 port: 6001 username: testuser @@ -20,7 +20,7 @@ nodes: # s74-t34-tg1-c4/p1 - 40GE port1 Intel XL710 2p40GE. mac_address: "40:a6:b7:85:e7:80" pci_address: "0000:31:00.0" - ip4_address: "172.16.10.2" + ip4_address: 172.16.10.2 driver: i40e link: link1 model: Intel-XL710 @@ -28,7 +28,7 @@ nodes: # s74-t34-tg1-c4/p2 - 40GE port2 Intel XL710 2p40GE. mac_address: "40:a6:b7:85:e7:81" pci_address: "0000:31:00.1" - ip4_address: "172.16.20.2" + ip4_address: 172.16.20.2 driver: i40e link: link2 model: Intel-XL710 @@ -36,7 +36,7 @@ nodes: # s74-t34-tg1-c8/p1 - 100GE port1 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:67:1c:e4" pci_address: "0000:b1:00.0" - ip4_address: "172.16.30.2" + ip4_address: 172.16.30.2 driver: ice link: link4 model: Intel-E810CQ @@ -44,12 +44,13 @@ nodes: # s74-t34-tg1-c8/p2 - 100GE port2 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:67:1c:e0" pci_address: "0000:b3:00.0" - ip4_address: "172.16.40.2" + ip4_address: 172.16.40.2 driver: ice link: link5 model: Intel-E810CQ DUT1: type: DUT + model: Ampere-Altra host: 10.30.51.72 arch: aarch64 port: 22 @@ -61,7 +62,7 @@ nodes: # s62-t34-sut1-c4/p1 - 40GE port1 Intel XL710 2p40GE. mac_address: "40:a6:b7:85:e7:78" pci_address: "0004:04:00.0" - ip4_address: "172.16.10.1" + ip4_address: 172.16.10.1 driver: i40e link: link3 model: Intel-XL710 @@ -69,7 +70,7 @@ nodes: # s62-t34-sut1-c4/p2 - 40GE port2 Intel XL710 2p40GE. mac_address: "40:a6:b7:85:e7:79" pci_address: "0004:04:00.1" - ip4_address: "172.16.20.1" + ip4_address: 172.16.20.1 driver: i40e link: link2 model: Intel-XL710 @@ -77,7 +78,7 @@ nodes: # s62-t34-sut1-c8/p1 - 100GE port1 Mellanox ConnectX-6 Dx 2p100GE. mac_address: "b8:3f:d2:16:07:b8" pci_address: "0007:01:00.0" - ip4_address: "172.16.30.1" + ip4_address: 172.16.30.1 driver: mlx5_core link: link6 model: Mellanox-CX6DX @@ -85,12 +86,13 @@ nodes: # s62-t34-sut1-c8/p2 - 100GE port2 Mellanox ConnectX-6 Dx 2p100GE. mac_address: "b8:3f:d2:16:07:b9" pci_address: "0007:01:00.1" - ip4_address: "172.16.40.1" + ip4_address: 172.16.40.1 driver: mlx5_core link: link4 model: Mellanox-CX6DX DUT2: type: DUT + model: Ampere-Altra host: 10.30.51.73 arch: aarch64 port: 22 @@ -102,7 +104,7 @@ nodes: # s63-t34-sut2-c4/p1 - 40GE port1 Intel XL710 2p40GE. mac_address: "3c:fd:fe:c3:e7:a0" pci_address: "0004:04:00.0" - ip4_address: "172.16.10.3" + ip4_address: 172.16.10.3 driver: i40e link: link1 model: Intel-XL710 @@ -110,7 +112,7 @@ nodes: # s63-t34-sut2-c4/p2 - 40GE port2 Intel XL710 2p40GE. mac_address: "3c:fd:fe:c3:e7:a1" pci_address: "0004:04:00.1" - ip4_address: "172.16.20.3" + ip4_address: 172.16.20.3 driver: i40e link: link3 model: Intel-XL710 @@ -118,7 +120,7 @@ nodes: # s63-t34-sut2-c8/p1 - 100GE port1 Mellanox ConnectX-6 Dx 2p100GE. mac_address: "b8:3f:d2:16:07:c4" pci_address: "0007:01:00.0" - ip4_address: "172.16.30.3" + ip4_address: 172.16.30.3 driver: mlx5_core link: link5 model: Mellanox-CX6DX @@ -126,7 +128,7 @@ nodes: # s63-t34-sut2-c8/p2 - 100GE port2 Mellanox ConnectX-6 Dx 2p100GE. mac_address: "b8:3f:d2:16:07:c5" pci_address: "0007:01:00.1" - ip4_address: "172.16.40.3" + ip4_address: 172.16.40.3 driver: mlx5_core link: link6 model: Mellanox-CX6DX
\ No newline at end of file diff --git a/topologies/available/lf_3n_emr_testbed28.yaml b/topologies/available/lf_3n_emr_testbed28.yaml index 7d9aff6b93..a741e86e3e 100644 --- a/topologies/available/lf_3n_emr_testbed28.yaml +++ b/topologies/available/lf_3n_emr_testbed28.yaml @@ -4,13 +4,13 @@ metadata: schema: - resources/topology_schemas/3_node_topology.sch.yaml - resources/topology_schemas/topology.sch.yaml - tags: [hw, 3-node] nodes: TG: type: TG subtype: TREX - host: "10.30.51.41" + model: Intel-Emeraldrapids + host: 10.30.51.41 arch: x86_64 port: 6001 username: testuser @@ -20,7 +20,7 @@ nodes: # s41-t28-tg1-c4/p1 - 100GE port1 Intel E810-2C-Q2 2p100GE. mac_address: "40:a6:b7:ca:2b:f8" pci_address: "0000:27:00.0" - ip4_address: "172.16.10.1" + ip4_address: 172.16.10.1 driver: ice link: link3 model: Intel-E810CQ @@ -28,13 +28,14 @@ nodes: # s41-t28-tg1-c4/p1 - 100GE port2 Intel E810-2C-Q2 2p100GE. mac_address: "40:a6:b7:ca:2b:fc" pci_address: "0000:29:00.0" - ip4_address: "172.16.30.1" + ip4_address: 172.16.30.1 driver: ice link: link1 model: Intel-E810CQ DUT1: type: DUT - host: "10.30.51.40" + model: Intel-Emeraldrapids + host: 10.30.51.40 arch: x86_64 port: 6001 username: testuser @@ -48,16 +49,16 @@ nodes: cryptodev: device1: pci_address: "0000:70:00.0" - driver: "4xxx" - model: "HW_4xxx" - module: "qat_4xxx" + driver: 4xxx + model: HW_4xxx + module: qat_4xxx numvfs: 8 interfaces: port1: # s40-t28-sut1-c4/p1 - 100GE port1 Intel E810-2C-Q2 2p100GE. mac_address: "40:a6:b7:ca:2a:90" pci_address: "0000:27:00.0" - ip4_address: "172.16.20.1" + ip4_address: 172.16.20.1 driver: ice link: link3 model: Intel-E810CQ @@ -65,13 +66,14 @@ nodes: # s40-t28-sut1-c4/p2 - 100GE port2 Intel E810-2C-Q2 2p100GE. mac_address: "40:a6:b7:ca:2a:94" pci_address: "0000:29:00.0" - ip4_address: "172.16.30.2" + ip4_address: 172.16.30.2 driver: ice link: link2 model: Intel-E810CQ DUT2: type: DUT - host: "10.30.51.40" + model: Intel-Emeraldrapids + host: 10.30.51.40 arch: x86_64 port: 6002 username: testuser @@ -85,16 +87,16 @@ nodes: cryptodev: device1: pci_address: "0000:ed:00.0" - driver: "4xxx" - model: "HW_4xxx" - module: "qat_4xxx" + driver: 4xxx + model: HW_4xxx + module: qat_4xxx numvfs: 8 interfaces: port1: # s40-t28-sut2-c9/p1 - 100GE port1 Intel E810-2C-Q2 2p100GE. mac_address: "40:a6:b7:ca:2a:98" pci_address: "0000:a8:00.0" - ip4_address: "172.16.20.2" + ip4_address: 172.16.20.2 driver: ice link: link1 model: Intel-E810CQ @@ -102,7 +104,7 @@ nodes: # s40-t28-sut2-c9/p2 - 100GE port2 Intel E810-2C-Q2 2p100GE. mac_address: "40:a6:b7:ca:2a:9c" pci_address: "0000:aa:00.0" - ip4_address: "172.16.10.2" + ip4_address: 172.16.10.2 driver: ice link: link2 model: Intel-E810CQ
\ No newline at end of file diff --git a/topologies/available/lf_3n_emr_testbed29.yaml b/topologies/available/lf_3n_emr_testbed29.yaml index 56d38a753e..739c23dc7f 100644 --- a/topologies/available/lf_3n_emr_testbed29.yaml +++ b/topologies/available/lf_3n_emr_testbed29.yaml @@ -4,13 +4,13 @@ metadata: schema: - resources/topology_schemas/3_node_topology.sch.yaml - resources/topology_schemas/topology.sch.yaml - tags: [hw, 3-node] nodes: TG: type: TG subtype: TREX - host: "10.30.51.43" + model: Intel-Emeraldrapids + host: 10.30.51.43 arch: x86_64 port: 6001 username: testuser @@ -23,16 +23,16 @@ nodes: cryptodev: device1: pci_address: "0000:70:00.0" - driver: "4xxx" - model: "HW_4xxx" - module: "qat_4xxx" + driver: 4xxx + model: HW_4xxx + module: qat_4xxx numvfs: 8 interfaces: port1: # s41-t29-tg1-c4/p1 - 100GE port1 Intel E810-2C-Q2 2p100GE. mac_address: "40:a6:b7:ca:2b:f8" pci_address: "0000:27:00.0" - ip4_address: "172.16.10.1" + ip4_address: 172.16.10.1 driver: ice link: link3 model: Intel-E810CQ @@ -40,13 +40,14 @@ nodes: # s41-t29-tg1-c4/p2 - 100GE port2 Intel E810-2C-Q2 2p100GE. mac_address: "40:a6:b7:ca:2a:70" pci_address: "0000:29:00.0" - ip4_address: "172.16.30.1" + ip4_address: 172.16.30.1 driver: ice link: link1 model: Intel-E810CQ DUT1: type: DUT - host: "10.30.51.42" + model: Intel-Emeraldrapids + host: 10.30.51.42 arch: x86_64 port: 6001 username: testuser @@ -60,9 +61,9 @@ nodes: cryptodev: device1: pci_address: "0000:70:00.0" - driver: "4xxx" - model: "HW_4xxx" - module: "qat_4xxx" + driver: 4xxx + model: HW_4xxx + module: qat_4xxx numvfs: 8 interfaces: port1: @@ -83,7 +84,8 @@ nodes: model: Intel-E810CQ DUT2: type: DUT - host: "10.30.51.42" + model: Intel-Emeraldrapids + host: 10.30.51.42 arch: x86_64 port: 6002 username: testuser @@ -97,16 +99,16 @@ nodes: cryptodev: device1: pci_address: "0000:ed:00.0" - driver: "4xxx" - model: "HW_4xxx" - module: "qat_4xxx" + driver: 4xxx + model: HW_4xxx + module: qat_4xxx numvfs: 8 interfaces: port1: # s40-t29-sut2-c9/p1 - 100GE port1 Intel E810-2C-Q2 2p100GE. mac_address: "40:a6:b7:ca:2a:a0" pci_address: "0000:a8:00.0" - ip4_address: "172.16.20.2" + ip4_address: 172.16.20.2 driver: ice link: link1 model: Intel-E810CQ @@ -114,7 +116,7 @@ nodes: # s40-t29-sut2-c9/p2 - 100GE port2 Intel E810-2C-Q2 2p100GE. mac_address: "40:a6:b7:ca:2a:a4" pci_address: "0000:aa:00.0" - ip4_address: "172.16.10.2" + ip4_address: 172.16.10.2 driver: ice link: link2 - model: Intel-E810CQ + model: Intel-E810CQ
\ No newline at end of file diff --git a/topologies/available/lf_3n_icx_testbed37.yaml b/topologies/available/lf_3n_icx_testbed37.yaml index 9b9ddfeeeb..1a12c36e74 100644 --- a/topologies/available/lf_3n_icx_testbed37.yaml +++ b/topologies/available/lf_3n_icx_testbed37.yaml @@ -4,13 +4,13 @@ metadata: schema: - resources/topology_schemas/3_node_topology.sch.yaml - resources/topology_schemas/topology.sch.yaml - tags: [hw, 3-node] nodes: TG: type: TG subtype: TREX - host: "10.30.51.77" + model: Intel-Icelake + host: 10.30.51.77 arch: x86_64 port: 6001 username: testuser @@ -20,7 +20,7 @@ nodes: # s77-t37-tg1-c9/p1 - 100GE port1 Intel E810-CQDA2 2p100GE. mac_address: "b4:96:91:b2:a1:48" pci_address: "0000:17:00.0" - ip4_address: "172.16.10.1" + ip4_address: 172.16.10.1 driver: ice link: link1 model: Intel-E810CQ @@ -28,7 +28,7 @@ nodes: # s77-t37-tg1-c9/p2 - 100GE port2 Intel E810-CQDA2 2p100GE. mac_address: "b4:96:91:b2:a1:49" pci_address: "0000:17:00.1" - ip4_address: "172.16.20.1" + ip4_address: 172.16.20.1 driver: ice link: link2 model: Intel-E810CQ @@ -36,7 +36,7 @@ nodes: # s77-t37-tg1-c4/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:78:ec" pci_address: "0000:31:00.0" - ip4_address: "172.16.30.1" + ip4_address: 172.16.30.1 driver: ice link: link3 model: Intel-E810XXV @@ -44,7 +44,7 @@ nodes: # s77-t37-tg1-c4/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:78:ed" pci_address: "0000:31:00.1" - ip4_address: "172.16.40.1" + ip4_address: 172.16.40.1 driver: ice link: link4 model: Intel-E810XXV @@ -52,7 +52,7 @@ nodes: # s77-t37-tg1-c4/p3 - 25GE port3 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:78:ee" pci_address: "0000:31:00.2" - ip4_address: "172.16.50.1" + ip4_address: 172.16.50.1 driver: ice link: link5 model: Intel-E810XXV @@ -60,7 +60,7 @@ nodes: # s77-t37-tg1-c4/p4 - 25GE port4 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:78:ef" pci_address: "0000:31:00.3" - ip4_address: "172.16.60.1" + ip4_address: 172.16.60.1 driver: ice link: link6 model: Intel-E810XXV @@ -68,7 +68,7 @@ nodes: # s77-t37-tg1-c2/p1 - 25GE port1 Intel NIC x710 2p25GE. mac_address: "3c:fd:fe:bd:fa:24" pci_address: "0000:4b:00.0" - ip4_address: "172.16.70.1" + ip4_address: 172.16.70.1 driver: i40e link: link7 model: Intel-XXV710 @@ -76,7 +76,7 @@ nodes: # s77-t37-tg1-c2/p2 - 25GE port2 Intel NIC x710 2p25GE. mac_address: "3c:fd:fe:bd:fa:25" pci_address: "0000:4b:00.1" - ip4_address: "172.16.80.1" + ip4_address: 172.16.80.1 driver: i40e link: link8 model: Intel-XXV710 @@ -84,7 +84,7 @@ nodes: # s77-t37-tg1-c10/p1 - 100GE port1 Mellanox ConnectX-6 Dx 2p100GE. mac_address: "b8:3f:d2:13:0f:a6" pci_address: "0000:e3:00.0" - ip4_address: "172.16.90.1" + ip4_address: 172.16.90.1 driver: mlx5_core link: link9 model: Mellanox-CX6DX @@ -92,13 +92,14 @@ nodes: # s77-t37-tg1-c10/p2 - 100GE port2 Mellanox ConnectX-6 Dx 2p100GE. mac_address: "b8:3f:d2:13:0f:a7" pci_address: "0000:e3:00.1" - ip4_address: "172.16.100.1" + ip4_address: 172.16.100.1 driver: mlx5_core link: link10 model: Mellanox-CX6DX DUT1: type: DUT - host: "10.30.51.75" + model: Intel-Icelake + host: 10.30.51.75 arch: x86_64 port: 22 username: testuser @@ -109,7 +110,7 @@ nodes: # s75-t37-sut1-c9/p1 - 100GE port1 Intel E810-CQDA2 2p100GE. mac_address: "b4:96:91:b2:a7:b0" pci_address: "0000:17:00.0" - ip4_address: "172.16.10.2" + ip4_address: 172.16.10.2 driver: ice link: link1 model: Intel-E810CQ @@ -117,7 +118,7 @@ nodes: # s75-t37-sut1-c9/p2 - 100GE port2 Intel E810-CQDA2 2p100GE. mac_address: "b4:96:91:b2:a7:b1" pci_address: "0000:17:00.1" - ip4_address: "172.16.20.2" + ip4_address: 172.16.20.2 driver: ice link: link22 model: Intel-E810CQ @@ -125,7 +126,7 @@ nodes: # s75-t37-sut1-c4/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:77:60" pci_address: "0000:31:00.0" - ip4_address: "172.16.30.2" + ip4_address: 172.16.30.2 driver: ice link: link3 model: Intel-E810XXV @@ -133,7 +134,7 @@ nodes: # s75-t37-sut1-c4/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:77:61" pci_address: "0000:31:00.1" - ip4_address: "172.16.40.2" + ip4_address: 172.16.40.2 driver: ice link: link44 model: Intel-E810XXV @@ -141,7 +142,7 @@ nodes: # s75-t37-sut1-c4/p3 - 25GE port3 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:77:62" pci_address: "0000:31:00.2" - ip4_address: "172.16.50.2" + ip4_address: 172.16.50.2 driver: ice link: link5 model: Intel-E810XXV @@ -149,7 +150,7 @@ nodes: # s75-t37-sut1-c4/p4 - 25GE port4 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:77:63" pci_address: "0000:31:00.3" - ip4_address: "172.16.60.2" + ip4_address: 172.16.60.2 driver: ice link: link66 model: Intel-E810XXV @@ -157,7 +158,7 @@ nodes: # s75-t37-sut1-c2/p1 - 25GE port1 Intel NIC xxv710 2p25GE. mac_address: "3c:fd:fe:bd:f8:68" pci_address: "0000:4b:00.0" - ip4_address: "172.16.70.2" + ip4_address: 172.16.70.2 driver: i40e link: link7 model: Intel-XXV710 @@ -165,7 +166,7 @@ nodes: # s75-t37-sut1-c2/p2 - 25GE port2 Intel NIC xxv710 2p25GE. mac_address: "3c:fd:fe:bd:f8:69" pci_address: "0000:4b:00.1" - ip4_address: "172.16.80.2" + ip4_address: 172.16.80.2 driver: i40e link: link88 model: Intel-XXV710 @@ -173,7 +174,7 @@ nodes: # s77-t37-sut1-c10/p1 - 100GE port1 Mellanox ConnectX-6 Dx 2p100GE. mac_address: "b8:3f:d2:13:0f:2e" pci_address: "0000:e3:00.0" - ip4_address: "172.16.90.2" + ip4_address: 172.16.90.2 driver: mlx5_core link: link1010 model: Mellanox-CX6DX @@ -181,13 +182,13 @@ nodes: # s77-t37-sut1-c10/p2 - 100GE port2 Mellanox ConnectX-6 Dx 2p100GE. mac_address: "b8:3f:d2:13:0f:2f" pci_address: "0000:e3:00.1" - ip4_address: "172.16.100.2" + ip4_address: 172.16.100.2 driver: mlx5_core link: link9 model: Mellanox-CX6DX DUT2: type: DUT - host: "10.30.51.76" + host: 10.30.51.76 arch: x86_64 port: 22 username: testuser @@ -198,7 +199,7 @@ nodes: # s76-t37-sut2-c9/p1 - 100GE port1 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:67:27:54" pci_address: "0000:17:00.0" - ip4_address: "172.16.10.3" + ip4_address: 172.16.10.3 driver: ice link: link2 model: Intel-E810CQ @@ -206,7 +207,7 @@ nodes: # s76-t37-sut2-c9/p2 - 100GE port2 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:67:27:50" pci_address: "0000:19:00.0" - ip4_address: "172.16.20.3" + ip4_address: 172.16.20.3 driver: ice link: link22 model: Intel-E810CQ @@ -214,7 +215,7 @@ nodes: # s76-t37-sut2-c4/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:78:24" pci_address: "0000:31:00.0" - ip4_address: "172.16.30.3" + ip4_address: 172.16.30.3 driver: ice link: link4 model: Intel-E810XXV @@ -222,7 +223,7 @@ nodes: # s76-t37-sut2-c4/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:78:25" pci_address: "0000:31:00.1" - ip4_address: "172.16.40.3" + ip4_address: 172.16.40.3 driver: ice link: link44 model: Intel-E810XXV @@ -230,7 +231,7 @@ nodes: # s76-t37-sut2-c4/p3 - 25GE port3 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:78:26" pci_address: "0000:31:00.2" - ip4_address: "172.16.50.3" + ip4_address: 172.16.50.3 driver: ice link: link6 model: Intel-E810XXV @@ -238,7 +239,7 @@ nodes: # s76-t37-sut2-c4/p4 - 25GE port4 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:78:27" pci_address: "0000:31:00.3" - ip4_address: "172.16.60.3" + ip4_address: 172.16.60.3 driver: ice link: link66 model: Intel-E810XXV @@ -246,7 +247,7 @@ nodes: # s76-t37-sut2-c2/p1 - 25GE port1 Intel NIC xxv710 2p25GE. mac_address: "3c:fd:fe:bd:f9:f4" pci_address: "0000:4b:00.0" - ip4_address: "172.16.70.3" + ip4_address: 172.16.70.3 driver: i40e link: link8 model: Intel-XXV710 @@ -254,7 +255,7 @@ nodes: # s76-t37-sut2-c2/p2 - 25GE port2 Intel NIC xxv710 2p25GE. mac_address: "3c:fd:fe:bd:f9:f5" pci_address: "0000:4b:00.1" - ip4_address: "172.16.80.3" + ip4_address: 172.16.80.3 driver: i40e link: link88 model: Intel-XXV710 @@ -262,7 +263,7 @@ nodes: # s76-t37-sut2-c10/p1 - 100GE port1 Mellanox ConnectX-6 Dx 2p100GE. mac_address: "b8:3f:d2:13:4b:16" pci_address: "0000:e3:00.0" - ip4_address: "172.16.100.3" + ip4_address: 172.16.100.3 driver: mlx5_core link: link10 model: Mellanox-CX6DX @@ -270,7 +271,7 @@ nodes: # s76-t37-sut2-c10/p2 - 100GE port2 Mellanox ConnectX-6 Dx 2p100GE. mac_address: "b8:3f:d2:13:4b:17" pci_address: "0000:e3:00.1" - ip4_address: "172.16.90.3" + ip4_address: 172.16.90.3 driver: mlx5_core link: link1010 model: Mellanox-CX6DX
\ No newline at end of file diff --git a/topologies/available/lf_3n_icx_testbed38.yaml b/topologies/available/lf_3n_icx_testbed38.yaml index 7b37c7ef5b..09ded4bbed 100644 --- a/topologies/available/lf_3n_icx_testbed38.yaml +++ b/topologies/available/lf_3n_icx_testbed38.yaml @@ -4,13 +4,13 @@ metadata: schema: - resources/topology_schemas/3_node_topology.sch.yaml - resources/topology_schemas/topology.sch.yaml - tags: [hw, 3-node] nodes: TG: type: TG subtype: TREX - host: "10.30.51.80" + model: Intel-Icelake + host: 10.30.51.80 arch: x86_64 port: 6001 username: testuser @@ -20,7 +20,7 @@ nodes: # s80-t38-tg1-c9/p1 - 100GE port1 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:67:22:5c" pci_address: "0000:b1:00.0" - ip4_address: "172.16.10.1" + ip4_address: 172.16.10.1 driver: ice link: link1 model: Intel-E810CQ @@ -28,7 +28,7 @@ nodes: # s80-t38-tg1-c9/p2 - 100GE port2 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:67:22:58" pci_address: "0000:b3:00.0" - ip4_address: "172.16.20.1" + ip4_address: 172.16.20.1 driver: ice link: link2 model: Intel-E810CQ @@ -36,7 +36,7 @@ nodes: # s80-t38-tg1-c4/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:22:44" pci_address: "0000:ca:00.0" - ip4_address: "172.16.30.1" + ip4_address: 172.16.30.1 driver: ice link: link3 model: Intel-E810XXV @@ -44,7 +44,7 @@ nodes: # s80-t38-tg1-c4/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:22:45" pci_address: "0000:ca:00.1" - ip4_address: "172.16.40.1" + ip4_address: 172.16.40.1 driver: ice link: link4 model: Intel-E810XXV @@ -52,7 +52,7 @@ nodes: # s80-t38-tg1-c4/p3 - 25GE port3 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:22:46" pci_address: "0000:ca:00.2" - ip4_address: "172.16.50.1" + ip4_address: 172.16.50.1 driver: ice link: link5 model: Intel-E810XXV @@ -60,7 +60,7 @@ nodes: # s80-t38-tg1-c4/p4 - 25GE port4 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:22:47" pci_address: "0000:ca:00.3" - ip4_address: "172.16.60.1" + ip4_address: 172.16.60.1 driver: ice link: link6 model: Intel-E810XXV @@ -68,7 +68,7 @@ nodes: # s80-t38-tg1-c2/p1 - 25GE port1 Intel NIC x710 2p25GE. mac_address: "40:a6:b7:40:87:28" pci_address: "0000:4b:00.0" - ip4_address: "172.16.70.1" + ip4_address: 172.16.70.1 driver: i40e link: link7 model: Intel-XXV710 @@ -76,7 +76,7 @@ nodes: # s80-t38-tg1-c2/p2 - 25GE port2 Intel NIC x710 2p25GE. mac_address: "40:a6:b7:40:87:29" pci_address: "0000:4b:00.1" - ip4_address: "172.16.80.1" + ip4_address: 172.16.80.1 driver: i40e link: link8 model: Intel-XXV710 @@ -84,7 +84,7 @@ nodes: # s80-t38-tg1-c10/p1 - 100GE port1 Mellanox ConnectX-6 Dx 2p100GE. mac_address: "b8:3f:d2:13:0f:ae" pci_address: "0000:e3:00.0" - ip4_address: "172.16.90.1" + ip4_address: 172.16.90.1 driver: mlx5_core link: link9 model: Mellanox-CX6DX @@ -92,13 +92,14 @@ nodes: # s80-t38-tg1-c10/p2 - 100GE port2 Mellanox ConnectX-6 Dx 2p100GE. mac_address: "b8:3f:d2:13:0f:af" pci_address: "0000:e3:00.1" - ip4_address: "172.16.100.1" + ip4_address: 172.16.100.1 driver: mlx5_core link: link10 model: Mellanox-CX6DX DUT1: type: DUT - host: "10.30.51.78" + model: Intel-Icelake + host: 10.30.51.78 arch: x86_64 port: 22 username: testuser @@ -109,7 +110,7 @@ nodes: # s78-t38-sut1-c9/p1 - 100GE port1 Intel E810-CQDA2 2p100GE. mac_address: "b4:96:91:a4:26:38" pci_address: "0000:b1:00.0" - ip4_address: "172.16.10.2" + ip4_address: 172.16.10.2 driver: ice link: link1 model: Intel-E810CQ @@ -117,7 +118,7 @@ nodes: # s78-t38-sut1-c9/p2 - 100GE port2 Intel E810-CQDA2 2p100GE. mac_address: "b4:96:91:a4:26:39" pci_address: "0000:b1:00.1" - ip4_address: "172.16.20.2" + ip4_address: 172.16.20.2 driver: ice link: link22 model: Intel-E810CQ @@ -125,7 +126,7 @@ nodes: # s78-t38-sut1-c4/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:22:40" pci_address: "0000:ca:00.0" - ip4_address: "172.16.30.2" + ip4_address: 172.16.30.2 driver: ice link: link3 model: Intel-E810XXV @@ -133,7 +134,7 @@ nodes: # s78-t38-sut1-c4/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:22:41" pci_address: "0000:ca:00.1" - ip4_address: "172.16.40.2" + ip4_address: 172.16.40.2 driver: ice link: link44 model: Intel-E810XXV @@ -141,7 +142,7 @@ nodes: # s78-t38-sut1-c4/p3 - 25GE port3 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:22:42" pci_address: "0000:ca:00.2" - ip4_address: "172.16.50.2" + ip4_address: 172.16.50.2 driver: ice link: link5 model: Intel-E810XXV @@ -149,7 +150,7 @@ nodes: # s78-t38-sut1-c4/p4 - 25GE port4 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:22:43" pci_address: "0000:ca:00.3" - ip4_address: "172.16.60.2" + ip4_address: 172.16.60.2 driver: ice link: link66 model: Intel-E810XXV @@ -157,7 +158,7 @@ nodes: # s78-t38-sut1-c2/p1 - 25GE port1 Intel NIC xxv710 2p25GE. mac_address: "3c:fd:fe:bd:f9:70" pci_address: "0000:4b:00.0" - ip4_address: "172.16.70.2" + ip4_address: 172.16.70.2 driver: i40e link: link7 model: Intel-XXV710 @@ -165,7 +166,7 @@ nodes: # s78-t38-sut1-c2/p2 - 25GE port2 Intel NIC xxv710 2p25GE. mac_address: "3c:fd:fe:bd:f9:71" pci_address: "0000:4b:00.1" - ip4_address: "172.16.80.2" + ip4_address: 172.16.80.2 driver: i40e link: link88 model: Intel-XXV710 @@ -173,7 +174,7 @@ nodes: # s78-t38-sut1-c10/p1 - 100GE port1 Mellanox ConnectX-6 Dx 2p100GE. mac_address: "b8:3f:d2:13:4b:2e" pci_address: "0000:e3:00.0" - ip4_address: "172.16.90.2" + ip4_address: 172.16.90.2 driver: mlx5_core link: link9 model: Mellanox-CX6DX @@ -181,13 +182,14 @@ nodes: # s78-t38-sut1-c10/p2 - 100GE port2 Mellanox ConnectX-6 Dx 2p100GE. mac_address: "b8:3f:d2:13:4b:2f" pci_address: "0000:e3:00.1" - ip4_address: "172.16.100.2" + ip4_address: 172.16.100.2 driver: mlx5_core link: link1010 model: Mellanox-CX6DX DUT2: type: DUT - host: "10.30.51.79" + model: Intel-Icelake + host: 10.30.51.79 arch: x86_64 port: 22 username: testuser @@ -198,7 +200,7 @@ nodes: # s79-t38-sut2-c9/p1 - 100GE port1 Intel E810-CQDA2 2p100GE. mac_address: "b4:96:91:a4:27:30" pci_address: "0000:b1:00.0" - ip4_address: "172.16.10.3" + ip4_address: 172.16.10.3 driver: ice link: link2 model: Intel-E810CQ @@ -206,7 +208,7 @@ nodes: # s79-t38-sut2-c9/p2 - 100GE port2 Intel E810-CQDA2 2p100GE. mac_address: "b4:96:91:a4:27:31" pci_address: "0000:b1:00.1" - ip4_address: "172.16.20.3" + ip4_address: 172.16.20.3 driver: ice link: link22 model: Intel-E810CQ @@ -214,7 +216,7 @@ nodes: # s79-t38-sut2-c4/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:22:3c" pci_address: "0000:ca:00.0" - ip4_address: "172.16.30.3" + ip4_address: 172.16.30.3 driver: ice link: link4 model: Intel-E810XXV @@ -222,7 +224,7 @@ nodes: # s79-t38-sut2-c4/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:22:3d" pci_address: "0000:ca:00.1" - ip4_address: "172.16.40.3" + ip4_address: 172.16.40.3 driver: ice link: link44 model: Intel-E810XXV @@ -230,7 +232,7 @@ nodes: # s79-t38-sut2-c4/p3 - 25GE port3 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:22:3e" pci_address: "0000:ca:00.2" - ip4_address: "172.16.50.3" + ip4_address: 172.16.50.3 driver: ice link: link6 model: Intel-E810XXV @@ -238,7 +240,7 @@ nodes: # s79-t38-sut2-c4/p4 - 25GE port4 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:22:3f" pci_address: "0000:ca:00.3" - ip4_address: "172.16.60.3" + ip4_address: 172.16.60.3 driver: ice link: link66 model: Intel-E810XXV @@ -246,7 +248,7 @@ nodes: # s79-t38-sut2-c2/p1 - 25GE port1 Intel NIC xxv710 2p25GE. mac_address: "3c:fd:fe:bd:f9:5c" pci_address: "0000:4b:00.0" - ip4_address: "172.16.70.3" + ip4_address: 172.16.70.3 driver: i40e link: link8 model: Intel-XXV710 @@ -254,7 +256,7 @@ nodes: # s79-t38-sut2-c2/p2 - 25GE port2 Intel NIC xxv710 2p25GE. mac_address: "3c:fd:fe:bd:f9:5d" pci_address: "0000:4b:00.1" - ip4_address: "172.16.80.3" + ip4_address: 172.16.80.3 driver: i40e link: link88 model: Intel-XXV710 @@ -262,7 +264,7 @@ nodes: # s79-t38-sut2-c10/p1 - 100GE port1 Mellanox ConnectX-6 Dx 2p100GE. mac_address: "b8:3f:d2:13:0f:8a" pci_address: "0000:e3:00.0" - ip4_address: "172.16.90.3" + ip4_address: 172.16.90.3 driver: mlx5_core link: link10 model: Mellanox-CX6DX @@ -270,7 +272,7 @@ nodes: # s79-t38-sut2-c10/p2 - 100GE port2 Mellanox ConnectX-6 Dx 2p100GE. mac_address: "b8:3f:d2:13:0f:8b" pci_address: "0000:e3:00.1" - ip4_address: "172.16.100.3" + ip4_address: 172.16.100.3 driver: mlx5_core link: link1010 model: Mellanox-CX6DX
\ No newline at end of file diff --git a/topologies/available/lf_3n_icxd_testbed31.yaml b/topologies/available/lf_3n_icxd_testbed31.yaml index 3731188081..a3883104f3 100644 --- a/topologies/available/lf_3n_icxd_testbed31.yaml +++ b/topologies/available/lf_3n_icxd_testbed31.yaml @@ -4,13 +4,13 @@ metadata: schema: - resources/topology_schemas/3_node_topology.sch.yaml - resources/topology_schemas/topology.sch.yaml - tags: [hw, 3-node] nodes: TG: type: TG subtype: TREX - host: "10.30.51.90" + model: Intel-Icelake + host: 10.30.51.90 arch: x86_64 port: 6001 username: testuser @@ -20,7 +20,7 @@ nodes: # s90-t31t32-tg1-c4/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:78:b4" pci_address: "0000:31:00.0" - ip4_address: "172.16.10.1" + ip4_address: 172.16.10.1 driver: ice link: link1 model: Intel-E810XXV @@ -28,13 +28,14 @@ nodes: # s90-t31t32-tg1-c4/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:78:b5" pci_address: "0000:31:00.1" - ip4_address: "172.16.20.1" + ip4_address: 172.16.20.1 driver: ice link: link2 model: Intel-E810XXV DUT1: type: DUT - host: "10.30.51.32" + model: Intel-IcelakeD + host: 10.30.51.32 arch: x86_64 port: 22 username: testuser @@ -42,9 +43,9 @@ nodes: cryptodev: device1: pci_address: "0000:81:00.0" - driver: "c4xxx" - model: "HW_C4xxx" - module: "qat_c4xxx" + driver: c4xxx + model: HW_C4xxx + module: qat_c4xxx numvfs: 8 uio_driver: vfio-pci interfaces: @@ -52,7 +53,7 @@ nodes: # s32-t31-sut1-c1/p1 - 25GE port1 Intel E823-C 2p25GE. mac_address: "3c:ec:ef:d9:e2:6a" pci_address: "0000:89:00.0" - ip4_address: "172.16.10.2" + ip4_address: 172.16.10.2 driver: ice link: link3 model: Intel-E823C @@ -60,12 +61,13 @@ nodes: # s32-t31-sut1-c1/p2 - 25GE port2 Intel E823-C 2p25GE. mac_address: "3c:ec:ef:d9:e2:6b" pci_address: "0000:89:00.2" - ip4_address: "172.16.30.1" + ip4_address: 172.16.30.1 driver: ice link: link1 model: Intel-E823C DUT2: type: DUT + model: Intel-IcelakeD host: "10.30.51.33" arch: x86_64 port: 22 @@ -74,9 +76,9 @@ nodes: cryptodev: device1: pci_address: "0000:81:00.0" - driver: "c4xxx" - model: "HW_C4xxx" - module: "qat_c4xxx" + driver: c4xxx + model: HW_C4xxx + module: qat_c4xxx numvfs: 8 uio_driver: vfio-pci interfaces: @@ -84,7 +86,7 @@ nodes: # s33-t31-sut2-c1/p1 - 25GE port1 Intel E823-C 2p25GE. mac_address: "3c:ec:ef:d9:e2:c8" pci_address: "0000:89:00.0" - ip4_address: "172.16.20.2" + ip4_address: 172.16.20.2 driver: ice link: link3 model: Intel-E823C @@ -92,7 +94,7 @@ nodes: # s33-t31-sut2-c1/p2 - 25GE port2 Intel E823-C 2p25GE. mac_address: "3c:ec:ef:d9:e2:c9" pci_address: "0000:89:00.2" - ip4_address: "172.16.30.2" + ip4_address: 172.16.30.2 driver: ice link: link2 - model: Intel-E823C + model: Intel-E823C
\ No newline at end of file diff --git a/topologies/available/lf_3n_icxd_testbed32.yaml b/topologies/available/lf_3n_icxd_testbed32.yaml index 7091a0c5cd..efdeb7d30e 100644 --- a/topologies/available/lf_3n_icxd_testbed32.yaml +++ b/topologies/available/lf_3n_icxd_testbed32.yaml @@ -4,13 +4,13 @@ metadata: schema: - resources/topology_schemas/3_node_topology.sch.yaml - resources/topology_schemas/topology.sch.yaml - tags: [hw, 3-node] nodes: TG: type: TG subtype: TREX - host: "10.30.51.90" + model: Intel-Icelake + host: 10.30.51.90 arch: x86_64 port: 6002 username: testuser @@ -20,7 +20,7 @@ nodes: # s90-t31t32-tg1-c4/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:22:dc" pci_address: "0000:ca:00.0" - ip4_address: "172.16.10.1" + ip4_address: 172.16.10.1 driver: ice link: link1 model: Intel-E810XXV @@ -28,13 +28,14 @@ nodes: # s90-t31t32-tg1-c4/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:22:dd" pci_address: "0000:ca:00.1" - ip4_address: "172.16.20.1" + ip4_address: 172.16.20.1 driver: ice link: link2 model: Intel-E810XXV DUT1: type: DUT - host: "10.30.51.34" + model: Intel-IcelakeD + host: 10.30.51.34 arch: x86_64 port: 22 username: testuser @@ -42,17 +43,17 @@ nodes: cryptodev: device1: pci_address: "0000:81:00.0" - driver: "c4xxx" - model: "HW_C4xxx" - module: "qat_c4xxx" - numvfs: 8 + driver: c4xxx + model: HW_C4xxx + module: qat_c4xxx + numvfs: 8∂ uio_driver: vfio-pci interfaces: port1: # s34-t32-sut1-c1/p1 - 25GE port1 Intel E823-C 2p25GE. mac_address: "3c:ec:ef:d9:e2:70" pci_address: "0000:89:00.0" - ip4_address: "172.16.10.2" + ip4_address: 172.16.10.2 driver: ice link: link3 model: Intel-E823C @@ -60,13 +61,14 @@ nodes: # s34-t32-sut1-c1/p2 - 25GE port2 Intel E823-C 2p25GE. mac_address: "3c:ec:ef:d9:e2:71" pci_address: "0000:89:00.2" - ip4_address: "172.16.30.1" + ip4_address: 172.16.30.1 driver: ice link: link1 model: Intel-E823C DUT2: type: DUT - host: "10.30.51.35" + model: Intel-IcelakeD + host: 10.30.51.35 arch: x86_64 port: 22 username: testuser @@ -74,9 +76,9 @@ nodes: cryptodev: device1: pci_address: "0000:81:00.0" - driver: "c4xxx" - model: "HW_C4xxx" - module: "qat_c4xxx" + driver: c4xxx + model: HW_C4xxx + module: qat_c4xxx numvfs: 8 uio_driver: vfio-pci interfaces: @@ -84,7 +86,7 @@ nodes: # s35-t32-sut2-c1/p1 - 25GE port1 Intel E823-C 4p25GE. mac_address: "3c:ec:ef:d9:e2:aa" pci_address: "0000:89:00.0" - ip4_address: "172.16.20.2" + ip4_address: 172.16.20.2 driver: ice link: link3 model: Intel-E823C @@ -92,7 +94,7 @@ nodes: # s35-t32-sut2-c1/p2 - 25GE port2 Intel E823-C 4p25GE. mac_address: "3c:ec:ef:d9:e2:ab" pci_address: "0000:89:00.2" - ip4_address: "172.16.30.2" + ip4_address: 172.16.30.2 driver: ice link: link2 - model: Intel-E823C + model: Intel-E823C
\ No newline at end of file diff --git a/topologies/available/lf_3n_oct_testbed215.yaml b/topologies/available/lf_3n_oct_testbed215.yaml index 5f41ca62f1..cc9445f0c9 100644 --- a/topologies/available/lf_3n_oct_testbed215.yaml +++ b/topologies/available/lf_3n_oct_testbed215.yaml @@ -4,13 +4,13 @@ metadata: schema: - resources/topology_schemas/3_node_topology.sch.yaml - resources/topology_schemas/topology.sch.yaml - tags: [hw, 3-node] nodes: TG: type: TG subtype: TREX - host: "10.30.51.88" + model: Intel-Icelake + host: 10.30.51.88 arch: x86_64 port: 6001 username: testuser @@ -20,7 +20,7 @@ nodes: # s88-t215-tg1-c9/p1 - 100GE port1 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:67:1c:f4" pci_address: "0000:17:00.0" - ip4_address: "172.16.10.1" + ip4_address: 172.16.10.1 driver: ice link: link1 model: Intel-E810CQ @@ -28,13 +28,14 @@ nodes: # s88-t215-tg1-c9/p2 - 100GE port2 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:67:1c:f0" pci_address: "0000:19:00.0" - ip4_address: "172.16.20.1" + ip4_address: 172.16.20.1 driver: ice link: link2 model: Intel-E810CQ DUT1: type: DUT - host: "10.30.51.95" + model: Marvel-Octeon-CN10K + host: 10.30.51.95 arch: aarch64 port: 22 username: root @@ -43,9 +44,9 @@ nodes: cryptodev: device1: pci_address: "0002:20:00.0" - driver: "rvu_cptpf" - model: "HW_A0FD" - module: "rvu_cptpf" + driver: rvu_cptpf + model: HW_A0FD + module: rvu_cptpf numvfs: 1 eventdev: "0002:0e:00.0" interfaces: @@ -53,21 +54,22 @@ nodes: # s95-t215-sut1-c2/p1 - 100GE port1 Cavium A063 2p100GE. mac_address: "1a:cc:6a:50:05:2a" pci_address: "0002:02:00.0" - ip4_address: "172.16.10.2" + ip4_address: 172.16.10.2 driver: rvu_nicpf link: link1 model: Cavium-A063-100G port2: # s95-t215-sut1-c2/p1 - 100GE port2 Cavium A063 2p100GE. - mac_address: "1a:cc:6a:50:05:2a " + mac_address: "1a:cc:6a:50:05:2a" pci_address: "0002:03:00.0" - ip4_address: "172.16.30.1" + ip4_address: 172.16.30.1 driver: rvu_nicpf link: link3 model: Cavium-A063-100G DUT2: type: DUT - host: "10.30.51.96" + model: Marvel-Octeon-CN10K + host: 10.30.51.96 arch: aarch64 port: 22 username: root @@ -86,7 +88,7 @@ nodes: # s87-t215-sut1-c6/p1 - 100GE port1 Cavium A063 2p100GE. mac_address: "40:a6:b7:67:2b:ec" pci_address: "0002:03:00.0" - ip4_address: "172.16.20.2" + ip4_address: 172.16.20.2 driver: rvu_nicpf link: link2 model: Cavium-A063-100G @@ -94,7 +96,7 @@ nodes: # s87-t215-sut1-c6/p1 - 100GE port2 Cavium A063 2p100GE. mac_address: "40:60:5a:02:e1:60" pci_address: "0002:02:00.0" - ip4_address: "172.16.30.2" + ip4_address: 172.16.30.2 driver: rvu_nicpf link: link3 model: Cavium-A063-100G
\ No newline at end of file diff --git a/topologies/available/lf_3n_snr_testbed39.yaml b/topologies/available/lf_3n_snr_testbed39.yaml index 3ea57a2409..53702b04d7 100644 --- a/topologies/available/lf_3n_snr_testbed39.yaml +++ b/topologies/available/lf_3n_snr_testbed39.yaml @@ -4,13 +4,13 @@ metadata: schema: - resources/topology_schemas/3_node_topology.sch.yaml - resources/topology_schemas/topology.sch.yaml - tags: [hw, 3-node] nodes: TG: type: TG subtype: TREX - host: "10.30.51.89" + model: Intel-Cascadelake + host: 10.30.51.89 arch: x86_64 port: 6001 username: testuser @@ -20,7 +20,7 @@ nodes: # s89-t39t310-tg1-c4/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:22:08" pci_address: "0000:86:00.0" - ip4_address: "172.16.10.1" + ip4_address: 172.16.10.1 driver: ice link: disabled1 model: Intel-E810XXV @@ -28,7 +28,7 @@ nodes: # s89-t39t310-tg1-c4/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:22:09" pci_address: "0000:86:00.1" - ip4_address: "172.16.20.1" + ip4_address: 172.16.20.1 driver: ice link: link2 model: Intel-E810XXV @@ -36,7 +36,7 @@ nodes: # s89-t39t310-tg1-c4/p3 - 25GE port3 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:22:0a" pci_address: "0000:86:00.2" - ip4_address: "172.16.50.1" + ip4_address: 172.16.50.1 driver: ice link: disabled2 model: Intel-E810XXV @@ -44,13 +44,14 @@ nodes: # s89-t39t310-tg1-c4/p4 - 25GE port4 Intel E810-XXVDA4 4p25GE. mac_address: "b4:96:91:a5:22:0b" pci_address: "0000:86:00.3" - ip4_address: "172.16.60.1" + ip4_address: 172.16.60.1 driver: ice link: link5 - model: Intel-E810XXV + model: Intel-E810XXV" DUT1: type: DUT - host: "10.30.51.93" + model: Intel-Snowridge + host: 10.30.51.93 arch: x86_64 port: 22 username: testuser @@ -58,9 +59,9 @@ nodes: cryptodev: device1: pci_address: "0000:f4:00.0" - driver: "c4xxx" - model: "HW_C4xxx" - module: "qat_c4xxx" + driver: c4xxx + model: HW_C4xxx + module: qat_c4xxx numvfs: 8 uio_driver: vfio-pci interfaces: @@ -68,15 +69,15 @@ nodes: # s93-t39-sut1-c1/p1 - 25GE port1 Intel E822-CQDA4 4p25GE. mac_address: "00:00:00:01:01:00" pci_address: "0000:ec:00.0" - ip4_address: "172.16.10.2" + ip4_address: 172.16.10.2 driver: ice link: link2 - model: Intel-E822CQ + model: "Intel-E822CQ" port2: # s93-t39-sut1-c1/p2 - 25GE port2 Intel E822-CQDA4 4p25GE. mac_address: "00:00:00:01:01:01" pci_address: "0000:ec:00.1" - ip4_address: "172.16.20.2" + ip4_address: 172.16.20.2 driver: ice link: disabled3 model: Intel-E822CQ @@ -84,7 +85,7 @@ nodes: # s93-t39-sut1-c1/p3 - 25GE port3 Intel E822-CQDA4 4p25GE. mac_address: "00:00:00:01:01:02" pci_address: "0000:ec:00.2" - ip4_address: "172.16.30.1" + ip4_address: 172.16.30.1 driver: ice link: link3 model: Intel-E822CQ @@ -92,13 +93,14 @@ nodes: # s93-t39-sut1-c1/p4 - 25GE port4 Intel E822-CQDA4 4p25GE. mac_address: "00:00:00:01:01:03" pci_address: "0000:ec:00.3" - ip4_address: "172.16.40.1" + ip4_address: 172.16.40.1 driver: ice link: link4 model: Intel-E822CQ DUT2: type: DUT - host: "10.30.51.94" + model: Intel-Snowridge + host: 10.30.51.94 arch: x86_64 port: 22 username: testuser @@ -106,9 +108,9 @@ nodes: cryptodev: device1: pci_address: "0000:f4:00.0" - driver: "c4xxx" - model: "HW_C4xxx" - module: "qat_c4xxx" + driver: c4xxx + model: HW_C4xxx + module: qat_c4xxx numvfs: 8 uio_driver: vfio-pci interfaces: @@ -116,7 +118,7 @@ nodes: # s94-t39-sut2-c1/p1 - 25GE port1 Intel E822-CQDA4 4p25GE. mac_address: "00:00:00:02:01:00" pci_address: "0000:ec:00.0" - ip4_address: "172.16.30.2" + ip4_address: 172.16.30.2 driver: ice link: link5 model: Intel-E822CQ @@ -124,7 +126,7 @@ nodes: # s94-t39-sut2-c1/p2 - 25GE port2 Intel E822-CQDA4 4p25GE. mac_address: "00:00:00:02:01:01" pci_address: "0000:ec:00.1" - ip4_address: "172.16.40.2" + ip4_address: 172.16.40.2 driver: ice link: disabled4 model: Intel-E822CQ @@ -132,7 +134,7 @@ nodes: # s94-t39-sut2-c1/p3 - 25GE port3 Intel E822-CQDA4 4p25GE. mac_address: "00:00:00:02:01:02" pci_address: "0000:ec:00.2" - ip4_address: "172.16.50.2" + ip4_address: 172.16.50.2 driver: ice link: link3 model: Intel-E822CQ @@ -140,7 +142,7 @@ nodes: # s94-t39-sut2-c1/p4 - 25GE port4 Intel E822-CQDA4 4p25GE. mac_address: "00:00:00:02:01:03" pci_address: "0000:ec:00.3" - ip4_address: "172.16.60.2" + ip4_address: 172.16.60.2 driver: ice link: link4 model: Intel-E822CQ diff --git a/topologies/available/lf_3na_spr_testbed21.yaml b/topologies/available/lf_3na_spr_testbed21.yaml index 76613924cf..6cee2f22cd 100644 --- a/topologies/available/lf_3na_spr_testbed21.yaml +++ b/topologies/available/lf_3na_spr_testbed21.yaml @@ -4,13 +4,13 @@ metadata: schema: - resources/topology_schemas/3_node_topology.sch.yaml - resources/topology_schemas/topology.sch.yaml - tags: [hw, 3-node] nodes: TG: type: TG subtype: TREX - host: "10.30.51.53" + model: Intel-Sapphirerapids + host: 10.30.51.53 arch: x86_64 port: 6001 username: testuser @@ -27,22 +27,22 @@ nodes: cryptodev: device1: pci_address: "0000:76:00.0" - driver: "4xxx" - model: "HW_4xxx" - module: "qat_4xxx" + driver: 4xxx + model: HW_4xxx + module: qat_4xxx numvfs: 8 #device2: # pci_address: "0000:7a:00.0" - # driver: "4xxx" - # model: "HW_4xxx" - # module: "qat_4xxx" + # driver: 4xxx + # model: HW_4xxx + # module: qat_4xxx # numvfs: 8 interfaces: port1: # s53-t21-tg1-c4/p1 - 200GE port1 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a0:e8" pci_address: "0000:2a:00.0" - ip4_address: "172.16.10.1" + ip4_address: 172.16.10.1 driver: mlx5_core link: link3 model: Mellanox-CX7VEAT @@ -50,7 +50,7 @@ nodes: # # s53-t21-tg1-c4/p2 - 200GE port2 Mellanox ConnectX7-2p200GE. # mac_address: "b8:3f:d2:b7:a0:e9" # pci_address: "0000:2a:00.1" - # ip4_address: "172.16.20.1" + # ip4_address: 172.16.20.1 # driver: mlx5_core # link: none # model: Mellanox-CX7VEAT @@ -58,7 +58,7 @@ nodes: # s53-t21-tg1-c2/p1 - 200GE port1 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a0:58" pci_address: "0000:3d:00.0" - ip4_address: "172.16.30.1" + ip4_address: 172.16.30.1 driver: mlx5_core link: link5 model: Mellanox-CX7VEAT @@ -66,7 +66,7 @@ nodes: # s53-t21-tg1-c2/p2 - 200GE port2 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a0:59" pci_address: "0000:3d:00.1" - ip4_address: "172.16.40.1" + ip4_address: 172.16.40.1 driver: mlx5_core link: link6 model: Mellanox-CX7VEAT @@ -74,7 +74,7 @@ nodes: # s53-t21-tg1-c9/p1 - 200GE port1 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a0:48" pci_address: "0000:ab:00.0" - ip4_address: "172.16.50.1" + ip4_address: 172.16.50.1 driver: mlx5_core link: link7 model: Mellanox-CX7VEAT @@ -82,7 +82,7 @@ nodes: # # s53-t21-tg1-c9/p2 - 200GE port2 Mellanox ConnectX7-2p200GE. # mac_address: "b8:3f:d2:b7:a0:49" # pci_address: "0000:ab:00.1" - # ip4_address: "172.16.60.1" + # ip4_address: 172.16.60.1 # driver: mlx5_core # link: none # model: Mellanox-CX7VEAT @@ -90,7 +90,7 @@ nodes: # s53-t21-tg1-c7/p1 - 200GE port1 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a0:f8" pci_address: "0000:bd:00.0" - ip4_address: "172.16.70.1" + ip4_address: 172.16.70.1 driver: mlx5_core link: link9 model: Mellanox-CX7VEAT @@ -98,13 +98,14 @@ nodes: # s53-t21-tg1-c7/p2 - 200GE port2 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a0:f9" pci_address: "0000:bd:00.1" - ip4_address: "172.16.80.1" + ip4_address: 172.16.80.1 driver: mlx5_core link: link10 model: Mellanox-CX7VEAT DUT1: type: DUT - host: "10.30.51.52" + model: Intel-Sapphirerapids + host: 10.30.51.52 arch: x86_64 port: 6001 username: testuser @@ -122,22 +123,22 @@ nodes: cryptodev: device1: pci_address: "0000:76:00.0" - driver: "4xxx" - model: "HW_4xxx" - module: "qat_4xxx" + driver: 4xxx + model: HW_4xxx + module: qat_4xxx numvfs: 8 #device2: # pci_address: "0000:7a:00.0" - # driver: "4xxx" - # model: "HW_4xxx" - # module: "qat_4xxx" + # driver: 4xxx + # model: HW_4xxx + # module: qat_4xxx # numvfs: 8 interfaces: port1: # s52-t21-sut1-c4/p1 - 200GE port1 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a1:08" pci_address: "0000:2a:00.0" - ip4_address: "172.16.10.2" + ip4_address: 172.16.10.2 driver: mlx5_core link: link3 model: Mellanox-CX7VEAT @@ -145,7 +146,7 @@ nodes: # s52-t21-sut1-c4/p2 - 200GE port2 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a1:09" pci_address: "0000:2a:00.1" - ip4_address: "172.16.20.2" + ip4_address: 172.16.20.2 driver: mlx5_core link: link59 model: Mellanox-CX7VEAT @@ -153,7 +154,7 @@ nodes: # s52-t21-sut1-c2/p1 - 200GE port1 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a0:50" pci_address: "0000:3d:00.0" - ip4_address: "172.16.30.2" + ip4_address: 172.16.30.2 driver: mlx5_core link: link5 model: Mellanox-CX7VEAT @@ -161,7 +162,7 @@ nodes: # s52-t21-sut1-c2/p2 - 200GE port2 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a0:51" pci_address: "0000:3d:00.1" - ip4_address: "172.16.40.2" + ip4_address: 172.16.40.2 driver: mlx5_core link: link6 model: Mellanox-CX7VEAT @@ -169,7 +170,7 @@ nodes: # s52-t21-sut1-c10/p1 - 200GE port1 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a1:88" pci_address: "0000:17:00.0" - ip4_address: "172.16.50.2" + ip4_address: 172.16.50.2 driver: mlx5_core link: link610 model: Mellanox-CX7VEAT @@ -177,13 +178,14 @@ nodes: # s52-t21-sut1-c10/p2 - 200GE port2 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a1:89" pci_address: "0000:17:00.1" - ip4_address: "172.16.60.2" + ip4_address: 172.16.60.2 driver: mlx5_core link: link37 model: Mellanox-CX7VEAT DUT2: type: DUT - host: "10.30.51.52" + model: Intel-Sapphirerapids + host: 10.30.51.52 arch: x86_64 port: 6002 username: testuser @@ -201,22 +203,22 @@ nodes: cryptodev: device1: pci_address: "0000:f3:00.0" - driver: "4xxx" - model: "HW_4xxx" - module: "qat_4xxx" + driver: 4xxx + model: HW_4xxx + module: qat_4xxx numvfs: 8 #device2: # pci_address: "0000:f7:00.0" - # driver: "4xxx" - # model: "HW_4xxx" - # module: "qat_4xxx" + # driver: 4xxx + # model: HW_4xxx + # module: qat_4xxx # numvfs: 8 interfaces: port1: # s52-t21-sut2-c9/p1 - 200GE port1 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a1:20" pci_address: "0000:ab:00.0" - ip4_address: "172.16.10.3" + ip4_address: 172.16.10.3 driver: mlx5_core link: link7 model: Mellanox-CX7VEAT @@ -224,7 +226,7 @@ nodes: # s52-t21-sut2-c9/p2 - 200GE port2 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a1:21" pci_address: "0000:ab:00.1" - ip4_address: "172.16.20.3" + ip4_address: 172.16.20.3 driver: mlx5_core link: link59 model: Mellanox-CX7VEAT @@ -232,7 +234,7 @@ nodes: # s52-t21-sut2-c7/p1 - 200GE port1 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a0:f0" pci_address: "0000:bd:00.0" - ip4_address: "172.16.30.3" + ip4_address: 172.16.30.3 driver: mlx5_core link: link9 model: Mellanox-CX7VEAT @@ -240,7 +242,7 @@ nodes: # s52-t21-sut2-c7/p2 - 200GE port2 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a0:f1" pci_address: "0000:bd:00.1" - ip4_address: "172.16.40.3" + ip4_address: 172.16.40.3 driver: mlx5_core link: link10 model: Mellanox-CX7VEAT @@ -248,7 +250,7 @@ nodes: # s52-t21-sut2-c11/p1 - 200GE port1 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a1:10" pci_address: "0000:cf:00.0" - ip4_address: "172.16.50.3" + ip4_address: 172.16.50.3 driver: mlx5_core link: link610 model: Mellanox-CX7VEAT @@ -256,7 +258,7 @@ nodes: # s52-t21-sut2-c11/p2 - 200GE port2 Mellanox ConnectX7-2p200GE. mac_address: "b8:3f:d2:b7:a1:11" pci_address: "0000:cf:00.1" - ip4_address: "172.16.60.3" + ip4_address: 172.16.60.3 driver: mlx5_core link: link37 model: Mellanox-CX7VEAT
\ No newline at end of file diff --git a/topologies/available/lf_3nb_spr_testbed22.yaml b/topologies/available/lf_3nb_spr_testbed22.yaml index 0d080e8c4e..ccabfb38f9 100644 --- a/topologies/available/lf_3nb_spr_testbed22.yaml +++ b/topologies/available/lf_3nb_spr_testbed22.yaml @@ -4,13 +4,13 @@ metadata: schema: - resources/topology_schemas/3_node_topology.sch.yaml - resources/topology_schemas/topology.sch.yaml - tags: [hw, 3-node] nodes: TG: type: TG subtype: TREX - host: "10.30.51.55" + model: Intel-Sapphirerapids + host: 10.30.51.55 arch: x86_64 port: 6001 username: testuser @@ -27,22 +27,22 @@ nodes: cryptodev: device1: pci_address: "0000:76:00.0" - driver: "4xxx" - model: "HW_4xxx" - module: "qat_4xxx" + driver: 4xxx + model: HW_4xxx + module: qat_4xxx numvfs: 8 #device2: # pci_address: "0000:7a:00.0" - # driver: "4xxx" - # model: "HW_4xxx" - # module: "qat_4xxx" + # driver: 4xxx + # model: HW_4xxx + # module: qat_4xxx # numvfs: 8 interfaces: port1: # s55-t22-tg1-c4/p1 - 100GE port1 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:9e:e7:00" pci_address: "0000:2a:00.0" - ip4_address: "172.16.30.1" + ip4_address: 172.16.30.1 driver: ice link: link1 model: Intel-E810CQ @@ -50,7 +50,7 @@ nodes: # s55-t22-tg1-c4/p2 - 100GE port2 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:9e:e7:04" pci_address: "0000:2c:00.0" - ip4_address: "172.16.40.1" + ip4_address: 172.16.40.1 driver: ice link: link3 model: Intel-E810CQ @@ -58,7 +58,7 @@ nodes: # s55-t22-tg1-c2/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE. mac_address: "50:7c:6f:48:45:50" pci_address: "0000:3d:00.0" - ip4_address: "172.16.10.1" + ip4_address: 172.16.10.1 driver: ice link: link4 model: Intel-E810XXV @@ -66,13 +66,14 @@ nodes: # s55-t22-tg1-c2/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE. mac_address: "50:7c:6f:48:45:51" pci_address: "0000:3d:00.1" - ip4_address: "172.16.20.1" + ip4_address: 172.16.20.1 driver: ice link: link6 model: Intel-E810XXV DUT1: type: DUT - host: "10.30.51.54" + model: Intel-Sapphirerapids + host: 10.30.51.54 arch: x86_64 port: 6001 username: testuser @@ -90,22 +91,22 @@ nodes: cryptodev: device1: pci_address: "0000:76:00.0" - driver: "4xxx" - model: "HW_4xxx" - module: "qat_4xxx" + driver: 4xxx + model: HW_4xxx + module: qat_4xxx numvfs: 8 #device2: # pci_address: "0000:7a:00.0" - # driver: "4xxx" - # model: "HW_4xxx" - # module: "qat_4xxx" + # driver: 4xxx + # model: HW_4xxx + # module: qat_4xxx # numvfs: 8 interfaces: port1: # s54-t22-sut1-c4/p1 - 100GE port1 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:9e:e5:c0" pci_address: "0000:2a:00.0" - ip4_address: "172.16.30.2" + ip4_address: 172.16.30.2 driver: ice link: link2 model: Intel-E810CQ @@ -113,7 +114,7 @@ nodes: # s54-t22-sut1-c4/p2 - 100GE port2 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:9e:e5:c4" pci_address: "0000:2c:00.0" - ip4_address: "172.16.40.2" + ip4_address: 172.16.40.2 driver: ice link: link3 model: Intel-E810CQ @@ -121,7 +122,7 @@ nodes: # s54-t22-sut1-c2/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE. mac_address: "50:7c:6f:48:45:4c" pci_address: "0000:3d:00.0" - ip4_address: "172.16.10.2" + ip4_address: 172.16.10.2 driver: ice link: link4 model: Intel-E810XXV @@ -129,13 +130,14 @@ nodes: # s54-t22-sut1-c2/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE. mac_address: "50:7c:6f:48:45:4d" pci_address: "0000:3d:00.1" - ip4_address: "172.16.20.2" + ip4_address: 172.16.20.2 driver: ice link: link5 model: Intel-E810XXV DUT2: type: DUT - host: "10.30.51.54" + model: Intel-Sapphirerapids + host: 10.30.51.54 arch: x86_64 port: 6002 username: testuser @@ -153,22 +155,22 @@ nodes: cryptodev: device1: pci_address: "0000:f3:00.0" - driver: "4xxx" - model: "HW_4xxx" - module: "qat_4xxx" + driver: 4xxx + model: HW_4xxx + module: qat_4xxx numvfs: 8 #device2: # pci_address: "0000:f7:00.0" - # driver: "4xxx" - # model: "HW_4xxx" - # module: "qat_4xxx" + # driver: 4xxx + # model: HW_4xxx + # module: qat_4xxx # numvfs: 8 interfaces: port1: # s54-t22-sut1-c9/p1 - 100GE port1 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:9e:e5:98" pci_address: "0000:ab:00.0" - ip4_address: "172.16.30.3" + ip4_address: 172.16.30.3 driver: ice link: link2 model: Intel-E810CQ @@ -176,7 +178,7 @@ nodes: # s54-t22-sut1-c9/p2 - 100GE port2 Intel E810-CQDA2 2p100GE. mac_address: "40:a6:b7:9e:e5:9c" pci_address: "0000:ad:00.0" - ip4_address: "172.16.40.3" + ip4_address: 172.16.40.3 driver: ice link: link1 model: Intel-E810CQ @@ -184,7 +186,7 @@ nodes: # s54-t22-sut1-c7/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE. mac_address: "50:7c:6f:48:4a:80" pci_address: "0000:bd:00.0" - ip4_address: "172.16.10.3" + ip4_address: 172.16.10.3 driver: ice link: link6 model: Intel-E810XXV @@ -192,7 +194,7 @@ nodes: # s54-t22-sut1-c7/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE. mac_address: "50:7c:6f:48:4a:81" pci_address: "0000:bd:00.1" - ip4_address: "172.16.20.3" + ip4_address: 172.16.20.3 driver: ice link: link5 model: Intel-E810XXV
\ No newline at end of file diff --git a/topologies/available/vagrant.yaml b/topologies/available/vagrant.yaml deleted file mode 100644 index a9177c799e..0000000000 --- a/topologies/available/vagrant.yaml +++ /dev/null @@ -1,117 +0,0 @@ ---- -metadata: - version: 0.1 - schema: - - resources/topology_schemas/3_node_topology.sch.yaml - - resources/topology_schemas/topology.sch.yaml - tags: [vagrant, 3-node] - -nodes: - TG: - type: TG - host: "192.168.255.100" - arch: x86_64 - port: 22 - username: csit - password: csit - interfaces: - port1: - mac_address: "" - pci_address: "0000:00:09.0" - link: link0 - driver: e1000 - model: virtual - port2: - mac_address: "" - pci_address: "0000:00:0a.0" - link: link0 - driver: e1000 - model: virtual - port3: - mac_address: "" - pci_address: "0000:00:10.0" - link: link1 - driver: e1000 - model: virtual - port4: - mac_address: "" - pci_address: "0000:00:11.0" - link: link4 - driver: e1000 - model: virtual - port5: - mac_address: "" - pci_address: "0000:00:12.0" - link: link2 - driver: e1000 - model: virtual - port6: - mac_address: "" - pci_address: "0000:00:13.0" - link: link5 - driver: e1000 - model: virtual - DUT1: - type: DUT - host: "192.168.255.101" - arch: x86_64 - port: 22 - username: csit - password: csit - interfaces: - port1: - mac_address: "" - pci_address: "0000:00:09.0" - link: link1 - driver: e1000 - model: virtual - port2: - mac_address: "" - pci_address: "0000:00:0a.0" - link: link4 - driver: e1000 - model: virtual - port3: - mac_address: "" - pci_address: "0000:00:10.0" - link: link3 - driver: e1000 - model: virtual - port4: - mac_address: "" - pci_address: "0000:00:11.0" - link: link6 - driver: e1000 - model: virtual - DUT2: - type: DUT - host: "192.168.255.102" - arch: x86_64 - port: 22 - username: csit - password: csit - interfaces: - port1: - mac_address: "" - pci_address: "0000:00:09.0" - link: link2 - driver: e1000 - model: virtual - port2: - mac_address: "" - pci_address: "0000:00:0a.0" - link: link5 - driver: e1000 - model: virtual - port3: - mac_address: "" - pci_address: "0000:00:10.0" - link: link3 - driver: e1000 - model: virtual - port4: - mac_address: "" - pci_address: "0000:00:11.0" - link: link6 - driver: e1000 - model: virtual diff --git a/topologies/available/vpp_device.template b/topologies/available/vpp_device.template index 70fbc42cb1..f8e2045444 100644 --- a/topologies/available/vpp_device.template +++ b/topologies/available/vpp_device.template @@ -4,24 +4,23 @@ metadata: schema: - resources/topology_schemas/2_node_topology.sch.yaml - resources/topology_schemas/topology.sch.yaml - tags: [dcr, 2-node] nodes: TG: - type: "TG" - host: "${CSIT_TG_HOST}" - arch: "${CSIT_TG_ARCH}" + type: TG + host: ${CSIT_TG_HOST} + arch: ${CSIT_TG_ARCH} port: ${CSIT_TG_PORT} - username: "root" - password: "Csit1234" + username: root + password: Csit1234 interfaces: ${CSIT_TG_INTERFACES} DUT1: - type: "DUT" - host: "${CSIT_DUT1_HOST}" - arch: "${CSIT_DUT1_ARCH}" + type: DUT + host: ${CSIT_DUT1_HOST} + arch: ${CSIT_DUT1_ARCH} port: ${CSIT_DUT1_PORT} - username: "root" - password: "Csit1234" + username: root + password: Csit1234 interfaces: ${CSIT_DUT1_INTERFACES} |