From b6b46fb4bcbc02df6ba8f1b69ede5827c8adcba6 Mon Sep 17 00:00:00 2001 From: jiajunsu Date: Thu, 17 May 2018 15:33:32 +0800 Subject: [PATCH] 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 --- nova/tests/unit/virt/libvirt/fakelibvirt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nova/tests/unit/virt/libvirt/fakelibvirt.py b/nova/tests/unit/virt/libvirt/fakelibvirt.py index 5edc3dd323ca..21cc6e92ce39 100644 --- a/nova/tests/unit/virt/libvirt/fakelibvirt.py +++ b/nova/tests/unit/virt/libvirt/fakelibvirt.py @@ -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!",