diff options
| author |   Juraj Linkeš <juraj.linkes@pantheon.tech> | 2020-09-30 13:50:53 +0200 |
|---|---|---|
| committer | Juraj Linkeš <juraj.linkes@pantheon.tech> | 2020-10-14 13:20:35 +0200 |
| commit | 402a7e1bcdf4724b23b02070edb1140008b2a489 (patch) | |
| tree | fbf208f41ce6a13769f297668a3847c6243c6b90 /resources/tools/testbed-setup/ansible/roles | |
| parent | 20ff48814382aba8ea963c771d2f341471a7aa8a (diff) | |
vpp_device: updates for 1n-tx2 testbeds
One ThunderX2 9975 server (.69) was replaced with two ThunderX2 9980
(.70, .71) servers. Move the .69 server under ansible perf section in
anticipation of repurposing it for that purpose. Update the ansible
scripts with .70 and .71 config and rename port names in device.sh lib
to reflect the NIC differences between .69 and .70 (and .71).
Change-Id: I88b75648735243e5559175d3192ffcc8fc70071c
Signed-off-by: Juraj Linkeš <juraj.linkes@pantheon.tech>
Diffstat (limited to 'resources/tools/testbed-setup/ansible/roles')
3 files changed, 18 insertions, 7 deletions
diff --git a/resources/tools/testbed-setup/ansible/roles/common/defaults/main.yaml b/resources/tools/testbed-setup/ansible/roles/common/defaults/main.yaml index f54bfce228..13db641423 100644 --- a/resources/tools/testbed-setup/ansible/roles/common/defaults/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/common/defaults/main.yaml @@ -38,7 +38,9 @@ packages_by_arch: aarch64: - "gfortran" - "libblas-dev" + - "libffi-dev" - "liblapack-dev" + - "libssl-dev" x86_64: - [] diff --git a/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml index c3d16d8b9c..e60b32ae2a 100644 --- a/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml @@ -35,7 +35,6 @@ - "dill==0.2.8.2" - "numpy==1.17.3" - "hdrhistogram==0.6.1" - - "pandas==0.25.3" - "plotly==4.1.1" - "PTable==0.9.2" - "Sphinx==2.2.1" @@ -76,9 +75,10 @@ tags: - install-pip -- name: Install CSIT PIP requirements - SciPy workaround +- name: Install CSIT PIP requirements - Pandas and SciPy workaround pip: name: + - "pandas==0.25.3" - "scipy==1.1.0" tags: - install-pip diff --git a/resources/tools/testbed-setup/ansible/roles/vpp_device/files/csit-initialize-vfs-tx2.sh b/resources/tools/testbed-setup/ansible/roles/vpp_device/files/csit-initialize-vfs-tx2.sh index 591c95a2be..b900efcf7c 100644 --- a/resources/tools/testbed-setup/ansible/roles/vpp_device/files/csit-initialize-vfs-tx2.sh +++ b/resources/tools/testbed-setup/ansible/roles/vpp_device/files/csit-initialize-vfs-tx2.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (c) 2019 PANTHEON.tech and/or its affiliates. +# Copyright (c) 2020 PANTHEON.tech and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -16,16 +16,25 @@ # Add QLogic Corp. FastLinQ QL41000 Series 10/25/40/50GbE Controller to # blacklist. PCI_BLACKLIST=($(lspci -Dmmd ':8070:0200' | cut -f1 -d' ')) +# Add I350 Gigabit Network Connection 1521 to blacklist. +PCI_BLACKLIST+=($(lspci -Dmmd ':1521:0200' | cut -f1 -d' ')) # Add Intel Corporation Ethernet Controller XL710 for 40GbE QSFP+ to whitelist. PCI_WHITELIST=($(lspci -Dmmd ':1583:0200' | cut -f1 -d' ')) +# Add MT27800 Family [ConnectX-5] 1017 to whitelist. +PCI_WHITELIST+=($(lspci -Dmmd ':1017:0200' | cut -f1 -d' ')) # See http://pci-ids.ucw.cz/v2.2/pci.ids for more info. declare -A PF_INDICES +# Intel NICs PF_INDICES["0000:05:00.0"]=0 PF_INDICES["0000:05:00.1"]=1 -PF_INDICES["0000:08:00.0"]=2 -PF_INDICES["0000:08:00.1"]=1 -PF_INDICES["0000:85:00.0"]=0 -PF_INDICES["0000:85:00.1"]=2 +PF_INDICES["0000:91:00.0"]=0 +PF_INDICES["0000:91:00.1"]=1 + +# Mellanox NICs +PF_INDICES["0000:0b:00.0"]=2 +PF_INDICES["0000:0b:00.1"]=3 +PF_INDICES["0000:9a:00.0"]=2 +PF_INDICES["0000:9a:00.1"]=3 |