summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@yahoo.com>2010-09-11 21:12:01 -0700
committerVishvananda Ishaya <vishvananda@yahoo.com>2010-09-11 21:12:01 -0700
commit19040b7b2b908b2816bc7aca54a8437d54badd26 (patch)
tree540ed39dba215f598691a4476fadc06f60c280c4
parentab0e61a1e05bdec8b39c22ff9d93845526a0a02b (diff)
downloadnova-19040b7b2b908b2816bc7aca54a8437d54badd26.tar.gz
nova-19040b7b2b908b2816bc7aca54a8437d54badd26.tar.xz
nova-19040b7b2b908b2816bc7aca54a8437d54badd26.zip
fixed reference to misnamed method
-rw-r--r--nova/endpoint/cloud.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/endpoint/cloud.py b/nova/endpoint/cloud.py
index 00aa2ede8..41f23618f 100644
--- a/nova/endpoint/cloud.py
+++ b/nova/endpoint/cloud.py
@@ -464,14 +464,15 @@ class CloudController(object):
@defer.inlineCallbacks
def associate_address(self, context, instance_id, public_ip, **kwargs):
instance_ref = db.instance_get_by_str(context, instance_id)
- fixed_ip_ref = db.fixed_ip_get_by_instance(context, instance_ref['id'])
+ fixed_address = db.instance_get_fixed_address(context,
+ instance_ref['id'])
floating_ip_ref = db.floating_ip_get_by_address(context, public_ip)
network_topic = yield self._get_network_topic(context)
rpc.cast(network_topic,
{"method": "associate_floating_ip",
"args": {"context": None,
"floating_address": floating_ip_ref['str_id'],
- "fixed_address": fixed_ip_ref['str_id']}})
+ "fixed_address": fixed_address}})
defer.returnValue({'associateResponse': ["Address associated."]})
@rbac.allow('netadmin')