vdsm-patches December 2012

vdsm-patches@lists.fedorahosted.org

51 participants
408 discussions

Change in vdsm[master]: vmfex hook: generating rpm
by Douglas Schilling Landgraf 10 Dec '12

10 Dec '12

Douglas Schilling Landgraf has uploaded a new change for review. Change subject: vmfex hook: generating rpm ...................................................................... vmfex hook: generating rpm Generate vmfex rpm with others hooks. Change-Id: Ibeafde1d49d205790deb1b39c9422587966a27fe Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com> --- M configure.ac M vdsm.spec.in M vdsm_hooks/Makefile.am M vdsm_hooks/vmfex/Makefile.am 4 files changed, 17 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/29/9829/1 diff --git a/configure.ac b/configure.ac index 35dabed..a6265b5 100644 --- a/configure.ac +++ b/configure.ac @@ -214,6 +214,7 @@ vdsm_hooks/sriov/Makefile vdsm_hooks/vhostmd/Makefile vdsm_hooks/vmdisk/Makefile + vdsm_hooks/vmfex/Makefile vdsm/Makefile vdsm_reg/Makefile vdsm/betterPopen/Makefile diff --git a/vdsm.spec.in b/vdsm.spec.in index 9830afe..1cec7b6 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -377,6 +377,13 @@ sr-iov hook enable to add virtual functions exposed by the device directly to a virtual machine. +%package hook-vmfex +Summary: vmfex support for VDSM +BuildArch: noarch + +%description hook-vmfex +Hook for vmfex. + %package hook-vmdisk Summary: External disk support for VDSM BuildArch: noarch @@ -897,6 +904,11 @@ %files hook-vmdisk %defattr(-, root, root, -) %{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_vmdisk + +%files hook-vmfex +%defattr(-, root, root, -) +%{_libexecdir}/%{vdsm_name}/hooks/before_vm_migrate_destination/50_vmfex +%{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_vmfex %endif %files debug-plugin diff --git a/vdsm_hooks/Makefile.am b/vdsm_hooks/Makefile.am index c96dc10..9f00d4d 100644 --- a/vdsm_hooks/Makefile.am +++ b/vdsm_hooks/Makefile.am @@ -40,7 +40,8 @@ smartcard \ smbios \ sriov \ - vmdisk + vmdisk \ + vmfex endif dist_vdsmexec_SCRIPTS = \ diff --git a/vdsm_hooks/vmfex/Makefile.am b/vdsm_hooks/vmfex/Makefile.am index 4b18cfe..0cc48e1 100644 --- a/vdsm_hooks/vmfex/Makefile.am +++ b/vdsm_hooks/vmfex/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2011 Red Hat, Inc. +# Copyright 2011-2012 Red Hat, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ EXTRA_DIST = \ before_vm_migrate_destination.py \ - before_vm_start.py \ + before_vm_start.py install-data-local: $(MKDIR_P) $(DESTDIR)$(vdsmhooksdir)/before_vm_start -- To view, visit http://gerrit.ovirt.org/9829 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibeafde1d49d205790deb1b39c9422587966a27fe Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>

3 6

Change in vdsm[master]: pep8: fix E241
by Dan Kenigsberg 10 Dec '12

10 Dec '12

Dan Kenigsberg has uploaded a new change for review. Change subject: pep8: fix E241 ...................................................................... pep8: fix E241 Change-Id: I091c5bd808bbb65b2e98f4a605521cb59af84e99 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M Makefile.am M tests/miscTests.py M vdsm/define.py M vdsm/libvirtvm.py M vdsm/qemuImg.py M vdsm_cli/vdsClient.py 6 files changed, 301 insertions(+), 301 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/07/9807/1 diff --git a/Makefile.am b/Makefile.am index b2faa14..80d6f52 100644 --- a/Makefile.am +++ b/Makefile.am @@ -103,7 +103,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=E126,E127,E128,E241 \ + --ignore=E126,E127,E128 \ $(PEP8_WHITELIST) @if test -f .gitignore; then \ for i in `git ls-files \*.in`; do \ diff --git a/tests/miscTests.py b/tests/miscTests.py index 4c986ed..7a9d4c5 100644 --- a/tests/miscTests.py +++ b/tests/miscTests.py @@ -891,7 +891,7 @@ fd, path = tempfile.mkstemp() os.unlink(path) - self.assertRaises(misc.se.MiscFileReadException, misc.readfile, path) + self.assertRaises(misc.se.MiscFileReadException, misc.readfile, path) class PidExists(TestCaseBase): diff --git a/vdsm/define.py b/vdsm/define.py index 61bcc64..bff2fa2 100644 --- a/vdsm/define.py +++ b/vdsm/define.py @@ -18,92 +18,92 @@ # 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'}}, +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'}}, + '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'}}, + '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'}}, @@ -111,23 +111,23 @@ {'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'}}, - 'recovery': {'status': - {'code': 99, - 'message': - 'Recovering from crash or Initializing'}}, + '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'}}, + 'recovery': {'status': + {'code': 99, + 'message': + 'Recovering from crash or Initializing'}}, } doneCode = {'code': 0, 'message': 'Done'} diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py index 97672a6..f9e88ff 100644 --- a/vdsm/libvirtvm.py +++ b/vdsm/libvirtvm.py @@ -215,10 +215,10 @@ for nic in self._vm._devices[vm.NIC_DEVICES]: ifSpeed = [100, 1000][nic.nicModel in ('e1000', 'virtio')] - ifStats = {'macAddr': nic.macAddr, - 'name': nic.name, - 'speed': str(ifSpeed), - 'state': 'unknown'} + ifStats = {'macAddr': nic.macAddr, + 'name': nic.name, + 'speed': str(ifSpeed), + 'state': 'unknown'} try: ifStats['rxErrors'] = str(eInfo[nic.name][2]) @@ -247,7 +247,7 @@ dName = vmDrive.name dStats = {} try: - dStats = {'truesize': str(vmDrive.truesize), + dStats = {'truesize': str(vmDrive.truesize), 'apparentsize': str(vmDrive.apparentsize)} if vmDrive.isVdsmImage(): dStats['imageID'] = vmDrive.imageID @@ -286,7 +286,7 @@ for vmDrive in self._vm._devices[vm.DISK_DEVICES]: dName = vmDrive.name - dLatency = {'readLatency': '0', + dLatency = {'readLatency': '0', 'writeLatency': '0', 'flushLatency': '0'} try: diff --git a/vdsm/qemuImg.py b/vdsm/qemuImg.py index 5496d93..77befcf 100644 --- a/vdsm/qemuImg.py +++ b/vdsm/qemuImg.py @@ -34,11 +34,11 @@ VMDK = "vmdk" __iregex = { - 'format': re.compile("^file format: (?P<value>\w+)$"), - 'virtualsize': re.compile("^virtual size: " - "[\d.]+[KMGT] $(?P<value>\d+) bytes$$"), - 'clustersize': re.compile("^cluster_size: (?P<value>\d+)$"), - 'backingfile': re.compile("^backing file: (?P<value>.+) $actual path"), + 'format': re.compile("^file format: (?P<value>\w+)$"), + 'virtualsize': re.compile("^virtual size: " + "[\d.]+[KMGT] \((?P<value>\d+) bytes$$"), + 'clustersize': re.compile("^cluster_size: (?P<value>\d+)$"), + 'backingfile': re.compile("^backing file: (?P<value>.+) \(actual path"), } @@ -72,7 +72,7 @@ try: info = { - 'format': __iregexSearch("format", out[1]), + 'format': __iregexSearch("format", out[1]), 'virtualsize': int(__iregexSearch("virtualsize", out[2])), } diff --git a/vdsm_cli/vdsClient.py b/vdsm_cli/vdsClient.py index 080da7e..c67e3fe 100644 --- a/vdsm_cli/vdsClient.py +++ b/vdsm_cli/vdsClient.py @@ -1410,7 +1410,7 @@ vmList = args[2].split(",") else: vmList = [] - infos = self.s.getVmsInfo(spUUID, sdUUID, vmList) + infos = self.s.getVmsInfo(spUUID, sdUUID, vmList) if infos['status']['code'] != 0: return infos['status']['code'], infos['status']['message'] else: @@ -1668,82 +1668,82 @@ else: serv = service() commands = { - 'create': (serv.do_create, - ('<configFile> [parameter=value, parameter=value, ' - '......]', - 'Creates new machine with the paremeters given in the' - ' command line overriding the ones in the config file', - 'Example with config file: vdsClient someServer create' - ' myVmConfigFile', - 'Example with no file : vdsClient someServer create' - ' /dev/null vmId=<uuid> memSize=256 ' - 'imageFile=someImage display=<vnc|qxl|qxlnc>', - 'Parameters list: r=required, o=optional', - 'r vmId=<uuid> : Unique identification for the ' - 'created VM. Any additional operation on the VM must ' - 'refer to this ID', - 'o vmType=<qemu/kvm> : Virtual machine technology - ' - 'if not given kvm is default', - 'o kvmEnable=<true/false> : run in KVM enabled mode ' - 'or full emulation - default is according to the VDS ' - 'capabilities', - 'r memSize=<int> : Memory to allocate for this ' - 'machine', - 'r macAddr=<aa:bb:cc:dd:ee:ff> : MAC address of the ' - 'machine', - 'r display=<vnc|qxl|qxlnc> : send the machine ' - 'display to vnc, spice, or spice with no ' - 'image compression', - 'o drive=pool:poolID,domain:domainID,image:imageID,' - 'volume:volumeID[,boot:true,format:cow] : disk image ' - 'by UUIDs', - 'o (deprecated) hda/b/c/d=<path> : Disk drive ' - 'images', - 'o floppy=<image> : Mount the specified Image as ' - 'floppy', - 'o cdrom=<path> : ISO image file to be mounted as ' - 'the powerup cdrom', - 'o boot=<c/d/n> : boot device - drive C or cdrom or ' - 'network', - 'o sysprepInf=/path/to/file: Launch with the ' - 'specified file as sysprep.inf in floppy', - #'o any parmeter=<any value> : parameter that is ' - #'not familiar is passed as is to the VM', - #' and displayed with ' - #'all other parameter. They can be used for ' - #'additional', - #' information the user ' - #'want to reserve with the machine' - 'o acpiEnable : If present will remove the default ' - '-no-acpi switch', - 'o qgaEnable : use qemu-ga as guest agent', - 'o tdf : If present will add the -rtc-td-hack ' - 'switch', - 'o irqChip : If false, add the -no-kvm-irqchip ' - 'switch', - 'o spiceSecureChannels : comma-separated list of ' - 'spice channel that will be encrypted', - 'o spiceMonitors : number of emulated screen heads', - 'o soundDevice : emulated sound device', - 'o launchPaused : If "true", start qemu paused', - 'o vmName : human-readable name of new VM', - 'o tabletEnable : If "true", enable tablet input', - 'o timeOffset : guest\'s start date, relative to ' - 'host\'s time, in seconds', - 'o smp : number of vcpus', - 'o smpCoresPerSocket, smpThreadsPerCore : vcpu ' - 'topology', - 'o keyboardLayout : language code of client ' - 'keyboard', - 'o cpuType : emulated cpu (with optional flags)', - 'o emulatedMachine : passed as qemu\'s -M', - 'o devices={name:val[, name:val, name:{name:val, ' - 'name:val}]} : add a fully specified device', - 'o cpuPinning={vcpuid:pinning} cpu pinning in ' - 'libvirt-like format. see ' - 'http://libvirt.org/formatdomain.html' - '#elementsCPUTuning' - )), + 'create': (serv.do_create, + ('<configFile> [parameter=value, parameter=value, ' + '......]', + 'Creates new machine with the paremeters given in the' + ' command line overriding the ones in the config file', + 'Example with config file: vdsClient someServer create' + ' myVmConfigFile', + 'Example with no file : vdsClient someServer create' + ' /dev/null vmId=<uuid> memSize=256 ' + 'imageFile=someImage display=<vnc|qxl|qxlnc>', + 'Parameters list: r=required, o=optional', + 'r vmId=<uuid> : Unique identification for the ' + 'created VM. Any additional operation on the VM must ' + 'refer to this ID', + 'o vmType=<qemu/kvm> : Virtual machine technology - ' + 'if not given kvm is default', + 'o kvmEnable=<true/false> : run in KVM enabled mode ' + 'or full emulation - default is according to the VDS ' + 'capabilities', + 'r memSize=<int> : Memory to allocate for this ' + 'machine', + 'r macAddr=<aa:bb:cc:dd:ee:ff> : MAC address of the ' + 'machine', + 'r display=<vnc|qxl|qxlnc> : send the machine ' + 'display to vnc, spice, or spice with no ' + 'image compression', + 'o drive=pool:poolID,domain:domainID,image:imageID,' + 'volume:volumeID[,boot:true,format:cow] : disk image ' + 'by UUIDs', + 'o (deprecated) hda/b/c/d=<path> : Disk drive ' + 'images', + 'o floppy=<image> : Mount the specified Image as ' + 'floppy', + 'o cdrom=<path> : ISO image file to be mounted as ' + 'the powerup cdrom', + 'o boot=<c/d/n> : boot device - drive C or cdrom or ' + 'network', + 'o sysprepInf=/path/to/file: Launch with the ' + 'specified file as sysprep.inf in floppy', + #'o any parmeter=<any value> : parameter that is ' + #'not familiar is passed as is to the VM', + #' and displayed with ' + #'all other parameter. They can be used for ' + #'additional', + #' information the user ' + #'want to reserve with the machine' + 'o acpiEnable : If present will remove the default ' + '-no-acpi switch', + 'o qgaEnable : use qemu-ga as guest agent', + 'o tdf : If present will add the -rtc-td-hack ' + 'switch', + 'o irqChip : If false, add the -no-kvm-irqchip ' + 'switch', + 'o spiceSecureChannels : comma-separated list of ' + 'spice channel that will be encrypted', + 'o spiceMonitors : number of emulated screen heads', + 'o soundDevice : emulated sound device', + 'o launchPaused : If "true", start qemu paused', + 'o vmName : human-readable name of new VM', + 'o tabletEnable : If "true", enable tablet input', + 'o timeOffset : guest\'s start date, relative to ' + 'host\'s time, in seconds', + 'o smp : number of vcpus', + 'o smpCoresPerSocket, smpThreadsPerCore : vcpu ' + 'topology', + 'o keyboardLayout : language code of client ' + 'keyboard', + 'o cpuType : emulated cpu (with optional flags)', + 'o emulatedMachine : passed as qemu\'s -M', + 'o devices={name:val[, name:val, name:{name:val, ' + 'name:val}]} : add a fully specified device', + 'o cpuPinning={vcpuid:pinning} cpu pinning in ' + 'libvirt-like format. see ' + 'http://libvirt.org/formatdomain.html' + '#elementsCPUTuning' + )), 'vmUpdateDevice': (serv.vmUpdateDevice, ('<vmId> <devicespec>', 'Update a VM\'s device', @@ -1762,47 +1762,47 @@ 'mirror. No change if not specified, no mirroring' 'if empty list.' )), - 'hotplugNic': (serv.hotplugNic, - ('<vmId> <nicspec>', - 'Hotplug NIC to existing VM', - 'nicspec parameters list: r=required, o=optional', - 'r device: bridge|sriov|vnlink|bridgeless.', - 'r network: network name', - 'r macAddr: mac address', - 'r nicModel: pv|rtl8139|e1000', - 'o bootOrder: <int> - global boot order across ' - 'all bootable devices' - )), - 'hotunplugNic': (serv.hotunplugNic, - ('<vmId> <nicspec>', - 'Hotunplug NIC from existing VM', - 'nicspec parameters list: r=required, o=optional', - 'r device: bridge|sriov|vnlink|bridgeless.', - 'r network: network name', - 'r macAddr: mac address', - 'r nicModel: pv|rtl8139|e1000', - 'o bootOrder: <int> - global boot order across ' - 'all bootable devices' - )), - 'hotplugDisk': (serv.hotplugDisk, - ('<vmId> <drivespec>', - 'Hotplug disk to existing VM', - 'drivespec parameters list: r=required, o=optional', - 'r iface:<ide|virtio> - Unique identification of ' - 'the existing VM.', - 'r index:<int> - disk index unique per interface ' - 'virtio|ide', - 'r [pool:UUID,domain:UUID,image:UUID,volume:UUID]|' - '[GUID:guid]|[UUID:uuid]', - 'r format: cow|raw', - 'r readonly: True|False - default is False', - 'r propagateErrors: off|on - default is off', - 'o bootOrder: <int> - global boot order across ' - 'all bootable devices', - 'o shared: True|False', - 'o optional: True|False' - )), - 'hotunplugDisk': (serv.hotunplugDisk, + 'hotplugNic': (serv.hotplugNic, + ('<vmId> <nicspec>', + 'Hotplug NIC to existing VM', + 'nicspec parameters list: r=required, o=optional', + 'r device: bridge|sriov|vnlink|bridgeless.', + 'r network: network name', + 'r macAddr: mac address', + 'r nicModel: pv|rtl8139|e1000', + 'o bootOrder: <int> - global boot order across ' + 'all bootable devices' + )), + 'hotunplugNic': (serv.hotunplugNic, + ('<vmId> <nicspec>', + 'Hotunplug NIC from existing VM', + 'nicspec parameters list: r=required, o=optional', + 'r device: bridge|sriov|vnlink|bridgeless.', + 'r network: network name', + 'r macAddr: mac address', + 'r nicModel: pv|rtl8139|e1000', + 'o bootOrder: <int> - global boot order across ' + 'all bootable devices' + )), + 'hotplugDisk': (serv.hotplugDisk, + ('<vmId> <drivespec>', + 'Hotplug disk to existing VM', + 'drivespec parameters list: r=required, o=optional', + 'r iface:<ide|virtio> - Unique identification of ' + 'the existing VM.', + 'r index:<int> - disk index unique per interface ' + 'virtio|ide', + 'r [pool:UUID,domain:UUID,image:UUID,volume:UUID]|' + '[GUID:guid]|[UUID:uuid]', + 'r format: cow|raw', + 'r readonly: True|False - default is False', + 'r propagateErrors: off|on - default is off', + 'o bootOrder: <int> - global boot order across ' + 'all bootable devices', + 'o shared: True|False', + 'o optional: True|False' + )), + 'hotunplugDisk': (serv.hotunplugDisk, ('<vmId> <drivespec >', 'Hotunplug disk from existing VM', 'drivespec parameters list: r=required, o=optional', @@ -1820,50 +1820,50 @@ 'o shared: True|False', 'o optional: True|False' )), - 'changeCD': (serv.do_changeCD, - ('<vmId> <fileName|drivespec>', - 'Changes the iso image of the cdrom' - )), - 'changeFloppy': (serv.do_changeFloppy, + 'changeCD': (serv.do_changeCD, + ('<vmId> <fileName|drivespec>', + 'Changes the iso image of the cdrom' + )), + 'changeFloppy': (serv.do_changeFloppy, ('<vmId> <fileName|drivespec>', 'Changes the image of the floppy drive' )), - 'destroy': (serv.do_destroy, - ('<vmId>', - 'Stops the emulation and destroys the virtual machine.' - ' This is not a shutdown.' - )), - 'shutdown': (serv.do_shutdown, - ('<vmId> <timeout> <message>', - 'Stops the emulation and graceful shutdown the virtual' - ' machine.' - )), - 'list': (serv.do_list, - ('[view] [vms:vmId1,vmId2]', - 'Lists all available machines on the specified ' - 'server.', - "Optional vms list, should start with 'vms:' and " - "follow with 'vmId1,vmId2,...'", - 'Optional views:', - ' "long" all available configuration info ' - '(Default).', - ' "table" table output with the fields: vmId, ' - 'vmName, Status and IP.', - ' "ids" all vmIds.' - )), - 'pause': (serv.do_pause, - ('<vmId>', - 'Pauses the execution of the virtual machine without ' - 'termination' - )), - 'continue': (serv.do_continue, - ('<vmId>', - 'Continues execution after of a paused machine' - )), - 'reset': (serv.do_reset, - ('<vmId>', - 'Sends reset signal to the vm' - )), + 'destroy': (serv.do_destroy, + ('<vmId>', + 'Stops the emulation and destroys the virtual machine.' + ' This is not a shutdown.' + )), + 'shutdown': (serv.do_shutdown, + ('<vmId> <timeout> <message>', + 'Stops the emulation and graceful shutdown the virtual' + ' machine.' + )), + 'list': (serv.do_list, + ('[view] [vms:vmId1,vmId2]', + 'Lists all available machines on the specified ' + 'server.', + "Optional vms list, should start with 'vms:' and " + "follow with 'vmId1,vmId2,...'", + 'Optional views:', + ' "long" all available configuration info ' + '(Default).', + ' "table" table output with the fields: vmId, ' + 'vmName, Status and IP.', + ' "ids" all vmIds.' + )), + 'pause': (serv.do_pause, + ('<vmId>', + 'Pauses the execution of the virtual machine without ' + 'termination' + )), + 'continue': (serv.do_continue, + ('<vmId>', + 'Continues execution after of a paused machine' + )), + 'reset': (serv.do_reset, + ('<vmId>', + 'Sends reset signal to the vm' + )), 'setVmTicket': (serv.do_setVmTicket, ('<vmId> <password> <sec> [disconnect|keep|fail], ' '[params={}]', @@ -1874,12 +1874,12 @@ 'Optional additional parameters in dictionary format,' ' name:value,name:value' )), - 'migrate': (serv.do_migrate, - ('vmId=<id> method=<offline|online> src=<host:[port]> ' - 'dst=<host:[port]>', - 'Migrate a desktop from src machine to dst host using ' - 'the specified ports' - )), + 'migrate': (serv.do_migrate, + ('vmId=<id> method=<offline|online> src=<host:[port]> ' + 'dst=<host:[port]>', + 'Migrate a desktop from src machine to dst host using ' + 'the specified ports' + )), 'migrateStatus': (serv.do_mStat, ('<vmId>', 'Check the progress of current outgoing migration' @@ -1888,10 +1888,10 @@ ('<vmId>', '(not implemented) cancel machine migration' )), - 'sendkeys': (serv.do_sendkeys, - ('<vmId> <key1> ...... <keyN>', - 'Send the key sequence to the vm' - )), + 'sendkeys': (serv.do_sendkeys, + ('<vmId> <key1> ...... <keyN>', + 'Send the key sequence to the vm' + )), 'getVdsCapabilities': (serv.do_getCap, ('', 'Get Capabilities info of the VDS' @@ -2126,15 +2126,15 @@ '<size>', 'Upload volume file into existing volume' )), - 'getVolumePath': (serv.getVolumePath, + 'getVolumePath': (serv.getVolumePath, ('<sdUUID> <spUUID> <imgUUID> <volume uuid>', 'Returns the path to the requested uuid' )), - 'setVolumeDescription': (serv.setVolumeDescription, + 'setVolumeDescription': (serv.setVolumeDescription, ('<sdUUID> <spUUID> <imgUUID> <volUUID> <Description>', 'Sets a new description to the volume' )), - 'setVolumeLegality': (serv.setVolumeLegality, + 'setVolumeLegality': (serv.setVolumeLegality, ('<sdUUID> <spUUID> <imgUUID> <volUUID> <Legality>', 'Set volume legality (ILLEGAL/LEGAL).' )), @@ -2313,42 +2313,42 @@ 'Get list of VMs from the pool or domain if sdUUID ' 'given. Run only from the SPM.' )), - 'addNetwork': (serv.do_addNetwork, + 'addNetwork': (serv.do_addNetwork, ('bridge=<bridge> [vlan=<number>] [bond=<bond>] ' 'nics=nic[,nic]', 'Add a new network to this vds.' )), - 'delNetwork': (serv.do_delNetwork, + 'delNetwork': (serv.do_delNetwork, ('bridge=<bridge> [vlan=<number>] [bond=<bond>] ' 'nics=nic[,nic]', 'Remove a network (and parts thereof) from this vds.' )), - 'editNetwork': (serv.do_editNetwork, + 'editNetwork': (serv.do_editNetwork, ('oldBridge=<bridge> newBridge=<bridge> [vlan=<number>]' ' [bond=<bond>] nics=nic[,nic]', 'Replace a network with a new one.' )), - 'setSafeNetworkConfig': (serv.do_setSafeNetworkConfig, + 'setSafeNetworkConfig': (serv.do_setSafeNetworkConfig, ('', 'declare current network configuration as "safe"' )), - 'fenceNode': (serv.do_fenceNode, - ('<addr> <port> <agent> <user> <passwd> <action> ' - '[<secure> [<options>]] \n\t<action> is one of ' - '(status, on, off, reboot),\n\t<agent> is one of ' - '(rsa, ilo, ipmilan, drac5, etc)\n\t<secure> ' - '(true|false) may be passed to some agents', - 'send a fencing command to a remote node' - )), - 'repoStats': (serv.repoStats, - ('', - "Get the the health status of the active domains" - )), - 'snapshot': (serv.snapshot, - ('<vmId> <sdUUID> <imgUUID> <baseVolUUID> <volUUID>', - "Take a live snapshot" - )), - 'setBalloonTarget': (serv.setBalloonTarget, + 'fenceNode': (serv.do_fenceNode, + ('<addr> <port> <agent> <user> <passwd> <action> ' + '[<secure> [<options>]] \n\t<action> is one of ' + '(status, on, off, reboot),\n\t<agent> is one of ' + '(rsa, ilo, ipmilan, drac5, etc)\n\t<secure> ' + '(true|false) may be passed to some agents', + 'send a fencing command to a remote node' + )), + 'repoStats': (serv.repoStats, + ('', + "Get the the health status of the active domains" + )), + 'snapshot': (serv.snapshot, + ('<vmId> <sdUUID> <imgUUID> <baseVolUUID> <volUUID>', + "Take a live snapshot" + )), + 'setBalloonTarget': (serv.setBalloonTarget, ('<vmId> <target>', "Set VM's balloon target" )), -- To view, visit http://gerrit.ovirt.org/9807 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I091c5bd808bbb65b2e98f4a605521cb59af84e99 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

4 7

Change in vdsm[master]: vdsm_reg/define.py: drop unused file
by Dan Kenigsberg 10 Dec '12

10 Dec '12

Dan Kenigsberg has uploaded a new change for review. Change subject: vdsm_reg/define.py: drop unused file ...................................................................... vdsm_reg/define.py: drop unused file Change-Id: I7bc1e13af78debfdb518156f874b554492dfa8e0 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M Makefile.am M vdsm.spec.in M vdsm_reg/Makefile.am D vdsm_reg/define.py 4 files changed, 0 insertions(+), 121 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/06/9806/1 diff --git a/Makefile.am b/Makefile.am index fa28ee1..b2faa14 100644 --- a/Makefile.am +++ b/Makefile.am @@ -95,7 +95,6 @@ vdsm_hooks/sriov/before_vm_start.py \ vdsm_hooks/vhostmd \ vdsm_reg/createDaemon.py \ - vdsm_reg/define.py \ $(NULL) PEP8_BLACKLIST = apiData.py,config.py,constants.py diff --git a/vdsm.spec.in b/vdsm.spec.in index 465d548..9830afe 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -945,7 +945,6 @@ %{_unitdir}/vdsm-reg.service %endif %{_datadir}/%{vdsm_reg}/vdsm-reg-setup -%{_datadir}/%{vdsm_reg}/define.py* %{_datadir}/%{vdsm_reg}/vdsm-complete %{_datadir}/%{vdsm_reg}/vdsm-gen-cert %{_datadir}/%{vdsm_reg}/vdsm-upgrade diff --git a/vdsm_reg/Makefile.am b/vdsm_reg/Makefile.am index 5098374..aebfc3d 100644 --- a/vdsm_reg/Makefile.am +++ b/vdsm_reg/Makefile.am @@ -24,7 +24,6 @@ dist_vdsmreg_PYTHON = \ createDaemon.py \ - define.py \ register-to-engine.py dist_ovirtsetup_PYTHON = \ diff --git a/vdsm_reg/define.py b/vdsm_reg/define.py deleted file mode 100644 index 707adae..0000000 --- a/vdsm_reg/define.py +++ /dev/null @@ -1,118 +0,0 @@ -# -# Copyright 2011 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# Refer to the README and COPYING files for full details of the license -# - -errCode = { - 'noVM': {'status': - {'code': 1, - 'message': - 'Desktop does not exist'}}, - 'nfsErr': {'status': - {'code': 3, - 'message': - 'Image repository access timeout'}}, - 'exist': {'status': - {'code': 4, - 'message': - 'Desktop already exists'}}, - 'noVmType': {'status': - {'code': 5, - 'message': - 'Unsupported virtual machine type'}}, - 'down': {'status': - {'code': 6, - 'message': - 'Desktop is down'}}, - 'copyerr': {'status': - {'code': 7, - 'message': - 'Copy failed'}}, - 'sparse': {'status': - {'code': 8, - 'message': - 'Sparse creation failed'}}, - 'createErr': {'status': - {'code': 9, - 'message': - 'Error creating the requested Desktop'}}, - '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 could not be found'}}, - 'outOfMem': {'status': - {'code': 14, - 'message': - 'Not enough free memory to create Desktop'}}, - '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'}}, - 'recovery': {'status': - {'code': 100, - 'message': - 'Recovering from crash or still initializing'}}, - 'installErr': {'status': - {'code': 101, - 'message': - 'Vds not operational. ' - 'Check logs, repair it, and restart'}}, - 'tmp': {} -} -doneCode = {'code': 0, 'message': 'Done'} -nullCode = {'code': 0, 'message': ''} - - -#confFile = 'vdsm.conf' -loggerConf = 'logger.conf' -installPath = '/usr/share/vdsm/' -relPath = './' - -Kbytes = 1024 -Mbytes = 1024 * Kbytes - -drives = ['hda', 'hdb', 'hdc', 'hdd', 'cdrom'] -requiredParams = ['vmId', 'hda', 'memSize', 'macAddr', 'display'] - - -class myException(Exception): - pass - -#exitCodes -ERROR = 1 -NORMAL = 0 -- To view, visit http://gerrit.ovirt.org/9806 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7bc1e13af78debfdb518156f874b554492dfa8e0 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

4 8

Change in vdsm[master]: mount.py: handle (deleted) mount points
by Dan Kenigsberg 10 Dec '12

10 Dec '12

Hello Saggi Mizrahi, I'd like you to do a code review. Please visit http://gerrit.ovirt.org/9817 to review the following change. Change subject: mount.py: handle (deleted) mount points ...................................................................... mount.py: handle (deleted) mount points If an NFS mount is removed from the server, client side kernel appends " (deleted)" to it specification. It comes from fs/dcache.c's d_path() function: Convert a dentry into an ASCII path name. If the entry has been deleted the string " (deleted)" is appended. Note that this is ambiguous. In this patch we assume that every mount specification ending with this string is indeed a deleted one, and not a funky nfs server provided by an evil admin that hates Linux. Change-Id: Ifb02976429d0b0c806b8754207d263e17dd7f59f Bug-Url: http://bugzilla.redhat.com/807351 Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com> Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M vdsm/storage/mount.py 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/17/9817/1 diff --git a/vdsm/storage/mount.py b/vdsm/storage/mount.py index aaa9eb0..81ca17f 100644 --- a/vdsm/storage/mount.py +++ b/vdsm/storage/mount.py @@ -46,7 +46,15 @@ fs_freq = int(fs_freq) fs_passno = int(fs_passno) fs_spec = normpath(_parseFstabPath(fs_spec)) + fs_file = normpath(_parseFstabPath(fs_file)) + for suffix in (" (deleted)", ): + if not fs_file.endswith(suffix): + continue + + fs_file = fs_file[:-len(suffix)] + break + fs_mntops = [_parseFstabPath(item) for item in fs_mntops] return MountRecord(fs_spec, fs_file, fs_vfstype, fs_mntops, -- To view, visit http://gerrit.ovirt.org/9817 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifb02976429d0b0c806b8754207d263e17dd7f59f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>

2 3

Change in vdsm[master]: style: drop trailing backslash per Zhou's request
by Dan Kenigsberg 10 Dec '12

10 Dec '12

Dan Kenigsberg has uploaded a new change for review. Change subject: style: drop trailing backslash per Zhou's request ...................................................................... style: drop trailing backslash per Zhou's request Change-Id: I829d15a74863f83c920dbb96e515b5dd6925ef79 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M vdsm/storage/blockSD.py 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/09/9809/1 diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py index c28f304..61ec996 100644 --- a/vdsm/storage/blockSD.py +++ b/vdsm/storage/blockSD.py @@ -167,9 +167,9 @@ res[vName]['parent'] = vPar if vImg not in res[vName]['imgs']: res[vName]['imgs'].insert(0, vImg) - if vPar != sd.BLANK_UUID and \ - not vName.startswith(sd.REMOVED_IMAGE_PREFIX) and \ - vImg not in res[vPar]['imgs']: + if (vPar != sd.BLANK_UUID and + not vName.startswith(sd.REMOVED_IMAGE_PREFIX) and + vImg not in res[vPar]['imgs']): res[vPar]['imgs'].append(vImg) return dict((k, sd.ImgsPar(tuple(v['imgs']), v['parent'])) -- To view, visit http://gerrit.ovirt.org/9809 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I829d15a74863f83c920dbb96e515b5dd6925ef79 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

4 7

Change in vdsm[master]: integrate zombie reaper in supervdsmServer
by lvroyce＠linux.vnet.ibm.com 10 Dec '12

10 Dec '12

Royce Lv has uploaded a new change for review. Change subject: integrate zombie reaper in supervdsmServer ...................................................................... integrate zombie reaper in supervdsmServer Integrate zombie reaper in supervdsmServer to reclaim the zombie produced by validateAccess. As python signal handlers only occur between atomic python intepreter instructions, join thread will result in SIGCHLD infinite delay.Change it to a timeout join. Change-Id: Idccc34d8761fb9997cda1184552c6c8f633afbf0 Signed-off-by: Royce Lv<lvroyce(a)linux.vnet.ibm.com> --- M vdsm/supervdsmServer.py 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/15/9315/1 diff --git a/vdsm/supervdsmServer.py b/vdsm/supervdsmServer.py index 34fefdb..33b22b6 100755 --- a/vdsm/supervdsmServer.py +++ b/vdsm/supervdsmServer.py @@ -56,6 +56,7 @@ import ksm import mkimage from storage.multipath import MPATH_CONF +import zombieReaper _UDEV_RULE_FILE_DIR = "/etc/udev/rules.d/" _UDEV_RULE_FILE_PREFIX = "99-vdsm-" @@ -199,6 +200,7 @@ res, err = pipe.recv() pipe.send("Bye") proc.terminate() + zombieReaper.autoReapPID(proc.pid) if err is not None: raise err @@ -348,6 +350,8 @@ if os.path.exists(address): os.unlink(address) + zombieReaper.registerSignalHandler() + log.debug("Setting up keep alive thread") monThread = threading.Thread(target=__pokeParent, @@ -369,7 +373,13 @@ chown(f, int(uid), METADATA_GROUP) log.debug("Started serving super vdsm object") - servThread.join() + + # Python signal handlers only occur between + # "atomic" instructions of the Python interpreter, + # periodically join server thread, + # to give chance to signal handling + while servThread.isAlive(): + servThread.join(5) finally: if os.path.exists(address): os.unlink(address) -- To view, visit http://gerrit.ovirt.org/9315 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idccc34d8761fb9997cda1184552c6c8f633afbf0 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv <lvroyce(a)linux.vnet.ibm.com>

6 24

Change in vdsm[master]: Nit fixes of supervdsmServer
by lvroyce＠linux.vnet.ibm.com 10 Dec '12

10 Dec '12

Royce Lv has uploaded a new change for review. Change subject: Nit fixes of supervdsmServer ...................................................................... Nit fixes of supervdsmServer use utils.rmFile instead of unlink raise directly will cause TypeError: exceptions must be old-style classes or derived from BaseException, not NoneType. use RuntimeError instead. Change-Id: Ie87c2332ca6342044e0c157231ea8c076ad622cc Signed-off-by: Royce Lv<lvroyce(a)linux.vnet.ibm.com> --- M vdsm/supervdsmServer.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/16/9316/1 diff --git a/vdsm/supervdsmServer.py b/vdsm/supervdsmServer.py index 34fefdb..06082ee 100755 --- a/vdsm/supervdsmServer.py +++ b/vdsm/supervdsmServer.py @@ -372,8 +372,8 @@ servThread.join() finally: if os.path.exists(address): - os.unlink(address) - raise + utils.rmFile(address) + raise RuntimeError('supervdsmServer exited') except Exception: log.error("Could not start Super Vdsm", exc_info=True) -- To view, visit http://gerrit.ovirt.org/9316 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie87c2332ca6342044e0c157231ea8c076ad622cc Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv <lvroyce(a)linux.vnet.ibm.com>

6 15

Change in vdsm[master]: pep8: fix E125
by Dan Kenigsberg 10 Dec '12

10 Dec '12

Dan Kenigsberg has uploaded a new change for review. Change subject: pep8: fix E125 ...................................................................... pep8: fix E125 Change-Id: I63312573beac2dfd2fa3062c5e6656d8b7fb50ce Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M Makefile.am M vdsm/libvirtvm.py M vdsm/storage/blockSD.py M vdsm/storage/fileSD.py M vdsm/storage/multipath.py M vdsm/storage/sd.py M vdsm/storage/task.py M vdsm/storage/volume.py M vdsm_hooks/fileinject/before_vm_start.py M vdsm_hooks/promisc/after_vm_start.py 10 files changed, 44 insertions(+), 43 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/05/9805/1 diff --git a/Makefile.am b/Makefile.am index 0da5d07..fa28ee1 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=E125,E126,E127,E128,E241 \ + --ignore=E126,E127,E128,E241 \ $(PEP8_WHITELIST) @if test -f .gitignore; then \ for i in `git ls-files \*.in`; do \ diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py index d5b5e4f..97672a6 100644 --- a/vdsm/libvirtvm.py +++ b/vdsm/libvirtvm.py @@ -401,7 +401,7 @@ fileTotal, fileProcessed, _) = self._vm._dom.jobInfo() if (smallest_dataRemaining is None or - smallest_dataRemaining > dataRemaining): + smallest_dataRemaining > dataRemaining): smallest_dataRemaining = dataRemaining lastProgressTime = time.time() elif (time.time() - lastProgressTime > @@ -477,7 +477,7 @@ try: if ('qxl' in self._vm.conf['display'] and - self._vm.conf.get('clientIp')): + self._vm.conf.get('clientIp')): SPICE_MIGRATION_HANDOVER_TIME = 120 self._vm._reviveTicket(SPICE_MIGRATION_HANDOVER_TIME) @@ -768,7 +768,7 @@ cpu.appendChild(f) if ('smpCoresPerSocket' in self.conf or - 'smpThreadsPerCore' in self.conf): + 'smpThreadsPerCore' in self.conf): topo = self.doc.createElement('topology') vcpus = int(self.conf.get('smp', '1')) cores = int(self.conf.get('smpCoresPerSocket', '1')) @@ -1194,7 +1194,7 @@ driver.setAttribute('cache', self.cache) if (self.propagateErrors == 'on' or - utils.tobool(self.propagateErrors)): + utils.tobool(self.propagateErrors)): driver.setAttribute('error_policy', 'enospace') else: driver.setAttribute('error_policy', 'stop') @@ -1341,8 +1341,8 @@ for volInfo in drive.volumeChain: if ('leasePath' not in volInfo or - 'leaseOffset' not in volInfo or - volInfo['shared']): + 'leaseOffset' not in volInfo or + volInfo['shared']): continue leaseElem = self._buildLease( @@ -1605,7 +1605,7 @@ nicDev = None for dev in self.conf['devices'][:]: if (dev['type'] == vm.NIC_DEVICES and - dev['macAddr'].lower() == nicParams['macAddr'].lower()): + dev['macAddr'].lower() == nicParams['macAddr'].lower()): self.conf['devices'].remove(dev) nicDev = dev @@ -1701,7 +1701,7 @@ diskDev = None for dev in self.conf['devices'][:]: if (dev['type'] == vm.DISK_DEVICES and - dev['path'] == diskParams['path']): + dev['path'] == diskParams['path']): self.conf['devices'].remove(dev) diskDev = dev break @@ -1802,7 +1802,7 @@ if not hasattr(device, "domainID"): continue if (device.domainID, device.imageID, - device.volumeID) == tgetDrv: + device.volumeID) == tgetDrv: return device elif "GUID" in drive: @@ -1837,7 +1837,7 @@ # Updating the VM configuration for device in self.conf["devices"][:]: if (device['type'] == vm.DISK_DEVICES and - device.get("name") == drive["name"]): + device.get("name") == drive["name"]): device.update(drive) break else: @@ -2428,7 +2428,7 @@ # delete the payload devices for drive in self._devices[vm.DISK_DEVICES]: if (hasattr(drive, 'specParams') and - 'vmPayload' in drive.specParams): + 'vmPayload' in drive.specParams): supervdsm.getProxy().removeFs(drive.path) with self._releaseLock: @@ -2450,7 +2450,7 @@ libvirt.VIR_DOMAIN_DESTROY_GRACEFUL) except libvirt.libvirtError, e: if (e.get_error_code() == - libvirt.VIR_ERR_OPERATION_FAILED): + libvirt.VIR_ERR_OPERATION_FAILED): self.log.warn("Failed to destroy VM '%s' " "gracefully", self.conf['vmId']) time.sleep(30) @@ -2579,7 +2579,7 @@ for x in devsxml.childNodes: # Ignore empty nodes and devices without address if (x.nodeName == '#text' or - not x.getElementsByTagName('address')): + not x.getElementsByTagName('address')): continue alias = x.getElementsByTagName('alias')[0].getAttribute('name') @@ -2618,8 +2618,8 @@ # are compared. Currently relevant for USB controllers. for ctrl in self._devices[vm.CONTROLLER_DEVICES]: if ((ctrl.device == device) and - (not hasattr(ctrl, 'index') or ctrl.index == index) and - (not hasattr(ctrl, 'model') or ctrl.model == model)): + (not hasattr(ctrl, 'index') or ctrl.index == index) and + (not hasattr(ctrl, 'model') or ctrl.model == model)): ctrl.alias = alias ctrl.address = address # Update vm's conf with address for known controller devices @@ -2628,9 +2628,9 @@ knownDev = False for dev in self.conf['devices']: if ((dev['type'] == vm.CONTROLLER_DEVICES) and - (dev['device'] == device) and - (not 'index' in dev or dev['index'] == index) and - (not 'model' in dev or dev['model'] == model)): + (dev['device'] == device) and + (not 'index' in dev or dev['index'] == index) and + (not 'model' in dev or dev['model'] == model)): dev['address'] = address dev['alias'] = alias knownDev = True @@ -2663,7 +2663,7 @@ for dev in self.conf['devices']: if ((dev['type'] == vm.BALLOON_DEVICES) and - not dev.get('address')): + not dev.get('address')): dev['address'] = address dev['alias'] = alias @@ -2688,7 +2688,7 @@ for dev in self.conf['devices']: if ((dev['type'] == vm.WATCHDOG_DEVICES) and - (not dev.get('address') or not dev.get('alias'))): + (not dev.get('address') or not dev.get('alias'))): dev['address'] = address dev['alias'] = alias @@ -2716,7 +2716,7 @@ # Update vm's conf with address for dev in self.conf['devices']: if ((dev['type'] == vm.VIDEO_DEVICES) and - (not dev.get('address') or not dev.get('alias'))): + (not dev.get('address') or not dev.get('alias'))): dev['address'] = address dev['alias'] = alias break @@ -2745,7 +2745,7 @@ # Update vm's conf with address for dev in self.conf['devices']: if ((dev['type'] == vm.SOUND_DEVICES) and - (not dev.get('address') or not dev.get('alias'))): + (not dev.get('address') or not dev.get('alias'))): dev['address'] = address dev['alias'] = alias break @@ -2863,7 +2863,7 @@ knownDev = False for dev in self.conf['devices']: if (dev['type'] == vm.NIC_DEVICES and - dev['macAddr'].lower() == mac.lower()): + dev['macAddr'].lower() == mac.lower()): dev['address'] = address dev['alias'] = alias dev['name'] = name @@ -2893,10 +2893,10 @@ eventToString(event), detail, opaque) if event == libvirt.VIR_DOMAIN_EVENT_STOPPED: if (detail == libvirt.VIR_DOMAIN_EVENT_STOPPED_MIGRATED and - self.lastStatus == 'Migration Source'): + self.lastStatus == 'Migration Source'): hooks.after_vm_migrate_source(self._lastXMLDesc, self.conf) elif (detail == libvirt.VIR_DOMAIN_EVENT_STOPPED_SAVED and - self.lastStatus == 'Saving State'): + self.lastStatus == 'Saving State'): hooks.after_vm_hibernate(self._lastXMLDesc, self.conf) else: if detail == libvirt.VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN: @@ -2959,7 +2959,7 @@ if self.childNodes: # added special handling of Text nodes if (len(self.childNodes) == 1 and - isinstance(self.childNodes[0], xml.dom.minidom.Text)): + isinstance(self.childNodes[0], xml.dom.minidom.Text)): writer.write(">") self.childNodes[0].writexml(writer) writer.write("</%s>%s" % (self.tagName, newl)) diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py index b021183..c28f304 100644 --- a/vdsm/storage/blockSD.py +++ b/vdsm/storage/blockSD.py @@ -168,8 +168,8 @@ if vImg not in res[vName]['imgs']: res[vName]['imgs'].insert(0, vImg) if vPar != sd.BLANK_UUID and \ - not vName.startswith(sd.REMOVED_IMAGE_PREFIX) \ - and vImg not in res[vPar]['imgs']: + not vName.startswith(sd.REMOVED_IMAGE_PREFIX) and \ + vImg not in res[vPar]['imgs']: res[vPar]['imgs'].append(vImg) return dict((k, sd.ImgsPar(tuple(v['imgs']), v['parent'])) @@ -766,7 +766,7 @@ pestart = int(pv["pestart"]) pecount = int(pv["pecount"]) if (os.path.basename(dev) == pv["guid"] and - int(ext) in range(pestart, pestart + pecount)): + int(ext) in range(pestart, pestart + pecount)): offs = int(ext) + int(pv["mapoffset"]) if offs < SD_METADATA_SIZE / sd.METASIZE: diff --git a/vdsm/storage/fileSD.py b/vdsm/storage/fileSD.py index fde466f..8e00245 100644 --- a/vdsm/storage/fileSD.py +++ b/vdsm/storage/fileSD.py @@ -529,7 +529,7 @@ for metaFile in metaFiles: if (os.path.basename(os.path.dirname(metaFile)) != - sd.MASTER_FS_DIR): + sd.MASTER_FS_DIR): sdUUID = os.path.basename(os.path.dirname(metaFile)) return (sdUUID, os.path.dirname(metaFile)) diff --git a/vdsm/storage/multipath.py b/vdsm/storage/multipath.py index adaa0c0..741f1a1 100644 --- a/vdsm/storage/multipath.py +++ b/vdsm/storage/multipath.py @@ -275,7 +275,7 @@ slave, exc_info=True) if (not devInfo["logicalblocksize"] or - not devInfo["physicalblocksize"]): + not devInfo["physicalblocksize"]): try: logBlkSize, phyBlkSize = getDeviceBlockSizes(slave) devInfo["logicalblocksize"] = str(logBlkSize) diff --git a/vdsm/storage/sd.py b/vdsm/storage/sd.py index 2d53a70..1b11017 100644 --- a/vdsm/storage/sd.py +++ b/vdsm/storage/sd.py @@ -167,7 +167,7 @@ def packLeaseParams(lockRenewalIntervalSec, leaseTimeSec, ioOpTimeoutSec, leaseRetries): if (lockRenewalIntervalSec and leaseTimeSec and - ioOpTimeoutSec and leaseRetries): + ioOpTimeoutSec and leaseRetries): return {DMDK_LEASE_RETRIES: leaseRetries, DMDK_LEASE_TIME_SEC: leaseTimeSec, DMDK_LOCK_RENEWAL_INTERVAL_SEC: lockRenewalIntervalSec, diff --git a/vdsm/storage/task.py b/vdsm/storage/task.py index a596494..716c1c0 100644 --- a/vdsm/storage/task.py +++ b/vdsm/storage/task.py @@ -484,7 +484,7 @@ if not self.state.isDone(): taskDir = None if (self.cleanPolicy == TaskCleanType.auto and - self.store is not None): + self.store is not None): taskDir = os.path.join(self.store, self.id) threading.Thread(target=finalize, args=(self.log, self.resOwner, taskDir)).start() @@ -900,7 +900,7 @@ try: try: if (not self.state.canAbort() and - (force and not self.state.canAbortRecover())): + (force and not self.state.canAbortRecover())): self.log.warning("Task._doAbort %s: ignoring - " "at state %s", self, self.state) return @@ -1072,7 +1072,7 @@ raise se.TaskPersistError("%s: cannot access/create taskdir" " %s: %s" % (self, taskDir, e)) if (self.persistPolicy == TaskPersistType.auto and - self.state != State.init): + self.state != State.init): self.persist() def setRecoveryPolicy(self, clean): diff --git a/vdsm/storage/volume.py b/vdsm/storage/volume.py index 3f82e08..cde612a 100644 --- a/vdsm/storage/volume.py +++ b/vdsm/storage/volume.py @@ -718,7 +718,7 @@ raise se.SharedVolumeNonWritable(self) if (not chainrw and rw and self.isInternal() and setrw and - not self.recheckIfLeaf()): + not self.recheckIfLeaf()): raise se.InternalVolumeNonWritable(self) self.llPrepare(rw=rw, setrw=setrw) @@ -830,9 +830,10 @@ """ vols = self.getImageVolumes(self.repoPath, self.sdUUID, self.imgUUID) children = [] + dom = sdCache.produce(self.sdUUID) for v in vols: - if (sdCache.produce(self.sdUUID). - produceVolume(self.imgUUID, v).getParent() == self.volUUID): + if (dom.produceVolume(self.imgUUID, v).getParent() == + self.volUUID): children.append(v) return children @@ -1008,7 +1009,7 @@ (src, src_fmt, dst, dst_fmt)) if (src_fmt == "raw" and dst_fmt == "raw" and - dstvolType == PREALLOCATED_VOL): + dstvolType == PREALLOCATED_VOL): (rc, out, err) = misc.ddWatchCopy( src=src, dst=dst, stop=stop, size=size, diff --git a/vdsm_hooks/fileinject/before_vm_start.py b/vdsm_hooks/fileinject/before_vm_start.py index 7a2dd1f..0f571e8 100755 --- a/vdsm_hooks/fileinject/before_vm_start.py +++ b/vdsm_hooks/fileinject/before_vm_start.py @@ -79,14 +79,14 @@ rawcount = 0 for disk in disks: if (disk.hasAttribute('device') and - disk.attributes['device'].value == 'disk'): + disk.attributes['device'].value == 'disk'): sources = disk.getElementsByTagName('source') if len(sources) > 0: source = sources[0] drivers = disk.getElementsByTagName('driver') if (len(drivers) > 0 and drivers[0].hasAttribute('type') and - drivers[0].attributes['type'].value == 'qcow2'): + drivers[0].attributes['type'].value == 'qcow2'): # we can only inject to 'raw' file format continue diff --git a/vdsm_hooks/promisc/after_vm_start.py b/vdsm_hooks/promisc/after_vm_start.py index 1310b62..30f04eb 100755 --- a/vdsm_hooks/promisc/after_vm_start.py +++ b/vdsm_hooks/promisc/after_vm_start.py @@ -110,7 +110,7 @@ for iface in interfaces: if (iface.hasAttribute('type') and - iface.attributes['type'].value == 'bridge'): + iface.attributes['type'].value == 'bridge'): ifaceName = getIfaceName(iface) if mode == MODE_MIRROR: -- To view, visit http://gerrit.ovirt.org/9805 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I63312573beac2dfd2fa3062c5e6656d8b7fb50ce Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

