Remove unused functions.

instance_system_metadata_delete
key_pair_destroy_all_by_user
network_count
network_create_fixed_ips
network_get_index
network_set_cidr
quota_destroy
quota_class_destroy
quota_class_destroy_all_by_name
quota_usage_destroy
reservation_get_all_by_project
snapshot_create
snapshot_destroy
snapshot_get
snapshot_get_all
snapshot_get_all_by_project
snapshot_update

Change-Id: I06a0320ee2765f772628855a671892a8138ca19b

2 files changed, 0 insertions, 235 deletions

diff --git a/nova/db/api.py b/nova/db/api.py
index e9bb36bca..2d432fc8f 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -736,11 +736,6 @@ def key_pair_destroy(context, user_id, name):
     return IMPL.key_pair_destroy(context, user_id, name)
 
 
-def key_pair_destroy_all_by_user(context, user_id):
-    """Destroy all key_pairs by user."""
-    return IMPL.key_pair_destroy_all_by_user(context, user_id)
-
-
 def key_pair_get(context, user_id, name):
     """Get a key_pair or raise if it does not exist."""
     return IMPL.key_pair_get(context, user_id, name)
@@ -764,11 +759,6 @@ def network_associate(context, project_id, network_id=None, force=False):
     return IMPL.network_associate(context, project_id, network_id, force)
 
 
-def network_count(context):
-    """Return the number of networks."""
-    return IMPL.network_count(context)
-
-
 def network_count_reserved_ips(context, network_id):
     """Return the number of reserved ips in the network."""
     return IMPL.network_count_reserved_ips(context, network_id)
@@ -793,11 +783,6 @@ def network_delete_safe(context, network_id):
     return IMPL.network_delete_safe(context, network_id)
 
 
-def network_create_fixed_ips(context, network_id, num_vpn_clients):
-    """Create the ips for the network, reserving sepecified ips."""
-    return IMPL.network_create_fixed_ips(context, network_id, num_vpn_clients)
-
-
 def network_disassociate(context, network_id):
     """Disassociate the network from project or raise if it does not exist."""
     return IMPL.network_disassociate(context, network_id)
@@ -858,16 +843,6 @@ def network_get_all_by_host(context, host):
     return IMPL.network_get_all_by_host(context, host)
 
 
-def network_get_index(context, network_id):
-    """Get non-conflicting index for network."""
-    return IMPL.network_get_index(context, network_id)
-
-
-def network_set_cidr(context, network_id, cidr):
-    """Set the Classless Inner Domain Routing for the network."""
-    return IMPL.network_set_cidr(context, network_id, cidr)
-
-
 def network_set_host(context, network_id, host_id):
     """Safely set the host for network."""
     return IMPL.network_set_host(context, network_id, host_id)
@@ -924,11 +899,6 @@ def quota_update(context, project_id, resource, limit):
     return IMPL.quota_update(context, project_id, resource, limit)
 
 
-def quota_destroy(context, project_id, resource):
-    """Destroy the quota or raise if it does not exist."""
-    return IMPL.quota_destroy(context, project_id, resource)
-
-
 ###################
 
 
@@ -952,16 +922,6 @@ def quota_class_update(context, class_name, resource, limit):
     return IMPL.quota_class_update(context, class_name, resource, limit)
 
 
-def quota_class_destroy(context, class_name, resource):
-    """Destroy the quota class or raise if it does not exist."""
-    return IMPL.quota_class_destroy(context, class_name, resource)
-
-
-def quota_class_destroy_all_by_name(context, class_name):
-    """Destroy all quotas associated with a given quota class."""
-    return IMPL.quota_class_destroy_all_by_name(context, class_name)
-
-
 ###################
 
 
@@ -987,11 +947,6 @@ def quota_usage_update(context, project_id, resource, **kwargs):
     return IMPL.quota_usage_update(context, project_id, resource, **kwargs)
 
 
-def quota_usage_destroy(context, project_id, resource):
-    """Destroy the quota usage or raise if it does not exist."""
-    return IMPL.quota_usage_destroy(context, project_id, resource)
-
-
 ###################
 
 
@@ -1007,11 +962,6 @@ def reservation_get(context, uuid):
     return IMPL.reservation_get(context, uuid)
 
 
