diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-26 18:27:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-26 18:27:20 +0000 |
| commit | 922e7306a4b0a5222d6f4175e021108c05f008bf (patch) | |
| tree | e7bdfbe4fd8a35e0b64727eee5e0e1c301e0ea2a /nova | |
| parent | 98e8670812a854c019d30846575107197d7c287f (diff) | |
| parent | 851205b8edd2950949e98103d25141c45a744cb1 (diff) | |
| download | nova-922e7306a4b0a5222d6f4175e021108c05f008bf.tar.gz nova-922e7306a4b0a5222d6f4175e021108c05f008bf.tar.xz nova-922e7306a4b0a5222d6f4175e021108c05f008bf.zip | |
Merge "Make info_cache handle when network_info is None"
Diffstat (limited to 'nova')
| -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 |