Group drivers modules by type

Change-Id: Id5fab5efa5dfbe155e559256faf465b7d0b76706

os_faults/api/human.py

@@ -16,6 +16,7 @@ import re
 from os_faults.api import error
 from os_faults.api import node_collection as node_collection_pkg
 from os_faults.api import service as service_pkg
+from os_faults.api import utils
 
 """
 Human API understands commands like these (examples):
@@ -42,8 +43,7 @@ Human API understands commands like these (examples):
 def list_actions(klazz):
     return set(m[0].replace('_', ' ') for m in inspect.getmembers(
         klazz,
-        predicate=lambda o: ((inspect.isfunction(o) or inspect.ismethod(o)) and
-                             hasattr(o, '__public__'))))
+        predicate=utils.is_public))
 
 RANDOMNESS = {'one', 'random', 'some', 'single'}
 ANYTHING = {'all'}

os_faults/api/node_collection.py

@@ -16,7 +16,7 @@ import random
 import warnings
 
 from os_faults.api import error
-from os_faults.api.util import public
+from os_faults.api.utils import public
 from os_faults import utils
 
 LOG = logging.getLogger(__name__)

os_faults/api/service.py

@@ -16,7 +16,7 @@ import abc
 import six
 
 from os_faults.api import base_driver
-from os_faults.api.util import public
+from os_faults.api.utils import public
 
 
 @six.add_metaclass(abc.ABCMeta)

os_faults/api/utils.py

@@ -11,7 +11,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import inspect
 
-def public(funcobj):
-    funcobj.__public__ = True
-    return funcobj
+
+def public(func):
+    func.__public__ = True
+    return func
+
+
+def is_public(obj):
+    return ((inspect.isfunction(obj) or inspect.ismethod(obj))
+            and hasattr(obj, '__public__'))

os_faults/drivers/cloud/devstack.py

@@ -17,7 +17,7 @@ from os_faults.ansible import executor
 from os_faults.api import cloud_management
 from os_faults.api import node_collection
 from os_faults.api import node_discover
-from os_faults.common import service
+from os_faults.drivers import service
 
 LOG = logging.getLogger(__name__)
 

os_faults/drivers/cloud/devstack_systemd.py

@@ -13,7 +13,7 @@
 
 import logging
 
-from os_faults.drivers import devstack
+from os_faults.drivers.cloud import devstack
 
 LOG = logging.getLogger(__name__)
 

os_faults/drivers/cloud/fuel.py

@@ -18,7 +18,7 @@ from os_faults.ansible import executor
 from os_faults.api import cloud_management
 from os_faults.api import node_collection
 from os_faults.api import node_discover
-from os_faults.common import service
+from os_faults.drivers import service
 
 LOG = logging.getLogger(__name__)
 

os_faults/drivers/cloud/tcpcloud.py

@@ -19,7 +19,7 @@ from os_faults.ansible import executor
 from os_faults.api import cloud_management
 from os_faults.api import node_collection
 from os_faults.api import node_discover
-from os_faults.common import service
+from os_faults.drivers import service
 from os_faults import error
 
 LOG = logging.getLogger(__name__)

os_faults/drivers/power/libvirt.py

@@ -13,6 +13,8 @@
 
 import logging
 
+from oslo_utils import importutils
+
 from os_faults.api import error
 from os_faults.api import power_management
 
@@ -59,12 +61,11 @@ class LibvirtDriver(power_management.PowerDriver):
 
     def _get_connection(self):
         if self._cached_conn is None:
-            try:
-                import libvirt
-            except ImportError:
+            libvirt_module = importutils.try_import('libvirt')
+            if not libvirt_module:
                 raise error.OSFError('libvirt-python is required '
                                      'to use LibvirtDriver')
-            self._cached_conn = libvirt.open(self.connection_uri)
+            self._cached_conn = libvirt_module.open(self.connection_uri)
 
         return self._cached_conn
 

os_faults/tests/unit/drivers/cloud/test_devstack.py

@@ -17,7 +17,7 @@ import ddt
 import mock
 
 from os_faults.api import node_collection
-from os_faults.drivers import devstack
+from os_faults.drivers.cloud import devstack
 from os_faults.tests.unit import fakes
 from os_faults.tests.unit import test
 

os_faults/tests/unit/drivers/cloud/test_devstack_systemd.py

@@ -15,8 +15,8 @@ import ddt
 import mock
 
 from os_faults.api import node_collection
-from os_faults.drivers import devstack_systemd
-from os_faults.tests.unit.drivers import test_devstack
+from os_faults.drivers.cloud import devstack_systemd
+from os_faults.tests.unit.drivers.cloud import test_devstack
 from os_faults.tests.unit import fakes
 from os_faults.tests.unit import test
 

os_faults/tests/unit/drivers/cloud/test_fuel_management.py

@@ -17,7 +17,7 @@ import mock
 from os_faults.ansible import executor
 from os_faults.api import error
 from os_faults.api import node_collection
-from os_faults.drivers import fuel
+from os_faults.drivers.cloud import fuel
 from os_faults.tests.unit import fakes
 from os_faults.tests.unit import test
 

os_faults/tests/unit/drivers/cloud/test_fuel_node_collection.py

@@ -16,7 +16,7 @@ import copy
 import mock
 
 from os_faults.api import node_collection
-from os_faults.drivers import fuel
+from os_faults.drivers.cloud import fuel
 from os_faults.tests.unit import test
 
 

os_faults/tests/unit/drivers/cloud/test_fuel_service.py

@@ -17,7 +17,7 @@ import mock
 from os_faults.ansible import executor
 from os_faults.api import error
 from os_faults.api import node_collection
-from os_faults.drivers import fuel
+from os_faults.drivers.cloud import fuel
 from os_faults.tests.unit import fakes
 from os_faults.tests.unit import test
 

os_faults/tests/unit/drivers/cloud/test_tcpcloud.py

@@ -16,7 +16,7 @@ import mock
 
 from os_faults.ansible import executor
 from os_faults.api import node_collection
-from os_faults.drivers import tcpcloud
+from os_faults.drivers.cloud import tcpcloud
 from os_faults.tests.unit import fakes
 from os_faults.tests.unit import test
 

os_faults/tests/unit/drivers/nodes/test_node_list.py

@@ -12,7 +12,7 @@
 # limitations under the License.
 
 from os_faults.api import node_collection
-from os_faults.drivers import node_list
+from os_faults.drivers.nodes import node_list
 from os_faults.tests.unit import test
 
 

os_faults/tests/unit/drivers/power/test_ipmi.py

@@ -17,7 +17,7 @@ from pyghmi import exceptions as pyghmi_exc
 
 import os_faults
 from os_faults.api import node_collection
-from os_faults.drivers import ipmi
+from os_faults.drivers.power import ipmi
 from os_faults import error
 from os_faults.tests.unit import test
 
@@ -124,7 +124,7 @@ class IPMIDriverTestCase(test.TestCase):
                           self.driver._run_set_power_cmd,
                           self.host, 'off', expected_state='off')
 
-    @mock.patch('os_faults.drivers.ipmi.IPMIDriver._run_set_power_cmd')
+    @mock.patch('os_faults.drivers.power.ipmi.IPMIDriver._run_set_power_cmd')
     @ddt.data(('poweroff', 'off', 'off'),
               ('poweron', 'on', 'on'),
               ('reset', 'boot'),

os_faults/tests/unit/drivers/power/test_libvirt.py

@@ -15,12 +15,12 @@ import ddt
 import mock
 
 from os_faults.api import node_collection
-from os_faults.drivers import libvirt_driver
+from os_faults.drivers.power import libvirt
 from os_faults import error
 from os_faults.tests.unit import test
 
 
-DRIVER_PATH = 'os_faults.drivers.libvirt_driver'
+DRIVER_PATH = 'os_faults.drivers.power.libvirt'
 
 
 @ddt.ddt
@@ -30,7 +30,7 @@ class LibvirtDriverTestCase(test.TestCase):
         super(LibvirtDriverTestCase, self).setUp()
 
         self.params = {'connection_uri': 'fake_connection_uri'}
-        self.driver = libvirt_driver.LibvirtDriver(self.params)
+        self.driver = libvirt.LibvirtDriver(self.params)
         self.host = node_collection.Host(
             ip='10.0.0.2', mac='00:00:00:00:00:00', fqdn='node1.com')
 

os_faults/tests/unit/test_os_faults.py

@@ -22,12 +22,12 @@ from os_faults.api import cloud_management
 from os_faults.api import error
 from os_faults.api import node_collection
 from os_faults.api import service
-from os_faults.drivers import devstack
-from os_faults.drivers import devstack_systemd
-from os_faults.drivers import fuel
-from os_faults.drivers import ipmi
-from os_faults.drivers import libvirt_driver
-from os_faults.drivers import node_list
+from os_faults.drivers.cloud import devstack
+from os_faults.drivers.cloud import devstack_systemd
+from os_faults.drivers.cloud import fuel
+from os_faults.drivers.nodes import node_list
+from os_faults.drivers.power import ipmi
+from os_faults.drivers.power import libvirt
 from os_faults.tests.unit import test
 
 
@@ -129,7 +129,7 @@ class OSFaultsTestCase(test.TestCase):
         self.assertIsInstance(destructor.node_discover, fuel.FuelManagement)
         self.assertEqual(1, len(destructor.power_manager.power_drivers))
         self.assertIsInstance(destructor.power_manager.power_drivers[0],
-                              libvirt_driver.LibvirtDriver)
+                              libvirt.LibvirtDriver)
 
     def test_connect_fuel_with_ipmi_libvirt_and_node_list(self):
         cloud_config = {
@@ -181,7 +181,7 @@ class OSFaultsTestCase(test.TestCase):
         self.assertIsInstance(destructor.power_manager.power_drivers[0],
                               ipmi.IPMIDriver)
         self.assertIsInstance(destructor.power_manager.power_drivers[1],
-                              libvirt_driver.LibvirtDriver)
+                              libvirt.LibvirtDriver)
 
     def test_connect_driver_not_found(self):
         cloud_config = {
@@ -207,7 +207,7 @@ class OSFaultsTestCase(test.TestCase):
             self.assertIsInstance(destructor, fuel.FuelManagement)
             self.assertEqual(1, len(destructor.power_manager.power_drivers))
             self.assertIsInstance(destructor.power_manager.power_drivers[0],
-                                  libvirt_driver.LibvirtDriver)
+                                  libvirt.LibvirtDriver)
 
     @mock.patch.dict(os.environ, {'OS_FAULTS_CONFIG': '/my/conf.yaml'})
     @mock.patch('os.path.exists', return_value=True)
@@ -219,7 +219,7 @@ class OSFaultsTestCase(test.TestCase):
             self.assertIsInstance(destructor, fuel.FuelManagement)
             self.assertEqual(1, len(destructor.power_manager.power_drivers))
             self.assertIsInstance(destructor.power_manager.power_drivers[0],
-                                  libvirt_driver.LibvirtDriver)
+                                  libvirt.LibvirtDriver)
             mock_os_faults_open.assert_called_once_with('/my/conf.yaml')
 
     @mock.patch('os.path.exists', return_value=False)