x/cloudbase-init
Code Issues Proposed changes

Move plugins factory on top plugins level

Browse Source 
Change-Id: Ie27409ff4c8605e171f13add4ad52381f5b5d382
This commit is contained in:
Cosmin Poieana
2015-09-28 23:13:52 +03:00
parent 317355b597
commit 44b1003b62
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cloudbaseinit/init.py
View File

@@ -21,7 +21,7 @@ from oslo_log import log as oslo_logging
from cloudbaseinit.metadata import factory as metadata_factory
from cloudbaseinit.osutils import factory as osutils_factory
from cloudbaseinit.plugins.common import base as plugins_base
from cloudbaseinit.plugins.common import factory as plugins_factory
from cloudbaseinit.plugins import factory as plugins_factory
from cloudbaseinit import version
opts = [

0
cloudbaseinit/plugins/common/factory.py → cloudbaseinit/plugins/factory.py
View File

6
cloudbaseinit/tests/plugins/test_factory.py
View File

@@ -22,7 +22,7 @@ except ImportError:
from oslo_config import cfg
from cloudbaseinit.plugins.common import base
from cloudbaseinit.plugins.common import factory
from cloudbaseinit.plugins import factory
from cloudbaseinit.tests import testutils
CONF = cfg.CONF
@@ -96,7 +96,7 @@ class TestPluginFactory(unittest.TestCase):
@testutils.ConfPatcher('plugins', ['missing.plugin'])
def test_load_plugins_plugin_failed(self):
with testutils.LogSnatcher('cloudbaseinit.plugins.'
'common.factory') as snatcher:
'factory') as snatcher:
plugins = factory.load_plugins(None)
self.assertEqual([], plugins)
@@ -107,7 +107,7 @@ class TestPluginFactory(unittest.TestCase):
"localscripts.LocalScriptsPlugin"])
@mock.patch('cloudbaseinit.utils.classloader.ClassLoader.load_class')
def test_old_plugin_mapping(self, mock_load_class):
with testutils.LogSnatcher('cloudbaseinit.plugins.common.'
with testutils.LogSnatcher('cloudbaseinit.plugins.'
'factory') as snatcher:
factory.load_plugins(None)

4
cloudbaseinit/tests/test_init.py
View File

@@ -140,7 +140,7 @@ class TestInitManager(unittest.TestCase):
'_exec_plugin')
@mock.patch('cloudbaseinit.init.InitManager.'
'_check_plugin_os_requirements')
@mock.patch('cloudbaseinit.plugins.common.factory.load_plugins')
@mock.patch('cloudbaseinit.plugins.factory.load_plugins')
def _test_handle_plugins_stage(self, mock_load_plugins,
mock_check_plugin_os_requirements,
mock_exec_plugin,
@@ -184,7 +184,7 @@ class TestInitManager(unittest.TestCase):
'._handle_plugins_stage')
@mock.patch('cloudbaseinit.init.InitManager._check_latest_version')
@mock.patch('cloudbaseinit.version.get_version')
@mock.patch('cloudbaseinit.plugins.common.factory.load_plugins')
@mock.patch('cloudbaseinit.plugins.factory.load_plugins')
@mock.patch('cloudbaseinit.osutils.factory.get_os_utils')
@mock.patch('cloudbaseinit.metadata.factory.get_metadata_service')
def _test_configure_host(self, mock_get_metadata_service,