diff options
| author | Senhua Huang <senhuang@cisco.com> | 2013-03-18 15:20:19 -0700 |
|---|---|---|
| committer | Senhua Huang <senhuang@cisco.com> | 2013-03-22 09:03:09 -0700 |
| commit | 2ee1c3d9f5342a135d422afcc7ea45264d232d2c (patch) | |
| tree | a34f96803af22d0c3360a1fb721cf893025f9e6e /nova/compute | |
| parent | 86396da1addad7700bab15fb16e8e644f4f833e9 (diff) | |
| download | nova-2ee1c3d9f5342a135d422afcc7ea45264d232d2c.tar.gz nova-2ee1c3d9f5342a135d422afcc7ea45264d232d2c.tar.xz nova-2ee1c3d9f5342a135d422afcc7ea45264d232d2c.zip | |
Adds return-type in two functions' docstrings
Change-Id: Ifdf49c59d8e983905ad6f31e0a3f7f64cd5a297c
Fixes: bug #1130922
Diffstat (limited to 'nova/compute')
| -rwxr-xr-x | nova/compute/manager.py | 8 |
1 files changed, 2 insertions, 6 deletions
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) |