openstack
/
nova
Code Issues Proposed changes

Fakelibvirt migrateToURI3 should provide args according to libvirt doc 

According to libvirt doc[1], migrateToURI3 supports
args(dconnuri, params, flags) but not logical_sum.
We call migrateToURI3 with arg flags in guest.py [2].

The wrong fake func may cause error in functional tests of nova.
With logs below:
  "/home/zuul/src/git.openstack.org/openstack/nova/nova/virt/libvirt/guest.py",
  line 669, in migrate'
  '    destination, params=params, flags=flags)'
  "TypeError: migrateToURI3() got an unexpected keyword argument 'flags'"

[1] https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainMigrateToURI3
[2] https://github.com/openstack/nova/blob/050e92/nova/virt/libvirt/guest.py#L668

Change-Id: I88d71bac7ddb69b9b63fb58dd8eaf6c048017933
This commit is contained in:
jiajunsu 2018-05-17 15:33:32 +08:00 committed by Matt Riedemann
parent 4b4e005c63
commit b6b46fb4bc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/tests/unit/virt/libvirt/fakelibvirt.py
View File

@ -766,7 +766,7 @@ class Domain(object):
error_code=VIR_ERR_INTERNAL_ERROR,
error_domain=VIR_FROM_QEMU)
def migrateToURI3(self, dconnuri, params, logical_sum):
def migrateToURI3(self, dconnuri, params, flags):
raise make_libvirtError(
libvirtError,
"Migration always fails for fake libvirt!",