renaming keystonelight to keystone

.gitignore

@@ -7,3 +7,4 @@ run_tests.log
 covhtml
 pep8.txt
 nosetests.xml
+bla.db

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)

bin/ks

@@ -5,7 +5,7 @@ import sys
 import cli.app
 import cli.log
 
-from keystonelight import client
+from keystone import client
 
 
 DEFAULT_PARAMS = (

keystone/backends/sql/__init__.py

@@ -0,0 +1 @@
+from keystone.backends.sql.core import *

keystone/backends/sql/core.py

@@ -10,8 +10,8 @@ import sqlalchemy.orm
 import sqlalchemy.pool
 import sqlalchemy.engine.url
 
-from keystonelight import config
+from keystone import config
-from keystonelight import models
+from keystone import models
 
 
 CONF = config.CONF

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):

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

keystone/backends/sql/util.py

@@ -1,7 +1,7 @@
 import os
 
-from keystonelight import config
+from keystone import config
-from keystonelight.backends.sql import migration
+from keystone.backends.sql import migration
 
 
 CONF = config.CONF

keystone/backends/templated.py

@@ -1,6 +1,6 @@
-from keystonelight import config
+from keystone import config
-from keystonelight import logging
+from keystone import logging
-from keystonelight.backends import kvs
+from keystone.backends import kvs
 
 
 CONF = config.CONF

keystone/catalog.py

@@ -2,8 +2,8 @@
 
 # the catalog interfaces
 
-from keystonelight import config
+from keystone import config
-from keystonelight import utils
+from keystone import utils
 
 
 CONF = config.CONF

keystone/client.py

@@ -6,8 +6,8 @@ import json
 import httplib2
 import webob
 
-from keystonelight import service
+from keystone import service
-from keystonelight import wsgi
+from keystone import wsgi
 
 
 URLMAP = service.URLMAP

keystone/config.py

@@ -1,6 +1,6 @@
 
 
-from keystonelight import cfg
+from keystone import cfg
 
 
 class Config(cfg.ConfigOpts):

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 keystone import config
-from keystonelight import utils
+from keystone import utils
 
 
 CONF = config.CONF

keystone/keystone_compat.py

@@ -9,12 +9,12 @@ import uuid
 import routes
 from webob import exc
 
-from keystonelight import catalog
+from keystone import catalog
-from keystonelight import identity
+from keystone import identity
-from keystonelight import policy
+from keystone import policy
-from keystonelight import service
+from keystone import service
-from keystonelight import token
+from keystone import token
-from keystonelight import wsgi
+from keystone import wsgi
 
 
 class KeystoneAdminRouter(wsgi.Router):

keystone/middleware.py

@@ -1,7 +1,7 @@
 import json
 
-from keystonelight import config
+from keystone import config
-from keystonelight import wsgi
+from keystone import wsgi
 
 
 CONF = config.CONF

keystone/policy.py

@@ -2,10 +2,8 @@
 
 # the catalog interfaces
 
-import uuid
+from keystone import config
-
+from keystone import utils
-from keystonelight import config
-from keystonelight import utils
 
 
 CONF = config.CONF

keystone/service.py

@@ -6,10 +6,9 @@ import routes
 import webob.dec
 import webob.exc
 
-from keystonelight import identity
+from keystone import identity
-from keystonelight import token
+from keystone import token
-from keystonelight import utils
+from keystone import wsgi
-from keystonelight import wsgi
 
 
 HIGH_LEVEL_CALLS = {

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 keystone import catalog
-from keystonelight import config
+from keystone import config
-from keystonelight import identity
+from keystone import identity
-from keystonelight import logging
+from keystone import logging
-from keystonelight import models
+from keystone import models
-from keystonelight import token
+from keystone import token
-from keystonelight import utils
+from keystone import utils
-from keystonelight import wsgi
+from keystone import wsgi
 
 
 ROOTDIR = os.path.dirname(os.path.dirname(__file__))

keystone/token.py

@@ -4,9 +4,9 @@
 
 import uuid
 
-from keystonelight import config
+from keystone import config
-from keystonelight import logging
+from keystone import logging
-from keystonelight import utils
+from keystone import utils
 
 
 CONF = config.CONF

keystone/utils.py

@@ -20,7 +20,7 @@
 import subprocess
 import sys
 
-from keystonelight import logging
+from keystone import logging
 
 
 def import_class(import_str):

keystonelight/backends/sql/__init__.py

@@ -1 +0,0 @@
-from keystonelight.backends.sql.core import *

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 \

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'],
       )

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

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]
+[app:keystone]
-paste.app_factory = keystonelight.service:app_factory
+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:keystone_api]
-pipeline = token_auth admin_token_auth json_body debug keystonelight
+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]

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]
+[app:keystone]
-paste.app_factory = keystonelight.service:app_factory
+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:keystone_api]
-pipeline = token_auth admin_token_auth json_body debug keystonelight
+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

tests/test_backend_kvs.py

@@ -1,8 +1,8 @@
 import uuid
 
-from keystonelight import models
+from keystone import models
-from keystonelight import test
+from keystone import test
-from keystonelight.backends import kvs
+from keystone.backends import kvs
 
 import test_backend
 import default_fixtures

tests/test_backend_sql.py

@@ -1,11 +1,11 @@
 import os
 import uuid
 
-from keystonelight import config
+from keystone import config
-from keystonelight import models
+from keystone import models
-from keystonelight import test
+from keystone import test
-from keystonelight.backends import sql
+from keystone.backends import sql
-from keystonelight.backends.sql import util as sql_util
+from keystone.backends.sql import util as sql_util
 
 import test_backend
 import default_fixtures

tests/test_identity_api.py

@@ -1,9 +1,9 @@
 import json
 
-from keystonelight import client
+from keystone import client
-from keystonelight import config
+from keystone import config
-from keystonelight import models
+from keystone import models
-from keystonelight import test
+from keystone import test
 
 import default_fixtures
 

tests/test_keystoneclient.py

@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-from keystonelight import config
+from keystone import config
-from keystonelight import test
+from keystone import test
 
 import default_fixtures
 

tests/test_keystoneclient_sql.py

@@ -1,8 +1,8 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-from keystonelight import config
+from keystone import config
-from keystonelight import test
+from keystone import test
-from keystonelight.backends.sql import util as sql_util
+from keystone.backends.sql import util as sql_util
-from keystonelight.backends.sql import migration
+from keystone.backends.sql import migration
 
 import test_keystoneclient
 

tests/test_legacy_compat.py

@@ -5,11 +5,11 @@ import sys
 
 from nose import exc
 
-from keystonelight import config
+from keystone import config
-from keystonelight import logging
+from keystone import logging
-from keystonelight import models
+from keystone import models
-from keystonelight import test
+from keystone import test
-from keystonelight import utils
+from keystone import utils
 
 
 CONF = config.CONF

tests/test_novaclient_compat.py

@@ -3,11 +3,11 @@ import json
 import os
 import sys
 
-from keystonelight import config
+from keystone import config
-from keystonelight import logging
+from keystone import logging
-from keystonelight import models
+from keystone import models
-from keystonelight import test
+from keystone import test
-from keystonelight import utils
+from keystone import utils
 
 import default_fixtures