diff options
| author | Brian Lamar <brian.lamar@rackspace.com> | 2011-04-21 16:18:49 -0400 |
|---|---|---|
| committer | Brian Lamar <brian.lamar@rackspace.com> | 2011-04-21 16:18:49 -0400 |
| commit | 18388b26c0e28df103d07ad0cc28fd9bfaab6416 (patch) | |
| tree | 526b9004c1f6c7eeb82dcff2aa96a6b4f7596bac /nova/virt | |
| parent | 6c037c5c639249556fcadd871d8af91760b50e90 (diff) | |
| parent | bec71bed9450d13202fdd7f54946e1376b271a2c (diff) | |
Merged trunk and fixed api servers conflict.
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/libvirt_conn.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index 715512507..ba34b88d3 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -165,9 +165,10 @@ def _get_network_info(instance): ip_addresses = db.fixed_ip_get_all_by_instance(admin_context, instance['id']) - networks = db.network_get_all_by_instance(admin_context, instance['id']) + flavor = db.instance_type_get_by_id(admin_context, + instance['instance_type_id']) network_info = [] for network in networks: @@ -191,7 +192,9 @@ def _get_network_info(instance): mapping = { 'label': network['label'], 'gateway': network['gateway'], + 'broadcast': network['broadcast'], 'mac': instance['mac_address'], + 'rxtx_cap': flavor['rxtx_cap'], 'dns': [network['dns']], 'ips': [ip_dict(ip) for ip in network_ips]} |