Antoni Segura Puimedon has uploaded a new change for review. Change subject: Improve the readability of define.py ......................................................................
Improve the readability of define.py Maintain pep8 compatibility but improve the readability by recovering some space (reducing indentation). Change-Id: If7649694b2dd215ae0c3279c61c1c6a3a86e5178 Signed-off-by: Antoni S. Puimedon <[email protected]> --- M vdsm/define.py 1 file changed, 113 insertions(+), 117 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/14/12514/1 diff --git a/vdsm/define.py b/vdsm/define.py index 86f6faa..ac91824 100644 --- a/vdsm/define.py +++ b/vdsm/define.py @@ -18,123 +18,119 @@ # Refer to the README and COPYING files for full details of the license # -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'}}, - 'hwInfoErr': {'status': - {'code': 57, - 'message': 'Failed to read hardware information'}}, - 'recovery': {'status': - {'code': 99, - 'message': - 'Recovering from crash or Initializing'}}, - } +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'}}, + 'hwInfoErr': {'status': { + 'code': 57, + 'message': 'Failed to read hardware information'}}, + 'recovery': {'status': { + 'code': 99, + 'message': 'Recovering from crash or Initializing'}}, +} + doneCode = {'code': 0, 'message': 'Done'} Kbytes = 1024 -- To view, visit http://gerrit.ovirt.org/12514 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If7649694b2dd215ae0c3279c61c1c6a3a86e5178 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
