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

nova_powervm/virt/powervm/driver.py

@@ -62,7 +62,8 @@ class PowerVMDriver(driver.ComputeDriver):
         return self._fake.list_instances()
 
     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.
 
         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`
         :param block_device_info: Information about block devices to be
                                   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,
                                 admin_password, network_info,

test-requirements.txt

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