diff options
| author | Alex Meade <alex.meade@rackspace.com> | 2011-12-06 15:32:33 -0500 |
|---|---|---|
| committer | Alex Meade <alex.meade@rackspace.com> | 2011-12-06 15:33:33 -0500 |
| commit | 3d9f0ed000ebe119cb7e15f957ee85b668086fea (patch) | |
| tree | 23834447c48f777ba0cf384e4fad9892b2ed41fa /nova/api | |
| parent | 882b1e475de1ef71d7d3f0b50a58f91569905a75 (diff) | |
Update associate_floating_ip to use instance objs
Related to blueprint internal-uuids.
Also cleans up some unused variables
Change-Id: I8adeceac8f4ab2894c48c1e1c7e1c7eab52e42d0
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 3 | ||||
| -rw-r--r-- | nova/api/openstack/v2/contrib/floating_ips.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 5eea3269a..cdedac679 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -1238,8 +1238,9 @@ class CloudController(object): LOG.audit(_("Associate address %(public_ip)s to" " instance %(instance_id)s") % locals(), context=context) instance_id = ec2utils.ec2_id_to_id(instance_id) + instance = self.compute_api.get(context, instance_id) self.compute_api.associate_floating_ip(context, - instance_id=instance_id, + instance, address=public_ip) return {'associateResponse': ["Address associated."]} diff --git a/nova/api/openstack/v2/contrib/floating_ips.py b/nova/api/openstack/v2/contrib/floating_ips.py index 072ada1ba..760ed65ab 100644 --- a/nova/api/openstack/v2/contrib/floating_ips.py +++ b/nova/api/openstack/v2/contrib/floating_ips.py @@ -168,7 +168,8 @@ class Floating_ips(extensions.ExtensionDescriptor): raise webob.exc.HTTPBadRequest(explanation=msg) try: - self.compute_api.associate_floating_ip(context, instance_id, + instance = self.compute_api.get(context, instance_id) + self.compute_api.associate_floating_ip(context, instance, address) except exception.ApiError, e: raise webob.exc.HTTPBadRequest(explanation=e.message) |