openstack
/
nova
Code Issues Proposed changes

Remove DictCompat from S3 object 

This changes over uses of dict syntax with the S3 object to use object
syntax.

Change-Id: I3a6c016440a7105498e417e56efb07099b76e7d5
Partially-Implements: bp rm-object-dict-compat-newton
This commit is contained in:
Ryan Rossiter 2016-04-04 18:22:59 +00:00
parent d57a4e8be9
commit c5626a2600
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nova/objects/ec2.py
View File

@ -136,10 +136,8 @@ class EC2SnapshotMapping(base.NovaPersistentObject, base.NovaObject):
return cls._from_db_object(context, cls(context), db_smap)
# TODO(berrange): Remove NovaObjectDictCompat
@base.NovaObjectRegistry.register
class S3ImageMapping(base.NovaPersistentObject, base.NovaObject,
base.NovaObjectDictCompat):
class S3ImageMapping(base.NovaPersistentObject, base.NovaObject):
# Version 1.0: Initial version
VERSION = '1.0'
@ -151,7 +149,7 @@ class S3ImageMapping(base.NovaPersistentObject, base.NovaObject,
@staticmethod
def _from_db_object(context, s3imap, db_s3imap):
for field in s3imap.fields:
s3imap[field] = db_s3imap[field]
setattr(s3imap, field, db_s3imap[field])
s3imap._context = context
s3imap.obj_reset_changes()
return s3imap

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

@ -157,7 +157,7 @@ class _TestS3ImageMapping(object):
@staticmethod
def _compare(test, db, obj):
for field, value in db.items():
test.assertEqual(db[field], obj[field])
test.assertEqual(db[field], getattr(obj, field))
def test_create(self):
s3imap = ec2_obj.S3ImageMapping(context=self.context)