Merge "Make info_cache handle when network_info is None"

openstack · Jun 26, 2013 · 922e730 · 922e730
2 parents 98e8670 + 851205b
commit 922e730
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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