From 51bdf76b501edae18b251adfa0163236455e15f5 Mon Sep 17 00:00:00 2001 From: Nikola Dipanov Date: Tue, 5 May 2015 14:41:08 +0100 Subject: [PATCH] compute utils: Remove a useless context parameter get_device_name_for_instance used to require a context to be passed in explicitly, but this is no longer required, so this patch removes it from the signature. Change-Id: I076c377199ce3d17541a772544dfb4d9bc4df2e9 --- nova/compute/manager.py | 2 +- nova/compute/utils.py | 2 +- nova/tests/unit/compute/test_compute_utils.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 375d1443dc24..6cf5263f406f 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -4398,7 +4398,7 @@ class ComputeManager(manager.Manager): context, instance.uuid)) 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 bdm = objects.BlockDeviceMapping( diff --git a/nova/compute/utils.py b/nova/compute/utils.py index 54102c425c53..0c3989ff9a5b 100644 --- a/nova/compute/utils.py +++ b/nova/compute/utils.py @@ -92,7 +92,7 @@ def add_instance_fault_from_exc(context, instance, fault, exc_info=None): 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. This method is a wrapper for get_next_device_name that gets the list diff --git a/nova/tests/unit/compute/test_compute_utils.py b/nova/tests/unit/compute/test_compute_utils.py index 5babcac21752..143af51b9423 100644 --- a/nova/tests/unit/compute/test_compute_utils.py +++ b/nova/tests/unit/compute/test_compute_utils.py @@ -104,7 +104,7 @@ class ComputeValidateDeviceTestCase(test.NoDBTestCase): bdms = objects.BlockDeviceMappingList.get_by_instance_uuid( self.context, self.instance['uuid']) return compute_utils.get_device_name_for_instance( - self.context, self.instance, bdms, device) + self.instance, bdms, device) @staticmethod def _fake_bdm(device):