-def reservation_get_all_by_project(context, project_id):
-    """Retrieve all reservations associated with a given project."""
-    return IMPL.reservation_get_all_by_project(context, project_id)
-
-
 def reservation_destroy(context, uuid):
     """Destroy the reservation or raise if it does not exist."""
     return IMPL.reservation_destroy(context, uuid)
@@ -1082,43 +1032,6 @@ def ec2_snapshot_create(context, snapshot_id, forced_id=None):
 ####################
 
 
-def snapshot_create(context, values):
-    """Create a snapshot from the values dictionary."""
-    return IMPL.snapshot_create(context, values)
-
-
-def snapshot_destroy(context, snapshot_id):
-    """Destroy the snapshot or raise if it does not exist."""
-    return IMPL.snapshot_destroy(context, snapshot_id)
-
-
-def snapshot_get(context, snapshot_id):
-    """Get a snapshot or raise if it does not exist."""
-    return IMPL.snapshot_get(context, snapshot_id)
-
-
-def snapshot_get_all(context):
-    """Get all snapshots."""
-    return IMPL.snapshot_get_all(context)
-
-
-def snapshot_get_all_by_project(context, project_id):
-    """Get all snapshots belonging to a project."""
-    return IMPL.snapshot_get_all_by_project(context, project_id)
-
-
-def snapshot_update(context, snapshot_id, values):
-    """Set the given properties on a snapshot and update it.
-
-    Raises NotFound if snapshot does not exist.
-
-    """
-    return IMPL.snapshot_update(context, snapshot_id, values)
-
-
-####################
-
-
 def block_device_mapping_create(context, values):
     """Create an entry of block device mapping"""
     return IMPL.block_device_mapping_create(context, values)
@@ -1416,11 +1329,6 @@ def instance_system_metadata_get(context, instance_uuid):
     return IMPL.instance_system_metadata_get(context, instance_uuid)
 
 
