openstack/nova
Code Issues Proposed changes

Fixed arguement order in remove_volume_connection

Browse Source 
RPC API and ComputeManager both contain a function named
remove_volume_connection with the same arguments, but ordered
differently.  This causes problems when called by
_rollback_live_migration.

This fix is more for future consistency, as this was affecting the
_ComputeV4Proxy class, which is present in stable/kilo but
no longer exists.

Change-Id: Iacadd5f015888c4181b8a332625ec746f991e239
Closes-Bug: #1538619
This commit is contained in:
gh159m
2016-02-16 14:42:25 -06:00
parent 11019fab7a
commit 603e7db9a8
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nova/compute/manager.py
View File

@@ -5531,7 +5531,7 @@ class ComputeManager(manager.Manager):
for bdm in bdms:
if bdm.is_volume:
self.compute_rpcapi.remove_volume_connection(
context, instance, bdm.volume_id, dest)
context, bdm.volume_id, instance, dest)
self._notify_about_instance_usage(context, instance,
"live_migration._rollback.start")

2
nova/compute/rpcapi.py
View File

@@ -759,7 +759,7 @@ class ComputeAPI(object):
cctxt.cast(ctxt, 'remove_fixed_ip_from_instance',
instance=instance, address=address)
def remove_volume_connection(self, ctxt, instance, volume_id, host):
def remove_volume_connection(self, ctxt, volume_id, instance, host):
version = '4.0'
cctxt = self.client.prepare(server=host, version=version)
return cctxt.call(ctxt, 'remove_volume_connection',

4
nova/tests/unit/compute/test_compute.py
View File

@@ -5591,9 +5591,9 @@ class ComputeTestCase(BaseTestCase):
objects.BlockDeviceMappingList.get_by_instance_uuid(c,
instance.uuid).MultipleTimes().AndReturn(fake_bdms)
self.compute.compute_rpcapi.remove_volume_connection(
c, instance, uuids.volume_id_1, dest_host)
c, uuids.volume_id_1, instance, dest_host)
self.compute.compute_rpcapi.remove_volume_connection(
c, instance, uuids.volume_id_2, dest_host)
c, uuids.volume_id_2, instance, dest_host)
self.compute.compute_rpcapi.rollback_live_migration_at_destination(
c, instance, dest_host, destroy_disks=True,
migrate_data=mox.IsA(migrate_data_obj.LiveMigrateData))