openstack
/
manila
Code Issues Proposed changes

Merge "Allow configuring availability_zones in share types"

changes/64/634864/6
Zuul 2019-02-18 20:38:20 +00:00 committed by Gerrit Code Review
parent 6b3650245e 4249e94c6b
commit 3017c3239e
24 changed files with 816 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manila/api/openstack/api_version_request.py
View File

@ -129,13 +129,15 @@ REST_API_VERSION_HISTORY = """
version: GET /v2/{tenant_id}/share-replicas/{
replica_id}/export-locations to allow retrieving individual
replica export locations if available.
* 2.48 - Added support for extra-spec "availability_zones" within Share
types along with validation in the API.
"""
# The minimum and maximum versions of the API supported
# The default api version request is defined to be the
# minimum version of the API supported.
_MIN_API_VERSION = "2.0"
_MAX_API_VERSION = "2.47"
_MAX_API_VERSION = "2.48"
DEFAULT_API_VERSION = _MIN_API_VERSION

8
manila/api/openstack/rest_api_version_history.rst
View File

@ -256,7 +256,6 @@ user documentation.
2.47
----
Export locations for non-active share replicas are no longer retrievable
through the export locations APIs: ``GET
/v2/{tenant_id}/shares/{share_id}/export_locations`` and ``GET
@ -264,3 +263,10 @@ user documentation.
A new API is introduced at this version: ``GET
/v2/{tenant_id}/share-replicas/{replica_id}/export-locations`` to allow
retrieving export locations of share replicas if available.
2.48
----
Administrators can now use the common, user-visible extra-spec
'availability_zones' within share types to allow provisioning of shares
only within specific availability zones. The extra-spec allows using
comma separated names of one or more availability zones.

6
manila/api/v1/share_types_extra_specs.py
View File

@ -99,6 +99,7 @@ class ShareTypeExtraSpecsController(wsgi.Controller):
raise webob.exc.HTTPBadRequest(e.message)
self._check_key_names(specs.keys())
specs = share_types.sanitize_extra_specs(specs)
db.share_type_extra_specs_update_or_create(context, type_id, specs)
notifier_info = dict(type_id=type_id, specs=specs)
notifier = rpc.get_notifier('shareTypeExtraSpecs')
@ -119,11 +120,12 @@ class ShareTypeExtraSpecsController(wsgi.Controller):
expl = _('Request body contains too many items')
raise webob.exc.HTTPBadRequest(explanation=expl)
self._verify_extra_specs(body, False)
db.share_type_extra_specs_update_or_create(context, type_id, body)
specs = share_types.sanitize_extra_specs(body)
db.share_type_extra_specs_update_or_create(context, type_id, specs)
notifier_info = dict(type_id=type_id, id=id)
notifier = rpc.get_notifier('shareTypeExtraSpecs')
notifier.info(context, 'share_type_extra_specs.update', notifier_info)
return body
return specs
@wsgi.Controller.authorize
def show(self, req, type_id, id):

24
manila/api/v1/shares.py
View File

@ -233,7 +233,8 @@ class ShareMixin(object):
return share
def _create(self, req, body,
check_create_share_from_snapshot_support=False):
check_create_share_from_snapshot_support=False,
check_availability_zones_extra_spec=False):
"""Creates a new share."""
context = req.environ['manila.context']
@ -300,6 +301,7 @@ class ShareMixin(object):
share_network_id = share.get('share_network_id')
parent_share_type = {}
if snapshot:
# Need to check that share_network_id from snapshot's
# parents share equals to share_network_id from args.
@ -307,6 +309,8 @@ class ShareMixin(object):
# share_network_id of parent share.
parent_share = self.share_api.get(context, snapshot['share_id'])
parent_share_net_id = parent_share.instance['share_network_id']
parent_share_type = share_types.get_share_type(
context, parent_share.instance['share_type_id'])
if share_network_id:
if share_network_id != parent_share_net_id:
msg = ("Share network ID should be the same as snapshot's"
@ -371,6 +375,24 @@ class ShareMixin(object):
'driver_handles_share_servers is true.')
raise exc.HTTPBadRequest(explanation=msg)
type_chosen = share_type or parent_share_type
if type_chosen and check_availability_zones_extra_spec:
type_azs = type_chosen.get(
'extra_specs', {}).get('availability_zones', '')
type_azs = type_azs.split(',') if type_azs else []
kwargs['availability_zones'] = type_azs
if (availability_zone and type_azs and
availability_zone not in type_azs):
msg = _("Share type %(type)s is not supported within the "
"availability zone chosen %(az)s.")
type_chosen = (
req_share_type or "%s (from source snapshot)" % (
parent_share_type.get('name') or
parent_share_type.get('id'))
)
payload = {'type': type_chosen, 'az': availability_zone}
raise exc.HTTPBadRequest(explanation=msg % payload)
if share_type:
kwargs['share_type'] = share_type
new_share = self.share_api.create(context,

5
manila/api/v2/share_groups.py
View File

@ -212,8 +212,9 @@ class ShareGroupController(wsgi.Controller, wsgi.AdminActionsMixin):
"availability zone is inherited from the source.")
raise exc.HTTPBadRequest(explanation=msg)
try:
az_id = db.availability_zone_get(context, availability_zone).id
kwargs['availability_zone_id'] = az_id
az = db.availability_zone_get(context, availability_zone)
kwargs['availability_zone_id'] = az.id
kwargs['availability_zone'] = az.name
except exception.AvailabilityZoneNotFound as e:
raise exc.HTTPNotFound(explanation=six.text_type(e))

24
manila/api/v2/share_types.py
View File

