openstack/nova
Code Issues Proposed changes

Merge "compute utils: Remove a useless context parameter"

Browse Source
This commit is contained in:
Jenkins 2015-05-28 10:23:02 +00:00 committed by Gerrit Code Review
commit e5c169d155
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/compute/manager.py
View File

@ -4399,7 +4399,7 @@ class ComputeManager(manager.Manager):
context, instance.uuid)) context, instance.uuid))
device_name = compute_utils.get_device_name_for_instance( device_name = compute_utils.get_device_name_for_instance(
context, instance, bdms, device) instance, bdms, device)
# NOTE(vish): create bdm here to avoid race condition # NOTE(vish): create bdm here to avoid race condition
bdm = objects.BlockDeviceMapping( bdm = objects.BlockDeviceMapping(

2
nova/compute/utils.py
View File

@ -92,7 +92,7 @@ def add_instance_fault_from_exc(context, instance, fault, exc_info=None):
fault_obj.create() fault_obj.create()
def get_device_name_for_instance(context, instance, bdms, device): def get_device_name_for_instance(instance, bdms, device):
"""Validates (or generates) a device name for instance. """Validates (or generates) a device name for instance.
This method is a wrapper for get_next_device_name that gets the list This method is a wrapper for get_next_device_name that gets the list

2
nova/tests/unit/compute/test_compute_utils.py
View File

@ -104,7 +104,7 @@ class ComputeValidateDeviceTestCase(test.NoDBTestCase):
bdms = objects.BlockDeviceMappingList.get_by_instance_uuid( bdms = objects.BlockDeviceMappingList.get_by_instance_uuid(
self.context, self.instance['uuid']) self.context, self.instance['uuid'])
return compute_utils.get_device_name_for_instance( return compute_utils.get_device_name_for_instance(
self.context, self.instance, bdms, device) self.instance, bdms, device)
@staticmethod @staticmethod
def _fake_bdm(device): def _fake_bdm(device):