openstack
/
nova
Code Issues Proposed changes

Make notifications use BandwidthUsageList object 

To remove the conductor proxying that compute manager currently uses
for making calls to notify_usage_exists(), a final remaining db call
in notifications have to be converted to objects.

This change converts the remaining call to db.bw_usage_get_by_uuids()
to call the object method BandwidthUsageList.get_by_uuids() instead.

Related to blueprint kilo-objects

Change-Id: I1c84edac57eb101bcffba790536fbb195185ff31
This commit is contained in:
Hans Lindgren 2014-11-21 15:01:35 +01:00
parent 8a6ddbe996
commit c0d2b36bbe
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nova/notifications.py
View File

@ -28,11 +28,11 @@ from oslo_utils import timeutils
import six
import nova.context
from nova import db
from nova.i18n import _LE
from nova.image import glance
from nova import network
from nova.network import model as network_model
from nova import objects
from nova.objects import base as obj_base
from nova import rpc
from nova import utils
@ -308,19 +308,19 @@ def bandwidth_usage(instance_ref, audit_start,
macs = [vif['address'] for vif in nw_info]
uuids = [instance_ref["uuid"]]
bw_usages = db.bw_usage_get_by_uuids(admin_context, uuids, audit_start)
bw_usages = [b for b in bw_usages if b.mac in macs]
bw_usages = objects.BandwidthUsageList.get_by_uuids(admin_context, uuids,
audit_start)
bw = {}
for b in bw_usages:
label = 'net-name-not-found-%s' % b['mac']
for vif in nw_info:
if vif['address'] == b['mac']:
label = vif['network']['label']
break
if b.mac in macs:
label = 'net-name-not-found-%s' % b.mac
for vif in nw_info:
if vif['address'] == b.mac:
label = vif['network']['label']
break
bw[label] = dict(bw_in=b.bw_in, bw_out=b.bw_out)
bw[label] = dict(bw_in=b.bw_in, bw_out=b.bw_out)
return bw