3 6

Change in vdsm[master]: pep8: fix E124
by Dan Kenigsberg 10 Dec '12

10 Dec '12

Dan Kenigsberg has uploaded a new change for review. Change subject: pep8: fix E124 ...................................................................... pep8: fix E124 Change-Id: I8f9cf34866a258b1b3c3e6941ea743b8fad08289 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M Makefile.am M tests/configNetworkTests.py M vdsm/define.py M vdsm/doc/source/conf.py M vdsm/netinfo.py M vdsm/storage/storage_mailbox.py M vdsm_cli/vdsClient.py 7 files changed, 102 insertions(+), 102 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/04/9804/1 diff --git a/Makefile.am b/Makefile.am index 434aa41..0da5d07 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=E124,E125,E126,E127,E128,E241 \ + --ignore=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 0813ebc..5f7cce4 100644 --- a/tests/configNetworkTests.py +++ b/tests/configNetworkTests.py @@ -177,7 +177,7 @@ def _fakeNetworks(): return {'fakebridgenet': {'iface': 'fakebridge', 'bridged': True}, 'fakenet': {'iface': 'fakeint', 'bridged': False}, - } + } def _addNetworkWithExc(self, parameters, errCode): with self.assertRaises(configNetwork.ConfigNetworkError) as cneContext: @@ -319,7 +319,7 @@ ('ifcfg-eth1', None, True), ('ifcfg-eth2', None, False), ('ifcfg-eth3', self.INITIAL_CONTENT, False), - )) + )) def __del__(self): shutil.rmtree(self._tempdir) diff --git a/vdsm/define.py b/vdsm/define.py index 11a6ef6..61bcc64 100644 --- a/vdsm/define.py +++ b/vdsm/define.py @@ -128,7 +128,7 @@ {'code': 99, 'message': 'Recovering from crash or Initializing'}}, - } + } doneCode = {'code': 0, 'message': 'Done'} Kbytes = 1024 diff --git a/vdsm/doc/source/conf.py b/vdsm/doc/source/conf.py index 4024217..4144135 100644 --- a/vdsm/doc/source/conf.py +++ b/vdsm/doc/source/conf.py @@ -173,7 +173,7 @@ # (source start file, target name, title, author, documentclass [howto/manual]). latex_documents = [('index', 'Vdsm.tex', u'VDSM Documentation', u'Red Hat', 'manual'), -] + ] # The name of an image file (relative to this directory) to place at the top of # the title page. diff --git a/vdsm/netinfo.py b/vdsm/netinfo.py index 9d8abf9..2b088b9 100644 --- a/vdsm/netinfo.py +++ b/vdsm/netinfo.py @@ -340,16 +340,16 @@ 'netmask': getnetmask(bridge), 'mtu': getMtu(bridge), 'cfg': getIfaceCfg(bridge), - }) + }) for bridge in bridges()]) d['nics'] = dict([(nic, {'speed': speed(nic), - 'addr': getaddr(nic), - 'netmask': getnetmask(nic), - 'hwaddr': gethwaddr(nic), - 'mtu': getMtu(nic), - 'cfg': getIfaceCfg(nic), - }) + 'addr': getaddr(nic), + 'netmask': getnetmask(nic), + 'hwaddr': gethwaddr(nic), + 'mtu': getMtu(nic), + 'cfg': getIfaceCfg(nic), + }) for nic in nics()]) paddr = permAddr() for nic, nd in d['nics'].iteritems(): @@ -363,11 +363,11 @@ 'mtu': getMtu(bond)}) for bond in bondings()]) d['vlans'] = dict([(vlan, {'iface': vlan.split('.')[0], - 'addr': getaddr(vlan), - 'netmask': getnetmask(vlan), - 'mtu': getMtu(vlan), - 'cfg': getIfaceCfg(vlan), - }) + 'addr': getaddr(vlan), + 'netmask': getnetmask(vlan), + 'mtu': getMtu(vlan), + 'cfg': getIfaceCfg(vlan), + }) for vlan in vlans()]) return d diff --git a/vdsm/storage/storage_mailbox.py b/vdsm/storage/storage_mailbox.py index 434977c..3a3a213 100644 --- a/vdsm/storage/storage_mailbox.py +++ b/vdsm/storage/storage_mailbox.py @@ -217,12 +217,12 @@ # TODO: add support for multiple paths (multiple mailboxes) self._spmStorageDir = config.get('irs', 'repository') self._inCmd = [constants.EXT_DD, - 'if=' + str(inbox), - 'iflag=direct,fullblock', - 'bs=' + str(BLOCK_SIZE), - 'count=' + str(BLOCKS_PER_MAILBOX), - 'skip=' + str(self._hostID * BLOCKS_PER_MAILBOX) - ] + 'if=' + str(inbox), + 'iflag=direct,fullblock', + 'bs=' + str(BLOCK_SIZE), + 'count=' + str(BLOCKS_PER_MAILBOX), + 'skip=' + str(self._hostID * BLOCKS_PER_MAILBOX) + ] self._outCmd = [constants.EXT_DD, 'of=' + str(outbox), 'iflag=fullblock', @@ -476,10 +476,10 @@ self._outgoingMail = self._outMailLen * "\0" self._incomingMail = self._outgoingMail self._inCmd = ['dd', - 'if=' + str(self._inbox), - 'iflag=direct,fullblock', - 'count=1' - ] + 'if=' + str(self._inbox), + 'iflag=direct,fullblock', + 'count=1' + ] self._outCmd = ['dd', 'of=' + str(self._outbox), 'oflag=direct', diff --git a/vdsm_cli/vdsClient.py b/vdsm_cli/vdsClient.py index 2260300..080da7e 100644 --- a/vdsm_cli/vdsClient.py +++ b/vdsm_cli/vdsClient.py @@ -1819,25 +1819,25 @@ 'all bootable devices', 'o shared: True|False', 'o optional: True|False' - )), + )), 'changeCD': (serv.do_changeCD, ('<vmId> <fileName|drivespec>', 'Changes the iso image of the cdrom' - )), + )), 'changeFloppy': (serv.do_changeFloppy, ('<vmId> <fileName|drivespec>', 'Changes the image of the floppy drive' - )), + )), 'destroy': (serv.do_destroy, ('<vmId>', 'Stops the emulation and destroys the virtual machine.' ' This is not a shutdown.' - )), + )), 'shutdown': (serv.do_shutdown, ('<vmId> <timeout> <message>', 'Stops the emulation and graceful shutdown the virtual' ' machine.' - )), + )), 'list': (serv.do_list, ('[view] [vms:vmId1,vmId2]', 'Lists all available machines on the specified ' @@ -1850,20 +1850,20 @@ ' "table" table output with the fields: vmId, ' 'vmName, Status and IP.', ' "ids" all vmIds.' - )), + )), 'pause': (serv.do_pause, ('<vmId>', 'Pauses the execution of the virtual machine without ' 'termination' - )), + )), 'continue': (serv.do_continue, ('<vmId>', 'Continues execution after of a paused machine' - )), + )), 'reset': (serv.do_reset, ('<vmId>', 'Sends reset signal to the vm' - )), + )), 'setVmTicket': (serv.do_setVmTicket, ('<vmId> <password> <sec> [disconnect|keep|fail], ' '[params={}]', @@ -1873,37 +1873,37 @@ 'currently-connected client.', 'Optional additional parameters in dictionary format,' ' name:value,name:value' - )), + )), 'migrate': (serv.do_migrate, ('vmId=<id> method=<offline|online> src=<host:[port]> ' 'dst=<host:[port]>', 'Migrate a desktop from src machine to dst host using ' 'the specified ports' - )), + )), 'migrateStatus': (serv.do_mStat, ('<vmId>', 'Check the progress of current outgoing migration' - )), + )), 'migrateCancel': (serv.do_mCancel, ('<vmId>', '(not implemented) cancel machine migration' - )), + )), 'sendkeys': (serv.do_sendkeys, ('<vmId> <key1> ...... <keyN>', 'Send the key sequence to the vm' - )), + )), 'getVdsCapabilities': (serv.do_getCap, ('', 'Get Capabilities info of the VDS' - )), + )), 'getVdsCaps': (serv.do_getCap, ('', 'Get Capabilities info of the VDS' - )), + )), 'getVdsStats': (serv.do_getVdsStats, ('', 'Get Statistics info on the VDS' - )), + )), 'getVmStats': (serv.do_getVmStats, ('<vmId>', 'Get Statistics info on the VM' @@ -2125,7 +2125,7 @@ ('<sdUUID> <spUUID> <imgUUID> <volUUID> <srcPath> ' '<size>', 'Upload volume file into existing volume' - )), + )), 'getVolumePath': (serv.getVolumePath, ('<sdUUID> <spUUID> <imgUUID> <volume uuid>', 'Returns the path to the requested uuid' @@ -2156,110 +2156,110 @@ ('<sdUUID> <spUUID> <imgUUID> <Disk Image uuid>', 'Returns the parent of the volume. Error if no parent' ' exists' - )), + )), 'getVolumesList': (serv.getVolumesList, ('<sdUUID> <spUUID> [imgUUID]', 'Returns list of volumes of imgUUID or sdUUID if ' 'imgUUID absent' - )), + )), 'getVolumeSize': (serv.getVolumeSize, ('<sdUUID> <spUUID> <imgUUID> <volUUID>', 'Returns the apparent size and the true size of the ' 'volume (in bytes)' - )), + )), 'getFileList': (serv.getFileList, ('<sdUUID> [pattern]', 'Returns files list from ISO domain' - )), + )), 'getIsoList': (serv.getIsoList, ('<spUUID>', 'Returns list of all .iso images in ISO domain' - )), + )), 'getFloppyList': (serv.getFloppyList, ('<spUUID>', 'Returns list of all .vfd images in ISO domain' - )), + )), 'getImagesList': (serv.getImagesList, ('<sdUUID>', 'Get list of all images of specific domain' - )), + )), 'getImageDomainsList': (serv.getImageDomainsList, ('<spUUID> <imgUUID> [datadomain=True]', 'Get list of all data domains in the pool that ' 'contains imgUUID' - )), + )), 'getConnectedStoragePoolsList': (serv.getConnectedStoragePoolsList, ('', 'Get storage pools list' - )), + )), 'getTaskInfo': (serv.getTaskInfo, ('<TaskID>', - 'get async task info' - )), + 'get async task info' + )), 'getAllTasksInfo': (serv.getAllTasksInfo, ('', - 'get info of all async tasks' - )), + 'get info of all async tasks' + )), 'getTaskStatus': (serv.getTaskStatus, ('<TaskID>', - 'get task status' - )), + 'get task status' + )), 'getAllTasksStatuses': (serv.getAllTasksStatuses, ('', - 'list statuses of all async tasks' - )), + 'list statuses of all async tasks' + )), 'getAllTasks': (serv.getAllTasks, ('[tags=\'\']', - 'get status and information for all async tasks' - )), + 'get status and information for all async tasks' + )), 'stopTask': (serv.stopTask, ('<TaskID>', - 'stop async task' - )), + 'stop async task' + )), 'clearTask': (serv.clearTask, ('<TaskID>', - 'clear async task' - )), + 'clear async task' + )), 'revertTask': (serv.revertTask, ('<TaskID>', - 'revert async task' - )), + 'revert async task' + )), 'prepareForShutdown': (serv.prepareForShutdown, ('', '' - )), + )), 'setLogLevel': (serv.do_setLogLevel, ('<level> [logName][,logName]...', 'set log verbosity' - ' level (10=DEBUG, 50=CRITICAL' - )), + ' level (10=DEBUG, 50=CRITICAL' + )), 'setMOMPolicy': (serv.do_setMOMPolicy, ('<policyfile>', 'set MOM policy')), 'deleteImage': (serv.deleteImage, ('<sdUUID> <spUUID> <imgUUID> [<postZero>] [<force>]', - 'Delete Image folder with all volumes.', - )), + 'Delete Image folder with all volumes.', + )), 'moveImage': (serv.moveImage, ('<spUUID> <srcDomUUID> <dstDomUUID> <imgUUID> <vmUUID>' - ' <op = COPY_OP/MOVE_OP> [<postZero>] [ <force>]', - 'Move/Copy image between storage domains within same ' - 'storage pool' - )), + ' <op = COPY_OP/MOVE_OP> [<postZero>] [ <force>]', + 'Move/Copy image between storage domains within same ' + 'storage pool' + )), 'cloneImageStructure': (serv.cloneImageStructure, ('<spUUID> <sdUUID> <imgUUID> <dstSdUUID>', - 'Clone an image structure from a source domain to a ' - 'destination domain within the same pool.' - )), + 'Clone an image structure from a source domain to a ' + 'destination domain within the same pool.' + )), 'syncImageData': (serv.syncImageData, ('<spUUID> <sdUUID> <imgUUID> <dstSdUUID> <syncType>', - 'Synchronize image data between storage domains within ' - 'same pool.' - )), + 'Synchronize image data between storage domains ' + 'within same pool.' + )), 'moveMultiImage': (serv.moveMultiImage, ('<spUUID> <srcDomUUID> <dstDomUUID> ' '<imgList>({imgUUID=postzero,imgUUID=postzero,...})' ' <vmUUID> [<force>]', - 'Move multiple images between storage domains within ' - 'same storage pool' - )), + 'Move multiple images between storage domains within ' + 'same storage pool' + )), 'copyImage': (serv.copyImage, ('<sdUUID> <spUUID> <vmUUID> <srcImgUUID> <srcVolUUID> ' '<dstImgUUID> <dstVolUUID> <dstDescr> <dstSdUUID> ' @@ -2268,7 +2268,7 @@ 'Create new template/volume from VM.', 'Do it by collapse and copy the whole chain ' '(baseVolUUID->srcVolUUID)' - )), + )), 'mergeSnapshots': (serv.mergeSnapshots, ('<sdUUID> <spUUID> <vmUUID> <imgUUID> <Ancestor Image ' 'uuid> <Successor Image uuid> [<postZero>]', @@ -2283,7 +2283,7 @@ 'desktopLogoff': (serv.desktopLogoff, ('<vmId> <force>', 'Lock user session. force should be set to true/false' - )), + )), 'desktopLock': (serv.desktopLock, ('<vmId>', 'Logoff current user' @@ -2317,21 +2317,21 @@ ('bridge=<bridge> [vlan=<number>] [bond=<bond>] ' 'nics=nic[,nic]', 'Add a new network to this vds.' - )), + )), 'delNetwork': (serv.do_delNetwork, ('bridge=<bridge> [vlan=<number>] [bond=<bond>] ' 'nics=nic[,nic]', 'Remove a network (and parts thereof) from this vds.' - )), + )), 'editNetwork': (serv.do_editNetwork, ('oldBridge=<bridge> newBridge=<bridge> [vlan=<number>]' ' [bond=<bond>] nics=nic[,nic]', 'Replace a network with a new one.' - )), + )), 'setSafeNetworkConfig': (serv.do_setSafeNetworkConfig, ('', 'declare current network configuration as "safe"' - )), + )), 'fenceNode': (serv.do_fenceNode, ('<addr> <port> <agent> <user> <passwd> <action> ' '[<secure> [<options>]] \n\t<action> is one of ' @@ -2339,29 +2339,29 @@ '(rsa, ilo, ipmilan, drac5, etc)\n\t<secure> ' '(true|false) may be passed to some agents', 'send a fencing command to a remote node' - )), + )), 'repoStats': (serv.repoStats, ('', "Get the the health status of the active domains" - )), + )), 'snapshot': (serv.snapshot, ('<vmId> <sdUUID> <imgUUID> <baseVolUUID> <volUUID>', - "Take a live snapshot" - )), + "Take a live snapshot" + )), 'setBalloonTarget': (serv.setBalloonTarget, ('<vmId> <target>', - "Set VM's balloon target" - )), + "Set VM's balloon target" + )), 'diskReplicateStart': (serv.diskReplicateStart, ('<vmId> <spUUID> <sdUUID> <imgUUID> <volUUID> ' '<dstSdUUID>', "Start live replication to the destination domain" - )), + )), 'diskReplicateFinish': (serv.diskReplicateFinish, ('<vmId> <spUUID> <sdUUID> <imgUUID> <volUUID> ' '<dstSdUUID>', "Start live replication to the destination domain" - )), + )), } if _glusterEnabled: commands.update(ge.getGlusterCmdDict(serv)) -- To view, visit http://gerrit.ovirt.org/9804 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8f9cf34866a258b1b3c3e6941ea743b8fad08289 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

