Rename private methods of compute manager.

Add an underscore in front of add_instance_fault_from_exc and
error_out_instance_on_exception in the compute manager.  They
are private methods that are not part of the rpc API.

Change-Id: Ic5c0c0fb1a599d38c100810a144592b082e1ebad

2 files changed, 20 insertions, 20 deletions

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 0da0e7319..6cd5358bc 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -231,7 +231,7 @@ def wrap_instance_fault(function):
             raise
         except Exception, e:
             with excutils.save_and_reraise_exception():
-                self.add_instance_fault_from_exc(context,
+                self._add_instance_fault_from_exc(context,
                         kwargs['instance_uuid'], e, sys.exc_info())
 
     @functools.wraps(function)
@@ -1011,7 +1011,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         if not instance:
             instance = self.db.instance_get_by_uuid(context, instance_uuid)
 
-        with self.error_out_instance_on_exception(context, instance['uuid']):
+        with self._error_out_instance_on_exception(context, instance['uuid']):
             LOG.audit(_("Rebuilding instance"), context=context,
                       instance=instance)
 
@@ -1107,7 +1107,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         except Exception, exc:
             LOG.error(_('Cannot reboot instance: %(exc)s'), locals(),
                       context=context, instance=instance)
-            self.add_instance_fault_from_exc(context, instance['uuid'], exc,
+            self._add_instance_fault_from_exc(context, instance['uuid'], exc,
                                              sys.exc_info())
             # Fall through and reset task_state to None
 
@@ -1340,7 +1340,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         network_info = self._get_instance_nw_info(context, instance)
         image_meta = _get_image_meta(context, instance['image_ref'])
 
-        with self.error_out_instance_on_exception(context, instance['uuid']):
+        with self._error_out_instance_on_exception(context, instance['uuid']):
             self.driver.rescue(context, instance,
                                self._legacy_nw_info(network_info), image_meta)
 
@@ -1364,7 +1364,7 @@ class ComputeManager(manager.SchedulerDependentManager):
 
         network_info = self._get_instance_nw_info(context, instance)
 
-        with self.error_out_instance_on_exception(context, instance['uuid']):
+        with self._error_out_instance_on_exception(context, instance['uuid']):
             self.driver.unrescue(instance,
                                  self._legacy_nw_info(network_info))
 
@@ -1429,7 +1429,7 @@ class ComputeManager(manager.SchedulerDependentManager):
             instance = self.db.instance_get_by_uuid(context,
                     migration_ref.instance_uuid)
 
-        with self.error_out_instance_on_exception(context, instance['uuid']):
+        with self._error_out_instance_on_exception(context, instance['uuid']):
             # NOTE(tr3buchet): tear down networks on destination host
             self.network_api.setup_networks_on_host(context, instance,
                                                     teardown=True)
@@ -1455,7 +1455,7 @@ class ComputeManager(manager.SchedulerDependentManager):
             instance = self.db.instance_get_by_uuid(context,
                     migration_ref.instance_uuid)
 
-        with self.error_out_instance_on_exception(context, instance['uuid']):
+        with self._error_out_instance_on_exception(context, instance['uuid']):
             network_info = self._get_instance_nw_info(context, instance)
 
             self._notify_about_instance_usage(
@@ -1505,7 +1505,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         if not instance_type:
             instance_type = instance_types.get_instance_type(instance_type_id)
 
-        with self.error_out_instance_on_exception(context, instance['uuid']):
+        with self._error_out_instance_on_exception(context, instance['uuid']):
             compute_utils.notify_usage_exists(
                     context, instance, current_period=True)
             self._notify_about_instance_usage(
@@ -1555,7 +1555,7 @@ class ComputeManager(manager.SchedulerDependentManager):
             instance = self.db.instance_get_by_uuid(context,
                     migration_ref.instance_uuid)
 
-        with self.error_out_instance_on_exception(context, instance['uuid']):
+        with self._error_out_instance_on_exception(context, instance['uuid']):
             instance_type_ref = self.db.instance_type_get(context,
                     migration_ref.new_instance_type_id)
 
@@ -1793,7 +1793,7 @@ class ComputeManager(manager.SchedulerDependentManager):
             instance = self.db.instance_get_by_uuid(context, instance_uuid)
 
         LOG.audit(_('Suspending'), context=context, instance=instance)
-        with self.error_out_instance_on_exception(context, instance['uuid']):
+        with self._error_out_instance_on_exception(context, instance['uuid']):
             self.driver.suspend(instance)
 
         current_power_state = self._get_power_state(context, instance)
@@ -2806,7 +2806,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         """
         self.driver.update_available_resource(context, self.host)
 
-    def add_instance_fault_from_exc(self, context, instance_uuid, fault,
+    def _add_instance_fault_from_exc(self, context, instance_uuid, fault,
                                     exc_info=None):
         """Adds the specified fault to the database."""
 
@@ -2898,7 +2898,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         return [i for i in instances if deleted_instance(i)]
 
     @contextlib.contextmanager
-    def error_out_instance_on_exception(self, context, instance_uuid):
+    def _error_out_instance_on_exception(self, context, instance_uuid):
         try:
             yield
         except Exception, error:
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py
index 5c6bc00d4..387c2c1cc 100644
--- a/nova/tests/compute/test_compute.py
+++ b/nova/tests/compute/test_compute.py
@@ -226,7 +226,7 @@ class ComputeTestCase(BaseTestCase):
         def did_it_add_fault(*args):
             called['fault_added'] = True
 
-        self.stubs.Set(self.compute, 'add_instance_fault_from_exc',
+        self.stubs.Set(self.compute, '_add_instance_fault_from_exc',
                        did_it_add_fault)
 
         @nova.compute.manager.wrap_instance_fault
@@ -246,7 +246,7 @@ class ComputeTestCase(BaseTestCase):
         def did_it_add_fault(*args):
             called['fault_added'] = True
 
-        self.stubs.Set(self.compute, 'add_instance_fault_from_exc',
+        self.stubs.Set(self.compute, '_add_instance_fault_from_exc',
                        did_it_add_fault)
 
         @nova.compute.manager.wrap_instance_fault
@@ -1828,9 +1828,9 @@ class ComputeTestCase(BaseTestCase):
         self.stubs.Set(nova.db, 'instance_fault_create', fake_db_fault_create)
 
         ctxt = context.get_admin_context()
-        self.compute.add_instance_fault_from_exc(ctxt, instance_uuid,
-                                                 NotImplementedError('test'),
-                                                 exc_info)
+        self.compute._add_instance_fault_from_exc(ctxt, instance_uuid,
+                                                  NotImplementedError('test'),
+                                                  exc_info)
 
     def test_add_instance_fault_user_error(self):
         exc_info = None
@@ -1856,7 +1856,7 @@ class ComputeTestCase(BaseTestCase):
         self.stubs.Set(nova.db, 'instance_fault_create', fake_db_fault_create)
 
         ctxt = context.get_admin_context()
-        self.compute.add_instance_fault_from_exc(ctxt, instance_uuid,
+        self.compute._add_instance_fault_from_exc(ctxt, instance_uuid,
             user_exc, exc_info)
 
     def test_add_instance_fault_no_exc_info(self):
@@ -1874,8 +1874,8 @@ class ComputeTestCase(BaseTestCase):
         self.stubs.Set(nova.db, 'instance_fault_create', fake_db_fault_create)
 
         ctxt = context.get_admin_context()
-        self.compute.add_instance_fault_from_exc(ctxt, instance_uuid,
-                                                 NotImplementedError('test'))
+        self.compute._add_instance_fault_from_exc(ctxt, instance_uuid,
+                                                  NotImplementedError('test'))
 
     def test_cleanup_running_deleted_instances(self):
         admin_context = context.get_admin_context()