From 1c21d5e382a11dcb2328067c02964ee6ae0b94f1 Mon Sep 17 00:00:00 2001
From: lzyeval <lzyeval@gmail.com>
Date: Sun, 1 Jan 2012 20:41:22 +0800
Subject: Unused db.api cleanup

Fixes bug #884837

not used:
virtual_interface_get_by_fixed_ip
instance_get_by_fixed_ip
instance_get_by_fixed_ipv6
volume_metadata_delete_all
instance_metadata_delete_all

internal functions:
volume_metadata_get_item
    (used by used by volume_metadata_update() -> not removed)
instance_metadata_get_item
    (used by instance_metadata_update() -> not removed)
instance_type_extra_specs_get_item
    (used by instance_type_extra_specs_update_or_create()
     -> not removed)

Change-Id: I1f8ad627d0305112a9d5d7b3b3b7257e98851122
---
 nova/db/api.py            | 15 ---------------
 nova/db/sqlalchemy/api.py | 30 ------------------------------
 2 files changed, 45 deletions(-)

diff --git a/nova/db/api.py b/nova/db/api.py
index b00328c52..533f34ee5 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -463,11 +463,6 @@ def virtual_interface_get_by_uuid(context, vif_uuid):
     return IMPL.virtual_interface_get_by_uuid(context, vif_uuid)
 
 
-def virtual_interface_get_by_fixed_ip(context, fixed_ip_id):
-    """Gets the virtual interface fixed_ip is associated with."""
-    return IMPL.virtual_interface_get_by_fixed_ip(context, fixed_ip_id)
-
-
 def virtual_interface_get_by_instance(context, instance_id):
     """Gets all virtual_interfaces for instance."""
     return IMPL.virtual_interface_get_by_instance(context, instance_id)
@@ -580,16 +575,6 @@ def instance_get_all_by_reservation(context, reservation_id):
     return IMPL.instance_get_all_by_reservation(context, reservation_id)
 
 
-def instance_get_by_fixed_ip(context, address):
-    """Get an instance for a fixed ip by address."""
-    return IMPL.instance_get_by_fixed_ip(context, address)
-
-
-def instance_get_by_fixed_ipv6(context, address):
-    """Get an instance for a fixed ip by IPv6 address."""
-    return IMPL.instance_get_by_fixed_ipv6(context, address)
-
-
 def instance_get_fixed_addresses(context, instance_id):
     """Get the fixed ip address of an instance."""
     return IMPL.instance_get_fixed_addresses(context, instance_id)
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index c1e003b18..c835c59f0 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -995,18 +995,6 @@ def virtual_interface_get_by_uuid(context, vif_uuid):
     return vif_ref
 
 
-@require_context
-def virtual_interface_get_by_fixed_ip(context, fixed_ip_id):
-    """Gets the virtual interface fixed_ip is associated with.
-
-    :param fixed_ip_id: = id of the fixed_ip
-    """
-    vif_ref = _virtual_interface_query(context).\
-                      filter_by(fixed_ip_id=fixed_ip_id).\
-                      first()
-    return vif_ref
-
-
 @require_context
 @require_instance_exists
 def virtual_interface_get_by_instance(context, instance_id):
@@ -2343,15 +2331,6 @@ def volume_metadata_delete(context, volume_id, key):
                 'updated_at': literal_column('updated_at')})
 
 
-@require_context
-@require_volume_exists
-def volume_metadata_delete_all(context, volume_id):
-    _volume_metadata_get_query(context, volume_id).\
-        update({'deleted': True,
-                'deleted_at': utils.utcnow(),
-                'updated_at': literal_column('updated_at')})
-
-
 @require_context
 @require_volume_exists
 def volume_metadata_get_item(context, volume_id, key, session=None):
@@ -3369,15 +3348,6 @@ def instance_metadata_delete(context, instance_id, key):
                 'updated_at': literal_column('updated_at')})
 
 
-@require_context
-@require_instance_exists
-def instance_metadata_delete_all(context, instance_id):
-    _instance_metadata_get_query(context, instance_id).\
-        update({'deleted': True,
-                'deleted_at': utils.utcnow(),
-                'updated_at': literal_column('updated_at')})
-
-
 @require_context
 @require_instance_exists
 def instance_metadata_get_item(context, instance_id, key, session=None):
-- 
cgit