openstack/nova
Code Issues Proposed changes

Cleanup NovaObjectDictCompat from BandwidthUsage

Browse Source 
Cleanup subclassing on NovaObjectDictCompat. A minor change to a unit
tests is also required.

Change-Id: I4ac17ccaa54424ac52fe0d1a83fc062c180f11db
Partially-Implements: bp rm-object-dict-compat-newton
This commit is contained in:
Stephen Finucane
2016-01-05 08:54:18 +00:00
committed by John Garbutt
parent 18169d572a
commit a5851f95bc
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nova/objects/bandwidth_usage.py
View File

@@ -15,10 +15,8 @@ from nova.objects import base
from nova.objects import fields from nova.objects import fields
# TODO(berrange): Remove NovaObjectDictCompat
@base.NovaObjectRegistry.register @base.NovaObjectRegistry.register
class BandwidthUsage(base.NovaPersistentObject, base.NovaObject, class BandwidthUsage(base.NovaPersistentObject, base.NovaObject):
base.NovaObjectDictCompat):
# Version 1.0: Initial version # Version 1.0: Initial version
# Version 1.1: Add use_slave to get_by_instance_uuid_and_mac # Version 1.1: Add use_slave to get_by_instance_uuid_and_mac
# Version 1.2: Add update_cells to create # Version 1.2: Add update_cells to create
@@ -39,9 +37,9 @@ class BandwidthUsage(base.NovaPersistentObject, base.NovaObject,
def _from_db_object(context, bw_usage, db_bw_usage): def _from_db_object(context, bw_usage, db_bw_usage):
for field in bw_usage.fields: for field in bw_usage.fields:
if field == 'instance_uuid': if field == 'instance_uuid':
bw_usage[field] = db_bw_usage['uuid'] setattr(bw_usage, field, db_bw_usage['uuid'])
else: else:
bw_usage[field] = db_bw_usage[field] setattr(bw_usage, field, db_bw_usage[field])
bw_usage._context = context bw_usage._context = context
bw_usage.obj_reset_changes() bw_usage.obj_reset_changes()
return bw_usage return bw_usage

2
nova/tests/unit/objects/test_bandwidth_usage.py
View File

@@ -44,7 +44,7 @@ class _TestBandwidthUsage(test.TestCase):
obj_field = field obj_field = field
if obj_field == 'uuid': if obj_field == 'uuid':
obj_field = 'instance_uuid' obj_field = 'instance_uuid'
test.assertEqual(db[field], obj[obj_field], test.assertEqual(db[field], getattr(obj, obj_field),
'Field %s is not equal' % field) 'Field %s is not equal' % field)
@staticmethod @staticmethod