3 6

Change in vdsm[master]: pep8 fixes for vdsm file
by ybronhei＠redhat.com 09 Dec '12

09 Dec '12

Yaniv Bronhaim has uploaded a new change for review. Change subject: pep8 fixes for vdsm file ...................................................................... pep8 fixes for vdsm file Change-Id: I24e861a6accc8190875f5e39f20f7deee4abd89b Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com> --- M vdsm/vdsm 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/98/9698/1 diff --git a/vdsm/vdsm b/vdsm/vdsm index 035ea5d..f749aa7 100755 --- a/vdsm/vdsm +++ b/vdsm/vdsm @@ -46,7 +46,7 @@ def sigusr1Handler(signum, frame): if cif and cif.irs: cif.irs.spmStop( - cif.irs.getConnectedStoragePoolsList()['poollist'][0]) + cif.irs.getConnectedStoragePoolsList()['poollist'][0]) signal.signal(signal.SIGTERM, sigtermHandler) signal.signal(signal.SIGUSR1, sigusr1Handler) @@ -84,8 +84,8 @@ sysname, nodename, release, version, machine = os.uname() log.info('I am the actual vdsm %s-%s %s (%s)', - dsaversion.software_version, dsaversion.software_revision, - nodename, release) + dsaversion.software_version, dsaversion.software_revision, + nodename, release) serve_clients(log) except: log.error("Exception raised", exc_info=True) @@ -119,8 +119,8 @@ ) group = grp.getgrnam(constants.VDSM_GROUP) assert ((constants.VDSM_USER in group.gr_mem - or pwd.getpwnam(constants.VDSM_USER).pw_gid == group.gr_gid), - "VDSM failed to start: vdsm user is not in KVM group") + or pwd.getpwnam(constants.VDSM_USER).pw_gid == group.gr_gid), + "VDSM failed to start: vdsm user is not in KVM group") if __name__ == '__main__': __assertVdsmUser() -- To view, visit http://gerrit.ovirt.org/9698 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I24e861a6accc8190875f5e39f20f7deee4abd89b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>

4 7

← Newer
1
...
33
34
35
36
37
38
39
40
41
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches December 2012