x/python-ganttclient
Code Issues Proposed changes

merge trunk

Browse Source
This commit is contained in:
Cory Wright
2010-12-22 13:19:21 -05:00
parent 634b40ad2f cf1afefd8a
commit d35e5b43fb
1 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
nova/tests/virt_unittest.py
View File

@@ -129,43 +129,45 @@ class LibvirtConnTestCase(test.TestCase):
check_list.append(check) check_list.append(check)
else: else:
if expect_kernel: if expect_kernel:
check = (lambda t: t.find('./os/kernel').text.split('/' check = (lambda t: t.find('./os/kernel').text.split(
)[1], 'kernel') '/')[1], 'kernel')
else: else:
check = (lambda t: t.find('./os/kernel'), None) check = (lambda t: t.find('./os/kernel'), None)
check_list.append(check) check_list.append(check)
if expect_ramdisk: if expect_ramdisk:
check = (lambda t: t.find('./os/initrd').text.split('/' check = (lambda t: t.find('./os/initrd').text.split(
)[1], 'ramdisk') '/')[1], 'ramdisk')
else: else:
check = (lambda t: t.find('./os/initrd'), None) check = (lambda t: t.find('./os/initrd'), None)
check_list.append(check) check_list.append(check)
common_checks = [ common_checks = [
(lambda t: t.find('.').tag, 'domain'), (lambda t: t.find('.').tag, 'domain'),
(lambda t: t.find('./devices/interface/filterref/parameter' (lambda t: t.find(
).get('name'), 'IP'), './devices/interface/filterref/parameter').get('name'), 'IP'),
(lambda t: t.find('./devices/interface/filterref/parameter' (lambda t: t.find(
).get('value'), '10.11.12.13'), './devices/interface/filterref/parameter').get(
(lambda t: t.findall('./devices/interface/filterref/parameter' 'value'), '10.11.12.13'),
)[1].get('name'), 'DHCPSERVER'), (lambda t: t.findall(
(lambda t: t.findall('./devices/interface/filterref/parameter' './devices/interface/filterref/parameter')[1].get(
)[1].get('value'), '10.0.0.1'), 'name'), 'DHCPSERVER'),
(lambda t: t.find('./devices/serial/source').get('path' (lambda t: t.findall(
).split('/')[1], 'console.log'), './devices/interface/filterref/parameter')[1].get(
'value'), '10.0.0.1'),
(lambda t: t.find('./devices/serial/source').get(
'path').split('/')[1], 'console.log'),
(lambda t: t.find('./memory').text, '2097152')] (lambda t: t.find('./memory').text, '2097152')]
if rescue: if rescue:
common_checks += [(lambda t: t.findall('./devices/disk/source' common_checks += [
)[0].get('file').split('/')[1], (lambda t: t.findall('./devices/disk/source')[0].get(
'rescue-disk'), 'file').split('/')[1], 'rescue-disk'),
(lambda t: t.findall('./devices/disk/source' (lambda t: t.findall('./devices/disk/source')[1].get(
)[1].get('file').split('/')[1], 'file').split('/')[1], 'disk')]
'disk')]
else: else:
common_checks += [(lambda t: t.findall('./devices/disk/source' common_checks += [(lambda t: t.findall(
)[0].get('file').split('/')[1], './devices/disk/source')[0].get('file').split('/')[1],
'disk')] 'disk')]
for (libvirt_type, (expected_uri, checks)) in type_uri_map.iteritems(): for (libvirt_type, (expected_uri, checks)) in type_uri_map.iteritems():