-def instance_system_metadata_delete(context, instance_uuid, key):
-    """Delete the given system metadata item."""
-    IMPL.instance_system_metadata_delete(context, instance_uuid, key)
-
-
 def instance_system_metadata_update(context, instance_uuid, metadata, delete):
     """Update metadata if it exists, otherwise create it."""
     IMPL.instance_system_metadata_update(
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 63ef26a0e..c840947e8 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -1944,18 +1944,6 @@ def key_pair_destroy(context, user_id, name):
 
 
 @require_context
-def key_pair_destroy_all_by_user(context, user_id):
-    authorize_user_context(context, user_id)
-    session = get_session()
-    with session.begin():
-        session.query(models.KeyPair).\
-                filter_by(user_id=user_id).\
-                update({'deleted': True,
-                        'deleted_at': timeutils.utcnow(),
-                        'updated_at': literal_column('updated_at')})
-
-
-@require_context
 def key_pair_get(context, user_id, name, session=None):
     authorize_user_context(context, user_id)
     result = model_query(context, models.KeyPair, session=session).\
@@ -2038,11 +2026,6 @@ def network_associate(context, project_id, network_id=None, force=False):
 
 
 @require_admin_context
-def network_count(context):
-    return model_query(context, models.Network).count()
-
-
-@require_admin_context
 def _network_ips_query(context, network_id):
     return model_query(context, models.FixedIp, read_deleted="no").\
                    filter_by(network_id=network_id)
@@ -2388,14 +2371,6 @@ def quota_update(context, project_id, resource, limit):
         quota_ref.save(session=session)
 
 
-@require_admin_context
-def quota_destroy(context, project_id, resource):
-    session = get_session()
-    with session.begin():
-        quota_ref = quota_get(context, project_id, resource, session=session)
-        quota_ref.delete(session=session)
-
-
 ###################
 
 
@@ -2448,28 +2423,6 @@ def quota_class_update(context, class_name, resource, limit):
         quota_class_ref.save(session=session)
 
 
-@require_admin_context
-def quota_class_destroy(context, class_name, resource):
-    session = get_session()
-    with session.begin():
-        quota_class_ref = quota_class_get(context, class_name, resource,
-                                          session=session)
-        quota_class_ref.delete(session=session)
-
-
-@require_admin_context
-def quota_class_destroy_all_by_name(context, class_name):
-    session = get_session()
-    with session.begin():
-        quota_classes = model_query(context, models.QuotaClass,
-                                    session=session, read_deleted="no").\
-                                filter_by(class_name=class_name).\
-                                all()
-
-        for quota_class_ref in quota_classes:
-            quota_class_ref.delete(session=session)
-
-
 ###################
 
 
@@ -2538,15 +2491,6 @@ def quota_usage_update(context, project_id, resource, session=None, **kwargs):
             do_update(session)
 
 
-@require_admin_context
-def quota_usage_destroy(context, project_id, resource):
-    session = get_session()
-    with session.begin():
-        quota_usage_ref = quota_usage_get(context, project_id, resource,
-                                          session=session)
-        quota_usage_ref.delete(session=session)
-
-
 ###################
 
 
@@ -2563,22 +2507,6 @@ def reservation_get(context, uuid, session=None):
     return result
 
 
-@require_context
-def reservation_get_all_by_project(context, project_id):
-    authorize_project_context(context, project_id)
-
-    rows = model_query(context, models.QuotaUsage, read_deleted="no").\
-                   filter_by(project_id=project_id).\
-                   all()
-
-    result = {'project_id': project_id}
-    for row in rows:
-        result.setdefault(row.resource, {})
-        result[row.resource][row.uuid] = row.delta
-
-    return result
-
-
 @require_admin_context
 def reservation_create(context, uuid, usage, project_id, resource, delta,
                        expire, session=None):
@@ -2951,68 +2879,6 @@ def get_snapshot_uuid_by_ec2_id(context, ec2_id, session=None):
 ###################
 
 
-@require_context
-def snapshot_create(context, values):
-    snapshot_ref = models.Snapshot()
-    if not values.get('id'):
-        values['id'] = str(utils.gen_uuid())
-    snapshot_ref.update(values)
-
-    session = get_session()
-    with session.begin():
-        snapshot_ref.save(session=session)
-    return snapshot_ref
-
-
-@require_admin_context
-def snapshot_destroy(context, snapshot_id):
-    session = get_session()
-    with session.begin():
-        session.query(models.Snapshot).\
-                filter_by(id=snapshot_id).\
-                update({'deleted': True,
-                        'deleted_at': timeutils.utcnow(),
-                        'updated_at': literal_column('updated_at')})
-
-
-@require_context
-def snapshot_get(context, snapshot_id, session=None):
-    result = model_query(context, models.Snapshot, session=session,
-                         project_only=True).\
-                filter_by(id=snapshot_id).\
-                first()
-
-    if not result:
-        raise exception.SnapshotNotFound(snapshot_id=snapshot_id)
-
-    return result
-
-
-@require_admin_context
-def snapshot_get_all(context):
-    return model_query(context, models.Snapshot).all()
-
-
-@require_context
-def snapshot_get_all_by_project(context, project_id):
-    authorize_project_context(context, project_id)
-    return model_query(context, models.Snapshot).\
-                   filter_by(project_id=project_id).\
-                   all()
-
-
-@require_context
-def snapshot_update(context, snapshot_id, values):
-    session = get_session()
-    with session.begin():
-        snapshot_ref = snapshot_get(context, snapshot_id, session=session)
-        snapshot_ref.update(values)
-        snapshot_ref.save(session=session)
-
-
-###################
-
-
 def _block_device_mapping_get_query(context, session=None):
     return model_query(context, models.BlockDeviceMapping, session=session)
 
@@ -3908,15 +3774,6 @@ def instance_system_metadata_get(context, instance_uuid, session=None):
     return result
 
 
-@require_context
-def instance_system_metadata_delete(context, instance_uuid, key):
-    _instance_system_metadata_get_query(context, instance_uuid).\
-        filter_by(key=key).\
-        update({'deleted': True,
-                'deleted_at': timeutils.utcnow(),
-                'updated_at': literal_column('updated_at')})
-
-
 def _instance_system_metadata_get_item(context, instance_uuid, key,
                                        session=None):
     result = _instance_system_metadata_get_query(