diff options
| author |   Maros Mullner <maros.mullner@pantheon.tech> | 2020-03-10 11:04:54 +0100 |
|---|---|---|
| committer |   Peter Mikus <pmikus@cisco.com> | 2020-03-16 06:47:04 +0000 |
| commit | 41b29c01d434b4536c33903423e1b28900e829bd (patch) | |
| tree | f1e8e1211d6586ad91b6fa9eabeeaba0bd42e15e | |
| parent | acd320f64d2049b2dfe6c4616d770383ff67f20d (diff) | |
Final changes for AWS.
Modified cpuutils numa to work with aws 18xlarge instances.
Added dmidecode package to calibration role as is not installed by default.
Added required constants
Signed-off-by: Maros Mullner <maros.mullner@pantheon.tech>
Change-Id: I99608d9df3cff0b085ad26c30e339216b17581eb
| -rw-r--r-- | resources/libraries/python/Constants.py | 2 | ||||
| -rw-r--r-- | resources/libraries/python/InterfaceUtil.py | 10 | ||||
| -rw-r--r-- | resources/tools/testbed-setup/ansible/roles/calibration/defaults/main.yaml | 1 |
3 files changed, 4 insertions, 9 deletions
diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py index 97514750a8..42a8b41922 100644 --- a/resources/libraries/python/Constants.py +++ b/resources/libraries/python/Constants.py @@ -280,6 +280,7 @@ class Constants: u"Intel-X710": u"10ge2p1x710", u"Intel-XL710": u"40ge2p1xl710", u"Intel-XXV710": u"25ge2p1xxv710", + u"Amazon-Nitro-50G": u"50ge1p1ENA", u"Mellanox-CX556A": u"100ge2p1cx556a", } @@ -292,6 +293,7 @@ class Constants: u"Intel-X710": [u"vfio-pci", u"avf"], u"Intel-XL710": [u"vfio-pci", u"avf"], u"Intel-XXV710": [u"vfio-pci", u"avf"], + u"Amazon-Nitro-50G": [u"vfio-pci"], u"Mellanox-CX556A": [u"rdma-core"], } diff --git a/resources/libraries/python/InterfaceUtil.py b/resources/libraries/python/InterfaceUtil.py index 0333c9c092..b6647ef32a 100644 --- a/resources/libraries/python/InterfaceUtil.py +++ b/resources/libraries/python/InterfaceUtil.py @@ -695,14 +695,6 @@ class InterfaceUtil: :raises ValueError: If numa node ia less than 0. :raises RuntimeError: If update of numa node failed. """ - def check_cpu_node_count(node_n, val): - val = int(val) - if val < 0: - if CpuUtils.cpu_node_count(node_n) == 1: - val = 0 - else: - raise ValueError - return val ssh = SSH() for if_key in Topology.get_node_interfaces(node): if_pci = Topology.get_interface_pci_addr(node, if_key) @@ -712,7 +704,7 @@ class InterfaceUtil: ret, out, _ = ssh.exec_command(cmd) if ret == 0: try: - numa_node = check_cpu_node_count(node, out) + numa_node = 0 if int(out) < 0 else int(out) except ValueError: logger.trace( f"Reading numa location failed for: {if_pci}" diff --git a/resources/tools/testbed-setup/ansible/roles/calibration/defaults/main.yaml b/resources/tools/testbed-setup/ansible/roles/calibration/defaults/main.yaml index 43628ff146..f7c37a764c 100644 --- a/resources/tools/testbed-setup/ansible/roles/calibration/defaults/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/calibration/defaults/main.yaml @@ -9,6 +9,7 @@ packages_base: packages_by_distro: ubuntu: - "build-essential" + - "dmidecode" packages_by_arch: aarch64: |