diff options
| author | Russell Bryant <rbryant@redhat.com> | 2014-06-16 22:04:55 +0000 |
|---|---|---|
| committer | Russell Bryant <rbryant@redhat.com> | 2014-06-17 21:02:01 +0000 |
| commit | 785f98a6b0889b9f2bd2ca44c7964d2913e9e6c9 (patch) | |
| tree | ad44bb5a57bf57c00b423f240f8e1be795d3dc61 /nova/api/ec2 | |
| parent | 96ac6ebde7b0ec906364f921c84b262c7a4933c8 (diff) | |
| download | nova-785f98a6b0889b9f2bd2ca44c7964d2913e9e6c9.tar.gz | |
Rename VolumeMapping to EC2VolumeMapping
During the code review for adding the InstanceMapping object, a
request was made by a couple of people to rename it to
EC2InstanceObject. I did that so now I think we should rename the one
that already merged to also have the EC2 prefix.
Change-Id: I0b0847b6d4e229c973e268045709fa90726baed9
Diffstat (limited to 'nova/api/ec2')
| -rw-r--r-- | nova/api/ec2/cloud.py | 4 | ||||
| -rw-r--r-- | nova/api/ec2/ec2utils.py | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index ef6a6609d9..d104aacf30 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -852,9 +852,9 @@ class CloudController(object): kwargs.get('description'), **create_kwargs) - vmap = ec2_obj.VolumeMapping() + vmap = ec2_obj.EC2VolumeMapping(context) vmap.uuid = volume['id'] - vmap.create(context) + vmap.create() # TODO(vish): Instance should be None at db layer instead of # trying to lazy load, but for now we turn it into diff --git a/nova/api/ec2/ec2utils.py b/nova/api/ec2/ec2utils.py index 4947127cea..5259d5ab0e 100644 --- a/nova/api/ec2/ec2utils.py +++ b/nova/api/ec2/ec2utils.py @@ -315,18 +315,18 @@ def get_int_id_from_volume_uuid(context, volume_uuid): if volume_uuid is None: return try: - vmap = ec2_obj.VolumeMapping.get_by_uuid(context, volume_uuid) + vmap = ec2_obj.EC2VolumeMapping.get_by_uuid(context, volume_uuid) return vmap.id except exception.NotFound: - vmap = ec2_obj.VolumeMapping() + vmap = ec2_obj.EC2VolumeMapping(context) vmap.uuid = volume_uuid - vmap.create(context) + vmap.create() return vmap.id @memoize def get_volume_uuid_from_int_id(context, int_id): - vmap = ec2_obj.VolumeMapping.get_by_id(context, int_id) + vmap = ec2_obj.EC2VolumeMapping.get_by_id(context, int_id) return vmap.uuid |