diff options
| author | Ziad Sawalha <github@highbridgellc.com> | 2011-12-28 00:23:31 -0600 |
|---|---|---|
| committer | Ziad Sawalha <github@highbridgellc.com> | 2012-01-20 12:14:02 -0600 |
| commit | 8db366c448d4074c044f596a8e4271befdb797cb (patch) | |
| tree | ff128968469d602e00ee41cfe09e12ba31a6d6b0 /tests/utils.py | |
| parent | cbe1f82931002e3562ab41582ff86470681b889b (diff) | |
| download | python-keystoneclient-essex-3.tar.gz | |
Support for version and extension discoveryessex-3
- Supports unauthenticated call to Keystone to discover
supported API versions
- Added command-line support (usage: keystone discover)
- Added client support (keystoneclient.genenric client).
Client returns dicts, whereas shell command prints
formated output.
- Added tests for genenric client
- Replicates 'nove discover' in python-novaclient
- Starts to address blueprint keystone-client
- keystone discover output looks like this:
$ keystone discover
Keystone found at http://localhost:35357
- supports version v1.0 (DEPRECATED) here http://localhost:35357/v1.0
- supports version v1.1 (CURRENT) here http://localhost:35357/v1.1
- supports version v2.0 (BETA) here http://localhost:35357/v2.0
- and HP-IDM: HP Token Validation Extension
- and OS-KSADM: Openstack Keystone Admin
- and OS-KSCATALOG: Openstack Keystone Catalog
Change-Id: Id16d34dac094c780d36afb3e31c98c318b6071ac
Diffstat (limited to 'tests/utils.py')
| -rw-r--r-- | tests/utils.py | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/tests/utils.py b/tests/utils.py index c4530e8..04c5890 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -12,8 +12,10 @@ class TestCase(unittest.TestCase): TEST_TENANT_NAME = 'aTenant' TEST_TOKEN = 'aToken' TEST_USER = 'test' - TEST_URL = 'http://127.0.0.1:5000/v2.0' - TEST_ADMIN_URL = 'http://127.0.0.1:35357/v2.0' + TEST_ROOT_URL = 'http://127.0.0.1:5000/' + TEST_URL = '%s%s' % (TEST_ROOT_URL, 'v2.0') + TEST_ROOT_ADMIN_URL = 'http://127.0.0.1:35357/' + TEST_ADMIN_URL = '%s%s' % (TEST_ROOT_ADMIN_URL, 'v2.0') TEST_SERVICE_CATALOG = [{ "endpoints": [{ @@ -79,3 +81,24 @@ class TestCase(unittest.TestCase): super(TestCase, self).tearDown() self.mox.UnsetStubs() self.mox.VerifyAll() + + +class UnauthenticatedTestCase(unittest.TestCase): + """ Class used as base for unauthenticated calls """ + TEST_ROOT_URL = 'http://127.0.0.1:5000/' + TEST_URL = '%s%s' % (TEST_ROOT_URL, 'v2.0') + TEST_ROOT_ADMIN_URL = 'http://127.0.0.1:35357/' + TEST_ADMIN_URL = '%s%s' % (TEST_ROOT_ADMIN_URL, 'v2.0') + + def setUp(self): + super(UnauthenticatedTestCase, self).setUp() + self.mox = mox.Mox() + self._original_time = time.time + time.time = lambda: 1234 + httplib2.Http.request = self.mox.CreateMockAnything() + + def tearDown(self): + time.time = self._original_time + super(UnauthenticatedTestCase, self).tearDown() + self.mox.UnsetStubs() + self.mox.VerifyAll() |