From 7343cad09fbe580d55e918d50a59f40479341bb7 Mon Sep 17 00:00:00 2001
From: Dmitry Tantsur <dtantsur@redhat.com>
Date: Wed, 26 Aug 2015 15:55:43 +0200
Subject: [PATCH] Rename plugin root_device_hint -> raid_device

We'll soon have root_device_hints plugin, so it will become confusing.
Also added a test that we can use it under new name.

Change-Id: I049e049002cb25afc5aadb9a7a9e5d026a6810fd
---
 README.rst                                      |  2 +-
 .../{root_device_hint.py => raid_device.py}     |  4 ++--
 ...vice_hint.py => test_plugins_raid_device.py} | 17 +++++++++++++----
 setup.cfg                                       |  4 +++-
 4 files changed, 19 insertions(+), 8 deletions(-)
 rename ironic_inspector/plugins/{root_device_hint.py => raid_device.py} (97%)
 rename ironic_inspector/test/{test_plugins_root_device_hint.py => test_plugins_raid_device.py} (86%)

diff --git a/README.rst b/README.rst
index 6423cbef8..9cd0809e7 100644
--- a/README.rst
+++ b/README.rst
@@ -347,7 +347,7 @@ Here are some plugins that can be additionally enabled:
 
 ``example``
     example plugin logging it's input and output.
-``root_device_hint``
+``raid_device`` (deprecated name ``root_device_hint``)
     gathers block devices from ramdisk and exposes root device in multiple
     runs.
 ``extra_hardware``
diff --git a/ironic_inspector/plugins/root_device_hint.py b/ironic_inspector/plugins/raid_device.py
similarity index 97%
rename from ironic_inspector/plugins/root_device_hint.py
rename to ironic_inspector/plugins/raid_device.py
index 25e0db0b8..32ed94fb3 100644
--- a/ironic_inspector/plugins/root_device_hint.py
+++ b/ironic_inspector/plugins/raid_device.py
@@ -19,10 +19,10 @@ from ironic_inspector.common.i18n import _LI, _LW
 from ironic_inspector.plugins import base
 
 
-LOG = log.getLogger('ironic_inspector.plugins.root_device_hint')
+LOG = log.getLogger(__name__)
 
 
-class RootDeviceHintHook(base.ProcessingHook):
+class RaidDeviceDetection(base.ProcessingHook):
     """Processing hook for learning the root device after RAID creation.
 
     The plugin can figure out the root device in 2 runs. First, it saves the
diff --git a/ironic_inspector/test/test_plugins_root_device_hint.py b/ironic_inspector/test/test_plugins_raid_device.py
similarity index 86%
rename from ironic_inspector/test/test_plugins_root_device_hint.py
rename to ironic_inspector/test/test_plugins_raid_device.py
index f5dab29ba..e300c7dc9 100644
--- a/ironic_inspector/test/test_plugins_root_device_hint.py
+++ b/ironic_inspector/test/test_plugins_raid_device.py
@@ -11,15 +11,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ironic_inspector.plugins import root_device_hint
+from ironic_inspector.plugins import base
+from ironic_inspector.plugins import raid_device
 from ironic_inspector.test import base as test_base
 
 
-class TestRootDeviceHint(test_base.NodeTest):
+class TestRaidDeviceDetection(test_base.NodeTest):
 
     def setUp(self):
-        super(TestRootDeviceHint, self).setUp()
-        self.hook = root_device_hint.RootDeviceHintHook()
+        super(TestRaidDeviceDetection, self).setUp()
+        self.hook = raid_device.RaidDeviceDetection()
 
     def _before_update(self, introspection_data):
         node_patches = []
@@ -29,6 +30,14 @@ class TestRootDeviceHint(test_base.NodeTest):
         self.assertFalse(ports_patches)
         return node_patches
 
+    def test_loadable_by_name(self):
+        names = ('raid_device', 'root_device_hint')
+        base.CONF.set_override('processing_hooks', ','.join(names),
+                               'processing')
+        for name in names:
+            ext = base.processing_hooks_manager()[name]
+            self.assertIsInstance(ext.obj, raid_device.RaidDeviceDetection)
+
     def test_missing_local_gb(self):
         introspection_data = {}
         self.hook.before_processing(introspection_data)
diff --git a/setup.cfg b/setup.cfg
index 22fe5dc87..7e6ca19ca 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -27,7 +27,9 @@ ironic_inspector.hooks.processing =
     ramdisk_error = ironic_inspector.plugins.standard:RamdiskErrorHook
     example = ironic_inspector.plugins.example:ExampleProcessingHook
     extra_hardware = ironic_inspector.plugins.extra_hardware:ExtraHardwareHook
-    root_device_hint = ironic_inspector.plugins.root_device_hint:RootDeviceHintHook
+    raid_device = ironic_inspector.plugins.raid_device:RaidDeviceDetection
+    # Deprecated name
+    root_device_hint = ironic_inspector.plugins.raid_device:RaidDeviceDetection
 ironic_inspector.hooks.node_not_found =
     example = ironic_inspector.plugins.example:example_not_found_hook
 oslo.config.opts =