Initial Oslo sync for Tempest.
This patch syncs cfg, iniparser, and setup from oslo.
Additionally, to avoid a name conflict tempest.openstack was
renamed tempest.clients.
Also, the duplicate copy of setup.py in tempest.common was removed
and all references to it were updated.
Change-Id: I6ed3a97e35ce73b820f7a436214480051ed6528f
diff --git a/tempest/tests/object_storage/base.py b/tempest/tests/object_storage/base.py
index f29798f..3992b13 100644
--- a/tempest/tests/object_storage/base.py
+++ b/tempest/tests/object_storage/base.py
@@ -18,16 +18,16 @@
import nose
import unittest2 as unittest
+from tempest import clients
import tempest.config
from tempest import exceptions
-from tempest import openstack
class BaseObjectTest(unittest.TestCase):
@classmethod
def setUpClass(cls):
- cls.os = openstack.Manager()
+ cls.os = clients.Manager()
cls.object_client = cls.os.object_client
cls.container_client = cls.os.container_client
cls.account_client = cls.os.account_client