openstack/nova
Code Issues Proposed changes

replace the "hide_hypervisor_id" to "hw:hide_hypervisor_id"

Browse Source 
When we use the flavor extra_specs "hide_hypervisor_id" in
AggregateInstanceExtraSpecsFilter, then will retrun False.
So we need correct the extra_specs.

NOTE: The first two files do not exist in stable/train due to
extra specs validators (patch Ib64a1348cce1dca995746214616c4f33d9d664bd)
was introduced in Ussuri.
The last one file has conflict due to the same
bp/flavor-extra-sepc-validators feature
(patch: I8da84b48e4d630eeb91d92346aa2323e25e28e3b)
added in Ussuri.

Conflicts:
	nova/api/validation/extra_specs/hw.py
	nova/api/validation/extra_specs/null.py
	nova/tests/unit/api/openstack/compute/test_flavors_extra_specs.py

Change-Id: I9d8d8c3a30cf6da7e8fb48374347e069ab075df2
Closes-Bug: 1841932
(cherry picked from commit bf488a8630)
(cherry picked from commit 9d28d7ec80)
This commit is contained in:
ramboman 2020-04-22 21:33:22 +08:00 committed by Xing Zhang
parent e39e622cb0
commit f602536778
No known key found for this signature in database
GPG Key ID: 43F80E57B910E3B0
4 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/source/user/flavors.rst
View File

@ -706,10 +706,14 @@ Hiding hypervisor signature
As of the 18.0.0 Rocky release, this is only supported by the libvirt
driver.
Prior to the 21.0.0 Ussuri release, this was called
``hide_hypervisor_id``. An alias is provided to provide backwards
compatibility.
.. code:: console
$ openstack flavor set FLAVOR-NAME \
--property hide_hypervisor_id=VALUE
--property hw:hide_hypervisor_id=VALUE
Where:

27
nova/tests/unit/virt/libvirt/test_driver.py
View File

@ -4445,6 +4445,19 @@ class LibvirtConnTestCase(test.NoDBTestCase,
self._test_get_guest_config_windows_hyperv()
def test_get_guest_config_windows_hyperv_all_hide_flv(self):
# Similar to test_get_guest_config_windows_hyperv_feature2
# but also test hiding the HyperV signature with the flavor
# extra_spec "hw:hide_hypervisor_id"
flavor_hide_id = fake_flavor.fake_flavor_obj(self.context,
extra_specs={"hw:hide_hypervisor_id": "true"},
expected_attrs={"extra_specs"})
# this works for kvm (the default, tested below) and qemu
self.flags(virt_type='qemu', group='libvirt')
self._test_get_guest_config_windows_hyperv(
flavor=flavor_hide_id, hvid_hidden=True)
def test_get_guest_config_windows_hyperv_all_hide_flv_old(self):
# Similar to test_get_guest_config_windows_hyperv_feature2
# but also test hiding the HyperV signature with the flavor
# extra_spec "hide_hypervisor_id"
@ -4471,10 +4484,10 @@ class LibvirtConnTestCase(test.NoDBTestCase,
def test_get_guest_config_windows_hyperv_all_hide_flv_img(self):
# Similar to test_get_guest_config_windows_hyperv_feature2
# but also test hiding the HyperV signature with both the flavor
# extra_spec "hide_hypervisor_id" and the image property
# extra_spec "hw:hide_hypervisor_id" and the image property
# "img_hide_hypervisor_id"
flavor_hide_id = fake_flavor.fake_flavor_obj(self.context,
extra_specs={"hide_hypervisor_id": "true"},
extra_specs={"hw:hide_hypervisor_id": "true"},
expected_attrs={"extra_specs"})
self.flags(virt_type='qemu', group='libvirt')
@ -6518,7 +6531,7 @@ class LibvirtConnTestCase(test.NoDBTestCase,
self):
# Input to the test: flavor extra_specs
flavor_hide_id = fake_flavor.fake_flavor_obj(self.context,
extra_specs={"hide_hypervisor_id": "true"},
extra_specs={"hw:hide_hypervisor_id": "true"},
expected_attrs={"extra_specs"})
self.flags(virt_type='kvm', group='libvirt')
@ -6544,7 +6557,7 @@ class LibvirtConnTestCase(test.NoDBTestCase,
# Input to the test: image metadata (true) and flavor
# extra_specs (true)
flavor_hide_id = fake_flavor.fake_flavor_obj(self.context,
extra_specs={"hide_hypervisor_id": "true"},
extra_specs={"hw:hide_hypervisor_id": "true"},
expected_attrs={"extra_specs"})
image_meta = objects.ImageMeta.from_dict({
"disk_format": "raw",
@ -6571,7 +6584,7 @@ class LibvirtConnTestCase(test.NoDBTestCase,
# Input to the test: image metadata (false) and flavor
# extra_specs (true)
flavor_hide_id = fake_flavor.fake_flavor_obj(self.context,
extra_specs={"hide_hypervisor_id": "true"},
extra_specs={"hw:hide_hypervisor_id": "true"},
expected_attrs={"extra_specs"})
image_meta = objects.ImageMeta.from_dict({
"disk_format": "raw",
@ -6596,7 +6609,7 @@ class LibvirtConnTestCase(test.NoDBTestCase,
# Input to the test: image metadata (true) and flavor
# extra_specs (false)
flavor_hide_id = fake_flavor.fake_flavor_obj(self.context,
extra_specs={"hide_hypervisor_id": "false"},
extra_specs={"hw:hide_hypervisor_id": "false"},
expected_attrs={"extra_specs"})
image_meta = objects.ImageMeta.from_dict({
"disk_format": "raw",
@ -6643,7 +6656,7 @@ class LibvirtConnTestCase(test.NoDBTestCase,
def test_get_guest_config_without_hiding_hypervisor_id_flavor_extra_specs(
self):
flavor_hide_id = fake_flavor.fake_flavor_obj(self.context,
extra_specs={"hide_hypervisor_id": "false"},
extra_specs={"hw:hide_hypervisor_id": "false"},
expected_attrs={"extra_specs"})
self.flags(virt_type='qemu', group='libvirt')

4
nova/virt/libvirt/driver.py
View File

@ -5126,7 +5126,9 @@ class LibvirtDriver(driver.ComputeDriver):
flavor):
hide_hypervisor_id = (strutils.bool_from_string(
flavor.extra_specs.get('hide_hypervisor_id')) or
image_meta.properties.get('img_hide_hypervisor_id'))
strutils.bool_from_string(
flavor.extra_specs.get('hw:hide_hypervisor_id')) or
image_meta.properties.get('img_hide_hypervisor_id'))
if virt_type == "xen":
# PAE only makes sense in X86

9
releasenotes/notes/bug-1841932-c871ac7b3b05d67e.yaml Normal file
View File

@ -0,0 +1,9 @@
---
fixes:
- |
Add support for the ``hw:hide_hypervisor_id`` extra spec. This is an
alias for the ``hide_hypervisor_id`` extra spec, which was not
compatible with the ``AggregateInstanceExtraSpecsFilter`` scheduler
filter. See
`bug 1841932 <https://bugs.launchpad.net/nova/+bug/1841932>`_ for more
details.