From 763013c5264e87dc8075d50117e5e394fccef1a7 Mon Sep 17 00:00:00 2001 From: Joe Heck Date: Mon, 9 Jan 2012 10:28:55 -0800 Subject: [PATCH] renaming keystonelight to keystone --- .gitignore | 1 + bin/keystone | 6 ++-- bin/{ksl => ks} | 2 +- {keystonelight => keystone}/__init__.py | 0 .../backends/__init__.py | 0 {keystonelight => keystone}/backends/kvs.py | 0 {keystonelight => keystone}/backends/pam.py | 0 .../backends/policy.py | 0 keystone/backends/sql/__init__.py | 1 + .../backends/sql/core.py | 4 +-- .../backends/sql/migrate_repo/README | 0 .../backends/sql/migrate_repo/__init__.py | 0 .../backends/sql/migrate_repo/manage.py | 0 .../backends/sql/migrate_repo/migrate.cfg | 0 .../versions/001_add_initial_tables.py | 2 +- .../sql/migrate_repo/versions/__init__.py | 0 .../backends/sql/migration.py | 2 +- .../backends/sql/util.py | 4 +-- .../backends/templated.py | 6 ++-- {keystonelight => keystone}/catalog.py | 4 +-- {keystonelight => keystone}/cfg.py | 0 {keystonelight => keystone}/client.py | 4 +-- {keystonelight => keystone}/config.py | 2 +- {keystonelight => keystone}/identity.py | 4 +-- .../keystone_compat.py | 12 +++---- {keystonelight => keystone}/logging.py | 0 {keystonelight => keystone}/middleware.py | 4 +-- {keystonelight => keystone}/models.py | 0 {keystonelight => keystone}/policy.py | 6 ++-- {keystonelight => keystone}/service.py | 7 ++-- {keystonelight => keystone}/test.py | 18 +++++------ {keystonelight => keystone}/token.py | 6 ++-- {keystonelight => keystone}/utils.py | 2 +- {keystonelight => keystone}/wsgi.py | 0 keystonelight/backends/sql/__init__.py | 1 - run_tests.sh | 2 +- setup.py | 4 +-- tests/backend_sql.conf | 2 +- tests/default.conf | 32 +++++++++---------- tests/keystone_compat_diablo.conf | 30 ++++++++--------- tests/test_backend_kvs.py | 6 ++-- tests/test_backend_sql.py | 10 +++--- tests/test_identity_api.py | 8 ++--- tests/test_keystoneclient.py | 4 +-- tests/test_keystoneclient_sql.py | 8 ++--- tests/test_legacy_compat.py | 10 +++--- tests/test_novaclient_compat.py | 10 +++--- 47 files changed, 110 insertions(+), 114 deletions(-) rename bin/{ksl => ks} (98%) rename {keystonelight => keystone}/__init__.py (100%) rename {keystonelight => keystone}/backends/__init__.py (100%) rename {keystonelight => keystone}/backends/kvs.py (100%) rename {keystonelight => keystone}/backends/pam.py (100%) rename {keystonelight => keystone}/backends/policy.py (100%) create mode 100644 keystone/backends/sql/__init__.py rename {keystonelight => keystone}/backends/sql/core.py (99%) rename {keystonelight => keystone}/backends/sql/migrate_repo/README (100%) rename {keystonelight => keystone}/backends/sql/migrate_repo/__init__.py (100%) rename {keystonelight => keystone}/backends/sql/migrate_repo/manage.py (100%) rename {keystonelight => keystone}/backends/sql/migrate_repo/migrate.cfg (100%) rename {keystonelight => keystone}/backends/sql/migrate_repo/versions/001_add_initial_tables.py (89%) rename {keystonelight => keystone}/backends/sql/migrate_repo/versions/__init__.py (100%) rename {keystonelight => keystone}/backends/sql/migration.py (98%) rename {keystonelight => keystone}/backends/sql/util.py (68%) rename {keystonelight => keystone}/backends/templated.py (95%) rename {keystonelight => keystone}/catalog.py (92%) rename {keystonelight => keystone}/cfg.py (100%) rename {keystonelight => keystone}/client.py (97%) rename {keystonelight => keystone}/config.py (97%) rename {keystonelight => keystone}/identity.py (98%) rename {keystonelight => keystone}/keystone_compat.py (99%) rename {keystonelight => keystone}/logging.py (100%) rename {keystonelight => keystone}/middleware.py (97%) rename {keystonelight => keystone}/models.py (100%) rename {keystonelight => keystone}/policy.py (83%) rename {keystonelight => keystone}/service.py (98%) rename {keystonelight => keystone}/test.py (95%) rename {keystonelight => keystone}/token.py (86%) rename {keystonelight => keystone}/utils.py (98%) rename {keystonelight => keystone}/wsgi.py (100%) delete mode 100644 keystonelight/backends/sql/__init__.py diff --git a/.gitignore b/.gitignore index bf562ab7f1..c20afefb53 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ run_tests.log covhtml pep8.txt nosetests.xml +bla.db diff --git a/bin/keystone b/bin/keystone index 7775b20337..58e7b3a941 100755 --- a/bin/keystone +++ b/bin/keystone @@ -12,13 +12,13 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]), os.pardir, os.pardir)) if os.path.exists(os.path.join(possible_topdir, - 'keystonelight', + 'keystone', '__init__.py')): sys.path.insert(0, possible_topdir) from paste import deploy -from keystonelight import wsgi +from keystone import wsgi def create_server(name, port): @@ -49,6 +49,6 @@ if __name__ == '__main__': servers = [] servers.append(create_server('keystone_admin', int(options['admin_port']))) - servers.append(create_server('keystonelight', + servers.append(create_server('keystone', int(options['public_port']))) serve(*servers) diff --git a/bin/ksl b/bin/ks similarity index 98% rename from bin/ksl rename to bin/ks index 0a9d7736f7..98a6ded243 100755 --- a/bin/ksl +++ b/bin/ks @@ -5,7 +5,7 @@ import sys import cli.app import cli.log -from keystonelight import client +from keystone import client DEFAULT_PARAMS = ( diff --git a/keystonelight/__init__.py b/keystone/__init__.py similarity index 100% rename from keystonelight/__init__.py rename to keystone/__init__.py diff --git a/keystonelight/backends/__init__.py b/keystone/backends/__init__.py similarity index 100% rename from keystonelight/backends/__init__.py rename to keystone/backends/__init__.py diff --git a/keystonelight/backends/kvs.py b/keystone/backends/kvs.py similarity index 100% rename from keystonelight/backends/kvs.py rename to keystone/backends/kvs.py diff --git a/keystonelight/backends/pam.py b/keystone/backends/pam.py similarity index 100% rename from keystonelight/backends/pam.py rename to keystone/backends/pam.py diff --git a/keystonelight/backends/policy.py b/keystone/backends/policy.py similarity index 100% rename from keystonelight/backends/policy.py rename to keystone/backends/policy.py diff --git a/keystone/backends/sql/__init__.py b/keystone/backends/sql/__init__.py new file mode 100644 index 0000000000..c52d6cbce2 --- /dev/null +++ b/keystone/backends/sql/__init__.py @@ -0,0 +1 @@ +from keystone.backends.sql.core import * diff --git a/keystonelight/backends/sql/core.py b/keystone/backends/sql/core.py similarity index 99% rename from keystonelight/backends/sql/core.py rename to keystone/backends/sql/core.py index 62528976bd..7f56bdc287 100644 --- a/keystonelight/backends/sql/core.py +++ b/keystone/backends/sql/core.py @@ -10,8 +10,8 @@ import sqlalchemy.orm import sqlalchemy.pool import sqlalchemy.engine.url -from keystonelight import config -from keystonelight import models +from keystone import config +from keystone import models CONF = config.CONF diff --git a/keystonelight/backends/sql/migrate_repo/README b/keystone/backends/sql/migrate_repo/README similarity index 100% rename from keystonelight/backends/sql/migrate_repo/README rename to keystone/backends/sql/migrate_repo/README diff --git a/keystonelight/backends/sql/migrate_repo/__init__.py b/keystone/backends/sql/migrate_repo/__init__.py similarity index 100% rename from keystonelight/backends/sql/migrate_repo/__init__.py rename to keystone/backends/sql/migrate_repo/__init__.py diff --git a/keystonelight/backends/sql/migrate_repo/manage.py b/keystone/backends/sql/migrate_repo/manage.py similarity index 100% rename from keystonelight/backends/sql/migrate_repo/manage.py rename to keystone/backends/sql/migrate_repo/manage.py diff --git a/keystonelight/backends/sql/migrate_repo/migrate.cfg b/keystone/backends/sql/migrate_repo/migrate.cfg similarity index 100% rename from keystonelight/backends/sql/migrate_repo/migrate.cfg rename to keystone/backends/sql/migrate_repo/migrate.cfg diff --git a/keystonelight/backends/sql/migrate_repo/versions/001_add_initial_tables.py b/keystone/backends/sql/migrate_repo/versions/001_add_initial_tables.py similarity index 89% rename from keystonelight/backends/sql/migrate_repo/versions/001_add_initial_tables.py rename to keystone/backends/sql/migrate_repo/versions/001_add_initial_tables.py index ecfd6f507d..92c9e6cd1e 100644 --- a/keystonelight/backends/sql/migrate_repo/versions/001_add_initial_tables.py +++ b/keystone/backends/sql/migrate_repo/versions/001_add_initial_tables.py @@ -1,7 +1,7 @@ from sqlalchemy import * from migrate import * -from keystonelight.backends import sql +from keystone.backends import sql def upgrade(migrate_engine): diff --git a/keystonelight/backends/sql/migrate_repo/versions/__init__.py b/keystone/backends/sql/migrate_repo/versions/__init__.py similarity index 100% rename from keystonelight/backends/sql/migrate_repo/versions/__init__.py rename to keystone/backends/sql/migrate_repo/versions/__init__.py diff --git a/keystonelight/backends/sql/migration.py b/keystone/backends/sql/migration.py similarity index 98% rename from keystonelight/backends/sql/migration.py rename to keystone/backends/sql/migration.py index 106bcea7ee..11d459a1ae 100644 --- a/keystonelight/backends/sql/migration.py +++ b/keystone/backends/sql/migration.py @@ -22,7 +22,7 @@ import sys import sqlalchemy from migrate.versioning import api as versioning_api -from keystonelight import config +from keystone import config CONF = config.CONF diff --git a/keystonelight/backends/sql/util.py b/keystone/backends/sql/util.py similarity index 68% rename from keystonelight/backends/sql/util.py rename to keystone/backends/sql/util.py index 64443ef7dc..498ee6c2a0 100644 --- a/keystonelight/backends/sql/util.py +++ b/keystone/backends/sql/util.py @@ -1,7 +1,7 @@ import os -from keystonelight import config -from keystonelight.backends.sql import migration +from keystone import config +from keystone.backends.sql import migration CONF = config.CONF diff --git a/keystonelight/backends/templated.py b/keystone/backends/templated.py similarity index 95% rename from keystonelight/backends/templated.py rename to keystone/backends/templated.py index 155839b2be..8f00fc41bd 100644 --- a/keystonelight/backends/templated.py +++ b/keystone/backends/templated.py @@ -1,6 +1,6 @@ -from keystonelight import config -from keystonelight import logging -from keystonelight.backends import kvs +from keystone import config +from keystone import logging +from keystone.backends import kvs CONF = config.CONF diff --git a/keystonelight/catalog.py b/keystone/catalog.py similarity index 92% rename from keystonelight/catalog.py rename to keystone/catalog.py index b4d472732e..96cfd4586e 100644 --- a/keystonelight/catalog.py +++ b/keystone/catalog.py @@ -2,8 +2,8 @@ # the catalog interfaces -from keystonelight import config -from keystonelight import utils +from keystone import config +from keystone import utils CONF = config.CONF diff --git a/keystonelight/cfg.py b/keystone/cfg.py similarity index 100% rename from keystonelight/cfg.py rename to keystone/cfg.py diff --git a/keystonelight/client.py b/keystone/client.py similarity index 97% rename from keystonelight/client.py rename to keystone/client.py index f5a78c5bbd..899e8d168b 100644 --- a/keystonelight/client.py +++ b/keystone/client.py @@ -6,8 +6,8 @@ import json import httplib2 import webob -from keystonelight import service -from keystonelight import wsgi +from keystone import service +from keystone import wsgi URLMAP = service.URLMAP diff --git a/keystonelight/config.py b/keystone/config.py similarity index 97% rename from keystonelight/config.py rename to keystone/config.py index 03d6a24b81..7ce9f3ca49 100644 --- a/keystonelight/config.py +++ b/keystone/config.py @@ -1,6 +1,6 @@ -from keystonelight import cfg +from keystone import cfg class Config(cfg.ConfigOpts): diff --git a/keystonelight/identity.py b/keystone/identity.py similarity index 98% rename from keystonelight/identity.py rename to keystone/identity.py index 93e8d309a5..6e606949df 100644 --- a/keystonelight/identity.py +++ b/keystone/identity.py @@ -2,8 +2,8 @@ # backends will make use of them to return something that conforms to their # apis -from keystonelight import config -from keystonelight import utils +from keystone import config +from keystone import utils CONF = config.CONF diff --git a/keystonelight/keystone_compat.py b/keystone/keystone_compat.py similarity index 99% rename from keystonelight/keystone_compat.py rename to keystone/keystone_compat.py index c909881d64..f87c8d46ac 100644 --- a/keystonelight/keystone_compat.py +++ b/keystone/keystone_compat.py @@ -9,12 +9,12 @@ import uuid import routes from webob import exc -from keystonelight import catalog -from keystonelight import identity -from keystonelight import policy -from keystonelight import service -from keystonelight import token -from keystonelight import wsgi +from keystone import catalog +from keystone import identity +from keystone import policy +from keystone import service +from keystone import token +from keystone import wsgi class KeystoneAdminRouter(wsgi.Router): diff --git a/keystonelight/logging.py b/keystone/logging.py similarity index 100% rename from keystonelight/logging.py rename to keystone/logging.py diff --git a/keystonelight/middleware.py b/keystone/middleware.py similarity index 97% rename from keystonelight/middleware.py rename to keystone/middleware.py index 9ab528549d..5bac8fb27b 100644 --- a/keystonelight/middleware.py +++ b/keystone/middleware.py @@ -1,7 +1,7 @@ import json -from keystonelight import config -from keystonelight import wsgi +from keystone import config +from keystone import wsgi CONF = config.CONF diff --git a/keystonelight/models.py b/keystone/models.py similarity index 100% rename from keystonelight/models.py rename to keystone/models.py diff --git a/keystonelight/policy.py b/keystone/policy.py similarity index 83% rename from keystonelight/policy.py rename to keystone/policy.py index 0143878d31..f5c3c6d4c5 100644 --- a/keystonelight/policy.py +++ b/keystone/policy.py @@ -2,10 +2,8 @@ # the catalog interfaces -import uuid - -from keystonelight import config -from keystonelight import utils +from keystone import config +from keystone import utils CONF = config.CONF diff --git a/keystonelight/service.py b/keystone/service.py similarity index 98% rename from keystonelight/service.py rename to keystone/service.py index 0f7dddfefc..fa77830496 100644 --- a/keystonelight/service.py +++ b/keystone/service.py @@ -6,10 +6,9 @@ import routes import webob.dec import webob.exc -from keystonelight import identity -from keystonelight import token -from keystonelight import utils -from keystonelight import wsgi +from keystone import identity +from keystone import token +from keystone import wsgi HIGH_LEVEL_CALLS = { diff --git a/keystonelight/test.py b/keystone/test.py similarity index 95% rename from keystonelight/test.py rename to keystone/test.py index 1196b78f57..bfd6a0ef4f 100644 --- a/keystonelight/test.py +++ b/keystone/test.py @@ -1,5 +1,3 @@ -import ConfigParser -import logging import os import unittest import subprocess @@ -8,14 +6,14 @@ import time from paste import deploy -from keystonelight import catalog -from keystonelight import config -from keystonelight import identity -from keystonelight import logging -from keystonelight import models -from keystonelight import token -from keystonelight import utils -from keystonelight import wsgi +from keystone import catalog +from keystone import config +from keystone import identity +from keystone import logging +from keystone import models +from keystone import token +from keystone import utils +from keystone import wsgi ROOTDIR = os.path.dirname(os.path.dirname(__file__)) diff --git a/keystonelight/token.py b/keystone/token.py similarity index 86% rename from keystonelight/token.py rename to keystone/token.py index 9e334f185e..194767bc8a 100644 --- a/keystonelight/token.py +++ b/keystone/token.py @@ -4,9 +4,9 @@ import uuid -from keystonelight import config -from keystonelight import logging -from keystonelight import utils +from keystone import config +from keystone import logging +from keystone import utils CONF = config.CONF diff --git a/keystonelight/utils.py b/keystone/utils.py similarity index 98% rename from keystonelight/utils.py rename to keystone/utils.py index ea4404f3c4..139c563122 100644 --- a/keystonelight/utils.py +++ b/keystone/utils.py @@ -20,7 +20,7 @@ import subprocess import sys -from keystonelight import logging +from keystone import logging def import_class(import_str): diff --git a/keystonelight/wsgi.py b/keystone/wsgi.py similarity index 100% rename from keystonelight/wsgi.py rename to keystone/wsgi.py diff --git a/keystonelight/backends/sql/__init__.py b/keystonelight/backends/sql/__init__.py deleted file mode 100644 index 38ecafd5d9..0000000000 --- a/keystonelight/backends/sql/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from keystonelight.backends.sql.core import * diff --git a/run_tests.sh b/run_tests.sh index d561a7b925..be245a9afe 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -86,7 +86,7 @@ function run_pep8 { ignore_dirs="*ajaxterm*" GLOBIGNORE="$ignore_scripts:$ignore_files:$ignore_dirs" srcfiles=`find bin -type f ! -name .*.swp` - srcfiles+=" keystonelight" + srcfiles+=" keystone" # Just run PEP8 in current environment ${wrapper} pep8 --repeat --show-pep8 --show-source \ --ignore=E202,E111 \ diff --git a/setup.py b/setup.py index 21099e48e1..bf7a7833a6 100755 --- a/setup.py +++ b/setup.py @@ -1,13 +1,13 @@ from setuptools import setup, find_packages -setup(name='keystonelight', +setup(name='keystone', version='1.0', description="Authentication service for OpenStack", author='OpenStack, LLC.', author_email='openstack@lists.launchpad.net', url='http://www.openstack.org', packages=find_packages(exclude=['test', 'bin']), - scripts=['bin/keystone', 'bin/ksl'], + scripts=['bin/keystone', 'bin/ks'], zip_safe=False, install_requires=['setuptools'], ) diff --git a/tests/backend_sql.conf b/tests/backend_sql.conf index 41dccf30e9..ca527e9af2 100644 --- a/tests/backend_sql.conf +++ b/tests/backend_sql.conf @@ -6,4 +6,4 @@ max_pool_size = 10 pool_timeout = 200 [identity] -driver = keystonelight.backends.sql.SqlIdentity +driver = keystone.backends.sql.SqlIdentity diff --git a/tests/default.conf b/tests/default.conf index 27e3820e2b..3062f4b317 100644 --- a/tests/default.conf +++ b/tests/default.conf @@ -12,45 +12,45 @@ max_pool_size = 10 pool_timeout = 200 [identity] -driver = keystonelight.backends.kvs.KvsIdentity +driver = keystone.backends.kvs.KvsIdentity [catalog] -driver = keystonelight.backends.templated.TemplatedCatalog +driver = keystone.backends.templated.TemplatedCatalog template_file = default_catalog.templates [token] -driver = keystonelight.backends.kvs.KvsToken +driver = keystone.backends.kvs.KvsToken [policy] -driver = keystonelight.backends.policy.SimpleMatch +driver = keystone.backends.policy.SimpleMatch [filter:debug] -paste.filter_factory = keystonelight.wsgi:Debug.factory +paste.filter_factory = keystone.wsgi:Debug.factory [filter:token_auth] -paste.filter_factory = keystonelight.middleware:TokenAuthMiddleware.factory +paste.filter_factory = keystone.middleware:TokenAuthMiddleware.factory [filter:admin_token_auth] -paste.filter_factory = keystonelight.middleware:AdminTokenAuthMiddleware.factory +paste.filter_factory = keystone.middleware:AdminTokenAuthMiddleware.factory [filter:json_body] -paste.filter_factory = keystonelight.middleware:JsonBodyMiddleware.factory +paste.filter_factory = keystone.middleware:JsonBodyMiddleware.factory [filter:crud_extension] -paste.filter_factory = keystonelight.keystone_compat:KeystoneAdminCrudExtension.factory +paste.filter_factory = keystone.keystone_compat:KeystoneAdminCrudExtension.factory -[app:keystonelight] -paste.app_factory = keystonelight.service:app_factory +[app:keystone] +paste.app_factory = keystone.service:app_factory [app:keystone_service] -paste.app_factory = keystonelight.keystone_compat:service_app_factory +paste.app_factory = keystone.keystone_compat:service_app_factory [app:keystone_admin] -paste.app_factory = keystonelight.keystone_compat:admin_app_factory +paste.app_factory = keystone.keystone_compat:admin_app_factory -[pipeline:keystonelight_api] -pipeline = token_auth admin_token_auth json_body debug keystonelight +[pipeline:keystone_api] +pipeline = token_auth admin_token_auth json_body debug keystone [pipeline:keystone_service_api] pipeline = token_auth admin_token_auth json_body debug keystone_service @@ -60,7 +60,7 @@ pipeline = token_auth admin_token_auth json_body debug crud_extension keystone_a [composite:main] use = egg:Paste#urlmap -/ = keystonelight_api +/ = keystone_api /v2.0 = keystone_service_api [composite:admin] diff --git a/tests/keystone_compat_diablo.conf b/tests/keystone_compat_diablo.conf index b629a71098..842bb810dc 100644 --- a/tests/keystone_compat_diablo.conf +++ b/tests/keystone_compat_diablo.conf @@ -4,41 +4,41 @@ admin_port = 35357 admin_token = ADMIN [identity] -driver = keystonelight.backends.kvs.KvsIdentity +driver = keystone.backends.kvs.KvsIdentity [catalog] -driver = keystonelight.backends.kvs.KvsCatalog +driver = keystone.backends.kvs.KvsCatalog [token] -driver = keystonelight.backends.kvs.KvsToken +driver = keystone.backends.kvs.KvsToken [policy] -driver = keystonelight.backends.policy.SimpleMatch +driver = keystone.backends.policy.SimpleMatch [filter:debug] -paste.filter_factory = keystonelight.wsgi:Debug.factory +paste.filter_factory = keystone.wsgi:Debug.factory [filter:token_auth] -paste.filter_factory = keystonelight.middleware:TokenAuthMiddleware.factory +paste.filter_factory = keystone.middleware:TokenAuthMiddleware.factory [filter:admin_token_auth] -paste.filter_factory = keystonelight.middleware:AdminTokenAuthMiddleware.factory +paste.filter_factory = keystone.middleware:AdminTokenAuthMiddleware.factory [filter:json_body] -paste.filter_factory = keystonelight.middleware:JsonBodyMiddleware.factory +paste.filter_factory = keystone.middleware:JsonBodyMiddleware.factory -[app:keystonelight] -paste.app_factory = keystonelight.service:app_factory +[app:keystone] +paste.app_factory = keystone.service:app_factory [app:keystone_service] -paste.app_factory = keystonelight.keystone_compat:service_app_factory +paste.app_factory = keystone.keystone_compat:service_app_factory [app:keystone_admin] -paste.app_factory = keystonelight.keystone_compat:admin_app_factory +paste.app_factory = keystone.keystone_compat:admin_app_factory -[pipeline:keystonelight_api] -pipeline = token_auth admin_token_auth json_body debug keystonelight +[pipeline:keystone_api] +pipeline = token_auth admin_token_auth json_body debug keystone [pipeline:keystone_service_api] pipeline = token_auth admin_token_auth json_body debug keystone_service @@ -48,5 +48,5 @@ pipeline = token_auth admin_token_auth json_body debug keystone_admin [composite:main] use = egg:Paste#urlmap -/ = keystonelight_api +/ = keystone_api /v2.0 = keystone_service_api diff --git a/tests/test_backend_kvs.py b/tests/test_backend_kvs.py index 05987101a8..a5a67ff2d3 100644 --- a/tests/test_backend_kvs.py +++ b/tests/test_backend_kvs.py @@ -1,8 +1,8 @@ import uuid -from keystonelight import models -from keystonelight import test -from keystonelight.backends import kvs +from keystone import models +from keystone import test +from keystone.backends import kvs import test_backend import default_fixtures diff --git a/tests/test_backend_sql.py b/tests/test_backend_sql.py index d80e5bfd12..3dac570484 100644 --- a/tests/test_backend_sql.py +++ b/tests/test_backend_sql.py @@ -1,11 +1,11 @@ import os import uuid -from keystonelight import config -from keystonelight import models -from keystonelight import test -from keystonelight.backends import sql -from keystonelight.backends.sql import util as sql_util +from keystone import config +from keystone import models +from keystone import test +from keystone.backends import sql +from keystone.backends.sql import util as sql_util import test_backend import default_fixtures diff --git a/tests/test_identity_api.py b/tests/test_identity_api.py index b48c5078d3..ef13ab1440 100644 --- a/tests/test_identity_api.py +++ b/tests/test_identity_api.py @@ -1,9 +1,9 @@ import json -from keystonelight import client -from keystonelight import config -from keystonelight import models -from keystonelight import test +from keystone import client +from keystone import config +from keystone import models +from keystone import test import default_fixtures diff --git a/tests/test_keystoneclient.py b/tests/test_keystoneclient.py index 0efd3ca889..3da7a77f40 100644 --- a/tests/test_keystoneclient.py +++ b/tests/test_keystoneclient.py @@ -1,6 +1,6 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 -from keystonelight import config -from keystonelight import test +from keystone import config +from keystone import test import default_fixtures diff --git a/tests/test_keystoneclient_sql.py b/tests/test_keystoneclient_sql.py index eafbd1f76a..b19aff8fb4 100644 --- a/tests/test_keystoneclient_sql.py +++ b/tests/test_keystoneclient_sql.py @@ -1,8 +1,8 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 -from keystonelight import config -from keystonelight import test -from keystonelight.backends.sql import util as sql_util -from keystonelight.backends.sql import migration +from keystone import config +from keystone import test +from keystone.backends.sql import util as sql_util +from keystone.backends.sql import migration import test_keystoneclient diff --git a/tests/test_legacy_compat.py b/tests/test_legacy_compat.py index 9fea88bf22..1525acaabd 100644 --- a/tests/test_legacy_compat.py +++ b/tests/test_legacy_compat.py @@ -5,11 +5,11 @@ import sys from nose import exc -from keystonelight import config -from keystonelight import logging -from keystonelight import models -from keystonelight import test -from keystonelight import utils +from keystone import config +from keystone import logging +from keystone import models +from keystone import test +from keystone import utils CONF = config.CONF diff --git a/tests/test_novaclient_compat.py b/tests/test_novaclient_compat.py index 387934d529..d762c5f1e2 100644 --- a/tests/test_novaclient_compat.py +++ b/tests/test_novaclient_compat.py @@ -3,11 +3,11 @@ import json import os import sys -from keystonelight import config -from keystonelight import logging -from keystonelight import models -from keystonelight import test -from keystonelight import utils +from keystone import config +from keystone import logging +from keystone import models +from keystone import test +from keystone import utils import default_fixtures