From 17ba935d9da2ff912196bb47f6856fb64db13247 Mon Sep 17 00:00:00 2001 From: Stanislaw Pitucha Date: Wed, 10 Apr 2013 13:26:12 +0000 Subject: Remove unnecessary LOG initialisation Remove a lot of getLogger lines and imports of logging in modules which never use that functionality. Change-Id: Icdaee2c540980412b000d02ebf1ec568dcf5b38a --- .../migrate_repo/versions/134_add_counters_to_bw_usage_cache.py | 4 ---- .../migrate_repo/versions/138_drop_server_name_from_instances.py | 3 --- nova/db/sqlalchemy/migrate_repo/versions/146_aggregate_zones.py | 4 ---- nova/db/sqlalchemy/migrate_repo/versions/147_no_service_zones.py | 4 ---- nova/db/sqlalchemy/migrate_repo/versions/148_add_instance_actions.py | 4 ---- .../migrate_repo/versions/173_add_unique_constraint_to_key_pairs.py | 2 -- .../versions/175_add_project_user_id_to_volume_usage_cache.py | 4 ---- nova/db/sqlalchemy/migration.py | 4 ---- 8 files changed, 29 deletions(-) (limited to 'nova/db') diff --git a/nova/db/sqlalchemy/migrate_repo/versions/134_add_counters_to_bw_usage_cache.py b/nova/db/sqlalchemy/migrate_repo/versions/134_add_counters_to_bw_usage_cache.py index b4178e3c7..612011982 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/134_add_counters_to_bw_usage_cache.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/134_add_counters_to_bw_usage_cache.py @@ -17,10 +17,6 @@ from sqlalchemy import Boolean, Column, DateTime, BigInteger from sqlalchemy import MetaData, Integer, String, Table -from nova.openstack.common import log as logging - -LOG = logging.getLogger(__name__) - def upgrade(migrate_engine): meta = MetaData() diff --git a/nova/db/sqlalchemy/migrate_repo/versions/138_drop_server_name_from_instances.py b/nova/db/sqlalchemy/migrate_repo/versions/138_drop_server_name_from_instances.py index d8d043b40..fd84217d7 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/138_drop_server_name_from_instances.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/138_drop_server_name_from_instances.py @@ -14,11 +14,8 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.openstack.common import log as logging from sqlalchemy import Column, String, MetaData, Table -LOG = logging.getLogger(__name__) - def upgrade(migrate_engine): meta = MetaData() diff --git a/nova/db/sqlalchemy/migrate_repo/versions/146_aggregate_zones.py b/nova/db/sqlalchemy/migrate_repo/versions/146_aggregate_zones.py index 0f39bf231..f7a5c97d7 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/146_aggregate_zones.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/146_aggregate_zones.py @@ -14,10 +14,6 @@ from sqlalchemy import String, Column, MetaData, Table, delete, select -from nova.openstack.common import log as logging - -LOG = logging.getLogger(__name__) - def upgrade(migrate_engine): meta = MetaData() diff --git a/nova/db/sqlalchemy/migrate_repo/versions/147_no_service_zones.py b/nova/db/sqlalchemy/migrate_repo/versions/147_no_service_zones.py index a0ad90d4e..111ed0747 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/147_no_service_zones.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/147_no_service_zones.py @@ -14,10 +14,6 @@ from sqlalchemy import String, Column, MetaData, Table, select -from nova.openstack.common import log as logging - -LOG = logging.getLogger(__name__) - """ Remove availability_zone column from services model and replace with aggregate based zone.""" diff --git a/nova/db/sqlalchemy/migrate_repo/versions/148_add_instance_actions.py b/nova/db/sqlalchemy/migrate_repo/versions/148_add_instance_actions.py index 5e60d41cc..e11c0b0e2 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/148_add_instance_actions.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/148_add_instance_actions.py @@ -25,10 +25,6 @@ from sqlalchemy import String from sqlalchemy import Table from sqlalchemy import Text -from nova.openstack.common import log as logging - -LOG = logging.getLogger(__name__) - def upgrade(migrate_engine): meta = MetaData() diff --git a/nova/db/sqlalchemy/migrate_repo/versions/173_add_unique_constraint_to_key_pairs.py b/nova/db/sqlalchemy/migrate_repo/versions/173_add_unique_constraint_to_key_pairs.py index e7c61b36d..2556ec00f 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/173_add_unique_constraint_to_key_pairs.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/173_add_unique_constraint_to_key_pairs.py @@ -17,9 +17,7 @@ from migrate.changeset import UniqueConstraint from sqlalchemy import Index, MetaData, Table from nova.db.sqlalchemy import utils -from nova.openstack.common import log as logging -LOG = logging.getLogger(__name__) OLD_IDX_NAME = 'key_pair_user_id_name_idx' UC_NAME = 'key_pairs_uniq_name_and_user_id' diff --git a/nova/db/sqlalchemy/migrate_repo/versions/175_add_project_user_id_to_volume_usage_cache.py b/nova/db/sqlalchemy/migrate_repo/versions/175_add_project_user_id_to_volume_usage_cache.py index 73b21304a..581df60a0 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/175_add_project_user_id_to_volume_usage_cache.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/175_add_project_user_id_to_volume_usage_cache.py @@ -16,10 +16,6 @@ from sqlalchemy import MetaData, Integer, String, Table, Column -from nova.openstack.common import log as logging - -LOG = logging.getLogger(__name__) - def upgrade(migrate_engine): meta = MetaData() diff --git a/nova/db/sqlalchemy/migration.py b/nova/db/sqlalchemy/migration.py index 421167bec..14758ab2b 100644 --- a/nova/db/sqlalchemy/migration.py +++ b/nova/db/sqlalchemy/migration.py @@ -22,7 +22,6 @@ import os from nova.db import migration from nova import exception from nova.openstack.common.db.sqlalchemy import session as db_session -from nova.openstack.common import log as logging import migrate @@ -30,9 +29,6 @@ from migrate.versioning import util as migrate_util import sqlalchemy -LOG = logging.getLogger(__name__) - - @migrate_util.decorator def patched_with_engine(f, *a, **kw): url = a[0] -- cgit