From 3fc1394954fbb06488e81102cc4cd9965ab15a22 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Tue, 14 May 2019 14:39:56 +0000 Subject: Make topology files read dynamically from directory Change-Id: Id43c7c299d2e112b6caf00a3d340e6051ab337b6 Signed-off-by: Peter Mikus --- topologies/available/lf_2n_skx_testbed22.yaml | 160 -------------------------- topologies/disabled/README | 1 + topologies/disabled/lf_2n_skx_testbed22.yaml | 160 ++++++++++++++++++++++++++ 3 files changed, 161 insertions(+), 160 deletions(-) delete mode 100644 topologies/available/lf_2n_skx_testbed22.yaml create mode 100644 topologies/disabled/README create mode 100644 topologies/disabled/lf_2n_skx_testbed22.yaml (limited to 'topologies') diff --git a/topologies/available/lf_2n_skx_testbed22.yaml b/topologies/available/lf_2n_skx_testbed22.yaml deleted file mode 100644 index f048e52486..0000000000 --- a/topologies/available/lf_2n_skx_testbed22.yaml +++ /dev/null @@ -1,160 +0,0 @@ ---- -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.30.51.53" - arch: x86_64 - port: 22 - username: testuser - password: Csit1234 - interfaces: - port1: - # s6-t22-tg1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE. - mac_address: "3c:fd:fe:a8:ab:98" - pci_address: "0000:18:00.0" - ip4_address: "172.16.10.2" - driver: i40e - link: link1 - model: Intel-X710 - port2: - # s6-t22-tg1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE. - mac_address: "3c:fd:fe:a8:ab:99" - pci_address: "0000:18:00.1" - ip4_address: "172.16.20.2" - driver: i40e - link: link2 - model: Intel-X710 - port3: - # s6-t22-tg1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE. - mac_address: "3c:fd:fe:a8:ab:9a" - pci_address: "0000:18:00.2" - ip4_address: "172.16.30.2" - driver: i40e - link: link3 - model: Intel-X710 - port4: - # s6-t22-tg1-c2/p4 - 10GE port1 on Intel NIC x710 4p10GE. - mac_address: "3c:fd:fe:a8:ab:9b" - pci_address: "0000:18:00.3" - ip4_address: "172.16.40.2" - driver: i40e - link: link4 - model: Intel-X710 - port5: - # s6-t22-tg1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE. - mac_address: "3c:fd:fe:bd:f8:60" - pci_address: "0000:3b:00.0" - ip4_address: "172.16.50.2" - driver: i40e - link: link5 - model: Intel-XXV710 - port6: - # s6-t22-tg1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE. - mac_address: "3c:fd:fe:bd:f8:61" - pci_address: "0000:3b:00.1" - ip4_address: "172.16.60.2" - driver: i40e - link: link6 - model: Intel-XXV710 - port7: - # s6-t22-tg1-c10/p1 - 10GE port1 on Intel NIC x710 4p10GE. - mac_address: "3c:fd:fe:a8:ab:98" - pci_address: "0000:d8:00.0" - ip4_address: "172.16.70.2" - driver: i40e - link: link7 - model: Intel-X710 - port8: - # s6-t22-tg1-c10/p2 - 10GE port1 on Intel NIC x710 4p10GE. - mac_address: "3c:fd:fe:a8:ab:99" - pci_address: "0000:d8:00.1" - ip4_address: "172.16.70.1" - driver: i40e - link: link7 - model: Intel-X710 - port9: - # s6-t22-tg1-c10/p3 - 10GE port1 on Intel NIC x710 4p10GE. - mac_address: "3c:fd:fe:a8:ab:9a" - pci_address: "0000:d8:00.2" - ip4_address: "172.16.80.2" - driver: i40e - link: link8 - model: Intel-X710 - port10: - # s6-t22-tg1-c10/p4 - 10GE port1 on Intel NIC x710 4p10GE. - mac_address: "3c:fd:fe:a8:ab:9b" - 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.52" - 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: - # s5-t22-sut1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE. - mac_address: "3c:fd:fe:a8:af:a8" - pci_address: "0000:18:00.0" - ip4_address: "172.16.10.1" - driver: i40e - link: link1 - model: Intel-X710 - port2: - # s5-t22-sut1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE. - mac_address: "3c:fd:fe:a8:af:a9" - pci_address: "0000:18:00.1" - ip4_address: "172.16.20.1" - driver: i40e - link: link2 - model: Intel-X710 - port3: - # s5-t22-sut1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE. - mac_address: "3c:fd:fe:a8:af:aa" - pci_address: "0000:18:00.2" - ip4_address: "172.16.30.1" - driver: i40e - link: link3 - model: Intel-X710 - port4: - # s5-t22-sut1-c2/p4 - 10GE port1 on Intel NIC x710 4p10GE. - mac_address: "3c:fd:fe:a8:af:ab" - pci_address: "0000:18:00.3" - ip4_address: "172.16.40.1" - driver: i40e - link: link4 - model: Intel-X710 - port5: - # s5-t22-sut1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE. - mac_address: "3c:fd:fe:bd:f9:54" - pci_address: "0000:3b:00.0" - ip4_address: "172.16.50.1" - driver: i40e - link: link5 - model: Intel-XXV710 - port6: - # s5-t22-sut1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE. - mac_address: "3c:fd:fe:bd:f9:55" - pci_address: "0000:3b:00.1" - ip4_address: "172.16.60.1" - driver: i40e - link: link6 - model: Intel-XXV710 diff --git a/topologies/disabled/README b/topologies/disabled/README new file mode 100644 index 0000000000..4063c771d1 --- /dev/null +++ b/topologies/disabled/README @@ -0,0 +1 @@ +Define disabled topologies. diff --git a/topologies/disabled/lf_2n_skx_testbed22.yaml b/topologies/disabled/lf_2n_skx_testbed22.yaml new file mode 100644 index 0000000000..f048e52486 --- /dev/null +++ b/topologies/disabled/lf_2n_skx_testbed22.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.30.51.53" + arch: x86_64 + port: 22 + username: testuser + password: Csit1234 + interfaces: + port1: + # s6-t22-tg1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:a8:ab:98" + pci_address: "0000:18:00.0" + ip4_address: "172.16.10.2" + driver: i40e + link: link1 + model: Intel-X710 + port2: + # s6-t22-tg1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:a8:ab:99" + pci_address: "0000:18:00.1" + ip4_address: "172.16.20.2" + driver: i40e + link: link2 + model: Intel-X710 + port3: + # s6-t22-tg1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:a8:ab:9a" + pci_address: "0000:18:00.2" + ip4_address: "172.16.30.2" + driver: i40e + link: link3 + model: Intel-X710 + port4: + # s6-t22-tg1-c2/p4 - 10GE port1 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:a8:ab:9b" + pci_address: "0000:18:00.3" + ip4_address: "172.16.40.2" + driver: i40e + link: link4 + model: Intel-X710 + port5: + # s6-t22-tg1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE. + mac_address: "3c:fd:fe:bd:f8:60" + pci_address: "0000:3b:00.0" + ip4_address: "172.16.50.2" + driver: i40e + link: link5 + model: Intel-XXV710 + port6: + # s6-t22-tg1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE. + mac_address: "3c:fd:fe:bd:f8:61" + pci_address: "0000:3b:00.1" + ip4_address: "172.16.60.2" + driver: i40e + link: link6 + model: Intel-XXV710 + port7: + # s6-t22-tg1-c10/p1 - 10GE port1 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:a8:ab:98" + pci_address: "0000:d8:00.0" + ip4_address: "172.16.70.2" + driver: i40e + link: link7 + model: Intel-X710 + port8: + # s6-t22-tg1-c10/p2 - 10GE port1 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:a8:ab:99" + pci_address: "0000:d8:00.1" + ip4_address: "172.16.70.1" + driver: i40e + link: link7 + model: Intel-X710 + port9: + # s6-t22-tg1-c10/p3 - 10GE port1 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:a8:ab:9a" + pci_address: "0000:d8:00.2" + ip4_address: "172.16.80.2" + driver: i40e + link: link8 + model: Intel-X710 + port10: + # s6-t22-tg1-c10/p4 - 10GE port1 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:a8:ab:9b" + 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.52" + 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: + # s5-t22-sut1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:a8:af:a8" + pci_address: "0000:18:00.0" + ip4_address: "172.16.10.1" + driver: i40e + link: link1 + model: Intel-X710 + port2: + # s5-t22-sut1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:a8:af:a9" + pci_address: "0000:18:00.1" + ip4_address: "172.16.20.1" + driver: i40e + link: link2 + model: Intel-X710 + port3: + # s5-t22-sut1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:a8:af:aa" + pci_address: "0000:18:00.2" + ip4_address: "172.16.30.1" + driver: i40e + link: link3 + model: Intel-X710 + port4: + # s5-t22-sut1-c2/p4 - 10GE port1 on Intel NIC x710 4p10GE. + mac_address: "3c:fd:fe:a8:af:ab" + pci_address: "0000:18:00.3" + ip4_address: "172.16.40.1" + driver: i40e + link: link4 + model: Intel-X710 + port5: + # s5-t22-sut1-c4/p1 - 25GE port1 on Intel NIC xxv710 2p25GE. + mac_address: "3c:fd:fe:bd:f9:54" + pci_address: "0000:3b:00.0" + ip4_address: "172.16.50.1" + driver: i40e + link: link5 + model: Intel-XXV710 + port6: + # s5-t22-sut1-c4/p2 - 25GE port2 on Intel NIC xxv710 2p25GE. + mac_address: "3c:fd:fe:bd:f9:55" + pci_address: "0000:3b:00.1" + ip4_address: "172.16.60.1" + driver: i40e + link: link6 + model: Intel-XXV710 -- cgit 1.2.3-korg