Merge "Use thread local storage from openstack.common."

6 files changed, 4 insertions, 57 deletions

diff --git a/nova/context.py b/nova/context.py
index 160699a11..9555f9fc1 100644
--- a/nova/context.py
+++ b/nova/context.py
@@ -21,8 +21,8 @@
 
 import copy
 
-from nova import local
 from nova import log as logging
+from nova.openstack.common import local
 from nova import utils
 
 
diff --git a/nova/log.py b/nova/log.py
index 98c67824d..acd3ba56e 100644
--- a/nova/log.py
+++ b/nova/log.py
@@ -43,8 +43,8 @@ import traceback
 
 import nova
 from nova import flags
-from nova import local
 from nova.openstack.common import cfg
+from nova.openstack.common import local
 from nova import version
 
 
diff --git a/nova/local.py b/nova/openstack/common/local.py
index 19d962732..19d962732 100644
--- a/nova/local.py
+++ b/nova/openstack/common/local.py
diff --git a/nova/rpc/amqp.py b/nova/rpc/amqp.py
index 444ade480..5387eff17 100644
--- a/nova/rpc/amqp.py
+++ b/nova/rpc/amqp.py
@@ -36,8 +36,8 @@ from eventlet import pools
 from nova import context
 from nova import exception
 from nova import flags
-from nova import local
 from nova import log as logging
+from nova.openstack.common import local
 import nova.rpc.common as rpc_common
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/tests/test_local.py b/nova/tests/test_local.py
deleted file mode 100644
index 0ddcd59ac..000000000
--- a/nova/tests/test_local.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2012 OpenStack LLC.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-import eventlet
-
-from nova import local
-from nova import test
-
-
-class Dict(dict):
-    """Make weak referencable object."""
-    pass
-
-
-class LocalStoreTestCase(test.TestCase):
-    v1 = Dict(a='1')
-    v2 = Dict(a='2')
-    v3 = Dict(a='3')
-
-    def test_thread_unique_storage(self):
-        """Make sure local store holds thread specific values."""
-        expected_set = []
-        local.store.a = self.v1
-
-        def do_something():
-            local.store.a = self.v2
-            expected_set.append(getattr(local.store, 'a'))
-
-        def do_something2():
-            local.store.a = self.v3
-            expected_set.append(getattr(local.store, 'a'))
-
-        eventlet.spawn(do_something).wait()
-        eventlet.spawn(do_something2).wait()
-        expected_set.append(getattr(local.store, 'a'))
-
-        self.assertTrue(self.v1 in expected_set)
-        self.assertTrue(self.v2 in expected_set)
-        self.assertTrue(self.v3 in expected_set)
diff --git a/openstack-common.conf b/openstack-common.conf
index bc191b959..854e80b14 100644
--- a/openstack-common.conf
+++ b/openstack-common.conf
@@ -1,7 +1,7 @@
 [DEFAULT]
 
 # The list of modules to copy from openstack-common
-modules=cfg,iniparser
+modules=cfg,local,iniparser
 
 # The base module to hold the copy of openstack.common
 base=nova