Dan Kenigsberg has uploaded a new change for review. Change subject: pep8: comply with E122 and E123 ......................................................................
pep8: comply with E122 and E123 Signed-off-by: Dan Kenigsberg <dan...@redhat.com> Change-Id: Iaa9dffbe1cc1c137430ec30148694e01750260a6 --- M Makefile.am M tests/configNetworkTests.py M vdsm/storage/blockSD.py M vdsm/storage/fileSD.py M vdsm/storage/iscsi.py M vdsm/storage/multipath.py M vdsm/storage/sd.py M vdsm/storage/sp.py M vdsm/storage/storageServer.py M vdsm/storage/storage_exception.py M vdsm_api/process-schema.py M vdsm_reg/define.py 12 files changed, 25 insertions(+), 26 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/30/9730/1 diff --git a/Makefile.am b/Makefile.am index 11f0597..434aa41 100644 --- a/Makefile.am +++ b/Makefile.am @@ -104,7 +104,7 @@ find . -path './.git' -prune -type f -o \ -name '*.py' -o -name '*.py.in' | xargs $(PYFLAKES) $(PEP8) --exclude="$(PEP8_BLACKLIST)" --filename '*.py,*.py.in' \ - --ignore=E122,E123,E124,E125,E126,E127,E128,E241 \ + --ignore=E124,E125,E126,E127,E128,E241 \ $(PEP8_WHITELIST) @if test -f .gitignore; then \ for i in `git ls-files \*.in`; do \ diff --git a/tests/configNetworkTests.py b/tests/configNetworkTests.py index cc88184..0813ebc 100644 --- a/tests/configNetworkTests.py +++ b/tests/configNetworkTests.py @@ -175,8 +175,7 @@ opts), None) def _fakeNetworks(): - return { - 'fakebridgenet': {'iface': 'fakebridge', 'bridged': True}, + return {'fakebridgenet': {'iface': 'fakebridge', 'bridged': True}, 'fakenet': {'iface': 'fakeint', 'bridged': False}, } @@ -199,29 +198,29 @@ 'fakebrnet2': {'iface': 'fakebr2', 'bridged': True, 'ports': ['eth7.1']}, 'fakebrnet3': {'iface': 'eth8', 'bridged': False} - }, + }, 'vlans': { 'eth3.2': { 'iface': 'eth3', 'addr': '10.10.10.10', 'netmask': '255.255.0.0', 'mtu': 1500 - }, + }, 'eth7.1': { 'iface': 'eth7', 'addr': '192.168.100.1', 'netmask': '255.255.255.0', 'mtu': 1500 - } - }, + } + }, 'nics': ['eth0', 'eth1', 'eth2', 'eth3', 'eth4', 'eth5', 'eth6', 'eth7', 'eth8', 'eth9', 'eth10'], 'bondings': { 'bond00': { 'slaves': ['eth5', 'eth6'] - } } } + } netinfoIns = netinfo.NetInfo(_netinfo) vlan = bonding = ipaddr = netmask = gw = bondingOptions = None diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py index 141754c..a5ed756 100644 --- a/vdsm/storage/blockSD.py +++ b/vdsm/storage/blockSD.py @@ -549,7 +549,7 @@ DMDK_VGUUID: vgUUID, DMDK_LOGBLKSIZE: logBlkSize, DMDK_PHYBLKSIZE: phyBlkSize, - } + } initialMetadata.update(mapping) diff --git a/vdsm/storage/fileSD.py b/vdsm/storage/fileSD.py index c4415da..fde466f 100644 --- a/vdsm/storage/fileSD.py +++ b/vdsm/storage/fileSD.py @@ -200,7 +200,7 @@ sd.DMDK_LEASE_RETRIES: sd.DEFAULT_LEASE_PARAMS[sd.DMDK_LEASE_RETRIES], REMOTE_PATH: remotePath - }) + }) def getReadDelay(self): t = time.time() diff --git a/vdsm/storage/iscsi.py b/vdsm/storage/iscsi.py index ac4d7f6..a7e320d 100644 --- a/vdsm/storage/iscsi.py +++ b/vdsm/storage/iscsi.py @@ -255,7 +255,7 @@ 'hardwareAddress': ("iface.hwaddress", 'rw'), 'ipAddress': ('iface.ipaddress', 'rw'), 'initiatorName': ('iface.initiatorname', 'rw') - } + } def __getattr__(self, name): if name in ("_conf", "_fields", "_loaded"): diff --git a/vdsm/storage/multipath.py b/vdsm/storage/multipath.py index c43cb09..adaa0c0 100644 --- a/vdsm/storage/multipath.py +++ b/vdsm/storage/multipath.py @@ -246,7 +246,7 @@ "fwrev": "", "logicalblocksize": "", "physicalblocksize": "", - } + } for slave in devicemapper.getSlaves(dmId): if not devicemapper.isBlockDevice(slave): @@ -310,7 +310,7 @@ "iqn": sess.target.iqn, "portal": str(sess.target.tpgt), "initiatorname": sess.iface.name - } + } # Note that credentials must be sent back in order for # the engine to tell vdsm how to reconnect later diff --git a/vdsm/storage/sd.py b/vdsm/storage/sd.py index 875d4b1..2d53a70 100644 --- a/vdsm/storage/sd.py +++ b/vdsm/storage/sd.py @@ -283,7 +283,7 @@ lambda val: intOrDefault( DEFAULT_LEASE_PARAMS[DMDK_LEASE_RETRIES], val), intEncode), - } +} class StorageDomain: diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index 98260dc..0c6fa39 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -93,7 +93,7 @@ PMDK_LVER: (int, str), PMDK_SPM_ID: (int, str), PMDK_MASTER_VER: (int, str) - } +} # Calculate how many domains can be in the pool before overflowing the Metadata MAX_DOMAINS = blockSD.SD_METADATA_SIZE - blockSD.METADATA_BASE_SIZE @@ -713,11 +713,11 @@ raise se.UnicodeArgumentException() futurePoolMD.update({ - PMDK_SPM_ID: SPM_ID_FREE, - PMDK_LVER: LVER_INVALID, - PMDK_MASTER_VER: masterVersion, - PMDK_POOL_DESCRIPTION: poolName, - PMDK_DOMAINS: {domain.sdUUID: sd.DOM_ACTIVE_STATUS}}) + PMDK_SPM_ID: SPM_ID_FREE, + PMDK_LVER: LVER_INVALID, + PMDK_MASTER_VER: masterVersion, + PMDK_POOL_DESCRIPTION: poolName, + PMDK_DOMAINS: {domain.sdUUID: sd.DOM_ACTIVE_STATUS}}) @unsecured def reconstructMaster(self, hostId, poolName, msdUUID, domDict, @@ -1362,7 +1362,7 @@ 'lastCheck': '%.1f' % (now - st.lastCheck), 'delay': str(st.readDelay), 'valid': (st.error is None) - }, + }, 'disktotal': disktotal, 'diskfree': diskfree, @@ -1374,8 +1374,8 @@ 'masterValidate': { 'mount': st.masterMounted, 'valid': st.masterValid - } } + } return res @unsecured diff --git a/vdsm/storage/storageServer.py b/vdsm/storage/storageServer.py index 383e04c..b457d5b 100644 --- a/vdsm/storage/storageServer.py +++ b/vdsm/storage/storageServer.py @@ -580,7 +580,7 @@ "posixfs": MountConnection, "iscsi": IscsiConnection, "localfs": LocalDirectoryConnection, - } + } @classmethod def createConnection(cls, conInfo): diff --git a/vdsm/storage/storage_exception.py b/vdsm/storage/storage_exception.py index 71c5431..4a80e78 100644 --- a/vdsm/storage/storage_exception.py +++ b/vdsm/storage/storage_exception.py @@ -37,7 +37,7 @@ GENERAL_EXCEPTION = lambda e: (100, str(e)) ERROR_MAP = { SecureError: SPM_STATUS_ERROR - } +} def generateResponse(error, default=GENERAL_EXCEPTION): diff --git a/vdsm_api/process-schema.py b/vdsm_api/process-schema.py index ae63f44..8244995 100755 --- a/vdsm_api/process-schema.py +++ b/vdsm_api/process-schema.py @@ -29,7 +29,7 @@ "'": "'", ">": ">", "<": "<", - } +} # Symbols of these types are considered data types typeKinds = ('class', 'type', 'enum', 'map', 'union', 'alias') diff --git a/vdsm_reg/define.py b/vdsm_reg/define.py index c665634..707adae 100644 --- a/vdsm_reg/define.py +++ b/vdsm_reg/define.py @@ -93,7 +93,7 @@ 'Vds not operational. ' 'Check logs, repair it, and restart'}}, 'tmp': {} - } +} doneCode = {'code': 0, 'message': 'Done'} nullCode = {'code': 0, 'message': ''} -- To view, visit http://gerrit.ovirt.org/9730 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaa9dffbe1cc1c137430ec30148694e01750260a6 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <dan...@redhat.com> _______________________________________________ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches