From 851205b8edd2950949e98103d25141c45a744cb1 Mon Sep 17 00:00:00 2001
From: Dan Smith <danms@us.ibm.com>
Date: Thu, 20 Jun 2013 11:32:13 -0700
Subject: 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
---
 nova/objects/instance_info_cache.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'nova/objects')

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
-- 
cgit