diff options
| author | Andy Southgate <andy.southgate@citrix.com> | 2011-01-21 12:00:45 +0000 |
|---|---|---|
| committer | Andy Southgate <andy.southgate@citrix.com> | 2011-01-21 12:00:45 +0000 |
| commit | 1dbdb180cb93a812f8336bbfc49bf67a5203d1eb (patch) | |
| tree | 00ef56bbe160449437bd24a0ee4250ef6c12272b /nova | |
| parent | 8f531ef7c0782feba46f83ec2e45d113753c4052 (diff) | |
OS-55: Fix current unit tests
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/tests/db/fakes.py | 2 | ||||
| -rw-r--r-- | nova/virt/xenapi/fake.py | 4 | ||||
| -rw-r--r-- | nova/virt/xenapi/vm_utils.py | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/nova/tests/db/fakes.py b/nova/tests/db/fakes.py index 05bdd172e..72e093f99 100644 --- a/nova/tests/db/fakes.py +++ b/nova/tests/db/fakes.py @@ -58,6 +58,7 @@ def stub_out_db_instance_api(stubs): 'project_id': values['project_id'], 'launch_time': time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime()), 'instance_type': values['instance_type'], + 'key_data': None, 'memory_mb': type_data['memory_mb'], 'mac_address': values['mac_address'], 'vcpus': type_data['vcpus'], @@ -68,6 +69,7 @@ def stub_out_db_instance_api(stubs): def fake_network_get_by_instance(context, instance_id): fields = { 'bridge': 'xenbr0', + 'injected': False } return FakeModel(fields) diff --git a/nova/virt/xenapi/fake.py b/nova/virt/xenapi/fake.py index e8352771c..836252730 100644 --- a/nova/virt/xenapi/fake.py +++ b/nova/virt/xenapi/fake.py @@ -161,6 +161,10 @@ def after_VBD_create(vbd_ref, vbd_rec): vm_name_label = _db_content['VM'][vm_ref]['name_label'] vbd_rec['vm_name_label'] = vm_name_label +def after_VM_create(vm_ref, vm_rec): + """Create read-only fields in the VM record.""" + if 'is_control_domain' not in vm_rec: + vm_rec['is_control_domain'] = False def create_pbd(config, host_ref, sr_ref, attached): return _create_object('PBD', { diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index eb699d715..9b78a178a 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -459,7 +459,7 @@ class VMHelper(HelperBase): if mount_required: def _mounted_processing(device): - """Callback whioch runds with the image VDI attached""" + """Callback which runs with the image VDI attached""" dev_path = '/dev/'+device+'1' # NB: Partition 1 hardcoded tmpdir = tempfile.mkdtemp() @@ -467,7 +467,7 @@ class VMHelper(HelperBase): # Mount only Linux filesystems, to avoid disturbing # NTFS images try: - _, err = utils.execute( + out, err = utils.execute( 'sudo mount -t ext2,ext3 "%s" "%s"' % (dev_path, tmpdir)) except exception.ProcessExecutionError as e: |