aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xbootstrap-verify-perf-DPDK.sh9
-rwxr-xr-xbootstrap-verify-perf.sh9
-rw-r--r--resources/tools/testbed-setup/ansible/roles/tg_sut/defaults/main.yaml4
-rw-r--r--resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_x86_64.yaml2
-rw-r--r--resources/tools/testbed-setup/ansible/site.yaml4
-rw-r--r--resources/tools/testbed-setup/pxe/dhcpd.conf40
-rw-r--r--topologies/available/lf_2n_skx_testbed21.yaml2
-rw-r--r--topologies/available/lf_2n_skx_testbed22.yaml2
-rw-r--r--topologies/available/lf_2n_skx_testbed23.yaml2
-rw-r--r--topologies/available/lf_2n_skx_testbed24.yaml2
-rw-r--r--topologies/available/lf_3n_skx_testbed31.yaml4
-rw-r--r--topologies/available/lf_3n_skx_testbed32.yaml222
12 files changed, 265 insertions, 37 deletions
diff --git a/bootstrap-verify-perf-DPDK.sh b/bootstrap-verify-perf-DPDK.sh
index ac595cb64a..566f5bc948 100755
--- a/bootstrap-verify-perf-DPDK.sh
+++ b/bootstrap-verify-perf-DPDK.sh
@@ -19,9 +19,12 @@ set -xo pipefail
TOPOLOGIES_3N_HSW="topologies/available/lf_3n_hsw_testbed1.yaml \
topologies/available/lf_3n_hsw_testbed2.yaml \
topologies/available/lf_3n_hsw_testbed3.yaml"
-TOPOLOGIES_2N_SKX="topologies/available/lf_2n_skx_testbed22.yaml \
- topologies/available/lf_2n_skx_testbed23.yaml"
-TOPOLOGIES_3N_SKX=""
+TOPOLOGIES_2N_SKX="topologies/available/lf_2n_skx_testbed21.yaml \
+ topologies/available/lf_2n_skx_testbed22.yaml \
+ topologies/available/lf_2n_skx_testbed23.yaml \
+ topologies/available/lf_2n_skx_testbed24.yaml"
+TOPOLOGIES_3N_SKX="topologies/available/lf_2n_skx_testbed31.yaml \
+ topologies/available/lf_2n_skx_testbed32.yaml"
# SYSTEM
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
diff --git a/bootstrap-verify-perf.sh b/bootstrap-verify-perf.sh
index 79c7fba4c7..8481406a6c 100755
--- a/bootstrap-verify-perf.sh
+++ b/bootstrap-verify-perf.sh
@@ -19,9 +19,12 @@ set -xo pipefail
TOPOLOGIES_3N_HSW="topologies/available/lf_3n_hsw_testbed1.yaml \
topologies/available/lf_3n_hsw_testbed2.yaml \
topologies/available/lf_3n_hsw_testbed3.yaml"
-TOPOLOGIES_2N_SKX="topologies/available/lf_2n_skx_testbed22.yaml \
- topologies/available/lf_2n_skx_testbed23.yaml"
-TOPOLOGIES_3N_SKX=""
+TOPOLOGIES_2N_SKX="topologies/available/lf_2n_skx_testbed21.yaml \
+ topologies/available/lf_2n_skx_testbed22.yaml \
+ topologies/available/lf_2n_skx_testbed23.yaml \
+ topologies/available/lf_2n_skx_testbed24.yaml"
+TOPOLOGIES_3N_SKX="topologies/available/lf_2n_skx_testbed31.yaml \
+ topologies/available/lf_2n_skx_testbed32.yaml"
# SYSTEM
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/defaults/main.yaml b/resources/tools/testbed-setup/ansible/roles/tg_sut/defaults/main.yaml
index cefc496107..174dc78cb0 100644
--- a/resources/tools/testbed-setup/ansible/roles/tg_sut/defaults/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/tg_sut/defaults/main.yaml
@@ -23,8 +23,8 @@ docker_apt_package_name: "{{ docker_version }}~{{ docker_edition }}~3-0~{{ ansib
apt_cache_time: 86400
kubernetes_channel: "main"
-kubernetes_version: "1.10.3"
+kubernetes_version: "1.11.0-00"
kubernetes_apt_key: "54A647F9048D5688D7DA2ABE6A030B21BA07F4FB"
kubernetes_repository: "deb http://apt.kubernetes.io/ kubernetes-xenial {{ kubernetes_channel }}"
-kubernetes_apt_package_name: "{{ kubernetes_version }}-00"
+kubernetes_apt_package_name: "{{ kubernetes_version }}"
diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_x86_64.yaml b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_x86_64.yaml
index f43fad1326..b416f9f7de 100644
--- a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_x86_64.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_x86_64.yaml
@@ -124,7 +124,7 @@
command: "systemctl daemon-reload"
notify: ["Restart Docker"]
when: (docker_register_systemd_service and
- docker_register_systemd_service | changed)
+ docker_register_systemd_service is changed)
tags: restart-docker
- name: Set specific users to "docker" group
diff --git a/resources/tools/testbed-setup/ansible/site.yaml b/resources/tools/testbed-setup/ansible/site.yaml
index 834ad51787..4a8a7f045a 100644
--- a/resources/tools/testbed-setup/ansible/site.yaml
+++ b/resources/tools/testbed-setup/ansible/site.yaml
@@ -7,8 +7,8 @@
- import_playbook: sut.yaml
tags: sut
-- import_playbook: vppdevice.yaml
- tags: vppdevice
+#- import_playbook: vppdevice.yaml
+# tags: vppdevice
#- import_playbook: virl.yaml
# tags: virl
diff --git a/resources/tools/testbed-setup/pxe/dhcpd.conf b/resources/tools/testbed-setup/pxe/dhcpd.conf
index 17c0bbccb1..00b5ed1ca0 100644
--- a/resources/tools/testbed-setup/pxe/dhcpd.conf
+++ b/resources/tools/testbed-setup/pxe/dhcpd.conf
@@ -155,21 +155,21 @@ subnet 10.30.51.0 netmask 255.255.255.0 {
fixed-address 10.30.51.48;
filename "pxelinux.0";
}
-# host s14-t32-sut1 {
-# hardware ethernet 00:00:00:00:00:00;
-# fixed-address 10.30.51.58;
-# filename "pxelinux.0";
-# }
-# host s15-t32-sut2 {
-# hardware ethernet 00:00:00:00:00:00;
-# fixed-address 10.30.51.59;
-# filename "pxelinux.0";
-# }
-# host s16-t32-tg1 {
-# hardware ethernet 00:00:00:00:00:00;
-# fixed-address 10.30.51.60;
-# filename "pxelinux.0";
-# }
+ host s14-t32-sut1 {
+ hardware ethernet ac:1f:6b:8b:53:64;
+ fixed-address 10.30.51.58;
+ filename "pxelinux.0";
+ }
+ host s15-t32-sut2 {
+ hardware ethernet ac:1f:6b:8b:56:e2;
+ fixed-address 10.30.51.59;
+ filename "pxelinux.0";
+ }
+ host s16-t32-tg1 {
+ hardware ethernet ac:1f:6b:8b:55:ae;
+ fixed-address 10.30.51.60;
+ filename "pxelinux.0";
+ }
# 3-Node Arm
# host s15-t33-sut1 {
# hardware ethernet 00:00:00:00:00:00;
@@ -181,11 +181,11 @@ subnet 10.30.51.0 netmask 255.255.255.0 {
# fixed-address 10.30.51.37;
# filename "ubuntu-installer/arm64/bootnetaa64.efi";
# }
-# host s19-t33t34-tg1 {
-# hardware ethernet 00:00:00:00:00:00;
-# fixed-address 10.30.51.49;
-# filename "pxelinux.0";
-# }
+ host s19-t33t34-tg1 {
+ hardware ethernet ac:1f:6b:8b:53:60;
+ fixed-address 10.30.51.49;
+ filename "pxelinux.0";
+ }
# host s18-t34-sut1 {
# hardware ethernet 00:00:00:00:00:00;
# fixed-address 10.30.51.41;
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