Merge "ID references made model not able to load in 2 passes"

This commit is contained in:
Jenkins 2015-09-08 15:29:59 +00:00 committed by Gerrit Code Review
commit 17f3f68fbe

View File

@ -39,7 +39,7 @@ class ObjectStore(object):
if object_id in self._store: if object_id in self._store:
result = self._store[object_id] result = self._store[object_id]
if not isinstance(result, dsl_types.MuranoObject): if not isinstance(result, dsl_types.MuranoObject):
result = None result = result.object
return result return result
if self._parent_store: if self._parent_store:
return self._parent_store.get(object_id) return self._parent_store.get(object_id)