diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2012-09-03 16:43:37 +0100 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2012-09-03 16:49:20 +0100 |
| commit | c813af2d7f441ac5e8506a5df2db256ebacbe875 (patch) | |
| tree | 79106c461ef2a05bc5d278cd716be84ce926c14b /nova | |
| parent | ca6505ef66ecdd948325ee37b627e813cc5ad56d (diff) | |
| download | nova-c813af2d7f441ac5e8506a5df2db256ebacbe875.tar.gz nova-c813af2d7f441ac5e8506a5df2db256ebacbe875.tar.xz nova-c813af2d7f441ac5e8506a5df2db256ebacbe875.zip | |
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
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/tests/test_vmwareapi.py | 4 | ||||
| -rw-r--r-- | nova/virt/vmwareapi/driver.py | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/nova/tests/test_vmwareapi.py b/nova/tests/test_vmwareapi.py index 7b9ad38e5..aa28f2762 100644 --- a/nova/tests/test_vmwareapi.py +++ b/nova/tests/test_vmwareapi.py @@ -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): diff --git a/nova/virt/vmwareapi/driver.py b/nova/virt/vmwareapi/driver.py index 98d5dc306..ec8673418 100644 --- a/nova/virt/vmwareapi/driver.py +++ b/nova/virt/vmwareapi/driver.py @@ -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) |