summaryrefslogtreecommitdiffstats
path: root/tests/default_fixtures.py
diff options
context:
space:
mode:
authorJay Pipes <jaypipes@gmail.com>2012-03-13 17:30:07 -0400
committerJay Pipes <jaypipes@gmail.com>2012-03-19 12:08:30 -0400
commit193374af3860e17ed03bb0431d823046079ae444 (patch)
tree7ebb20420c9649b30a58cf133d014df7eae64cba /tests/default_fixtures.py
parent88ac1edec0b62fe5b18b2b0ffce3798f63f21351 (diff)
downloadkeystone-193374af3860e17ed03bb0431d823046079ae444.tar.gz
keystone-193374af3860e17ed03bb0431d823046079ae444.tar.xz
keystone-193374af3860e17ed03bb0431d823046079ae444.zip
Fixes LP #954089 - Service list templated catalog
* Adds missing test cases for the TemplatedCatalog * Adds a base CatalogTest that different backends can use * Updates kvs.Catalog to raise ServiceNotFound where appropriate * Updates the tests.test_keystoneclient_sql to actually test the SQL catalog backend * Removes old test for incorrect endpoints listing * Removes the keystone.catalog.core.Driver.service_exists method since it was only implemented in the SQL driver and wasn't required now that get_service and delete_service properly raise ServiceNotFound exception. Change-Id: I35690cc147e56007be27bacf94eeff360e727e5d
Diffstat (limited to 'tests/default_fixtures.py')
-rw-r--r--tests/default_fixtures.py21
1 files changed, 21 insertions, 0 deletions
diff --git a/tests/default_fixtures.py b/tests/default_fixtures.py
index 90526ceb..a97a48d8 100644
--- a/tests/default_fixtures.py
+++ b/tests/default_fixtures.py
@@ -35,3 +35,24 @@ ROLES = [
{'id': 'keystone_admin', 'name': 'Keystone Admin'},
{'id': 'useless', 'name': 'Useless'},
]
+
+SERVICES = [
+ {
+ 'id': 'COMPUTE_ID',
+ 'type': 'compute',
+ 'name': 'Nova',
+ 'description': 'OpenStack Compute service'
+ },
+ {
+ 'id': 'IDENTITY_ID',
+ 'type': 'identity',
+ 'name': 'Keystone',
+ 'description': 'OpenStack Identity service'
+ },
+ {
+ 'id': 'IMAGE_ID',
+ 'type': 'image',
+ 'name': 'Glance',
+ 'description': 'OpenStack Image service'
+ },
+]