@ -126,17 +126,19 @@ class ShareTypesController(wsgi.Controller):
else:
filters['is_public'] = True
if (req.api_version_request < api_version.APIVersionRequest("2.43")):
extra_specs = req.params.get('extra_specs')
if extra_specs:
msg = _("Filter by 'extra_specs' is not supported by this "
"microversion. Use 2.43 or greater microversion to "
"be able to use filter search by 'extra_specs.")
raise webob.exc.HTTPBadRequest(explanation=msg)
else:
extra_specs = req.params.get('extra_specs')
if extra_specs:
filters['extra_specs'] = ast.literal_eval(extra_specs)
extra_specs = req.params.get('extra_specs', {})
extra_specs_disallowed = (req.api_version_request <
api_version.APIVersionRequest("2.43"))
if extra_specs and extra_specs_disallowed:
msg = _("Filter by 'extra_specs' is not supported by this "
"microversion. Use 2.43 or greater microversion to "
"be able to use filter search by 'extra_specs.")
raise webob.exc.HTTPBadRequest(explanation=msg)
elif extra_specs:
extra_specs = ast.literal_eval(extra_specs)
filters['extra_specs'] = share_types.sanitize_extra_specs(
extra_specs)
limited_types = share_types.get_all_types(
context, search_opts=filters).values()

8
manila/api/v2/shares.py
View File

