vdsm-patches December 2012

vdsm-patches@lists.fedorahosted.org

51 participants
408 discussions

Change in vdsm[master]: Remove redundant ifupping of bonded ifaces.
by asegurap＠redhat.com 17 Dec '12

17 Dec '12

Antoni Segura Puimedon has uploaded a new change for review. Change subject: Remove redundant ifupping of bonded ifaces. ...................................................................... Remove redundant ifupping of bonded ifaces. ifup-eth of initscripts, when ifupping a bond checks which are its slaves and ifups them. Thus, removing this two ifup places we avoid a big source of FAILED messages in our logs while keeping all the functionality and correctness. Change-Id: I069ac2b60a2d591b5cc76484e0d7eee30b1429e2 Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com> --- M vdsm/configNetwork.py 1 file changed, 5 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/09/10009/1 diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py index 711a0d4..def9f34 100755 --- a/vdsm/configNetwork.py +++ b/vdsm/configNetwork.py @@ -1004,11 +1004,11 @@ # Now we can run ifup for all interfaces if bonding: ifup(bonding, bondBootproto == 'dhcp' and not blockingDhcp) - - # NICs must be activated in the same order of boot time - # to expose the correct MAC address. - for nic in nicSort(nics): - ifup(nic, options.get('bootproto') == 'dhcp' and not blockingDhcp) + else: + # NICs must be activated in the same order of boot time + # to expose the correct MAC address. + for nic in nicSort(nics): + ifup(nic, options.get('bootproto') == 'dhcp' and not blockingDhcp) # Now we can ifup VLAN interface, because bond and nic already up if vlan: @@ -1266,10 +1266,6 @@ # Now we can run ifup for all interfaces ifup(bond) - # NICs must be activated in the same order of boot time - # to expose the correct MAC address. - for nic in nicSort(bondAttrs['nics']): - ifup(nic) def _removeBondings(bondings, configWriter): -- To view, visit http://gerrit.ovirt.org/10009 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I069ac2b60a2d591b5cc76484e0d7eee30b1429e2 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>

5 18

Change in vdsm[master]: vdsm/vdsm: fix vdsm start failure
by zhshzhou＠linux.vnet.ibm.com 17 Dec '12

17 Dec '12

Zhou Zheng Sheng has uploaded a new change for review. Change subject: vdsm/vdsm: fix vdsm start failure ...................................................................... vdsm/vdsm: fix vdsm start failure vdsm checks the log file permissions before start. However the log file path in the code is not correct, so it checks a non-existing file and always fails. This patch fix the problem. Change-Id: I102c017e564f0f24782992fae29395ae556b34ed Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- M vdsm/vdsm 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/45/10145/1 diff --git a/vdsm/vdsm b/vdsm/vdsm index 5e07b56..ec291b7 100755 --- a/vdsm/vdsm +++ b/vdsm/vdsm @@ -113,7 +113,7 @@ def __assertLogPermission(): - logfile = constants.P_VDSM_LOG + "vdsm.log" + logfile = constants.P_VDSM_LOG + "/vdsm.log" if not os.access(logfile, os.W_OK): syslog.syslog("error in accessing vdsm log file") sys.exit(1) -- To view, visit http://gerrit.ovirt.org/10145 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I102c017e564f0f24782992fae29395ae556b34ed Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>

5 8

Change in vdsm[ovirt-3.2]: schema: Missing comment for new VmDeviceType
by asegurap＠redhat.com 17 Dec '12

17 Dec '12

Hello Adam Litke, Saggi Mizrahi, I'd like you to do a code review. Please visit http://gerrit.ovirt.org/10020 to review the following change. Change subject: schema: Missing comment for new VmDeviceType ...................................................................... schema: Missing comment for new VmDeviceType When adding a new 'console' VmDeviceType, the submitter forgot to include documentation in the comment block. This caused process-schema.py to fail. Change-Id: Icd7db71a4cd1a2addd31815a73dcd5c1cda7af4f Signed-off-by: Adam Litke <agl(a)us.ibm.com> Reviewed-on: http://gerrit.ovirt.org/10013 Reviewed-by: Saggi Mizrahi <smizrahi(a)redhat.com> Tested-by: Saggi Mizrahi <smizrahi(a)redhat.com> --- M vdsm_api/vdsmapi-schema.json 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/20/10020/1 diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json index 9772e18..8f56df0 100644 --- a/vdsm_api/vdsmapi-schema.json +++ b/vdsm_api/vdsmapi-schema.json @@ -1681,6 +1681,8 @@ # # @channel: A host-guest communication channel # +# @console: A console device +# # Since: 4.10.0 ## {'enum': 'VmDeviceType', -- To view, visit http://gerrit.ovirt.org/10020 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icd7db71a4cd1a2addd31815a73dcd5c1cda7af4f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.2 Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com> Gerrit-Reviewer: Adam Litke <agl(a)us.ibm.com> Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>

4 4

Change in vdsm[ovirt-3.2]: schema: Fix schema for VM.updateDevice
by asegurap＠redhat.com 17 Dec '12

17 Dec '12

