diff options
Diffstat (limited to 'nova/db/sqlalchemy/migrate_repo')
8 files changed, 18 insertions, 34 deletions
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/216_havana.py b/nova/db/sqlalchemy/migrate_repo/versions/216_havana.py index 317e3c3f93..efb29a40a1 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/216_havana.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/216_havana.py @@ -21,8 +21,6 @@ from sqlalchemy import ForeignKey, Index, Integer, MetaData, String, Table from sqlalchemy import Text from sqlalchemy.types import NullType -from nova.i18n import _LE - LOG = logging.getLogger(__name__) @@ -81,7 +79,7 @@ def _create_shadow_tables(migrate_engine): shadow_table.create() except Exception: LOG.info(repr(shadow_table)) - LOG.exception(_LE('Exception while creating table.')) + LOG.exception('Exception while creating table.') raise @@ -1075,7 +1073,7 @@ def upgrade(migrate_engine): table.create() except Exception: LOG.info(repr(table)) - LOG.exception(_LE('Exception while creating table.')) + LOG.exception('Exception while creating table.') raise # task log unique constraint diff --git a/nova/db/sqlalchemy/migrate_repo/versions/234_add_expire_reservations_index.py b/nova/db/sqlalchemy/migrate_repo/versions/234_add_expire_reservations_index.py index d9484a7bfd..1d123869a9 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/234_add_expire_reservations_index.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/234_add_expire_reservations_index.py @@ -15,8 +15,6 @@ from oslo_log import log as logging from sqlalchemy import Index, MetaData, Table -from nova.i18n import _LI - LOG = logging.getLogger(__name__) @@ -33,8 +31,8 @@ def upgrade(migrate_engine): reservations = Table('reservations', meta, autoload=True) if _get_deleted_expire_index(reservations): - LOG.info(_LI('Skipped adding reservations_deleted_expire_idx ' - 'because an equivalent index already exists.')) + LOG.info('Skipped adding reservations_deleted_expire_idx ' + 'because an equivalent index already exists.') return # Based on expire_reservations query diff --git a/nova/db/sqlalchemy/migrate_repo/versions/248_add_expire_reservations_index.py b/nova/db/sqlalchemy/migrate_repo/versions/248_add_expire_reservations_index.py index d9484a7bfd..1d123869a9 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/248_add_expire_reservations_index.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/248_add_expire_reservations_index.py @@ -15,8 +15,6 @@ from oslo_log import log as logging from sqlalchemy import Index, MetaData, Table -from nova.i18n import _LI - LOG = logging.getLogger(__name__) @@ -33,8 +31,8 @@ def upgrade(migrate_engine): reservations = Table('reservations', meta, autoload=True) if _get_deleted_expire_index(reservations): - LOG.info(_LI('Skipped adding reservations_deleted_expire_idx ' - 'because an equivalent index already exists.')) + LOG.info('Skipped adding reservations_deleted_expire_idx ' + 'because an equivalent index already exists.') return # Based on expire_reservations query diff --git a/nova/db/sqlalchemy/migrate_repo/versions/274_update_instances_project_id_index.py b/nova/db/sqlalchemy/migrate_repo/versions/274_update_instances_project_id_index.py index 3b8ba9f154..012cf4556a 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/274_update_instances_project_id_index.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/274_update_instances_project_id_index.py @@ -16,8 +16,6 @@ from oslo_log import log as logging from sqlalchemy import MetaData, Table, Index -from nova.i18n import _LI - LOG = logging.getLogger(__name__) @@ -33,8 +31,8 @@ def upgrade(migrate_engine): for index in instances.indexes: if [c.name for c in index.columns] == ['project_id', 'deleted']: - LOG.info(_LI('Skipped adding instances_project_id_deleted_idx ' - 'because an equivalent index already exists.')) + LOG.info('Skipped adding instances_project_id_deleted_idx ' + 'because an equivalent index already exists.') break else: index = Index('instances_project_id_deleted_idx', diff --git a/nova/db/sqlalchemy/migrate_repo/versions/277_add_fixed_ip_updated_index.py b/nova/db/sqlalchemy/migrate_repo/versions/277_add_fixed_ip_updated_index.py index afba49cd58..bd01c99ac0 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/277_add_fixed_ip_updated_index.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/277_add_fixed_ip_updated_index.py @@ -13,8 +13,6 @@ from oslo_log import log as logging from sqlalchemy import Index, MetaData, Table -from nova.i18n import _LI - LOG = logging.getLogger(__name__) @@ -37,8 +35,8 @@ def _get_table_index(migrate_engine): def upgrade(migrate_engine): meta, table, index = _get_table_index(migrate_engine) if index: - LOG.info(_LI('Skipped adding %s because an equivalent index' - ' already exists.'), INDEX_NAME) + LOG.info('Skipped adding %s because an equivalent index' + ' already exists.', INDEX_NAME) return columns = [getattr(table.c, col_name) for col_name in INDEX_COLUMNS] index = Index(INDEX_NAME, *columns) diff --git a/nova/db/sqlalchemy/migrate_repo/versions/295_add_virtual_interfaces_uuid_index.py b/nova/db/sqlalchemy/migrate_repo/versions/295_add_virtual_interfaces_uuid_index.py index e3c9445ed2..2402721ceb 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/295_add_virtual_interfaces_uuid_index.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/295_add_virtual_interfaces_uuid_index.py @@ -14,8 +14,6 @@ from oslo_log import log as logging from sqlalchemy import MetaData, Table, Index -from nova.i18n import _LI - LOG = logging.getLogger(__name__) INDEX_COLUMNS = ['uuid'] @@ -37,8 +35,8 @@ def _get_table_index(migrate_engine): def upgrade(migrate_engine): meta, table, index = _get_table_index(migrate_engine) if index: - LOG.info(_LI('Skipped adding %s because an equivalent index' - ' already exists.'), INDEX_NAME) + LOG.info('Skipped adding %s because an equivalent index' + ' already exists.', INDEX_NAME) return columns = [getattr(table.c, col_name) for col_name in INDEX_COLUMNS] index = Index(INDEX_NAME, *columns) diff --git a/nova/db/sqlalchemy/migrate_repo/versions/319_add_instances_deleted_created_at_index.py b/nova/db/sqlalchemy/migrate_repo/versions/319_add_instances_deleted_created_at_index.py index 5457f70af0..766e6a37cf 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/319_add_instances_deleted_created_at_index.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/319_add_instances_deleted_created_at_index.py @@ -16,8 +16,6 @@ from oslo_log import log as logging from sqlalchemy import MetaData, Table, Index -from nova.i18n import _LI - LOG = logging.getLogger(__name__) INDEX_COLUMNS = ['deleted', 'created_at'] @@ -39,8 +37,8 @@ def _get_table_index(migrate_engine): def upgrade(migrate_engine): meta, table, index = _get_table_index(migrate_engine) if index: - LOG.info(_LI('Skipped adding %s because an equivalent index' - ' already exists.'), INDEX_NAME) + LOG.info('Skipped adding %s because an equivalent index' + ' already exists.', INDEX_NAME) return columns = [getattr(table.c, col_name) for col_name in INDEX_COLUMNS] index = Index(INDEX_NAME, *columns) diff --git a/nova/db/sqlalchemy/migrate_repo/versions/347_add_updated_at_index.py b/nova/db/sqlalchemy/migrate_repo/versions/347_add_updated_at_index.py index b87fcf6984..65d2ec62e0 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/347_add_updated_at_index.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/347_add_updated_at_index.py @@ -14,8 +14,6 @@ from oslo_log import log as logging from sqlalchemy import MetaData, Table, Index from sqlalchemy.engine import reflection -from nova.i18n import _LI - LOG = logging.getLogger(__name__) INDEX_COLUMNS_1 = ['project_id'] @@ -42,16 +40,16 @@ def upgrade(migrate_engine): meta.bind = migrate_engine table = Table(TABLE_NAME, meta, autoload=True) if _get_table_index(migrate_engine, TABLE_NAME, INDEX_COLUMNS_1): - LOG.info(_LI('Skipped adding %s because an equivalent index' - ' already exists.'), INDEX_NAME_1) + LOG.info('Skipped adding %s because an equivalent index' + ' already exists.', INDEX_NAME_1) else: columns = [getattr(table.c, col_name) for col_name in INDEX_COLUMNS_1] index = Index(INDEX_NAME_1, *columns) index.create(migrate_engine) if _get_table_index(migrate_engine, TABLE_NAME, INDEX_COLUMNS_2): - LOG.info(_LI('Skipped adding %s because an equivalent index' - ' already exists.'), INDEX_NAME_2) + LOG.info('Skipped adding %s because an equivalent index' + ' already exists.', INDEX_NAME_2) else: columns = [getattr(table.c, col_name) for col_name in INDEX_COLUMNS_2] index = Index(INDEX_NAME_2, *columns) |