Merge "Remove circle reference"
This commit is contained in:
commit
e7b27cd47e
|
@ -24,8 +24,8 @@ from magnum.api.controllers import base
|
||||||
from magnum.api.controllers import link
|
from magnum.api.controllers import link
|
||||||
from magnum.api.controllers.v1 import collection
|
from magnum.api.controllers.v1 import collection
|
||||||
from magnum.api.controllers.v1 import types
|
from magnum.api.controllers.v1 import types
|
||||||
from magnum.api.controllers.v1 import utils as api_utils
|
|
||||||
from magnum.api import expose
|
from magnum.api import expose
|
||||||
|
from magnum.api import utils as api_utils
|
||||||
from magnum.common import exception
|
from magnum.common import exception
|
||||||
from magnum.common import policy
|
from magnum.common import policy
|
||||||
from magnum import objects
|
from magnum import objects
|
||||||
|
|
|
@ -24,8 +24,8 @@ from magnum.api.controllers import base
|
||||||
from magnum.api.controllers import link
|
from magnum.api.controllers import link
|
||||||
from magnum.api.controllers.v1 import collection
|
from magnum.api.controllers.v1 import collection
|
||||||
from magnum.api.controllers.v1 import types
|
from magnum.api.controllers.v1 import types
|
||||||
from magnum.api.controllers.v1 import utils as api_utils
|
|
||||||
from magnum.api import expose
|
from magnum.api import expose
|
||||||
|
from magnum.api import utils as api_utils
|
||||||
from magnum.api import validation
|
from magnum.api import validation
|
||||||
from magnum.common import clients
|
from magnum.common import clients
|
||||||
from magnum.common import exception
|
from magnum.common import exception
|
||||||
|
|
|
@ -22,7 +22,7 @@ import wsmeext.pecan as wsme_pecan
|
||||||
from magnum.api.controllers import base
|
from magnum.api.controllers import base
|
||||||
from magnum.api.controllers import link
|
from magnum.api.controllers import link
|
||||||
from magnum.api.controllers.v1 import types
|
from magnum.api.controllers.v1 import types
|
||||||
from magnum.api.controllers.v1 import utils as api_utils
|
from magnum.api import utils as api_utils
|
||||||
from magnum.common import exception
|
from magnum.common import exception
|
||||||
from magnum.common import policy
|
from magnum.common import policy
|
||||||
from magnum import objects
|
from magnum import objects
|
||||||
|
|
|
@ -24,8 +24,8 @@ from magnum.api.controllers import base
|
||||||
from magnum.api.controllers import link
|
from magnum.api.controllers import link
|
||||||
from magnum.api.controllers.v1 import collection
|
from magnum.api.controllers.v1 import collection
|
||||||
from magnum.api.controllers.v1 import types
|
from magnum.api.controllers.v1 import types
|
||||||
from magnum.api.controllers.v1 import utils as api_utils
|
|
||||||
from magnum.api import expose
|
from magnum.api import expose
|
||||||
|
from magnum.api import utils as api_utils
|
||||||
from magnum.api import validation
|
from magnum.api import validation
|
||||||
from magnum.common import exception
|
from magnum.common import exception
|
||||||
from magnum.common import policy
|
from magnum.common import policy
|
||||||
|
|
|
@ -23,8 +23,8 @@ from magnum.api.controllers import base
|
||||||
from magnum.api.controllers import link
|
from magnum.api.controllers import link
|
||||||
from magnum.api.controllers.v1 import collection
|
from magnum.api.controllers.v1 import collection
|
||||||
from magnum.api.controllers.v1 import types
|
from magnum.api.controllers.v1 import types
|
||||||
from magnum.api.controllers.v1 import utils as api_utils
|
|
||||||
from magnum.api import expose
|
from magnum.api import expose
|
||||||
|
from magnum.api import utils as api_utils
|
||||||
from magnum.common import exception
|
from magnum.common import exception
|
||||||
from magnum.common import policy
|
from magnum.common import policy
|
||||||
from magnum import objects
|
from magnum import objects
|
||||||
|
|
|
@ -21,8 +21,8 @@ from magnum.api.controllers import link
|
||||||
from magnum.api.controllers.v1 import base as v1_base
|
from magnum.api.controllers.v1 import base as v1_base
|
||||||
from magnum.api.controllers.v1 import collection
|
from magnum.api.controllers.v1 import collection
|
||||||
from magnum.api.controllers.v1 import types
|
from magnum.api.controllers.v1 import types
|
||||||
from magnum.api.controllers.v1 import utils as api_utils
|
|
||||||
from magnum.api import expose
|
from magnum.api import expose
|
||||||
|
from magnum.api import utils as api_utils
|
||||||
from magnum.api import validation
|
from magnum.api import validation
|
||||||
from magnum.common import exception
|
from magnum.common import exception
|
||||||
from magnum.common import k8s_manifest
|
from magnum.common import k8s_manifest
|
||||||
|
|
|
@ -22,8 +22,8 @@ from magnum.api.controllers import link
|
||||||
from magnum.api.controllers.v1 import base as v1_base
|
from magnum.api.controllers.v1 import base as v1_base
|
||||||
from magnum.api.controllers.v1 import collection
|
from magnum.api.controllers.v1 import collection
|
||||||
from magnum.api.controllers.v1 import types
|
from magnum.api.controllers.v1 import types
|
||||||
from magnum.api.controllers.v1 import utils as api_utils
|
|
||||||
from magnum.api import expose
|
from magnum.api import expose
|
||||||
|
from magnum.api import utils as api_utils
|
||||||
from magnum.api import validation
|
from magnum.api import validation
|
||||||
from magnum.common import exception
|
from magnum.common import exception
|
||||||
from magnum.common import k8s_manifest
|
from magnum.common import k8s_manifest
|
||||||
|
|
|
@ -20,8 +20,8 @@ from magnum.api.controllers import link
|
||||||
from magnum.api.controllers.v1 import base as v1_base
|
from magnum.api.controllers.v1 import base as v1_base
|
||||||
from magnum.api.controllers.v1 import collection
|
from magnum.api.controllers.v1 import collection
|
||||||
from magnum.api.controllers.v1 import types
|
from magnum.api.controllers.v1 import types
|
||||||
from magnum.api.controllers.v1 import utils as api_utils
|
|
||||||
from magnum.api import expose
|
from magnum.api import expose
|
||||||
|
from magnum.api import utils as api_utils
|
||||||
from magnum.api import validation
|
from magnum.api import validation
|
||||||
from magnum.common import exception
|
from magnum.common import exception
|
||||||
from magnum.common import k8s_manifest
|
from magnum.common import k8s_manifest
|
||||||
|
|
|
@ -23,7 +23,7 @@ from magnum.api.controllers import base
|
||||||
from magnum.api.controllers import link
|
from magnum.api.controllers import link
|
||||||
from magnum.api.controllers.v1 import collection
|
from magnum.api.controllers.v1 import collection
|
||||||
from magnum.api.controllers.v1 import types
|
from magnum.api.controllers.v1 import types
|
||||||
from magnum.api.controllers.v1 import utils as api_utils
|
from magnum.api import utils as api_utils
|
||||||
from magnum.common import exception
|
from magnum.common import exception
|
||||||
from magnum import objects
|
from magnum import objects
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ import decorator
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
import pecan
|
import pecan
|
||||||
|
|
||||||
from magnum.api.controllers.v1 import utils as api_utils
|
from magnum.api import utils as api_utils
|
||||||
from magnum.common import exception
|
from magnum.common import exception
|
||||||
from magnum import objects
|
from magnum import objects
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,7 @@ from magnum.tests.unit.objects import utils as obj_utils
|
||||||
|
|
||||||
class TestCertObject(base.TestCase):
|
class TestCertObject(base.TestCase):
|
||||||
|
|
||||||
@mock.patch('magnum.api.controllers.v1.utils.get_rpc_resource')
|
@mock.patch('magnum.api.utils.get_rpc_resource')
|
||||||
def test_cert_init(self, mock_get_rpc_resource):
|
def test_cert_init(self, mock_get_rpc_resource):
|
||||||
cert_dict = apiutils.cert_post_data()
|
cert_dict = apiutils.cert_post_data()
|
||||||
mock_bay = mock.MagicMock()
|
mock_bay = mock.MagicMock()
|
||||||
|
|
|
@ -17,7 +17,7 @@ import jsonpatch
|
||||||
import mock
|
import mock
|
||||||
import wsme
|
import wsme
|
||||||
|
|
||||||
from magnum.api.controllers.v1 import utils
|
from magnum.api import utils
|
||||||
from magnum.common import exception
|
from magnum.common import exception
|
||||||
from magnum.common import utils as common_utils
|
from magnum.common import utils as common_utils
|
||||||
from magnum.tests.unit.api import base
|
from magnum.tests.unit.api import base
|
||||||
|
|
|
@ -188,7 +188,7 @@ class TestValidation(base.BaseTestCase):
|
||||||
assert_raised=True)
|
assert_raised=True)
|
||||||
|
|
||||||
@mock.patch('pecan.request')
|
@mock.patch('pecan.request')
|
||||||
@mock.patch('magnum.api.controllers.v1.utils.get_rpc_resource')
|
@mock.patch('magnum.api.utils.get_rpc_resource')
|
||||||
def _test_enforce_network_driver_types_update(
|
def _test_enforce_network_driver_types_update(
|
||||||
self,
|
self,
|
||||||
mock_get_rpc_resource,
|
mock_get_rpc_resource,
|
||||||
|
|
Loading…
Reference in New Issue