Merge "db: Rename 'share_instances_*' to 'share_instance_*'"
This commit is contained in:
Zuul
Gerrit Code Review
commit
d0182bf9e4
|
|
@ -70,7 +70,7 @@ class ShareInstancesController(wsgi.Controller, wsgi.AdminActionsMixin):
|
|||
|
||||
req.GET.pop('export_location_id', None)
|
||||
req.GET.pop('export_location_path', None)
|
||||
instances = db.share_instances_get_all(context)
|
||||
instances = db.share_instance_get_all(context)
|
||||
return self._view_builder.detail_list(req, instances)
|
||||
|
||||
@wsgi.Controller.api_version("2.35", "2.68") # noqa
|
||||
|
|
@ -82,7 +82,7 @@ class ShareInstancesController(wsgi.Controller, wsgi.AdminActionsMixin):
|
|||
common.remove_invalid_options(
|
||||
context, filters, ('export_location_id', 'export_location_path'))
|
||||
|
||||
instances = db.share_instances_get_all(context, filters)
|
||||
instances = db.share_instance_get_all(context, filters)
|
||||
return self._view_builder.detail_list(req, instances)
|
||||
|
||||
@wsgi.Controller.api_version("2.69") # noqa
|
||||
|
|
@ -99,7 +99,7 @@ class ShareInstancesController(wsgi.Controller, wsgi.AdminActionsMixin):
|
|||
'is_soft_deleted', filters)
|
||||
filters['is_soft_deleted'] = is_soft_deleted
|
||||
|
||||
instances = db.share_instances_get_all(context, filters)
|
||||
instances = db.share_instance_get_all(context, filters)
|
||||
return self._view_builder.detail_list(req, instances)
|
||||
|
||||
@wsgi.Controller.api_version("2.3")
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ class ShareNetworkSubnetController(wsgi.Controller,
|
|||
raise exc.HTTPNotFound(explanation=e.msg)
|
||||
|
||||
for share_server in share_network_subnet['share_servers'] or []:
|
||||
shares = db_api.share_instances_get_all_by_share_server(
|
||||
shares = db_api.share_instance_get_all_by_share_server(
|
||||
context, share_server['id'])
|
||||
if shares:
|
||||
msg = _("Cannot delete share network subnet %(id)s, it has "
|
||||
|
|
|
|||
|
|
@ -94,9 +94,8 @@ class ShareNetworkController(wsgi.Controller, wsgi.AdminActionsMixin):
|
|||
except exception.ShareNetworkNotFound as e:
|
||||
raise exc.HTTPNotFound(explanation=e.msg)
|
||||
|
||||
share_instances = (
|
||||
db_api.share_instances_get_all_by_share_network(context, id)
|
||||
)
|
||||
share_instances = db_api.share_instance_get_all_by_share_network(
|
||||
context, id)
|
||||
if share_instances:
|
||||
msg = _("Can not delete share network %(id)s, it has "
|
||||
"%(len)s share(s).") % {'id': id,
|
||||
|
|
|
|||
|
|
@ -337,45 +337,47 @@ def share_and_snapshot_instances_status_update(
|
|||
current_expected_status=current_expected_status)
|
||||
|
||||
|
||||
def share_instances_status_update(context, share_instance_ids, values):
|
||||
def share_instance_status_update(context, share_instance_ids, values):
|
||||
"""Updates the status of a bunch of share instances at once."""
|
||||
return IMPL.share_instances_status_update(
|
||||
return IMPL.share_instance_status_update(
|
||||
context, share_instance_ids, values)
|
||||
|
||||
|
||||
def share_instances_get_all(context, filters=None):
|
||||
def share_instance_get_all(context, filters=None):
|
||||
"""Returns all share instances."""
|
||||
return IMPL.share_instances_get_all(context, filters=filters)
|
||||
return IMPL.share_instance_get_all(context, filters=filters)
|
||||
|
||||
|
||||
def share_instances_get_all_by_share_server(context, share_server_id,
|
||||
with_share_data=False):
|
||||
def share_instance_get_all_by_share_server(
|
||||
context, share_server_id, with_share_data=False,
|
||||
):
|
||||
"""Returns all share instances with given share_server_id."""
|
||||
return IMPL.share_instances_get_all_by_share_server(
|
||||
return IMPL.share_instance_get_all_by_share_server(
|
||||
context, share_server_id, with_share_data=with_share_data)
|
||||
|
||||
|
||||
def share_instances_get_all_by_host(context, host, with_share_data=False,
|
||||
status=None):
|
||||
def share_instance_get_all_by_host(
|
||||
context, host, with_share_data=False, status=None,
|
||||
):
|
||||
"""Returns all share instances with given host."""
|
||||
return IMPL.share_instances_get_all_by_host(
|
||||
return IMPL.share_instance_get_all_by_host(
|
||||
context, host, with_share_data=with_share_data, status=status)
|
||||
|
||||
|
||||
def share_instances_get_all_by_share_network(context, share_network_id):
|
||||
def share_instance_get_all_by_share_network(context, share_network_id):
|
||||
"""Returns list of shares that belong to given share network."""
|
||||
return IMPL.share_instances_get_all_by_share_network(context,
|
||||
share_network_id)
|
||||
return IMPL.share_instance_get_all_by_share_network(
|
||||
context, share_network_id)
|
||||
|
||||
|
||||
def share_instances_get_all_by_share(context, share_id):
|
||||
def share_instance_get_all_by_share(context, share_id):
|
||||
"""Returns list of shares that belong to given share."""
|
||||
return IMPL.share_instances_get_all_by_share(context, share_id)
|
||||
return IMPL.share_instance_get_all_by_share(context, share_id)
|
||||
|
||||
|
||||
def share_instances_get_all_by_share_group_id(context, share_group_id):
|
||||
def share_instance_get_all_by_share_group_id(context, share_group_id):
|
||||
"""Returns list of share instances that belong to given share group."""
|
||||
return IMPL.share_instances_get_all_by_share_group_id(
|
||||
return IMPL.share_instance_get_all_by_share_group_id(
|
||||
context, share_group_id)
|
||||
|
||||
###################
|
||||
|
|
|
|||
|
|
@ -1663,7 +1663,7 @@ def share_and_snapshot_instances_status_update(
|
|||
with session.begin():
|
||||
if current_expected_status and share_instance_ids:
|
||||
filters = {'instance_ids': share_instance_ids}
|
||||
share_instances = share_instances_get_all(
|
||||
share_instances = share_instance_get_all(
|
||||
context, filters=filters, session=session)
|
||||
all_instances_are_compliant = all(
|
||||
instance['status'] == current_expected_status
|
||||
|
|
@ -1691,7 +1691,7 @@ def share_and_snapshot_instances_status_update(
|
|||
raise exception.InvalidShareSnapshotInstance(reason=msg)
|
||||
|
||||
if share_instance_ids:
|
||||
updated_share_instances = share_instances_status_update(
|
||||
updated_share_instances = share_instance_status_update(
|
||||
context, share_instance_ids, values, session=session)
|
||||
|
||||
if snapshot_instance_ids:
|
||||
|
|
@ -1703,7 +1703,7 @@ def share_and_snapshot_instances_status_update(
|
|||
|
||||
|
||||
@require_context
|
||||
def share_instances_status_update(
|
||||
def share_instance_status_update(
|
||||
context, share_instance_ids, values, session=None):
|
||||
session = session or get_session()
|
||||
|
||||
|
|
@ -1748,7 +1748,7 @@ def share_instance_get(context, share_instance_id, session=None,
|
|||
|
||||
|
||||
@require_admin_context
|
||||
def share_instances_get_all(context, filters=None, session=None):
|
||||
def share_instance_get_all(context, filters=None, session=None):
|
||||
session = session or get_session()
|
||||
query = model_query(
|
||||
context, models.ShareInstance, session=session, read_deleted="no",
|
||||
|
|
@ -1896,8 +1896,8 @@ def _set_instances_share_data(context, instances, session):
|
|||
|
||||
|
||||
@require_admin_context
|
||||
def share_instances_get_all_by_host(context, host, with_share_data=False,
|
||||
status=None, session=None):
|
||||
def share_instance_get_all_by_host(context, host, with_share_data=False,
|
||||
status=None, session=None):
|
||||
"""Retrieves all share instances hosted on a host."""
|
||||
session = session or get_session()
|
||||
instances = (
|
||||
|
|
@ -1919,7 +1919,7 @@ def share_instances_get_all_by_host(context, host, with_share_data=False,
|
|||
|
||||
|
||||
@require_context
|
||||
def share_instances_get_all_by_share_network(context, share_network_id):
|
||||
def share_instance_get_all_by_share_network(context, share_network_id):
|
||||
"""Returns list of share instances that belong to given share network."""
|
||||
result = (
|
||||
model_query(context, models.ShareInstance).filter(
|
||||
|
|
@ -1930,8 +1930,8 @@ def share_instances_get_all_by_share_network(context, share_network_id):
|
|||
|
||||
|
||||
@require_context
|
||||
def share_instances_get_all_by_share_server(context, share_server_id,
|
||||
with_share_data=False):
|
||||
def share_instance_get_all_by_share_server(context, share_server_id,
|
||||
with_share_data=False):
|
||||
"""Returns list of share instance with given share server."""
|
||||
session = get_session()
|
||||
result = (
|
||||
|
|
@ -1947,7 +1947,7 @@ def share_instances_get_all_by_share_server(context, share_server_id,
|
|||
|
||||
|
||||
@require_context
|
||||
def share_instances_get_all_by_share(context, share_id):
|
||||
def share_instance_get_all_by_share(context, share_id):
|
||||
"""Returns list of share instances that belong to given share."""
|
||||
result = (
|
||||
model_query(context, models.ShareInstance).filter(
|
||||
|
|
@ -1958,7 +1958,7 @@ def share_instances_get_all_by_share(context, share_id):
|
|||
|
||||
|
||||
@require_context
|
||||
def share_instances_get_all_by_share_group_id(context, share_group_id):
|
||||
def share_instance_get_all_by_share_group_id(context, share_group_id):
|
||||
"""Returns list of share instances that belong to given share group."""
|
||||
result = (
|
||||
model_query(context, models.Share).filter(
|
||||
|
|
|
|||
|
|
@ -442,7 +442,7 @@ class PoolState(HostState):
|
|||
"""Estimate provisioned capacity from share sizes on backend."""
|
||||
provisioned_capacity = 0
|
||||
|
||||
instances = db.share_instances_get_all_by_host(
|
||||
instances = db.share_instance_get_all_by_host(
|
||||
context, host_name, with_share_data=True)
|
||||
|
||||
for instance in instances:
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ class ShareInstanceAccessDatabaseMixin(object):
|
|||
"""
|
||||
updates = {'access_rules_status': status}
|
||||
|
||||
self.db.share_instances_status_update(
|
||||
self.db.share_instance_status_update(
|
||||
context, share_instance_ids, updates)
|
||||
|
||||
@locked_access_rules_operation
|
||||
|
|
|
|||
|
|
@ -950,8 +950,8 @@ class API(base.Base):
|
|||
if share_server_id:
|
||||
filters['share_server_id'] = share_data['share_server_id']
|
||||
|
||||
already_managed = self.db.share_instances_get_all(context,
|
||||
filters=filters)
|
||||
already_managed = self.db.share_instance_get_all(
|
||||
context, filters=filters)
|
||||
|
||||
if already_managed:
|
||||
LOG.error("Found an existing share with export location %s!",
|
||||
|
|
@ -1423,8 +1423,8 @@ class API(base.Base):
|
|||
def delete_share_server(self, context, server):
|
||||
"""Delete share server."""
|
||||
policy.check_policy(context, 'share_server', 'delete', server)
|
||||
shares = self.db.share_instances_get_all_by_share_server(context,
|
||||
server['id'])
|
||||
shares = self.db.share_instance_get_all_by_share_server(
|
||||
context, server['id'])
|
||||
|
||||
if shares:
|
||||
raise exception.ShareServerInUse(share_server_id=server['id'])
|
||||
|
|
@ -1478,7 +1478,7 @@ class API(base.Base):
|
|||
def unmanage_share_server(self, context, share_server, force=False):
|
||||
"""Unmanage a share server."""
|
||||
|
||||
shares = self.db.share_instances_get_all_by_share_server(
|
||||
shares = self.db.share_instance_get_all_by_share_server(
|
||||
context, share_server['id'])
|
||||
|
||||
if shares:
|
||||
|
|
|
|||
|
|
@ -430,7 +430,7 @@ class ShareManager(manager.SchedulerDependentManager):
|
|||
{'host': self.host})
|
||||
return
|
||||
|
||||
share_instances = self.db.share_instances_get_all_by_host(
|
||||
share_instances = self.db.share_instance_get_all_by_host(
|
||||
ctxt, self.host)
|
||||
LOG.debug("Re-exporting %s shares", len(share_instances))
|
||||
|
||||
|
|
@ -577,7 +577,7 @@ class ShareManager(manager.SchedulerDependentManager):
|
|||
return available_share_servers
|
||||
|
||||
for ss in available_share_servers[:]:
|
||||
share_instances = self.db.share_instances_get_all_by_share_server(
|
||||
share_instances = self.db.share_instance_get_all_by_share_server(
|
||||
context, ss['id'], with_share_data=True)
|
||||
if not share_instances:
|
||||
continue
|
||||
|
|
@ -1359,7 +1359,7 @@ class ShareManager(manager.SchedulerDependentManager):
|
|||
def migration_driver_continue(self, context):
|
||||
"""Invokes driver to continue migration of shares."""
|
||||
|
||||
instances = self.db.share_instances_get_all_by_host(
|
||||
instances = self.db.share_instance_get_all_by_host(
|
||||
context, self.host, with_share_data=True)
|
||||
|
||||
for instance in instances:
|
||||
|
|
@ -3644,7 +3644,7 @@ class ShareManager(manager.SchedulerDependentManager):
|
|||
share_ref = self.db.share_get(elevated_context, share_id)
|
||||
access_rules = self.db.share_access_get_all_for_share(
|
||||
elevated_context, share_id)
|
||||
share_instances = self.db.share_instances_get_all_by_share(
|
||||
share_instances = self.db.share_instance_get_all_by_share(
|
||||
elevated_context, share_id)
|
||||
share_server = self._get_share_server(context, share_ref)
|
||||
|
||||
|
|
@ -4215,7 +4215,7 @@ class ShareManager(manager.SchedulerDependentManager):
|
|||
"""Executes periodic-based hooks."""
|
||||
# TODO(vponomaryov): add also access rules and share servers
|
||||
share_instances = (
|
||||
self.db.share_instances_get_all_by_host(
|
||||
self.db.share_instance_get_all_by_host(
|
||||
context=context, host=self.host))
|
||||
periodic_hook_data = self.driver.get_periodic_hook_data(
|
||||
context=context, share_instances=share_instances)
|
||||
|
|
@ -4429,7 +4429,7 @@ class ShareManager(manager.SchedulerDependentManager):
|
|||
# this method starts executing when amount of dependent shares
|
||||
# has been changed.
|
||||
server_id = share_server['id']
|
||||
shares = self.db.share_instances_get_all_by_share_server(
|
||||
shares = self.db.share_instance_get_all_by_share_server(
|
||||
context, server_id)
|
||||
|
||||
if shares:
|
||||
|
|
@ -4636,7 +4636,7 @@ class ShareManager(manager.SchedulerDependentManager):
|
|||
context = context.elevated()
|
||||
share_group_ref = self.db.share_group_get(context, share_group_id)
|
||||
share_group_ref['host'] = self.host
|
||||
shares = self.db.share_instances_get_all_by_share_group_id(
|
||||
shares = self.db.share_instance_get_all_by_share_group_id(
|
||||
context, share_group_id)
|
||||
|
||||
source_share_group_snapshot_id = share_group_ref.get(
|
||||
|
|
@ -4796,7 +4796,7 @@ class ShareManager(manager.SchedulerDependentManager):
|
|||
share_group_ref = self.db.share_group_get(context, share_group_id)
|
||||
share_group_ref['host'] = self.host
|
||||
share_group_ref['shares'] = (
|
||||
self.db.share_instances_get_all_by_share_group_id(
|
||||
self.db.share_instance_get_all_by_share_group_id(
|
||||
context, share_group_id))
|
||||
|
||||
# TODO(ameade): Add notification for delete.start
|
||||
|
|
@ -5275,7 +5275,7 @@ class ShareManager(manager.SchedulerDependentManager):
|
|||
def update_share_usage_size(self, context):
|
||||
"""Invokes driver to gather usage size of shares."""
|
||||
updated_share_instances = []
|
||||
share_instances = self.db.share_instances_get_all_by_host(
|
||||
share_instances = self.db.share_instance_get_all_by_host(
|
||||
context, host=self.host, with_share_data=True)
|
||||
|
||||
if share_instances:
|
||||
|
|
@ -5298,7 +5298,7 @@ class ShareManager(manager.SchedulerDependentManager):
|
|||
def periodic_share_status_update(self, context):
|
||||
"""Invokes share driver to update shares status."""
|
||||
LOG.debug("Updating status of share instances.")
|
||||
share_instances = self.db.share_instances_get_all_by_host(
|
||||
share_instances = self.db.share_instance_get_all_by_host(
|
||||
context, self.host, with_share_data=True,
|
||||
status=constants.STATUS_CREATING_FROM_SNAPSHOT)
|
||||
|
||||
|
|
@ -5434,7 +5434,7 @@ class ShareManager(manager.SchedulerDependentManager):
|
|||
if task_state:
|
||||
fields['task_state'] = task_state
|
||||
if share_instance_ids:
|
||||
self.db.share_instances_status_update(
|
||||
self.db.share_instance_status_update(
|
||||
context, share_instance_ids, fields)
|
||||
if snapshot_instance_ids:
|
||||
self.db.share_snapshot_instances_status_update(
|
||||
|
|
@ -5444,7 +5444,7 @@ class ShareManager(manager.SchedulerDependentManager):
|
|||
self, context, source_share_server, dest_host, writable,
|
||||
nondisruptive, preserve_snapshots, new_share_network_id):
|
||||
|
||||
share_instances = self.db.share_instances_get_all_by_share_server(
|
||||
share_instances = self.db.share_instance_get_all_by_share_server(
|
||||
context, source_share_server['id'], with_share_data=True)
|
||||
share_instance_ids = [x.id for x in share_instances]
|
||||
|
||||
|
|
@ -5619,7 +5619,7 @@ class ShareManager(manager.SchedulerDependentManager):
|
|||
return result
|
||||
|
||||
share_server = self.db.share_server_get(context, share_server_id)
|
||||
share_instances = self.db.share_instances_get_all_by_share_server(
|
||||
share_instances = self.db.share_instance_get_all_by_share_server(
|
||||
context, share_server_id, with_share_data=True)
|
||||
share_instance_ids = [x.id for x in share_instances]
|
||||
|
||||
|
|
@ -5764,7 +5764,7 @@ class ShareManager(manager.SchedulerDependentManager):
|
|||
continue
|
||||
|
||||
share_instances = (
|
||||
self.db.share_instances_get_all_by_share_server(
|
||||
self.db.share_instance_get_all_by_share_server(
|
||||
context, src_share_server_id, with_share_data=True))
|
||||
share_instance_ids = [x.id for x in share_instances]
|
||||
|
||||
|
|
@ -5826,7 +5826,7 @@ class ShareManager(manager.SchedulerDependentManager):
|
|||
src_server = self.db.share_server_get(context, src_share_server_id)
|
||||
|
||||
share_instances = (
|
||||
self.db.share_instances_get_all_by_share_server(
|
||||
self.db.share_instance_get_all_by_share_server(
|
||||
context, src_share_server_id, with_share_data=True))
|
||||
share_instance_ids = [x.id for x in share_instances]
|
||||
|
||||
|
|
@ -6045,7 +6045,7 @@ class ShareManager(manager.SchedulerDependentManager):
|
|||
raise exception.InvalidShareServer(reason=msg)
|
||||
|
||||
share_instances = (
|
||||
self.db.share_instances_get_all_by_share_server(
|
||||
self.db.share_instance_get_all_by_share_server(
|
||||
context, src_share_server_id, with_share_data=True))
|
||||
share_instance_ids = [x.id for x in share_instances]
|
||||
|
||||
|
|
@ -6112,7 +6112,7 @@ class ShareManager(manager.SchedulerDependentManager):
|
|||
dest_share_server = self.db.share_server_get(context,
|
||||
dest_share_server_id)
|
||||
share_instances = (
|
||||
self.db.share_instances_get_all_by_share_server(
|
||||
self.db.share_instance_get_all_by_share_server(
|
||||
context, src_share_server_id, with_share_data=True))
|
||||
share_instance_ids = [x.id for x in share_instances]
|
||||
|
||||
|
|
@ -6187,7 +6187,7 @@ class ShareManager(manager.SchedulerDependentManager):
|
|||
context, share_server, share_network, share_network_subnets)
|
||||
|
||||
share_instances = (
|
||||
self.db.share_instances_get_all_by_share_server(
|
||||
self.db.share_instance_get_all_by_share_server(
|
||||
context, share_server['id'], with_share_data=True))
|
||||
share_instance_ids = [sn.id for sn in share_instances]
|
||||
|
||||
|
|
@ -6256,7 +6256,7 @@ class ShareManager(manager.SchedulerDependentManager):
|
|||
# failed on update operation. We will set all share
|
||||
# instances to 'error'.
|
||||
if share_instance_ids:
|
||||
self.db.share_instances_status_update(
|
||||
self.db.share_instance_status_update(
|
||||
context, share_instance_ids,
|
||||
{'status': constants.STATUS_ERROR})
|
||||
# Update share instance access rules status
|
||||
|
|
@ -6403,7 +6403,7 @@ class ShareManager(manager.SchedulerDependentManager):
|
|||
context, share_server['id'], az_subnets)
|
||||
|
||||
share_instances = (
|
||||
self.db.share_instances_get_all_by_share_server(
|
||||
self.db.share_instance_get_all_by_share_server(
|
||||
context, share_server['id'], with_share_data=True))
|
||||
share_instance_ids = [sn.id for sn in share_instances]
|
||||
|
||||
|
|
@ -6512,7 +6512,7 @@ class ShareManager(manager.SchedulerDependentManager):
|
|||
current_network_allocations = self._form_network_allocations(
|
||||
context, share_server_id, current_subnets)
|
||||
share_instances = (
|
||||
self.db.share_instances_get_all_by_share_server(
|
||||
self.db.share_instance_get_all_by_share_server(
|
||||
context, share_server_id, with_share_data=True))
|
||||
share_instance_ids = [x['id'] for x in share_instances]
|
||||
snapshot_instances = (
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ class ShareNetworkSubnetControllerTest(test.TestCase):
|
|||
db_api, 'share_network_subnet_get',
|
||||
mock.Mock(return_value=self.subnet))
|
||||
mock_all_get_all_shares_by_ss = self.mock_object(
|
||||
db_api, 'share_instances_get_all_by_share_server',
|
||||
db_api, 'share_instance_get_all_by_share_server',
|
||||
mock.Mock(return_value=[]))
|
||||
mock_all_ss_are_auto_deletable = self.mock_object(
|
||||
self.controller, '_all_share_servers_are_auto_deletable',
|
||||
|
|
@ -160,7 +160,7 @@ class ShareNetworkSubnetControllerTest(test.TestCase):
|
|||
db_api, 'share_network_subnet_get',
|
||||
mock.Mock(return_value=self.subnet))
|
||||
mock_all_get_all_shares_by_ss = self.mock_object(
|
||||
db_api, 'share_instances_get_all_by_share_server',
|
||||
db_api, 'share_instance_get_all_by_share_server',
|
||||
mock.Mock(return_value=[]))
|
||||
mock_all_ss_are_auto_deletable = self.mock_object(
|
||||
self.controller, '_all_share_servers_are_auto_deletable',
|
||||
|
|
@ -195,7 +195,7 @@ class ShareNetworkSubnetControllerTest(test.TestCase):
|
|||
db_api, 'share_network_subnet_get',
|
||||
mock.Mock(return_value=self.subnet))
|
||||
mock_all_get_all_shares_by_ss = self.mock_object(
|
||||
db_api, 'share_instances_get_all_by_share_server',
|
||||
db_api, 'share_instance_get_all_by_share_server',
|
||||
mock.Mock(return_value=[self.share]))
|
||||
|
||||
self.assertRaises(exc.HTTPConflict,
|
||||
|
|
|
|||
|
|
@ -327,7 +327,7 @@ class ShareNetworkAPITest(test.TestCase):
|
|||
share_nw['share_network_subnets'] = [subnet]
|
||||
self.mock_object(db_api, 'share_network_get',
|
||||
mock.Mock(return_value=share_nw))
|
||||
self.mock_object(db_api, 'share_instances_get_all_by_share_network',
|
||||
self.mock_object(db_api, 'share_instance_get_all_by_share_network',
|
||||
mock.Mock(return_value=[]))
|
||||
self.mock_object(self.controller.share_rpcapi, 'delete_share_server')
|
||||
self.mock_object(self.controller,
|
||||
|
|
@ -339,7 +339,7 @@ class ShareNetworkAPITest(test.TestCase):
|
|||
|
||||
db_api.share_network_get.assert_called_once_with(
|
||||
self.req.environ['manila.context'], share_nw['id'])
|
||||
(db_api.share_instances_get_all_by_share_network.
|
||||
(db_api.share_instance_get_all_by_share_network.
|
||||
assert_called_once_with(self.req.environ['manila.context'],
|
||||
share_nw['id']))
|
||||
self.controller.share_rpcapi.delete_share_server.assert_has_calls([
|
||||
|
|
@ -368,7 +368,7 @@ class ShareNetworkAPITest(test.TestCase):
|
|||
|
||||
self.mock_object(db_api, 'share_network_get',
|
||||
mock.Mock(return_value=share_nw))
|
||||
self.mock_object(db_api, 'share_instances_get_all_by_share_network',
|
||||
self.mock_object(db_api, 'share_instance_get_all_by_share_network',
|
||||
mock.Mock(return_value=[]))
|
||||
self.mock_object(self.controller,
|
||||
'_all_share_servers_are_auto_deletable',
|
||||
|
|
@ -384,7 +384,7 @@ class ShareNetworkAPITest(test.TestCase):
|
|||
db_api.share_network_get.assert_called_once_with(
|
||||
self.req.environ['manila.context'], share_nw['id'])
|
||||
|
||||
(db_api.share_instances_get_all_by_share_network.
|
||||
(db_api.share_instance_get_all_by_share_network.
|
||||
assert_called_once_with(self.req.environ['manila.context'],
|
||||
share_nw['id']))
|
||||
|
||||
|
|
@ -405,7 +405,7 @@ class ShareNetworkAPITest(test.TestCase):
|
|||
share_nw = fake_share_network.copy()
|
||||
self.mock_object(db_api, 'share_network_get',
|
||||
mock.Mock(return_value=share_nw))
|
||||
self.mock_object(db_api, 'share_instances_get_all_by_share_network',
|
||||
self.mock_object(db_api, 'share_instance_get_all_by_share_network',
|
||||
mock.Mock(return_value=['foo', 'bar']))
|
||||
|
||||
self.assertRaises(webob_exc.HTTPConflict,
|
||||
|
|
@ -415,7 +415,7 @@ class ShareNetworkAPITest(test.TestCase):
|
|||
|
||||
db_api.share_network_get.assert_called_once_with(
|
||||
self.req.environ['manila.context'], share_nw['id'])
|
||||
(db_api.share_instances_get_all_by_share_network.
|
||||
(db_api.share_instance_get_all_by_share_network.
|
||||
assert_called_once_with(self.req.environ['manila.context'],
|
||||
share_nw['id']))
|
||||
|
||||
|
|
@ -455,7 +455,7 @@ class ShareNetworkAPITest(test.TestCase):
|
|||
share_nw = fake_share_network.copy()
|
||||
self.mock_object(db_api, 'share_network_get',
|
||||
mock.Mock(return_value=share_nw))
|
||||
self.mock_object(db_api, 'share_instances_get_all_by_share_network',
|
||||
self.mock_object(db_api, 'share_instance_get_all_by_share_network',
|
||||
mock.Mock(return_value=None))
|
||||
self.mock_object(db_api, 'count_share_groups_in_share_network',
|
||||
mock.Mock(return_value=None))
|
||||
|
|
@ -469,7 +469,7 @@ class ShareNetworkAPITest(test.TestCase):
|
|||
|
||||
db_api.share_network_get.assert_called_once_with(
|
||||
self.context, share_nw['id'])
|
||||
(db_api.share_instances_get_all_by_share_network
|
||||
(db_api.share_instance_get_all_by_share_network
|
||||
.assert_called_once_with(self.context, share_nw['id']))
|
||||
db_api.count_share_groups_in_share_network.assert_called_once_with(
|
||||
self.context, share_nw['id']
|
||||
|
|
|
|||
|
|
@ -390,7 +390,7 @@ class ShareDatabaseAPITestCase(test.TestCase):
|
|||
|
||||
db_utils.create_share()
|
||||
self._assertEqualListsOfObjects(share_instances[0],
|
||||
db_api.share_instances_get_all_by_host(
|
||||
db_api.share_instance_get_all_by_host(
|
||||
self.ctxt, 'foo'),
|
||||
ignored_keys=['share_type',
|
||||
'share_type_id',
|
||||
|
|
@ -403,7 +403,7 @@ class ShareDatabaseAPITestCase(test.TestCase):
|
|||
|
||||
db_utils.create_share()
|
||||
self._assertEqualListsOfObjects(share_instances[0],
|
||||
db_api.share_instances_get_all_by_host(
|
||||
db_api.share_instance_get_all_by_host(
|
||||
self.ctxt, 'foo'),
|
||||
ignored_keys=['share_type',
|
||||
'share_type_id',
|
||||
|
|
@ -516,7 +516,7 @@ class ShareDatabaseAPITestCase(test.TestCase):
|
|||
def test_share_instance_get_all_by_host(self, with_share_data, status):
|
||||
kwargs = {'status': status} if status else {}
|
||||
db_utils.create_share(**kwargs)
|
||||
instances = db_api.share_instances_get_all_by_host(
|
||||
instances = db_api.share_instance_get_all_by_host(
|
||||
self.ctxt, 'fake_host', with_share_data=with_share_data,
|
||||
status=status)
|
||||
|
||||
|
|
@ -535,7 +535,7 @@ class ShareDatabaseAPITestCase(test.TestCase):
|
|||
db_utils.create_share()
|
||||
self.mock_object(db_api, 'share_get', mock.Mock(
|
||||
side_effect=exception.NotFound))
|
||||
instances = db_api.share_instances_get_all_by_host(
|
||||
instances = db_api.share_instance_get_all_by_host(
|
||||
self.ctxt, 'fake_host', True)
|
||||
|
||||
self.assertEqual(0, len(instances))
|
||||
|
|
@ -545,7 +545,7 @@ class ShareDatabaseAPITestCase(test.TestCase):
|
|||
db_utils.create_share(share_group_id=group['id'])
|
||||
db_utils.create_share()
|
||||
|
||||
instances = db_api.share_instances_get_all_by_share_group_id(
|
||||
instances = db_api.share_instance_get_all_by_share_group_id(
|
||||
self.ctxt, group['id'])
|
||||
|
||||
self.assertEqual(1, len(instances))
|
||||
|
|
@ -568,7 +568,7 @@ class ShareDatabaseAPITestCase(test.TestCase):
|
|||
else:
|
||||
value = 'fake_export_location'
|
||||
|
||||
instances = db_api.share_instances_get_all(
|
||||
instances = db_api.share_instance_get_all(
|
||||
self.ctxt, filters={'export_location_' + type: value})
|
||||
|
||||
self.assertEqual(1, len(instances))
|
||||
|
|
@ -580,7 +580,7 @@ class ShareDatabaseAPITestCase(test.TestCase):
|
|||
db_utils.create_share()
|
||||
db_utils.create_share(is_soft_deleted=True)
|
||||
|
||||
instances = db_api.share_instances_get_all(
|
||||
instances = db_api.share_instance_get_all(
|
||||
self.ctxt, filters={'is_soft_deleted': True})
|
||||
|
||||
self.assertEqual(1, len(instances))
|
||||
|
|
@ -596,7 +596,7 @@ class ShareDatabaseAPITestCase(test.TestCase):
|
|||
# Populate the db with a dummy share
|
||||
db_utils.create_share_instance(share_id=fake_share['id'])
|
||||
|
||||
instances = db_api.share_instances_get_all(
|
||||
instances = db_api.share_instance_get_all(
|
||||
self.ctxt,
|
||||
filters={'instance_ids': [expected_share_instance['id']]})
|
||||
|
||||
|
|
@ -4884,7 +4884,7 @@ class ShareResourcesAPITestCase(test.TestCase):
|
|||
expected_updates = {'instances': 0, 'servers': 0, 'groups': 0}
|
||||
self.assertDictEqual(expected_updates, updates)
|
||||
# validate that resources are unmodified:
|
||||
share_instances = db_api.share_instances_get_all(
|
||||
share_instances = db_api.share_instance_get_all(
|
||||
self.context, filters={'share_id': share_id})
|
||||
share_groups = db_api.share_group_get_all(
|
||||
self.context, filters={'share_network_id': share_network_id})
|
||||
|
|
@ -4976,7 +4976,7 @@ class ShareResourcesAPITestCase(test.TestCase):
|
|||
actual_updates = db_api.share_resources_host_update(
|
||||
self.context, current_host, new_host)
|
||||
|
||||
share_instances = db_api.share_instances_get_all(
|
||||
share_instances = db_api.share_instance_get_all(
|
||||
self.context, filters={'share_id': share_id})
|
||||
share_groups = db_api.share_group_get_all(
|
||||
self.context, filters={'share_network_id': share_network_id})
|
||||
|
|
@ -4991,7 +4991,7 @@ class ShareResourcesAPITestCase(test.TestCase):
|
|||
self.assertEqual(expected_updates, actual_updates)
|
||||
self.assertEqual(total_updates_expected, len(updated_resources))
|
||||
|
||||
def test_share_instances_status_update(self):
|
||||
def test_share_instance_status_update(self):
|
||||
for i in range(1, 3):
|
||||
instances = [
|
||||
db_utils.create_share_instance(
|
||||
|
|
@ -5000,7 +5000,7 @@ class ShareResourcesAPITestCase(test.TestCase):
|
|||
share_instance_ids = [instance['id'] for instance in instances]
|
||||
values = {'status': constants.STATUS_AVAILABLE}
|
||||
|
||||
db_api.share_instances_status_update(
|
||||
db_api.share_instance_status_update(
|
||||
self.context, share_instance_ids, values)
|
||||
|
||||
instances = [
|
||||
|
|
@ -5047,7 +5047,7 @@ class ShareResourcesAPITestCase(test.TestCase):
|
|||
values = {'status': constants.STATUS_AVAILABLE}
|
||||
|
||||
mock_update_share_instances = self.mock_object(
|
||||
db_api, 'share_instances_status_update',
|
||||
db_api, 'share_instance_status_update',
|
||||
mock.Mock(return_value=[share_instance]))
|
||||
mock_update_snap_instances = self.mock_object(
|
||||
db_api, 'share_snapshot_instances_status_update',
|
||||
|
|
@ -5096,7 +5096,7 @@ class ShareResourcesAPITestCase(test.TestCase):
|
|||
mock_get_session = self.mock_object(
|
||||
db_api, 'get_session', mock.Mock(return_value=fake_session))
|
||||
mock_instances_get_all = self.mock_object(
|
||||
db_api, 'share_instances_get_all',
|
||||
db_api, 'share_instance_get_all',
|
||||
mock.Mock(return_value=[share_instance]))
|
||||
mock_snap_instances_get_all = self.mock_object(
|
||||
db_api, 'share_snapshot_instance_get_all_with_filters',
|
||||
|
|
|
|||
|
|
@ -1219,7 +1219,7 @@ class PoolStateTestCase(test.TestCase):
|
|||
def test_update_from_share_capability(self, share_capability, instances):
|
||||
fake_context = context.RequestContext('user', 'project', is_admin=True)
|
||||
self.mock_object(
|
||||
db, 'share_instances_get_all_by_host',
|
||||
db, 'share_instance_get_all_by_host',
|
||||
mock.Mock(return_value=instances))
|
||||
fake_pool = host_manager.PoolState('host1', None, 'pool0')
|
||||
self.assertIsNone(fake_pool.free_capacity_gb)
|
||||
|
|
@ -1243,19 +1243,19 @@ class PoolStateTestCase(test.TestCase):
|
|||
self.assertEqual(thin_provisioned, fake_pool.thin_provisioning)
|
||||
if 'provisioned_capacity_gb' not in share_capability or (
|
||||
share_capability['provisioned_capacity_gb'] is None):
|
||||
db.share_instances_get_all_by_host.assert_called_once_with(
|
||||
db.share_instance_get_all_by_host.assert_called_once_with(
|
||||
fake_context, fake_pool.host, with_share_data=True)
|
||||
if len(instances) > 0:
|
||||
self.assertEqual(4, fake_pool.provisioned_capacity_gb)
|
||||
else:
|
||||
self.assertEqual(0, fake_pool.provisioned_capacity_gb)
|
||||
else:
|
||||
self.assertFalse(db.share_instances_get_all_by_host.called)
|
||||
self.assertFalse(db.share_instance_get_all_by_host.called)
|
||||
self.assertEqual(share_capability['provisioned_capacity_gb'],
|
||||
fake_pool.provisioned_capacity_gb)
|
||||
else:
|
||||
self.assertFalse(fake_pool.thin_provisioning)
|
||||
self.assertFalse(db.share_instances_get_all_by_host.called)
|
||||
self.assertFalse(db.share_instance_get_all_by_host.called)
|
||||
if 'provisioned_capacity_gb' not in share_capability or (
|
||||
share_capability['provisioned_capacity_gb'] is None):
|
||||
self.assertIsNone(fake_pool.provisioned_capacity_gb)
|
||||
|
|
|
|||
|
|
@ -799,7 +799,7 @@ class ShareInstanceAccessTestCase(test.TestCase):
|
|||
|
||||
def test_update_share_instances_access_rules_status(self):
|
||||
mock_db_instances_update = self.mock_object(
|
||||
db, 'share_instances_status_update')
|
||||
db, 'share_instance_status_update')
|
||||
share_instances = ['fake_instance_id', 'fake_instance_id_2']
|
||||
|
||||
self.access_helper.update_share_instances_access_rules_status(
|
||||
|
|
|
|||
|
|
@ -1156,7 +1156,7 @@ class ShareAPITestCase(test.TestCase):
|
|||
mock.Mock(return_value=fake_type))
|
||||
self.mock_object(db_api, 'share_server_get',
|
||||
mock.Mock(return_value=share_server))
|
||||
self.mock_object(db_api, 'share_instances_get_all',
|
||||
self.mock_object(db_api, 'share_instance_get_all',
|
||||
mock.Mock(return_value=[]))
|
||||
self.mock_object(db_api, 'share_network_get',
|
||||
mock.Mock(return_value=share_network))
|
||||
|
|
@ -1193,7 +1193,7 @@ class ShareAPITestCase(test.TestCase):
|
|||
}
|
||||
if share_server_id:
|
||||
filters['share_server_id'] = share_server_id
|
||||
db_api.share_instances_get_all.assert_called_once_with(
|
||||
db_api.share_instance_get_all.assert_called_once_with(
|
||||
self.context, filters=filters)
|
||||
db_api.share_create.assert_called_once_with(self.context, share_data)
|
||||
db_api.share_get.assert_called_once_with(self.context, share['id'])
|
||||
|
|
@ -1237,7 +1237,7 @@ class ShareAPITestCase(test.TestCase):
|
|||
|
||||
self.mock_object(share_types, 'get_share_type',
|
||||
mock.Mock(return_value=fake_type))
|
||||
self.mock_object(db_api, 'share_instances_get_all',
|
||||
self.mock_object(db_api, 'share_instance_get_all',
|
||||
mock.Mock(return_value=[]))
|
||||
|
||||
self.assertRaises(exception_type,
|
||||
|
|
@ -1254,7 +1254,7 @@ class ShareAPITestCase(test.TestCase):
|
|||
}
|
||||
if has_share_server_id:
|
||||
filters['share_server_id'] = 'fake'
|
||||
db_api.share_instances_get_all.assert_called_once_with(
|
||||
db_api.share_instance_get_all.assert_called_once_with(
|
||||
self.context, filters=filters)
|
||||
|
||||
def test_manage_new_share_server_not_found(self):
|
||||
|
|
@ -1284,7 +1284,7 @@ class ShareAPITestCase(test.TestCase):
|
|||
|
||||
self.mock_object(share_types, 'get_share_type',
|
||||
mock.Mock(return_value=fake_type))
|
||||
self.mock_object(db_api, 'share_instances_get_all',
|
||||
self.mock_object(db_api, 'share_instance_get_all',
|
||||
mock.Mock(return_value=[]))
|
||||
|
||||
self.assertRaises(exception.InvalidInput,
|
||||
|
|
@ -1296,7 +1296,7 @@ class ShareAPITestCase(test.TestCase):
|
|||
share_types.get_share_type.assert_called_once_with(
|
||||
self.context, share_data['share_type_id']
|
||||
)
|
||||
db_api.share_instances_get_all.assert_called_once_with(
|
||||
db_api.share_instance_get_all.assert_called_once_with(
|
||||
self.context, filters={
|
||||
'export_location_path': share_data['export_location_path'],
|
||||
'host': share_data['host'],
|
||||
|
|
@ -1337,7 +1337,7 @@ class ShareAPITestCase(test.TestCase):
|
|||
|
||||
self.mock_object(share_types, 'get_share_type',
|
||||
mock.Mock(return_value=fake_type))
|
||||
self.mock_object(db_api, 'share_instances_get_all',
|
||||
self.mock_object(db_api, 'share_instance_get_all',
|
||||
mock.Mock(return_value=[]))
|
||||
self.mock_object(db_api, 'share_server_get',
|
||||
mock.Mock(return_value=share))
|
||||
|
|
@ -1351,7 +1351,7 @@ class ShareAPITestCase(test.TestCase):
|
|||
share_types.get_share_type.assert_called_once_with(
|
||||
self.context, share_data['share_type_id']
|
||||
)
|
||||
db_api.share_instances_get_all.assert_called_once_with(
|
||||
db_api.share_instance_get_all.assert_called_once_with(
|
||||
self.context, filters={
|
||||
'export_location_path': share_data['export_location_path'],
|
||||
'host': share_data['host'],
|
||||
|
|
@ -1380,7 +1380,7 @@ class ShareAPITestCase(test.TestCase):
|
|||
},
|
||||
}
|
||||
already_managed = [{'id': 'fake', 'status': status}]
|
||||
self.mock_object(db_api, 'share_instances_get_all',
|
||||
self.mock_object(db_api, 'share_instance_get_all',
|
||||
mock.Mock(return_value=already_managed))
|
||||
self.mock_object(share_types, 'get_share_type',
|
||||
mock.Mock(return_value=fake_type))
|
||||
|
|
@ -1781,8 +1781,8 @@ class ShareAPITestCase(test.TestCase):
|
|||
update_data = {'status': constants.STATUS_UNMANAGING,
|
||||
'terminated_at': timeutils.utcnow()}
|
||||
|
||||
mock_share_instances_get_all = self.mock_object(
|
||||
db_api, 'share_instances_get_all_by_share_server',
|
||||
mock_share_instance_get_all = self.mock_object(
|
||||
db_api, 'share_instance_get_all_by_share_server',
|
||||
mock.Mock(return_value={}))
|
||||
mock_share_group_get_all = self.mock_object(
|
||||
db_api, 'share_group_get_all_by_share_server',
|
||||
|
|
@ -1796,7 +1796,7 @@ class ShareAPITestCase(test.TestCase):
|
|||
|
||||
self.api.unmanage_share_server(self.context, share_server, True)
|
||||
|
||||
mock_share_instances_get_all.assert_called_once_with(
|
||||
mock_share_instance_get_all.assert_called_once_with(
|
||||
self.context, share_server['id']
|
||||
)
|
||||
mock_share_group_get_all.assert_called_once_with(
|
||||
|
|
@ -1816,7 +1816,7 @@ class ShareAPITestCase(test.TestCase):
|
|||
fake_share_instance = db_utils.create_share_instance(
|
||||
share_id=fake_share['id'])
|
||||
share_instance_get_all_mock = self.mock_object(
|
||||
db_api, 'share_instances_get_all_by_share_server',
|
||||
db_api, 'share_instance_get_all_by_share_server',
|
||||
mock.Mock(return_value=fake_share_instance)
|
||||
)
|
||||
|
||||
|
|
@ -1833,7 +1833,7 @@ class ShareAPITestCase(test.TestCase):
|
|||
fake_share_groups = db_utils.create_share_group()
|
||||
|
||||
share_instance_get_all_mock = self.mock_object(
|
||||
db_api, 'share_instances_get_all_by_share_server',
|
||||
db_api, 'share_instance_get_all_by_share_server',
|
||||
mock.Mock(return_value={})
|
||||
)
|
||||
group_get_all_mock = self.mock_object(
|
||||
|
|
@ -2109,7 +2109,7 @@ class ShareAPITestCase(test.TestCase):
|
|||
self.assertFalse(mock_snapshot_rpc_call.called)
|
||||
self.assertTrue(mock_replicated_snapshot_rpc_call.called)
|
||||
|
||||
@mock.patch.object(db_api, 'share_instances_get_all_by_share_server',
|
||||
@mock.patch.object(db_api, 'share_instance_get_all_by_share_server',
|
||||
mock.Mock(return_value=[]))
|
||||
@mock.patch.object(db_api, 'share_group_get_all_by_share_server',
|
||||
mock.Mock(return_value=[]))
|
||||
|
|
@ -2121,14 +2121,14 @@ class ShareAPITestCase(test.TestCase):
|
|||
self.mock_object(db_api, 'share_server_update',
|
||||
mock.Mock(return_value=server_returned))
|
||||
self.api.delete_share_server(self.context, server)
|
||||
db_api.share_instances_get_all_by_share_server.assert_called_once_with(
|
||||
db_api.share_instance_get_all_by_share_server.assert_called_once_with(
|
||||
self.context, server['id'])
|
||||
(db_api.share_group_get_all_by_share_server.
|
||||
assert_called_once_with(self.context, server['id']))
|
||||
self.share_rpcapi.delete_share_server.assert_called_once_with(
|
||||
self.context, server_returned)
|
||||
|
||||
@mock.patch.object(db_api, 'share_instances_get_all_by_share_server',
|
||||
@mock.patch.object(db_api, 'share_instance_get_all_by_share_server',
|
||||
mock.Mock(return_value=['fake_share', ]))
|
||||
@mock.patch.object(db_api, 'share_group_get_all_by_share_server',
|
||||
mock.Mock(return_value=[]))
|
||||
|
|
@ -2138,10 +2138,10 @@ class ShareAPITestCase(test.TestCase):
|
|||
self.api.delete_share_server,
|
||||
self.context,
|
||||
server)
|
||||
db_api.share_instances_get_all_by_share_server.assert_called_once_with(
|
||||
db_api.share_instance_get_all_by_share_server.assert_called_once_with(
|
||||
self.context, server['id'])
|
||||
|
||||
@mock.patch.object(db_api, 'share_instances_get_all_by_share_server',
|
||||
@mock.patch.object(db_api, 'share_instance_get_all_by_share_server',
|
||||
mock.Mock(return_value=[]))
|
||||
@mock.patch.object(db_api, 'share_group_get_all_by_share_server',
|
||||
mock.Mock(return_value=['fake_group', ]))
|
||||
|
|
@ -2152,7 +2152,7 @@ class ShareAPITestCase(test.TestCase):
|
|||
self.context,
|
||||
server)
|
||||
|
||||
db_api.share_instances_get_all_by_share_server.assert_called_once_with(
|
||||
db_api.share_instance_get_all_by_share_server.assert_called_once_with(
|
||||
self.context, server['id'])
|
||||
(db_api.share_group_get_all_by_share_server.
|
||||
assert_called_once_with(self.context, server['id']))
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
hook_data_mock = mock.Mock()
|
||||
self.mock_object(
|
||||
self.share_manager.db,
|
||||
"share_instances_get_all_by_host",
|
||||
"share_instance_get_all_by_host",
|
||||
share_instances_mock)
|
||||
self.mock_object(
|
||||
self.share_manager.driver,
|
||||
|
|
@ -210,7 +210,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
mock_backend_info_update = self.mock_object(
|
||||
self.share_manager.db, 'backend_info_update')
|
||||
mock_share_get_all_by_host = self.mock_object(
|
||||
self.share_manager.db, 'share_instances_get_all_by_host',
|
||||
self.share_manager.db, 'share_instance_get_all_by_host',
|
||||
mock.Mock(return_value=instances))
|
||||
self.mock_object(self.share_manager.db, 'share_instance_get',
|
||||
mock.Mock(side_effect=[instances[0], instances[2],
|
||||
|
|
@ -285,13 +285,13 @@ class ShareManagerTestCase(test.TestCase):
|
|||
|
||||
def test_init_host_with_no_shares(self):
|
||||
self.mock_object(self.share_manager.db,
|
||||
'share_instances_get_all_by_host',
|
||||
'share_instance_get_all_by_host',
|
||||
mock.Mock(return_value=[]))
|
||||
|
||||
self.share_manager.init_host()
|
||||
|
||||
self.assertTrue(self.share_manager.driver.initialized)
|
||||
(self.share_manager.db.share_instances_get_all_by_host.
|
||||
(self.share_manager.db.share_instance_get_all_by_host.
|
||||
assert_called_once_with(utils.IsAMatcher(context.RequestContext),
|
||||
self.share_manager.host))
|
||||
self.share_manager.driver.do_setup.assert_called_once_with(
|
||||
|
|
@ -450,7 +450,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
self.mock_object(self.share_manager.driver, 'get_backend_info',
|
||||
mock.Mock(return_value=new_backend_info))
|
||||
mock_share_get_all_by_host = self.mock_object(
|
||||
self.share_manager.db, 'share_instances_get_all_by_host',
|
||||
self.share_manager.db, 'share_instance_get_all_by_host',
|
||||
mock.Mock(return_value=instances))
|
||||
self.mock_object(self.share_manager.db, 'share_instance_get',
|
||||
mock.Mock(side_effect=[instances[0], instances[2],
|
||||
|
|
@ -554,8 +554,8 @@ class ShareManagerTestCase(test.TestCase):
|
|||
mock.Mock())
|
||||
mock_ensure_shares = self.mock_object(
|
||||
self.share_manager.driver, 'ensure_shares')
|
||||
mock_share_instances_get_all_by_host = self.mock_object(
|
||||
self.share_manager.db, 'share_instances_get_all_by_host',
|
||||
mock_share_instance_get_all_by_host = self.mock_object(
|
||||
self.share_manager.db, 'share_instance_get_all_by_host',
|
||||
mock.Mock(return_value=[]))
|
||||
|
||||
# call of 'init_host' method
|
||||
|
|
@ -563,7 +563,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
if new_backend_info_hash == old_backend_info_hash:
|
||||
mock_backend_info_update.assert_not_called()
|
||||
mock_ensure_shares.assert_not_called()
|
||||
mock_share_instances_get_all_by_host.assert_not_called()
|
||||
mock_share_instance_get_all_by_host.assert_not_called()
|
||||
else:
|
||||
mock_backend_info_update.assert_called_once_with(
|
||||
utils.IsAMatcher(context.RequestContext),
|
||||
|
|
@ -576,7 +576,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
self.share_manager.driver.get_backend_info.assert_called_once_with(
|
||||
utils.IsAMatcher(context.RequestContext))
|
||||
mock_ensure_shares.assert_not_called()
|
||||
mock_share_instances_get_all_by_host.assert_called_once_with(
|
||||
mock_share_instance_get_all_by_host.assert_called_once_with(
|
||||
utils.IsAMatcher(context.RequestContext),
|
||||
self.share_manager.host)
|
||||
|
||||
|
|
@ -588,7 +588,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
instances = self._setup_init_mocks(setup_access_rules=False)
|
||||
share_server = fakes.fake_share_server_get()
|
||||
self.mock_object(self.share_manager.db,
|
||||
'share_instances_get_all_by_host',
|
||||
'share_instance_get_all_by_host',
|
||||
mock.Mock(return_value=instances))
|
||||
self.mock_object(self.share_manager.db, 'share_instance_get',
|
||||
mock.Mock(side_effect=[instances[0], instances[2],
|
||||
|
|
@ -615,7 +615,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
self.share_manager.init_host()
|
||||
|
||||
# verification of call
|
||||
(self.share_manager.db.share_instances_get_all_by_host.
|
||||
(self.share_manager.db.share_instance_get_all_by_host.
|
||||
assert_called_once_with(utils.IsAMatcher(context.RequestContext),
|
||||
self.share_manager.host))
|
||||
self.share_manager.driver.do_setup.assert_called_once_with(
|
||||
|
|
@ -700,7 +700,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
mock_ensure_share = self.mock_object(
|
||||
self.share_manager.driver, 'ensure_share')
|
||||
self.mock_object(self.share_manager.db,
|
||||
'share_instances_get_all_by_host',
|
||||
'share_instance_get_all_by_host',
|
||||
mock.Mock(return_value=instances))
|
||||
self.mock_object(self.share_manager.db, 'share_instance_get',
|
||||
mock.Mock(side_effect=[instances[0], instances[2],
|
||||
|
|
@ -720,7 +720,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
self.share_manager.init_host()
|
||||
|
||||
# verification of call
|
||||
(self.share_manager.db.share_instances_get_all_by_host.
|
||||
(self.share_manager.db.share_instance_get_all_by_host.
|
||||
assert_called_once_with(utils.IsAMatcher(context.RequestContext),
|
||||
self.share_manager.host))
|
||||
self.share_manager.driver.do_setup.assert_called_once_with(
|
||||
|
|
@ -776,7 +776,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
instances[4]['id']: {'status': 'available'}
|
||||
}
|
||||
smanager = self.share_manager
|
||||
self.mock_object(smanager.db, 'share_instances_get_all_by_host',
|
||||
self.mock_object(smanager.db, 'share_instance_get_all_by_host',
|
||||
mock.Mock(return_value=instances))
|
||||
self.mock_object(self.share_manager.db, 'share_instance_get',
|
||||
mock.Mock(side_effect=[instances[0], instances[2],
|
||||
|
|
@ -805,7 +805,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
smanager.init_host()
|
||||
|
||||
# verification of call
|
||||
(smanager.db.share_instances_get_all_by_host.
|
||||
(smanager.db.share_instance_get_all_by_host.
|
||||
assert_called_once_with(utils.IsAMatcher(context.RequestContext),
|
||||
smanager.host))
|
||||
smanager.driver.do_setup.assert_called_once_with(
|
||||
|
|
@ -2580,7 +2580,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
driver_mock.max_share_server_size = max_gigabytes
|
||||
self.share_manager.driver = driver_mock
|
||||
self.mock_object(
|
||||
db, 'share_instances_get_all_by_share_server',
|
||||
db, 'share_instance_get_all_by_share_server',
|
||||
mock.Mock(return_value=share_instances))
|
||||
self.mock_object(
|
||||
db, 'share_snapshot_instance_get_all_with_filters',
|
||||
|
|
@ -2629,7 +2629,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
|
||||
self.share_manager.driver = driver_mock
|
||||
self.mock_object(
|
||||
db, 'share_instances_get_all_by_share_server',
|
||||
db, 'share_instance_get_all_by_share_server',
|
||||
mock.Mock(return_value=share_instances))
|
||||
self.mock_object(
|
||||
db, 'share_snapshot_instance_get_all_with_filters',
|
||||
|
|
@ -2655,7 +2655,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
|
||||
self.assertEqual(
|
||||
1, len(available_share_servers))
|
||||
db.share_instances_get_all_by_share_server.assert_called_once_with(
|
||||
db.share_instance_get_all_by_share_server.assert_called_once_with(
|
||||
self.context, share_servers[0]['id'], with_share_data=True)
|
||||
(db.share_snapshot_instance_get_all_with_filters.
|
||||
assert_called_once_with(
|
||||
|
|
@ -2828,7 +2828,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
self.assertEqual(share_id, db.share_get(context.get_admin_context(),
|
||||
share_id).id)
|
||||
shr = db.share_get(self.context, share_id)
|
||||
shr_instances = db.share_instances_get_all_by_share(
|
||||
shr_instances = db.share_instance_get_all_by_share(
|
||||
self.context, shr['id'])
|
||||
self.assertEqual(1, len(shr_instances))
|
||||
self.assertEqual(constants.STATUS_AVAILABLE, shr['status'])
|
||||
|
|
@ -4254,7 +4254,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
'share_access_get_all_for_share',
|
||||
mock.Mock(return_value=rules))
|
||||
self.mock_object(self.share_manager.db,
|
||||
'share_instances_get_all_by_share',
|
||||
'share_instance_get_all_by_share',
|
||||
mock.Mock(return_value=instances))
|
||||
self.mock_object(db, 'share_instance_get',
|
||||
mock.Mock(return_value=instances[0]))
|
||||
|
|
@ -4296,7 +4296,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
'share_access_get_all_for_share',
|
||||
mock.Mock(return_value=rules))
|
||||
self.mock_object(self.share_manager.db,
|
||||
'share_instances_get_all_by_share',
|
||||
'share_instance_get_all_by_share',
|
||||
mock.Mock(return_value=[shr_obj['instance']]))
|
||||
self.mock_object(db, 'share_instance_get',
|
||||
mock.Mock(return_value=shr_obj['instance']))
|
||||
|
|
@ -4341,7 +4341,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
'share_access_get_all_for_share',
|
||||
mock.Mock(return_value=rules))
|
||||
self.mock_object(self.share_manager.db,
|
||||
'share_instances_get_all_by_share',
|
||||
'share_instance_get_all_by_share',
|
||||
mock.Mock(return_value=[shr_obj['instance']]))
|
||||
self.mock_object(db, 'share_instance_get',
|
||||
mock.Mock(return_value=shr_obj['instance']))
|
||||
|
|
@ -4927,7 +4927,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
self.share_manager.driver.configuration, 'safe_get',
|
||||
mock.Mock(return_value=True))
|
||||
self.mock_object(self.share_manager.db,
|
||||
'share_instances_get_all_by_share_group_id',
|
||||
'share_instance_get_all_by_share_group_id',
|
||||
mock.Mock(return_value=[]))
|
||||
fake_group = {
|
||||
'id': 'fake_id',
|
||||
|
|
@ -5098,7 +5098,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
self.mock_object(self.share_manager.db, 'share_group_snapshot_get',
|
||||
mock.Mock(return_value=fake_snap))
|
||||
self.mock_object(self.share_manager.db,
|
||||
'share_instances_get_all_by_share_group_id',
|
||||
'share_instance_get_all_by_share_group_id',
|
||||
mock.Mock(return_value=[]))
|
||||
self.mock_object(self.share_manager.db, 'share_group_update',
|
||||
mock.Mock(return_value=fake_group))
|
||||
|
|
@ -5134,7 +5134,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
self.mock_object(self.share_manager.db, 'share_group_snapshot_get',
|
||||
mock.Mock(return_value=fake_snap))
|
||||
self.mock_object(self.share_manager.db,
|
||||
'share_instances_get_all_by_share_group_id',
|
||||
'share_instance_get_all_by_share_group_id',
|
||||
mock.Mock(return_value=[]))
|
||||
self.mock_object(self.share_manager.db, 'share_group_update',
|
||||
mock.Mock(return_value=fake_group))
|
||||
|
|
@ -5173,7 +5173,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
self.mock_object(self.share_manager.db, 'share_group_snapshot_get',
|
||||
mock.Mock(return_value=fake_snap))
|
||||
self.mock_object(self.share_manager.db,
|
||||
'share_instances_get_all_by_share_group_id',
|
||||
'share_instance_get_all_by_share_group_id',
|
||||
mock.Mock(return_value=[fake_share]))
|
||||
self.mock_object(self.share_manager.db, 'share_group_update')
|
||||
self.mock_object(self.share_manager.db, 'share_instance_update')
|
||||
|
|
@ -6013,7 +6013,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
|
||||
self.mock_object(manager.LOG, 'warning')
|
||||
self.mock_object(self.share_manager.db,
|
||||
'share_instances_get_all_by_host', mock.Mock(
|
||||
'share_instance_get_all_by_host', mock.Mock(
|
||||
return_value=[regular_instance, src_instance]))
|
||||
self.mock_object(self.share_manager.db, 'share_get',
|
||||
mock.Mock(side_effect=[share, share_cancelled]))
|
||||
|
|
@ -6084,7 +6084,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
share_get_calls.append(mock.call(self.context, 'share_id'))
|
||||
self.assertTrue(manager.LOG.warning.called)
|
||||
|
||||
self.share_manager.db.share_instances_get_all_by_host(
|
||||
self.share_manager.db.share_instance_get_all_by_host(
|
||||
self.context, self.share_manager.host)
|
||||
self.share_manager.db.share_get.assert_has_calls(share_get_calls)
|
||||
api.API.get_migrating_instances.assert_called_once_with(share)
|
||||
|
|
@ -8372,7 +8372,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
|
||||
manager = self.share_manager
|
||||
self.mock_object(manager, 'driver')
|
||||
self.mock_object(manager.db, 'share_instances_get_all_by_host',
|
||||
self.mock_object(manager.db, 'share_instance_get_all_by_host',
|
||||
mock.Mock(return_value=instances))
|
||||
self.mock_object(manager.db, 'share_instance_get',
|
||||
mock.Mock(side_effect=instances))
|
||||
|
|
@ -8392,7 +8392,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
|
||||
self.mock_object(self.share_manager, 'driver')
|
||||
self.mock_object(self.share_manager.db,
|
||||
'share_instances_get_all_by_host',
|
||||
'share_instance_get_all_by_host',
|
||||
mock.Mock(return_value=instances))
|
||||
self.mock_object(self.share_manager.db, 'share_instance_get',
|
||||
mock.Mock(side_effect=instances))
|
||||
|
|
@ -8411,7 +8411,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
]
|
||||
self.mock_object(self.share_manager, 'driver')
|
||||
self.mock_object(self.share_manager.db,
|
||||
'share_instances_get_all_by_host',
|
||||
'share_instance_get_all_by_host',
|
||||
mock.Mock(return_value=instances_creating_from_snap))
|
||||
mock_update_share_status = self.mock_object(
|
||||
self.share_manager, '_update_share_status')
|
||||
|
|
@ -8595,7 +8595,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
def test__update_resource_status(self, kwargs, resource_type):
|
||||
if resource_type == 'share_instance':
|
||||
mock_db_instances_status_update = self.mock_object(
|
||||
db, 'share_instances_status_update')
|
||||
db, 'share_instance_status_update')
|
||||
else:
|
||||
mock_db_instances_status_update = self.mock_object(
|
||||
db, 'share_snapshot_instances_status_update')
|
||||
|
|
@ -8664,7 +8664,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
fake_new_network, fake_service, fake_request_spec,
|
||||
fake_driver_result, fake_new_share_server, server_info,
|
||||
network_subnet, new_network_subnet=None, az_compatible=True):
|
||||
self.mock_object(db, 'share_instances_get_all_by_share_server',
|
||||
self.mock_object(db, 'share_instance_get_all_by_share_server',
|
||||
mock.Mock(return_value=fake_share_instances))
|
||||
self.mock_object(db, 'share_snapshot_instance_get_all_with_filters',
|
||||
mock.Mock(return_value=fake_snap_instances))
|
||||
|
|
@ -8773,7 +8773,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
nondisruptive, preserve_snapshots, fake_new_network['id'])
|
||||
|
||||
self.assertTrue(result)
|
||||
db.share_instances_get_all_by_share_server.assert_called_once_with(
|
||||
db.share_instance_get_all_by_share_server.assert_called_once_with(
|
||||
self.context, fake_old_share_server['id'], with_share_data=True)
|
||||
(db.share_snapshot_instance_get_all_with_filters.
|
||||
assert_called_once_with(
|
||||
|
|
@ -8889,7 +8889,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
nondisruptive, preserve_snapshots, fake_new_network['id']
|
||||
)
|
||||
|
||||
db.share_instances_get_all_by_share_server.assert_called_once_with(
|
||||
db.share_instance_get_all_by_share_server.assert_called_once_with(
|
||||
self.context, fake_old_share_server['id'], with_share_data=True)
|
||||
(db.share_snapshot_instance_get_all_with_filters.
|
||||
assert_called_once_with(
|
||||
|
|
@ -8979,7 +8979,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
mock_server_get = self.mock_object(
|
||||
db, 'share_server_get', mock.Mock(return_value=fake_share_server))
|
||||
mock_get_server_instances = self.mock_object(
|
||||
db, 'share_instances_get_all_by_share_server',
|
||||
db, 'share_instance_get_all_by_share_server',
|
||||
mock.Mock(return_value=fake_share_instances))
|
||||
mock_snap_instances_get = self.mock_object(
|
||||
db, 'share_snapshot_instance_get_all_with_filters',
|
||||
|
|
@ -9141,7 +9141,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
db, 'share_server_get_all_by_host',
|
||||
mock.Mock(return_value=fake_share_servers))
|
||||
self.mock_object(
|
||||
db, 'share_instances_get_all_by_share_server',
|
||||
db, 'share_instance_get_all_by_share_server',
|
||||
mock.Mock(return_value=fake_share_instances))
|
||||
self.mock_object(
|
||||
db, 'share_snapshot_instance_get_all_with_filters',
|
||||
|
|
@ -9196,7 +9196,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
self.context, self.share_manager.host,
|
||||
filters={'status': constants.STATUS_SERVER_MIGRATING_TO}
|
||||
)
|
||||
db.share_instances_get_all_by_share_server.assert_called_once_with(
|
||||
db.share_instance_get_all_by_share_server.assert_called_once_with(
|
||||
self.context, fake_src_share_servers[0]['id'],
|
||||
with_share_data=True
|
||||
)
|
||||
|
|
@ -9292,7 +9292,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
db.share_server_get.assert_called_once_with(
|
||||
self.context, fake_src_share_server['id'])
|
||||
if src_share_server_exists:
|
||||
db.share_instances_get_all_by_share_server.assert_called_once_with(
|
||||
db.share_instance_get_all_by_share_server.assert_called_once_with(
|
||||
self.context, fake_src_share_server['id'],
|
||||
with_share_data=True)
|
||||
(db.share_snapshot_instance_get_all_with_filters.
|
||||
|
|
@ -9323,7 +9323,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
db, 'share_server_get',
|
||||
mock.Mock(side_effect=server_get_side_effects))
|
||||
self.mock_object(
|
||||
db, 'share_instances_get_all_by_share_server',
|
||||
db, 'share_instance_get_all_by_share_server',
|
||||
mock.Mock(return_value=fake_share_instances))
|
||||
self.mock_object(
|
||||
db, 'share_snapshot_instance_get_all_with_filters',
|
||||
|
|
@ -9376,7 +9376,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
[mock.call(self.context, fake_dest_share_server['id']),
|
||||
mock.call(self.context, fake_source_share_server['id'])]
|
||||
)
|
||||
db.share_instances_get_all_by_share_server.assert_called_once_with(
|
||||
db.share_instance_get_all_by_share_server.assert_called_once_with(
|
||||
self.context, fake_source_share_server['id'], with_share_data=True)
|
||||
(db.share_snapshot_instance_get_all_with_filters.
|
||||
assert_called_once_with(
|
||||
|
|
@ -9426,7 +9426,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
[mock.call(self.context, fake_dest_share_server['id']),
|
||||
mock.call(self.context, fake_source_share_server['id'])]
|
||||
)
|
||||
db.share_instances_get_all_by_share_server.assert_called_once_with(
|
||||
db.share_instance_get_all_by_share_server.assert_called_once_with(
|
||||
self.context, fake_source_share_server['id'], with_share_data=True)
|
||||
(db.share_snapshot_instance_get_all_with_filters.
|
||||
assert_called_once_with(
|
||||
|
|
@ -9672,7 +9672,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
mock.Mock(side_effect=[fake_source_share_server,
|
||||
fake_dest_share_server]))
|
||||
mock_get_instances = self.mock_object(
|
||||
db, 'share_instances_get_all_by_share_server',
|
||||
db, 'share_instance_get_all_by_share_server',
|
||||
mock.Mock(return_value=fake_share_instances))
|
||||
mock_get_snap_instances = self.mock_object(
|
||||
db, 'share_snapshot_instance_get_all_with_filters',
|
||||
|
|
@ -9760,7 +9760,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
mock.Mock(side_effect=[fake_source_share_server,
|
||||
fake_dest_share_server]))
|
||||
mock_get_instances = self.mock_object(
|
||||
db, 'share_instances_get_all_by_share_server',
|
||||
db, 'share_instance_get_all_by_share_server',
|
||||
mock.Mock(return_value=fake_share_instances))
|
||||
mock_get_snap_instances = self.mock_object(
|
||||
db, 'share_snapshot_instance_get_all_with_filters',
|
||||
|
|
@ -9849,7 +9849,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
self.share_manager, '_form_server_setup_info',
|
||||
mock.Mock(return_value=network_info))
|
||||
self.mock_object(
|
||||
db, 'share_instances_get_all_by_share_server',
|
||||
db, 'share_instance_get_all_by_share_server',
|
||||
mock.Mock(return_value=share_instances))
|
||||
self.mock_object(
|
||||
db, 'share_access_get_all_for_instance',
|
||||
|
|
@ -9942,7 +9942,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
self.context, share_servers[0], share_network,
|
||||
[share_network_subnet]
|
||||
)
|
||||
db.share_instances_get_all_by_share_server.assert_called_once_with(
|
||||
db.share_instance_get_all_by_share_server.assert_called_once_with(
|
||||
self.context, share_servers[0]['id'], with_share_data=True)
|
||||
db.share_access_get_all_for_instance.assert_called_once_with(
|
||||
self.context, share_instances[0]['id'])
|
||||
|
|
@ -10020,7 +10020,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
self.context, share_servers[0], share_network,
|
||||
[share_network_subnet]
|
||||
)
|
||||
db.share_instances_get_all_by_share_server.assert_called_once_with(
|
||||
db.share_instance_get_all_by_share_server.assert_called_once_with(
|
||||
self.context, share_servers[0]['id'], with_share_data=True)
|
||||
db.share_access_get_all_for_instance.assert_called_once_with(
|
||||
self.context, share_instances[0]['id'])
|
||||
|
|
@ -10075,7 +10075,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
self.share_manager.access_helper,
|
||||
'update_share_instances_access_rules_status')
|
||||
self.mock_object(
|
||||
db, 'share_instances_get_all_by_share_server',
|
||||
db, 'share_instance_get_all_by_share_server',
|
||||
mock.Mock(return_value=share_instances))
|
||||
|
||||
self.share_manager._update_share_network_security_service(
|
||||
|
|
@ -10110,7 +10110,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
db.share_server_update.assert_called_once_with(
|
||||
self.context, share_servers[0]['id'],
|
||||
{'status': constants.STATUS_ERROR})
|
||||
db.share_instances_get_all_by_share_server.assert_called_once_with(
|
||||
db.share_instance_get_all_by_share_server.assert_called_once_with(
|
||||
self.context, share_servers[0]['id'], with_share_data=True)
|
||||
db.share_access_get_all_for_instance.assert_called_once_with(
|
||||
self.context, share_instances[0]['id'])
|
||||
|
|
@ -10263,7 +10263,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
shares = [fakes.fake_share(id=share_id)]
|
||||
mock_shares_get = self.mock_object(
|
||||
self.share_manager.db,
|
||||
'share_instances_get_all_by_share_server',
|
||||
'share_instance_get_all_by_share_server',
|
||||
mock.Mock(return_value=shares))
|
||||
access = 'fake_access'
|
||||
mock_access_get = self.mock_object(
|
||||
|
|
@ -10417,7 +10417,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
share_instances = [{'id': 'fake_id'}]
|
||||
mock_instances_get = self.mock_object(
|
||||
self.share_manager.db,
|
||||
'share_instances_get_all_by_share_server',
|
||||
'share_instance_get_all_by_share_server',
|
||||
mock.Mock(return_value=share_instances))
|
||||
snap_instances = [{'id': 'fake_id'}]
|
||||
mock_snap_instances_get = self.mock_object(
|
||||
|
|
@ -10487,7 +10487,7 @@ class ShareManagerTestCase(test.TestCase):
|
|||
share_instances = [{'id': 'fake_id'}]
|
||||
mock_instances_get = self.mock_object(
|
||||
self.share_manager.db,
|
||||
'share_instances_get_all_by_share_server',
|
||||
'share_instance_get_all_by_share_server',
|
||||
mock.Mock(return_value=share_instances))
|
||||
snap_instances = [{'id': 'fake_id'}]
|
||||
mock_snap_instances_get = self.mock_object(
|
||||
|
|
|
|||
Loading…
Reference in New Issue