openstack/openstacksdk
Code Issues Proposed changes

Replace catalog-v3.json with keystoneauth fixture

Browse Source 
As a first step to having a reusable fixture, replace our
use of catalog-v3.json with a fixture built on top of keystoneauth
token fixtures. Make a catalog containing all of the openstack
services.

There are a bunch of places where we just have some things
hardcoded that change with the auto-generation - like bare-metal
to baremetal. Those are whatever.

There are also places where the test code is requesting an admin
url but in the old catalog the admin and non-admin were
the same, so we were not catching that this was incorrect. Started
to fix this, but it got hairy and it's only a keystone v2 thing
which is on lifesupport. Make the admin and public urls the same
just for ease of landing this patch. We can go back in and make
them different and audit all the v2 keystone codepaths if anyone
decides to care about keystone v2.

There was a bunch of things hardcoded for block-storage which
break when we actually use proxies, which in turn breaks when
we try to properly use a better catalog fixture.

As a followup, we should stop forcing block_storage_api_version=2
because that's absurd, but this is a big enough patch as it is.

Also, volume quota calls were in the image file. Ooops.

Change-Id: I308cd159a5b71c94511f86c9d46bdbc589580c6d
This commit is contained in:
Monty Taylor 2019-08-07 15:48:50 -04:00
parent 658cd3a7f1
commit 5534590861
43 changed files with 483 additions and 1261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

184
openstack/cloud/_block_storage.py
View File

