x/python-ganttclient
Code Issues Proposed changes

add back accidentally removed bridge name.

Browse Source 
str is reserved, so don't use it as a variable name
This commit is contained in:
Vishvananda Ishaya
2010-06-24 04:11:56 +01:00
committed by andy
parent d1387a3b54
commit e216588a95
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nova/endpoint/cloud.py
View File

@@ -364,12 +364,12 @@ class CloudController(object):
'status' : volume['attachStatus'], 'status' : volume['attachStatus'],
'volumeId' : volume_id}) 'volumeId' : volume_id})
def _convert_to_set(self, lst, str): def _convert_to_set(self, lst, label):
if lst == None or lst == []: if lst == None or lst == []:
return None return None
if not isinstance(lst, list): if not isinstance(lst, list):
lst = [lst] lst = [lst]
return [{str: x} for x in lst] return [{label: x} for x in lst]
@rbac.allow('all') @rbac.allow('all')
def describe_instances(self, context, **kwargs): def describe_instances(self, context, **kwargs):
@@ -497,10 +497,10 @@ class CloudController(object):
inst['project_id'] = context.project.id inst['project_id'] = context.project.id
inst['mac_address'] = utils.generate_mac() inst['mac_address'] = utils.generate_mac()
inst['ami_launch_index'] = num inst['ami_launch_index'] = num
inst['bridge_name'] = bridge_name
address = network.allocate_ip( address = network.allocate_ip(
inst['user_id'], inst['project_id'], mac=inst['mac_address']) inst['user_id'], inst['project_id'], mac=inst['mac_address'])
inst['private_dns_name'] = str(address) inst['private_dns_name'] = str(address)
inst['bridge_name'] = bridge_name
# TODO: allocate expresses on the router node # TODO: allocate expresses on the router node
inst.save() inst.save()
rpc.cast(FLAGS.compute_topic, rpc.cast(FLAGS.compute_topic,