diff options
| author | Artom Lifshitz <alifshit@redhat.com> | 2021-03-09 13:36:57 -0500 |
|---|---|---|
| committer | Artom Lifshitz <alifshit@redhat.com> | 2021-03-29 10:50:35 -0400 |
| commit | e19f6fda58dc8f76dc5fe79165e5d18292af2842 (patch) | |
| tree | fdbf3157702f442703c9dfe6e0577772297cbf11 /nova/virt | |
| parent | 68ad2c67d891935c66e8c0e5a368695c202a9f49 (diff) | |
| download | nova-e19f6fda58dc8f76dc5fe79165e5d18292af2842.tar.gz | |
Follow up from bp/pci-socket-affinity series
This patch addresses outstanding nits from the bp/pci-socket-affinity
series. The most important is how the libvirt driver handles reporting
the new COMPUTE_SOCKET_PCI_NUMA_AFFINITY trait. Previously, this was
done by directly adding the trait in static_traits(). This patch
switches it to use driver capabilities.
Change-Id: I89d742ae01d65ab4e16fd8bd86b761f4c5d54d54
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/driver.py | 3 | ||||
| -rw-r--r-- | nova/virt/libvirt/driver.py | 2 | ||||
| -rw-r--r-- | nova/virt/powervm/driver.py | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/nova/virt/driver.py b/nova/virt/driver.py index 5c96d4041a..4e1a80d173 100644 --- a/nova/virt/driver.py +++ b/nova/virt/driver.py @@ -124,6 +124,8 @@ CAPABILITY_TRAITS_MAP = { "supports_migrate_to_same_host": os_traits.COMPUTE_SAME_HOST_COLD_MIGRATE, "supports_bfv_rescue": os_traits.COMPUTE_RESCUE_BFV, "supports_secure_boot": os_traits.COMPUTE_SECURITY_UEFI_SECURE_BOOT, + "supports_socket_pci_numa_affinity": + os_traits.COMPUTE_SOCKET_PCI_NUMA_AFFINITY, } @@ -191,6 +193,7 @@ class ComputeDriver(object): "supports_bfv_rescue": False, "supports_vtpm": False, "supports_secure_boot": False, + "supports_socket_pci_numa_affinity": False, # Image type support flags "supports_image_type_aki": False, diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index b5eb984fef..a99cb3963e 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -417,6 +417,7 @@ class LibvirtDriver(driver.ComputeDriver): "supports_accelerators": True, "supports_bfv_rescue": True, "supports_vtpm": CONF.libvirt.swtpm_enabled, + "supports_socket_pci_numa_affinity": True, } super(LibvirtDriver, self).__init__(virtapi) @@ -8087,7 +8088,6 @@ class LibvirtDriver(driver.ComputeDriver): traits.update(self._get_video_model_traits()) traits.update(self._get_vif_model_traits()) traits.update(self._get_tpm_traits()) - traits.update({ot.COMPUTE_SOCKET_PCI_NUMA_AFFINITY: True}) _, invalid_traits = ot.check_traits(traits) for invalid_trait in invalid_traits: diff --git a/nova/virt/powervm/driver.py b/nova/virt/powervm/driver.py index c94dcd35f2..ec8f60226d 100644 --- a/nova/virt/powervm/driver.py +++ b/nova/virt/powervm/driver.py @@ -81,6 +81,7 @@ class PowerVMDriver(driver.ComputeDriver): 'supports_accelerators': False, 'supports_vtpm': False, 'supports_secure_boot': False, + 'supports_socket_pci_numa_affinity': False, # Supported image types "supports_image_type_aki": False, |