Mike Kolesnik has uploaded a new change for review. Change subject: engine: Simplify canDoAction ......................................................................
engine: Simplify canDoAction Simplify canDoAction to fast-fail so that the code becomes easier to read (less nested conditionals). Change-Id: I7fa092ce8f568b11ae14ac1c943107a10cffa068 Bug-Url: https://bugzilla.redhat.com/907155 Signed-off-by: Mike Kolesnik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/ActivateDeactivateVmNicCommand.java 1 file changed, 17 insertions(+), 21 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/96/11696/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/ActivateDeactivateVmNicCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/ActivateDeactivateVmNicCommand.java index e9f35fd..b5f5182 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/ActivateDeactivateVmNicCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/ActivateDeactivateVmNicCommand.java @@ -39,33 +39,29 @@ @Override protected boolean canDoAction() { - boolean returnValue = true; - - if (activateDeactivateVmNicAllowed(getVm().getStatus())) { - // HotPlug in the host needs to be called only if the Vm is UP - if (hotPlugVmNicRequired(getVm().getStatus())) { - setVdsId(getVm().getRunOnVds().getValue()); - returnValue = canPerformHotPlug(); - if (returnValue && (getNetworkName() != null && !networkAttachedToVds(getNetworkName(), getVdsId()))) { - addCanDoActionMessage(VdcBllMessages.ACTIVATE_DEACTIVATE_NETWORK_NOT_IN_VDS); - returnValue = false; - } - } - } else { + if (!activateDeactivateVmNicAllowed(getVm().getStatus())) { addCanDoActionMessage(VdcBllMessages.ACTIVATE_DEACTIVATE_NIC_VM_STATUS_ILLEGAL); - returnValue = false; + return false; } - if (returnValue) { - vmDevice = getVmDeviceDao().get(new VmDeviceId(getParameters().getNicId(), getParameters().getVmId())); - vmNetworkInterface = getVmNetworkInterfaceDao().get(getParameters().getNicId()); - if (vmDevice == null || vmNetworkInterface == null) { - returnValue = false; - addCanDoActionMessage(VdcBllMessages.VM_INTERFACE_NOT_EXIST); + // HotPlug in the host needs to be called only if the Vm is UP + if (hotPlugVmNicRequired(getVm().getStatus())) { + setVdsId(getVm().getRunOnVds().getValue()); + if (canPerformHotPlug() + && (getNetworkName() != null && !networkAttachedToVds(getNetworkName(), getVdsId()))) { + addCanDoActionMessage(VdcBllMessages.ACTIVATE_DEACTIVATE_NETWORK_NOT_IN_VDS); + return false; } } - return returnValue; + vmDevice = getVmDeviceDao().get(new VmDeviceId(getParameters().getNicId(), getParameters().getVmId())); + vmNetworkInterface = getVmNetworkInterfaceDao().get(getParameters().getNicId()); + if (vmDevice == null || vmNetworkInterface == null) { + addCanDoActionMessage(VdcBllMessages.VM_INTERFACE_NOT_EXIST); + return false; + } + + return true; } private String getNetworkName() { -- To view, visit http://gerrit.ovirt.org/11696 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7fa092ce8f568b11ae14ac1c943107a10cffa068 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Mike Kolesnik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
