Move glance.registry.db to glance.db

Related to bp refactor-db-layer

Change-Id: Ia7c5aea29eef8068a9b67ac5fd051b45a38a20de

MANIFEST.in

@@ -9,9 +9,9 @@ include ChangeLog
 include babel.cfg tox.ini
 include openstack-common.conf
 include glance/openstack/common/README
-include glance/registry/db/migrate_repo/README
-include glance/registry/db/migrate_repo/migrate.cfg
-include glance/registry/db/migrate_repo/versions/*.sql
+include glance/db/migrate_repo/README
+include glance/db/migrate_repo/migrate.cfg
+include glance/db/migrate_repo/versions/*.sql
 include glance/tests/unit/test_migrations.conf
 include glance/tests/functional/data/*
 include glance/tests/etc/*

bin/glance-manage

@@ -43,20 +43,20 @@ gettext.install('glance', unicode=1)
 from glance.common import config
 from glance.common import exception
 from glance.openstack.common import cfg
-import glance.registry.db
-import glance.registry.db.api
-import glance.registry.db.migration
+import glance.db
+import glance.db.api
+import glance.db.migration
 
 
 def do_db_version(conf, args):
     """Print database's current migration level"""
-    print glance.registry.db.migration.db_version(conf)
+    print glance.db.migration.db_version(conf)
 
 
 def do_upgrade(conf, args):
     """Upgrade the database's migration level"""
     version = args.pop(0) if args else None
-    glance.registry.db.migration.upgrade(conf, version)
+    glance.db.migration.upgrade(conf, version)
 
 
 def do_downgrade(conf, args):
@@ -66,13 +66,13 @@ def do_downgrade(conf, args):
             "downgrade requires a version argument")
 
     version = args.pop(0)
-    glance.registry.db.migration.downgrade(conf, version)
+    glance.db.migration.downgrade(conf, version)
 
 
 def do_version_control(conf, args):
     """Place a database under migration control"""
     version = args.pop(0) if args else None
-    glance.registry.db.migration.version_control(conf, version)
+    glance.db.migration.version_control(conf, version)
 
 
 def do_db_sync(conf, args):
@@ -83,10 +83,10 @@ def do_db_sync(conf, args):
     # override auto-create flag, as complete DB should always
     # be created on sync if not already existing
     conf.db_auto_create = True
-    glance.registry.db.api.configure_db(conf)
+    glance.db.api.configure_db(conf)
     version = args.pop(0) if args else None
     current_version = args.pop(0) if args else None
-    glance.registry.db.migration.db_sync(conf, version, current_version)
+    glance.db.migration.db_sync(conf, version, current_version)
 
 
 def dispatch_cmd(conf, args):
@@ -112,7 +112,7 @@ def main():
 
         conf = config.GlanceConfigOpts(default_config_files=default_cfg_files,
                                        usage="%prog [options] <cmd>")
-        glance.registry.db.add_options(conf)
+        glance.db.add_options(conf)
         args = conf()
         config.setup_logging(conf)
     except RuntimeError, e:

glance/api/v2/image_access.py

@@ -21,13 +21,13 @@ from glance.api.v2 import base
 from glance.common import exception
 from glance.common import utils
 from glance.common import wsgi
-import glance.registry.db.api
+import glance.db.api
 
 
 class Controller(base.Controller):
     def __init__(self, conf, db=None):
         super(Controller, self).__init__(conf)
-        self.db_api = db or glance.registry.db.api
+        self.db_api = db or glance.db.api
         self.db_api.configure_db(conf)
 
     def index(self, req, image_id):

glance/api/v2/image_data.py

@@ -19,14 +19,14 @@ from glance.api.v2 import base
 from glance.common import exception
 from glance.common import utils
 from glance.common import wsgi
-import glance.registry.db.api
+import glance.db.api
 import glance.store
 
 
 class ImageDataController(base.Controller):
     def __init__(self, conf, db_api=None, store_api=None):
         super(ImageDataController, self).__init__(conf)
-        self.db_api = db_api or glance.registry.db.api
+        self.db_api = db_api or glance.db.api
         self.db_api.configure_db(conf)
         self.store_api = store_api or glance.store
         self.store_api.create_stores(conf)

glance/api/v2/image_tags.py

@@ -21,13 +21,13 @@ from glance.api.v2 import base
 from glance.common import exception
 from glance.common import utils
 from glance.common import wsgi
-import glance.registry.db.api
+import glance.db.api
 
 
 class Controller(base.Controller):
     def __init__(self, conf, db=None):
         super(Controller, self).__init__(conf)
-        self.db_api = db or glance.registry.db.api
+        self.db_api = db or glance.db.api
         self.db_api.configure_db(conf)
 
     def index(self, req, image_id):

glance/api/v2/images.py

@@ -22,13 +22,13 @@ from glance.api.v2 import base
 from glance.common import exception
 from glance.common import utils
 from glance.common import wsgi
-import glance.registry.db.api
+import glance.db.api
 
 
 class ImagesController(base.Controller):
     def __init__(self, conf, db_api=None):
         super(ImagesController, self).__init__(conf)
-        self.db_api = db_api or glance.registry.db.api
+        self.db_api = db_api or glance.db.api
         self.db_api.configure_db(conf)
 
     def _normalize_properties(self, image):

glance/common/context.py

@@ -20,7 +20,7 @@ import webob.exc
 from glance.common import exception
 from glance.common import wsgi
 from glance.openstack.common import cfg
-from glance.registry.db import api as db_api
+from glance.db import api as db_api
 
 
 class RequestContext(object):

glance/db/api.py

@@ -37,8 +37,8 @@ from sqlalchemy.sql import or_, and_
 from glance.common import exception
 from glance.common import utils
 from glance.openstack.common import cfg
-from glance.registry.db import migration
-from glance.registry.db import models
+from glance.db import migration
+from glance.db import models
 
 _ENGINE = None
 _MAKER = None

glance/db/migrate_repo/schema.py

@@ -24,7 +24,7 @@ import logging
 import sqlalchemy.types
 
 
-logger = logging.getLogger('glance.registry.db.migrate_repo.schema')
+logger = logging.getLogger('glance.db.migrate_repo.schema')
 
 
 String = lambda length: sqlalchemy.types.String(
@@ -85,7 +85,7 @@ def from_migration_import(module_name, fromlist):
 
         # Refer to images table
     """
-    module_path = 'glance.registry.db.migrate_repo.versions.%s' % module_name
+    module_path = 'glance.db.migrate_repo.versions.%s' % module_name
     module = __import__(module_path, globals(), locals(), fromlist, -1)
     return [getattr(module, item) for item in fromlist]
 

glance/db/migrate_repo/versions/001_add_images_table.py

@@ -17,7 +17,7 @@
 
 from sqlalchemy.schema import (Column, MetaData, Table)
 
-from glance.registry.db.migrate_repo.schema import (
+from glance.db.migrate_repo.schema import (
     Boolean, DateTime, Integer, String, Text, create_tables, drop_tables)
 
 

glance/db/migrate_repo/versions/002_add_image_properties_table.py

@@ -18,7 +18,7 @@
 from sqlalchemy.schema import (
     Column, ForeignKey, Index, MetaData, Table, UniqueConstraint)
 
-from glance.registry.db.migrate_repo.schema import (
+from glance.db.migrate_repo.schema import (
     Boolean, DateTime, Integer, String, Text, create_tables, drop_tables,
     from_migration_import)
 

glance/db/migrate_repo/versions/003_add_disk_format.py

@@ -19,7 +19,7 @@ from migrate.changeset import *
 from sqlalchemy import *
 from sqlalchemy.sql import and_, not_
 
-from glance.registry.db.migrate_repo.schema import (
+from glance.db.migrate_repo.schema import (
     Boolean, DateTime, Integer, String, Text, from_migration_import)
 
 

glance/db/migrate_repo/versions/004_add_checksum.py

@@ -19,7 +19,7 @@ from migrate.changeset import *
 from sqlalchemy import *
 from sqlalchemy.sql import and_, not_
 
-from glance.registry.db.migrate_repo.schema import (
+from glance.db.migrate_repo.schema import (
     Boolean, DateTime, Integer, String, Text, from_migration_import)
 
 

glance/db/migrate_repo/versions/005_size_big_integer.py

@@ -18,7 +18,7 @@
 from migrate.changeset import *
 from sqlalchemy import *
 
-from glance.registry.db.migrate_repo.schema import (
+from glance.db.migrate_repo.schema import (
     Boolean, DateTime, BigInteger, Integer, String,
     Text, from_migration_import)
 

glance/db/migrate_repo/versions/006_key_to_name.py

@@ -19,7 +19,7 @@ from migrate.changeset import *
 from sqlalchemy import *
 from sqlalchemy.sql import and_, not_
 
-from glance.registry.db.migrate_repo.schema import (
+from glance.db.migrate_repo.schema import (
     Boolean, DateTime, Integer, String, Text, from_migration_import)
 
 

glance/db/migrate_repo/versions/007_add_owner.py

@@ -19,7 +19,7 @@ from migrate.changeset import *
 from sqlalchemy import *
 from sqlalchemy.sql import and_, not_
 
-from glance.registry.db.migrate_repo.schema import (
+from glance.db.migrate_repo.schema import (
     Boolean, DateTime, BigInteger, Integer, String,
     Text, from_migration_import)
 

glance/db/migrate_repo/versions/008_add_image_members_table.py

@@ -18,7 +18,7 @@
 from migrate.changeset import *
 from sqlalchemy import *
 
-from glance.registry.db.migrate_repo.schema import (
+from glance.db.migrate_repo.schema import (
     Boolean, DateTime, BigInteger, Integer, String, Text,
     create_tables, drop_tables, from_migration_import)
 

glance/db/migrate_repo/versions/009_add_mindisk_and_minram.py

@@ -19,7 +19,7 @@ from migrate.changeset import *
 from sqlalchemy import *
 from sqlalchemy.sql import and_, not_
 
-from glance.registry.db.migrate_repo.schema import (
+from glance.db.migrate_repo.schema import (
     Boolean, DateTime, Integer, String, Text, from_migration_import)
 
 

glance/db/migrate_repo/versions/010_default_update_at.py

@@ -18,7 +18,7 @@
 from migrate.changeset import *
 from sqlalchemy import *
 
-from glance.registry.db.migrate_repo.schema import from_migration_import
+from glance.db.migrate_repo.schema import from_migration_import
 
 
 def get_images_table(meta):

glance/db/migrate_repo/versions/014_add_image_tags_table.py

@@ -15,7 +15,7 @@
 
 from sqlalchemy import schema
 
-from glance.registry.db.migrate_repo import schema as glance_schema
+from glance.db.migrate_repo import schema as glance_schema
 
 
 def define_image_tags_table(meta):

glance/db/migration.py

@@ -30,7 +30,7 @@ from migrate.versioning import repository as versioning_repository
 from glance.common import exception
 
 
-logger = logging.getLogger('glance.registry.db.migration')
+logger = logging.getLogger('glance.db.migration')
 
 
 def db_version(conf):

glance/db/models.py

@@ -29,7 +29,7 @@ from sqlalchemy import UniqueConstraint
 from sqlalchemy.ext.compiler import compiles
 from sqlalchemy.ext.declarative import declarative_base
 
-import glance.registry.db.api
+import glance.db.api
 from glance.common import utils
 
 BASE = declarative_base()
@@ -56,7 +56,7 @@ class ModelBase(object):
 
     def save(self, session=None):
         """Save this object"""
-        session = session or glance.registry.db.api.get_session()
+        session = session or glance.db.api.get_session()
         session.add(self)
         session.flush()
 

glance/registry/api/v1/images.py

@@ -27,7 +27,7 @@ from glance.common import exception
 from glance.common import utils
 from glance.common import wsgi
 from glance.openstack.common import cfg
-from glance.registry.db import api as db_api
+from glance.db import api as db_api
 
 
 logger = logging.getLogger('glance.registry.api.v1.images')

glance/registry/api/v1/members.py

@@ -22,7 +22,7 @@ import webob.exc
 from glance.common import exception
 from glance.common import utils
 from glance.common import wsgi
-from glance.registry.db import api as db_api
+from glance.db import api as db_api
 
 
 logger = logging.getLogger('glance.registry.api.v1.members')

glance/tests/unit/test_clients.py

@@ -24,8 +24,8 @@ from glance.common import client as base_client
 from glance.common import context
 from glance.common import exception
 from glance.common import utils
-from glance.registry.db import api as db_api
-from glance.registry.db import models as db_models
+from glance.db import api as db_api
+from glance.db import models as db_models
 from glance.registry import client as rclient
 from glance.tests.unit import base
 from glance.tests import utils as test_utils

glance/tests/unit/test_db.py

@@ -22,8 +22,8 @@ import random
 from glance.common import context
 from glance.common import exception
 from glance.common import utils
-from glance.registry.db import api as db_api
-from glance.registry.db import models as db_models
+from glance.db import api as db_api
+from glance.db import models as db_models
 from glance.tests.unit import base
 from glance.tests import utils as test_utils
 

glance/tests/unit/test_http_store.py

@@ -21,7 +21,7 @@ import stubout
 
 from glance.common import config
 from glance.common import exception, context
-from glance.registry.db import api as db_api
+from glance.db import api as db_api
 from glance.registry import configure_registry_client
 from glance.store import (delete_from_backend,
                           schedule_delete_from_backend)

glance/tests/unit/test_migrations.py

@@ -35,8 +35,8 @@ from sqlalchemy.pool import NullPool
 
 from glance.common import exception
 from glance.openstack.common import cfg
-import glance.registry.db.migration as migration_api
-from glance.registry.db import models
+import glance.db.migration as migration_api
+from glance.db import models
 from glance.tests import utils
 
 
@@ -50,7 +50,7 @@ class TestMigrations(utils.BaseTestCase):
     CONFIG_FILE_PATH = os.environ.get('GLANCE_TEST_MIGRATIONS_CONF',
                                       os.path.join('glance', 'tests', 'unit',
                                                    'test_migrations.conf'))
-    REPOSITORY_PATH = os.path.join('glance', 'registry', 'db', 'migrate_repo')
+    REPOSITORY_PATH = os.path.join('glance', 'db', 'migrate_repo')
     REPOSITORY = Repository(REPOSITORY_PATH)
 
     def __init__(self, *args, **kwargs):

glance/tests/unit/v1/test_api.py

@@ -29,8 +29,8 @@ from glance.api.v1 import router
 from glance.common import context
 from glance.common import utils
 from glance.registry.api import v1 as rserver
-from glance.registry.db import api as db_api
-from glance.registry.db import models as db_models
+from glance.db import api as db_api
+from glance.db import models as db_models
 from glance.tests import utils as test_utils
 from glance.tests.unit import base
 

tools/migrate_image_owners.py

@@ -8,7 +8,7 @@ import keystoneclient.v2_0.client
 import glance.common.context
 import glance.openstack.common.cfg
 import glance.registry.context
-import glance.registry.db.api as db_api
+import glance.db.api as db_api
 
 
 logger = logging.getLogger(__name__)