diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-02 20:38:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-02 20:38:04 +0000 |
| commit | 2b672bd989c42be00475dbdf83a162660049785d (patch) | |
| tree | a898b984aa86a0ae8f36c65bd84bc10b12ce1883 /nova/virt | |
| parent | 2d524f5e055c1797da8900ca137ed82d82496123 (diff) | |
| parent | 3a97db6c45ead4330e2fa69a75a86dfb2ecc92dd (diff) | |
| download | nova-2b672bd989c42be00475dbdf83a162660049785d.tar.gz | |
Merge "Remove xmlutils module"
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/libvirt/driver.py | 6 | ||||
| -rw-r--r-- | nova/virt/xenapi/vm_utils.py | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 8a0df90384..0195505a97 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -39,6 +39,7 @@ import tempfile import threading import time import uuid +from xml.dom import minidom import eventlet from eventlet import greenio @@ -79,7 +80,6 @@ from nova.openstack.common import loopingcall from nova.openstack.common import processutils from nova.openstack.common import timeutils from nova.openstack.common import units -from nova.openstack.common import xmlutils from nova.pci import pci_manager from nova.pci import pci_utils from nova.pci import pci_whitelist @@ -2719,7 +2719,7 @@ class LibvirtDriver(driver.ComputeDriver): def get_vnc_port_for_instance(instance_name): virt_dom = self._lookup_by_name(instance_name) xml = virt_dom.XMLDesc(0) - dom = xmlutils.safe_minidom_parse_string(xml) + dom = minidom.parseString(xml) for graphic in dom.getElementsByTagName('graphics'): if graphic.getAttribute('type') == 'vnc': @@ -2738,7 +2738,7 @@ class LibvirtDriver(driver.ComputeDriver): virt_dom = self._lookup_by_name(instance_name) xml = virt_dom.XMLDesc(0) # TODO(sleepsonthefloor): use etree instead of minidom - dom = xmlutils.safe_minidom_parse_string(xml) + dom = minidom.parseString(xml) for graphic in dom.getElementsByTagName('graphics'): if graphic.getAttribute('type') == 'spice': diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index 8191b389c4..75dcdb36a5 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -24,6 +24,7 @@ import os import time import urllib import uuid +from xml.dom import minidom from xml.parsers import expat from eventlet import greenthread @@ -47,7 +48,6 @@ from nova.openstack.common import strutils from nova.openstack.common import timeutils from nova.openstack.common import units from nova.openstack.common import versionutils -from nova.openstack.common import xmlutils from nova import utils from nova.virt import configdrive from nova.virt import diagnostics @@ -1792,7 +1792,7 @@ def compile_diagnostics(vm_rec): vm_uuid = vm_rec["uuid"] xml = _get_rrd(_get_rrd_server(), vm_uuid) if xml: - rrd = xmlutils.safe_minidom_parse_string(xml) + rrd = minidom.parseString(xml) for i, node in enumerate(rrd.firstChild.childNodes): # Provide the last update of the information if node.localName == 'lastupdate': |