diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-06 23:59:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-06 23:59:01 +0000 |
| commit | d52ea46f558ef5e8d2cda238d89b420e9a5d7932 (patch) | |
| tree | 09fda7fda6ab08a1b03425b9bd96f1770901f817 /nova/virt | |
| parent | 724961063323d811405c3933fb5d16fb5b83bb12 (diff) | |
| parent | 9b1b65a4395511b07e15a521de3a3a66c4bdcfaa (diff) | |
Merge "Fix _poll_bandwidth_usage if no network on vif"
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/xenapi_conn.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py index 26e36b911..e034cb3ca 100644 --- a/nova/virt/xenapi_conn.py +++ b/nova/virt/xenapi_conn.py @@ -328,13 +328,9 @@ class XenAPIConnection(driver.ComputeDriver): for iusage in self._vmops.get_all_bw_usage(start_time, stop_time).\ values(): for macaddr, usage in iusage.iteritems(): - vi = db.virtual_interface_get_by_address( - context.get_admin_context(), - macaddr) - if vi: - bwusage.append(dict(virtual_interface=vi, - bw_in=usage['bw_in'], - bw_out=usage['bw_out'])) + bwusage.append(dict(mac_address=macaddr, + bw_in=usage['bw_in'], + bw_out=usage['bw_out'])) return bwusage def get_console_output(self, instance): |