Merge "Remove hooks"

Author: Zuul

nova/compute/api.py

@@ -58,7 +58,6 @@
 from nova.db.sqlalchemy import api as db_api
 from nova import exception
 from nova import exception_wrapper
-from nova import hooks
 from nova.i18n import _
 from nova.image import glance
 from nova.network import constants
@@ -1927,7 +1926,6 @@ def _check_multiple_instances_with_specified_ip(self, requested_networks):
                         "is specified.")
                 raise exception.InvalidFixedIpAndMaxCountRequest(reason=msg)
 
-    @hooks.add_hook("create_instance")
     def create(self, context, instance_type,
                image_href, kernel_id=None, ramdisk_id=None,
                min_count=None, max_count=None,

nova/compute/manager.py

@@ -73,7 +73,6 @@
 import nova.context
 from nova import exception
 from nova import exception_wrapper
-from nova import hooks
 from nova.i18n import _
 from nova.image import glance
 from nova import manager
@@ -2114,7 +2113,6 @@ def _check_trusted_certs(self, instance):
                 'Trusted image certificates provided on host that does not '
                 'support certificate validation.')
 
-    @hooks.add_hook('build_instance')
     @wrap_exception()
     @reverts_task_state
     @wrap_instance_event(prefix='compute')
@@ -2896,7 +2894,6 @@ def _cleanup_volumes(self, context, instance, bdms, raise_exc=True,
         if exc_info is not None and raise_exc:
             six.reraise(exc_info[0], exc_info[1], exc_info[2])
 
-    @hooks.add_hook("delete_instance")
     def _delete_instance(self, context, instance, bdms):
         """Delete an instance on this host.
 

nova/hooks.py

@@ -37,7 +37,6 @@
 from nova import context as nova_context
 from nova.db import base
 from nova import exception
-from nova import hooks
 from nova.i18n import _
 from nova.network import constants
 from nova.network import model as network_model
@@ -102,7 +101,6 @@ def get_binding_profile(port):
     return port.get(constants.BINDING_PROFILE, {}) or {}
 
 
-@hooks.add_hook('instance_network_info')
 def update_instance_cache_with_nw_info(impl, context, instance, nw_info=None):
     if instance.deleted:
         LOG.debug('Instance is deleted, no further info cache update',

nova/network/neutron.py

@@ -750,12 +750,6 @@ class NoDBTestCase(TestCase):
     USES_DB = False
 
 
-class BaseHookTestCase(NoDBTestCase):
-    def assert_has_hook(self, expected_name, func):
-        self.assertTrue(hasattr(func, '__hook_name__'))
-        self.assertEqual(expected_name, func.__hook_name__)
-
-
 class MatchType(object):
     """Matches any instance of a specified type
 

nova/test.py

@@ -13383,18 +13383,3 @@ def test_cpu_thread_policy(self):
                           self.compute_api._validate_flavor_image,
                           self.context, image['id'], image, self.instance_type,
                           None)
-
-
-class ComputeHooksTestCase(test.BaseHookTestCase):
-    def test_delete_instance_has_hook(self):
-        delete_func = compute_manager.ComputeManager._delete_instance
-        self.assert_has_hook('delete_instance', delete_func)
-
-    def test_create_instance_has_hook(self):
-        create_func = compute.API.create
-        self.assert_has_hook('create_instance', create_func)
-
-    def test_build_instance_has_hook(self):
-        build_instance_func = (compute_manager.ComputeManager.
-                               _do_build_and_run_instance)
-        self.assert_has_hook('build_instance', build_instance_func)