From: Peter Mikus Date: Wed, 11 Sep 2019 09:33:21 +0000 (+0000) Subject: Topology: Cascadelake X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=45882a2701df2349b3f53b8436aec530cbeeb614 Topology: Cascadelake Signed-off-by: Peter Mikus Change-Id: I1533f00dd4b40f9dda82b1e9b5b15a81bbb9f7fb --- diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh index 7a55d56871..b38cd52e5e 100644 --- a/resources/libraries/bash/function/common.sh +++ b/resources/libraries/bash/function/common.sh @@ -470,6 +470,10 @@ function get_test_code () { NODENESS="3n" FLAVOR="skx" ;; + *"2n-clx"*) + NODENESS="2n" + FLAVOR="clx" + ;; *"2n-dnv"*) NODENESS="2n" FLAVOR="dnv" @@ -802,6 +806,9 @@ function select_tags () { # Not enough nic_intel-xxv710 to support double link tests. test_tag_array+=("!3_node_double_link_topoANDnic_intel-xxv710") ;; + *"2n-clx"*) + test_tag_array+=("!ipsechw") + ;; *"2n-dnv"*) test_tag_array+=("!ipsechw") test_tag_array+=("!memif") @@ -907,6 +914,10 @@ function select_topology () { TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_skx*.yaml ) TOPOLOGIES_TAGS="3_node_*_link_topo" ;; + "2n_clx") + TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_clx*.yaml ) + TOPOLOGIES_TAGS="2_node_*_link_topo" + ;; "2n_dnv") TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_dnv*.yaml ) TOPOLOGIES_TAGS="2_node_single_link_topo" diff --git a/resources/libraries/bash/function/mrr-daily-clx.txt b/resources/libraries/bash/function/mrr-daily-clx.txt new file mode 120000 index 0000000000..addc759369 --- /dev/null +++ b/resources/libraries/bash/function/mrr-daily-clx.txt @@ -0,0 +1 @@ +mrr-daily.txt \ No newline at end of file diff --git a/topologies/available/lf_2n_clx_testbed27.yaml b/topologies/available/lf_2n_clx_testbed27.yaml new file mode 100644 index 0000000000..d820353266 --- /dev/null +++ b/topologies/available/lf_2n_clx_testbed27.yaml @@ -0,0 +1,160 @@ +--- +metadata: + version: 0.1 + 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.32.8.19" + arch: x86_64 + port: 22 + username: testuser + password: Csit1234 + interfaces: + port1: + # s34-t27-tg1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:ca:e9:88" + pci_address: "0000:18:00.0" + ip4_address: "172.16.10.2" + driver: i40e + link: link1 + model: Intel-X710 + port2: + # s34-t27-tg1-c2/p2 - 10GE port2 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:ca:e9:89" + pci_address: "0000:18:00.1" + ip4_address: "172.16.20.2" + driver: i40e + link: link2 + model: Intel-X710 + port3: + # s34-t27-tg1-c2/p3 - 10GE port3 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:ca:e9:8a" + pci_address: "0000:18:00.2" + ip4_address: "172.16.30.2" + driver: i40e + link: link3 + model: Intel-X710 + port4: + # s34-t27-tg1-c2/p4 - 10GE port4 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:ca:e9:8b" + pci_address: "0000:18:00.3" + ip4_address: "172.16.40.2" + driver: i40e + link: link4 + model: Intel-X710 + port5: + # s34-t27-tg1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE. + mac_address: "3c:fd:fe:dd:d4:28" + pci_address: "0000:3b:00.0" + ip4_address: "172.16.50.2" + driver: i40e + link: link5 + model: Intel-XXV710 + port6: + # s34-t27-tg1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE. + mac_address: "3c:fd:fe:dd:d4:29" + pci_address: "0000:3b:00.1" + ip4_address: "172.16.60.2" + driver: i40e + link: link6 + model: Intel-XXV710 +# port7: +# # s34-t27-tg1-c9/p1 - 100GE-port1 ConnectX5-2p100GE. +# mac_address: "?" +# pci_address: "0000:5e:00.0" +# ip4_address: "172.16.70.2" +# driver: mlx5_core +# link: link7 +# model: Mellanox-CX556A +# port8: +# # s34-t27-tg1-c9/p2 - 100GE-port2 ConnectX5-2p100GE. +# mac_address: "?" +# pci_address: "0000:5e:00.1" +# ip4_address: "172.16.70.1" +# driver: mlx5_core +# link: link8 +# model: Mellanox-CX556A + DUT1: + type: DUT + host: "10.32.8.18" + 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: + # s33-t27-sut1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:ca:e9:98" + pci_address: "0000:18:00.0" + ip4_address: "172.16.10.1" + driver: i40e + link: link1 + model: Intel-X710 + port2: + # s33-t27-sut1-c2/p2 - 10GE port2 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:ca:e9:99" + pci_address: "0000:18:00.1" + ip4_address: "172.16.20.1" + driver: i40e + link: link2 + model: Intel-X710 + port3: + # s33-t27-sut1-c2/p3 - 10GE port3 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:ca:e9:9a" + pci_address: "0000:18:00.2" + ip4_address: "172.16.30.1" + driver: i40e + link: link3 + model: Intel-X710 + port4: + # s33-t27-sut1-c2/p4 - 10GE port4 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:ca:e9:9b" + pci_address: "0000:18:00.3" + ip4_address: "172.16.40.1" + driver: i40e + link: link4 + model: Intel-X710 + port5: + # s33-t27-sut1-c2/p1 - 25GE port1 on Intel NIC xxv710 2p25GE. + mac_address: "3c:fd:fe:cf:69:e8" + pci_address: "0000:3b:00.0" + ip4_address: "172.16.50.1" + driver: i40e + link: link5 + model: Intel-XXV710 + port6: + # s33-t27-sut1-c2/p2 - 25GE port2 on Intel NIC xxv710 2p25GE. + mac_address: "3c:fd:fe:cf:69:e9" + pci_address: "0000:3b:00.1" + ip4_address: "172.16.60.1" + driver: i40e + link: link6 + model: Intel-XXV710 +# port7: +# # s33-t27-sut1-c9/p1 - 100GE-port1 ConnectX5-2p100GE. +# mac_address: "?" +# pci_address: "0000:5e:00.0" +# ip4_address: "172.16.70.2" +# driver: mlx5_core +# link: link7 +# model: Mellanox-CX556A +# port8: +# # s33-t27-sut1-c9/p2 - 100GE-port2 ConnectX5-2p100GE. +# mac_address: "?" +# pci_address: "0000:5e:00.1" +# ip4_address: "172.16.70.1" +# driver: mlx5_core +# link: link8 +# model: Mellanox-CX556A diff --git a/topologies/available/lf_2n_clx_testbed28.yaml b/topologies/available/lf_2n_clx_testbed28.yaml new file mode 100644 index 0000000000..98a34cf7c9 --- /dev/null +++ b/topologies/available/lf_2n_clx_testbed28.yaml @@ -0,0 +1,160 @@ +--- +metadata: + version: 0.1 + 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.32.8.21" + arch: x86_64 + port: 22 + username: testuser + password: Csit1234 + interfaces: + port1: + # s36-t28-tg1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:ca:e8:28" + pci_address: "0000:18:00.0" + ip4_address: "172.16.10.2" + driver: i40e + link: link1 + model: Intel-X710 + port2: + # s36-t28-tg1-c2/p2 - 10GE port2 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:ca:e8:29" + pci_address: "0000:18:00.1" + ip4_address: "172.16.20.2" + driver: i40e + link: link2 + model: Intel-X710 + port3: + # s36-t28-tg1-c2/p3 - 10GE port3 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:ca:e8:2a" + pci_address: "0000:18:00.2" + ip4_address: "172.16.30.2" + driver: i40e + link: link3 + model: Intel-X710 + port4: + # s36-t28-tg1-c2/p4 - 10GE port4 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:ca:e8:2b" + pci_address: "0000:18:00.3" + ip4_address: "172.16.40.2" + driver: i40e + link: link4 + model: Intel-X710 + port5: + # s36-t28-tg1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE. + mac_address: "3c:fd:fe:cf:69:ec" + pci_address: "0000:3b:00.0" + ip4_address: "172.16.50.2" + driver: i40e + link: link5 + model: Intel-XXV710 + port6: + # s36-t28-tg1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE. + mac_address: "3c:fd:fe:cf:69:ed" + pci_address: "0000:3b:00.1" + ip4_address: "172.16.60.2" + driver: i40e + link: link6 + model: Intel-XXV710 +# port7: +# # s36-t28-tg1-c9/p1 - 100GE-port1 ConnectX5-2p100GE. +# mac_address: "?" +# pci_address: "0000:5e:00.0" +# ip4_address: "172.16.70.2" +# driver: mlx5_core +# link: link7 +# model: Mellanox-CX556A +# port8: +# # s36-t28-tg1-c9/p2 - 100GE-port2 ConnectX5-2p100GE. +# mac_address: "?" +# pci_address: "0000:5e:00.1" +# ip4_address: "172.16.70.1" +# driver: mlx5_core +# link: link8 +# model: Mellanox-CX556A + DUT1: + type: DUT + host: "10.32.8.20" + 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: + # s35-t28-sut1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:ca:e3:b0" + pci_address: "0000:18:00.0" + ip4_address: "172.16.10.1" + driver: i40e + link: link1 + model: Intel-X710 + port2: + # s35-t28-sut1-c2/p2 - 10GE port2 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:ca:e3:b1" + pci_address: "0000:18:00.1" + ip4_address: "172.16.20.1" + driver: i40e + link: link2 + model: Intel-X710 + port3: + # s35-t28-sut1-c2/p3 - 10GE port3 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:ca:e3:b2" + pci_address: "0000:18:00.2" + ip4_address: "172.16.30.1" + driver: i40e + link: link3 + model: Intel-X710 + port4: + # s35-t28-sut1-c2/p4 - 10GE port4 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:ca:e3:b3" + pci_address: "0000:18:00.3" + ip4_address: "172.16.40.1" + driver: i40e + link: link4 + model: Intel-X710 + port5: + # s35-t28-sut1-c2/p1 - 25GE port1 on Intel NIC xxv710 2p25GE. + mac_address: "3c:fd:fe:dd:d1:90" + pci_address: "0000:3b:00.0" + ip4_address: "172.16.50.1" + driver: i40e + link: link5 + model: Intel-XXV710 + port6: + # s35-t28-sut1-c2/p2 - 25GE port2 on Intel NIC xxv710 2p25GE. + mac_address: "3c:fd:fe:dd:d1:91" + pci_address: "0000:3b:00.1" + ip4_address: "172.16.60.1" + driver: i40e + link: link6 + model: Intel-XXV710 +# port7: +# # s35-t28-sut1-c9/p1 - 100GE-port1 ConnectX5-2p100GE. +# mac_address: "?" +# pci_address: "0000:5e:00.0" +# ip4_address: "172.16.70.2" +# driver: mlx5_core +# link: link7 +# model: Mellanox-CX556A +# port8: +# # s35-t28-sut1-c9/p2 - 100GE-port2 ConnectX5-2p100GE. +# mac_address: "?" +# pci_address: "0000:5e:00.1" +# ip4_address: "172.16.70.1" +# driver: mlx5_core +# link: link8 +# model: Mellanox-CX556A diff --git a/topologies/available/lf_2n_clx_testbed29.yaml b/topologies/available/lf_2n_clx_testbed29.yaml new file mode 100644 index 0000000000..4aebd1d4e1 --- /dev/null +++ b/topologies/available/lf_2n_clx_testbed29.yaml @@ -0,0 +1,128 @@ +--- +metadata: + version: 0.1 + 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.32.8.23" + arch: x86_64 + port: 22 + username: testuser + password: Csit1234 + interfaces: + port1: + # s38-t29-tg1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:a8:b1:90" + pci_address: "0000:18:00.0" + ip4_address: "172.16.10.2" + driver: i40e + link: link1 + model: Intel-X710 + port2: + # s38-t29-tg1-c2/p2 - 10GE port2 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:a8:b1:91" + pci_address: "0000:18:00.1" + ip4_address: "172.16.20.2" + driver: i40e + link: link2 + model: Intel-X710 + port3: + # s38-t29-tg1-c2/p3 - 10GE port3 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:a8:b1:92" + pci_address: "0000:18:00.2" + ip4_address: "172.16.30.2" + driver: i40e + link: link3 + model: Intel-X710 + port4: + # s38-t29-tg1-c2/p4 - 10GE port4 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:a8:b1:93" + pci_address: "0000:18:00.3" + ip4_address: "172.16.40.2" + driver: i40e + link: link4 + model: Intel-X710 + port5: + # s38-t29-tg1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE. + mac_address: "3c:fd:fe:cf:6c:bc" + pci_address: "0000:3b:00.0" + ip4_address: "172.16.50.2" + driver: i40e + link: link5 + model: Intel-XXV710 + port6: + # s38-t29-tg1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE. + mac_address: "3c:fd:fe:cf:6c:bd" + pci_address: "0000:3b:00.1" + ip4_address: "172.16.60.2" + driver: i40e + link: link6 + model: Intel-XXV710 + DUT1: + type: DUT + host: "10.32.8.22" + 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: + # s37-t29-sut1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:ca:eb:10" + pci_address: "0000:18:00.0" + ip4_address: "172.16.10.1" + driver: i40e + link: link1 + model: Intel-X710 + port2: + # s37-t29-sut1-c2/p2 - 10GE port2 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:ca:eb:11" + pci_address: "0000:18:00.1" + ip4_address: "172.16.20.1" + driver: i40e + link: link2 + model: Intel-X710 + port3: + # s37-t29-sut1-c2/p3 - 10GE port3 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:ca:eb:12" + pci_address: "0000:18:00.2" + ip4_address: "172.16.30.1" + driver: i40e + link: link3 + model: Intel-X710 + port4: + # s37-t29-sut1-c2/p4 - 10GE port4 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:ca:eb:13" + pci_address: "0000:18:00.3" + ip4_address: "172.16.40.1" + driver: i40e + link: link4 + model: Intel-X710 + port5: + # s37-t29-sut1-c2/p1 - 25GE port1 on Intel NIC xxv710 2p25GE. + mac_address: "3c:fd:fe:dd:d3:48" + pci_address: "0000:3b:00.0" + ip4_address: "172.16.50.1" + driver: i40e + link: link5 + model: Intel-XXV710 + port6: + # s37-t29-sut1-c2/p2 - 25GE port2 on Intel NIC xxv710 2p25GE. + mac_address: "3c:fd:fe:dd:d3:49" + pci_address: "0000:3b:00.1" + ip4_address: "172.16.60.1" + driver: i40e + link: link6 + model: Intel-XXV710