From b944b1ace9d5765a2752b9e5ad45b6703885bb69 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Thu, 14 Mar 2019 18:03:37 +0000 Subject: [PATCH] trivial: Remove dead nova.db functions Change-Id: I9eed6a0cb9fcaa969cfa053f6f9045b063f5e277 Signed-off-by: Stephen Finucane --- nova/db/sqlalchemy/api.py | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 530d961595..55262a44c7 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -148,6 +148,7 @@ _DEFAULT_QUOTA_NAME = 'default' PER_PROJECT_QUOTAS = ['fixed_ips', 'floating_ips', 'networks'] +# NOTE(stephenfin): This is required and used by oslo.db def get_backend(): """The backend is this module itself.""" return sys.modules[__name__] @@ -963,15 +964,6 @@ def floating_ip_create(context, values): return floating_ip_ref -def _floating_ip_count_by_project(context, project_id): - nova.context.authorize_project_context(context, project_id) - # TODO(tr3buchet): why leave auto_assigned floating IPs out? - return model_query(context, models.FloatingIp, read_deleted="no").\ - filter_by(project_id=project_id).\ - filter_by(auto_assigned=False).\ - count() - - @require_context @oslo_db_api.wrap_db_retry(max_retries=5, retry_on_deadlock=True) @pick_context_manager_writer @@ -1507,16 +1499,6 @@ def fixed_ip_update(context, address, values): _fixed_ip_get_by_address(context, address).update(values) -def _fixed_ip_count_by_project(context, project_id): - nova.context.authorize_project_context(context, project_id) - return model_query(context, models.FixedIp, (models.FixedIp.id,), - read_deleted="no").\ - join((models.Instance, - models.Instance.uuid == models.FixedIp.instance_uuid)).\ - filter(models.Instance.project_id == project_id).\ - count() - - ################### @@ -4086,14 +4068,6 @@ def security_group_destroy(context, security_group_id): soft_delete() -def _security_group_count_by_project_and_user(context, project_id, user_id): - nova.context.authorize_project_context(context, project_id) - return model_query(context, models.SecurityGroup, read_deleted="no").\ - filter_by(project_id=project_id).\ - filter_by(user_id=user_id).\ - count() - - ###################