Merge "Move baremetal dir out from engine"

mogan/baremetal/driver.py

@@ -148,7 +148,7 @@ def load_engine_driver(engine_driver):
     LOG.info("Loading engine driver '%s'", engine_driver)
     try:
         driver = importutils.import_object(
-            'mogan.engine.baremetal.%s' % engine_driver)
+            'mogan.baremetal.%s' % engine_driver)
         return utils.check_isinstance(driver, BaseEngineDriver)
     except ImportError:
         LOG.exception("Unable to load the baremetal driver")

mogan/baremetal/ironic/__init__.py

@@ -13,6 +13,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from mogan.engine.baremetal.ironic import driver
+from mogan.baremetal.ironic import driver
 
 IronicDriver = driver.IronicDriver

mogan/baremetal/ironic/driver.py

@@ -20,13 +20,13 @@ from oslo_service import loopingcall
 from oslo_utils import excutils
 import six
 
+from mogan.baremetal import driver as base_driver
+from mogan.baremetal.ironic import ironic_states
 from mogan.common import exception
 from mogan.common.i18n import _
 from mogan.common import ironic
 from mogan.common import states
 from mogan.conf import CONF
-from mogan.engine.baremetal import driver as base_driver
-from mogan.engine.baremetal.ironic import ironic_states
 
 LOG = logging.getLogger(__name__)
 

mogan/engine/base_manager.py

@@ -18,10 +18,10 @@
 from eventlet import greenpool
 from oslo_service import periodic_task
 
+from mogan.baremetal import driver
 from mogan.common.i18n import _
 from mogan.conf import CONF
 from mogan.db import api as dbapi
-from mogan.engine.baremetal import driver
 from mogan.engine import rpcapi
 from mogan import network
 

mogan/engine/manager.py

@@ -25,13 +25,13 @@ from oslo_utils import uuidutils
 import six
 import six.moves.urllib.parse as urlparse
 
+from mogan.baremetal.ironic import ironic_states
 from mogan.common import exception
 from mogan.common import flow_utils
 from mogan.common.i18n import _
 from mogan.common import states
 from mogan.common import utils
 from mogan.conf import CONF
-from mogan.engine.baremetal.ironic import ironic_states
 from mogan.engine import base_manager
 from mogan.engine.flows import create_server
 from mogan.notifications import base as notifications

mogan/tests/unit/engine/flows/test_create_server_flow.py

@@ -17,7 +17,7 @@
 import mock
 from oslo_context import context
 
-from mogan.engine.baremetal.ironic import IronicDriver
+from mogan.baremetal.ironic import IronicDriver
 from mogan.engine.flows import create_server
 from mogan.engine import manager
 from mogan import objects

mogan/tests/unit/engine/test_manager.py

@@ -19,11 +19,11 @@ import mock
 from oslo_config import cfg
 from oslo_utils import uuidutils
 
+from mogan.baremetal.ironic.driver import ironic_states
+from mogan.baremetal.ironic import IronicDriver
 from mogan.common import exception
 from mogan.common import ironic
 from mogan.common import states
-from mogan.engine.baremetal.ironic.driver import ironic_states
-from mogan.engine.baremetal.ironic import IronicDriver
 from mogan.engine import manager
 from mogan.network import api as network_api
 from mogan.tests.unit.db import base as tests_db_base