openstack/nova
Code Issues Proposed changes

Merge "Fix return param docstring in check_can_live_migrate* methods"

Browse Source
This commit is contained in:
Zuul 2019-03-22 20:41:50 +00:00 committed by Gerrit Code Review
commit 4b65c8f52e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/compute/manager.py
View File

@ -6192,7 +6192,7 @@ class ComputeManager(manager.Manager):
if None, calculate it in driver if None, calculate it in driver
:param disk_over_commit: if true, allow disk over commit :param disk_over_commit: if true, allow disk over commit
if None, ignore disk usage checking if None, ignore disk usage checking
:returns: a dict containing migration info :returns: a LiveMigrateData object (hypervisor-dependent)
""" """
src_compute_info = obj_base.obj_to_primitive( src_compute_info = obj_base.obj_to_primitive(
self._get_compute_info(ctxt, instance.host)) self._get_compute_info(ctxt, instance.host))
@ -6223,7 +6223,7 @@ class ComputeManager(manager.Manager):
:param ctxt: security context :param ctxt: security context
:param instance: dict of instance data :param instance: dict of instance data
:param dest_check_data: result of check_can_live_migrate_destination :param dest_check_data: result of check_can_live_migrate_destination
:returns: a dict containing migration info :returns: a LiveMigrateData object
""" """
bdms = objects.BlockDeviceMappingList.get_by_instance_uuid( bdms = objects.BlockDeviceMappingList.get_by_instance_uuid(
ctxt, instance.uuid) ctxt, instance.uuid)