@ -178,8 +178,14 @@ class ShareController(shares.ShareMixin,
return data
@wsgi.Controller.api_version("2.31")
@wsgi.Controller.api_version("2.48")
def create(self, req, body):
return self._create(req, body,
check_create_share_from_snapshot_support=True,
check_availability_zones_extra_spec=True)
@wsgi.Controller.api_version("2.31", "2.47") # noqa
def create(self, req, body): # pylint: disable=E0102
return self._create(
req, body, check_create_share_from_snapshot_support=True)

2
manila/common/constants.py
View File

@ -196,6 +196,7 @@ class ExtraSpecs(object):
CREATE_SHARE_FROM_SNAPSHOT_SUPPORT = "create_share_from_snapshot_support"
REVERT_TO_SNAPSHOT_SUPPORT = "revert_to_snapshot_support"
MOUNT_SNAPSHOT_SUPPORT = "mount_snapshot_support"
AVAILABILITY_ZONES = "availability_zones"
# Extra specs containers
REQUIRED = (
@ -208,6 +209,7 @@ class ExtraSpecs(object):
REVERT_TO_SNAPSHOT_SUPPORT,
REPLICATION_TYPE_SPEC,
MOUNT_SNAPSHOT_SUPPORT,
AVAILABILITY_ZONES,
)
# NOTE(cknight): Some extra specs are necessary parts of the Manila API and

19
manila/scheduler/filters/availability_zone.py
View File

@ -25,10 +25,17 @@ class AvailabilityZoneFilter(base_host.BaseHostFilter):
def host_passes(self, host_state, filter_properties):
spec = filter_properties.get('request_spec', {})
props = spec.get('resource_properties', {})
availability_zone_id = props.get(
'availability_zone_id', spec.get('availability_zone_id'))
request_az_id = props.get('availability_zone_id',
spec.get('availability_zone_id'))
request_azs = spec.get('availability_zones')
host_az_id = host_state.service['availability_zone_id']
host_az = host_state.service['availability_zone']['name']
if availability_zone_id:
return (availability_zone_id ==
host_state.service['availability_zone_id'])
return True
host_satisfied = True
if request_az_id is not None:
host_satisfied = request_az_id == host_az_id
if request_azs:
host_satisfied = host_satisfied and host_az in request_azs
return host_satisfied

9
manila/scheduler/utils.py
View File

@ -129,7 +129,16 @@ def thin_provisioning(host_state_thin_provisioning):
def capabilities_satisfied(capabilities, extra_specs):
# These extra-specs are not capabilities for matching hosts
ignored_extra_specs = (
'availability_zones', 'capabilities:availability_zones',
)
for key, req in extra_specs.items():
# Ignore some extra_specs if told to
if key in ignored_extra_specs:
continue
# Either not scoped format, or in capabilities scope
scope = key.split(':')

47
manila/share/api.py
View File

@ -69,7 +69,8 @@ class API(base.Base):
def create(self, context, share_proto, size, name, description,
snapshot_id=None, availability_zone=None, metadata=None,
share_network_id=None, share_type=None, is_public=False,
share_group_id=None, share_group_snapshot_member=None):
share_group_id=None, share_group_snapshot_member=None,
availability_zones=None):
"""Create new share."""
policy.check_policy(context, 'share', 'create')
@ -257,7 +258,7 @@ class API(base.Base):
context, share, share_network_id=share_network_id, host=host,
availability_zone=availability_zone, share_group=share_group,
share_group_snapshot_member=share_group_snapshot_member,
share_type_id=share_type_id)
share_type_id=share_type_id, availability_zones=availability_zones)
# Retrieve the share with instance details
share = self.db.share_get(context, share['id'])
@ -333,7 +334,7 @@ class API(base.Base):
def create_instance(self, context, share, share_network_id=None,
host=None, availability_zone=None,
share_group=None, share_group_snapshot_member=None,
share_type_id=None):
share_type_id=None, availability_zones=None):
policy.check_policy(context, 'share', 'create')
request_spec, share_instance = (
@ -341,7 +342,8 @@ class API(base.Base):
context, share, availability_zone=availability_zone,
share_group=share_group, host=host,
share_network_id=share_network_id,
share_type_id=share_type_id))
share_type_id=share_type_id,
availability_zones=availability_zones))
if share_group_snapshot_member:
# Inherit properties from the share_group_snapshot_member
@ -379,7 +381,8 @@ class API(base.Base):
def create_share_instance_and_get_request_spec(
self, context, share, availability_zone=None,
share_group=None, host=None, share_network_id=None,
share_type_id=None, cast_rules_to_readonly=False):
share_type_id=None, cast_rules_to_readonly=False,
availability_zones=None):
availability_zone_id = None
if availability_zone:
@ -449,6 +452,7 @@ class API(base.Base):
'share_type': share_type,
'share_group': share_group,
'availability_zone_id': availability_zone_id,
'availability_zones': availability_zones,
}
return request_spec, share_instance
@ -473,6 +477,21 @@ class API(base.Base):
"state.")
raise exception.ReplicationException(reason=msg % share['id'])
share_type = share_types.get_share_type(
context, share.instance['share_type_id'])
type_azs = share_type['extra_specs'].get('availability_zones', '')
type_azs = [t for t in type_azs.split(',') if type_azs]
if (availability_zone and type_azs and
availability_zone not in type_azs):
msg = _("Share replica cannot be created since the share type "
"%(type)s is not supported within the availability zone "
"chosen %(az)s.")
type_name = '%s' % (share_type['name'] or '')
type_id = '(ID: %s)' % share_type['id']
payload = {'type': '%s%s' % (type_name, type_id),
'az': availability_zone}
raise exception.InvalidShare(message=msg % payload)
if share['replication_type'] == constants.REPLICATION_TYPE_READABLE:
cast_rules_to_readonly = True
else:
@ -483,7 +502,9 @@ class API(base.Base):
context, share, availability_zone=availability_zone,
share_network_id=share_network_id,
share_type_id=share['instance']['share_type_id'],
cast_rules_to_readonly=cast_rules_to_readonly))
cast_rules_to_readonly=cast_rules_to_readonly,
availability_zones=type_azs)
)
all_replicas = self.db.share_replicas_get_all_by_share(
context, share['id'])
@ -1197,6 +1218,20 @@ class API(base.Base):
service = self.db.service_get_by_args(
context, dest_host_host, 'manila-share')
type_azs = share_type['extra_specs'].get('availability_zones', '')
type_azs = [t for t in type_azs.split(',') if type_azs]
if type_azs and service['availability_zone']['name'] not in type_azs:
msg = _("Share %(shr)s cannot be migrated to host %(dest)s "
"because share type %(type)s is not supported within the "
"availability zone (%(az)s) that the host is in.")
type_name = '%s' % (share_type['name'] or '')
type_id = '(ID: %s)' % share_type['id']
payload = {'type': '%s%s' % (type_name, type_id),
'az': service['availability_zone']['name'],
'shr': share['id'],
'dest': dest_host}
raise exception.InvalidShare(reason=msg % payload)
request_spec = self._get_request_spec_dict(
share,
share_type,

99
manila/share/share_types.py
View File

@ -45,6 +45,9 @@ def create(context, name, extra_specs=None, is_public=True,
get_valid_optional_extra_specs(extra_specs)
except exception.InvalidExtraSpec as e:
raise exception.InvalidShareType(reason=six.text_type(e))
extra_specs = sanitize_extra_specs(extra_specs)
try:
type_ref = db.share_type_create(context,
dict(name=name,
@ -59,6 +62,14 @@ def create(context, name, extra_specs=None, is_public=True,
return type_ref
def sanitize_extra_specs(extra_specs):
"""Post process extra specs here if necessary"""
az_spec = constants.ExtraSpecs.AVAILABILITY_ZONES
if az_spec in extra_specs:
extra_specs[az_spec] = sanitize_csv(extra_specs[az_spec])
return extra_specs
def destroy(context, id):
"""Marks share types as deleted."""
if id is None:
@ -92,39 +103,61 @@ def get_all_types(context, inactive=0, search_opts=None):
type_args['required_extra_specs'] = required_extra_specs
search_vars = {}
if 'extra_specs' in search_opts:
search_vars['extra_specs'] = search_opts.pop('extra_specs')
availability_zones = search_opts.get('extra_specs', {}).pop(
'availability_zones', None)
extra_specs = search_opts.pop('extra_specs', {})
if extra_specs:
search_vars['extra_specs'] = extra_specs
if availability_zones:
search_vars['availability_zones'] = availability_zones.split(',')
if search_opts:
# No other search options are currently supported
return {}
elif search_vars:
LOG.debug("Searching by: %s", search_vars)
elif not search_vars:
return share_types
def _check_extra_specs_match(share_type, searchdict):
for k, v in searchdict.items():
if (k not in share_type['extra_specs'].keys()
or share_type['extra_specs'][k] != v):
return False
LOG.debug("Searching by: %s", search_vars)
def _check_extra_specs_match(share_type, searchdict):
for k, v in searchdict.items():
if (k not in share_type['extra_specs'].keys()
or share_type['extra_specs'][k] != v):
return False
return True
# search_option to filter_name mapping.
filter_mapping = {'extra_specs': _check_extra_specs_match}
def _check_availability_zones_match(share_type, availability_zones):
type_azs = share_type['extra_specs'].get('availability_zones')
if type_azs:
type_azs = type_azs.split(',')
return set(availability_zones).issubset(set(type_azs))
return True
result = {}
for type_name, type_args in share_types.items():
# go over all filters in the list
for opt, values in search_vars.items():
try:
filter_func = filter_mapping[opt]
except KeyError:
# no such filter - ignore it, go to next filter
continue
else:
if filter_func(type_args, values):
result[type_name] = type_args
break
share_types = result
return share_types
# search_option to filter_name mapping.
filter_mapping = {
'extra_specs': _check_extra_specs_match,
'availability_zones': _check_availability_zones_match,
}
result = {}
for type_name, type_args in share_types.items():
# go over all filters in the list (*AND* operation)
type_matches = True
for opt, value in search_vars.items():
try:
filter_func = filter_mapping[opt]
except KeyError:
# no such filter - ignore it, go to next filter
continue
else:
if not filter_func(type_args, value):
type_matches = False
break
if type_matches:
result[type_name] = type_args
return result
def get_share_type(ctxt, id, expected_fields=None):
@ -264,6 +297,18 @@ def get_valid_required_extra_specs(extra_specs):
return required_extra_specs
def is_valid_csv(extra_spec_value):
if not isinstance(extra_spec_value, six.string_types):
extra_spec_value = six.text_type(extra_spec_value)
values = extra_spec_value.split(',')
return all([v.strip() for v in values])
def sanitize_csv(csv_string):
return ','.join(value.strip() for value in csv_string.split(',')
if (csv_string and value))
def is_valid_optional_extra_spec(key, value):
"""Validates optional but standardized extra_spec value.
@ -285,6 +330,8 @@ def is_valid_optional_extra_spec(key, value):
return value in constants.ExtraSpecs.REPLICATION_TYPES
elif key == constants.ExtraSpecs.MOUNT_SNAPSHOT_SUPPORT:
return parse_boolean_extra_spec(key, value) is not None
elif key == constants.ExtraSpecs.AVAILABILITY_ZONES:
return is_valid_csv(value)
return False

37
manila/share_group/api.py
View File

@ -50,7 +50,7 @@ class API(base.Base):
def create(self, context, name=None, description=None,
share_type_ids=None, source_share_group_snapshot_id=None,
share_network_id=None, share_group_type_id=None,
availability_zone_id=None):
availability_zone_id=None, availability_zone=None):
"""Create new share group."""
share_group_snapshot = None
@ -132,12 +132,46 @@ class API(base.Base):
supported_share_types = set(
[x['share_type_id'] for x in share_group_type['share_types']])
supported_share_type_objects = [
share_types.get_share_type(context, share_type_id) for
share_type_id in supported_share_types
]
if not set(share_type_ids or []) <= supported_share_types:
msg = _("The specified share types must be a subset of the share "
"types supported by the share group type.")
raise exception.InvalidInput(reason=msg)
# Grab share type AZs for scheduling
share_types_of_new_group = (
share_type_objects or supported_share_type_objects
)
stype_azs_of_new_group = []
stypes_unsupported_in_az = []
for stype in share_types_of_new_group:
stype_azs = stype.get('extra_specs', {}).get(
'availability_zones', '')
if stype_azs:
stype_azs = stype_azs.split(',')
stype_azs_of_new_group.extend(stype_azs)
if availability_zone and availability_zone not in stype_azs:
# If an AZ is requested, it must be supported by the AZs
# configured in each of the share types requested
stypes_unsupported_in_az.append((stype['name'],
stype['id']))
if stypes_unsupported_in_az:
msg = _("Share group cannot be created since the following share "
"types are not supported within the availability zone "
"'%(az)s': (%(stypes)s)")
payload = {'az': availability_zone, 'stypes': ''}
for type_name, type_id in set(stypes_unsupported_in_az):
if payload['stypes']:
payload['stypes'] += ', '
type_name = '%s ' % (type_name or '')
payload['stypes'] += type_name + '(ID: %s)' % type_id
raise exception.InvalidInput(reason=msg % payload)
try:
reservations = QUOTAS.reserve(context, share_groups=1)
except exception.OverQuota as e:
@ -213,6 +247,7 @@ class API(base.Base):
request_spec = {'share_group_id': share_group['id']}
request_spec.update(options)
request_spec['availability_zones'] = set(stype_azs_of_new_group)
request_spec['share_types'] = share_type_objects
request_spec['resource_type'] = share_group_type

15
manila/tests/api/contrib/stubs.py
View File

@ -122,6 +122,21 @@ def stub_snapshot(id, **kwargs):
return snapshot
def stub_share_type(id, **kwargs):
share_type = {
'id': id,
'name': 'fakesharetype',
'description': 'fakesharetypedescription',
'is_public': True,
}
share_type.update(kwargs)
return share_type
def stub_share_type_get(context, share_type_id, **kwargs):
return stub_share_type(share_type_id, **kwargs)
def stub_share_get(self, context, share_id, **kwargs):
return stub_share(share_id, **kwargs)

2
manila/tests/api/v1/test_shares.py
View File

@ -57,6 +57,8 @@ class ShareAPITest(test.TestCase):
self.mock_object(share_api.API, 'delete', stubs.stub_share_delete)
self.mock_object(share_api.API, 'get_snapshot',
stubs.stub_snapshot_get)
self.mock_object(share_types, 'get_share_type',
stubs.stub_share_type_get)
self.maxDiff = None
self.share = {
"size": 100,

1
manila/tests/api/v2/test_share_groups.py
View File

@ -263,6 +263,7 @@ class ShareGroupAPITest(test.TestCase):
self.controller.share_group_api.create.assert_called_once_with(
self.context, availability_zone_id=fake_az_id,
availability_zone=fake_az_name,
share_group_type_id=self.fake_share_group_type['id'],
share_type_ids=[self.fake_share_type['id']])
share_groups.db.availability_zone_get.assert_called_once_with(

234
manila/tests/api/v2/test_shares.py
View File

@ -21,6 +21,7 @@ import ddt
import mock
from oslo_config import cfg
from oslo_serialization import jsonutils
from oslo_utils import uuidutils
import six
import webob
import webob.exc
@ -41,10 +42,13 @@ from manila.tests.api.contrib import stubs
from manila.tests.api import fakes
from manila.tests import db_utils
from manila.tests import fake_share
from manila.tests import utils as test_utils
from manila import utils
CONF = cfg.CONF
LATEST_MICROVERSION = api_version._MAX_API_VERSION
@ddt.ddt
class ShareAPITest(test.TestCase):
@ -62,6 +66,8 @@ class ShareAPITest(test.TestCase):
self.mock_object(share_api.API, 'delete', stubs.stub_share_delete)
self.mock_object(share_api.API, 'get_snapshot',
stubs.stub_snapshot_get)
self.mock_object(share_types, 'get_share_type',
stubs.stub_share_type_get)
self.maxDiff = None
self.share = {
"id": "1",
@ -102,7 +108,40 @@ class ShareAPITest(test.TestCase):
CONF.set_default("default_share_type", None)
def _get_expected_share_detailed_response(self, values=None, admin=False):
def _process_expected_share_detailed_response(self, shr_dict, req_version):
"""Sets version based parameters on share dictionary."""
share_dict = copy.deepcopy(shr_dict)
changed_parameters = {
'2.2': {'snapshot_support': True},
'2.5': {'task_state': None},
'2.6': {'share_type_name': None},
'2.10': {'access_rules_status': constants.ACCESS_STATE_ACTIVE},
'2.11': {'replication_type': None, 'has_replicas': False},
'2.16': {'user_id': 'fakeuser'},
'2.24': {'create_share_from_snapshot_support': True},
'2.27': {'revert_to_snapshot_support': False},
'2.31': {'share_group_id': None,
'source_share_group_snapshot_member_id': None},
'2.32': {'mount_snapshot_support': False},
}
# Apply all the share transformations
if self.is_microversion_ge(req_version, '2.9'):
share_dict.pop('export_locations', None)
share_dict.pop('export_location', None)
for version, parameters in changed_parameters.items():
for param, default in parameters.items():
if self.is_microversion_ge(req_version, version):
share_dict[param] = share_dict.get(param, default)
else:
share_dict.pop(param, None)
return share_dict
def _get_expected_share_detailed_response(self, values=None,
admin=False, version='2.0'):
share = {
'id': '1',
'name': 'displayname',
@ -146,7 +185,10 @@ class ShareAPITest(test.TestCase):
if admin:
share['share_server_id'] = 'fake_share_server_id'
share['host'] = 'fakehost'
return {'share': share}
return {
'share': self._process_expected_share_detailed_response(
share, version)
}
def test__revert(self):
@ -445,10 +487,8 @@ class ShareAPITest(test.TestCase):
res_dict = self.controller.create(req, body)
expected = self._get_expected_share_detailed_response(self.share)
expected['share'].pop('snapshot_support')
expected['share'].pop('share_type_name')
expected['share'].pop('task_state')
expected = self._get_expected_share_detailed_response(
self.share, version=microversion)
self.assertEqual(expected, res_dict)
@ddt.data("2.2", "2.3")
@ -459,31 +499,20 @@ class ShareAPITest(test.TestCase):
res_dict = self.controller.create(req, body)
expected = self._get_expected_share_detailed_response(self.share)
expected['share'].pop('share_type_name')
expected['share'].pop('task_state')
expected = self._get_expected_share_detailed_response(
self.share, version=microversion)
self.assertEqual(expected, res_dict)
@ddt.data("2.31")
def test_share_create_with_share_group(self, microversion):
def test_share_create_with_share_group(self):
self.mock_object(share_api.API, 'create', self.create_mock)
body = {"share": copy.deepcopy(self.share)}
req = fakes.HTTPRequest.blank('/shares', version=microversion,
req = fakes.HTTPRequest.blank('/shares', version="2.31",
experimental=True)
res_dict = self.controller.create(req, body)
expected = self._get_expected_share_detailed_response(self.share)
expected['share'].pop('export_location')
expected['share'].pop('export_locations')
expected['share']['access_rules_status'] = 'active'
expected['share']['replication_type'] = None
expected['share']['has_replicas'] = False
expected['share']['user_id'] = 'fakeuser'
expected['share']['create_share_from_snapshot_support'] = True
expected['share']['revert_to_snapshot_support'] = False
expected['share']['share_group_id'] = None
expected['share']['source_share_group_snapshot_member_id'] = None
expected = self._get_expected_share_detailed_response(
self.share, version="2.31")
self.assertEqual(expected, res_dict)
def test_share_create_with_sg_and_availability_zone(self):
@ -586,7 +615,8 @@ class ShareAPITest(test.TestCase):
req = fakes.HTTPRequest.blank('/shares', version='2.7')
res_dict = self.controller.create(req, body)
expected = self._get_expected_share_detailed_response(self.share)
expected = self._get_expected_share_detailed_response(self.share,
version='2.7')
share_types.get_share_type_by_name.assert_called_once_with(
utils.IsAMatcher(context.RequestContext), self.vt['name'])
self.assertEqual(expected, res_dict)
@ -612,15 +642,8 @@ class ShareAPITest(test.TestCase):
res_dict = self.controller.create(req, body)
expected = self._get_expected_share_detailed_response(self.share)
expected['share']['task_state'] = None
expected['share']['replication_type'] = None
expected['share']['share_type_name'] = None
expected['share']['has_replicas'] = False
expected['share']['access_rules_status'] = 'active'
expected['share'].pop('export_location')
expected['share'].pop('export_locations')
expected = self._get_expected_share_detailed_response(
self.share, version=share_replicas.MIN_SUPPORTED_API_VERSION)
self.assertEqual(expected, res_dict)
@ -648,7 +671,8 @@ class ShareAPITest(test.TestCase):
req = fakes.HTTPRequest.blank('/shares', version='2.7')
res_dict = self.controller.create(req, body)
expected = self._get_expected_share_detailed_response(shr)
expected = self._get_expected_share_detailed_response(
shr, version='2.7')
self.assertDictMatch(expected, res_dict)
self.assertEqual("fakenetid",
create_mock.call_args[1]['share_network_id'])
@ -661,22 +685,67 @@ class ShareAPITest(test.TestCase):
res_dict = self.controller.create(req, body)
expected = self._get_expected_share_detailed_response(self.share)
if api_version.APIVersionRequest(microversion) >= (
api_version.APIVersionRequest("2.16")):
expected['share']['user_id'] = 'fakeuser'
else:
self.assertNotIn('user_id', expected['share'])
expected['share']['task_state'] = None
expected['share']['replication_type'] = None
expected['share']['share_type_name'] = None
expected['share']['has_replicas'] = False
expected['share']['access_rules_status'] = 'active'
expected['share'].pop('export_location')
expected['share'].pop('export_locations')
expected = self._get_expected_share_detailed_response(
self.share, version=microversion)
self.assertEqual(expected, res_dict)
@ddt.data(test_utils.annotated('v2.0_az_unsupported', ('2.0', False)),
test_utils.annotated('v2.0_az_supported', ('2.0', True)),
test_utils.annotated('v2.47_az_unsupported', ('2.47', False)),
test_utils.annotated('v2.47_az_supported', ('2.47', True)))
@ddt.unpack
def test_share_create_with_share_type_azs(self, version, az_supported):
"""For API version<2.48, AZ validation should not be performed."""
self.mock_object(share_api.API, 'create', self.create_mock)
create_args = copy.deepcopy(self.share)
create_args['availability_zone'] = 'az1' if az_supported else 'az2'
create_args['share_type'] = uuidutils.generate_uuid()
stype_with_azs = copy.deepcopy(self.vt)
stype_with_azs['extra_specs']['availability_zones'] = 'az1,az3'
self.mock_object(share_types, 'get_share_type', mock.Mock(
return_value=stype_with_azs))
req = fakes.HTTPRequest.blank('/shares', version=version)
res_dict = self.controller.create(req, {'share': create_args})
expected = self._get_expected_share_detailed_response(
values=self.share, version=version)
self.assertEqual(expected, res_dict)
@ddt.data(*set([
test_utils.annotated('v2.48_share_from_snap', ('2.48', True)),
test_utils.annotated('v2.48_share_not_from_snap', ('2.48', False)),
test_utils.annotated('v%s_share_from_snap' % LATEST_MICROVERSION,
(LATEST_MICROVERSION, True)),
test_utils.annotated('v%s_share_not_from_snap' % LATEST_MICROVERSION,
(LATEST_MICROVERSION, False))]))
@ddt.unpack
def test_share_create_az_not_in_share_type(self, version, snap):
"""For API version>=2.48, AZ validation should be performed."""
self.mock_object(share_api.API, 'create', self.create_mock)
create_args = copy.deepcopy(self.share)
create_args['availability_zone'] = 'az2'
create_args['share_type'] = (uuidutils.generate_uuid() if not snap
else None)
create_args['snapshot_id'] = (uuidutils.generate_uuid() if snap
else None)
stype_with_azs = copy.deepcopy(self.vt)
stype_with_azs['extra_specs']['availability_zones'] = 'az1 , az3'
self.mock_object(share_types, 'get_share_type', mock.Mock(
return_value=stype_with_azs))
self.mock_object(share_api.API, 'get_snapshot',
stubs.stub_snapshot_get)
req = fakes.HTTPRequest.blank('/shares', version=version)
self.assertRaises(webob.exc.HTTPBadRequest,
self.controller.create,
req, {'share': create_args})
share_api.API.create.assert_not_called()
def test_migration_start(self):
share = db_utils.create_share()
share_network = db_utils.create_share_network()
@ -1138,8 +1207,11 @@ class ShareAPITest(test.TestCase):
self.mock_object(share_api.API, 'create', create_mock)
body = {"share": copy.deepcopy(shr)}
req = fakes.HTTPRequest.blank('/shares', version='2.7')
res_dict = self.controller.create(req, body)
expected = self._get_expected_share_detailed_response(shr)
expected = self._get_expected_share_detailed_response(
shr, version='2.7')
self.assertEqual(expected, res_dict)
def test_share_create_from_snapshot_without_share_net_parent_exists(self):
@ -1175,8 +1247,11 @@ class ShareAPITest(test.TestCase):
body = {"share": copy.deepcopy(shr)}
req = fakes.HTTPRequest.blank('/shares', version='2.7')
res_dict = self.controller.create(req, body)
expected = self._get_expected_share_detailed_response(shr)
expected = self._get_expected_share_detailed_response(
shr, version='2.7')
self.assertEqual(expected, res_dict)
self.assertEqual(parent_share_net,
create_mock.call_args[1]['share_network_id'])
@ -1215,7 +1290,8 @@ class ShareAPITest(test.TestCase):
body = {"share": copy.deepcopy(shr)}
req = fakes.HTTPRequest.blank('/shares', version='2.7')
res_dict = self.controller.create(req, body)
expected = self._get_expected_share_detailed_response(shr)
expected = self._get_expected_share_detailed_response(
shr, version='2.7')
self.assertDictMatch(expected, res_dict)
self.assertEqual(parent_share_net,
create_mock.call_args[1]['share_network_id'])
@ -1294,9 +1370,6 @@ class ShareAPITest(test.TestCase):
def test_share_show(self):
req = fakes.HTTPRequest.blank('/shares/1')
expected = self._get_expected_share_detailed_response()
expected['share'].pop('snapshot_support')
expected['share'].pop('share_type_name')
expected['share'].pop('task_state')
res_dict = self.controller.show(req, '1')
@ -1305,17 +1378,7 @@ class ShareAPITest(test.TestCase):
def test_share_show_with_share_group(self):
req = fakes.HTTPRequest.blank(
'/shares/1', version='2.31', experimental=True)
expected = self._get_expected_share_detailed_response()
expected['share'].pop('export_location')
expected['share'].pop('export_locations')
expected['share']['create_share_from_snapshot_support'] = True
expected['share']['revert_to_snapshot_support'] = False
expected['share']['share_group_id'] = None
expected['share']['source_share_group_snapshot_member_id'] = None
expected['share']['access_rules_status'] = 'active'
expected['share']['replication_type'] = None
expected['share']['has_replicas'] = False
expected['share']['user_id'] = 'fakeuser'
expected = self._get_expected_share_detailed_response(version='2.31')
res_dict = self.controller.show(req, '1')
@ -1324,13 +1387,7 @@ class ShareAPITest(test.TestCase):
def test_share_show_with_share_group_earlier_version(self):
req = fakes.HTTPRequest.blank(
'/shares/1', version='2.23', experimental=True)
expected = self._get_expected_share_detailed_response()
expected['share'].pop('export_location')
expected['share'].pop('export_locations')
expected['share']['access_rules_status'] = 'active'
expected['share']['replication_type'] = None
expected['share']['has_replicas'] = False
expected['share']['user_id'] = 'fakeuser'
expected = self._get_expected_share_detailed_response(version='2.23')
res_dict = self.controller.show(req, '1')
@ -1338,10 +1395,10 @@ class ShareAPITest(test.TestCase):
def test_share_show_with_share_type_name(self):
req = fakes.HTTPRequest.blank('/shares/1', version='2.6')
res_dict = self.controller.show(req, '1')
expected = self._get_expected_share_detailed_response()
expected['share']['share_type_name'] = None
expected['share']['task_state'] = None
expected = self._get_expected_share_detailed_response(version='2.6')
self.assertEqual(expected, res_dict)
@ddt.data("2.15", "2.16")
@ -1350,28 +1407,14 @@ class ShareAPITest(test.TestCase):
res_dict = self.controller.show(req, '1')
expected = self._get_expected_share_detailed_response()
if api_version.APIVersionRequest(microversion) >= (
api_version.APIVersionRequest("2.16")):
expected['share']['user_id'] = 'fakeuser'
else:
self.assertNotIn('user_id', expected['share'])
expected['share']['share_type_name'] = None
expected['share']['task_state'] = None
expected['share']['access_rules_status'] = 'active'
expected['share'].pop('export_location')
expected['share'].pop('export_locations')
expected['share']['replication_type'] = None
expected['share']['has_replicas'] = False
expected = self._get_expected_share_detailed_response(
version=microversion)
self.assertEqual(expected, res_dict)
def test_share_show_admin(self):
req = fakes.HTTPRequest.blank('/shares/1', use_admin_context=True)
expected = self._get_expected_share_detailed_response(admin=True)
expected['share'].pop('snapshot_support')
expected['share'].pop('share_type_name')
expected['share'].pop('task_state')
res_dict = self.controller.show(req, '1')
@ -1390,15 +1433,8 @@ class ShareAPITest(test.TestCase):
'/shares/1', version=share_replicas.MIN_SUPPORTED_API_VERSION)
res_dict = self.controller.show(req, '1')
expected = self._get_expected_share_detailed_response()
expected['share']['task_state'] = None
expected['share']['access_rules_status'] = 'active'
expected['share']['share_type_name'] = None
expected['share']['replication_type'] = None
expected['share']['has_replicas'] = False
expected['share'].pop('export_location')
expected['share'].pop('export_locations')
expected = self._get_expected_share_detailed_response(
version=share_replicas.MIN_SUPPORTED_API_VERSION)
self.assertEqual(expected, res_dict)

55
manila/tests/scheduler/fakes.py
View File

@ -22,13 +22,24 @@ from manila.scheduler.drivers import filter
from manila.scheduler import host_manager
from manila.scheduler.weighers import base_host as base_host_weigher
FAKE_AZ_1 = {'name': 'zone1', 'id': '24433438-c9b5-4cb5-a472-f78462aa5f31'}
FAKE_AZ_2 = {'name': 'zone2', 'id': 'ebef050c-d20d-4c44-b272-1a0adce11cb5'}
FAKE_AZ_3 = {'name': 'zone3', 'id': '18e7e6e2-39d6-466b-a706-2717bd1086e1'}
FAKE_AZ_4 = {'name': 'zone4', 'id': '9ca40ee4-3c2a-4635-9a18-233cf6e0ad0b'}
FAKE_AZ_5 = {'name': 'zone4', 'id': 'd76d921d-d6fa-41b4-a180-fb68952784bd'}
FAKE_AZ_6 = {'name': 'zone4', 'id': 'bc09c3d6-671c-4d55-9f43-f00757aabc50'}
SHARE_SERVICES_NO_POOLS = [
dict(id=1, host='host1', topic='share', disabled=False,
availability_zone='zone1', updated_at=timeutils.utcnow()),
updated_at=timeutils.utcnow(), availability_zone_id=FAKE_AZ_1['id'],
availability_zone=FAKE_AZ_1),
dict(id=2, host='host2@back1', topic='share', disabled=False,
availability_zone='zone1', updated_at=timeutils.utcnow()),
updated_at=timeutils.utcnow(), availability_zone_id=FAKE_AZ_2['id'],
availability_zone=FAKE_AZ_2),
dict(id=3, host='host2@back2', topic='share', disabled=False,
availability_zone='zone2', updated_at=timeutils.utcnow()),
updated_at=timeutils.utcnow(), availability_zone_id=FAKE_AZ_3['id'],
availability_zone=FAKE_AZ_3),
]
SERVICE_STATES_NO_POOLS = {
@ -69,18 +80,24 @@ SERVICE_STATES_NO_POOLS = {
SHARE_SERVICES_WITH_POOLS = [
dict(id=1, host='host1@AAA', topic='share', disabled=False,
availability_zone='zone1', updated_at=timeutils.utcnow()),
updated_at=timeutils.utcnow(), availability_zone_id=FAKE_AZ_1['id'],
availability_zone=FAKE_AZ_1),
dict(id=2, host='host2@BBB', topic='share', disabled=False,
availability_zone='zone1', updated_at=timeutils.utcnow()),
updated_at=timeutils.utcnow(), availability_zone_id=FAKE_AZ_2['id'],
availability_zone=FAKE_AZ_2),
dict(id=3, host='host3@CCC', topic='share', disabled=False,
availability_zone='zone2', updated_at=timeutils.utcnow()),
updated_at=timeutils.utcnow(), availability_zone_id=FAKE_AZ_3['id'],
availability_zone=FAKE_AZ_3),
dict(id=4, host='host4@DDD', topic='share', disabled=False,
availability_zone='zone3', updated_at=timeutils.utcnow()),
updated_at=timeutils.utcnow(), availability_zone_id=FAKE_AZ_4['id'],
availability_zone=FAKE_AZ_4),
# service on host5 is disabled
dict(id=5, host='host5@EEE', topic='share', disabled=True,
availability_zone='zone4', updated_at=timeutils.utcnow()),
dict(id=5, host='host6@FFF', topic='share', disabled=True,
availability_zone='zone5', updated_at=timeutils.utcnow()),
updated_at=timeutils.utcnow(), availability_zone_id=FAKE_AZ_5['id'],
availability_zone=FAKE_AZ_5),
dict(id=6, host='host6@FFF', topic='share', disabled=True,
updated_at=timeutils.utcnow(), availability_zone_id=FAKE_AZ_6['id'],
availability_zone=FAKE_AZ_6),
]
SHARE_SERVICE_STATES_WITH_POOLS = {
@ -289,17 +306,23 @@ FAKE_HOST_STRING_3 = 'openstack@BackendC#PoolZ'
def mock_host_manager_db_calls(mock_obj, disabled=None):
services = [
dict(id=1, host='host1', topic='share', disabled=False,
availability_zone_id='zone1', updated_at=timeutils.utcnow()),
availability_zone=FAKE_AZ_1, availability_zone_id=FAKE_AZ_1['id'],
updated_at=timeutils.utcnow()),
dict(id=2, host='host2', topic='share', disabled=False,
availability_zone_id='zone1', updated_at=timeutils.utcnow()),
availability_zone=FAKE_AZ_1, availability_zone_id=FAKE_AZ_1['id'],
updated_at=timeutils.utcnow()),
dict(id=3, host='host3', topic='share', disabled=False,
availability_zone_id='zone2', updated_at=timeutils.utcnow()),
availability_zone=FAKE_AZ_2, availability_zone_id=FAKE_AZ_2['id'],
updated_at=timeutils.utcnow()),
dict(id=4, host='host4', topic='share', disabled=False,
availability_zone_id='zone3', updated_at=timeutils.utcnow()),
availability_zone=FAKE_AZ_3, availability_zone_id=FAKE_AZ_3['id'],
updated_at=timeutils.utcnow()),
dict(id=5, host='host5', topic='share', disabled=False,
availability_zone_id='zone3', updated_at=timeutils.utcnow()),
availability_zone=FAKE_AZ_3, availability_zone_id=FAKE_AZ_3['id'],
updated_at=timeutils.utcnow()),
dict(id=6, host='host6', topic='share', disabled=False,
availability_zone_id='zone4', updated_at=timeutils.utcnow()),
availability_zone=FAKE_AZ_4, availability_zone_id=FAKE_AZ_4['id'],
updated_at=timeutils.utcnow()),
]
if disabled is None:
mock_obj.return_value = services

63
manila/tests/scheduler/filters/test_availability_zone.py
View File

@ -16,7 +16,7 @@
"""
Tests For AvailabilityZoneFilter.
"""
import ddt
from oslo_context import context
from manila.scheduler.filters import availability_zone
@ -24,12 +24,23 @@ from manila import test
from manila.tests.scheduler import fakes
@ddt.ddt
class HostFiltersTestCase(test.TestCase):
"""Test case for AvailabilityZoneFilter."""
def setUp(self):
super(HostFiltersTestCase, self).setUp()
self.filter = availability_zone.AvailabilityZoneFilter()
self.az_id = 'e3ecad6f-e984-4cd1-b149-d83c962374a8'
self.fake_service = {
'service': {
'availability_zone_id': self.az_id,
'availability_zone': {
'name': 'nova',
'id': self.az_id
}
}
}
@staticmethod
def _make_zone_request(zone, is_admin=False):
@ -44,22 +55,52 @@ class HostFiltersTestCase(test.TestCase):
}
def test_availability_zone_filter_same(self):
service = {'availability_zone_id': 'nova'}
request = self._make_zone_request('nova')
host = fakes.FakeHostState('host1',
{'service': service})
request = self._make_zone_request(self.az_id)
host = fakes.FakeHostState('host1', self.fake_service)
self.assertTrue(self.filter.host_passes(host, request))
def test_availability_zone_filter_different(self):
service = {'availability_zone_id': 'nova'}
request = self._make_zone_request('bad')
host = fakes.FakeHostState('host1',
{'service': service})
host = fakes.FakeHostState('host1', self.fake_service)
self.assertFalse(self.filter.host_passes(host, request))
def test_availability_zone_filter_empty(self):
service = {'availability_zone_id': 'nova'}
request = {}
host = fakes.FakeHostState('host1',
{'service': service})
host = fakes.FakeHostState('host1', self.fake_service)
self.assertTrue(self.filter.host_passes(host, request))
def test_availability_zone_filter_both_request_AZ_and_type_AZs_match(self):
request = self._make_zone_request(
'9382098d-d40f-42a2-8f31-8eb78ee18c02')
request['request_spec']['availability_zones'] = [
'nova', 'super nova', 'hypernova']
service = {
'availability_zone': {
'name': 'nova',
'id': '9382098d-d40f-42a2-8f31-8eb78ee18c02',
},
'availability_zone_id': '9382098d-d40f-42a2-8f31-8eb78ee18c02',
}
host = fakes.FakeHostState('host1', {'service': service})
self.assertTrue(self.filter.host_passes(host, request))
@ddt.data((['zone1', 'zone2', 'zone 4', 'zone3'], 'zone2', True),
(['zone1zone2zone3'], 'zone2', False),
(['zone1zone2zone3'], 'nova', False),
(['zone1', 'zone2', 'zone 4', 'zone3'], 'zone 4', True))
@ddt.unpack
def test_availability_zone_filter_only_share_type_AZs(
self, supported_azs, request_az, host_passes):
service = {
'availability_zone': {
'name': request_az,
'id': '9382098d-d40f-42a2-8f31-8eb78ee18c02',