openstack/deb-nova
Code Issues Proposed changes

Adds return-type in two functions' docstrings

Browse Source 
Change-Id: Ifdf49c59d8e983905ad6f31e0a3f7f64cd5a297c
Fixes: bug #1130922
This commit is contained in:
Senhua Huang
2013-03-18 15:20:19 -07:00
parent 86396da1ad
commit 2ee1c3d9f5
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nova/compute/manager.py
View File

@@ -2995,9 +2995,7 @@ class ComputeManager(manager.SchedulerDependentManager):
:param instance: dict of instance data :param instance: dict of instance data
:param block_migration: if true, prepare for block migration :param block_migration: if true, prepare for block migration
:param disk_over_commit: if true, allow disk over commit :param disk_over_commit: if true, allow disk over commit
:returns: a dict containing migration info
Returns a mapping of values required in case of block migration
and None otherwise.
""" """
src_compute_info = self._get_compute_info(ctxt, instance['host']) src_compute_info = self._get_compute_info(ctxt, instance['host'])
dst_compute_info = self._get_compute_info(ctxt, CONF.host) dst_compute_info = self._get_compute_info(ctxt, CONF.host)
@@ -3026,9 +3024,7 @@ class ComputeManager(manager.SchedulerDependentManager):
:param context: security context :param context: 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 dict values required for live migration without shared
storage.
""" """
capi = self.conductor_api capi = self.conductor_api
bdms = capi.block_device_mapping_get_all_by_instance(ctxt, instance) bdms = capi.block_device_mapping_get_all_by_instance(ctxt, instance)

2
nova/virt/driver.py
View File

@@ -502,6 +502,7 @@ class ComputeDriver(object):
:param dst_compute_info: Info about the receiving machine :param dst_compute_info: Info about the receiving machine
:param block_migration: if true, prepare for block migration :param block_migration: if true, prepare for block migration
:param disk_over_commit: if true, allow disk over commit :param disk_over_commit: if true, allow disk over commit
:returns: a dict containing migration info (hypervisor-dependent)
""" """
raise NotImplementedError() raise NotImplementedError()
@@ -524,6 +525,7 @@ class ComputeDriver(object):
:param context: security context :param context: security context
:param instance_ref: nova.db.sqlalchemy.models.Instance :param instance_ref: nova.db.sqlalchemy.models.Instance
: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 (hypervisor-dependent)
""" """
raise NotImplementedError() raise NotImplementedError()

6
nova/virt/libvirt/driver.py
View File

@@ -2833,6 +2833,11 @@ class LibvirtDriver(driver.ComputeDriver):
:param instance_ref: nova.db.sqlalchemy.models.Instance :param instance_ref: nova.db.sqlalchemy.models.Instance
:param block_migration: if true, prepare for block migration :param block_migration: if true, prepare for block migration
:param disk_over_commit: if true, allow disk over commit :param disk_over_commit: if true, allow disk over commit
:returns: a dict containing:
:filename: name of the tmpfile under CONF.instances_path
:block_migration: whether this is block migration
:disk_over_commit: disk-over-commit factor on dest host
:disk_available_mb: available disk space on dest host
""" """
disk_available_mb = None disk_available_mb = None
if block_migration: if block_migration:
@@ -2872,6 +2877,7 @@ class LibvirtDriver(driver.ComputeDriver):
:param context: security context :param context: security context
:param instance_ref: nova.db.sqlalchemy.models.Instance :param instance_ref: nova.db.sqlalchemy.models.Instance
: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
""" """
# Checking shared storage connectivity # Checking shared storage connectivity
# if block migration, instances_paths should not be on shared storage. # if block migration, instances_paths should not be on shared storage.