diff options
| author | Dan Smith <danms@us.ibm.com> | 2013-06-20 11:32:13 -0700 |
|---|---|---|
| committer | Dan Smith <danms@us.ibm.com> | 2013-06-26 08:03:14 -0700 |
| commit | 851205b8edd2950949e98103d25141c45a744cb1 (patch) | |
| tree | bd5903abe51cce2a400256239661852b4dce6b40 /nova/objects | |
| parent | 38ff7199bd861886307b6f346d7978100f63937b (diff) | |
| download | nova-851205b8edd2950949e98103d25141c45a744cb1.tar.gz nova-851205b8edd2950949e98103d25141c45a744cb1.tar.xz nova-851205b8edd2950949e98103d25141c45a744cb1.zip | |
Make info_cache handle when network_info is None
The info_cache['network_info'] data can be None, so don't string-
convert it to 'None'.
Related to blueprint unified-object-model
Change-Id: I7a18f9189ab31beca0f8df764531387b4dd41b50
Diffstat (limited to 'nova/objects')
| -rw-r--r-- | nova/objects/instance_info_cache.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/objects/instance_info_cache.py b/nova/objects/instance_info_cache.py index a14175852..1f2db1223 100644 --- a/nova/objects/instance_info_cache.py +++ b/nova/objects/instance_info_cache.py @@ -14,12 +14,13 @@ from nova import db from nova.objects import base +from nova.objects import utils class InstanceInfoCache(base.NovaObject): fields = { 'instance_uuid': str, - 'network_info': str, + 'network_info': utils.str_or_none, } @staticmethod |