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 <[email protected]> --- 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 <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