Hello Adam Litke, Saggi Mizrahi, I'd like you to do a code review. Please visit http://gerrit.ovirt.org/10019 to review the following change. Change subject: schema: Fix schema for VM.updateDevice ...................................................................... schema: Fix schema for VM.updateDevice Another recent update broke the schema file. I'll take the blame for this one since I approved the change :) Some missing and/or malformed data in comments was causing the process-schema script to fail. Another reason for validating the schema during the build. Change-Id: If88596050ace9511bcc7be65ee46645359e30532 Signed-off-by: Adam Litke <agl(a)us.ibm.com> Reviewed-on: http://gerrit.ovirt.org/10012 Reviewed-by: Saggi Mizrahi <smizrahi(a)redhat.com> Tested-by: Saggi Mizrahi <smizrahi(a)redhat.com> --- M vdsm_api/vdsmapi-schema.json 1 file changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/19/10019/1 diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json index 9772e18..487e69a 100644 --- a/vdsm_api/vdsmapi-schema.json +++ b/vdsm_api/vdsmapi-schema.json @@ -4894,10 +4894,12 @@ ## # @vmUpdateDeviceParams: # +# A discriminated record of update parameters for a VM device. +# # @deviceType: The VM device type to update. For example 'interface' for # network devices or 'disk' for disk storage devices. # -# Since 4.10.3 +# Since: 4.10.3 ## {'type': 'vmUpdateDeviceParams', 'data': {'deviceType': 'VmDeviceType'}, @@ -4924,11 +4926,11 @@ # by alias. If omitted, it keeps the current mirroring # configuration. # -# Since 4.10.3 +# Since: 4.10.3 ## {'type': 'vmUpdateInterfaceDeviceParams', 'data': {'*network': 'str', '*linkActive': 'bool', - 'alias': 'str', '*portMirroring': '[str]'}} + 'alias': 'str', '*portMirroring': ['str']}} ## # @VM.updateDevice: @@ -4943,7 +4945,6 @@ # The VM definition, as updated # # Since: 4.10.3 -# ## {'command': {'class': 'VM', 'name': 'updateDevice'}, 'data': {'vmId': 'UUID', 'params': 'vmUpdateDeviceParams'}, -- To view, visit http://gerrit.ovirt.org/10019 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If88596050ace9511bcc7be65ee46645359e30532 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.2 Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com> Gerrit-Reviewer: Adam Litke <agl(a)us.ibm.com> Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>

4 4

Change in vdsm[master]: Take care of 'No devices found' when calling dmsetup status
by ykaplan＠redhat.com 17 Dec '12

17 Dec '12

Yeela Kaplan has uploaded a new change for review. Change subject: Take care of 'No devices found' when calling dmsetup status ...................................................................... Take care of 'No devices found' when calling dmsetup status When there are no devices dmsetup status will return only: 'No devices found' Change-Id: Ibb487feab43741267e4f7027c1baf033148683c1 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=881947 Signed-off-by: Yeela Kaplan <ykaplan(a)redhat.com> --- M vdsm/storage/devicemapper.py 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/35/10035/1 diff --git a/vdsm/storage/devicemapper.py b/vdsm/storage/devicemapper.py index a1651e0..9263a4b 100644 --- a/vdsm/storage/devicemapper.py +++ b/vdsm/storage/devicemapper.py @@ -176,7 +176,14 @@ res = {} for statusLine in out: - devName, statusLine = statusLine.split(":", 1) + try: + devName, statusLine = statusLine.split(":", 1) + except ValueError: + if len(out) == 1: + return res + else: + raise + for m in PATH_STATUS_RE.finditer(statusLine): devNum, status = m.groups() physdevName = findDev(*[int(i) for i in devNum.split(":")]) -- To view, visit http://gerrit.ovirt.org/10035 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibb487feab43741267e4f7027c1baf033148683c1 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yeela Kaplan <ykaplan(a)redhat.com>

6 20

Change in vdsm[master]: Remove redundant vlan device deletion.
by asegurap＠redhat.com 17 Dec '12

17 Dec '12

Antoni Segura Puimedon has uploaded a new change for review. Change subject: Remove redundant vlan device deletion. ...................................................................... Remove redundant vlan device deletion. ifdown-eth has a clause that on ifdown of a vlan interface, said interface is deleted using ip link delete xxx type vlan. That happens synchronously and just one line before we do the deletion ourselves and generates a lot of FAILED messages in vdsm.log. Change-Id: I3b9b6aea80ad372363aa54e3d4173ab2c1f8af7e Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com> --- M vdsm/configNetwork.py 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/08/10008/1 diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py index e6daa68..711a0d4 100755 --- a/vdsm/configNetwork.py +++ b/vdsm/configNetwork.py @@ -558,7 +558,6 @@ def removeVlan(self, vlan, iface): vlandev = iface + '.' + vlan ifdown(vlandev) - execCmd([constants.EXT_IPROUTE, 'link', 'del', vlandev]) self._backup(self.NET_CONF_PREF + iface + '.' + vlan) self._removeFile(self.NET_CONF_PREF + iface + '.' + vlan) -- To view, visit http://gerrit.ovirt.org/10008 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3b9b6aea80ad372363aa54e3d4173ab2c1f8af7e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>

4 7

Change in vdsm[master]: add general test to be compatible for xmlrpc and rest
by lvroyce＠linux.vnet.ibm.com 16 Dec '12

16 Dec '12

Royce Lv has uploaded a new change for review. Change subject: add general test to be compatible for xmlrpc and rest ...................................................................... add general test to be compatible for xmlrpc and rest this allow xmlrpc and rest to share common functional testcases and different binding to handle their own interface use def file to make test case dynamically changable Change-Id: I00449f9c22800e2b00109990a7e535da986c5d48 Signed-off-by: Royce Lv<lvroyce(a)linux.vnet.ibm.com> --- M configure.ac M tests/functional/Makefile.am A tests/functional/SampleDef/Makefile.am A tests/functional/SampleDef/testBindingUp.def A tests/functional/defLoader.py A tests/functional/generalTest.py M vdsm.spec.in 7 files changed, 121 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/08/5308/1 -- To view, visit http://gerrit.ovirt.org/5308 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I00449f9c22800e2b00109990a7e535da986c5d48 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv <lvroyce(a)linux.vnet.ibm.com>

3 7

Change in vdsm[master]: Yet another bunch of completely pep8 fixed files.
by asegurap＠redhat.com 15 Dec '12

15 Dec '12

