From 52913516a16429a0ec6573260cf946223c84f34d Mon Sep 17 00:00:00 2001 From: Miroslav Miklus Date: Wed, 25 May 2016 14:37:08 +0200 Subject: Rename topology files with correct NIC names JIRA: CSIT-106 Change-Id: I3bb33d0025c99f1cf0defe542a86f0d620b80730 Signed-off-by: Miroslav Miklus --- bootstrap-verify-perf.sh | 6 +-- topologies/available/lf_testbed1-710-520.yaml | 63 ------------------------- topologies/available/lf_testbed1-X710-X520.yaml | 63 +++++++++++++++++++++++++ topologies/available/lf_testbed2-710-520.yaml | 63 ------------------------- topologies/available/lf_testbed2-X710-X520.yaml | 63 +++++++++++++++++++++++++ topologies/available/lf_testbed3-710-520.yaml | 63 ------------------------- topologies/available/lf_testbed3-X710-X520.yaml | 63 +++++++++++++++++++++++++ 7 files changed, 192 insertions(+), 192 deletions(-) delete mode 100644 topologies/available/lf_testbed1-710-520.yaml create mode 100644 topologies/available/lf_testbed1-X710-X520.yaml delete mode 100644 topologies/available/lf_testbed2-710-520.yaml create mode 100644 topologies/available/lf_testbed2-X710-X520.yaml delete mode 100644 topologies/available/lf_testbed3-710-520.yaml create mode 100644 topologies/available/lf_testbed3-X710-X520.yaml diff --git a/bootstrap-verify-perf.sh b/bootstrap-verify-perf.sh index 860e956632..8662026dc2 100755 --- a/bootstrap-verify-perf.sh +++ b/bootstrap-verify-perf.sh @@ -15,9 +15,9 @@ set -x # Space separated list of available testbeds, described by topology files -TOPOLOGIES="topologies/available/lf_testbed1-710-520.yaml \ - topologies/available/lf_testbed2-710-520.yaml \ - topologies/available/lf_testbed3-710-520.yaml" +TOPOLOGIES="topologies/available/lf_testbed1-X710-X520.yaml \ + topologies/available/lf_testbed2-X710-X520.yaml \ + topologies/available/lf_testbed3-X710-X520.yaml" VPP_STABLE_VER="1.0.0-437~g8f15e92_amd64" VPP_REPO_URL="https://nexus.fd.io/service/local/repositories/fd.io.dev/content/io/fd/vpp" diff --git a/topologies/available/lf_testbed1-710-520.yaml b/topologies/available/lf_testbed1-710-520.yaml deleted file mode 100644 index 31c74e8ad9..0000000000 --- a/topologies/available/lf_testbed1-710-520.yaml +++ /dev/null @@ -1,63 +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: "10.30.51.16" - port: 22 - username: testuser - password: Cisco1234 - interfaces: - port3: - mac_address: "3c:fd:fe:9c:ed:a0" - pci_address: "0000:05:00.0" - link: link1 - driver: i40e - model: Intel-X710 - port5: - mac_address: "3c:fd:fe:9c:ed:a1" - pci_address: "0000:05:00.1" - link: link2 - driver: i40e - model: Intel-X710 - DUT1: - type: DUT - host: "10.30.51.17" - port: 22 - username: testuser - password: Cisco1234 - interfaces: - port1: - mac_address: "90:e2:ba:b5:0a:2d" - pci_address: "0000:0a:00.1" - link: link1 - model: Intel-X520-DA2 - port3: - mac_address: "90:e2:ba:b5:0a:2c" - pci_address: "0000:0a:00.0" - link: link3 - model: Intel-X520-DA2 - DUT2: - type: DUT - host: "10.30.51.18" - port: 22 - username: testuser - password: Cisco1234 - interfaces: - port1: - mac_address: "90:e2:ba:b5:12:30" - pci_address: "0000:0a:00.0" - link: link2 - model: Intel-X520-DA2 - port3: - mac_address: "90:e2:ba:b5:12:31" - pci_address: "0000:0a:00.1" - link: link3 - model: Intel-X520-DA2 diff --git a/topologies/available/lf_testbed1-X710-X520.yaml b/topologies/available/lf_testbed1-X710-X520.yaml new file mode 100644 index 0000000000..31c74e8ad9 --- /dev/null +++ b/topologies/available/lf_testbed1-X710-X520.yaml @@ -0,0 +1,63 @@ +--- +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.16" + port: 22 + username: testuser + password: Cisco1234 + interfaces: + port3: + mac_address: "3c:fd:fe:9c:ed:a0" + pci_address: "0000:05:00.0" + link: link1 + driver: i40e + model: Intel-X710 + port5: + mac_address: "3c:fd:fe:9c:ed:a1" + pci_address: "0000:05:00.1" + link: link2 + driver: i40e + model: Intel-X710 + DUT1: + type: DUT + host: "10.30.51.17" + port: 22 + username: testuser + password: Cisco1234 + interfaces: + port1: + mac_address: "90:e2:ba:b5:0a:2d" + pci_address: "0000:0a:00.1" + link: link1 + model: Intel-X520-DA2 + port3: + mac_address: "90:e2:ba:b5:0a:2c" + pci_address: "0000:0a:00.0" + link: link3 + model: Intel-X520-DA2 + DUT2: + type: DUT + host: "10.30.51.18" + port: 22 + username: testuser + password: Cisco1234 + interfaces: + port1: + mac_address: "90:e2:ba:b5:12:30" + pci_address: "0000:0a:00.0" + link: link2 + model: Intel-X520-DA2 + port3: + mac_address: "90:e2:ba:b5:12:31" + pci_address: "0000:0a:00.1" + link: link3 + model: Intel-X520-DA2 diff --git a/topologies/available/lf_testbed2-710-520.yaml b/topologies/available/lf_testbed2-710-520.yaml deleted file mode 100644 index 8af6d4ee29..0000000000 --- a/topologies/available/lf_testbed2-710-520.yaml +++ /dev/null @@ -1,63 +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: "10.30.51.20" - port: 22 - username: testuser - password: Cisco1234 - interfaces: - port3: - mac_address: "3c:fd:fe:9c:ed:5c" - pci_address: "0000:05:00.0" - link: link1 - driver: i40e - model: Intel-X710 - port5: - mac_address: "3c:fd:fe:9c:ed:5d" - pci_address: "0000:05:00.1" - link: link2 - driver: i40e - model: Intel-X710 - DUT1: - type: DUT - host: "10.30.51.21" - port: 22 - username: testuser - password: Cisco1234 - interfaces: - port1: - mac_address: "90:e2:ba:b5:02:b9" - pci_address: "0000:0a:00.1" - link: link1 - model: Intel-X520-DA2 - port3: - mac_address: "90:e2:ba:b5:02:b8" - pci_address: "0000:0a:00.0" - link: link3 - model: Intel-X520-DA2 - DUT2: - type: DUT - host: "10.30.51.22" - port: 22 - username: testuser - password: Cisco1234 - interfaces: - port1: - mac_address: "90:e2:ba:b5:01:d8" - pci_address: "0000:0a:00.0" - link: link2 - model: Intel-X520-DA2 - port3: - mac_address: "90:e2:ba:b5:01:d9" - pci_address: "0000:0a:00.1" - link: link3 - model: Intel-X520-DA2 diff --git a/topologies/available/lf_testbed2-X710-X520.yaml b/topologies/available/lf_testbed2-X710-X520.yaml new file mode 100644 index 0000000000..8af6d4ee29 --- /dev/null +++ b/topologies/available/lf_testbed2-X710-X520.yaml @@ -0,0 +1,63 @@ +--- +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.20" + port: 22 + username: testuser + password: Cisco1234 + interfaces: + port3: + mac_address: "3c:fd:fe:9c:ed:5c" + pci_address: "0000:05:00.0" + link: link1 + driver: i40e + model: Intel-X710 + port5: + mac_address: "3c:fd:fe:9c:ed:5d" + pci_address: "0000:05:00.1" + link: link2 + driver: i40e + model: Intel-X710 + DUT1: + type: DUT + host: "10.30.51.21" + port: 22 + username: testuser + password: Cisco1234 + interfaces: + port1: + mac_address: "90:e2:ba:b5:02:b9" + pci_address: "0000:0a:00.1" + link: link1 + model: Intel-X520-DA2 + port3: + mac_address: "90:e2:ba:b5:02:b8" + pci_address: "0000:0a:00.0" + link: link3 + model: Intel-X520-DA2 + DUT2: + type: DUT + host: "10.30.51.22" + port: 22 + username: testuser + password: Cisco1234 + interfaces: + port1: + mac_address: "90:e2:ba:b5:01:d8" + pci_address: "0000:0a:00.0" + link: link2 + model: Intel-X520-DA2 + port3: + mac_address: "90:e2:ba:b5:01:d9" + pci_address: "0000:0a:00.1" + link: link3 + model: Intel-X520-DA2 diff --git a/topologies/available/lf_testbed3-710-520.yaml b/topologies/available/lf_testbed3-710-520.yaml deleted file mode 100644 index a098fa8699..0000000000 --- a/topologies/available/lf_testbed3-710-520.yaml +++ /dev/null @@ -1,63 +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: "10.30.51.24" - port: 22 - username: testuser - password: Cisco1234 - interfaces: - port3: - mac_address: "3c:fd:fe:9c:ef:98" - pci_address: "0000:05:00.0" - link: link1 - driver: i40e - model: Intel-X710 - port5: - mac_address: "3c:fd:fe:9c:ef:99" - pci_address: "0000:05:00.1" - link: link2 - driver: i40e - model: Intel-X710 - DUT1: - type: DUT - host: "10.30.51.25" - port: 22 - username: testuser - password: Cisco1234 - interfaces: - port1: - mac_address: "90:e2:ba:b5:01:dd" - pci_address: "0000:0a:00.1" - link: link1 - model: Intel-X520-DA2 - port3: - mac_address: "90:e2:ba:b5:01:dc" - pci_address: "0000:0a:00.0" - link: link3 - model: Intel-X520-DA2 - DUT2: - type: DUT - host: "10.30.51.26" - port: 22 - username: testuser - password: Cisco1234 - interfaces: - port1: - mac_address: "90:e2:ba:b5:0f:38" - pci_address: "0000:0a:00.0" - link: link2 - model: Intel-X520-DA2 - port3: - mac_address: "90:e2:ba:b5:0f:39" - pci_address: "0000:0a:00.1" - link: link3 - model: Intel-X520-DA2 diff --git a/topologies/available/lf_testbed3-X710-X520.yaml b/topologies/available/lf_testbed3-X710-X520.yaml new file mode 100644 index 0000000000..a098fa8699 --- /dev/null +++ b/topologies/available/lf_testbed3-X710-X520.yaml @@ -0,0 +1,63 @@ +--- +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.24" + port: 22 + username: testuser + password: Cisco1234 + interfaces: + port3: + mac_address: "3c:fd:fe:9c:ef:98" + pci_address: "0000:05:00.0" + link: link1 + driver: i40e + model: Intel-X710 + port5: + mac_address: "3c:fd:fe:9c:ef:99" + pci_address: "0000:05:00.1" + link: link2 + driver: i40e + model: Intel-X710 + DUT1: + type: DUT + host: "10.30.51.25" + port: 22 + username: testuser + password: Cisco1234 + interfaces: + port1: + mac_address: "90:e2:ba:b5:01:dd" + pci_address: "0000:0a:00.1" + link: link1 + model: Intel-X520-DA2 + port3: + mac_address: "90:e2:ba:b5:01:dc" + pci_address: "0000:0a:00.0" + link: link3 + model: Intel-X520-DA2 + DUT2: + type: DUT + host: "10.30.51.26" + port: 22 + username: testuser + password: Cisco1234 + interfaces: + port1: + mac_address: "90:e2:ba:b5:0f:38" + pci_address: "0000:0a:00.0" + link: link2 + model: Intel-X520-DA2 + port3: + mac_address: "90:e2:ba:b5:0f:39" + pci_address: "0000:0a:00.1" + link: link3 + model: Intel-X520-DA2 -- cgit 1.2.3-korg