summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorChuck Short <chuck.short@canonical.com>2012-12-08 15:09:14 -0600
committerChuck Short <chuck.short@canonical.com>2012-12-08 15:32:35 -0600
commit63f5839a19f2f1063d96bb8a24a582b4a6d0e940 (patch)
tree8a66b4147e20ee596bcb0f60c8b2a0d0237d2cdb /nova
parent45a1878ef6e7b1b1e7024194111a7c74bd1fd9c0 (diff)
Unpin lxml requirements
Ubuntu is using a much newer version of lxml so we shouldn't lock the versions in our infrasctructure. Change-Id: I688c0be196db526f220262e25afa79d84fcae632 Signed-off-by: Chuck Short <chuck.short@canonical.com>
Diffstat (limited to 'nova')
-rw-r--r--nova/tests/test_libvirt_config.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/tests/test_libvirt_config.py b/nova/tests/test_libvirt_config.py
index c285d46c0..dd4472555 100644
--- a/nova/tests/test_libvirt_config.py
+++ b/nova/tests/test_libvirt_config.py
@@ -366,7 +366,7 @@ class LibvirtConfigGuestDiskTest(LibvirtConfigBaseTest):
self.assertXmlEqual(xml, """
<disk type="network" device="disk">
<driver name="qemu" type="qcow2"/>
- <source protocol="iscsi" name="foo.bar.com"/>
+ <source name="foo.bar.com" protocol="iscsi"/>
<target bus="ide" dev="/dev/hda"/>
</disk>""")
@@ -387,7 +387,7 @@ class LibvirtConfigGuestDiskTest(LibvirtConfigBaseTest):
self.assertXmlEqual(xml, """
<disk type="network" device="disk">
<driver name="qemu" type="raw"/>
- <source protocol="rbd" name="pool/image"/>
+ <source name="pool/image" protocol="rbd"/>
<auth username="foo">
<secret type="ceph"
uuid="b38a3f43-4be2-4046-897f-b67c2f5e0147"/>
@@ -535,7 +535,7 @@ class LibvirtConfigGuestInterfaceTest(LibvirtConfigBaseTest):
<interface type="direct">
<mac address="DE:AD:BE:EF:CA:FE"/>
<model type="virtio"/>
- <source mode="private" dev="eth0"/>
+ <source dev="eth0" mode="private"/>
<target dev="tap12345678"/>
<virtualport type="802.1Qbh"/>
</interface>""")