Fix vmwareapi driver spawn() signature

Fixes bug #1045393

commit 99fb9d2a changed the signature of the spawn() method but not
all drivers were updated for the change.

The injected_files and admin_password instance attributes were ignored
by the hyperv driver before, so we can just ignore them in spawn() now
that they are being passed as function arguments.

Change-Id: Ifc4279a05127dcc5c01388882c40570bf6de5ff2
This commit is contained in:
Mark McLoughlin 2012-09-03 16:43:37 +01:00
parent ca6505ef66
commit c813af2d7f
2 changed files with 5 additions and 3 deletions

View File

@ -102,7 +102,9 @@ class VMWareAPIVMTestCase(test.TestCase):
self._create_instance_in_the_db()
self.type_data = db.instance_type_get_by_name(None, 'm1.large')
self.conn.spawn(self.context, self.instance, self.image,
self.network_info)
injected_files=[], admin_password=None,
network_info=self.network_info,
block_device_info=None)
self._check_vm_record()
def _check_vm_record(self):

View File

@ -126,8 +126,8 @@ class VMWareESXDriver(driver.ComputeDriver):
"""List VM instances."""
return self._vmops.list_instances()
def spawn(self, context, instance, image_meta, network_info,
block_device_mapping=None):
def spawn(self, context, instance, image_meta, injected_files,
admin_password, network_info=None, block_device_info=None):
"""Create VM instance."""
self._vmops.spawn(context, instance, image_meta, network_info)