diff --git a/nova/tests/fakelibvirt.py b/nova/tests/fakelibvirt.py index 24ff5ae5..5a317dca 100644 --- a/nova/tests/fakelibvirt.py +++ b/nova/tests/fakelibvirt.py @@ -14,12 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. -from xml.etree import ElementTree -try: - ParseError = ElementTree.ParseError -except AttributeError: - from xml.parsers import expat - ParseError = expat.ExpatError +from lxml import etree import uuid @@ -141,7 +136,7 @@ class NWFilter(object): self._parse_xml(xml) def _parse_xml(self, xml): - tree = ElementTree.fromstring(xml) + tree = etree.fromstring(xml) root = tree.find('.') self._name = root.get('name') @@ -163,8 +158,8 @@ class Domain(object): def _parse_definition(self, xml): try: - tree = ElementTree.fromstring(xml) - except ParseError: + tree = etree.fromstring(xml) + except etree.ParseError: raise libvirtError(VIR_ERR_XML_DETAIL, VIR_FROM_DOMAIN, "Invalid XML.") @@ -301,13 +296,13 @@ class Domain(object): 123456789L] def attachDevice(self, xml): - disk_info = _parse_disk_info(ElementTree.fromstring(xml)) + disk_info = _parse_disk_info(etree.fromstring(xml)) disk_info['_attached'] = True self._def['devices']['disks'] += [disk_info] return True def detachDevice(self, xml): - disk_info = _parse_disk_info(ElementTree.fromstring(xml)) + disk_info = _parse_disk_info(etree.fromstring(xml)) disk_info['_attached'] = True return disk_info in self._def['devices']['disks'] @@ -404,7 +399,7 @@ class Domain(object): self._state = VIR_DOMAIN_RUNNING def snapshotCreateXML(self, xml, flags): - tree = ElementTree.fromstring(xml) + tree = etree.fromstring(xml) name = tree.find('./name').text snapshot = DomainSnapshot(name, self) self._snapshots[name] = snapshot @@ -741,7 +736,7 @@ class Connection(object): ''' def compareCPU(self, xml, flags): - tree = ElementTree.fromstring(xml) + tree = etree.fromstring(xml) arch_node = tree.find('./arch') if arch_node is not None: diff --git a/nova/tests/test_fakelibvirt.py b/nova/tests/test_fakelibvirt.py index ac3ceea2..51ff55b1 100644 --- a/nova/tests/test_fakelibvirt.py +++ b/nova/tests/test_fakelibvirt.py @@ -16,7 +16,7 @@ from nova import test -from xml.etree import ElementTree +from lxml import etree import fakelibvirt as libvirt @@ -252,7 +252,7 @@ class FakeLibvirtTests(test.TestCase): conn.defineXML(get_vm_xml()) dom = conn.lookupByName('testname') xml = dom.XMLDesc(0) - ElementTree.fromstring(xml) + etree.fromstring(xml) def _test_accepts_source_type(self, source_type): conn = self.get_openAuth_curry_func()('qemu:///system') @@ -260,7 +260,7 @@ class FakeLibvirtTests(test.TestCase): conn.defineXML(get_vm_xml(source_type=source_type)) dom = conn.lookupByName('testname') xml = dom.XMLDesc(0) - tree = ElementTree.fromstring(xml) + tree = etree.fromstring(xml) elem = tree.find('./devices/disk/source') self.assertEquals(elem.get('file'), '/somefile') @@ -282,7 +282,7 @@ class FakeLibvirtTests(test.TestCase): conn.defineXML(get_vm_xml(interface_type=network_type)) dom = conn.lookupByName('testname') xml = dom.XMLDesc(0) - tree = ElementTree.fromstring(xml) + tree = etree.fromstring(xml) elem = tree.find('./devices/interface') self.assertEquals(elem.get('type'), network_type) elem = elem.find('./source') @@ -298,7 +298,7 @@ class FakeLibvirtTests(test.TestCase): def test_getCapabilities(self): conn = self.get_openAuth_curry_func()('qemu:///system') - ElementTree.fromstring(conn.getCapabilities()) + etree.fromstring(conn.getCapabilities()) def test_nwfilter_define_undefine(self): conn = self.get_openAuth_curry_func()('qemu:///system') diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py index c330aeb7..9a459545 100644 --- a/nova/tests/test_libvirt.py +++ b/nova/tests/test_libvirt.py @@ -24,7 +24,7 @@ import shutil import sys import tempfile -from xml.etree import ElementTree +from lxml import etree from xml.dom import minidom from nova.api.ec2 import cloud @@ -885,7 +885,7 @@ class LibvirtConnTestCase(test.TestCase): conn = connection.LibvirtConnection(True) instance_ref = db.instance_create(self.context, instance_data) xml = conn.to_xml(instance_ref, network_info, None, False) - tree = ElementTree.fromstring(xml) + tree = etree.fromstring(xml) interfaces = tree.findall("./devices/interface") self.assertEquals(len(interfaces), 2) parameters = interfaces[0].findall('./filterref/parameter') @@ -907,7 +907,7 @@ class LibvirtConnTestCase(test.TestCase): network_info = _fake_network_info(self.stubs, 1) xml = conn.to_xml(instance_ref, network_info) - tree = ElementTree.fromstring(xml) + tree = etree.fromstring(xml) check = [ (lambda t: t.find('.').get('type'), 'lxc'), @@ -948,7 +948,7 @@ class LibvirtConnTestCase(test.TestCase): network_info = _fake_network_info(self.stubs, 1) xml = conn.to_xml(instance_ref, network_info) - tree = ElementTree.fromstring(xml) + tree = etree.fromstring(xml) for i, (check, expected_result) in enumerate(checks): self.assertEqual(check(tree), @@ -983,7 +983,7 @@ class LibvirtConnTestCase(test.TestCase): xml = connection.LibvirtConnection(True).to_xml(instance_ref, network_info, image_meta) - tree = ElementTree.fromstring(xml) + tree = etree.fromstring(xml) disks = tree.findall('./devices/disk/driver') for disk in disks: self.assertEqual(disk.get("cache"), "none") @@ -995,7 +995,7 @@ class LibvirtConnTestCase(test.TestCase): xml = connection.LibvirtConnection(True).to_xml(instance_ref, network_info, image_meta) - tree = ElementTree.fromstring(xml) + tree = etree.fromstring(xml) disks = tree.findall('./devices/disk/driver') for disk in disks: self.assertEqual(disk.get("cache"), "writethrough") @@ -1008,7 +1008,7 @@ class LibvirtConnTestCase(test.TestCase): xml = connection.LibvirtConnection(True).to_xml(instance_ref, network_info, image_meta) - tree = ElementTree.fromstring(xml) + tree = etree.fromstring(xml) self.assertEqual(tree.find('./devices/disk').get('device'), device_type) self.assertEqual(tree.find('./devices/disk/target').get('bus'), bus) @@ -1021,7 +1021,7 @@ class LibvirtConnTestCase(test.TestCase): xml = connection.LibvirtConnection(True).to_xml(instance_ref, network_info, image_meta) - tree = ElementTree.fromstring(xml) + tree = etree.fromstring(xml) self.assertEqual(tree.find('./uuid').text, instance_ref['uuid']) @@ -1120,7 +1120,7 @@ class LibvirtConnTestCase(test.TestCase): network_info = _fake_network_info(self.stubs, 1) xml = conn.to_xml(instance_ref, network_info, None, rescue) - tree = ElementTree.fromstring(xml) + tree = etree.fromstring(xml) for i, (check, expected_result) in enumerate(checks): self.assertEqual(check(tree), expected_result, @@ -1677,7 +1677,7 @@ class NWFilterFakes: def undefine(self): del self.parent.filters[self.name] pass - tree = ElementTree.fromstring(xml) + tree = etree.fromstring(xml) name = tree.get('name') if name not in self.filters: self.filters[name] = FakeNWFilterInternal(self, name) diff --git a/nova/tests/test_libvirt_vif.py b/nova/tests/test_libvirt_vif.py index 2cc1abce..dfa18325 100644 --- a/nova/tests/test_libvirt_vif.py +++ b/nova/tests/test_libvirt_vif.py @@ -14,15 +14,15 @@ # License for the specific language governing permissions and limitations # under the License. -from xml.etree import ElementTree +from lxml import etree from nova import flags from nova import test from nova import utils from nova.virt import firewall -from nova.virt.libvirt import vif -from nova.virt.libvirt import connection from nova.virt.libvirt import config +from nova.virt.libvirt import connection +from nova.virt.libvirt import vif FLAGS = flags.FLAGS @@ -83,7 +83,7 @@ class LibvirtVifTestCase(test.TestCase): d = vif.LibvirtBridgeDriver() xml = self._get_instance_xml(d) - doc = ElementTree.fromstring(xml) + doc = etree.fromstring(xml) ret = doc.findall('./devices/interface') self.assertEqual(len(ret), 1) node = ret[0] @@ -99,7 +99,7 @@ class LibvirtVifTestCase(test.TestCase): d = vif.LibvirtOpenVswitchDriver() xml = self._get_instance_xml(d) - doc = ElementTree.fromstring(xml) + doc = etree.fromstring(xml) ret = doc.findall('./devices/interface') self.assertEqual(len(ret), 1) node = ret[0] @@ -117,7 +117,7 @@ class LibvirtVifTestCase(test.TestCase): d = vif.LibvirtOpenVswitchVirtualPortDriver() xml = self._get_instance_xml(d) - doc = ElementTree.fromstring(xml) + doc = etree.fromstring(xml) ret = doc.findall('./devices/interface') self.assertEqual(len(ret), 1) node = ret[0] @@ -143,7 +143,7 @@ class LibvirtVifTestCase(test.TestCase): d = vif.QuantumLinuxBridgeVIFDriver() xml = self._get_instance_xml(d) - doc = ElementTree.fromstring(xml) + doc = etree.fromstring(xml) ret = doc.findall('./devices/interface') self.assertEqual(len(ret), 1) node = ret[0]