diff options
| -rw-r--r-- | nova/db/api.py | 29 | ||||
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 46 |
2 files changed, 0 insertions, 75 deletions
diff --git a/nova/db/api.py b/nova/db/api.py index ff5536c49..fd932c9ef 100644 --- a/nova/db/api.py +++ b/nova/db/api.py @@ -875,25 +875,6 @@ def network_update(context, network_id, values): return IMPL.network_update(context, network_id, values) -################### - - -def iscsi_target_count_by_host(context, host): - """Return count of export devices.""" - return IMPL.iscsi_target_count_by_host(context, host) - - -def iscsi_target_create_safe(context, values): - """Create an iscsi_target from the values dictionary. - - The device is not returned. If the create violates the unique - constraints because the iscsi_target and host already exist, - no exception is raised. - - """ - return IMPL.iscsi_target_create_safe(context, values) - - ############### @@ -973,11 +954,6 @@ def reservation_get(context, uuid): return IMPL.reservation_get(context, uuid) -def reservation_destroy(context, uuid): - """Destroy the reservation or raise if it does not exist.""" - return IMPL.reservation_destroy(context, uuid) - - ################### @@ -1013,11 +989,6 @@ def reservation_expire(context): ################### -def volume_get_iscsi_target_num(context, volume_id): - """Get the target num (tid) allocated to the volume.""" - return IMPL.volume_get_iscsi_target_num(context, volume_id) - - def get_ec2_volume_id_by_uuid(context, volume_id): return IMPL.get_ec2_volume_id_by_uuid(context, volume_id) diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 33261f4db..45095576a 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -31,7 +31,6 @@ from oslo.config import cfg from sqlalchemy import and_ from sqlalchemy import Boolean from sqlalchemy.exc import DataError -from sqlalchemy.exc import IntegrityError from sqlalchemy.exc import NoSuchTableError from sqlalchemy import Integer from sqlalchemy import MetaData @@ -2313,29 +2312,6 @@ def network_update(context, network_id, values): ################### -@require_admin_context -def iscsi_target_count_by_host(context, host): - return model_query(context, models.IscsiTarget).\ - filter_by(host=host).\ - count() - - -@require_admin_context -def iscsi_target_create_safe(context, values): - iscsi_target_ref = models.IscsiTarget() - - for (key, value) in values.iteritems(): - iscsi_target_ref[key] = value - try: - iscsi_target_ref.save() - return iscsi_target_ref - except IntegrityError: - return None - - -################### - - @require_context def quota_get(context, project_id, resource): result = model_query(context, models.Quota, read_deleted="no").\ @@ -2531,16 +2507,6 @@ def reservation_create(context, uuid, usage, project_id, resource, delta, return reservation_ref -@require_admin_context -def reservation_destroy(context, uuid): - result = model_query(context, models.Reservation, read_deleted="no").\ - filter_by(uuid=uuid).\ - delete() - - if not result: - raise exception.ReservationNotFound(uuid=uuid) - - ################### @@ -2788,18 +2754,6 @@ def _ec2_snapshot_get_query(context, session=None): session=session, read_deleted='yes') -@require_admin_context -def volume_get_iscsi_target_num(context, volume_id): - result = model_query(context, models.IscsiTarget, read_deleted="yes").\ - filter_by(volume_id=volume_id).\ - first() - - if not result: - raise exception.ISCSITargetNotFoundForVolume(volume_id=volume_id) - - return result.target_num - - @require_context def ec2_volume_create(context, volume_uuid, id=None): """Create ec2 compatible volume by provided uuid.""" |