diff options
Diffstat (limited to 'cinderclient/tests/unit/fixture_data')
| -rw-r--r-- | cinderclient/tests/unit/fixture_data/client.py | 16 | ||||
| -rw-r--r-- | cinderclient/tests/unit/fixture_data/keystone_client.py | 4 |
2 files changed, 18 insertions, 2 deletions
diff --git a/cinderclient/tests/unit/fixture_data/client.py b/cinderclient/tests/unit/fixture_data/client.py index 4a30f70..2beeb90 100644 --- a/cinderclient/tests/unit/fixture_data/client.py +++ b/cinderclient/tests/unit/fixture_data/client.py @@ -14,6 +14,7 @@ from keystoneauth1 import fixture from cinderclient.tests.unit.fixture_data import base from cinderclient.v2 import client as v2client +from cinderclient.v3 import client as v3client class Base(base.Fixture): @@ -46,3 +47,18 @@ class V2(Base): api_key='xx', project_id='xx', auth_url=self.identity_url) + + +class V3(Base): + + def __init__(self, *args, **kwargs): + super(V3, self).__init__(*args, **kwargs) + + svc = self.token.add_service('volumev3') + svc.add_endpoint(self.volume_url) + + def new_client(self): + return v3client.Client(username='xx', + api_key='xx', + project_id='xx', + auth_url=self.identity_url) diff --git a/cinderclient/tests/unit/fixture_data/keystone_client.py b/cinderclient/tests/unit/fixture_data/keystone_client.py index 061235b..81767c5 100644 --- a/cinderclient/tests/unit/fixture_data/keystone_client.py +++ b/cinderclient/tests/unit/fixture_data/keystone_client.py @@ -153,7 +153,7 @@ def generate_v2_project_scoped_token(**kwargs): ], 'endpoints_links': [], 'name': None, - 'type': 'volumev2' + 'type': 'volumev3' } # Add multiple Cinder endpoints @@ -163,7 +163,7 @@ def generate_v2_project_scoped_token(**kwargs): name = "cinder%i" % count # Assign the service name and a unique endpoint endpoint_copy['endpoints'][0]['publicURL'] = \ - 'http://%s.api.com/v2' % name + 'http://%s.api.com/v3' % name endpoint_copy['name'] = name o['access']['serviceCatalog'].append(endpoint_copy) |