prep_for_spawn: remove unused params and make private

This patch modifies the method prep_for_spawn
* Making it private -> _prep_for_spawn
* Removing unused parameters

Change-Id: Ie2e2259badef350082b150b7989a93e85c09e9db
This commit is contained in:
Andreas Scheuring 2018-01-19 09:01:40 +01:00
parent f05c21544a
commit bc04ba1279
2 changed files with 16 additions and 18 deletions

View File

@ -139,16 +139,16 @@ class DPMdriverInitHostTestCase(TestCase):
@mock.patch.object(vm.PartitionInstance, 'attach_hbas')
@mock.patch.object(vm.PartitionInstance, 'get_partition')
@mock.patch.object(vm.PartitionInstance, 'properties')
def test_prep_for_spawn_volume(self, mock_properties,
mock_partition,
mock_attac_hbas,
mock_create,
mock_context,
mock_flavor):
def test__prep_for_spawn_volume(self, mock_properties,
mock_partition,
mock_attac_hbas,
mock_create,
mock_context,
mock_flavor):
instance = mock.Mock()
instance.image_ref = ''
self.dpmdriver.prep_for_spawn(mock.Mock, instance)
self.dpmdriver._prep_for_spawn(instance)
mock_create.assert_called_once()
mock_attac_hbas.assert_called_once()
@ -158,18 +158,17 @@ class DPMdriverInitHostTestCase(TestCase):
@mock.patch.object(vm.PartitionInstance, 'attach_hbas')
@mock.patch.object(vm.PartitionInstance, 'get_partition')
@mock.patch.object(vm.PartitionInstance, 'properties')
def test_prep_for_spawn_image(self, mock_properties,
mock_partition,
mock_attac_hbas,
mock_create,
mock_context,
mock_flavor):
def test__prep_for_spawn_image(self, mock_properties,
mock_partition,
mock_attac_hbas,
mock_create,
mock_context,
mock_flavor):
instance = mock.Mock()
instance.image_ref = '6c77503d-4bff-4205-9e90-d75373c3c689'
self.assertRaises(
exceptions.BootFromImageNotSupported,
self.dpmdriver.prep_for_spawn,
mock.Mock(), instance)
self.dpmdriver._prep_for_spawn, instance)
@mock.patch.object(vm.PartitionInstance, 'get_partition')
def test_get_volume_connector(self, mock_get_partition):

View File

@ -281,10 +281,9 @@ class DPMDriver(driver.ComputeDriver):
driver.get_volume_connector (returns the partitions WWPNs)
driver.spawn (continues setting up the partition)
"""
self.prep_for_spawn(context=None, instance=instance)
self._prep_for_spawn(instance)
def prep_for_spawn(self, context, instance,
flavor=None):
def _prep_for_spawn(self, instance):
inst = self._get_partition_instance(instance)
inst.create(inst.properties())