From 4b3b8f8c2e0feab1e875137e53498c6152951867 Mon Sep 17 00:00:00 2001 From: Ryan Rossiter Date: Mon, 11 Jan 2016 16:38:06 +0000 Subject: [PATCH] Remove DictCompat from DNSDomain This changes over all occurrences of dictionary syntax on the DNSDomain object to use object syntax. Change-Id: Ice2c55650645346e0593bd6ba204ca64b60b82d4 Partially-Implements: bp rm-object-dict-compat --- nova/objects/dns_domain.py | 6 ++---- nova/tests/unit/objects/test_dns_domain.py | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/nova/objects/dns_domain.py b/nova/objects/dns_domain.py index dbb35e520103..020e3ad5d79a 100644 --- a/nova/objects/dns_domain.py +++ b/nova/objects/dns_domain.py @@ -18,10 +18,8 @@ from nova.objects import base from nova.objects import fields -# TODO(berrange): Remove NovaObjectDictCompat @base.NovaObjectRegistry.register -class DNSDomain(base.NovaPersistentObject, base.NovaObject, - base.NovaObjectDictCompat): +class DNSDomain(base.NovaPersistentObject, base.NovaObject): # Version 1.0: Initial version VERSION = '1.0' @@ -35,7 +33,7 @@ class DNSDomain(base.NovaPersistentObject, base.NovaObject, @staticmethod def _from_db_object(context, vif, db_vif): for field in vif.fields: - vif[field] = db_vif[field] + setattr(vif, field, db_vif[field]) vif._context = context vif.obj_reset_changes() return vif diff --git a/nova/tests/unit/objects/test_dns_domain.py b/nova/tests/unit/objects/test_dns_domain.py index 45f42ff2371a..71ea5979d18a 100644 --- a/nova/tests/unit/objects/test_dns_domain.py +++ b/nova/tests/unit/objects/test_dns_domain.py @@ -35,7 +35,7 @@ class _TestDNSDomain(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_get_by_domain(self): with mock.patch.object(db, 'dnsdomain_get') as get: