From c212ad27b0a18cf4caf3cf8edb27aaeab310d0e2 Mon Sep 17 00:00:00 2001 From: Sahid Orentino Ferdjaoui Date: Thu, 24 Aug 2017 09:39:06 -0400 Subject: [PATCH] libvirt: bandwidth param should be set in guest migrate The bandwidth param set outside of the method "migrate" from guest object have to be done inside that to avoid duplicating that option. Change-Id: I8a37753dea8eca7b26466f17dfbdc184c48c24c5 Signed-off-by: Sahid Orentino Ferdjaoui --- nova/tests/unit/virt/libvirt/test_guest.py | 2 +- nova/virt/libvirt/driver.py | 1 - nova/virt/libvirt/guest.py | 5 +++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nova/tests/unit/virt/libvirt/test_guest.py b/nova/tests/unit/virt/libvirt/test_guest.py index 36eb54df981d..245e0f39d58c 100644 --- a/nova/tests/unit/virt/libvirt/test_guest.py +++ b/nova/tests/unit/virt/libvirt/test_guest.py @@ -644,7 +644,7 @@ class GuestTestCase(test.NoDBTestCase): self.guest.migrate('an-uri', domain_xml='', params={'p1': 'v1'}, flags=1, bandwidth=2) self.domain.migrateToURI3.assert_called_once_with( - 'an-uri', flags=1, params={'p1': 'v1'}) + 'an-uri', flags=1, params={'p1': 'v1', 'bandwidth': 2}) def test_abort_job(self): self.guest.abort_job() diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 82dc2b99f6ad..b5201d733eec 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -6327,7 +6327,6 @@ class LibvirtDriver(driver.ComputeDriver): if self._host.has_min_version( MIN_LIBVIRT_BLOCK_LM_WITH_VOLUMES_VERSION): params = { - 'bandwidth': CONF.libvirt.live_migration_bandwidth, 'destination_xml': new_xml_str, 'migrate_disks': device_names, } diff --git a/nova/virt/libvirt/guest.py b/nova/virt/libvirt/guest.py index ed614f60dc23..f533edf43112 100644 --- a/nova/virt/libvirt/guest.py +++ b/nova/virt/libvirt/guest.py @@ -640,10 +640,11 @@ class Guest(object): destination, flags=flags, bandwidth=bandwidth) else: if params: + # In migrateToURI3 these parameters are extracted from the + # `params` dict if migrate_uri: - # In migrateToURI3 this parameter is searched in - # the `params` dict params['migrate_uri'] = migrate_uri + params['bandwidth'] = bandwidth self._domain.migrateToURI3( destination, params=params, flags=flags) else: