From 2ee1c3d9f5342a135d422afcc7ea45264d232d2c Mon Sep 17 00:00:00 2001 From: Senhua Huang Date: Mon, 18 Mar 2013 15:20:19 -0700 Subject: Adds return-type in two functions' docstrings Change-Id: Ifdf49c59d8e983905ad6f31e0a3f7f64cd5a297c Fixes: bug #1130922 --- nova/compute/manager.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'nova/compute') diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 604362783..6cd688e83 100755 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -2995,9 +2995,7 @@ class ComputeManager(manager.SchedulerDependentManager): :param instance: dict of instance data :param block_migration: if true, prepare for block migration :param disk_over_commit: if true, allow disk over commit - - Returns a mapping of values required in case of block migration - and None otherwise. + :returns: a dict containing migration info """ src_compute_info = self._get_compute_info(ctxt, instance['host']) dst_compute_info = self._get_compute_info(ctxt, CONF.host) @@ -3026,9 +3024,7 @@ class ComputeManager(manager.SchedulerDependentManager): :param context: security context :param instance: dict of instance data :param dest_check_data: result of check_can_live_migrate_destination - - Returns a dict values required for live migration without shared - storage. + :returns: a dict containing migration info """ capi = self.conductor_api bdms = capi.block_device_mapping_get_all_by_instance(ctxt, instance) -- cgit