Merge "Avoid API root controller dependency on v1 dir"

10 files changed, 17 insertions, 17 deletions

diff --git a/ironic/api/controllers/v1/base.py b/ironic/api/controllers/base.py
index 8a10ffbfc..8a10ffbfc 100644
--- a/ironic/api/controllers/v1/base.py
+++ b/ironic/api/controllers/base.py
diff --git a/ironic/api/controllers/v1/link.py b/ironic/api/controllers/link.py
index dd542d7ea..94052b9e0 100644
--- a/ironic/api/controllers/v1/link.py
+++ b/ironic/api/controllers/link.py
@@ -15,7 +15,7 @@
 
 from wsme import types as wtypes
 
-from ironic.api.controllers.v1 import base
+from ironic.api.controllers import base
 
 
 class Link(base.APIBase):
diff --git a/ironic/api/controllers/root.py b/ironic/api/controllers/root.py
index 0f7e2732a..8eb10c749 100644
--- a/ironic/api/controllers/root.py
+++ b/ironic/api/controllers/root.py
@@ -22,9 +22,9 @@ from pecan import rest
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
+from ironic.api.controllers import base
+from ironic.api.controllers import link
 from ironic.api.controllers import v1
-from ironic.api.controllers.v1 import base
-from ironic.api.controllers.v1 import link
 
 
 class Version(base.APIBase):
diff --git a/ironic/api/controllers/v1/__init__.py b/ironic/api/controllers/v1/__init__.py
index fa2dff458..16d3d48ec 100644
--- a/ironic/api/controllers/v1/__init__.py
+++ b/ironic/api/controllers/v1/__init__.py
@@ -28,10 +28,10 @@ from pecan import rest
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
-from ironic.api.controllers.v1 import base
+from ironic.api.controllers import base
+from ironic.api.controllers import link
 from ironic.api.controllers.v1 import chassis
 from ironic.api.controllers.v1 import driver
-from ironic.api.controllers.v1 import link
 from ironic.api.controllers.v1 import node
 from ironic.api.controllers.v1 import port
 
diff --git a/ironic/api/controllers/v1/chassis.py b/ironic/api/controllers/v1/chassis.py
index ea8bba7d4..90f914426 100644
--- a/ironic/api/controllers/v1/chassis.py
+++ b/ironic/api/controllers/v1/chassis.py
@@ -24,9 +24,9 @@ import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
-from ironic.api.controllers.v1 import base
+from ironic.api.controllers import base
+from ironic.api.controllers import link
 from ironic.api.controllers.v1 import collection
-from ironic.api.controllers.v1 import link
 from ironic.api.controllers.v1 import node
 from ironic.api.controllers.v1 import types
 from ironic.api.controllers.v1 import utils as api_utils
diff --git a/ironic/api/controllers/v1/collection.py b/ironic/api/controllers/v1/collection.py
index 2ff0c9b76..6ec298791 100644
--- a/ironic/api/controllers/v1/collection.py
+++ b/ironic/api/controllers/v1/collection.py
@@ -16,8 +16,8 @@
 import pecan
 from wsme import types as wtypes
 
-from ironic.api.controllers.v1 import base
-from ironic.api.controllers.v1 import link
+from ironic.api.controllers import base
+from ironic.api.controllers import link
 
 
 class Collection(base.APIBase):
diff --git a/ironic/api/controllers/v1/driver.py b/ironic/api/controllers/v1/driver.py
index e9f016346..b00a14a8b 100644
--- a/ironic/api/controllers/v1/driver.py
+++ b/ironic/api/controllers/v1/driver.py
@@ -20,8 +20,8 @@ import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
-from ironic.api.controllers.v1 import base
-from ironic.api.controllers.v1 import link
+from ironic.api.controllers import base
+from ironic.api.controllers import link
 from ironic.common import exception
 from ironic.openstack.common import log
 
diff --git a/ironic/api/controllers/v1/node.py b/ironic/api/controllers/v1/node.py
index f650a19d6..57b52b326 100644
--- a/ironic/api/controllers/v1/node.py
+++ b/ironic/api/controllers/v1/node.py
@@ -24,9 +24,9 @@ import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
-from ironic.api.controllers.v1 import base
+from ironic.api.controllers import base
+from ironic.api.controllers import link
 from ironic.api.controllers.v1 import collection
-from ironic.api.controllers.v1 import link
 from ironic.api.controllers.v1 import port
 from ironic.api.controllers.v1 import types
 from ironic.api.controllers.v1 import utils as api_utils
diff --git a/ironic/api/controllers/v1/port.py b/ironic/api/controllers/v1/port.py
index 958a6f939..fcc844e18 100644
--- a/ironic/api/controllers/v1/port.py
+++ b/ironic/api/controllers/v1/port.py
@@ -23,9 +23,9 @@ import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
-from ironic.api.controllers.v1 import base
+from ironic.api.controllers import base
+from ironic.api.controllers import link
 from ironic.api.controllers.v1 import collection
-from ironic.api.controllers.v1 import link
 from ironic.api.controllers.v1 import types
 from ironic.api.controllers.v1 import utils as api_utils
 from ironic.common import exception
diff --git a/ironic/api/controllers/v1/state.py b/ironic/api/controllers/v1/state.py
index 3809d49f8..2f85284ab 100644
--- a/ironic/api/controllers/v1/state.py
+++ b/ironic/api/controllers/v1/state.py
@@ -15,8 +15,8 @@
 
 from wsme import types as wtypes
 
-from ironic.api.controllers.v1 import base
-from ironic.api.controllers.v1 import link
+from ironic.api.controllers import base
+from ironic.api.controllers import link
 
 
 class State(base.APIBase):