Don't import form keystoneclient.openstack.common
The keystoneclient.openstack.common directory is where we sync files from oslo incubator. It is not a public directory and should not be being consumed by openstackclient. Change-Id: I011bb95c2c824e2dbc4b822ca922ae77b8d9b955
This commit is contained in:
@@ -15,8 +15,7 @@
|
|||||||
|
|
||||||
import simplejson as json
|
import simplejson as json
|
||||||
|
|
||||||
from keystoneclient.openstack.common.apiclient \
|
from keystoneclient import exceptions as ksc_exceptions
|
||||||
import exceptions as ksc_exceptions
|
|
||||||
from keystoneclient import session as ksc_session
|
from keystoneclient import session as ksc_session
|
||||||
from openstackclient.common import exceptions
|
from openstackclient.common import exceptions
|
||||||
|
|
||||||
|
@@ -23,7 +23,7 @@ from cliff import command
|
|||||||
from cliff import lister
|
from cliff import lister
|
||||||
from cliff import show
|
from cliff import show
|
||||||
|
|
||||||
from keystoneclient.openstack.common.apiclient import exceptions as ksc_exc
|
from keystoneclient import exceptions as ksc_exc
|
||||||
from novaclient.v1_1 import security_group_rules
|
from novaclient.v1_1 import security_group_rules
|
||||||
from openstackclient.common import parseractions
|
from openstackclient.common import parseractions
|
||||||
from openstackclient.common import utils
|
from openstackclient.common import utils
|
||||||
|
@@ -21,7 +21,7 @@ import six
|
|||||||
from cliff import command
|
from cliff import command
|
||||||
from cliff import lister
|
from cliff import lister
|
||||||
from cliff import show
|
from cliff import show
|
||||||
from keystoneclient.openstack.common.apiclient import exceptions as ksc_exc
|
from keystoneclient import exceptions as ksc_exc
|
||||||
|
|
||||||
from openstackclient.common import parseractions
|
from openstackclient.common import parseractions
|
||||||
from openstackclient.common import utils
|
from openstackclient.common import utils
|
||||||
|
@@ -21,7 +21,7 @@ import six
|
|||||||
from cliff import command
|
from cliff import command
|
||||||
from cliff import lister
|
from cliff import lister
|
||||||
from cliff import show
|
from cliff import show
|
||||||
from keystoneclient.openstack.common.apiclient import exceptions as ksc_exc
|
from keystoneclient import exceptions as ksc_exc
|
||||||
|
|
||||||
from openstackclient.common import exceptions
|
from openstackclient.common import exceptions
|
||||||
from openstackclient.common import utils
|
from openstackclient.common import utils
|
||||||
|
@@ -21,7 +21,7 @@ import six
|
|||||||
from cliff import command
|
from cliff import command
|
||||||
from cliff import lister
|
from cliff import lister
|
||||||
from cliff import show
|
from cliff import show
|
||||||
from keystoneclient.openstack.common.apiclient import exceptions as ksc_exc
|
from keystoneclient import exceptions as ksc_exc
|
||||||
|
|
||||||
from openstackclient.common import utils
|
from openstackclient.common import utils
|
||||||
from openstackclient.i18n import _ # noqa
|
from openstackclient.i18n import _ # noqa
|
||||||
|
@@ -22,7 +22,7 @@ import sys
|
|||||||
from cliff import command
|
from cliff import command
|
||||||
from cliff import lister
|
from cliff import lister
|
||||||
from cliff import show
|
from cliff import show
|
||||||
from keystoneclient.openstack.common.apiclient import exceptions as ksc_exc
|
from keystoneclient import exceptions as ksc_exc
|
||||||
|
|
||||||
from openstackclient.common import utils
|
from openstackclient.common import utils
|
||||||
from openstackclient.i18n import _ # noqa
|
from openstackclient.i18n import _ # noqa
|
||||||
|
@@ -22,7 +22,7 @@ import sys
|
|||||||
from cliff import command
|
from cliff import command
|
||||||
from cliff import lister
|
from cliff import lister
|
||||||
from cliff import show
|
from cliff import show
|
||||||
from keystoneclient.openstack.common.apiclient import exceptions as ksc_exc
|
from keystoneclient import exceptions as ksc_exc
|
||||||
|
|
||||||
from openstackclient.common import utils
|
from openstackclient.common import utils
|
||||||
from openstackclient.i18n import _ # noqa
|
from openstackclient.i18n import _ # noqa
|
||||||
|
@@ -21,7 +21,7 @@ import six
|
|||||||
from cliff import command
|
from cliff import command
|
||||||
from cliff import lister
|
from cliff import lister
|
||||||
from cliff import show
|
from cliff import show
|
||||||
from keystoneclient.openstack.common.apiclient import exceptions as ksc_exc
|
from keystoneclient import exceptions as ksc_exc
|
||||||
|
|
||||||
from openstackclient.common import parseractions
|
from openstackclient.common import parseractions
|
||||||
from openstackclient.common import utils
|
from openstackclient.common import utils
|
||||||
|
@@ -22,7 +22,7 @@ import sys
|
|||||||
from cliff import command
|
from cliff import command
|
||||||
from cliff import lister
|
from cliff import lister
|
||||||
from cliff import show
|
from cliff import show
|
||||||
from keystoneclient.openstack.common.apiclient import exceptions as ksc_exc
|
from keystoneclient import exceptions as ksc_exc
|
||||||
|
|
||||||
from openstackclient.common import utils
|
from openstackclient.common import utils
|
||||||
from openstackclient.i18n import _ # noqa
|
from openstackclient.i18n import _ # noqa
|
||||||
|
@@ -21,7 +21,7 @@ import six
|
|||||||
from cliff import command
|
from cliff import command
|
||||||
from cliff import lister
|
from cliff import lister
|
||||||
from cliff import show
|
from cliff import show
|
||||||
from keystoneclient.openstack.common.apiclient import exceptions as ksc_exc
|
from keystoneclient import exceptions as ksc_exc
|
||||||
|
|
||||||
from openstackclient.common import utils
|
from openstackclient.common import utils
|
||||||
from openstackclient.i18n import _ # noqa
|
from openstackclient.i18n import _ # noqa
|
||||||
|
@@ -15,7 +15,7 @@
|
|||||||
|
|
||||||
import copy
|
import copy
|
||||||
|
|
||||||
from keystoneclient.openstack.common.apiclient import exceptions as ksc_exc
|
from keystoneclient import exceptions as ksc_exc
|
||||||
|
|
||||||
from openstackclient.identity.v2_0 import project
|
from openstackclient.identity.v2_0 import project
|
||||||
from openstackclient.tests import fakes
|
from openstackclient.tests import fakes
|
||||||
|
@@ -16,7 +16,7 @@
|
|||||||
import copy
|
import copy
|
||||||
import mock
|
import mock
|
||||||
|
|
||||||
from keystoneclient.openstack.common.apiclient import exceptions as ksc_exc
|
from keystoneclient import exceptions as ksc_exc
|
||||||
|
|
||||||
from openstackclient.common import exceptions
|
from openstackclient.common import exceptions
|
||||||
from openstackclient.identity.v2_0 import role
|
from openstackclient.identity.v2_0 import role
|
||||||
|
@@ -16,7 +16,7 @@
|
|||||||
import copy
|
import copy
|
||||||
import mock
|
import mock
|
||||||
|
|
||||||
from keystoneclient.openstack.common.apiclient import exceptions as ksc_exc
|
from keystoneclient import exceptions as ksc_exc
|
||||||
from openstackclient.identity.v2_0 import user
|
from openstackclient.identity.v2_0 import user
|
||||||
from openstackclient.tests import fakes
|
from openstackclient.tests import fakes
|
||||||
from openstackclient.tests.identity.v2_0 import fakes as identity_fakes
|
from openstackclient.tests.identity.v2_0 import fakes as identity_fakes
|
||||||
|
Reference in New Issue
Block a user