From 4f587a58fa90ed07db6bf924dd9b9b132c7c6930 Mon Sep 17 00:00:00 2001 From: Amit Uniyal Date: Mon, 19 Aug 2024 09:18:38 +0000 Subject: [PATCH] VMware: updates resource provider trait list updates resource provider trait list for hw architecture Change-Id: Ie7a7a154e6ca43b5eaf8094df420a0c7d14bcebc --- nova/tests/unit/virt/vmwareapi/test_driver_api.py | 3 +++ nova/virt/vmwareapi/driver.py | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/nova/tests/unit/virt/vmwareapi/test_driver_api.py b/nova/tests/unit/virt/vmwareapi/test_driver_api.py index ac473c8c09..6a070d868e 100644 --- a/nova/tests/unit/virt/vmwareapi/test_driver_api.py +++ b/nova/tests/unit/virt/vmwareapi/test_driver_api.py @@ -2144,6 +2144,9 @@ class VMwareAPIVMTestCase(test.NoDBTestCase, } inventory = self.pt.data(self.node_name).inventory self.assertEqual(expected, inventory) + traits = self.pt.data(self.node_name).traits + # nova with vmware only supports HW_ARCH_X86_64 + self.assertEqual(traits, {'HW_ARCH_X86_64'}) def test_invalid_datastore_regex(self): diff --git a/nova/virt/vmwareapi/driver.py b/nova/virt/vmwareapi/driver.py index 456e964815..605bf77482 100644 --- a/nova/virt/vmwareapi/driver.py +++ b/nova/virt/vmwareapi/driver.py @@ -23,6 +23,7 @@ import os import re import os_resource_classes as orc +import os_traits as ot from oslo_log import log as logging from oslo_utils import excutils from oslo_utils import units @@ -528,6 +529,11 @@ class VMwareVCDriver(driver.ComputeDriver): # where cpu traits are added. In the vmware world, this is where we # would add nested providers representing tenant VDC and similar. + # nova with vmware only supports HW_ARCH_X86_64 + cpu_arch_trait = 'HW_ARCH_X86_64' + if cpu_arch_trait in ot.get_traits('HW_ARCH_'): + provider_tree.add_traits(nodename, cpu_arch_trait) + def prepare_for_spawn(self, instance): """Perform pre-checks for spawn.""" self._vmops.prepare_for_spawn(instance)