x/gantt
Code Issues Proposed changes

fix extra reference, method passing to network, various errors in elastic_ips

Browse Source
This commit is contained in:
Vishvananda Ishaya
2010-08-04 14:08:23 -07:00
parent aa3852e182
commit 3d1bdc5db4
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
nova/endpoint/cloud.py
View File

@@ -473,8 +473,10 @@ class CloudController(object):
@defer.inlineCallbacks @defer.inlineCallbacks
def allocate_address(self, context, **kwargs): def allocate_address(self, context, **kwargs):
network_topic = yield self._get_network_topic(context) network_topic = yield self._get_network_topic(context)
alloc_result = rpc.call(network_topic, alloc_result = yield rpc.call(network_topic,
{"method": "allocate_elastic_ip"}) {"method": "allocate_elastic_ip",
"args": {"user_id": context.user.id,
"project_id": context.project.id}})
public_ip = alloc_result['result'] public_ip = alloc_result['result']
defer.returnValue({'addressSet': [{'publicIp' : public_ip}]}) defer.returnValue({'addressSet': [{'publicIp' : public_ip}]})
@@ -496,7 +498,7 @@ class CloudController(object):
network_topic = yield self._get_network_topic(context) network_topic = yield self._get_network_topic(context)
rpc.cast(network_topic, rpc.cast(network_topic,
{"method": "associate_elastic_ip", {"method": "associate_elastic_ip",
"args": {"elastic_ip": address['public_ip'], "args": {"elastic_ip": address['address'],
"fixed_ip": instance['private_dns_name'], "fixed_ip": instance['private_dns_name'],
"instance_id": instance['instance_id']}}) "instance_id": instance['instance_id']}})
defer.returnValue({'associateResponse': ["Address associated."]}) defer.returnValue({'associateResponse': ["Address associated."]})
@@ -507,8 +509,8 @@ class CloudController(object):
address = self._get_address(context, public_ip) address = self._get_address(context, public_ip)
network_topic = yield self._get_network_topic(context) network_topic = yield self._get_network_topic(context)
rpc.cast(network_topic, rpc.cast(network_topic,
{"method": "associate_elastic_ip", {"method": "disassociate_elastic_ip",
"args": {"elastic_ip": address['public_ip']}}) "args": {"elastic_ip": address['address']}})
defer.returnValue({'disassociateResponse': ["Address disassociated."]}) defer.returnValue({'disassociateResponse': ["Address disassociated."]})
@defer.inlineCallbacks @defer.inlineCallbacks