openstack
/
nova-powervm
Code Issues Proposed changes

Rebase for driver spawn method signature change 

The spawn method added instance_type as a parameter in its method
signature.  This change set adds support for that in the PowerVM driver.

Includes an addition for oslo-test which is pulled in by Nova in the
tests package now.

Change-Id: Ib26dacb9ab3004b9ad5599074b2e50c3eaf0df09
This commit is contained in:
Drew Thorstensen 2014-12-03 09:31:06 -06:00
parent 07b33e3c92
commit b085b68000
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova_powervm/virt/powervm/driver.py
View File

@ -62,7 +62,8 @@ class PowerVMDriver(driver.ComputeDriver):
return self._fake.list_instances() return self._fake.list_instances()
def spawn(self, context, instance, image_meta, injected_files, def spawn(self, context, instance, image_meta, injected_files,
admin_password, network_info=None, block_device_info=None): admin_password, network_info=None, block_device_info=None,
instance_type=None):
"""Create a new instance/VM/domain on the virtualization platform. """Create a new instance/VM/domain on the virtualization platform.
Once this successfully completes, the instance should be Once this successfully completes, the instance should be
@ -84,6 +85,7 @@ class PowerVMDriver(driver.ComputeDriver):
:py:meth:`~nova.network.manager.NetworkManager.get_instance_nw_info` :py:meth:`~nova.network.manager.NetworkManager.get_instance_nw_info`
:param block_device_info: Information about block devices to be :param block_device_info: Information about block devices to be
attached to the instance. attached to the instance.
:param instance_type: The instance_type for the instance to be spawned.
""" """
return self._fake.spawn(context, instance, image_meta, injected_files, return self._fake.spawn(context, instance, image_meta, injected_files,
admin_password, network_info, admin_password, network_info,

1
test-requirements.txt
View File

@ -6,6 +6,7 @@ fixtures>=0.3.14
python-subunit python-subunit
sphinx>=1.1.2 sphinx>=1.1.2
oslosphinx oslosphinx
oslotest>=1.2.0
testrepository>=0.0.17 testrepository>=0.0.17
testscenarios>=0.4,<0.5 testscenarios>=0.4,<0.5
testtools>=0.9.32 testtools>=0.9.32