speed up describe by loading fixed and floating ips

This commit is contained in:
Vishvananda Ishaya
2010-09-09 06:55:54 -07:00
parent 759fc8b287
commit 305e3b52e9

View File

@@ -379,11 +379,11 @@ class CloudController(object):
'code': instance['state'], 'code': instance['state'],
'name': instance['state_description'] 'name': instance['state_description']
} }
floating_addr = db.instance_get_floating_address(context, floating_addr = None
instance['id']) if instance['fixed_ip']['floating_ips']:
floating_addr = instance['fixed_ip']['floating_ips'][0]['str_id']
i['publicDnsName'] = floating_addr i['publicDnsName'] = floating_addr
fixed_addr = db.instance_get_fixed_address(context, fixed_addr = instance['fixed_ip']['str_id']
instance['id'])
i['privateDnsName'] = fixed_addr i['privateDnsName'] = fixed_addr
if not i['publicDnsName']: if not i['publicDnsName']:
i['publicDnsName'] = i['privateDnsName'] i['publicDnsName'] = i['privateDnsName']