diff options
| author | Chuck Short <zulcss@ubuntu.com> | 2011-06-08 22:03:48 -0400 |
|---|---|---|
| committer | Chuck Short <zulcss@ubuntu.com> | 2011-06-08 22:03:48 -0400 |
| commit | 22ffa88cc7d030e915d3aac051dd540ab6ea70a5 (patch) | |
| tree | b3340a93c97fdbdbec55b0efa18bfc3013b9ebce /nova/virt | |
| parent | 0c3c0ef6e0604e24ab3f2ec25554a867fe64bd45 (diff) | |
| parent | 8ff87c649e13e21ba968ec85a1158230e8cf118d (diff) | |
Fix merge conflict
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/libvirt/connection.py | 6 | ||||
| -rw-r--r-- | nova/virt/xenapi/fake.py | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py index da5911a1a..c68bdcbaf 100644 --- a/nova/virt/libvirt/connection.py +++ b/nova/virt/libvirt/connection.py @@ -402,8 +402,7 @@ class LibvirtConnection(driver.ComputeDriver): 'is_public': False, 'status': 'active', 'name': snapshot['name'], - 'properties': {'architecture': - base['properties']['architecture'], + 'properties': { 'kernel_id': instance['kernel_id'], 'image_location': 'snapshot', 'image_state': 'available', @@ -411,6 +410,9 @@ class LibvirtConnection(driver.ComputeDriver): 'ramdisk_id': instance['ramdisk_id'], } } + if 'architecture' in base['properties']: + arch = base['properties']['architecture'] + metadata['properties']['architecture'] = arch # Make the snapshot snapshot_name = uuid.uuid4().hex diff --git a/nova/virt/xenapi/fake.py b/nova/virt/xenapi/fake.py index 165888cb2..113198689 100644 --- a/nova/virt/xenapi/fake.py +++ b/nova/virt/xenapi/fake.py @@ -340,10 +340,6 @@ class SessionBase(object): return db_ref['xenstore_data'][key] = None - def network_get_all_records_where(self, _1, _2): - # TODO (salvatore-orlando): filter table on _2 - return _db_content['network'] - def VM_add_to_xenstore_data(self, _1, vm_ref, key, value): db_ref = _db_content['VM'][vm_ref] if not 'xenstore_data' in db_ref: @@ -354,7 +350,7 @@ class SessionBase(object): #Always return 12GB available return 12 * 1024 * 1024 * 1024 - def host_call_plugin(*args): + def host_call_plugin(self, *args): return 'herp' def network_get_all_records_where(self, _1, filter): |