diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-12-10 18:44:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-12-10 18:44:50 +0000 |
| commit | 994ff1fc74c8e2d7a332c5bc02dcce2dda800ab2 (patch) | |
| tree | d0af5d2b7a43b62ee68a8a04bf92b5ea5b3ec61c | |
| parent | 734d9fb22b56c2fea9831c6ceba37a671d76b707 (diff) | |
| parent | 63f5839a19f2f1063d96bb8a24a582b4a6d0e940 (diff) | |
| download | nova-994ff1fc74c8e2d7a332c5bc02dcce2dda800ab2.tar.gz nova-994ff1fc74c8e2d7a332c5bc02dcce2dda800ab2.tar.xz nova-994ff1fc74c8e2d7a332c5bc02dcce2dda800ab2.zip | |
Merge "Unpin lxml requirements"
| -rw-r--r-- | nova/tests/test_libvirt_config.py | 6 | ||||
| -rw-r--r-- | tools/pip-requires | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nova/tests/test_libvirt_config.py b/nova/tests/test_libvirt_config.py index 887199608..c332ce7c3 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>""") diff --git a/tools/pip-requires b/tools/pip-requires index 008a67c3f..d10072546 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -5,7 +5,7 @@ anyjson>=0.2.4 boto eventlet>=0.9.17 kombu>=1.0.4 -lxml>=2.3,<=2.3.5 +lxml>=2.3 routes==1.12.3 WebOb==1.0.8 greenlet>=0.3.1 |