openstack/nova
Code Issues Proposed changes

Merge "Fix libvirt driver tests to use LibvirtConfigCapsGuest instances"

Browse Source
This commit is contained in:
Zuul
2019-08-16 19:12:17 +00:00
committed by Gerrit Code Review
parent 45a680cdf5 d5b9b0052a
commit ee6b69cadc
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15345,13 +15345,13 @@ class LibvirtConnTestCase(test.NoDBTestCase,
caps.host = vconfig.LibvirtConfigCapsHost() caps.host = vconfig.LibvirtConfigCapsHost()
caps.host.cpu = cpu caps.host.cpu = cpu
guest = vconfig.LibvirtConfigGuest() guest = vconfig.LibvirtConfigCapsGuest()
guest.ostype = fields.VMMode.HVM guest.ostype = fields.VMMode.HVM
guest.arch = fields.Architecture.X86_64 guest.arch = fields.Architecture.X86_64
guest.domtype = ["kvm"] guest.domtype = ["kvm"]
caps.guests.append(guest) caps.guests.append(guest)
guest = vconfig.LibvirtConfigGuest() guest = vconfig.LibvirtConfigCapsGuest()
guest.ostype = fields.VMMode.HVM guest.ostype = fields.VMMode.HVM
guest.arch = fields.Architecture.I686 guest.arch = fields.Architecture.I686
guest.domtype = ["kvm"] guest.domtype = ["kvm"]
@@ -16379,13 +16379,13 @@ class LibvirtConnTestCase(test.NoDBTestCase,
def get_host_capabilities_stub(self): def get_host_capabilities_stub(self):
caps = vconfig.LibvirtConfigCaps() caps = vconfig.LibvirtConfigCaps()
guest = vconfig.LibvirtConfigGuest() guest = vconfig.LibvirtConfigCapsGuest()
guest.ostype = 'hvm' guest.ostype = 'hvm'
guest.arch = fields.Architecture.X86_64 guest.arch = fields.Architecture.X86_64
guest.domtype = ['kvm', 'qemu'] guest.domtype = ['kvm', 'qemu']
caps.guests.append(guest) caps.guests.append(guest)
guest = vconfig.LibvirtConfigGuest() guest = vconfig.LibvirtConfigCapsGuest()
guest.ostype = 'hvm' guest.ostype = 'hvm'
guest.arch = fields.Architecture.I686 guest.arch = fields.Architecture.I686
guest.domtype = ['kvm'] guest.domtype = ['kvm']
@@ -16393,7 +16393,7 @@ class LibvirtConnTestCase(test.NoDBTestCase,
# Include one that is not known to nova to make sure it # Include one that is not known to nova to make sure it
# does not trip us up. # does not trip us up.
guest = vconfig.LibvirtConfigGuest() guest = vconfig.LibvirtConfigCapsGuest()
guest.ostype = 'hvm' guest.ostype = 'hvm'
guest.arch = 'itanic' guest.arch = 'itanic'
guest.domtype = ['kvm'] guest.domtype = ['kvm']