diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-10 23:04:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-10 23:04:18 +0000 |
| commit | b962f98a18a4070ae859b8a98b4169e37db6fa69 (patch) | |
| tree | cbbab0daa817face4fb7a83d3d73f6a67a015842 /nova/db | |
| parent | 4e596a171f7dc1a4140726b1cfab85976f98243a (diff) | |
| parent | f546f62397979312dd891509c31feadf149b8c59 (diff) | |
Merge "Make sure ec2 mapping raises proper exceptions"
Diffstat (limited to 'nova/db')
| -rw-r--r-- | nova/db/api.py | 4 | ||||
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/nova/db/api.py b/nova/db/api.py index 83f4ca355..48b9fba1e 100644 --- a/nova/db/api.py +++ b/nova/db/api.py @@ -1909,9 +1909,9 @@ def get_ec2_instance_id_by_uuid(context, instance_id): return IMPL.get_ec2_instance_id_by_uuid(context, instance_id) -def get_instance_uuid_by_ec2_id(context, instance_id): +def get_instance_uuid_by_ec2_id(context, ec2_id): """Get uuid through ec2 id from instance_id_mappings table""" - return IMPL.get_instance_uuid_by_ec2_id(context, instance_id) + return IMPL.get_instance_uuid_by_ec2_id(context, ec2_id) def ec2_instance_create(context, instance_ec2_id): diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 325827089..b887c1d7b 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -3224,7 +3224,7 @@ def get_ec2_volume_id_by_uuid(context, volume_id, session=None): first() if not result: - raise exception.VolumeNotFound(uuid=volume_id) + raise exception.VolumeNotFound(volume_id=volume_id) return result['id'] @@ -3236,7 +3236,7 @@ def get_volume_uuid_by_ec2_id(context, ec2_id, session=None): first() if not result: - raise exception.VolumeNotFound(ec2_id=ec2_id) + raise exception.VolumeNotFound(volume_id=ec2_id) return result['uuid'] @@ -3261,7 +3261,7 @@ def get_ec2_snapshot_id_by_uuid(context, snapshot_id, session=None): first() if not result: - raise exception.SnapshotNotFound(uuid=snapshot_id) + raise exception.SnapshotNotFound(snapshot_id=snapshot_id) return result['id'] @@ -3273,7 +3273,7 @@ def get_snapshot_uuid_by_ec2_id(context, ec2_id, session=None): first() if not result: - raise exception.SnapshotNotFound(ec2_id=ec2_id) + raise exception.SnapshotNotFound(snapshot_id=ec2_id) return result['uuid'] @@ -5178,20 +5178,20 @@ def get_ec2_instance_id_by_uuid(context, instance_id, session=None): first() if not result: - raise exception.InstanceNotFound(uuid=instance_id) + raise exception.InstanceNotFound(instance_id=instance_id) return result['id'] @require_context -def get_instance_uuid_by_ec2_id(context, instance_id, session=None): +def get_instance_uuid_by_ec2_id(context, ec2_id, session=None): result = _ec2_instance_get_query(context, session=session).\ - filter_by(id=instance_id).\ + filter_by(id=ec2_id).\ first() if not result: - raise exception.InstanceNotFound(id=instance_id) + raise exception.InstanceNotFound(instance_id=ec2_id) return result['uuid'] |