From bc04ba1279ca166df7a70d64ac856ffac1031591 Mon Sep 17 00:00:00 2001
From: Andreas Scheuring <andreas.scheuring@de.ibm.com>
Date: Fri, 19 Jan 2018 09:01:40 +0100
Subject: [PATCH] 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
---
 nova_dpm/tests/unit/virt/dpm/test_driver.py | 29 ++++++++++-----------
 nova_dpm/virt/dpm/driver.py                 |  5 ++--
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/nova_dpm/tests/unit/virt/dpm/test_driver.py b/nova_dpm/tests/unit/virt/dpm/test_driver.py
index 56bad99..efaa5ad 100644
--- a/nova_dpm/tests/unit/virt/dpm/test_driver.py
+++ b/nova_dpm/tests/unit/virt/dpm/test_driver.py
@@ -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):
diff --git a/nova_dpm/virt/dpm/driver.py b/nova_dpm/virt/dpm/driver.py
index 99701c8..058b59b 100644
--- a/nova_dpm/virt/dpm/driver.py
+++ b/nova_dpm/virt/dpm/driver.py
@@ -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())