Antoni Segura Puimedon has uploaded a new change for review. Change subject: Yet another bunch of completely pep8 fixed files. ...................................................................... Yet another bunch of completely pep8 fixed files. Change-Id: I2d0e38fd43bd76febf3bfb231c4257298e6d921f Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com> --- M Makefile.am M vdsm/alignmentScan.py M vdsm/betterPopen/__init__.py M vdsm/betterPopen/setup.py M vdsm/blkid.py M vdsm/clientIF.py M vdsm/doc/source/conf.py M vdsm/hooks.py M vdsm/kaxmlrpclib.py M vdsm/ksm.py M vdsm/parted_utils.py M vdsm/sos/vdsm.py.in M vdsm/substitute_constants.py 13 files changed, 77 insertions(+), 69 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/41/10041/1 diff --git a/Makefile.am b/Makefile.am index 80d6f52..0168dbc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -52,6 +52,8 @@ vdsm-tool \ vdsm/*.py \ vdsm/*.py.in \ + vdsm/doc/ \ + vdsm/sos/ \ vdsm/storage/__init__.py \ vdsm/storage/blockVolume.py \ vdsm/storage/devicemapper.py \ diff --git a/vdsm/alignmentScan.py b/vdsm/alignmentScan.py index 3a76654..53d4ee3 100644 --- a/vdsm/alignmentScan.py +++ b/vdsm/alignmentScan.py @@ -22,9 +22,10 @@ from collections import namedtuple from storage.misc import execCmd -ScanOutput = namedtuple('ScanOutput', - ['partition_name', 'partition_start_bytes', 'partition_alignment', - 'alignment_scan_result', 'alignment_scan_explanation']) +ScanOutput = namedtuple( + 'ScanOutput', + ['partition_name', 'partition_start_bytes', 'partition_alignment', + 'alignment_scan_result', 'alignment_scan_explanation']) class VirtAlignError(Exception): @@ -65,5 +66,5 @@ scan_result = (line[3] == "ok") # True if aligned, otherwise False scan_explanation = line[3] # optional free-text explanation out_list.append(ScanOutput(part_name, part_start, part_alignment, - scan_result, scan_explanation)) + scan_result, scan_explanation)) return out_list diff --git a/vdsm/betterPopen/__init__.py b/vdsm/betterPopen/__init__.py index 0700a3b..4f16ea4 100644 --- a/vdsm/betterPopen/__init__.py +++ b/vdsm/betterPopen/__init__.py @@ -41,23 +41,23 @@ env = list(("=".join(item) for item in env.iteritems())) Popen.__init__(self, args, - close_fds=close_fds, cwd=cwd, env=env, - stdin=PIPE, stdout=PIPE, - stderr=PIPE) + close_fds=close_fds, cwd=cwd, env=env, + stdin=PIPE, stdout=PIPE, + stderr=PIPE) def _execute_child(self, args, executable, preexec_fn, close_fds, - cwd, env, universal_newlines, - startupinfo, creationflags, shell, - p2cread, p2cwrite, - c2pread, c2pwrite, - errread, errwrite): + cwd, env, universal_newlines, + startupinfo, creationflags, shell, + p2cread, p2cwrite, + c2pread, c2pwrite, + errread, errwrite): try: pid, stdin, stdout, stderr = createProcess(args, close_fds, - p2cread, p2cwrite, - c2pread, c2pwrite, - errread, errwrite, - cwd, env) + p2cread, p2cwrite, + c2pread, c2pwrite, + errread, errwrite, + cwd, env) self.pid = pid self._closed = False diff --git a/vdsm/betterPopen/setup.py b/vdsm/betterPopen/setup.py index ac1e45d..f9a33d8 100644 --- a/vdsm/betterPopen/setup.py +++ b/vdsm/betterPopen/setup.py @@ -1,9 +1,9 @@ from distutils.core import setup, Extension module1 = Extension('createprocess', - sources = ['createprocess.c']) + sources=['createprocess.c']) -setup (name = 'createprocess', - version = '1.0', - description = 'Creates a subprocess in simpler safer manner', - ext_modules = [module1]) +setup(name='createprocess', + version='1.0', + description='Creates a subprocess in simpler safer manner', + ext_modules=[module1]) diff --git a/vdsm/blkid.py b/vdsm/blkid.py index 4d855ee..0e8d2ea 100644 --- a/vdsm/blkid.py +++ b/vdsm/blkid.py @@ -36,7 +36,7 @@ 'detected for %s' % self.attrib else: self.message = 'blkid execution failed with error ' + \ - 'code %s for %s' % (self.rc, self.attrib) + 'code %s for %s' % (self.rc, self.attrib) def __str__(self): return self.message diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py index b46415d..5e034a1 100644 --- a/vdsm/clientIF.py +++ b/vdsm/clientIF.py @@ -86,8 +86,8 @@ ifids = netinfo.nics() + netinfo.bondings() ifrates = map(netinfo.speed, ifids) self._hostStats = utils.HostStatsThread( - cif=self, log=log, ifids=ifids, - ifrates=ifrates) + cif=self, log=log, ifids=ifids, + ifrates=ifrates) self._hostStats.start() mog = min(config.getint('vars', 'max_outgoing_migrations'), caps.CpuTopology().cores()) @@ -101,7 +101,7 @@ threading.Thread(target=self._recoverExistingVms, name='clientIFinit').start() self.channelListener.settimeout( - config.getint('vars', 'guest_agent_timeout')) + config.getint('vars', 'guest_agent_timeout')) self.channelListener.start() self.threadLocal = threading.local() self.threadLocal.client = '' @@ -265,8 +265,8 @@ # PDIV drive format if drive['device'] == 'disk' and vm.isVdsmImage(drive): res = self.irs.prepareImage( - drive['domainID'], drive['poolID'], - drive['imageID'], drive['volumeID']) + drive['domainID'], drive['poolID'], + drive['imageID'], drive['volumeID']) if res['status']['code']: raise vm.VolumeError(drive) @@ -300,7 +300,7 @@ volPath = supervdsm.getProxy().mkIsoFs(vmId, files) elif drive['device'] == 'floppy': volPath = \ - supervdsm.getProxy().mkFloppyFs(vmId, files) + supervdsm.getProxy().mkFloppyFs(vmId, files) elif "path" in drive: volPath = drive['path'] @@ -337,7 +337,7 @@ def createVm(self, vmParams): self.vmContainerLock.acquire() self.log.info("vmContainerLock acquired by vm %s", - vmParams['vmId']) + vmParams['vmId']) try: if 'recover' not in vmParams: if vmParams['vmId'] in self.vmContainer: @@ -372,8 +372,8 @@ vmId, exc_info=True) while (self._enabled and - 'WaitForLaunch' in [v.lastStatus for v in - self.vmContainer.values()]): + 'WaitForLaunch' in [v.lastStatus for v in + self.vmContainer.values()]): time.sleep(1) self._cleanOldFiles() self._recovery = False @@ -383,7 +383,7 @@ # Actually, we need it just to get the resources for future # volumes manipulations while self._enabled and self.vmContainer and \ - not self.irs.getConnectedStoragePoolsList()['poollist']: + not self.irs.getConnectedStoragePoolsList()['poollist']: time.sleep(5) for vmId, vmObj in self.vmContainer.items(): @@ -392,7 +392,7 @@ # Do not prepare volumes when system goes down if self._enabled: vmObj.preparePaths( - vmObj.getConfDevices()[vm.DISK_DEVICES]) + vmObj.getConfDevices()[vm.DISK_DEVICES]) except: self.log.error("Vm %s recovery failed", vmId, exc_info=True) @@ -421,8 +421,8 @@ if entry.getAttribute("name") == "product": prod = entry.firstChild.data if prod in (caps.OSName.RHEL, caps.OSName.OVIRT, - caps.OSName.RHEVH, caps.OSName.FEDORA, - caps.OSName.DEBIAN): + caps.OSName.RHEVH, caps.OSName.FEDORA, + caps.OSName.DEBIAN): return True return False @@ -466,7 +466,7 @@ try: vmId, fileType = f.split(".", 1) if fileType in ["guest.socket", "monitor.socket", "pid", - "stdio.dump", "recovery"]: + "stdio.dump", "recovery"]: if vmId in self.vmContainer: continue if f == 'vdsmd.pid': diff --git a/vdsm/doc/source/conf.py b/vdsm/doc/source/conf.py index 4144135..b0814da 100644 --- a/vdsm/doc/source/conf.py +++ b/vdsm/doc/source/conf.py @@ -3,7 +3,7 @@ # VDSM documentation build configuration file, created by # sphinx-quickstart on Thu Dec 24 14:07:47 2009. # -# This file is execfile()d with the current directory set to its containing dir. +# This file is execfile()d with the current directory set to its containing dir # # Note that not all possible configuration values are present in this # autogenerated file. @@ -11,18 +11,20 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys, os +import os +import sys # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. sys.path.append(os.path.abspath('../../')) -# -- General configuration ----------------------------------------------------- +# -- General configuration ---------------------------------------------------- -# Add any Sphinx extension module names here, as strings. They can be extensions +# Add any Sphinx extension module names here, as strings. They can be extension # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. -extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.ifconfig'] +extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx', + 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.ifconfig'] # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates'] @@ -66,7 +68,7 @@ # for source files. exclude_trees = [] -# The reST default role (used for this markup: `text`) to use for all documents. +# The reST default role (used for this markup: `text`) to use for all documents #default_role = None # If true, '()' will be appended to :func: etc. cross-reference text. @@ -87,7 +89,7 @@ #modindex_common_prefix = [] -# -- Options for HTML output --------------------------------------------------- +# -- Options for HTML output -------------------------------------------------- # The theme to use for HTML and HTML Help pages. Major themes that come with # Sphinx are currently 'default' and 'sphinxdoc'. @@ -161,7 +163,7 @@ htmlhelp_basename = 'vdsmdoc' -# -- Options for LaTeX output -------------------------------------------------- +# -- Options for LaTeX output ------------------------------------------------- # The paper size ('letter' or 'a4'). #latex_paper_size = 'letter' @@ -170,7 +172,7 @@ #latex_font_size = '10pt' # Grouping the document tree into LaTeX files. List of tuples -# (source start file, target name, title, author, documentclass [howto/manual]). +# (source start file, target name, title, author, documentclass [howto/manual]) latex_documents = [('index', 'Vdsm.tex', u'VDSM Documentation', u'Red Hat', 'manual'), ] diff --git a/vdsm/hooks.py b/vdsm/hooks.py index 2fda658..b3c53d3 100644 --- a/vdsm/hooks.py +++ b/vdsm/hooks.py @@ -220,7 +220,7 @@ def _getHookInfo(dir): return dict([(os.path.basename(script), _getScriptInfo(script)) - for script in _scriptsPerDir(dir)]) + for script in _scriptsPerDir(dir)]) def installed(): diff --git a/vdsm/kaxmlrpclib.py b/vdsm/kaxmlrpclib.py index 8ab5e88..3a19292 100644 --- a/vdsm/kaxmlrpclib.py +++ b/vdsm/kaxmlrpclib.py @@ -127,15 +127,15 @@ chost, self._extra_headers, x509 = self.get_host_info(host) if hasattr(xmlrpclib.SafeTransport, "single_request"): # Python 2.7 return TcpkeepHTTPSConnection( - chost, None, key_file=self.key_file, strict=None, - timeout=CONNECTTIMEOUT, - cert_file=self.cert_file, ca_certs=self.ca_certs, - cert_reqs=self.cert_reqs) + chost, None, key_file=self.key_file, strict=None, + timeout=CONNECTTIMEOUT, + cert_file=self.cert_file, ca_certs=self.ca_certs, + cert_reqs=self.cert_reqs) else: return TcpkeepHTTPS( - chost, None, key_file=self.key_file, - cert_file=self.cert_file, ca_certs=self.ca_certs, - cert_reqs=self.cert_reqs) + chost, None, key_file=self.key_file, + cert_file=self.cert_file, ca_certs=self.ca_certs, + cert_reqs=self.cert_reqs) class TcpkeepHTTPSConnection(SecureXMLRPCServer.VerifyingHTTPSConnection): @@ -143,9 +143,9 @@ strict=None, timeout=CONNECTTIMEOUT, ca_certs=None, cert_reqs=ssl.CERT_REQUIRED): SecureXMLRPCServer.VerifyingHTTPSConnection.__init__( - self, host, port=port, key_file=key_file, cert_file=cert_file, - strict=strict, timeout=timeout, - ca_certs=ca_certs, cert_reqs=cert_reqs) + self, host, port=port, key_file=key_file, cert_file=cert_file, + strict=strict, timeout=timeout, + ca_certs=ca_certs, cert_reqs=cert_reqs) def connect(self): SecureXMLRPCServer.VerifyingHTTPSConnection.connect(self) diff --git a/vdsm/ksm.py b/vdsm/ksm.py index c9bb2c2..c5db89b 100644 --- a/vdsm/ksm.py +++ b/vdsm/ksm.py @@ -50,7 +50,7 @@ def _getKsmdJiffies(self): return sum(map(int, file('/proc/%s/stat' % self._pid) - .read().split()[13:15])) + .read().split()[13:15])) def run(self): start() @@ -61,7 +61,7 @@ time.sleep(KSM_MONITOR_INTERVAL) jiff1 = self._getKsmdJiffies() self.cpuUsage = (jiff1 - jiff0) % 2 ** 32 * 100 / \ - os.sysconf('SC_CLK_TCK') / KSM_MONITOR_INTERVAL + os.sysconf('SC_CLK_TCK') / KSM_MONITOR_INTERVAL jiff0 = jiff1 except: self._cif.log.error("Error monitoring KSM", exc_info=True) diff --git a/vdsm/parted_utils.py b/vdsm/parted_utils.py index 29fde80..f394985 100644 --- a/vdsm/parted_utils.py +++ b/vdsm/parted_utils.py @@ -44,9 +44,9 @@ partitions = {} for partition in partedDisk.partitions: partitions.update({partition.path: - (partition.getFlagsAsString().split(), - partition.geometry.start, - partition.geometry.end)}) + (partition.getFlagsAsString().split(), + partition.geometry.start, + partition.geometry.end)}) return {'model': partedDevice.model, 'sectorSize': partedDevice.sectorSize, diff --git a/vdsm/sos/vdsm.py.in b/vdsm/sos/vdsm.py.in index 5f09f8d..d7b9651 100644 --- a/vdsm/sos/vdsm.py.in +++ b/vdsm/sos/vdsm.py.in @@ -27,8 +27,8 @@ import imp import os.path from distutils.sysconfig import get_python_lib - modFile, modPath, modDesc = imp.find_module(modName, - [os.path.join(get_python_lib(True), "vdsm")]) + modFile, modPath, modDesc = imp.find_module( + modName, [os.path.join(get_python_lib(True), "vdsm")]) mod = imp.load_module(modName, modFile, modPath, modDesc) return mod @@ -43,7 +43,8 @@ """VDSM server related information """ - optionList = [("logsize", 'max size (MiB) to collect per log file', '', False)] + optionList = [("logsize", 'max size (MiB) to collect per log file', '', + False)] def __addCopySpecLogLimit(self, path, logsize=None): """ @@ -56,7 +57,6 @@ self.addCopySpecLimit(path, logsize) else: self.addCopySpec(path) - def setup(self): os.environ["LVM_SYSTEM_DIR"] = "@VDSMRUNDIR@/lvm" @@ -81,8 +81,10 @@ self.addCopySpec("/proc/%s/status" % pid) self.addCopySpec("/proc/%s/mountstats" % pid) self.collectExtOutput("/bin/ls -l /var/log/core") - self.collectExtOutput("/bin/su vdsm -s /bin/sh -c '/usr/bin/tree @VDSMREPO@'") - self.collectExtOutput("/bin/su vdsm -s /bin/sh -c '/bin/ls -lR @VDSMREPO@'") + self.collectExtOutput( + "/bin/su vdsm -s /bin/sh -c '/usr/bin/tree @VDSMREPO@'") + self.collectExtOutput( + "/bin/su vdsm -s /bin/sh -c '/bin/ls -lR @VDSMREPO@'") self.collectExtOutput("/sbin/lvm vgs -v -o +tags") self.collectExtOutput("/sbin/lvm lvs -v -o +tags") self.collectExtOutput("/sbin/lvm pvs -v -o +all") @@ -107,7 +109,8 @@ for line in out.splitlines()[1:-1]: pool = line.strip() self.collectExtOutput(vdsclient + "getSpmStatus " + pool) - self.collectExtOutput('/bin/su vdsm -s @PYTHON@ @VDSMDIR@/dumpStorageTable.pyc') + self.collectExtOutput( + '/bin/su vdsm -s @PYTHON@ @VDSMDIR@/dumpStorageTable.pyc') def _addVdsmRunDir(self): """Add everything under /var/run/vdsm except possibly confidential diff --git a/vdsm/substitute_constants.py b/vdsm/substitute_constants.py index 0dc750d..f1a0b4e 100644 --- a/vdsm/substitute_constants.py +++ b/vdsm/substitute_constants.py @@ -28,7 +28,7 @@ def replacement(m): s = m.group() return getattr(constants, 'EXT_' + s[1:-1], - getattr(constants, s[1:-1], s)) + getattr(constants, s[1:-1], s)) if len(sys.argv) <= 1: print """usage: %s filename... -- To view, visit http://gerrit.ovirt.org/10041 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2d0e38fd43bd76febf3bfb231c4257298e6d921f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>

3 15

Change in vdsm[master]: Multiple pep8 fixes
by asegurap＠redhat.com 15 Dec '12

15 Dec '12

Antoni Segura Puimedon has uploaded a new change for review. Change subject: Multiple pep8 fixes ...................................................................... Multiple pep8 fixes Several complete pep8 fixes in the road to complete pep8 compliance. Change-Id: I52878345d5b46eec0fea74ce87d435df629eedfe Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com> --- M vdsm/BindingXMLRPC.py M vdsm/SecureXMLRPCServer.py M vdsm/configNetwork.py M vdsm/define.py 4 files changed, 148 insertions(+), 150 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/37/10037/1 diff --git a/vdsm/BindingXMLRPC.py b/vdsm/BindingXMLRPC.py index 73185b9..7d601b8 100644 --- a/vdsm/BindingXMLRPC.py +++ b/vdsm/BindingXMLRPC.py @@ -134,19 +134,21 @@ def parse_request(self): r = (SecureXMLRPCServer.SecureXMLRPCRequestHandler. - parse_request(self)) + parse_request(self)) threadLocal.flowID = self.headers.get(HTTP_HEADER_FLOWID) return r if self.enableSSL: KEYFILE, CERTFILE, CACERT = self._getKeyCertFilenames() - s = SecureXMLRPCServer.SecureThreadedXMLRPCServer(server_address, - keyfile=KEYFILE, certfile=CERTFILE, ca_certs=CACERT, - timeout=self.serverRespTimeout, - requestHandler=LoggingHandler) + s = SecureXMLRPCServer.SecureThreadedXMLRPCServer( + server_address, + keyfile=KEYFILE, certfile=CERTFILE, ca_certs=CACERT, + timeout=self.serverRespTimeout, + requestHandler=LoggingHandler) else: - s = utils.SimpleThreadedXMLRPCServer(server_address, - requestHandler=LoggingHandler, logRequests=True) + s = utils.SimpleThreadedXMLRPCServer( + server_address, + requestHandler=LoggingHandler, logRequests=True) utils.closeOnExec(s.socket.fileno()) s.lastClientTime = 0 @@ -355,8 +357,7 @@ def editNetwork(self, oldBridge, newBridge, vlan=None, bond=None, nics=None, options={}): api = API.Global() - return api.editNetwork(oldBridge, newBridge, vlan, bond, nics, - options) + return api.editNetwork(oldBridge, newBridge, vlan, bond, nics, options) def setupNetworks(self, networks={}, bondings={}, options={}): api = API.Global() @@ -373,8 +374,8 @@ def fenceNode(self, addr, port, agent, username, password, action, secure=False, options=''): api = API.Global() - return api.fenceNode(addr, port, agent, username, password, - action, secure, options) + return api.fenceNode(addr, port, agent, username, password, action, + secure, options) def setLogLevel(self, level): api = API.Global() @@ -499,8 +500,8 @@ leaseRetries=None, options=None): pool = API.StoragePool(spUUID) return pool.create(poolName, masterDom, masterVersion, domList, - lockRenewalIntervalSec, leaseTimeSec, ioOpTimeoutSec, - leaseRetries) + lockRenewalIntervalSec, leaseTimeSec, + ioOpTimeoutSec, leaseRetries) def poolDestroy(self, spUUID, hostID, scsiKey, options=None): pool = API.StoragePool(spUUID) @@ -561,9 +562,9 @@ ioOpTimeoutSec=None, leaseRetries=None, hostId=None, options=None): pool = API.StoragePool(spUUID) - return pool.reconstructMaster(hostId, poolName, masterDom, - masterVersion, domDict, lockRenewalIntervalSec, leaseTimeSec, - ioOpTimeoutSec, leaseRetries) + return pool.reconstructMaster( + hostId, poolName, masterDom, masterVersion, domDict, + lockRenewalIntervalSec, leaseTimeSec, ioOpTimeoutSec, leaseRetries) def poolRefresh(self, spUUID, msdUUID, masterVersion, options=None): pool = API.StoragePool(spUUID) @@ -609,17 +610,16 @@ preallocate=API.Volume.Types.UNKNOWN, postZero=False, force=False): volume = API.Volume(srcVolUUID, spUUID, sdUUID, srcImgUUID) - return volume.copy(dstSdUUID, dstImgUUID, dstVolUUID, - description, volType, volFormat, preallocate, postZero, - force) + return volume.copy(dstSdUUID, dstImgUUID, dstVolUUID, description, + volType, volFormat, preallocate, postZero, force) def volumeCreate(self, sdUUID, spUUID, imgUUID, size, volFormat, preallocate, diskType, volUUID, desc, srcImgUUID=API.Image.BLANK_UUID, srcVolUUID=API.Volume.BLANK_UUID): volume = API.Volume(volUUID, spUUID, sdUUID, imgUUID) - return volume.create(size, volFormat, preallocate, diskType, - desc, srcImgUUID, srcVolUUID) + return volume.create(size, volFormat, preallocate, diskType, desc, + srcImgUUID, srcVolUUID) def volumeExtend(self, sdUUID, spUUID, imgUUID, volUUID, size, isShuttingDown=None): @@ -693,8 +693,8 @@ return api.getAllTasks() def iscsiDiscoverSendTargets(self, con, options=None): - iscsiConn = API.ISCSIConnection(con['connection'], - con['port'], con['user'], con['password']) + iscsiConn = API.ISCSIConnection(con['connection'], con['port'], + con['user'], con['password']) return iscsiConn.discoverSendTargets() def vgCreate(self, name, devlist, force=False): @@ -897,8 +897,8 @@ # Logging current call logStr = 'client [%s]::call %s with %s %s' % \ - (getattr(f.im_self.cif.threadLocal, 'client', ''), - f.__name__, displayArgs, kwargs) + (getattr(f.im_self.cif.threadLocal, 'client', ''), + f.__name__, displayArgs, kwargs) # if flowID exists if getattr(f.im_self.cif.threadLocal, 'flowID', None) is not None: diff --git a/vdsm/SecureXMLRPCServer.py b/vdsm/SecureXMLRPCServer.py index 2de1cf7..c674acb 100644 --- a/vdsm/SecureXMLRPCServer.py +++ b/vdsm/SecureXMLRPCServer.py @@ -125,10 +125,9 @@ its self.socket member with ssl. """ - SimpleXMLRPCServer.SimpleXMLRPCServer.__init__(self, addr, - requestHandler, - logRequests, allow_none, encoding, - bind_and_activate=False) + SimpleXMLRPCServer.SimpleXMLRPCServer.__init__( + self, addr, requestHandler, logRequests, allow_none, encoding, + bind_and_activate=False) self.socket = SSLServerSocket(raw=self.socket, certfile=certfile, keyfile=keyfile, ca_certs=ca_certs) if timeout is not None: @@ -151,7 +150,7 @@ strict=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT, ca_certs=None, cert_reqs=ssl.CERT_REQUIRED): httplib.HTTPSConnection.__init__(self, host, port, key_file, cert_file, - strict, timeout) + strict, timeout) self.ca_certs = ca_certs self.cert_reqs = cert_reqs @@ -185,14 +184,14 @@ chost, self._extra_headers, x509 = self.get_host_info(host) if hasattr(xmlrpclib.SafeTransport, "single_request"): # Python 2.7 return VerifyingHTTPSConnection( - chost, None, key_file=self.key_file, strict=None, - cert_file=self.cert_file, ca_certs=self.ca_certs, - cert_reqs=self.cert_reqs) + chost, None, key_file=self.key_file, strict=None, + cert_file=self.cert_file, ca_certs=self.ca_certs, + cert_reqs=self.cert_reqs) else: return VerifyingHTTPS( - chost, None, key_file=self.key_file, - cert_file=self.cert_file, ca_certs=self.ca_certs, - cert_reqs=self.cert_reqs) + chost, None, key_file=self.key_file, + cert_file=self.cert_file, ca_certs=self.ca_certs, + cert_reqs=self.cert_reqs) class VerifyingHTTPS(httplib.HTTPS): diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py index e6daa68..2ba7d6c 100755 --- a/vdsm/configNetwork.py +++ b/vdsm/configNetwork.py @@ -343,8 +343,7 @@ devdict[self._devType(content)].append(dev) - return nicSort(devdict['Other']) + devdict['Vlan'] + \ - devdict['Bridge'] + return nicSort(devdict['Other']) + devdict['Vlan'] + devdict['Bridge'] def _stopAtomicDevices(self): for dev in reversed(self._sortModifiedIfcfgs()): diff --git a/vdsm/define.py b/vdsm/define.py index efebea1..0313116 100644 --- a/vdsm/define.py +++ b/vdsm/define.py @@ -19,118 +19,118 @@ # errCode = {'noVM': {'status': - {'code': 1, - 'message': 'Virtual machine does not exist'}}, - 'nfsErr': {'status': - {'code': 3, - 'message': 'Image repository access timeout'}}, - 'exist': {'status': - {'code': 4, - 'message': 'Virtual machine already exists'}}, - 'noVmType': {'status': - {'code': 5, - 'message': 'Unsupported VM type'}}, - 'down': {'status': - {'code': 6, - 'message': 'Virtual machine is down'}}, - 'copyerr': {'status': - {'code': 7, - 'message': 'Copy failed'}}, - 'sparse': {'status': - {'code': 8, - 'message': 'sparse creation faild'}}, - 'createErr': {'status': - {'code': 9, - 'message': 'Error creating the requested VM'}}, - 'noConPeer': {'status': - {'code': 10, - 'message': 'Could not connect to peer VDS'}}, - 'MissParam': {'status': - {'code': 11, - 'message': 'Missing required parameter'}}, - 'migrateErr': {'status': - {'code': 12, - 'message': 'Fatal error during migration'}}, - 'imageErr': {'status': - {'code': 13, - 'message': - 'Drive image file %s could not be found'}}, - 'outOfMem': {'status': - {'code': 14, - 'message': - 'Not enough free memory to create VM'}}, - 'unexpected': {'status': - {'code': 16, - 'message': 'Unexpected exception'}}, - 'unsupFormat': {'status': - {'code': 17, - 'message': 'Unsupported image format'}}, - 'ticketErr': {'status': - {'code': 18, - 'message': 'Error while setting spice ticket'}}, - 'nonresp': {'status': - {'code': 19, - 'message': 'Guest agent non-responsive'}}, -# codes 20-29 are reserved for add/delNetwork -# code 39 was used for: -# wrongHost - migration destination has an invalid hostname - 'unavail': {'status': - {'code': 40, - 'message': 'Resource unavailable'}}, - 'changeDisk': {'status': - {'code': 41, - 'message': 'Failed to change disk image'}}, - 'destroyErr': {'status': - {'code': 42, - 'message': 'Virtual machine destroy error'}}, - 'fenceAgent': {'status': - {'code': 43, - 'message': 'Unsupported fencing agent'}}, - 'noimpl': {'status': - {'code': 44, - 'message': 'Not implemented'}}, - 'hotplugDisk': {'status': - {'code': 45, - 'message': 'Failed to hotplug disk'}}, - 'hotunplugDisk': {'status': - {'code': 46, - 'message': 'Failed to hotunplug disk'}}, - 'migCancelErr': {'status': - {'code': 47, - 'message': 'Migration not in progress'}}, - 'snapshotErr': {'status': - {'code': 48, - 'message': 'Snapshot failed'}}, - 'hotplugNic': {'status': - {'code': 49, - 'message': 'Failed to hotplug NIC'}}, - 'hotunplugNic': {'status': - {'code': 50, - 'message': 'Failed to hotunplug NIC'}}, - 'migInProgress': {'status': - {'code': 51, - 'message': - 'Command not supported during migration'}}, - 'mergeErr': {'status': - {'code': 52, - 'message': 'Merge failed'}}, - 'balloonErr': {'status': - {'code': 53, - 'message': - 'Balloon operation is not available'}}, - 'momErr': {'status': - {'code': 54, - 'message': 'Failed to set mom policy'}}, - 'replicaErr': {'status': - {'code': 55, - 'message': 'Drive replication error'}}, - 'updateDevice': {'status': - {'code': 56, - 'message': 'Failed to update device'}}, - 'recovery': {'status': - {'code': 99, - 'message': - 'Recovering from crash or Initializing'}}, + {'code': 1, + 'message': 'Virtual machine does not exist'}}, + 'nfsErr': {'status': + {'code': 3, + 'message': 'Image repository access timeout'}}, + 'exist': {'status': + {'code': 4, + 'message': 'Virtual machine already exists'}}, + 'noVmType': {'status': + {'code': 5, + 'message': 'Unsupported VM type'}}, + 'down': {'status': + {'code': 6, + 'message': 'Virtual machine is down'}}, + 'copyerr': {'status': + {'code': 7, + 'message': 'Copy failed'}}, + 'sparse': {'status': + {'code': 8, + 'message': 'sparse creation faild'}}, + 'createErr': {'status': + {'code': 9, + 'message': 'Error creating the requested VM'}}, + 'noConPeer': {'status': + {'code': 10, + 'message': 'Could not connect to peer VDS'}}, + 'MissParam': {'status': + {'code': 11, + 'message': 'Missing required parameter'}}, + 'migrateErr': {'status': + {'code': 12, + 'message': 'Fatal error during migration'}}, + 'imageErr': {'status': + {'code': 13, + 'message': + 'Drive image file %s could not be found'}}, + 'outOfMem': {'status': + {'code': 14, + 'message': + 'Not enough free memory to create VM'}}, + 'unexpected': {'status': + {'code': 16, + 'message': 'Unexpected exception'}}, + 'unsupFormat': {'status': + {'code': 17, + 'message': 'Unsupported image format'}}, + 'ticketErr': {'status': + {'code': 18, + 'message': 'Error while setting spice ticket'}}, + 'nonresp': {'status': + {'code': 19, + 'message': 'Guest agent non-responsive'}}, + # codes 20-29 are reserved for add/delNetwork + # code 39 was used for: + # wrongHost - migration destination has an invalid hostname + 'unavail': {'status': + {'code': 40, + 'message': 'Resource unavailable'}}, + 'changeDisk': {'status': + {'code': 41, + 'message': 'Failed to change disk image'}}, + 'destroyErr': {'status': + {'code': 42, + 'message': 'Virtual machine destroy error'}}, + 'fenceAgent': {'status': + {'code': 43, + 'message': 'Unsupported fencing agent'}}, + 'noimpl': {'status': + {'code': 44, + 'message': 'Not implemented'}}, + 'hotplugDisk': {'status': + {'code': 45, + 'message': 'Failed to hotplug disk'}}, + 'hotunplugDisk': {'status': + {'code': 46, + 'message': 'Failed to hotunplug disk'}}, + 'migCancelErr': {'status': + {'code': 47, + 'message': 'Migration not in progress'}}, + 'snapshotErr': {'status': + {'code': 48, + 'message': 'Snapshot failed'}}, + 'hotplugNic': {'status': + {'code': 49, + 'message': 'Failed to hotplug NIC'}}, + 'hotunplugNic': {'status': + {'code': 50, + 'message': 'Failed to hotunplug NIC'}}, + 'migInProgress': {'status': + {'code': 51, + 'message': + 'Command not supported during migration'}}, + 'mergeErr': {'status': + {'code': 52, + 'message': 'Merge failed'}}, + 'balloonErr': {'status': + {'code': 53, + 'message': + 'Balloon operation is not available'}}, + 'momErr': {'status': + {'code': 54, + 'message': 'Failed to set mom policy'}}, + 'replicaErr': {'status': + {'code': 55, + 'message': 'Drive replication error'}}, + 'updateDevice': {'status': + {'code': 56, + 'message': 'Failed to update device'}}, + 'recovery': {'status': + {'code': 99, + 'message': + 'Recovering from crash or Initializing'}}, } doneCode = {'code': 0, 'message': 'Done'} -- To view, visit http://gerrit.ovirt.org/10037 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I52878345d5b46eec0fea74ce87d435df629eedfe Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>

3 11

Change in vdsm[master]: pep8 cleanup
by lhornyak＠redhat.com 14 Dec '12

14 Dec '12

Laszlo Hornyak has uploaded a new change for review. Change subject: pep8 cleanup ...................................................................... pep8 cleanup removed some pep8 errors Signed-off-by: Laszlo Hornyak <lhornyak(a)redhat.com> Change-Id: Ib7c118947504f0bda5a922b5da07dca01c2cfca9 --- M tests/capsTests.py M vdsm/caps.py 2 files changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/32/10032/1 diff --git a/tests/capsTests.py b/tests/capsTests.py index dec0ec7..b39e8e2 100644 --- a/tests/capsTests.py +++ b/tests/capsTests.py @@ -67,8 +67,8 @@ path = os.path.join(dirName, "caps_libvirt.out") machines = caps._getEmulatedMachines(file(path).read()) expectedMachines = ['pc-1.2', 'none', 'pc', 'pc-1.1', 'pc-1.0', - 'pc-0.15', 'pc-0.14', 'pc-0.13', 'pc-0.12', 'pc-0.11', - 'pc-0.10', 'isapc'] + 'pc-0.15', 'pc-0.14', 'pc-0.13', 'pc-0.12', + 'pc-0.11', 'pc-0.10', 'isapc'] self.assertEqual(machines, expectedMachines) def test_parseKeyVal(self): diff --git a/vdsm/caps.py b/vdsm/caps.py index 0b16796..d6298df 100644 --- a/vdsm/caps.py +++ b/vdsm/caps.py @@ -135,6 +135,7 @@ if m.nodeName == 'machine'] return [] + def _getAllCpuModels(): cpu_map = minidom.parseString( file('/usr/share/libvirt/cpu_map.xml').read()) -- To view, visit http://gerrit.ovirt.org/10032 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib7c118947504f0bda5a922b5da07dca01c2cfca9 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Laszlo Hornyak <lhornyak(a)redhat.com>

3 5

← Newer
1
...
30
31
32
33
34
35
36
...
41
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches December 2012