diff options
| author | Cory Wright <cory.wright@rackspace.com> | 2011-03-09 00:49:56 +0000 |
|---|---|---|
| committer | Cory Wright <cory.wright@rackspace.com> | 2011-03-09 00:49:56 +0000 |
| commit | e4b176d41cca234082c28ba6d9188745f1d2b98a (patch) | |
| tree | 8132e4447d5b0e9c12e73b49597f93997cb64edd /nova | |
| parent | 25549162650581e8d458dcd10b0755741a4e8c74 (diff) | |
| download | nova-e4b176d41cca234082c28ba6d9188745f1d2b98a.tar.gz nova-e4b176d41cca234082c28ba6d9188745f1d2b98a.tar.xz nova-e4b176d41cca234082c28ba6d9188745f1d2b98a.zip | |
a few fixes for the tests
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/db/sqlalchemy/migrate_repo/versions/010_add_os_type_to_instances.py (renamed from nova/db/sqlalchemy/migrate_repo/versions/009_add_os_type_to_instances.py) | 0 | ||||
| -rw-r--r-- | nova/tests/test_xenapi.py | 1 | ||||
| -rw-r--r-- | nova/virt/xenapi/vmops.py | 2 |
3 files changed, 2 insertions, 1 deletions
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/009_add_os_type_to_instances.py b/nova/db/sqlalchemy/migrate_repo/versions/010_add_os_type_to_instances.py index 514b92b81..514b92b81 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/009_add_os_type_to_instances.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/010_add_os_type_to_instances.py diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py index 383819b00..cd125a301 100644 --- a/nova/tests/test_xenapi.py +++ b/nova/tests/test_xenapi.py @@ -440,6 +440,7 @@ class XenAPIMigrateInstance(test.TestCase): 'ramdisk_id': None, 'instance_type': 'm1.large', 'mac_address': 'aa:bb:cc:dd:ee:ff', + 'os_type': 'linux' } stubs.stub_out_migration_methods(self.stubs) glance_stubs.stubout_glance_client(self.stubs, diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index a6a9fbf95..aa4372c3d 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -261,7 +261,7 @@ class VMOps(object): template_vm_ref, template_vdi_uuids = self._get_snapshot(instance) # call plugin to ship snapshot off to glance VMHelper.upload_image( - self._session, instance.id, template_vdi_uuids, image_id) + self._session, instance, template_vdi_uuids, image_id) finally: if template_vm_ref: self._destroy(instance, template_vm_ref, |