Francesco Romani has uploaded a new change for review.
Change subject: janitorial: vm: remove _reportError ......................................................................
janitorial: vm: remove _reportError
Vm._reportError was an early attempt to build what we have now with response.error().
With the new code in place there is no more reason to use it, so this patch removes it.
Change-Id: Ie23167c0289bdb0326dcfe48903cd1bae905e9b5 Signed-off-by: Francesco Romani fromani@redhat.com --- M vdsm/virt/vm.py 1 file changed, 15 insertions(+), 27 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/69/38269/1
diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index cd392c7..4be63ce 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -42,7 +42,7 @@ from vdsm import utils from vdsm.compat import pickle from vdsm.config import config -from vdsm.define import ERROR, NORMAL, doneCode, errCode +from vdsm.define import ERROR, NORMAL, doneCode from vdsm.netinfo import DUMMY_BRIDGE from storage import outOfProcess as oop from storage import sd @@ -2650,15 +2650,15 @@
if not params: self.log.error("updateVmPolicy got an empty policy.") - return self._reportError(key='MissParam', - msg="updateVmPolicy got an empty policy.") + return response.error('MissParam', + 'updateVmPolicy got an empty policy.')
# # Get the current QoS block metadata_modified = False qos = self._getVmPolicy() if qos is None: - return self._reportError(key='updateVmPolicyErr') + return response.error('updateVmPolicyErr')
# # Process provided properties, remove property after it is processed @@ -2712,8 +2712,7 @@ if e.get_error_code() == libvirt.VIR_ERR_NO_DOMAIN: return response.error('noVM') else: - return self._reportError(key='updateVmPolicyErr', - msg=e.message) + return response.error('updateVmPolicyErr', e.message)
return {'status': doneCode}
@@ -2771,9 +2770,9 @@ found_device = self._findDeviceByNameOrPath(device_name, device_path) if found_device is None: - return self._reportError( - key='updateIoTuneErr', - msg="Device {} not found".format(device_name)) + return response.error( + 'updateIoTuneErr', + "Device {} not found".format(device_name))
# Merge the update with current values dom = found_device.getXML() @@ -2799,8 +2798,7 @@ if e.get_error_code() == libvirt.VIR_ERR_NO_DOMAIN: return response.error('noVM') else: - return self._reportError(key='updateIoTuneErr', - msg=e.message) + return response.error('updateIoTuneErr', e.message)
# Update both the ioTune arguments and device xml DOM # so we are still up-to-date @@ -3956,7 +3954,7 @@ def setBalloonTarget(self, target):
if self._dom is None: - return self._reportError(key='balloonErr') + return response.error('balloonErr') try: target = int(target) self._dom.setMemory(target) @@ -3980,8 +3978,8 @@ try: self._dom.setSchedulerParameters({'vcpu_quota': int(quota)}) except ValueError: - return self._reportError(key='cpuTuneErr', - msg='an integer is required for period') + return response.error('cpuTuneErr', + 'an integer is required for period') except libvirt.libvirtError as e: return self._reportException(key='cpuTuneErr', msg=e.message) return {'status': doneCode} @@ -3990,21 +3988,11 @@ try: self._dom.setSchedulerParameters({'vcpu_period': int(period)}) except ValueError: - return self._reportError(key='cpuTuneErr', - msg='an integer is required for period') + return response.error('cpuTuneErr', + 'an integer is required for period') except libvirt.libvirtError as e: return self._reportException(key='cpuTuneErr', msg=e.message) return {'status': doneCode} - - def _reportError(self, key, msg=None): - """ - Produce an error status. - """ - if msg is None: - error = errCode[key] - else: - error = response.error(key, msg) - return error
def _reportException(self, key, msg=None): """ @@ -4012,7 +4000,7 @@ This method should be called only within exception-handling context. """ self.log.exception("Operation failed") - return self._reportError(key, msg) + return response.error(key, msg)
def _getUnderlyingDeviceAddress(self, devXml): """