Change in vdsm[master]: virt: make domain_descriptor.py API pep8-friendly
fromani at redhat.com
fromani at redhat.com
Wed Oct 1 15:58:53 UTC 2014
Francesco Romani has uploaded a new change for review.
Change subject: virt: make domain_descriptor.py API pep8-friendly
......................................................................
virt: make domain_descriptor.py API pep8-friendly
Only changes in naming.
Change-Id: I6aadabb0152966dae7da885b6933c440d6496f6d
Signed-off-by: Francesco Romani <fromani at redhat.com>
---
M vdsm/virt/domain_descriptor.py
M vdsm/virt/vm.py
M vdsm/virt/vmxml.py
3 files changed, 20 insertions(+), 20 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/72/33672/1
diff --git a/vdsm/virt/domain_descriptor.py b/vdsm/virt/domain_descriptor.py
index b1d6cb7..ef9c373 100644
--- a/vdsm/virt/domain_descriptor.py
+++ b/vdsm/virt/domain_descriptor.py
@@ -25,12 +25,12 @@
def __init__(self, xmlStr):
self._xml = xmlStr
self._dom = xml.dom.minidom.parseString(xmlStr)
- self._devices = self.firstElementByTagName('devices')
+ self._devices = self.first_element_by_tag_name('devices')
# VDSM by default reports '0' as hash when it has no device list yet
- self._devicesHash = hash(self._devices) if self._devices else 0
+ self._devices_hash = hash(self._devices) if self._devices else 0
@classmethod
- def fromId(cls, uuid):
+ def from_id(cls, uuid):
return cls('<domain><uuid>%s</uuid></domain>' % uuid)
@property
@@ -41,7 +41,7 @@
def dom(self):
return self._dom
- def firstElementByTagName(self, tagName):
+ def first_element_by_tag_name(self, tagName):
elements = self._dom.childNodes[0].getElementsByTagName(tagName)
return elements[0] if elements else None
@@ -49,9 +49,9 @@
def devices(self):
return self._devices
- def getDeviceElements(self, tagName):
+ def get_device_elements(self, tagName):
return self._devices.getElementsByTagName(tagName)
@property
- def devicesHash(self):
- return self._devicesHash
+ def devices_hash(self):
+ return self._devices_hash
diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py
index ccbb740..6479cdc 100644
--- a/vdsm/virt/vm.py
+++ b/vdsm/virt/vm.py
@@ -1500,7 +1500,7 @@
self._qemuguestSocketFile = self._makeChannelPath(_QEMU_GA_DEVICE_NAME)
self.guestAgent = guestagent.GuestAgent(
self._guestSocketFile, self.cif.channelListener, self.log)
- self._lastXMLDesc = DomainDescriptor.fromId(self.id)
+ self._lastXMLDesc = DomainDescriptor.from_id(self.id)
self._released = False
self._releaseLock = threading.Lock()
self.saveState()
@@ -2516,7 +2516,7 @@
exc_info=True)
stats.update(self._getGraphicsStats())
- stats['hash'] = str(hash((self._lastXMLDesc.devicesHash,
+ stats['hash'] = str(hash((self._lastXMLDesc.devices_hash,
self.guestAgent.diskMappingHash)))
if self._watchdogEvent:
stats['watchdogEvent'] = self._watchdogEvent
@@ -4728,7 +4728,7 @@
"""
Obtain controller devices info from libvirt.
"""
- for x in self._lastXMLDesc.getDeviceElements('controller'):
+ for x in self._lastXMLDesc.get_device_elements('controller'):
# Ignore controller devices without address
if not x.getElementsByTagName('address'):
continue
@@ -4772,7 +4772,7 @@
"""
Obtain balloon device info from libvirt.
"""
- for x in self._lastXMLDesc.getDeviceElements('memballoon'):
+ for x in self._lastXMLDesc.get_device_elements('memballoon'):
# Ignore balloon devices without address.
if not x.getElementsByTagName('address'):
address = None
@@ -4797,7 +4797,7 @@
"""
Obtain the alias for the console device from libvirt
"""
- for x in self._lastXMLDesc.getDeviceElements('console'):
+ for x in self._lastXMLDesc.get_device_elements('console'):
# All we care about is the alias
alias = x.getElementsByTagName('alias')[0].getAttribute('name')
for dev in self._devices[CONSOLE_DEVICES]:
@@ -4813,7 +4813,7 @@
"""
Obtain smartcard device info from libvirt.
"""
- for x in self._lastXMLDesc.getDeviceElements('smartcard'):
+ for x in self._lastXMLDesc.get_device_elements('smartcard'):
if not x.getElementsByTagName('address'):
continue
@@ -4835,7 +4835,7 @@
"""
Obtain watchdog device info from libvirt.
"""
- for x in self._lastXMLDesc.getDeviceElements('watchdog'):
+ for x in self._lastXMLDesc.get_device_elements('watchdog'):
# PCI watchdog has "address" different from ISA watchdog
if x.getElementsByTagName('address'):
@@ -4857,7 +4857,7 @@
"""
Obtain video devices info from libvirt.
"""
- for x in self._lastXMLDesc.getDeviceElements('video'):
+ for x in self._lastXMLDesc.get_device_elements('video'):
alias = x.getElementsByTagName('alias')[0].getAttribute('name')
# Get video card address
address = self._getUnderlyingDeviceAddress(x)
@@ -4883,7 +4883,7 @@
"""
Obtain sound devices info from libvirt.
"""
- for x in self._lastXMLDesc.getDeviceElements('sound'):
+ for x in self._lastXMLDesc.get_device_elements('sound'):
alias = x.getElementsByTagName('alias')[0].getAttribute('name')
# Get sound card address
address = self._getUnderlyingDeviceAddress(x)
@@ -4925,7 +4925,7 @@
# FIXME! We need to gather as much info as possible from the libvirt.
# In the future we can return this real data to management instead of
# vm's conf
- for x in self._lastXMLDesc.getDeviceElements('disk'):
+ for x in self._lastXMLDesc.get_device_elements('disk'):
alias, devPath, name = self._getDriveIdentification(x)
readonly = bool(x.getElementsByTagName('readonly'))
boot = x.getElementsByTagName('boot')
@@ -5017,7 +5017,7 @@
device of each type (sdl, vnc, spice) is supported
"""
- for gxml in self._lastXMLDesc.getDeviceElements('graphics'):
+ for gxml in self._lastXMLDesc.get_device_elements('graphics'):
port = gxml.getAttribute('port')
tlsPort = gxml.getAttribute('tlsPort')
graphicsType = gxml.getAttribute('type')
@@ -5047,7 +5047,7 @@
Obtain network interface info from libvirt.
"""
# TODO use xpath instead of parseString (here and elsewhere)
- for x in self._lastXMLDesc.getDeviceElements('interface'):
+ for x in self._lastXMLDesc.get_device_elements('interface'):
devType = x.getAttribute('type')
mac = x.getElementsByTagName('mac')[0].getAttribute('address')
alias = x.getElementsByTagName('alias')[0].getAttribute('name')
diff --git a/vdsm/virt/vmxml.py b/vdsm/virt/vmxml.py
index 4f9398d..11aecb6 100644
--- a/vdsm/virt/vmxml.py
+++ b/vdsm/virt/vmxml.py
@@ -44,7 +44,7 @@
def all_channels(domXML):
- for channel in domXML.getDeviceElements('channel'):
+ for channel in domXML.get_device_elements('channel'):
try:
name = channel.getElementsByTagName('target')[0].\
getAttribute('name')
--
To view, visit http://gerrit.ovirt.org/33672
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6aadabb0152966dae7da885b6933c440d6496f6d
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani at redhat.com>
More information about the vdsm-patches
mailing list