Francesco Romani has uploaded a new change for review. Change subject: pep8: storage cleanups for pep-1.5.x ......................................................................
pep8: storage cleanups for pep-1.5.x storage/* is now pep8 1.5.x clean. Change-Id: I49d4e4e59101ea54759a700644f04c9400fe2349 Signed-off-by: Francesco Romani <[email protected]> --- M vdsm/storage/blockSD.py M vdsm/storage/blockVolume.py M vdsm/storage/fileUtils.py M vdsm/storage/hsm.py M vdsm/storage/iscsi.py M vdsm/storage/misc.py M vdsm/storage/outOfProcess.py M vdsm/storage/resourceManager.py M vdsm/storage/storageServer.py M vdsm/storage/storage_mailbox.py 10 files changed, 25 insertions(+), 25 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/24/26424/1 diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py index f807d3e..58f5558 100644 --- a/vdsm/storage/blockSD.py +++ b/vdsm/storage/blockSD.py @@ -458,7 +458,7 @@ # extent size of 128MB. In any case we compute the right size on line. vg = lvm.getVG(vgroup) minmetasize = (SD_METADATA_SIZE / sd.METASIZE * int(vg.extent_size) + - (1024 * 1024 - 1)) / (1024 * 1024) + (1024 * 1024 - 1)) / (1024 * 1024) metaratio = int(vg.extent_size) / sd.METASIZE metasize = (int(vg.extent_count) * sd.METASIZE + (1024 * 1024 - 1)) / (1024 * 1024) @@ -982,9 +982,9 @@ """ try: lvm.changelv(sdUUID, volUUIDs, (("-a", "y"), - ("--deltag", blockVolume.TAG_PREFIX_IMAGE + imgUUID), - ("--addtag", blockVolume.TAG_PREFIX_IMAGE + - opTag + imgUUID))) + ("--deltag", blockVolume.TAG_PREFIX_IMAGE + imgUUID), + ("--addtag", blockVolume.TAG_PREFIX_IMAGE + + opTag + imgUUID))) except se.StorageException as e: log.error("Can't activate or change LV tags in SD %s. " "failing Image %s %s operation for vols: %s. %s", diff --git a/vdsm/storage/blockVolume.py b/vdsm/storage/blockVolume.py index 36bfa1f..65be640 100644 --- a/vdsm/storage/blockVolume.py +++ b/vdsm/storage/blockVolume.py @@ -94,7 +94,7 @@ @classmethod def halfbakedVolumeRollback(cls, taskObj, sdUUID, volUUID, volPath): cls.log.info("sdUUID=%s volUUID=%s volPath=%s" % - (sdUUID, volUUID, volPath)) + (sdUUID, volUUID, volPath)) try: # Fix me: assert resource lock. tags = lvm.getLV(sdUUID, volUUID).tags @@ -330,9 +330,9 @@ if recovery: name = "Rename volume rollback: " + newUUID - vars.task.pushRecovery(task.Recovery(name, "blockVolume", - "BlockVolume", "renameVolumeRollback", - [self.sdUUID, newUUID, self.volUUID])) + vars.task.pushRecovery(task.Recovery( + name, "blockVolume", "BlockVolume", "renameVolumeRollback", + [self.sdUUID, newUUID, self.volUUID])) lvm.renameLV(self.sdUUID, self.volUUID, newUUID) self.volUUID = newUUID diff --git a/vdsm/storage/fileUtils.py b/vdsm/storage/fileUtils.py index f1af44a..56dc1ef 100644 --- a/vdsm/storage/fileUtils.py +++ b/vdsm/storage/fileUtils.py @@ -229,7 +229,7 @@ class DirectFile(object): def __init__(self, path, mode): - if not "d" in mode: + if "d" not in mode: raise ValueError("This class only handles direct IO") if len(mode) < 2: diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index 0ebe129..9040d79 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -2589,7 +2589,7 @@ misc.validateUUID(sdUUID, 'sdUUID') self.validateNonDomain(sdUUID) - if not domClass in sd.DOMAIN_CLASSES.keys(): + if domClass not in sd.DOMAIN_CLASSES.keys(): raise se.StorageDomainClassError() sd.validateDomainVersion(domVersion) diff --git a/vdsm/storage/iscsi.py b/vdsm/storage/iscsi.py index f0b3d54..bc57ecf 100644 --- a/vdsm/storage/iscsi.py +++ b/vdsm/storage/iscsi.py @@ -293,7 +293,7 @@ key, mode = self._fields[name] - if not "r" in mode: + if "r" not in mode: raise AttributeError(name) value = self._conf[key] @@ -316,7 +316,7 @@ raise AttributeError(name) key, mode = self._fields[name] - if not "w" in mode: + if "w" not in mode: raise AttributeError(name) self._conf[key] = value diff --git a/vdsm/storage/misc.py b/vdsm/storage/misc.py index a433723..0e11c65 100644 --- a/vdsm/storage/misc.py +++ b/vdsm/storage/misc.py @@ -654,7 +654,7 @@ def release(self): currentThread = threading.currentThread() - if not currentThread in self._holdingThreads: + if currentThread not in self._holdingThreads: raise RuntimeError("Releasing an lock without acquiring it first") # If in nested lock don't really release diff --git a/vdsm/storage/outOfProcess.py b/vdsm/storage/outOfProcess.py index 65d29e9..7b69faa 100644 --- a/vdsm/storage/outOfProcess.py +++ b/vdsm/storage/outOfProcess.py @@ -39,7 +39,7 @@ return _pools[clientName] except KeyError: with _poolsLock: - if not clientName in _pools: + if clientName not in _pools: _pools[clientName] = OopWrapper( RemoteFileHandlerPool(HELPERS_PER_DOMAIN)) diff --git a/vdsm/storage/resourceManager.py b/vdsm/storage/resourceManager.py index 2f40345..cdf8b84 100644 --- a/vdsm/storage/resourceManager.py +++ b/vdsm/storage/resourceManager.py @@ -56,7 +56,7 @@ @classmethod def validate(cls, ltype): validValues = ["shared", "exclusive"] - if not ltype in validValues: + if ltype not in validValues: raise ValueError("invalid lock type '%s'" % ltype) @classmethod @@ -424,7 +424,7 @@ def unregisterNamespace(self, namespace): with self._syncRoot.exclusive: - if not namespace in self._namespaces: + if namespace not in self._namespaces: raise KeyError("Namespace '%s' doesn't exist" % namespace) self._log.debug("Unregistering namespace '%s'", namespace) @@ -453,7 +453,7 @@ raise KeyError("No such resource '%s.%s'" % (namespace, name)) - if not name in resources: + if name not in resources: return LockState.free return LockState.fromType(resources[name].currentLock) @@ -741,7 +741,7 @@ resource.fullName) self.lock.acquire() try: - if not request in self.requests: + if request not in self.requests: self.log.warning("request %s not requested by %s", request, self) resource.release() @@ -777,7 +777,7 @@ self.log.debug("%s: request canceled %s", self, request) self.lock.acquire() try: - if not request.fullName in self.requests: + if request.fullName not in self.requests: self.log.warning("request %s not requested by %s", request, self) return @@ -899,7 +899,7 @@ self.log.debug("%s: Trying to cancel request for '%s'", self, fullName) self.lock.acquire() try: - if not fullName in self.requests: + if fullName not in self.requests: self.log.warning("%s: Tried to cancel resource '%s' but it was" " not requested or already canceled", self, fullName) @@ -951,7 +951,7 @@ fullName = "%s.%s" % (namespace, name) self.lock.acquire() try: - if not fullName in self.resources: + if fullName not in self.resources: raise ValueError("resource %s not owned by %s" % (fullName, self)) diff --git a/vdsm/storage/storageServer.py b/vdsm/storage/storageServer.py index e62e38a..21260b6 100644 --- a/vdsm/storage/storageServer.py +++ b/vdsm/storage/storageServer.py @@ -748,7 +748,7 @@ con = self._conDict[alias] self._delConnection(alias) self._log.info("Stopped managing connection alias %s", alias) - if not con in self._conDict.values(): + if con not in self._conDict.values(): return self._asyncDisconnect(con) return AsyncCallStub(None) diff --git a/vdsm/storage/storage_mailbox.py b/vdsm/storage/storage_mailbox.py index b53fd5c..c31018a 100644 --- a/vdsm/storage/storage_mailbox.py +++ b/vdsm/storage/storage_mailbox.py @@ -90,9 +90,9 @@ def __init__(self, volumeData, newSize, callbackFunction=None): - if (not 'poolID' in volumeData) or \ - (not 'domainID' in volumeData) or \ - (not 'volumeID' in volumeData): + if ('poolID' not in volumeData) or \ + ('domainID' not in volumeData) or \ + ('volumeID' not in volumeData): self.log.error('create extend msg failed for volume: %s, size:' ' %d', '-'.join(volumeData.values()), newSize) raise InvalidParameterException('volumeData dictionary', -- To view, visit http://gerrit.ovirt.org/26424 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I49d4e4e59101ea54759a700644f04c9400fe2349 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