@ -33,13 +33,6 @@ def _no_pending_volumes(volumes):
class BlockStorageCloudMixin(_normalize.Normalizer): class BlockStorageCloudMixin(_normalize.Normalizer):
@property
def _volume_client(self):
if 'block-storage' not in self._raw_clients:
client = self._get_raw_client('block-storage')
self._raw_clients['block-storage'] = client
return self._raw_clients['block-storage']
@_utils.cache_on_arguments(should_cache_fn=_no_pending_volumes) @_utils.cache_on_arguments(should_cache_fn=_no_pending_volumes)
def list_volumes(self, cache=True): def list_volumes(self, cache=True):
"""List all available volumes. """List all available volumes.
@ -56,7 +49,8 @@ class BlockStorageCloudMixin(_normalize.Normalizer):
break break
if endpoint: if endpoint:
try: try:
_list(self._volume_client.get(endpoint)) _list(proxy._json_response(
self.block_storage.get(endpoint)))
except exc.OpenStackCloudURINotFound: except exc.OpenStackCloudURINotFound:
# Catch and re-raise here because we are making recursive # Catch and re-raise here because we are making recursive
# calls and we just have context for the log here # calls and we just have context for the log here
@ -75,7 +69,8 @@ class BlockStorageCloudMixin(_normalize.Normalizer):
attempts = 5 attempts = 5
for _ in range(attempts): for _ in range(attempts):
volumes = [] volumes = []
data = self._volume_client.get('/volumes/detail') data = proxy._json_response(
self.block_storage.get('/volumes/detail'))
if 'volumes_links' not in data: if 'volumes_links' not in data:
# no pagination needed # no pagination needed
volumes.extend(data.get('volumes', [])) volumes.extend(data.get('volumes', []))
@ -103,9 +98,11 @@ class BlockStorageCloudMixin(_normalize.Normalizer):
:returns: A list of volume ``munch.Munch``. :returns: A list of volume ``munch.Munch``.
""" """
data = self._volume_client.get( resp = self.block_storage.get(
'/types', '/types',
params=dict(is_public='None'), params=dict(is_public='None'))
data = proxy._json_response(
resp,
error_message='Error fetching volume_type list') error_message='Error fetching volume_type list')
return self._normalize_volume_types( return self._normalize_volume_types(
self._get_and_munchify('volume_types', data)) self._get_and_munchify('volume_types', data))
@ -141,8 +138,9 @@ class BlockStorageCloudMixin(_normalize.Normalizer):
:param id: ID of the volume. :param id: ID of the volume.
:returns: A volume ``munch.Munch``. :returns: A volume ``munch.Munch``.
""" """
data = self._volume_client.get( resp = self.block_storage.get('/volumes/{id}'.format(id=id))
'/volumes/{id}'.format(id=id), data = proxy._json_response(
resp,
error_message="Error getting volume with ID {id}".format(id=id) error_message="Error getting volume with ID {id}".format(id=id)
) )
volume = self._normalize_volume( volume = self._normalize_volume(
@ -214,9 +212,11 @@ class BlockStorageCloudMixin(_normalize.Normalizer):
if 'scheduler_hints' in kwargs: if 'scheduler_hints' in kwargs:
payload['OS-SCH-HNT:scheduler_hints'] = kwargs.pop( payload['OS-SCH-HNT:scheduler_hints'] = kwargs.pop(
'scheduler_hints', None) 'scheduler_hints', None)
data = self._volume_client.post( resp = self.block_storage.post(
'/volumes', '/volumes',
json=dict(payload), json=dict(payload))
data = proxy._json_response(
resp,
error_message='Error in creating volume') error_message='Error in creating volume')
volume = self._get_and_munchify('volume', data) volume = self._get_and_munchify('volume', data)
self.list_volumes.invalidate(self) self.list_volumes.invalidate(self)
@ -254,9 +254,11 @@ class BlockStorageCloudMixin(_normalize.Normalizer):
raise exc.OpenStackCloudException( raise exc.OpenStackCloudException(
"Volume %s not found." % name_or_id) "Volume %s not found." % name_or_id)
data = self._volume_client.put( resp = self.block_storage.put(
'/volumes/{volume_id}'.format(volume_id=volume.id), '/volumes/{volume_id}'.format(volume_id=volume.id),
json=dict({'volume': kwargs}), json=dict({'volume': kwargs}))
data = proxy._json_response(
resp,
error_message='Error updating volume') error_message='Error updating volume')
self.list_volumes.invalidate(self) self.list_volumes.invalidate(self)
@ -281,9 +283,11 @@ class BlockStorageCloudMixin(_normalize.Normalizer):
"Volume {name_or_id} does not exist".format( "Volume {name_or_id} does not exist".format(
name_or_id=name_or_id)) name_or_id=name_or_id))
self._volume_client.post( resp = self.block_storage.post(
'volumes/{id}/action'.format(id=volume['id']), 'volumes/{id}/action'.format(id=volume['id']),
json={'os-set_bootable': {'bootable': bootable}}, json={'os-set_bootable': {'bootable': bootable}})
proxy._json_response(
resp,
error_message="Error setting bootable on volume {volume}".format( error_message="Error setting bootable on volume {volume}".format(
volume=volume['id']) volume=volume['id'])
) )
@ -315,12 +319,12 @@ class BlockStorageCloudMixin(_normalize.Normalizer):
with _utils.shade_exceptions("Error in deleting volume"): with _utils.shade_exceptions("Error in deleting volume"):
try: try:
if force: if force:
self._volume_client.post( proxy._json_response(self.block_storage.post(
'volumes/{id}/action'.format(id=volume['id']), 'volumes/{id}/action'.format(id=volume['id']),
json={'os-force_delete': None}) json={'os-force_delete': None}))
else: else:
self._volume_client.delete( proxy._json_response(self.block_storage.delete(
'volumes/{id}'.format(id=volume['id'])) 'volumes/{id}'.format(id=volume['id'])))
except exc.OpenStackCloudURINotFound: except exc.OpenStackCloudURINotFound:
self.log.debug( self.log.debug(
"Volume {id} not found when deleting. Ignoring.".format( "Volume {id} not found when deleting. Ignoring.".format(
@ -368,7 +372,8 @@ class BlockStorageCloudMixin(_normalize.Normalizer):
error_msg = "{msg} for the project: {project} ".format( error_msg = "{msg} for the project: {project} ".format(
msg=error_msg, project=name_or_id) msg=error_msg, project=name_or_id)
data = self._volume_client.get('/limits', params=params) data = proxy._json_response(
self.block_storage.get('/limits', params=params))
limits = self._get_and_munchify('limits', data) limits = self._get_and_munchify('limits', data)
return limits return limits
@ -516,12 +521,12 @@ class BlockStorageCloudMixin(_normalize.Normalizer):
description = kwargs.pop('description', description = kwargs.pop('description',
kwargs.pop('display_description', None)) kwargs.pop('display_description', None))
if name: if name:
if self._is_client_version('volume', 2): if self.block_storage._version_matches(2):
kwargs['name'] = name kwargs['name'] = name
else: else:
kwargs['display_name'] = name kwargs['display_name'] = name
if description: if description:
if self._is_client_version('volume', 2): if self.block_storage._version_matches(2):
kwargs['description'] = description kwargs['description'] = description
else: else:
kwargs['display_description'] = description kwargs['display_description'] = description
@ -553,9 +558,11 @@ class BlockStorageCloudMixin(_normalize.Normalizer):
kwargs = self._get_volume_kwargs(kwargs) kwargs = self._get_volume_kwargs(kwargs)
payload = {'volume_id': volume_id, 'force': force} payload = {'volume_id': volume_id, 'force': force}
payload.update(kwargs) payload.update(kwargs)
data = self._volume_client.post( resp = self.block_storage.post(
'/snapshots', '/snapshots',
json=dict(snapshot=payload), json=dict(snapshot=payload))
data = proxy._json_response(
resp,
error_message="Error creating snapshot of volume " error_message="Error creating snapshot of volume "
"{volume_id}".format(volume_id=volume_id)) "{volume_id}".format(volume_id=volume_id))
snapshot = self._get_and_munchify('snapshot', data) snapshot = self._get_and_munchify('snapshot', data)
@ -588,8 +595,10 @@ class BlockStorageCloudMixin(_normalize.Normalizer):
param: snapshot_id: ID of the volume snapshot. param: snapshot_id: ID of the volume snapshot.
""" """
data = self._volume_client.get( resp = self.block_storage.get(
'/snapshots/{snapshot_id}'.format(snapshot_id=snapshot_id), '/snapshots/{snapshot_id}'.format(snapshot_id=snapshot_id))
data = proxy._json_response(
resp,
error_message="Error getting snapshot " error_message="Error getting snapshot "
"{snapshot_id}".format(snapshot_id=snapshot_id)) "{snapshot_id}".format(snapshot_id=snapshot_id))
return self._normalize_volume( return self._normalize_volume(
@ -647,8 +656,10 @@ class BlockStorageCloudMixin(_normalize.Normalizer):
'force': force, 'force': force,
} }
data = self._volume_client.post( resp = self.block_storage.post(
'/backups', json=dict(backup=payload), '/backups', json=dict(backup=payload))
data = proxy._json_response(
resp,
error_message="Error creating backup of volume " error_message="Error creating backup of volume "
"{volume_id}".format(volume_id=volume_id)) "{volume_id}".format(volume_id=volume_id))
backup = self._get_and_munchify('backup', data) backup = self._get_and_munchify('backup', data)
@ -686,9 +697,11 @@ class BlockStorageCloudMixin(_normalize.Normalizer):
""" """
endpoint = '/snapshots/detail' if detailed else '/snapshots' endpoint = '/snapshots/detail' if detailed else '/snapshots'
data = self._volume_client.get( resp = self.block_storage.get(
endpoint, endpoint,
params=search_opts, params=search_opts)
data = proxy._json_response(
resp,
error_message="Error getting a list of snapshots") error_message="Error getting a list of snapshots")
return self._get_and_munchify('snapshots', data) return self._get_and_munchify('snapshots', data)
@ -710,8 +723,10 @@ class BlockStorageCloudMixin(_normalize.Normalizer):
:returns: A list of volume backups ``munch.Munch``. :returns: A list of volume backups ``munch.Munch``.
""" """
endpoint = '/backups/detail' if detailed else '/backups' endpoint = '/backups/detail' if detailed else '/backups'
data = self._volume_client.get( resp = self.block_storage.get(
endpoint, params=search_opts, endpoint, params=search_opts)
data = proxy._json_response(
resp,
error_message="Error getting a list of backups") error_message="Error getting a list of backups")
return self._get_and_munchify('backups', data) return self._get_and_munchify('backups', data)
@ -736,16 +751,15 @@ class BlockStorageCloudMixin(_normalize.Normalizer):
msg = "Error in deleting volume backup" msg = "Error in deleting volume backup"
if force: if force:
self._volume_client.post( resp = self.block_storage.post(
'/backups/{backup_id}/action'.format( '/backups/{backup_id}/action'.format(
backup_id=volume_backup['id']), backup_id=volume_backup['id']),
json={'os-force_delete': None}, json={'os-force_delete': None})
error_message=msg)
else: else:
self._volume_client.delete( resp = self.block_storage.delete(
'/backups/{backup_id}'.format( '/backups/{backup_id}'.format(
backup_id=volume_backup['id']), backup_id=volume_backup['id']))
error_message=msg) proxy._json_response(resp, error_message=msg)
if wait: if wait:
msg = "Timeout waiting for the volume backup to be deleted." msg = "Timeout waiting for the volume backup to be deleted."
for count in utils.iterate_timeout(timeout, msg): for count in utils.iterate_timeout(timeout, msg):
@ -772,9 +786,11 @@ class BlockStorageCloudMixin(_normalize.Normalizer):
if not volumesnapshot: if not volumesnapshot:
return False return False
self._volume_client.delete( resp = self.block_storage.delete(
'/snapshots/{snapshot_id}'.format( '/snapshots/{snapshot_id}'.format(
snapshot_id=volumesnapshot['id']), snapshot_id=volumesnapshot['id']))
proxy._json_response(
resp,
error_message="Error in deleting volume snapshot") error_message="Error in deleting volume snapshot")
if wait: if wait:
@ -818,8 +834,10 @@ class BlockStorageCloudMixin(_normalize.Normalizer):
raise exc.OpenStackCloudException( raise exc.OpenStackCloudException(
"VolumeType not found: %s" % name_or_id) "VolumeType not found: %s" % name_or_id)
data = self._volume_client.get( resp = self.block_storage.get(
'/types/{id}/os-volume-type-access'.format(id=volume_type.id), '/types/{id}/os-volume-type-access'.format(id=volume_type.id))
data = proxy._json_response(
resp,
error_message="Unable to get volume type access" error_message="Unable to get volume type access"
" {name}".format(name=name_or_id)) " {name}".format(name=name_or_id))
return self._normalize_volume_type_accesses( return self._normalize_volume_type_accesses(
@ -839,11 +857,12 @@ class BlockStorageCloudMixin(_normalize.Normalizer):
if not volume_type: if not volume_type:
raise exc.OpenStackCloudException( raise exc.OpenStackCloudException(
"VolumeType not found: %s" % name_or_id) "VolumeType not found: %s" % name_or_id)
with _utils.shade_exceptions():
payload = {'project': project_id} payload = {'project': project_id}
self._volume_client.post( resp = self.block_storage.post(
'/types/{id}/action'.format(id=volume_type.id), '/types/{id}/action'.format(id=volume_type.id),
json=dict(addProjectAccess=payload), json=dict(addProjectAccess=payload))
proxy._json_response(
resp,
error_message="Unable to authorize {project} " error_message="Unable to authorize {project} "
"to use volume type {name}".format( "to use volume type {name}".format(
name=name_or_id, project=project_id)) name=name_or_id, project=project_id))
@ -860,11 +879,72 @@ class BlockStorageCloudMixin(_normalize.Normalizer):
if not volume_type: if not volume_type:
raise exc.OpenStackCloudException( raise exc.OpenStackCloudException(
"VolumeType not found: %s" % name_or_id) "VolumeType not found: %s" % name_or_id)
with _utils.shade_exceptions():
payload = {'project': project_id} payload = {'project': project_id}
self._volume_client.post( resp = self.block_storage.post(
'/types/{id}/action'.format(id=volume_type.id), '/types/{id}/action'.format(id=volume_type.id),
json=dict(removeProjectAccess=payload), json=dict(removeProjectAccess=payload))
proxy._json_response(
resp,
error_message="Unable to revoke {project} " error_message="Unable to revoke {project} "
"to use volume type {name}".format( "to use volume type {name}".format(
name=name_or_id, project=project_id)) name=name_or_id, project=project_id))
def set_volume_quotas(self, name_or_id, **kwargs):
""" Set a volume quota in a project
:param name_or_id: project name or id
:param kwargs: key/value pairs of quota name and quota value
:raises: OpenStackCloudException if the resource to set the
quota does not exist.
"""
proj = self.get_project(name_or_id)
if not proj:
raise exc.OpenStackCloudException("project does not exist")
kwargs['tenant_id'] = proj.id
resp = self.block_storage.put(
'/os-quota-sets/{tenant_id}'.format(tenant_id=proj.id),
json={'quota_set': kwargs})
proxy._json_response(
resp,
error_message="No valid quota or resource")
def get_volume_quotas(self, name_or_id):
""" Get volume quotas for a project
:param name_or_id: project name or id
:raises: OpenStackCloudException if it's not a valid project
:returns: Munch object with the quotas
"""
proj = self.get_project(name_or_id)
if not proj:
raise exc.OpenStackCloudException("project does not exist")
resp = self.block_storage.get(
'/os-quota-sets/{tenant_id}'.format(tenant_id=proj.id))
data = proxy._json_response(
resp,
error_message="cinder client call failed")
return self._get_and_munchify('quota_set', data)
def delete_volume_quotas(self, name_or_id):
""" Delete volume quotas for a project
:param name_or_id: project name or id
:raises: OpenStackCloudException if it's not a valid project or the
cinder client call failed
:returns: dict with the quotas
"""
proj = self.get_project(name_or_id)
if not proj:
raise exc.OpenStackCloudException("project does not exist")
resp = self.block_storage.delete(
'/os-quota-sets/{tenant_id}'.format(tenant_id=proj.id))
return proxy._json_response(
resp,
error_message="cinder client call failed")

54
openstack/cloud/_image.py
View File

@ -328,57 +328,3 @@ class ImageCloudMixin(_normalize.Normalizer):
image = image or name_or_id image = image or name_or_id
return self.image.update_image_properties( return self.image.update_image_properties(
image=image, meta=meta, **properties) image=image, meta=meta, **properties)
def set_volume_quotas(self, name_or_id, **kwargs):
""" Set a volume quota in a project
:param name_or_id: project name or id
:param kwargs: key/value pairs of quota name and quota value
:raises: OpenStackCloudException if the resource to set the
quota does not exist.
"""
proj = self.get_project(name_or_id)
if not proj:
raise exc.OpenStackCloudException("project does not exist")
kwargs['tenant_id'] = proj.id
self._volume_client.put(
'/os-quota-sets/{tenant_id}'.format(tenant_id=proj.id),
json={'quota_set': kwargs},
error_message="No valid quota or resource")
def get_volume_quotas(self, name_or_id):
""" Get volume quotas for a project
:param name_or_id: project name or id
:raises: OpenStackCloudException if it's not a valid project
:returns: Munch object with the quotas
"""
proj = self.get_project(name_or_id)
if not proj:
raise exc.OpenStackCloudException("project does not exist")
data = self._volume_client.get(
'/os-quota-sets/{tenant_id}'.format(tenant_id=proj.id),
error_message="cinder client call failed")
return self._get_and_munchify('quota_set', data)
def delete_volume_quotas(self, name_or_id):
""" Delete volume quotas for a project
:param name_or_id: project name or id
:raises: OpenStackCloudException if it's not a valid project or the
cinder client call failed
:returns: dict with the quotas
"""
proj = self.get_project(name_or_id)
if not proj:
raise exc.OpenStackCloudException("project does not exist")
return self._volume_client.delete(
'/os-quota-sets/{tenant_id}'.format(tenant_id=proj.id),
error_message="cinder client call failed")

3
openstack/cloud/openstackcloud.py
View File

@ -453,7 +453,8 @@ class _OpenStackCloudMixin(object):
region_name=self.config.get_region_name(service_type)) region_name=self.config.get_region_name(service_type))
def _is_client_version(self, client, version): def _is_client_version(self, client, version):
client_name = '_{client}_client'.format(client=client) client_name = '_{client}_client'.format(
client=client.replace('-', '_'))
client = getattr(self, client_name) client = getattr(self, client_name)
return client._version_matches(version) return client._version_matches(version)

0
openstack/fixture/__init__.py Normal file
View File

107
openstack/fixture/connection.py Normal file
View File

@ -0,0 +1,107 @@
# Copyright 2019 Red Hat, Inc.
#
# 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 uuid
import fixtures
from keystoneauth1.fixture import v2
from keystoneauth1.fixture import v3
import os_service_types
_service_type_manager = os_service_types.ServiceTypes()
_SUBURL_TEMPLATES = {
'public': 'https://example.com/{service_type}',
'internal': 'https://internal.example.com/{service_type}',
'admin': 'https://example.com/{service_type}',
}
_ENDPOINT_TEMPLATES = {
'public': 'https://{service_type}.example.com',
'internal': 'https://internal.{service_type}.example.com',
'admin': 'https://{service_type}.example.com',
}
class ConnectionFixture(fixtures.Fixture):
_suffixes = {
'baremetal': '/',
'block-storage': '/{project_id}',
'compute': '/v2.1/',
'container-infrastructure-management': '/v1',
'object-store': '/v1/{project_id}',
'orchestration': '/v1/{project_id}',
'volumev2': '/v2/{project_id}',
'volumev3': '/v3/{project_id}',
}
def __init__(self, suburl=False, project_id=None, *args, **kwargs):
super(ConnectionFixture, self).__init__(*args, **kwargs)
self._endpoint_templates = _ENDPOINT_TEMPLATES
if suburl:
self.use_suburl()
self.project_id = project_id or uuid.uuid4().hex.replace('-', '')
self.build_tokens()
def use_suburl(self):
self._endpoint_templates = _SUBURL_TEMPLATES
def _get_endpoint_templates(self, service_type, alias=None, v2=False):
templates = {}
for k, v in self._endpoint_templates.items():
suffix = self._suffixes.get(
alias, self._suffixes.get(service_type, ''))
# For a keystone v2 catalog, we want to list the
# versioned endpoint in the catalog, because that's
# more likely how those were deployed.
if v2:
suffix = '/v2.0'
templates[k] = (v + suffix).format(
service_type=service_type,
project_id=self.project_id,
)
return templates
def _setUp(self):
pass
def clear_tokens(self):
self.v2_token = v2.Token(tenant_id=self.project_id)
self.v3_token = v3.Token(project_id=self.project_id)
def build_tokens(self):
self.clear_tokens()
for service in _service_type_manager.services:
service_type = service['service_type']
if service_type == 'ec2-api':
continue
service_name = service['project']
ets = self._get_endpoint_templates(service_type)
v3_svc = self.v3_token.add_service(
service_type, name=service_name)
v2_svc = self.v2_token.add_service(
service_type, name=service_name)
v3_svc.add_standard_endpoints(region='RegionOne', **ets)
if service_type == 'identity':
ets = self._get_endpoint_templates(service_type, v2=True)
v2_svc.add_endpoint(region='RegionOne', **ets)
for alias in service.get('aliases', []):
ets = self._get_endpoint_templates(service_type, alias=alias)
v3_svc = self.v3_token.add_service(alias, name=service_name)
v2_svc = self.v2_token.add_service(alias, name=service_name)
v3_svc.add_standard_endpoints(region='RegionOne', **ets)
v2_svc.add_endpoint(region='RegionOne', **ets)
def _cleanup(self):
pass

4
openstack/tests/functional/cloud/test_volume_type.py
View File

@ -38,13 +38,13 @@ class TestVolumeType(base.BaseFunctionalTest):
"name": 'test-volume-type', "name": 'test-volume-type',
"description": None, "description": None,
"os-volume-type-access:is_public": False} "os-volume-type-access:is_public": False}
self.operator_cloud._volume_client.post( self.operator_cloud.block_storage.post(
'/types', json={'volume_type': volume_type}) '/types', json={'volume_type': volume_type})
def tearDown(self): def tearDown(self):
ret = self.operator_cloud.get_volume_type('test-volume-type') ret = self.operator_cloud.get_volume_type('test-volume-type')
if ret.get('id'): if ret.get('id'):
self.operator_cloud._volume_client.delete( self.operator_cloud.block_storage.delete(
'/types/{volume_type_id}'.format(volume_type_id=ret.id)) '/types/{volume_type_id}'.format(volume_type_id=ret.id))
super(TestVolumeType, self).tearDown() super(TestVolumeType, self).tearDown()

34
openstack/tests/unit/base.py
View File

@ -29,6 +29,8 @@ import tempfile
import openstack.cloud import openstack.cloud
import openstack.connection import openstack.connection
from openstack.tests import fakes
from openstack.fixture import connection as os_fixture
from openstack.tests import base from openstack.tests import base
@ -101,6 +103,8 @@ class TestCase(base.TestCase):
'time.sleep', 'time.sleep',
_nosleep)) _nosleep))
self.fixtures_directory = 'openstack/tests/unit/fixtures' self.fixtures_directory = 'openstack/tests/unit/fixtures'
self.os_fixture = self.useFixture(
os_fixture.ConnectionFixture(project_id=fakes.PROJECT_ID))
# Isolate openstack.config from test environment # Isolate openstack.config from test environment
config = tempfile.NamedTemporaryFile(delete=False) config = tempfile.NamedTemporaryFile(delete=False)
@ -422,18 +426,15 @@ class TestCase(base.TestCase):
def get_keystone_v3_token( def get_keystone_v3_token(
self, self,
catalog='catalog-v3.json',
project_name='admin', project_name='admin',
): ):
catalog_file = os.path.join(self.fixtures_directory, catalog)
with open(catalog_file, 'r') as tokens_file:
return dict( return dict(
method='POST', method='POST',
uri='https://identity.example.com/v3/auth/tokens', uri='https://identity.example.com/v3/auth/tokens',
headers={ headers={
'X-Subject-Token': self.getUniqueString('KeystoneToken') 'X-Subject-Token': self.getUniqueString('KeystoneToken')
}, },
text=tokens_file.read(), json=self.os_fixture.v3_token,
validate=dict(json={ validate=dict(json={
'auth': { 'auth': {
'identity': { 'identity': {
@ -460,7 +461,7 @@ class TestCase(base.TestCase):
}), }),
) )
def get_keystone_v3_discovery(self): def get_keystone_discovery(self):
with open(self.discovery_json, 'r') as discovery_file: with open(self.discovery_json, 'r') as discovery_file:
return dict( return dict(
method='GET', method='GET',
@ -468,13 +469,13 @@ class TestCase(base.TestCase):
text=discovery_file.read(), text=discovery_file.read(),
) )
def use_keystone_v3(self, catalog='catalog-v3.json'): def use_keystone_v3(self):
self.adapter = self.useFixture(rm_fixture.Fixture()) self.adapter = self.useFixture(rm_fixture.Fixture())
self.calls = [] self.calls = []
self._uri_registry.clear() self._uri_registry.clear()
self.__do_register_uris([ self.__do_register_uris([
self.get_keystone_v3_discovery(), self.get_keystone_discovery(),
self.get_keystone_v3_token(catalog), self.get_keystone_v3_token(),
]) ])
self._make_test_cloud(identity_api_version='3') self._make_test_cloud(identity_api_version='3')
@ -483,16 +484,11 @@ class TestCase(base.TestCase):
self.calls = [] self.calls = []
self._uri_registry.clear() self._uri_registry.clear()
with open(self.discovery_json, 'r') as discovery_file, \
open(os.path.join(
self.fixtures_directory,
'catalog-v2.json'), 'r') as tokens_file:
self.__do_register_uris([ self.__do_register_uris([
dict(method='GET', uri='https://identity.example.com/', self.get_keystone_discovery(),
text=discovery_file.read()),
dict(method='POST', dict(method='POST',
uri='https://identity.example.com/v2.0/tokens', uri='https://identity.example.com/v2.0/tokens',
text=tokens_file.read() json=self.os_fixture.v2_token,
), ),
]) ])
@ -509,7 +505,7 @@ class TestCase(base.TestCase):
def get_cinder_discovery_mock_dict( def get_cinder_discovery_mock_dict(
self, self,
block_storage_version_json='block-storage-version.json', block_storage_version_json='block-storage-version.json',
block_storage_discovery_url='https://volume.example.com/'): block_storage_discovery_url='https://block-storage.example.com/'):
discovery_fixture = os.path.join( discovery_fixture = os.path.join(
self.fixtures_directory, block_storage_version_json) self.fixtures_directory, block_storage_version_json)
return dict(method='GET', uri=block_storage_discovery_url, return dict(method='GET', uri=block_storage_discovery_url,
@ -551,7 +547,7 @@ class TestCase(base.TestCase):
def get_ironic_discovery_mock_dict(self): def get_ironic_discovery_mock_dict(self):
discovery_fixture = os.path.join( discovery_fixture = os.path.join(
self.fixtures_directory, "baremetal.json") self.fixtures_directory, "baremetal.json")
return dict(method='GET', uri="https://bare-metal.example.com/", return dict(method='GET', uri="https://baremetal.example.com/",
text=open(discovery_fixture, 'r').read()) text=open(discovery_fixture, 'r').read())
def get_senlin_discovery_mock_dict(self): def get_senlin_discovery_mock_dict(self):
@ -580,6 +576,10 @@ class TestCase(base.TestCase):
self.get_glance_discovery_mock_dict( self.get_glance_discovery_mock_dict(
image_version_json, image_discovery_url)]) image_version_json, image_discovery_url)])
def use_cinder(self):
self.__do_register_uris([
self.get_cinder_discovery_mock_dict()])
def use_placement(self): def use_placement(self):
self.__do_register_uris([ self.__do_register_uris([
self.get_placement_discovery_mock_dict()]) self.get_placement_discovery_mock_dict()])

6
openstack/tests/unit/cloud/test_caching.py
View File

@ -117,7 +117,7 @@ class TestMemoryCache(base.TestCase):
for p in project_list]} for p in project_list]}
mock_uri = self.get_mock_url( mock_uri = self.get_mock_url(
service_type='identity', interface='admin', resource='projects', service_type='identity', resource='projects',
base_url_append='v3') base_url_append='v3')
self.register_uris([ self.register_uris([
@ -206,6 +206,7 @@ class TestMemoryCache(base.TestCase):
'Volume 2 Display Name') 'Volume 2 Display Name')
fake_volume2_dict = meta.obj_to_munch(fake_volume2) fake_volume2_dict = meta.obj_to_munch(fake_volume2)
self.register_uris([ self.register_uris([
self.get_cinder_discovery_mock_dict(),
dict(method='GET', dict(method='GET',
uri=self.get_mock_url( uri=self.get_mock_url(
'volumev2', 'public', append=['volumes', 'detail']), 'volumev2', 'public', append=['volumes', 'detail']),
@ -236,6 +237,7 @@ class TestMemoryCache(base.TestCase):
'Volume 2 Display Name') 'Volume 2 Display Name')
fake_volume2_dict = meta.obj_to_munch(fake_volume2) fake_volume2_dict = meta.obj_to_munch(fake_volume2)
self.register_uris([ self.register_uris([
self.get_cinder_discovery_mock_dict(),
dict(method='GET', dict(method='GET',
uri=self.get_mock_url( uri=self.get_mock_url(
'volumev2', 'public', append=['volumes', 'detail']), 'volumev2', 'public', append=['volumes', 'detail']),
@ -266,6 +268,7 @@ class TestMemoryCache(base.TestCase):
fake_vol_avail['status'] = 'deleting' fake_vol_avail['status'] = 'deleting'
self.register_uris([ self.register_uris([
self.get_cinder_discovery_mock_dict(),
dict(method='GET', dict(method='GET',
uri=self.get_mock_url( uri=self.get_mock_url(
'volumev2', 'public', append=['volumes', 'detail']), 'volumev2', 'public', append=['volumes', 'detail']),
@ -323,7 +326,6 @@ class TestMemoryCache(base.TestCase):
dict(method='GET', dict(method='GET',
uri=self.get_mock_url( uri=self.get_mock_url(
service_type='identity', service_type='identity',
interface='admin',
resource='users', resource='users',
base_url_append='v3'), base_url_append='v3'),
status_code=200, status_code=200,

58
openstack/tests/unit/cloud/test_cluster_templates.py
View File

@ -51,16 +51,24 @@ cluster_template_obj = munch.Munch(
class TestClusterTemplates(base.TestCase): class TestClusterTemplates(base.TestCase):
def get_mock_url(
self,
service_type='container-infrastructure-management',
base_url_append=None, append=None, resource=None):
return super(TestClusterTemplates, self).get_mock_url(
service_type=service_type, resource=resource,
append=append, base_url_append=base_url_append)
def test_list_cluster_templates_without_detail(self): def test_list_cluster_templates_without_detail(self):
self.register_uris([ self.register_uris([
dict( dict(
method='GET', method='GET',
uri='https://container-infra.example.com/v1/clustertemplates', uri=self.get_mock_url(resource='clustertemplates'),
status_code=404), status_code=404),
dict( dict(
method='GET', method='GET',
uri='https://container-infra.example.com/v1/baymodels/detail', uri=self.get_mock_url(resource='baymodels/detail'),
json=dict(baymodels=[cluster_template_obj.toDict()]))]) json=dict(baymodels=[cluster_template_obj.toDict()]))])
cluster_templates_list = self.cloud.list_cluster_templates() cluster_templates_list = self.cloud.list_cluster_templates()
self.assertEqual( self.assertEqual(
@ -72,11 +80,11 @@ class TestClusterTemplates(base.TestCase):
self.register_uris([ self.register_uris([
dict( dict(
method='GET', method='GET',
uri='https://container-infra.example.com/v1/clustertemplates', uri=self.get_mock_url(resource='clustertemplates'),
status_code=404), status_code=404),
dict( dict(
method='GET', method='GET',
uri='https://container-infra.example.com/v1/baymodels/detail', uri=self.get_mock_url(resource='baymodels/detail'),
json=dict(baymodels=[cluster_template_obj.toDict()]))]) json=dict(baymodels=[cluster_template_obj.toDict()]))])
cluster_templates_list = self.cloud.list_cluster_templates(detail=True) cluster_templates_list = self.cloud.list_cluster_templates(detail=True)
self.assertEqual( self.assertEqual(
@ -88,11 +96,11 @@ class TestClusterTemplates(base.TestCase):
self.register_uris([ self.register_uris([
dict( dict(
method='GET', method='GET',
uri='https://container-infra.example.com/v1/clustertemplates', uri=self.get_mock_url(resource='clustertemplates'),
status_code=404), status_code=404),
dict( dict(
method='GET', method='GET',
uri='https://container-infra.example.com/v1/baymodels/detail', uri=self.get_mock_url(resource='baymodels/detail'),
json=dict(baymodels=[cluster_template_obj.toDict()]))]) json=dict(baymodels=[cluster_template_obj.toDict()]))])
cluster_templates = self.cloud.search_cluster_templates( cluster_templates = self.cloud.search_cluster_templates(
@ -107,11 +115,11 @@ class TestClusterTemplates(base.TestCase):
self.register_uris([ self.register_uris([
dict( dict(
method='GET', method='GET',
uri='https://container-infra.example.com/v1/clustertemplates', uri=self.get_mock_url(resource='clustertemplates'),
status_code=404), status_code=404),
dict( dict(
method='GET', method='GET',
uri='https://container-infra.example.com/v1/baymodels/detail', uri=self.get_mock_url(resource='baymodels/detail'),
json=dict(baymodels=[cluster_template_obj.toDict()]))]) json=dict(baymodels=[cluster_template_obj.toDict()]))])
cluster_templates = self.cloud.search_cluster_templates( cluster_templates = self.cloud.search_cluster_templates(
@ -124,11 +132,11 @@ class TestClusterTemplates(base.TestCase):
self.register_uris([ self.register_uris([
dict( dict(
method='GET', method='GET',
uri='https://container-infra.example.com/v1/clustertemplates', uri=self.get_mock_url(resource='clustertemplates'),
status_code=404), status_code=404),
dict( dict(
method='GET', method='GET',
uri='https://container-infra.example.com/v1/baymodels/detail', uri=self.get_mock_url(resource='baymodels/detail'),
json=dict(baymodels=[cluster_template_obj.toDict()]))]) json=dict(baymodels=[cluster_template_obj.toDict()]))])
r = self.cloud.get_cluster_template('fake-cluster-template') r = self.cloud.get_cluster_template('fake-cluster-template')
@ -141,11 +149,11 @@ class TestClusterTemplates(base.TestCase):
self.register_uris([ self.register_uris([
dict( dict(
method='GET', method='GET',
uri='https://container-infra.example.com/v1/clustertemplates', uri=self.get_mock_url(resource='clustertemplates'),
status_code=404), status_code=404),
dict( dict(
method='GET', method='GET',
uri='https://container-infra.example.com/v1/baymodels/detail', uri=self.get_mock_url(resource='baymodels/detail'),
json=dict(baymodels=[]))]) json=dict(baymodels=[]))])
r = self.cloud.get_cluster_template('doesNotExist') r = self.cloud.get_cluster_template('doesNotExist')
self.assertIsNone(r) self.assertIsNone(r)
@ -155,11 +163,11 @@ class TestClusterTemplates(base.TestCase):
self.register_uris([ self.register_uris([
dict( dict(
method='POST', method='POST',
uri='https://container-infra.example.com/v1/clustertemplates', uri=self.get_mock_url(resource='clustertemplates'),
status_code=404), status_code=404),
dict( dict(
method='POST', method='POST',
uri='https://container-infra.example.com/v1/baymodels', uri=self.get_mock_url(resource='baymodels'),
json=dict(baymodels=[cluster_template_obj.toDict()]), json=dict(baymodels=[cluster_template_obj.toDict()]),
validate=dict(json={ validate=dict(json={
'coe': 'fake-coe', 'coe': 'fake-coe',
@ -177,11 +185,11 @@ class TestClusterTemplates(base.TestCase):
self.register_uris([ self.register_uris([
dict( dict(
method='POST', method='POST',
uri='https://container-infra.example.com/v1/clustertemplates', uri=self.get_mock_url(resource='clustertemplates'),
status_code=404), status_code=404),
dict( dict(
method='POST', method='POST',
uri='https://container-infra.example.com/v1/baymodels', uri=self.get_mock_url(resource='baymodels'),
status_code=403)]) status_code=403)])
# TODO(mordred) requests here doens't give us a great story # TODO(mordred) requests here doens't give us a great story
# for matching the old error message text. Investigate plumbing # for matching the old error message text. Investigate plumbing
@ -196,37 +204,35 @@ class TestClusterTemplates(base.TestCase):
self.assert_calls() self.assert_calls()
def test_delete_cluster_template(self): def test_delete_cluster_template(self):
uri = 'https://container-infra.example.com/v1/baymodels/fake-uuid'
self.register_uris([ self.register_uris([
dict( dict(
method='GET', method='GET',
uri='https://container-infra.example.com/v1/clustertemplates', uri=self.get_mock_url(resource='clustertemplates'),
status_code=404), status_code=404),
dict( dict(
method='GET', method='GET',
uri='https://container-infra.example.com/v1/baymodels/detail', uri=self.get_mock_url(resource='baymodels/detail'),
json=dict(baymodels=[cluster_template_obj.toDict()])), json=dict(baymodels=[cluster_template_obj.toDict()])),
dict( dict(
method='DELETE', method='DELETE',
uri=uri), uri=self.get_mock_url(resource='baymodels/fake-uuid')),
]) ])
self.cloud.delete_cluster_template('fake-uuid') self.cloud.delete_cluster_template('fake-uuid')
self.assert_calls() self.assert_calls()
def test_update_cluster_template(self): def test_update_cluster_template(self):
uri = 'https://container-infra.example.com/v1/baymodels/fake-uuid'
self.register_uris([ self.register_uris([
dict( dict(
method='GET', method='GET',
uri='https://container-infra.example.com/v1/clustertemplates', uri=self.get_mock_url(resource='clustertemplates'),
status_code=404), status_code=404),
dict( dict(
method='GET', method='GET',
uri='https://container-infra.example.com/v1/baymodels/detail', uri=self.get_mock_url(resource='baymodels/detail'),
json=dict(baymodels=[cluster_template_obj.toDict()])), json=dict(baymodels=[cluster_template_obj.toDict()])),
dict( dict(
method='PATCH', method='PATCH',
uri=uri, uri=self.get_mock_url(resource='baymodels/fake-uuid'),
status_code=200, status_code=200,
validate=dict( validate=dict(
json=[{ json=[{
@ -237,7 +243,7 @@ class TestClusterTemplates(base.TestCase):
)), )),
dict( dict(
method='GET', method='GET',
uri='https://container-infra.example.com/v1/clustertemplates', uri=self.get_mock_url(resource='clustertemplates'),
# This json value is not meaningful to the test - it just has # This json value is not meaningful to the test - it just has
# to be valid. # to be valid.
json=dict(baymodels=[cluster_template_obj.toDict()])), json=dict(baymodels=[cluster_template_obj.toDict()])),
@ -251,7 +257,7 @@ class TestClusterTemplates(base.TestCase):
self.register_uris([ self.register_uris([
dict( dict(
method='GET', method='GET',
uri='https://container-infra.example.com/v1/clustertemplates', uri=self.get_mock_url(resource='clustertemplates'),
json=dict(clustertemplates=[cluster_template_obj.toDict()]))]) json=dict(clustertemplates=[cluster_template_obj.toDict()]))])
r = self.cloud.get_coe_cluster_template('fake-cluster-template') r = self.cloud.get_coe_cluster_template('fake-cluster-template')

38
openstack/tests/unit/cloud/test_coe_clusters.py
View File

@ -39,11 +39,19 @@ coe_cluster_obj = munch.Munch(
class TestCOEClusters(base.TestCase): class TestCOEClusters(base.TestCase):
def get_mock_url(
self,
service_type='container-infrastructure-management',
base_url_append=None, append=None, resource=None):
return super(TestCOEClusters, self).get_mock_url(
service_type=service_type, resource=resource,
append=append, base_url_append=base_url_append)
def test_list_coe_clusters(self): def test_list_coe_clusters(self):
self.register_uris([dict( self.register_uris([dict(
method='GET', method='GET',
uri='https://container-infra.example.com/v1/clusters', uri=self.get_mock_url(resource='clusters'),
json=dict(clusters=[coe_cluster_obj.toDict()]))]) json=dict(clusters=[coe_cluster_obj.toDict()]))])
cluster_list = self.cloud.list_coe_clusters() cluster_list = self.cloud.list_coe_clusters()
self.assertEqual( self.assertEqual(
@ -54,7 +62,7 @@ class TestCOEClusters(base.TestCase):
def test_create_coe_cluster(self): def test_create_coe_cluster(self):
self.register_uris([dict( self.register_uris([dict(
method='POST', method='POST',
uri='https://container-infra.example.com/v1/clusters', uri=self.get_mock_url(resource='clusters'),
json=dict(baymodels=[coe_cluster_obj.toDict()]), json=dict(baymodels=[coe_cluster_obj.toDict()]),
validate=dict(json={ validate=dict(json={
'name': 'k8s', 'name': 'k8s',
@ -72,7 +80,7 @@ class TestCOEClusters(base.TestCase):
def test_search_coe_cluster_by_name(self): def test_search_coe_cluster_by_name(self):
self.register_uris([dict( self.register_uris([dict(
method='GET', method='GET',
uri='https://container-infra.example.com/v1/clusters', uri=self.get_mock_url(resource='clusters'),
json=dict(clusters=[coe_cluster_obj.toDict()]))]) json=dict(clusters=[coe_cluster_obj.toDict()]))])
coe_clusters = self.cloud.search_coe_clusters( coe_clusters = self.cloud.search_coe_clusters(
@ -86,7 +94,7 @@ class TestCOEClusters(base.TestCase):
self.register_uris([dict( self.register_uris([dict(
method='GET', method='GET',
uri='https://container-infra.example.com/v1/clusters', uri=self.get_mock_url(resource='clusters'),
json=dict(clusters=[coe_cluster_obj.toDict()]))]) json=dict(clusters=[coe_cluster_obj.toDict()]))])
coe_clusters = self.cloud.search_coe_clusters( coe_clusters = self.cloud.search_coe_clusters(
@ -98,7 +106,7 @@ class TestCOEClusters(base.TestCase):
def test_get_coe_cluster(self): def test_get_coe_cluster(self):
self.register_uris([dict( self.register_uris([dict(
method='GET', method='GET',
uri='https://container-infra.example.com/v1/clusters', uri=self.get_mock_url(resource='clusters'),
json=dict(clusters=[coe_cluster_obj.toDict()]))]) json=dict(clusters=[coe_cluster_obj.toDict()]))])
r = self.cloud.get_coe_cluster(coe_cluster_obj.name) r = self.cloud.get_coe_cluster(coe_cluster_obj.name)
@ -110,38 +118,38 @@ class TestCOEClusters(base.TestCase):
def test_get_coe_cluster_not_found(self): def test_get_coe_cluster_not_found(self):
self.register_uris([dict( self.register_uris([dict(
method='GET', method='GET',
uri='https://container-infra.example.com/v1/clusters', uri=self.get_mock_url(resource='clusters'),
json=dict(clusters=[]))]) json=dict(clusters=[]))])
r = self.cloud.get_coe_cluster('doesNotExist') r = self.cloud.get_coe_cluster('doesNotExist')
self.assertIsNone(r) self.assertIsNone(r)
self.assert_calls() self.assert_calls()
def test_delete_coe_cluster(self): def test_delete_coe_cluster(self):
uri = ('https://container-infra.example.com/v1/clusters/%s' %
coe_cluster_obj.uuid)
self.register_uris([ self.register_uris([
dict( dict(
method='GET', method='GET',
uri='https://container-infra.example.com/v1/clusters', uri=self.get_mock_url(resource='clusters'),
json=dict(clusters=[coe_cluster_obj.toDict()])), json=dict(clusters=[coe_cluster_obj.toDict()])),
dict( dict(
method='DELETE', method='DELETE',
uri=uri), uri=self.get_mock_url(
resource='clusters',
append=[coe_cluster_obj.uuid])),
]) ])
self.cloud.delete_coe_cluster(coe_cluster_obj.uuid) self.cloud.delete_coe_cluster(coe_cluster_obj.uuid)
self.assert_calls() self.assert_calls()
def test_update_coe_cluster(self): def test_update_coe_cluster(self):
uri = ('https://container-infra.example.com/v1/clusters/%s' %
coe_cluster_obj.uuid)
self.register_uris([ self.register_uris([
dict( dict(
method='GET', method='GET',
uri='https://container-infra.example.com/v1/clusters', uri=self.get_mock_url(resource='clusters'),
json=dict(clusters=[coe_cluster_obj.toDict()])), json=dict(clusters=[coe_cluster_obj.toDict()])),
dict( dict(
method='PATCH', method='PATCH',
uri=uri, uri=self.get_mock_url(
resource='clusters',
append=[coe_cluster_obj.uuid]),
status_code=200, status_code=200,
validate=dict( validate=dict(
json=[{ json=[{
@ -152,7 +160,7 @@ class TestCOEClusters(base.TestCase):
)), )),
dict( dict(
method='GET', method='GET',
uri='https://container-infra.example.com/v1/clusters', uri=self.get_mock_url(resource='clusters'),
# This json value is not meaningful to the test - it just has # This json value is not meaningful to the test - it just has
# to be valid. # to be valid.
json=dict(clusters=[coe_cluster_obj.toDict()])), json=dict(clusters=[coe_cluster_obj.toDict()])),

15
openstack/tests/unit/cloud/test_coe_clusters_certificate.py
View File

@ -34,11 +34,20 @@ coe_cluster_signed_cert_obj = munch.Munch(
class TestCOEClusters(base.TestCase): class TestCOEClusters(base.TestCase):
def get_mock_url(
self,
service_type='container-infrastructure-management',
base_url_append=None, append=None, resource=None):
return super(TestCOEClusters, self).get_mock_url(
service_type=service_type, resource=resource,
append=append, base_url_append=base_url_append)
def test_get_coe_cluster_certificate(self): def test_get_coe_cluster_certificate(self):
self.register_uris([dict( self.register_uris([dict(
method='GET', method='GET',
uri=('https://container-infra.example.com/v1/certificates/%s' % uri=self.get_mock_url(
coe_cluster_ca_obj.cluster_uuid), resource='certificates',
append=[coe_cluster_ca_obj.cluster_uuid]),
json=coe_cluster_ca_obj) json=coe_cluster_ca_obj)
]) ])
ca_cert = self.cloud.get_coe_cluster_certificate( ca_cert = self.cloud.get_coe_cluster_certificate(
@ -51,7 +60,7 @@ class TestCOEClusters(base.TestCase):
def test_sign_coe_cluster_certificate(self): def test_sign_coe_cluster_certificate(self):
self.register_uris([dict( self.register_uris([dict(
method='POST', method='POST',
uri='https://container-infra.example.com/v1/certificates', uri=self.get_mock_url(resource='certificates'),
json={"cluster_uuid": coe_cluster_signed_cert_obj.cluster_uuid, json={"cluster_uuid": coe_cluster_signed_cert_obj.cluster_uuid,
"csr": coe_cluster_signed_cert_obj.csr} "csr": coe_cluster_signed_cert_obj.csr}
)]) )])

4
openstack/tests/unit/cloud/test_create_volume_snapshot.py
View File

@ -25,6 +25,10 @@ from openstack.tests.unit import base
class TestCreateVolumeSnapshot(base.TestCase): class TestCreateVolumeSnapshot(base.TestCase):
def setUp(self):
super(TestCreateVolumeSnapshot, self).setUp()
self.use_cinder()
def test_create_volume_snapshot_wait(self): def test_create_volume_snapshot_wait(self):
""" """
Test that create_volume_snapshot with a wait returns the volume Test that create_volume_snapshot with a wait returns the volume

4
openstack/tests/unit/cloud/test_delete_volume_snapshot.py
View File

@ -25,6 +25,10 @@ from openstack.tests.unit import base
class TestDeleteVolumeSnapshot(base.TestCase): class TestDeleteVolumeSnapshot(base.TestCase):
def setUp(self):
super(TestDeleteVolumeSnapshot, self).setUp()
self.use_cinder()
def test_delete_volume_snapshot(self): def test_delete_volume_snapshot(self):
""" """
Test that delete_volume_snapshot without a wait returns True instance Test that delete_volume_snapshot without a wait returns True instance

4
openstack/tests/unit/cloud/test_domains.py
View File

@ -25,10 +25,10 @@ from openstack.tests.unit import base
class TestDomains(base.TestCase): class TestDomains(base.TestCase):
def get_mock_url(self, service_type='identity', def get_mock_url(self, service_type='identity',
interface='admin', resource='domains', resource='domains',
append=None, base_url_append='v3'): append=None, base_url_append='v3'):
return super(TestDomains, self).get_mock_url( return super(TestDomains, self).get_mock_url(
service_type=service_type, interface=interface, resource=resource, service_type=service_type, resource=resource,
append=append, base_url_append=base_url_append) append=append, base_url_append=base_url_append)
def test_list_domains(self): def test_list_domains(self):

2
openstack/tests/unit/cloud/test_endpoints.py
View File

@ -29,7 +29,7 @@ from testtools import matchers
class TestCloudEndpoints(base.TestCase): class TestCloudEndpoints(base.TestCase):
def get_mock_url(self, service_type='identity', interface='admin', def get_mock_url(self, service_type='identity', interface='public',
resource='endpoints', append=None, base_url_append='v3'): resource='endpoints', append=None, base_url_append='v3'):
return super(TestCloudEndpoints, self).get_mock_url( return super(TestCloudEndpoints, self).get_mock_url(
service_type, interface, resource, append, base_url_append) service_type, interface, resource, append, base_url_append)

4
openstack/tests/unit/cloud/test_groups.py
View File

@ -20,10 +20,10 @@ class TestGroups(base.TestCase):
cloud_config_fixture=cloud_config_fixture) cloud_config_fixture=cloud_config_fixture)
self.addCleanup(self.assert_calls) self.addCleanup(self.assert_calls)
def get_mock_url(self, service_type='identity', interface='admin', def get_mock_url(self, service_type='identity', interface='public',
resource='groups', append=None, base_url_append='v3'): resource='groups', append=None, base_url_append='v3'):
return super(TestGroups, self).get_mock_url( return super(TestGroups, self).get_mock_url(
service_type='identity', interface='admin', resource=resource, service_type='identity', interface=interface, resource=resource,
append=append, base_url_append=base_url_append) append=append, base_url_append=base_url_append)
def test_list_groups(self): def test_list_groups(self):

2
openstack/tests/unit/cloud/test_identity_roles.py
View File

@ -36,7 +36,7 @@ RAW_ROLE_ASSIGNMENTS = [
class TestIdentityRoles(base.TestCase): class TestIdentityRoles(base.TestCase):
def get_mock_url(self, service_type='identity', interface='admin', def get_mock_url(self, service_type='identity', interface='public',
resource='roles', append=None, base_url_append='v3', resource='roles', append=None, base_url_append='v3',
qs_elements=None): qs_elements=None):
return super(TestIdentityRoles, self).get_mock_url( return super(TestIdentityRoles, self).get_mock_url(

8
openstack/tests/unit/cloud/test_image.py
View File

@ -24,9 +24,6 @@ from openstack.tests import fakes
from openstack.tests.unit import base from openstack.tests.unit import base
CINDER_URL = 'https://volume.example.com/v2/1c36b64c840a42cd9e9b931a369337f0'
class BaseTestImage(base.TestCase): class BaseTestImage(base.TestCase):
def setUp(self): def setUp(self):
@ -1045,7 +1042,9 @@ class TestImageSuburl(BaseTestImage):
def setUp(self): def setUp(self):
super(TestImageSuburl, self).setUp() super(TestImageSuburl, self).setUp()
self.use_keystone_v3(catalog='catalog-v3-suburl.json') self.os_fixture.use_suburl()
self.os_fixture.build_tokens()
self.use_keystone_v3()
self.use_glance( self.use_glance(
image_version_json='image-version-suburl.json', image_version_json='image-version-suburl.json',
image_discovery_url='https://example.com/image') image_discovery_url='https://example.com/image')
@ -1142,7 +1141,6 @@ class TestImageVolume(BaseTestImage):
self.volume_id = str(uuid.uuid4()) self.volume_id = str(uuid.uuid4())
def test_create_image_volume(self): def test_create_image_volume(self):
self.register_uris([ self.register_uris([
self.get_cinder_discovery_mock_dict(), self.get_cinder_discovery_mock_dict(),
dict(method='POST', dict(method='POST',

4
openstack/tests/unit/cloud/test_magnum_services.py
View File

@ -31,7 +31,9 @@ class TestMagnumServices(base.TestCase):
def test_list_magnum_services(self): def test_list_magnum_services(self):
self.register_uris([dict( self.register_uris([dict(
method='GET', method='GET',
uri='https://container-infra.example.com/v1/mservices', uri=self.get_mock_url(
service_type='container-infrastructure-management',
resource='mservices'),
json=dict(mservices=[magnum_service_obj]))]) json=dict(mservices=[magnum_service_obj]))])
mservices_list = self.cloud.list_magnum_services() mservices_list = self.cloud.list_magnum_services()
self.assertEqual( self.assertEqual(

3
openstack/tests/unit/cloud/test_meta.py
View File

@ -991,7 +991,8 @@ class TestMeta(base.TestCase):
self.assertIn('location', hostvars) self.assertIn('location', hostvars)
self.assertEqual('_test_cloud_', hostvars['location']['cloud']) self.assertEqual('_test_cloud_', hostvars['location']['cloud'])
self.assertEqual('RegionOne', hostvars['location']['region_name']) self.assertEqual('RegionOne', hostvars['location']['region_name'])
self.assertEqual('admin', hostvars['location']['project']['name']) self.assertEqual(
fakes.PROJECT_ID, hostvars['location']['project']['id'])
self.assertEqual("test-image-name", hostvars['image']['name']) self.assertEqual("test-image-name", hostvars['image']['name'])
self.assertEqual( self.assertEqual(
standard_fake_server['image']['id'], hostvars['image']['id']) standard_fake_server['image']['id'], hostvars['image']['id'])

8
openstack/tests/unit/cloud/test_normalize.py
View File

@ -667,12 +667,6 @@ class TestNormalize(base.TestCase):
status='in-use', status='in-use',
created_at='2015-08-27T09:49:58-05:00', created_at='2015-08-27T09:49:58-05:00',
) )
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'block-storage', 'public', append=['volumes', 'detail']),
json={'volumes': [vol]}),
])
expected = { expected = {
'attachments': [], 'attachments': [],
'availability_zone': None, 'availability_zone': None,
@ -712,7 +706,7 @@ class TestNormalize(base.TestCase):
'updated_at': None, 'updated_at': None,
'volume_type': None, 'volume_type': None,
} }
retval = self.cloud.list_volumes(vol)[0] retval = self.cloud._normalize_volume(vol)
self.assertEqual(expected, retval) self.assertEqual(expected, retval)
def test_normalize_volumes_v2(self): def test_normalize_volumes_v2(self):

32
openstack/tests/unit/cloud/test_operator_noauth.py
View File

@ -37,7 +37,7 @@ class TestOpenStackCloudOperatorNoAuth(base.TestCase):
uri=self.get_mock_url( uri=self.get_mock_url(
service_type='baremetal', base_url_append='v1'), service_type='baremetal', base_url_append='v1'),
json={'id': 'v1', json={'id': 'v1',
'links': [{"href": "https://bare-metal.example.com/v1", 'links': [{"href": "https://baremetal.example.com/v1",
"rel": "self"}]}), "rel": "self"}]}),
dict(method='GET', dict(method='GET',
uri=self.get_mock_url( uri=self.get_mock_url(
@ -58,7 +58,7 @@ class TestOpenStackCloudOperatorNoAuth(base.TestCase):
# client library. # client library.
self.cloud_noauth = openstack.connect( self.cloud_noauth = openstack.connect(
auth_type='none', auth_type='none',
baremetal_endpoint_override="https://bare-metal.example.com/v1") baremetal_endpoint_override="https://baremetal.example.com/v1")
self.cloud_noauth.list_machines() self.cloud_noauth.list_machines()
@ -73,11 +73,11 @@ class TestOpenStackCloudOperatorNoAuth(base.TestCase):
clouds: clouds:
bifrost: bifrost:
auth_type: "none" auth_type: "none"
endpoint: https://bare-metal.example.com endpoint: https://baremetal.example.com
""" """
self.cloud_noauth = openstack.connect( self.cloud_noauth = openstack.connect(
auth_type='none', auth_type='none',
endpoint='https://bare-metal.example.com/v1', endpoint='https://baremetal.example.com/v1',
) )
self.cloud_noauth.list_machines() self.cloud_noauth.list_machines()
@ -92,7 +92,7 @@ class TestOpenStackCloudOperatorNoAuth(base.TestCase):
self.cloud_noauth = openstack.connect( self.cloud_noauth = openstack.connect(
auth_type='admin_token', auth_type='admin_token',
auth=dict( auth=dict(
endpoint='https://bare-metal.example.com/v1', endpoint='https://baremetal.example.com/v1',
token='ignored')) token='ignored'))
self.cloud_noauth.list_machines() self.cloud_noauth.list_machines()
@ -118,7 +118,7 @@ class TestOpenStackCloudOperatorNoAuthUnversioned(base.TestCase):
self._uri_registry.clear() self._uri_registry.clear()
self.register_uris([ self.register_uris([
dict(method='GET', dict(method='GET',
uri='https://bare-metal.example.com/', uri='https://baremetal.example.com/',
json={ json={
"default_version": { "default_version": {
"status": "CURRENT", "status": "CURRENT",
@ -126,7 +126,7 @@ class TestOpenStackCloudOperatorNoAuthUnversioned(base.TestCase):
"version": "1.46", "version": "1.46",
"id": "v1", "id": "v1",
"links": [{ "links": [{
"href": "https://bare-metal.example.com/v1", "href": "https://baremetal.example.com/v1",
"rel": "self" "rel": "self"
}]}, }]},
"versions": [{ "versions": [{
@ -135,7 +135,7 @@ class TestOpenStackCloudOperatorNoAuthUnversioned(base.TestCase):
"version": "1.46", "version": "1.46",
"id": "v1", "id": "v1",
"links": [{ "links": [{
"href": "https://bare-metal.example.com/v1", "href": "https://baremetal.example.com/v1",
"rel": "self" "rel": "self"
}]}], }]}],
"name": "OpenStack Ironic API", "name": "OpenStack Ironic API",
@ -150,21 +150,21 @@ class TestOpenStackCloudOperatorNoAuthUnversioned(base.TestCase):
"type": "application/vnd.openstack.ironic.v1+json" "type": "application/vnd.openstack.ironic.v1+json"
}], }],
"links": [{ "links": [{
"href": "https://bare-metal.example.com/v1", "href": "https://baremetal.example.com/v1",
"rel": "self" "rel": "self"
}], }],
"ports": [{ "ports": [{
"href": "https://bare-metal.example.com/v1/ports/", "href": "https://baremetal.example.com/v1/ports/",
"rel": "self" "rel": "self"
}, { }, {
"href": "https://bare-metal.example.com/ports/", "href": "https://baremetal.example.com/ports/",
"rel": "bookmark" "rel": "bookmark"
}], }],
"nodes": [{ "nodes": [{
"href": "https://bare-metal.example.com/v1/nodes/", "href": "https://baremetal.example.com/v1/nodes/",
"rel": "self" "rel": "self"
}, { }, {
"href": "https://bare-metal.example.com/nodes/", "href": "https://baremetal.example.com/nodes/",
"rel": "bookmark" "rel": "bookmark"
}], }],
"id": "v1" "id": "v1"
@ -188,7 +188,7 @@ class TestOpenStackCloudOperatorNoAuthUnversioned(base.TestCase):
# client library. # client library.
self.cloud_noauth = openstack.connect( self.cloud_noauth = openstack.connect(
auth_type='none', auth_type='none',
baremetal_endpoint_override="https://bare-metal.example.com") baremetal_endpoint_override="https://baremetal.example.com")
self.cloud_noauth.list_machines() self.cloud_noauth.list_machines()
@ -203,11 +203,11 @@ class TestOpenStackCloudOperatorNoAuthUnversioned(base.TestCase):
clouds: clouds:
bifrost: bifrost:
auth_type: "none" auth_type: "none"
endpoint: https://bare-metal.example.com endpoint: https://baremetal.example.com
""" """
self.cloud_noauth = openstack.connect( self.cloud_noauth = openstack.connect(
auth_type='none', auth_type='none',
endpoint='https://bare-metal.example.com/', endpoint='https://baremetal.example.com/',
) )
self.cloud_noauth.list_machines() self.cloud_noauth.list_machines()

2
openstack/tests/unit/cloud/test_project.py
View File

@ -20,7 +20,7 @@ from openstack.tests.unit import base
class TestProject(base.TestCase): class TestProject(base.TestCase):
def get_mock_url(self, service_type='identity', interface='admin', def get_mock_url(self, service_type='identity', interface='public',
resource=None, append=None, base_url_append=None, resource=None, append=None, base_url_append=None,
v3=True): v3=True):
if v3 and resource is None: if v3 and resource is None:

3
openstack/tests/unit/cloud/test_quotas.py
View File

@ -109,6 +109,7 @@ class TestQuotas(base.TestCase):
project = self.mock_for_keystone_projects(project_count=1, project = self.mock_for_keystone_projects(project_count=1,
list_get=True)[0] list_get=True)[0]
self.register_uris([ self.register_uris([
self.get_cinder_discovery_mock_dict(),
dict(method='PUT', dict(method='PUT',
uri=self.get_mock_url( uri=self.get_mock_url(
'volumev2', 'public', 'volumev2', 'public',
@ -125,6 +126,7 @@ class TestQuotas(base.TestCase):
project = self.mock_for_keystone_projects(project_count=1, project = self.mock_for_keystone_projects(project_count=1,
list_get=True)[0] list_get=True)[0]
self.register_uris([ self.register_uris([
self.get_cinder_discovery_mock_dict(),
dict(method='GET', dict(method='GET',
uri=self.get_mock_url( uri=self.get_mock_url(
'volumev2', 'public', 'volumev2', 'public',
@ -137,6 +139,7 @@ class TestQuotas(base.TestCase):
project = self.mock_for_keystone_projects(project_count=1, project = self.mock_for_keystone_projects(project_count=1,
list_get=True)[0] list_get=True)[0]
self.register_uris([ self.register_uris([
self.get_cinder_discovery_mock_dict(),
dict(method='DELETE', dict(method='DELETE',
uri=self.get_mock_url( uri=self.get_mock_url(
'volumev2', 'public', 'volumev2', 'public',

2
openstack/tests/unit/cloud/test_role_assignment.py
View File

@ -84,7 +84,7 @@ class TestRoleAssignment(base.TestCase):
self.addCleanup(delattr, self, 'user_domain_assignment') self.addCleanup(delattr, self, 'user_domain_assignment')
self.addCleanup(delattr, self, 'group_domain_assignment') self.addCleanup(delattr, self, 'group_domain_assignment')
def get_mock_url(self, service_type='identity', interface='admin', def get_mock_url(self, service_type='identity', interface='public',
resource='role_assignments', append=None, resource='role_assignments', append=None,
base_url_append='v3', qs_elements=None): base_url_append='v3', qs_elements=None):
return super(TestRoleAssignment, self).get_mock_url( return super(TestRoleAssignment, self).get_mock_url(

2
openstack/tests/unit/cloud/test_services.py
View File

@ -30,7 +30,7 @@ class CloudServices(base.TestCase):
def setUp(self, cloud_config_fixture='clouds.yaml'): def setUp(self, cloud_config_fixture='clouds.yaml'):
super(CloudServices, self).setUp(cloud_config_fixture) super(CloudServices, self).setUp(cloud_config_fixture)
def get_mock_url(self, service_type='identity', interface='admin', def get_mock_url(self, service_type='identity', interface='public',
resource='services', append=None, base_url_append='v3'): resource='services', append=None, base_url_append='v3'):
return super(CloudServices, self).get_mock_url( return super(CloudServices, self).get_mock_url(

2
openstack/tests/unit/cloud/test_users.py
View File

@ -25,7 +25,7 @@ class TestUsers(base.TestCase):
if v3: if v3:
base_url_append = 'v3' base_url_append = 'v3'
return self.get_mock_url( return self.get_mock_url(
service_type='identity', interface='admin', resource=resource, service_type='identity', resource=resource,
append=append, base_url_append=base_url_append) append=append, base_url_append=base_url_append)
def _get_user_list(self, user_data): def _get_user_list(self, user_data):

16
openstack/tests/unit/cloud/test_volume.py
View File

@ -88,6 +88,7 @@ class TestVolume(base.TestCase):
validate=dict(json={ validate=dict(json={
'volumeAttachment': { 'volumeAttachment': {
'volumeId': vol['id']}})), 'volumeId': vol['id']}})),
self.get_cinder_discovery_mock_dict(),
dict(method='GET', dict(method='GET',
uri=self.get_mock_url( uri=self.get_mock_url(
'volumev2', 'public', append=['volumes', 'detail']), 'volumev2', 'public', append=['volumes', 'detail']),
@ -120,6 +121,7 @@ class TestVolume(base.TestCase):
validate=dict(json={ validate=dict(json={
'volumeAttachment': { 'volumeAttachment': {
'volumeId': vol['id']}})), 'volumeId': vol['id']}})),
self.get_cinder_discovery_mock_dict(),
dict(method='GET', dict(method='GET',
uri=self.get_mock_url( uri=self.get_mock_url(
'volumev2', 'public', append=['volumes', 'detail']), 'volumev2', 'public', append=['volumes', 'detail']),
@ -211,6 +213,7 @@ class TestVolume(base.TestCase):
'compute', 'public', 'compute', 'public',
append=['servers', server['id'], append=['servers', server['id'],
'os-volume_attachments', volume.id])), 'os-volume_attachments', volume.id])),
self.get_cinder_discovery_mock_dict(),
dict(method='GET', dict(method='GET',
uri=self.get_mock_url( uri=self.get_mock_url(
'volumev2', 'public', append=['volumes', 'detail']), 'volumev2', 'public', append=['volumes', 'detail']),
@ -233,6 +236,7 @@ class TestVolume(base.TestCase):
'compute', 'public', 'compute', 'public',
append=['servers', server['id'], append=['servers', server['id'],
'os-volume_attachments', volume.id])), 'os-volume_attachments', volume.id])),
self.get_cinder_discovery_mock_dict(),
dict(method='GET', dict(method='GET',
uri=self.get_mock_url( uri=self.get_mock_url(
'volumev2', 'public', append=['volumes', 'detail']), 'volumev2', 'public', append=['volumes', 'detail']),
@ -249,6 +253,7 @@ class TestVolume(base.TestCase):
'name': '', 'attachments': []} 'name': '', 'attachments': []}
volume = meta.obj_to_munch(fakes.FakeVolume(**vol)) volume = meta.obj_to_munch(fakes.FakeVolume(**vol))
self.register_uris([ self.register_uris([
self.get_cinder_discovery_mock_dict(),
dict(method='GET', dict(method='GET',
uri=self.get_mock_url( uri=self.get_mock_url(
'volumev2', 'public', append=['volumes', 'detail']), 'volumev2', 'public', append=['volumes', 'detail']),
@ -268,6 +273,7 @@ class TestVolume(base.TestCase):
'name': '', 'attachments': []} 'name': '', 'attachments': []}
volume = meta.obj_to_munch(fakes.FakeVolume(**vol)) volume = meta.obj_to_munch(fakes.FakeVolume(**vol))
self.register_uris([ self.register_uris([
self.get_cinder_discovery_mock_dict(),
dict(method='GET', dict(method='GET',
uri=self.get_mock_url( uri=self.get_mock_url(
'volumev2', 'public', append=['volumes', 'detail']), 'volumev2', 'public', append=['volumes', 'detail']),
@ -284,6 +290,7 @@ class TestVolume(base.TestCase):
'name': '', 'attachments': []} 'name': '', 'attachments': []}
volume = meta.obj_to_munch(fakes.FakeVolume(**vol)) volume = meta.obj_to_munch(fakes.FakeVolume(**vol))
self.register_uris([ self.register_uris([
self.get_cinder_discovery_mock_dict(),
dict(method='GET', dict(method='GET',
uri=self.get_mock_url( uri=self.get_mock_url(
'volumev2', 'public', append=['volumes', 'detail']), 'volumev2', 'public', append=['volumes', 'detail']),
@ -306,6 +313,7 @@ class TestVolume(base.TestCase):
'name': '', 'attachments': []} 'name': '', 'attachments': []}
volume = meta.obj_to_munch(fakes.FakeVolume(**vol)) volume = meta.obj_to_munch(fakes.FakeVolume(**vol))
self.register_uris([ self.register_uris([
self.get_cinder_discovery_mock_dict(),
dict(method='GET', dict(method='GET',
uri=self.get_mock_url( uri=self.get_mock_url(
'volumev2', 'public', append=['volumes', 'detail']), 'volumev2', 'public', append=['volumes', 'detail']),
@ -324,6 +332,7 @@ class TestVolume(base.TestCase):
'name': '', 'attachments': []} 'name': '', 'attachments': []}
volume = meta.obj_to_munch(fakes.FakeVolume(**vol)) volume = meta.obj_to_munch(fakes.FakeVolume(**vol))
self.register_uris([ self.register_uris([
self.get_cinder_discovery_mock_dict(),
dict(method='GET', dict(method='GET',
uri=self.get_mock_url( uri=self.get_mock_url(
'volumev2', 'public', append=['volumes', 'detail']), 'volumev2', 'public', append=['volumes', 'detail']),
@ -341,6 +350,7 @@ class TestVolume(base.TestCase):
vol1 = meta.obj_to_munch(fakes.FakeVolume('01', 'available', 'vol1')) vol1 = meta.obj_to_munch(fakes.FakeVolume('01', 'available', 'vol1'))
vol2 = meta.obj_to_munch(fakes.FakeVolume('02', 'available', 'vol2')) vol2 = meta.obj_to_munch(fakes.FakeVolume('02', 'available', 'vol2'))
self.register_uris([ self.register_uris([
self.get_cinder_discovery_mock_dict(),
dict(method='GET', dict(method='GET',
uri=self.get_mock_url( uri=self.get_mock_url(
'volumev2', 'public', 'volumev2', 'public',
@ -382,6 +392,7 @@ class TestVolume(base.TestCase):
vol1 = meta.obj_to_munch(fakes.FakeVolume('01', 'available', 'vol1')) vol1 = meta.obj_to_munch(fakes.FakeVolume('01', 'available', 'vol1'))
vol2 = meta.obj_to_munch(fakes.FakeVolume('02', 'available', 'vol2')) vol2 = meta.obj_to_munch(fakes.FakeVolume('02', 'available', 'vol2'))
self.register_uris([ self.register_uris([
self.get_cinder_discovery_mock_dict(),
dict(method='GET', dict(method='GET',
uri=self.get_mock_url( uri=self.get_mock_url(
'volumev2', 'public', 'volumev2', 'public',
@ -440,7 +451,7 @@ class TestVolume(base.TestCase):
def test_list_volumes_with_pagination_next_link_fails_all_attempts(self): def test_list_volumes_with_pagination_next_link_fails_all_attempts(self):
vol1 = meta.obj_to_munch(fakes.FakeVolume('01', 'available', 'vol1')) vol1 = meta.obj_to_munch(fakes.FakeVolume('01', 'available', 'vol1'))
uris = [] uris = [self.get_cinder_discovery_mock_dict()]
attempts = 5 attempts = 5
for i in range(attempts): for i in range(attempts):
uris.extend([ uris.extend([
@ -474,6 +485,7 @@ class TestVolume(base.TestCase):
def test_get_volume_by_id(self): def test_get_volume_by_id(self):
vol1 = meta.obj_to_munch(fakes.FakeVolume('01', 'available', 'vol1')) vol1 = meta.obj_to_munch(fakes.FakeVolume('01', 'available', 'vol1'))
self.register_uris([ self.register_uris([
self.get_cinder_discovery_mock_dict(),
dict(method='GET', dict(method='GET',
uri=self.get_mock_url( uri=self.get_mock_url(
'volumev2', 'public', 'volumev2', 'public',
@ -489,6 +501,7 @@ class TestVolume(base.TestCase):
def test_create_volume(self): def test_create_volume(self):
vol1 = meta.obj_to_munch(fakes.FakeVolume('01', 'available', 'vol1')) vol1 = meta.obj_to_munch(fakes.FakeVolume('01', 'available', 'vol1'))
self.register_uris([ self.register_uris([
self.get_cinder_discovery_mock_dict(),
dict(method='POST', dict(method='POST',
uri=self.get_mock_url( uri=self.get_mock_url(
'volumev2', 'public', append=['volumes']), 'volumev2', 'public', append=['volumes']),
@ -511,6 +524,7 @@ class TestVolume(base.TestCase):
def test_create_bootable_volume(self): def test_create_bootable_volume(self):
vol1 = meta.obj_to_munch(fakes.FakeVolume('01', 'available', 'vol1')) vol1 = meta.obj_to_munch(fakes.FakeVolume('01', 'available', 'vol1'))
self.register_uris([ self.register_uris([
self.get_cinder_discovery_mock_dict(),
dict(method='POST', dict(method='POST',
uri=self.get_mock_url( uri=self.get_mock_url(
'volumev2', 'public', append=['volumes']), 'volumev2', 'public', append=['volumes']),

4
openstack/tests/unit/cloud/test_volume_access.py
View File

@ -20,6 +20,10 @@ from openstack.tests.unit import base
class TestVolumeAccess(base.TestCase): class TestVolumeAccess(base.TestCase):
def setUp(self):
super(TestVolumeAccess, self).setUp()
self.use_cinder()
def test_list_volume_types(self): def test_list_volume_types(self):
volume_type = dict( volume_type = dict(
id='voltype01', description='volume type description', id='voltype01', description='volume type description',

4
openstack/tests/unit/cloud/test_volume_backups.py
View File

@ -14,6 +14,10 @@ from openstack.tests.unit import base
class TestVolumeBackups(base.TestCase): class TestVolumeBackups(base.TestCase):
def setUp(self):
super(TestVolumeBackups, self).setUp()
self.use_cinder()
def test_search_volume_backups(self): def test_search_volume_backups(self):
name = 'Volume1' name = 'Volume1'
vol1 = {'name': name, 'availability_zone': 'az1'} vol1 = {'name': name, 'availability_zone': 'az1'}

1
openstack/tests/unit/config/test_from_conf.py
View File

@ -194,6 +194,7 @@ class TestFromConf(base.TestCase):
def test_no_endpoint(self): def test_no_endpoint(self):
"""Conf contains adapter opts, but service type not in catalog.""" """Conf contains adapter opts, but service type not in catalog."""
self.os_fixture.v3_token.remove_service('monitoring')
conn = self._get_conn() conn = self._get_conn()
# Monasca is not in the service catalog # Monasca is not in the service catalog
self.assertRaises(ks_exc.catalog.EndpointNotFound, self.assertRaises(ks_exc.catalog.EndpointNotFound,

4
openstack/tests/unit/fixtures/baremetal.json
View File

@ -3,7 +3,7 @@
"id": "v1", "id": "v1",
"links": [ "links": [
{ {
"href": "https://bare-metal.example.com/v1/", "href": "https://baremetal.example.com/v1/",
"rel": "self" "rel": "self"
} }
], ],
@ -18,7 +18,7 @@
"id": "v1", "id": "v1",
"links": [ "links": [
{ {
"href": "https://bare-metal.example.com/v1/", "href": "https://baremetal.example.com/v1/",
"rel": "self" "rel": "self"
} }
], ],

52
openstack/tests/unit/fixtures/catalog-bogus-glance.json
View File

@ -1,52 +0,0 @@
{
"token": {
"audit_ids": [
"Rvn7eHkiSeOwucBIPaKdYA"
],
"catalog": [
{
"endpoints": [
{
"id": "32466f357f3545248c47471ca51b0d3a",
"interface": "public",
"region": "RegionOne",
"url": "https://example.com/image/"
}
],
"name": "glance",
"type": "image"
}
],
"expires_at": "9999-12-31T23:59:59Z",
"issued_at": "2016-12-17T14:25:05.000000Z",
"methods": [
"password"
],
"project": {
"domain": {
"id": "default",
"name": "default"
},
"id": "1c36b64c840a42cd9e9b931a369337f0",
"name": "Default Project"
},
"roles": [
{
"id": "9fe2ff9ee4384b1894a90878d3e92bab",
"name": "_member_"
},
{
"id": "37071fc082e14c2284c32a2761f71c63",
"name": "swiftoperator"
}
],
"user": {
"domain": {
"id": "default",
"name": "default"
},
"id": "c17534835f8f42bf98fc367e0bf35e09",
"name": "mordred"
}
}
}

177
openstack/tests/unit/fixtures/catalog-v2.json
View File

@ -1,177 +0,0 @@
{
"access": {
"token": {
"issued_at": "2016-04-14T10:09:58.014014Z",
"expires": "9999-12-31T23:59:59Z",
"id": "7fa3037ae2fe48ada8c626a51dc01ffd",
"tenant": {
"enabled": true,
"description": "Bootstrap project for initializing the cloud.",
"name": "admin",
"id": "1c36b64c840a42cd9e9b931a369337f0"
},
"audit_ids": [
"FgG3Q8T3Sh21r_7HyjHP8A"
]
},
"serviceCatalog": [
{
"endpoints_links": [],
"endpoints": [
{
"adminURL": "https://compute.example.com/v2.1/1c36b64c840a42cd9e9b931a369337f0",
"region": "RegionOne",
"publicURL": "https://compute.example.com/v2.1/1c36b64c840a42cd9e9b931a369337f0",
"internalURL": "https://compute.example.com/v2.1/1c36b64c840a42cd9e9b931a369337f0",
"id": "32466f357f3545248c47471ca51b0d3a"
}
],
"type": "compute",
"name": "nova"
},
{
"endpoints_links": [],
"endpoints": [
{
"adminURL": "https://volume.example.com/v2/1c36b64c840a42cd9e9b931a369337f0",
"region": "RegionOne",
"publicURL": "https://volume.example.com/v2/1c36b64c840a42cd9e9b931a369337f0",
"internalURL": "https://volume.example.com/v2/1c36b64c840a42cd9e9b931a369337f0",
"id": "1e875ca2225b408bbf3520a1b8e1a537"
}
],
"type": "volumev2",
"name": "cinderv2"
},
{
"endpoints_links": [],
"endpoints": [
{
"adminURL": "https://image.example.com/v2",
"region": "RegionOne",
"publicURL": "https://image.example.com/v2",
"internalURL": "https://image.example.com/v2",
"id": "5a64de3c4a614d8d8f8d1ba3dee5f45f"
}
],
"type": "image",
"name": "glance"
},
{
"endpoints_links": [],
"endpoints": [
{
"adminURL": "https://volume.example.com/v1/1c36b64c840a42cd9e9b931a369337f0",
"region": "RegionOne",
"publicURL": "https://volume.example.com/v1/1c36b64c840a42cd9e9b931a369337f0",
"internalURL": "https://volume.example.com/v1/1c36b64c840a42cd9e9b931a369337f0",
"id": "3d15fdfc7d424f3c8923324417e1a3d1"
}
],
"type": "volume",
"name": "cinder"
},
{
"endpoints_links": [],
"endpoints": [
{
"adminURL": "https://identity.example.com/v2.0",
"region": "RegionOne",
"publicURL": "https://identity.example.com/v2.0",
"internalURL": "https://identity.example.com/v2.0",
"id": "4deb4d0504a044a395d4480741ba628c"
}
],
"type": "identity",
"name": "keystone"
},
{
"endpoints_links": [],
"endpoints": [
{
"adminURL": "https://network.example.com",
"region": "RegionOne",
"publicURL": "https://network.example.com",
"internalURL": "https://network.example.com",
"id": "4deb4d0504a044a395d4480741ba628d"
}
],
"type": "network",
"name": "neutron"
},
{
"endpoints_links": [],
"endpoints": [
{
"adminURL": "https://object-store.example.com/v1/1c36b64c840a42cd9e9b931a369337f0",
"region": "RegionOne",
"publicURL": "https://object-store.example.com/v1/1c36b64c840a42cd9e9b931a369337f0",
"internalURL": "https://object-store.example.com/v1/1c36b64c840a42cd9e9b931a369337f0",
"id": "4deb4d0504a044a395d4480741ba628c"
}
],
"type": "object-store",
"name": "swift"
},
{
"endpoints_links": [],
"endpoints": [
{
"adminURL": "https://placement.example.com",
"region": "RegionOne",
"publicURL": "https://placement.example.com",
"internalURL": "https://placement.example.com",
"id": "652f0612744042bfbb8a8bb2c777a16e"
}
],
"type": "placement",
"name": "placement"
},
{
"endpoints_links": [],
"endpoints": [
{
"adminURL": "https://dns.example.com",
"region": "RegionOne",
"publicURL": "https://dns.example.com",
"internalURL": "https://dns.example.com",
"id": "652f0612744042bfbb8a8bb2c777a16d"
}
],
"type": "dns",
"name": "designate"
},
{
"endpoints_links": [],
"endpoints": [
{
"adminURL": "https://clustering.example.com",
"region": "RegionOne",
"publicURL": "https://clustering.example.com",
"internalURL": "https://clustering.example.com",
"id": "4deb4d0504a044a395d4480741ba624z"
}
],
"type": "clustering",
"name": "senlin"
}
],
"user": {
"username": "dummy",
"roles_links": [],
"id": "71675f719c3343e8ac441cc28f396474",
"roles": [
{
"name": "admin"
}
],
"name": "admin"
},
"metadata": {
"is_admin": 0,
"roles": [
"6d813db50b6e4a1ababdbbb5a83c7de5"
]
}
}
}

71
openstack/tests/unit/fixtures/catalog-v3-fake-v1.json
View File

@ -1,71 +0,0 @@
{
"token": {
"audit_ids": [
"Rvn7eHkiSeOwucBIPaKdYA"
],
"catalog": [
{
"endpoints": [
{
"id": "4deb4d0504a044a395d4480741ba628c",
"interface": "public",
"region": "RegionOne",
"url": "https://identity.example.com"
},
{
"id": "012322eeedcd459edabb4933021112bc",
"interface": "admin",
"region": "RegionOne",
"url": "https://identity.example.com"
}
],
"endpoints_links": [],
"name": "keystone",
"type": "identity"
},
{
"endpoints": [
{
"id": "1e875ca2225b408bbf3520a1b8e1a537",
"interface": "public",
"region": "RegionOne",
"url": "https://fake.example.com/v1/1c36b64c840a42cd9e9b931a369337f0"
}
],
"name": "fake_service",
"type": "fake"
}
],
"expires_at": "9999-12-31T23:59:59Z",
"issued_at": "2016-12-17T14:25:05.000000Z",
"methods": [
"password"
],
"project": {
"domain": {
"id": "default",
"name": "default"
},
"id": "1c36b64c840a42cd9e9b931a369337f0",
"name": "Default Project"
},
"roles": [
{
"id": "9fe2ff9ee4384b1894a90878d3e92bab",
"name": "_member_"
},
{
"id": "37071fc082e14c2284c32a2761f71c63",
"name": "swiftoperator"
}
],
"user": {
"domain": {
"id": "default",
"name": "default"
},
"id": "c17534835f8f42bf98fc367e0bf35e09",
"name": "mordred"
}
}
}

71
openstack/tests/unit/fixtures/catalog-v3-fake-v2.json
View File

@ -1,71 +0,0 @@
{
"token": {
"audit_ids": [
"Rvn7eHkiSeOwucBIPaKdYA"
],
"catalog": [
{
"endpoints": [
{
"id": "4deb4d0504a044a395d4480741ba628c",
"interface": "public",
"region": "RegionOne",
"url": "https://identity.example.com"
},
{
"id": "012322eeedcd459edabb4933021112bc",
"interface": "admin",
"region": "RegionOne",
"url": "https://identity.example.com"
}
],
"endpoints_links": [],
"name": "keystone",
"type": "identity"
},
{
"endpoints": [
{
"id": "1e875ca2225b408bbf3520a1b8e1a537",
"interface": "public",
"region": "RegionOne",
"url": "https://fake.example.com/v2/1c36b64c840a42cd9e9b931a369337f0"
}
],
"name": "fake_service",
"type": "fake"
}
],
"expires_at": "9999-12-31T23:59:59Z",
"issued_at": "2016-12-17T14:25:05.000000Z",
"methods": [
"password"
],
"project": {
"domain": {
"id": "default",
"name": "default"
},
"id": "1c36b64c840a42cd9e9b931a369337f0",
"name": "Default Project"
},
"roles": [
{
"id": "9fe2ff9ee4384b1894a90878d3e92bab",
"name": "_member_"
},
{
"id": "37071fc082e14c2284c32a2761f71c63",
"name": "swiftoperator"
}
],
"user": {
"domain": {
"id": "default",
"name": "default"
},
"id": "c17534835f8f42bf98fc367e0bf35e09",
"name": "mordred"
}
}
}

198
openstack/tests/unit/fixtures/catalog-v3-suburl.json
View File

@ -1,198 +0,0 @@
{
"token": {
"audit_ids": [
"Rvn7eHkiSeOwucBIPaKdYA"
],
"catalog": [
{
"endpoints": [
{
"id": "32466f357f3545248c47471ca51b0d3a",
"interface": "public",
"region": "RegionOne",
"url": "https://example.com/compute/v2.1/"
}
],
"name": "nova",
"type": "compute"
},
{
"endpoints": [
{
"id": "1e875ca2225b408bbf3520a1b8e1a537",
"interface": "public",
"region": "RegionOne",
"url": "https://example.com/volumev2/v2/1c36b64c840a42cd9e9b931a369337f0"
}
],
"name": "cinderv2",
"type": "volumev2"
},
{
"endpoints": [
{
"id": "5a64de3c4a614d8d8f8d1ba3dee5f45f",
"interface": "public",
"region": "RegionOne",
"url": "https://example.com/image"
}
],
"name": "glance",
"type": "image"
},
{
"endpoints": [
{
"id": "3d15fdfc7d424f3c8923324417e1a3d1",
"interface": "public",
"region": "RegionOne",
"url": "https://example.com/volume/v1/1c36b64c840a42cd9e9b931a369337f0"
}
],
"name": "cinder",
"type": "volume"
},
{
"endpoints": [
{
"id": "4deb4d0504a044a395d4480741ba628c",
"interface": "public",
"region": "RegionOne",
"url": "https://identity.example.com"
},
{
"id": "012322eeedcd459edabb4933021112bc",
"interface": "admin",
"region": "RegionOne",
"url": "https://example.com/identity"
}
],
"endpoints_links": [],
"name": "keystone",
"type": "identity"
},
{
"endpoints": [
{
"id": "4deb4d0504a044a395d4480741ba628d",
"interface": "public",
"region": "RegionOne",
"url": "https://example.com/example"
}
],
"endpoints_links": [],
"name": "neutron",
"type": "network"
},
{
"endpoints": [
{
"id": "4deb4d0504a044a395d4480741ba628e",
"interface": "public",
"region": "RegionOne",
"url": "https://example.com/container-infra/v1"
}
],
"endpoints_links": [],
"name": "magnum",
"type": "container-infra"
},
{
"endpoints": [
{
"id": "4deb4d0504a044a395d4480741ba628c",
"interface": "public",
"region": "RegionOne",
"url": "https://example.com/object-store/v1/1c36b64c840a42cd9e9b931a369337f0"
}
],
"endpoints_links": [],
"name": "swift",
"type": "object-store"
},
{
"endpoints": [
{
"id": "652f0612744042bfbb8a8bb2c777a16d",
"interface": "public",
"region": "RegionOne",
"url": "https://example.com/bare-metal"
}
],
"endpoints_links": [],
"name": "ironic",
"type": "baremetal"
},
{
"endpoints": [
{
"id": "4deb4d0504a044a395d4480741ba628c",
"interface": "public",
"region": "RegionOne",
"url": "https://example.com/orchestration/v1/1c36b64c840a42cd9e9b931a369337f0"
}
],
"endpoints_links": [],
"name": "heat",
"type": "orchestration"
},
{
"endpoints": [
{
"id": "10c76ffd2b744a67950ed1365190d352",
"interface": "public",
"region": "RegionOne",
"url": "https://example.com/dns"
}
],
"endpoints_links": [],
"name": "designate",
"type": "dns"
},
{
"endpoints": [
{
"id": "4deb4d0504a044a395d4480741ba624z",
"interface": "public",
"region": "RegionOne",
"url": "https://example.com/clustering"
}
],
"endpoint_links": [],
"name": "senlin",
"type": "clustering"
}
],
"expires_at": "9999-12-31T23:59:59Z",
"issued_at": "2016-12-17T14:25:05.000000Z",
"methods": [
"password"
],
"project": {
"domain": {
"id": "default",
"name": "default"
},
"id": "1c36b64c840a42cd9e9b931a369337f0",
"name": "Default Project"
},
"roles": [
{
"id": "9fe2ff9ee4384b1894a90878d3e92bab",
"name": "_member_"
},
{
"id": "37071fc082e14c2284c32a2761f71c63",
"name": "swiftoperator"
}
],
"user": {
"domain": {
"id": "default",
"name": "default"
},
"id": "c17534835f8f42bf98fc367e0bf35e09",
"name": "mordred"
}
}
}

211
openstack/tests/unit/fixtures/catalog-v3-suffix.json
View File

@ -1,211 +0,0 @@
{
"token": {
"audit_ids": [
"Rvn7eHkiSeOwucBIPaKdYA"
],
"catalog": [
{
"endpoints": [
{
"id": "32466f357f3545248c47471ca51b0d3a",
"interface": "public",
"region": "RegionOne",
"url": "https://compute.example.com/v2.1/"
}
],
"name": "nova",
"type": "compute"
},
{
"endpoints": [
{
"id": "1e875ca2225b408bbf3520a1b8e1a537",
"interface": "public",
"region": "RegionOne",
"url": "https://volume.example.com/v2/1c36b64c840a42cd9e9b931a369337f0"
}
],
"name": "cinderv2",
"type": "volumev2"
},
{
"endpoints": [
{
"id": "5a64de3c4a614d8d8f8d1ba3dee5f45f",
"interface": "public",
"region": "RegionOne",
"url": "https://image.example.com"
}
],
"name": "glance",
"type": "image"
},
{
"endpoints": [
{
"id": "3d15fdfc7d424f3c8923324417e1a3d1",
"interface": "public",
"region": "RegionOne",
"url": "https://volume.example.com/v1/1c36b64c840a42cd9e9b931a369337f0"
}
],
"name": "cinder",
"type": "volume"
},
{
"endpoints": [
{
"id": "4deb4d0504a044a395d4480741ba628c",
"interface": "public",
"region": "RegionOne",
"url": "https://identity.example.com"
},
{
"id": "012322eeedcd459edabb4933021112bc",
"interface": "admin",
"region": "RegionOne",
"url": "https://identity.example.com"
}
],
"endpoints_links": [],
"name": "keystone",
"type": "identity"
},
{
"endpoints": [
{
"id": "4deb4d0504a044a395d4480741ba628d",
"interface": "public",
"region": "RegionOne",
"url": "https://network.example.com/v2.0"
}
],
"endpoints_links": [],
"name": "neutron",
"type": "network"
},
{
"endpoints": [
{
"id": "4deb4d0504a044a395d4480741ba628e",
"interface": "public",
"region": "RegionOne",
"url": "https://container-infra.example.com/v1"
}
],
"endpoints_links": [],
"name": "magnum",
"type": "container-infra"
},
{
"endpoints": [
{
"id": "4deb4d0504a044a395d4480741ba628c",
"interface": "public",
"region": "RegionOne",
"url": "https://object-store.example.com/v1/1c36b64c840a42cd9e9b931a369337f0"
}
],
"endpoints_links": [],
"name": "swift",
"type": "object-store"
},
{
"endpoints": [
{
"id": "652f0612744042bfbb8a8bb2c777a16d",
"interface": "public",
"region": "RegionOne",
"url": "https://bare-metal.example.com/"
}
],
"endpoints_links": [],
"name": "ironic",
"type": "baremetal"
},
{
"endpoints": [
{
"id": "4deb4d0504a044a395d4480741ba628c",
"interface": "public",
"region": "RegionOne",
"url": "https://orchestration.example.com/v1/1c36b64c840a42cd9e9b931a369337f0"
}
],
"endpoints_links": [],
"name": "heat",
"type": "orchestration"
},
{
"endpoints": [
{
"id": "10c76ffd2b744a67950ed1365190d353",
"interface": "public",
"region": "RegionOne",
"url": "https://placement.example.com"
}
],
"endpoints_links": [],
"name": "placement",
"type": "placement"
},
{
"endpoints": [
{
"id": "10c76ffd2b744a67950ed1365190d352",
"interface": "public",
"region": "RegionOne",
"url": "https://dns.example.com"
}
],
"endpoints_links": [],
"name": "designate",
"type": "dns"
},
{
"endpoints": [
{
"id": "4deb4d0504a044a395d4480741ba624z",
"interface": "public",
"region": "RegionOne",
"url": "https://clustering.example.com"
}
],
"endpoints_links": [],
"name": "senlin",
"type": "clustering"
}
],
"expires_at": "9999-12-31T23:59:59Z",
"issued_at": "2016-12-17T14:25:05.000000Z",
"methods": [
"password"
],
"project": {
"domain": {
"id": "default",
"name": "default"
},
"id": "1c36b64c840a42cd9e9b931a369337f0",
"name": "Default Project"
},
"roles": [
{
"id": "9fe2ff9ee4384b1894a90878d3e92bab",
"name": "_member_"
},
{
"id": "37071fc082e14c2284c32a2761f71c63",
"name": "swiftoperator"
}
],
"user": {
"domain": {
"id": "default",
"name": "default"
},
"id": "c17534835f8f42bf98fc367e0bf35e09",
"name": "mordred"
}
}
}

217
openstack/tests/unit/fixtures/catalog-v3.json
View File

@ -1,217 +0,0 @@
{
"token": {
"audit_ids": [
"Rvn7eHkiSeOwucBIPaKdYA"
],
"catalog": [
{
"endpoints": [
{
"id": "32466f357f3545248c47471ca51b0d3a",
"interface": "public",
"region": "RegionOne",
"url": "https://compute.example.com/v2.1/"
},
{
"id": "32466f357f3545248c47471ca51b0d3b",
"interface": "internal",
"region": "RegionOne",
"url": "https://internal.compute.example.com/v2.1/"
}
],
"name": "nova",
"type": "compute"
},
{
"endpoints": [
{
"id": "1e875ca2225b408bbf3520a1b8e1a537",
"interface": "public",
"region": "RegionOne",
"url": "https://volume.example.com/v2/1c36b64c840a42cd9e9b931a369337f0"
}
],
"name": "cinderv2",
"type": "volumev2"
},
{
"endpoints": [
{
"id": "5a64de3c4a614d8d8f8d1ba3dee5f45f",
"interface": "public",
"region": "RegionOne",
"url": "https://image.example.com"
}
],
"name": "glance",
"type": "image"
},
{
"endpoints": [
{
"id": "3d15fdfc7d424f3c8923324417e1a3d1",
"interface": "public",
"region": "RegionOne",
"url": "https://volume.example.com/v1/1c36b64c840a42cd9e9b931a369337f0"
}
],
"name": "cinder",
"type": "volume"
},
{
"endpoints": [
{
"id": "4deb4d0504a044a395d4480741ba628c",
"interface": "public",
"region": "RegionOne",
"url": "https://identity.example.com"
},
{
"id": "012322eeedcd459edabb4933021112bc",
"interface": "admin",
"region": "RegionOne",
"url": "https://identity.example.com"
}
],
"endpoints_links": [],
"name": "keystone",
"type": "identity"
},
{
"endpoints": [
{
"id": "4deb4d0504a044a395d4480741ba628d",
"interface": "public",
"region": "RegionOne",
"url": "https://network.example.com"
}
],
"endpoints_links": [],
"name": "neutron",
"type": "network"
},
{
"endpoints": [
{
"id": "4deb4d0504a044a395d4480741ba628e",
"interface": "public",
"region": "RegionOne",
"url": "https://container-infra.example.com/v1"
}
],
"endpoints_links": [],
"name": "magnum",
"type": "container-infra"
},
{
"endpoints": [
{
"id": "4deb4d0504a044a395d4480741ba628c",
"interface": "public",
"region": "RegionOne",
"url": "https://object-store.example.com/v1/1c36b64c840a42cd9e9b931a369337f0"
}
],
"endpoints_links": [],
"name": "swift",
"type": "object-store"
},
{
"endpoints": [
{
"id": "652f0612744042bfbb8a8bb2c777a16d",
"interface": "public",
"region": "RegionOne",
"url": "https://bare-metal.example.com/"
}
],
"endpoints_links": [],
"name": "ironic",
"type": "baremetal"
},
{
"endpoints": [
{
"id": "4deb4d0504a044a395d4480741ba628c",
"interface": "public",
"region": "RegionOne",
"url": "https://orchestration.example.com/v1/1c36b64c840a42cd9e9b931a369337f0"
}
],
"endpoints_links": [],
"name": "heat",
"type": "orchestration"
},
{
"endpoints": [
{
"id": "10c76ffd2b744a67950ed1365190d353",
"interface": "public",
"region": "RegionOne",
"url": "https://placement.example.com"
}
],
"endpoints_links": [],
"name": "placement",
"type": "placement"
},
{
"endpoints": [
{
"id": "10c76ffd2b744a67950ed1365190d352",
"interface": "public",
"region": "RegionOne",
"url": "https://dns.example.com"
}
],
"endpoints_links": [],
"name": "designate",
"type": "dns"
},
{
"endpoints": [
{
"id": "4deb4d0504a044a395d4480741ba624z",
"interface": "public",
"region": "RegionOne",
"url": "https://clustering.example.com"
}
],
"endpoints_links": [],
"name": "senlin",
"type": "clustering"
}
],
"expires_at": "9999-12-31T23:59:59Z",
"issued_at": "2016-12-17T14:25:05.000000Z",
"methods": [
"password"
],
"project": {
"domain": {
"id": "default",
"name": "default"
},
"id": "1c36b64c840a42cd9e9b931a369337f0",
"name": "Default Project"
},
"roles": [
{
"id": "9fe2ff9ee4384b1894a90878d3e92bab",
"name": "_member_"
},
{
"id": "37071fc082e14c2284c32a2761f71c63",
"name": "swiftoperator"
}
],
"user": {
"domain": {
"id": "default",
"name": "default"
},
"id": "c17534835f8f42bf98fc367e0bf35e09",
"name": "mordred"
}
}
}

1
openstack/tests/unit/fixtures/clouds/clouds.yaml
View File

@ -7,6 +7,7 @@ clouds:
username: admin username: admin
user_domain_name: default user_domain_name: default
project_domain_name: default project_domain_name: default
block_storage_api_version: 2
region_name: RegionOne region_name: RegionOne
_test_cloud_v2_: _test_cloud_v2_:
auth: auth:

33
openstack/tests/unit/test_connection.py
View File

@ -21,6 +21,7 @@ from openstack import connection
from openstack import proxy from openstack import proxy
import openstack.config import openstack.config
from openstack import service_description from openstack import service_description
from openstack.tests import fakes
from openstack.tests.unit import base from openstack.tests.unit import base
from openstack.tests.unit.fake import fake_service from openstack.tests.unit.fake import fake_service
@ -290,7 +291,13 @@ class TestNetworkConnection(base.TestCase):
# Verify that if the catalog has the suffix we don't mess things up. # Verify that if the catalog has the suffix we don't mess things up.
def test_network_proxy(self): def test_network_proxy(self):
self.use_keystone_v3(catalog='catalog-v3-suffix.json') self.os_fixture.v3_token.remove_service('network')
svc = self.os_fixture.v3_token.add_service('network')
svc.add_endpoint(
interface='public',
url='https://network.example.com/v2.0',
region='RegionOne')
self.use_keystone_v3()
self.assertEqual( self.assertEqual(
'openstack.network.v2._proxy', 'openstack.network.v2._proxy',
self.cloud.network.__class__.__module__) self.cloud.network.__class__.__module__)
@ -330,7 +337,13 @@ class TestAuthorize(base.TestCase):
class TestNewService(base.TestCase): class TestNewService(base.TestCase):
def test_add_service_v1(self): def test_add_service_v1(self):
self.use_keystone_v3(catalog='catalog-v3-fake-v1.json') svc = self.os_fixture.v3_token.add_service('fake')
svc.add_endpoint(
interface='public',
region='RegionOne',
url='https://fake.example.com/v1/{0}'.format(fakes.PROJECT_ID),
)
self.use_keystone_v3()
conn = self.cloud conn = self.cloud
service = fake_service.FakeService('fake') service = fake_service.FakeService('fake')
@ -358,7 +371,13 @@ class TestNewService(base.TestCase):
self.assertTrue(conn.fake.dummy()) self.assertTrue(conn.fake.dummy())
def test_add_service_v2(self): def test_add_service_v2(self):
self.use_keystone_v3(catalog='catalog-v3-fake-v2.json') svc = self.os_fixture.v3_token.add_service('fake')
svc.add_endpoint(
interface='public',
region='RegionOne',
url='https://fake.example.com/v2/{0}'.format(fakes.PROJECT_ID),
)
self.use_keystone_v3()
conn = self.cloud conn = self.cloud
self.register_uris([ self.register_uris([
@ -383,7 +402,13 @@ class TestNewService(base.TestCase):
self.assertFalse(conn.fake.dummy()) self.assertFalse(conn.fake.dummy())
def test_replace_system_service(self): def test_replace_system_service(self):
self.use_keystone_v3(catalog='catalog-v3-fake-v2.json') svc = self.os_fixture.v3_token.add_service('fake')
svc.add_endpoint(
interface='public',
region='RegionOne',
url='https://fake.example.com/v2/{0}'.format(fakes.PROJECT_ID),
)
self.use_keystone_v3()
conn = self.cloud conn = self.cloud
# delete native dns service # delete native dns service

7
openstack/tests/unit/test_missing_version.py
View File

@ -21,7 +21,12 @@ class TestMissingVersion(base.TestCase):
def setUp(self): def setUp(self):
super(TestMissingVersion, self).setUp() super(TestMissingVersion, self).setUp()
self.use_keystone_v3(catalog='catalog-bogus-glance.json') self.os_fixture.clear_tokens()
svc = self.os_fixture.v3_token.add_service('image')
svc.add_endpoint(
url='https://example.com/image/',
region='RegionOne', interface='public')
self.use_keystone_v3()
self.use_glance( self.use_glance(
image_version_json='bad-glance-version.json', image_version_json='bad-glance-version.json',
image_discovery_url='https://example.com/image/') image_discovery_url='https://example.com/image/')

6
openstack/tests/unit/test_stats.py
View File

@ -164,7 +164,7 @@ class TestStats(base.TestCase):
def test_list_projects(self): def test_list_projects(self):
mock_uri = self.get_mock_url( mock_uri = self.get_mock_url(
service_type='identity', interface='admin', resource='projects', service_type='identity', resource='projects',
base_url_append='v3') base_url_append='v3')
self.register_uris([ self.register_uris([
@ -185,7 +185,7 @@ class TestStats(base.TestCase):
def test_projects(self): def test_projects(self):
mock_uri = self.get_mock_url( mock_uri = self.get_mock_url(
service_type='identity', interface='admin', resource='projects', service_type='identity', resource='projects',
base_url_append='v3') base_url_append='v3')
self.register_uris([ self.register_uris([
@ -256,7 +256,7 @@ class TestNoStats(base.TestCase):
def test_no_stats(self): def test_no_stats(self):
mock_uri = self.get_mock_url( mock_uri = self.get_mock_url(
service_type='identity', interface='admin', resource='projects', service_type='identity', resource='projects',
base_url_append='v3') base_url_append='v3')
self.register_uris([ self.register_uris([