From c752a6609f9d32d4a4ac2d6f20dba78aae4241c4 Mon Sep 17 00:00:00 2001 From: Dan Smith Date: Thu, 3 Oct 2013 13:07:39 -0700 Subject: [PATCH] Migrate InstanceInfoCache object to Fields Related to blueprint structured-object-fields Change-Id: I202769261e28aba5682fd0db1762bfa3b5e0461a --- nova/objects/instance_info_cache.py | 6 +++--- nova/tests/objects/test_instance.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nova/objects/instance_info_cache.py b/nova/objects/instance_info_cache.py index 388c01258a5b..2ca0823ccf9c 100644 --- a/nova/objects/instance_info_cache.py +++ b/nova/objects/instance_info_cache.py @@ -17,7 +17,7 @@ from nova.cells import rpcapi as cells_rpcapi from nova import db from nova import exception from nova.objects import base -from nova.objects import utils +from nova.objects import fields from nova.openstack.common.gettextutils import _ from nova.openstack.common import log as logging @@ -33,8 +33,8 @@ class InstanceInfoCache(base.NovaPersistentObject, base.NovaObject): VERSION = '1.4' fields = { - 'instance_uuid': utils.str_value, - 'network_info': utils.network_model_or_none, + 'instance_uuid': fields.UUIDField(), + 'network_info': fields.Field(fields.NetworkModel(), nullable=True), } def _attr_network_info_to_primitive(self): diff --git a/nova/tests/objects/test_instance.py b/nova/tests/objects/test_instance.py index 5f1e66bdac05..4a262b65c891 100644 --- a/nova/tests/objects/test_instance.py +++ b/nova/tests/objects/test_instance.py @@ -641,7 +641,7 @@ class _TestInstanceObject(object): secgroups.objects.append(secgroup) inst.security_groups = secgroups inst.info_cache = instance_info_cache.InstanceInfoCache() - inst.info_cache.network_info = [] + inst.info_cache.network_info = network_model.NetworkInfo() inst.create(self.context) def test_destroy_stubbed(self):