openstack/nova
Code Issues Proposed changes

Merge "Migrate InstanceInfoCache object to Fields"

Browse Source
This commit is contained in:
Jenkins
2013-10-11 22:44:42 +00:00
committed by Gerrit Code Review
parent 6757c4d3f0 c752a6609f
commit 1d540c2bce
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nova/objects/instance_info_cache.py
View File

@@ -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):

2
nova/tests/objects/test_instance.py
View File

@@ -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):