From cfd0d32435a912fccf39aac04959bd0d13a8d0e8 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Fri, 13 Jul 2018 07:33:16 +0000 Subject: Update skylake tesbed inventory - Add missing topology files - Add missing topologies to bootstrap - Small fixes in ansible Change-Id: I3b9ad60a0adfae9e93e5e700279f7ade81174471 Signed-off-by: Peter Mikus --- topologies/available/lf_2n_skx_testbed21.yaml | 2 +- topologies/available/lf_2n_skx_testbed22.yaml | 2 +- topologies/available/lf_2n_skx_testbed23.yaml | 2 +- topologies/available/lf_2n_skx_testbed24.yaml | 2 +- topologies/available/lf_3n_skx_testbed31.yaml | 4 +- topologies/available/lf_3n_skx_testbed32.yaml | 222 ++++++++++++++++++++++++++ 6 files changed, 228 insertions(+), 6 deletions(-) create mode 100644 topologies/available/lf_3n_skx_testbed32.yaml (limited to 'topologies') diff --git a/topologies/available/lf_2n_skx_testbed21.yaml b/topologies/available/lf_2n_skx_testbed21.yaml index d5dc1f50ab..317938d1e2 100644 --- a/topologies/available/lf_2n_skx_testbed21.yaml +++ b/topologies/available/lf_2n_skx_testbed21.yaml @@ -103,7 +103,7 @@ nodes: port: 22 username: testuser password: Csit1234 - uio_driver: igb_uio + uio_driver: vfio-pci honeycomb: user: admin passwd: admin diff --git a/topologies/available/lf_2n_skx_testbed22.yaml b/topologies/available/lf_2n_skx_testbed22.yaml index 588284c93a..d2e49a1686 100644 --- a/topologies/available/lf_2n_skx_testbed22.yaml +++ b/topologies/available/lf_2n_skx_testbed22.yaml @@ -103,7 +103,7 @@ nodes: port: 22 username: testuser password: Csit1234 - uio_driver: igb_uio + uio_driver: vfio-pci honeycomb: user: admin passwd: admin diff --git a/topologies/available/lf_2n_skx_testbed23.yaml b/topologies/available/lf_2n_skx_testbed23.yaml index d3606e1dde..892e9bf7f0 100644 --- a/topologies/available/lf_2n_skx_testbed23.yaml +++ b/topologies/available/lf_2n_skx_testbed23.yaml @@ -103,7 +103,7 @@ nodes: port: 22 username: testuser password: Csit1234 - uio_driver: igb_uio + uio_driver: vfio-pci honeycomb: user: admin passwd: admin diff --git a/topologies/available/lf_2n_skx_testbed24.yaml b/topologies/available/lf_2n_skx_testbed24.yaml index 092104f24f..e73f99db0e 100644 --- a/topologies/available/lf_2n_skx_testbed24.yaml +++ b/topologies/available/lf_2n_skx_testbed24.yaml @@ -103,7 +103,7 @@ nodes: port: 22 username: testuser password: Csit1234 - uio_driver: igb_uio + uio_driver: vfio-pci honeycomb: user: admin passwd: admin diff --git a/topologies/available/lf_3n_skx_testbed31.yaml b/topologies/available/lf_3n_skx_testbed31.yaml index ab40e81f70..c4a8ef1e60 100644 --- a/topologies/available/lf_3n_skx_testbed31.yaml +++ b/topologies/available/lf_3n_skx_testbed31.yaml @@ -103,7 +103,7 @@ nodes: port: 22 username: testuser password: Csit1234 - uio_driver: igb_uio + uio_driver: vfio-pci honeycomb: user: admin passwd: admin @@ -165,7 +165,7 @@ nodes: port: 22 username: testuser password: Csit1234 - uio_driver: igb_uio + uio_driver: vfio-pci honeycomb: user: admin passwd: admin diff --git a/topologies/available/lf_3n_skx_testbed32.yaml b/topologies/available/lf_3n_skx_testbed32.yaml new file mode 100644 index 0000000000..cd67d8b680 --- /dev/null +++ b/topologies/available/lf_3n_skx_testbed32.yaml @@ -0,0 +1,222 @@ +--- +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: "10.30.51.60" + arch: x86_64 + port: 22 + username: testuser + password: Csit1234 + interfaces: + port1: + # s13-t31-tg1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:a8:af:08" + pci_address: "0000:18:00.0" + ip4_address: "172.16.10.2" + driver: i40e + link: link1 + model: Intel-XL710 + port2: + # s13-t31-tg1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:a8:af:09" + pci_address: "0000:18:00.1" + ip4_address: "172.16.20.2" + driver: i40e + link: link2 + model: Intel-XL710 + port3: + # s13-t31-tg1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:a8:af:0a" + pci_address: "0000:18:00.2" + ip4_address: "172.16.30.2" + driver: i40e + link: link3 + model: Intel-X710 + port4: + # s13-t31-tg1-c2/p4 - 10GE port1 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:a8:af:0b" + pci_address: "0000:18:00.3" + ip4_address: "172.16.40.2" + driver: i40e + link: link4 + model: Intel-X710 + port5: + # s13-t31-tg1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE. + mac_address: "3c:fd:fe:bd:fa:1c" + pci_address: "0000:3b:00.0" + ip4_address: "172.16.50.2" + driver: i40e + link: link5 + model: Intel-XXV710 + port6: + # s13-t31-tg1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE. + mac_address: "3c:fd:fe:bd:fa:1d" + pci_address: "0000:3b:00.1" + ip4_address: "172.16.60.2" + driver: i40e + link: link6 + model: Intel-XXV710 + port7: + # s13-t31-tg1-c10/p1 - 10GE port1 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:a8:ab:e0" + pci_address: "0000:d8:00.0" + ip4_address: "172.16.70.2" + driver: i40e + link: link7 + model: Intel-XL710 + port8: + # s13-t31-tg1-c10/p2 - 10GE port1 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:a8:ab:e1" + pci_address: "0000:d8:00.1" + ip4_address: "172.16.70.1" + driver: i40e + link: link7 + model: Intel-XL710 + port9: + # s13-t31-tg1-c10/p3 - 10GE port1 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:a8:ab:e2" + pci_address: "0000:d8:00.2" + ip4_address: "172.16.80.2" + driver: i40e + link: link8 + model: Intel-X710 + port10: + # s13-t31-tg1-c10/p4 - 10GE port1 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:a8:ab:e3" + pci_address: "0000:d8:00.3" + ip4_address: "172.16.80.1" + driver: i40e + link: link8 + model: Intel-X710 + DUT1: + type: DUT + host: "10.30.51.58" + 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: + # s14-t32-sut1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:a8:ae:60" + pci_address: "0000:18:00.0" + ip4_address: "172.16.10.1" + driver: i40e + link: link1 + model: Intel-XL710 + port2: + # s14-t32-sut1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:a8:ae:61" + pci_address: "0000:18:00.1" + ip4_address: "172.16.120.1" + driver: i40e + link: link21 + model: Intel-XL710 + port3: + # s14-t32-sut1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:a8:ae:62" + pci_address: "0000:18:00.2" + ip4_address: "172.16.30.1" + driver: i40e + link: link3 + model: Intel-X710 + port4: + # s14-t32-sut1-c2/p4 - 10GE port1 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:a8:ae:63" + pci_address: "0000:18:00.3" + ip4_address: "172.16.140.1" + driver: i40e + link: link22 + model: Intel-X710 + port5: + # s14-t32-sut1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE. + mac_address: "3c:fd:fe:bd:f9:38" + pci_address: "0000:3b:00.0" + ip4_address: "172.16.50.1" + driver: i40e + link: link5 + model: Intel-XXV710 + port6: + # s14-t32-sut1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE. + mac_address: "3c:fd:fe:bd:f9:39" + pci_address: "0000:3b:00.1" + ip4_address: "172.16.160.1" + driver: i40e + link: link23 + model: Intel-XXV710 + DUT2: + type: DUT + host: "10.30.51.59" + 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: + # s15-t32-sut1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:a8:ae:c0" + pci_address: "0000:18:00.0" + ip4_address: "172.16.20.1" + driver: i40e + link: link2 + model: Intel-XL710 + port2: + # s15-t32-sut1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:a8:ae:c1" + pci_address: "0000:18:00.1" + ip4_address: "172.16.120.2" + driver: i40e + link: link21 + model: Intel-XL710 + port3: + # s15-t32-sut1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:a8:ae:c2" + pci_address: "0000:18:00.2" + ip4_address: "172.16.40.1" + driver: i40e + link: link4 + model: Intel-X710 + port4: + # s15-t32-sut1-c2/p4 - 10GE port1 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:a8:ae:c3" + pci_address: "0000:18:00.3" + ip4_address: "172.16.140.2" + driver: i40e + link: link22 + model: Intel-X710 + port5: + # s15-t32-sut1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE. + mac_address: "3c:fd:fe:bd:f8:fc" + pci_address: "0000:3b:00.0" + ip4_address: "172.16.60.1" + driver: i40e + link: link6 + model: Intel-XXV710 + port6: + # s15-t32-sut1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE. + mac_address: "3c:fd:fe:bd:f8:fd" + pci_address: "0000:3b:00.1" + ip4_address: "172.16.160.2" + driver: i40e + link: link23 + model: Intel-XXV710 -- cgit 1.2.3-korg