Use functions in oslo.utils
Keystone was using functions in oslo-incubator that have been graduated into oslo.utils. This changes the function calls to use the functions in oslo.utils. Change-Id: I39365042de913e1b3edaf849e3f5578cef0b7b02
This commit is contained in:
parent
41ae15795e
commit
b763d613b4
@ -15,6 +15,7 @@
|
|||||||
import sys
|
import sys
|
||||||
|
|
||||||
from keystoneclient.common import cms
|
from keystoneclient.common import cms
|
||||||
|
from oslo.utils import timeutils
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from keystone.common import controller
|
from keystone.common import controller
|
||||||
@ -27,7 +28,6 @@ from keystone.i18n import _, _LI
|
|||||||
from keystone.openstack.common import importutils
|
from keystone.openstack.common import importutils
|
||||||
from keystone.openstack.common import jsonutils
|
from keystone.openstack.common import jsonutils
|
||||||
from keystone.openstack.common import log
|
from keystone.openstack.common import log
|
||||||
from keystone.openstack.common import timeutils
|
|
||||||
|
|
||||||
|
|
||||||
LOG = log.getLogger(__name__)
|
LOG = log.getLogger(__name__)
|
||||||
|
@ -12,6 +12,8 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
|
from oslo.utils import timeutils
|
||||||
|
|
||||||
from keystone import auth
|
from keystone import auth
|
||||||
from keystone.common import controller
|
from keystone.common import controller
|
||||||
from keystone.common import dependency
|
from keystone.common import dependency
|
||||||
@ -20,7 +22,6 @@ from keystone.contrib.oauth1 import validator
|
|||||||
from keystone import exception
|
from keystone import exception
|
||||||
from keystone.i18n import _
|
from keystone.i18n import _
|
||||||
from keystone.openstack.common import log
|
from keystone.openstack.common import log
|
||||||
from keystone.openstack.common import timeutils
|
|
||||||
|
|
||||||
|
|
||||||
LOG = log.getLogger(__name__)
|
LOG = log.getLogger(__name__)
|
||||||
|
@ -12,12 +12,13 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
|
from oslo.utils import timeutils
|
||||||
|
|
||||||
from keystone import auth
|
from keystone import auth
|
||||||
from keystone.common import dependency
|
from keystone.common import dependency
|
||||||
from keystone.common import wsgi
|
from keystone.common import wsgi
|
||||||
from keystone import exception
|
from keystone import exception
|
||||||
from keystone.openstack.common import log
|
from keystone.openstack.common import log
|
||||||
from keystone.openstack.common import timeutils
|
|
||||||
|
|
||||||
|
|
||||||
LOG = log.getLogger(__name__)
|
LOG = log.getLogger(__name__)
|
||||||
|
2
keystone/common/cache/backends/mongo.py
vendored
2
keystone/common/cache/backends/mongo.py
vendored
@ -17,13 +17,13 @@ import datetime
|
|||||||
|
|
||||||
from dogpile.cache import api
|
from dogpile.cache import api
|
||||||
from dogpile.cache import util as dp_util
|
from dogpile.cache import util as dp_util
|
||||||
|
from oslo.utils import timeutils
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from keystone import exception
|
from keystone import exception
|
||||||
from keystone.i18n import _
|
from keystone.i18n import _
|
||||||
from keystone.openstack.common import importutils
|
from keystone.openstack.common import importutils
|
||||||
from keystone.openstack.common import log
|
from keystone.openstack.common import log
|
||||||
from keystone.openstack.common import timeutils
|
|
||||||
|
|
||||||
|
|
||||||
NO_VALUE = api.NO_VALUE
|
NO_VALUE = api.NO_VALUE
|
||||||
|
@ -28,11 +28,11 @@ column.
|
|||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
from oslo.utils import strutils
|
||||||
import sqlalchemy as sql
|
import sqlalchemy as sql
|
||||||
from sqlalchemy.orm import sessionmaker
|
from sqlalchemy.orm import sessionmaker
|
||||||
|
|
||||||
from keystone.openstack.common import jsonutils
|
from keystone.openstack.common import jsonutils
|
||||||
from keystone.openstack.common import strutils
|
|
||||||
|
|
||||||
|
|
||||||
def _migrate_enabled_from_extra(migrate_engine, endpoint_table):
|
def _migrate_enabled_from_extra(migrate_engine, endpoint_table):
|
||||||
|
@ -28,11 +28,11 @@ column.
|
|||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
from oslo.utils import strutils
|
||||||
import sqlalchemy as sql
|
import sqlalchemy as sql
|
||||||
from sqlalchemy.orm import sessionmaker
|
from sqlalchemy.orm import sessionmaker
|
||||||
|
|
||||||
from keystone.openstack.common import jsonutils
|
from keystone.openstack.common import jsonutils
|
||||||
from keystone.openstack.common import strutils
|
|
||||||
|
|
||||||
|
|
||||||
def _migrate_enabled_from_extra(migrate_engine, service_table):
|
def _migrate_enabled_from_extra(migrate_engine, service_table):
|
||||||
|
@ -23,6 +23,7 @@ import hashlib
|
|||||||
import os
|
import os
|
||||||
import pwd
|
import pwd
|
||||||
|
|
||||||
|
from oslo.utils import strutils
|
||||||
import passlib.hash
|
import passlib.hash
|
||||||
import six
|
import six
|
||||||
from six import moves
|
from six import moves
|
||||||
@ -33,7 +34,6 @@ from keystone import exception
|
|||||||
from keystone.i18n import _
|
from keystone.i18n import _
|
||||||
from keystone.openstack.common import jsonutils
|
from keystone.openstack.common import jsonutils
|
||||||
from keystone.openstack.common import log
|
from keystone.openstack.common import log
|
||||||
from keystone.openstack.common import strutils
|
|
||||||
|
|
||||||
|
|
||||||
CONF = config.CONF
|
CONF = config.CONF
|
||||||
|
@ -12,12 +12,12 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
|
from oslo.utils import timeutils
|
||||||
import webob.dec
|
import webob.dec
|
||||||
|
|
||||||
from keystone.common import wsgi
|
from keystone.common import wsgi
|
||||||
from keystone import config
|
from keystone import config
|
||||||
from keystone.openstack.common import log
|
from keystone.openstack.common import log
|
||||||
from keystone.openstack.common import timeutils
|
|
||||||
from keystone.openstack.common import versionutils
|
from keystone.openstack.common import versionutils
|
||||||
|
|
||||||
|
|
||||||
|
@ -15,13 +15,13 @@
|
|||||||
import re
|
import re
|
||||||
|
|
||||||
import jsonschema
|
import jsonschema
|
||||||
|
from oslo.utils import timeutils
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from keystone.common import config
|
from keystone.common import config
|
||||||
from keystone import exception
|
from keystone import exception
|
||||||
from keystone.i18n import _
|
from keystone.i18n import _
|
||||||
from keystone.openstack.common import log
|
from keystone.openstack.common import log
|
||||||
from keystone.openstack.common import timeutils
|
|
||||||
|
|
||||||
|
|
||||||
CONF = config.CONF
|
CONF = config.CONF
|
||||||
|
@ -16,6 +16,7 @@ import datetime
|
|||||||
import random
|
import random
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
|
from oslo.utils import timeutils
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from keystone.common import sql
|
from keystone.common import sql
|
||||||
@ -23,7 +24,6 @@ from keystone.contrib.oauth1 import core
|
|||||||
from keystone import exception
|
from keystone import exception
|
||||||
from keystone.i18n import _
|
from keystone.i18n import _
|
||||||
from keystone.openstack.common import jsonutils
|
from keystone.openstack.common import jsonutils
|
||||||
from keystone.openstack.common import timeutils
|
|
||||||
|
|
||||||
|
|
||||||
class Consumer(sql.ModelBase, sql.DictBase):
|
class Consumer(sql.ModelBase, sql.DictBase):
|
||||||
|
@ -14,6 +14,8 @@
|
|||||||
|
|
||||||
"""Extensions supporting OAuth1."""
|
"""Extensions supporting OAuth1."""
|
||||||
|
|
||||||
|
from oslo.utils import timeutils
|
||||||
|
|
||||||
from keystone.common import controller
|
from keystone.common import controller
|
||||||
from keystone.common import dependency
|
from keystone.common import dependency
|
||||||
from keystone.common import wsgi
|
from keystone.common import wsgi
|
||||||
@ -23,7 +25,6 @@ from keystone.contrib.oauth1 import validator
|
|||||||
from keystone import exception
|
from keystone import exception
|
||||||
from keystone.i18n import _
|
from keystone.i18n import _
|
||||||
from keystone.openstack.common import jsonutils
|
from keystone.openstack.common import jsonutils
|
||||||
from keystone.openstack.common import timeutils
|
|
||||||
|
|
||||||
|
|
||||||
CONF = config.CONF
|
CONF = config.CONF
|
||||||
|
@ -12,11 +12,12 @@
|
|||||||
|
|
||||||
import datetime
|
import datetime
|
||||||
|
|
||||||
|
from oslo.utils import timeutils
|
||||||
|
|
||||||
from keystone.common import kvs
|
from keystone.common import kvs
|
||||||
from keystone import config
|
from keystone import config
|
||||||
from keystone.contrib import revoke
|
from keystone.contrib import revoke
|
||||||
from keystone import exception
|
from keystone import exception
|
||||||
from keystone.openstack.common import timeutils
|
|
||||||
|
|
||||||
|
|
||||||
CONF = config.CONF
|
CONF = config.CONF
|
||||||
|
@ -10,11 +10,12 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
|
from oslo.utils import timeutils
|
||||||
|
|
||||||
from keystone.common import controller
|
from keystone.common import controller
|
||||||
from keystone.common import dependency
|
from keystone.common import dependency
|
||||||
from keystone import exception
|
from keystone import exception
|
||||||
from keystone.i18n import _
|
from keystone.i18n import _
|
||||||
from keystone.openstack.common import timeutils
|
|
||||||
|
|
||||||
|
|
||||||
@dependency.requires('revoke_api')
|
@dependency.requires('revoke_api')
|
||||||
|
@ -13,6 +13,7 @@
|
|||||||
import abc
|
import abc
|
||||||
import datetime
|
import datetime
|
||||||
|
|
||||||
|
from oslo.utils import timeutils
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from keystone.common import cache
|
from keystone.common import cache
|
||||||
@ -25,7 +26,6 @@ from keystone import exception
|
|||||||
from keystone.i18n import _
|
from keystone.i18n import _
|
||||||
from keystone import notifications
|
from keystone import notifications
|
||||||
from keystone.openstack.common import log
|
from keystone.openstack.common import log
|
||||||
from keystone.openstack.common import timeutils
|
|
||||||
|
|
||||||
|
|
||||||
CONF = config.CONF
|
CONF = config.CONF
|
||||||
|
@ -10,7 +10,8 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from keystone.openstack.common import timeutils
|
from oslo.utils import timeutils
|
||||||
|
|
||||||
|
|
||||||
# The set of attributes common between the RevokeEvent
|
# The set of attributes common between the RevokeEvent
|
||||||
# and the dictionaries created from the token Data.
|
# and the dictionaries created from the token Data.
|
||||||
|
@ -12,12 +12,12 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
|
from oslo.utils import encodeutils
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from keystone.common import config
|
from keystone.common import config
|
||||||
from keystone.i18n import _
|
from keystone.i18n import _
|
||||||
from keystone.openstack.common import log
|
from keystone.openstack.common import log
|
||||||
from keystone.openstack.common import strutils
|
|
||||||
|
|
||||||
|
|
||||||
CONF = config.CONF
|
CONF = config.CONF
|
||||||
@ -62,7 +62,7 @@ class Error(Exception):
|
|||||||
message = self.message_format % kwargs
|
message = self.message_format % kwargs
|
||||||
except UnicodeDecodeError:
|
except UnicodeDecodeError:
|
||||||
try:
|
try:
|
||||||
kwargs = dict([(k, strutils.safe_decode(v)) for k, v in
|
kwargs = dict([(k, encodeutils.safe_decode(v)) for k, v in
|
||||||
six.iteritems(kwargs)])
|
six.iteritems(kwargs)])
|
||||||
except UnicodeDecodeError:
|
except UnicodeDecodeError:
|
||||||
# NOTE(jamielennox): This is the complete failure case
|
# NOTE(jamielennox): This is the complete failure case
|
||||||
|
@ -12,12 +12,12 @@
|
|||||||
|
|
||||||
"""Unified in-memory token model."""
|
"""Unified in-memory token model."""
|
||||||
|
|
||||||
|
from oslo.utils import timeutils
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from keystone.common import config
|
from keystone.common import config
|
||||||
from keystone import exception
|
from keystone import exception
|
||||||
from keystone.i18n import _
|
from keystone.i18n import _
|
||||||
from keystone.openstack.common import timeutils
|
|
||||||
|
|
||||||
|
|
||||||
CONF = config.CONF
|
CONF = config.CONF
|
||||||
|
@ -17,6 +17,7 @@ import datetime
|
|||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
|
from oslo.utils import timeutils
|
||||||
|
|
||||||
from keystone import assignment
|
from keystone import assignment
|
||||||
from keystone import auth
|
from keystone import auth
|
||||||
@ -24,7 +25,6 @@ from keystone.common import authorization
|
|||||||
from keystone.common import environment
|
from keystone.common import environment
|
||||||
from keystone import config
|
from keystone import config
|
||||||
from keystone import exception
|
from keystone import exception
|
||||||
from keystone.openstack.common import timeutils
|
|
||||||
from keystone import tests
|
from keystone import tests
|
||||||
from keystone.tests import default_fixtures
|
from keystone.tests import default_fixtures
|
||||||
from keystone.tests.ksfixtures import database
|
from keystone.tests.ksfixtures import database
|
||||||
|
@ -19,13 +19,13 @@ import mock
|
|||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
from keystoneclient.common import cms
|
from keystoneclient.common import cms
|
||||||
|
from oslo.utils import timeutils
|
||||||
import six
|
import six
|
||||||
from testtools import matchers
|
from testtools import matchers
|
||||||
|
|
||||||
from keystone.common import driver_hints
|
from keystone.common import driver_hints
|
||||||
from keystone import config
|
from keystone import config
|
||||||
from keystone import exception
|
from keystone import exception
|
||||||
from keystone.openstack.common import timeutils
|
|
||||||
from keystone import tests
|
from keystone import tests
|
||||||
from keystone.tests import default_fixtures
|
from keystone.tests import default_fixtures
|
||||||
from keystone.tests import filtering
|
from keystone.tests import filtering
|
||||||
|
@ -14,10 +14,10 @@
|
|||||||
import datetime
|
import datetime
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
|
from oslo.utils import timeutils
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from keystone import exception
|
from keystone import exception
|
||||||
from keystone.openstack.common import timeutils
|
|
||||||
from keystone import tests
|
from keystone import tests
|
||||||
from keystone.tests import default_fixtures
|
from keystone.tests import default_fixtures
|
||||||
from keystone.tests.ksfixtures import database
|
from keystone.tests.ksfixtures import database
|
||||||
|
@ -18,10 +18,10 @@ import uuid
|
|||||||
import webob
|
import webob
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
|
from oslo.utils import timeutils
|
||||||
|
|
||||||
from keystone import config
|
from keystone import config
|
||||||
from keystone.openstack.common import jsonutils
|
from keystone.openstack.common import jsonutils
|
||||||
from keystone.openstack.common import timeutils
|
|
||||||
from keystone import tests
|
from keystone import tests
|
||||||
from keystone.tests import default_fixtures
|
from keystone.tests import default_fixtures
|
||||||
from keystone.tests.ksfixtures import appserver
|
from keystone.tests.ksfixtures import appserver
|
||||||
|
@ -15,13 +15,13 @@ import datetime
|
|||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
|
from oslo.utils import timeutils
|
||||||
from testtools import matchers
|
from testtools import matchers
|
||||||
|
|
||||||
from keystone.common import dependency
|
from keystone.common import dependency
|
||||||
from keystone import config
|
from keystone import config
|
||||||
from keystone.contrib.revoke import model
|
from keystone.contrib.revoke import model
|
||||||
from keystone import exception
|
from keystone import exception
|
||||||
from keystone.openstack.common import timeutils
|
|
||||||
from keystone import tests
|
from keystone import tests
|
||||||
from keystone.tests import test_backend_sql
|
from keystone.tests import test_backend_sql
|
||||||
|
|
||||||
|
@ -14,9 +14,10 @@
|
|||||||
|
|
||||||
import datetime
|
import datetime
|
||||||
|
|
||||||
|
from oslo.utils import timeutils
|
||||||
|
|
||||||
from keystone import config
|
from keystone import config
|
||||||
from keystone import exception
|
from keystone import exception
|
||||||
from keystone.openstack.common import timeutils
|
|
||||||
from keystone import tests
|
from keystone import tests
|
||||||
from keystone.tests import default_fixtures
|
from keystone.tests import default_fixtures
|
||||||
from keystone import token
|
from keystone import token
|
||||||
|
@ -16,6 +16,7 @@ import datetime
|
|||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
from lxml import etree
|
from lxml import etree
|
||||||
|
from oslo.utils import timeutils
|
||||||
import six
|
import six
|
||||||
from testtools import matchers
|
from testtools import matchers
|
||||||
|
|
||||||
@ -26,7 +27,6 @@ from keystone.common import serializer
|
|||||||
from keystone import config
|
from keystone import config
|
||||||
from keystone import exception
|
from keystone import exception
|
||||||
from keystone import middleware
|
from keystone import middleware
|
||||||
from keystone.openstack.common import timeutils
|
|
||||||
from keystone.policy.backends import rules
|
from keystone.policy.backends import rules
|
||||||
from keystone import tests
|
from keystone import tests
|
||||||
from keystone.tests.ksfixtures import database
|
from keystone.tests.ksfixtures import database
|
||||||
|
@ -19,12 +19,12 @@ from testtools import testcase
|
|||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
from keystoneclient.common import cms
|
from keystoneclient.common import cms
|
||||||
|
from oslo.utils import timeutils
|
||||||
|
|
||||||
from keystone import auth
|
from keystone import auth
|
||||||
from keystone.common import dependency
|
from keystone.common import dependency
|
||||||
from keystone import config
|
from keystone import config
|
||||||
from keystone import exception
|
from keystone import exception
|
||||||
from keystone.openstack.common import timeutils
|
|
||||||
from keystone import tests
|
from keystone import tests
|
||||||
from keystone.tests import test_v3
|
from keystone.tests import test_v3
|
||||||
|
|
||||||
|
@ -13,11 +13,11 @@
|
|||||||
import datetime
|
import datetime
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
|
from oslo.utils import timeutils
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from keystone.common import dependency
|
from keystone.common import dependency
|
||||||
from keystone.contrib.revoke import model
|
from keystone.contrib.revoke import model
|
||||||
from keystone.openstack.common import timeutils
|
|
||||||
from keystone.tests import test_v3
|
from keystone.tests import test_v3
|
||||||
from keystone.token import provider
|
from keystone.token import provider
|
||||||
|
|
||||||
|
@ -13,10 +13,11 @@
|
|||||||
import copy
|
import copy
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
|
from oslo.utils import timeutils
|
||||||
|
|
||||||
from keystone.common import config
|
from keystone.common import config
|
||||||
from keystone import exception
|
from keystone import exception
|
||||||
from keystone.models import token_model
|
from keystone.models import token_model
|
||||||
from keystone.openstack.common import timeutils
|
|
||||||
from keystone.tests import core
|
from keystone.tests import core
|
||||||
from keystone.tests import test_token_provider
|
from keystone.tests import test_token_provider
|
||||||
|
|
||||||
|
@ -16,6 +16,7 @@ import datetime
|
|||||||
import sys
|
import sys
|
||||||
|
|
||||||
from keystoneclient.common import cms
|
from keystoneclient.common import cms
|
||||||
|
from oslo.utils import timeutils
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from keystone.common import controller
|
from keystone.common import controller
|
||||||
@ -26,7 +27,6 @@ from keystone import exception
|
|||||||
from keystone.i18n import _
|
from keystone.i18n import _
|
||||||
from keystone.openstack.common import jsonutils
|
from keystone.openstack.common import jsonutils
|
||||||
from keystone.openstack.common import log
|
from keystone.openstack.common import log
|
||||||
from keystone.openstack.common import timeutils
|
|
||||||
from keystone.token import provider
|
from keystone.token import provider
|
||||||
|
|
||||||
|
|
||||||
|
@ -16,6 +16,7 @@
|
|||||||
from __future__ import absolute_import
|
from __future__ import absolute_import
|
||||||
import copy
|
import copy
|
||||||
|
|
||||||
|
from oslo.utils import timeutils
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from keystone.common import kvs
|
from keystone.common import kvs
|
||||||
@ -23,7 +24,6 @@ from keystone import config
|
|||||||
from keystone import exception
|
from keystone import exception
|
||||||
from keystone.i18n import _
|
from keystone.i18n import _
|
||||||
from keystone.openstack.common import log
|
from keystone.openstack.common import log
|
||||||
from keystone.openstack.common import timeutils
|
|
||||||
from keystone import token
|
from keystone import token
|
||||||
from keystone.token import provider
|
from keystone.token import provider
|
||||||
|
|
||||||
|
@ -15,12 +15,13 @@
|
|||||||
import copy
|
import copy
|
||||||
import functools
|
import functools
|
||||||
|
|
||||||
|
from oslo.utils import timeutils
|
||||||
|
|
||||||
from keystone.common import sql
|
from keystone.common import sql
|
||||||
from keystone import config
|
from keystone import config
|
||||||
from keystone import exception
|
from keystone import exception
|
||||||
from keystone.i18n import _LI
|
from keystone.i18n import _LI
|
||||||
from keystone.openstack.common import log
|
from keystone.openstack.common import log
|
||||||
from keystone.openstack.common import timeutils
|
|
||||||
from keystone import token
|
from keystone import token
|
||||||
from keystone.token import provider
|
from keystone.token import provider
|
||||||
|
|
||||||
|
@ -17,6 +17,7 @@
|
|||||||
import abc
|
import abc
|
||||||
import copy
|
import copy
|
||||||
|
|
||||||
|
from oslo.utils import timeutils
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from keystone.common import cache
|
from keystone.common import cache
|
||||||
@ -25,7 +26,6 @@ from keystone.common import manager
|
|||||||
from keystone import config
|
from keystone import config
|
||||||
from keystone import exception
|
from keystone import exception
|
||||||
from keystone.openstack.common import log
|
from keystone.openstack.common import log
|
||||||
from keystone.openstack.common import timeutils
|
|
||||||
from keystone.openstack.common import versionutils
|
from keystone.openstack.common import versionutils
|
||||||
|
|
||||||
|
|
||||||
|
@ -19,6 +19,7 @@ import datetime
|
|||||||
import sys
|
import sys
|
||||||
|
|
||||||
from keystoneclient.common import cms
|
from keystoneclient.common import cms
|
||||||
|
from oslo.utils import timeutils
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from keystone.common import cache
|
from keystone.common import cache
|
||||||
@ -29,7 +30,6 @@ from keystone import exception
|
|||||||
from keystone.i18n import _
|
from keystone.i18n import _
|
||||||
from keystone.models import token_model
|
from keystone.models import token_model
|
||||||
from keystone.openstack.common import log
|
from keystone.openstack.common import log
|
||||||
from keystone.openstack.common import timeutils
|
|
||||||
from keystone.openstack.common import versionutils
|
from keystone.openstack.common import versionutils
|
||||||
from keystone.token import persistence
|
from keystone.token import persistence
|
||||||
|
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
|
from oslo.utils import timeutils
|
||||||
import six
|
import six
|
||||||
from six.moves.urllib import parse
|
from six.moves.urllib import parse
|
||||||
|
|
||||||
@ -26,7 +27,6 @@ from keystone.token import provider
|
|||||||
|
|
||||||
|
|
||||||
from keystone.openstack.common import log
|
from keystone.openstack.common import log
|
||||||
from keystone.openstack.common import timeutils
|
|
||||||
|
|
||||||
|
|
||||||
LOG = log.getLogger(__name__)
|
LOG = log.getLogger(__name__)
|
||||||
|
@ -17,9 +17,10 @@ only to be used for testing purposes
|
|||||||
"""
|
"""
|
||||||
import copy
|
import copy
|
||||||
|
|
||||||
|
from oslo.utils import timeutils
|
||||||
|
|
||||||
from keystone.common import kvs
|
from keystone.common import kvs
|
||||||
from keystone import exception
|
from keystone import exception
|
||||||
from keystone.openstack.common import timeutils
|
|
||||||
from keystone import trust as keystone_trust
|
from keystone import trust as keystone_trust
|
||||||
|
|
||||||
|
|
||||||
|
@ -14,10 +14,11 @@
|
|||||||
|
|
||||||
import time
|
import time
|
||||||
|
|
||||||
|
from oslo.utils import timeutils
|
||||||
|
|
||||||
from keystone.common import sql
|
from keystone.common import sql
|
||||||
from keystone import exception
|
from keystone import exception
|
||||||
from keystone.openstack.common import log
|
from keystone.openstack.common import log
|
||||||
from keystone.openstack.common import timeutils
|
|
||||||
from keystone import trust
|
from keystone import trust
|
||||||
|
|
||||||
|
|
||||||
|
@ -14,6 +14,7 @@
|
|||||||
|
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
|
from oslo.utils import timeutils
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from keystone import assignment
|
from keystone import assignment
|
||||||
@ -23,7 +24,6 @@ from keystone import config
|
|||||||
from keystone import exception
|
from keystone import exception
|
||||||
from keystone.i18n import _
|
from keystone.i18n import _
|
||||||
from keystone.openstack.common import log
|
from keystone.openstack.common import log
|
||||||
from keystone.openstack.common import timeutils
|
|
||||||
|
|
||||||
|
|
||||||
LOG = log.getLogger(__name__)
|
LOG = log.getLogger(__name__)
|
||||||
|
Loading…
Reference in New Issue
Block a user