From caa6c31bb5bbc1e783254d185b62ddabee107f85 Mon Sep 17 00:00:00 2001
From: Dan Smith <danms@us.ibm.com>
Date: Tue, 28 May 2013 18:45:33 -0700
Subject: [PATCH] Use InstanceList object for init_host

Related to blueprint unified-object-model

Change-Id: Idcc4da2a6807a58966e267c62a7f134ce58c890a
---
 nova/test.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nova/test.py b/nova/test.py
index f0dba7c7c..886478362 100644
--- a/nova/test.py
+++ b/nova/test.py
@@ -41,6 +41,7 @@ from nova import context
 from nova import db
 from nova.db import migration
 from nova.network import manager as network_manager
+from nova.objects import base as objects_base
 from nova.openstack.common.db.sqlalchemy import session
 from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
@@ -225,6 +226,10 @@ class TestCase(testtools.TestCase):
                                     sqlite_clean_db=CONF.sqlite_clean_db)
         self.useFixture(_DB_CACHE)
 
+        # NOTE(danms): Make sure to reset us back to non-remote objects
+        # for each test to avoid interactions.
+        objects_base.NovaObject.indirection_api = None
+
         mox_fixture = self.useFixture(MoxStubout())
         self.mox = mox_fixture.mox
         self.stubs = mox_fixture.stubs