From 73fd7abacd3bc5492b0335b3bb71c16b4a9d30e2 Mon Sep 17 00:00:00 2001 From: Trey Morris Date: Mon, 9 Jan 2012 11:52:53 -0600 Subject: Ties quantum, melange, and nova network model get_instance_nw_info() now returns network model, and keeps the network info cache up to date. virt shim and translation in place for virts to get at the old stuff Change-Id: I070ea7d8564af6c644059d1c209542d250d19ddb --- nova/utils.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'nova/utils.py') diff --git a/nova/utils.py b/nova/utils.py index 791c63167..d2f4f1bf5 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -414,13 +414,8 @@ def usage_from_instance(instance_ref, network_info=None, **kw): state_description=instance_ref['task_state'] \ if instance_ref['task_state'] else '') - # NOTE(jkoelker) This nastyness can go away once compute uses the - # network model if network_info is not None: - fixed_ips = [] - for network, info in network_info: - fixed_ips.extend([ip['ip'] for ip in info['ips']]) - usage_info['fixed_ips'] = fixed_ips + usage_info['fixed_ips'] = network_info.fixed_ips() usage_info.update(kw) return usage_info -- cgit