Tomas Jelinek has uploaded a new change for review. Change subject: core: enable editing the watchdog for blank template ......................................................................
core: enable editing the watchdog for blank template Since the blank template is editable, also the watchdog has to be editable on it Feature Page: www.ovirt.org/Features/Blank_to_Defaults Bug-Url: https://bugzilla.redhat.com/1130174 Change-Id: Icdaa438ff674dab599d04c94e97724e8c51700f9 Signed-off-by: Tomas Jelinek <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddWatchdogCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateWatchdogCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/WatchdogParameters.java 5 files changed, 21 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/03/37903/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddWatchdogCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddWatchdogCommand.java index ba90ccb..7d89c3b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddWatchdogCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddWatchdogCommand.java @@ -58,7 +58,7 @@ return failCanDoAction(VdcBllMessages.WATCHDOG_ALREADY_EXISTS); } - if (!getParameters().isInstanceType() && !validate(validateModelCompatibleWithOs())) { + if (!getParameters().isClusterIndependent() && !validate(validateModelCompatibleWithOs())) { return false; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java index 01e0683..a775f11 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java @@ -379,6 +379,10 @@ getVdsGroup().getCompatibilityVersion())); } + private boolean isInstanceType() { + return getVmTemplate().getTemplateType() == VmEntityType.INSTANCE_TYPE; + } + private VmPropertiesUtils getVmPropertiesUtils() { return VmPropertiesUtils.getInstance(); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateWatchdogCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateWatchdogCommand.java index 8c2e861..6ebfc80 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateWatchdogCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateWatchdogCommand.java @@ -38,7 +38,7 @@ return failCanDoAction(VdcBllMessages.WATCHDOG_NOT_FOUND); } - if (!getParameters().isInstanceType() && !validate(validateModelCompatibleWithOs())) { + if (!getParameters().isClusterIndependent() && !validate(validateModelCompatibleWithOs())) { return false; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java index 24474fc..f2f37a2 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java @@ -218,7 +218,7 @@ if (getParameters().getWatchdog() != null) { WatchdogParameters parameters = new WatchdogParameters(); parameters.setVm(false); - parameters.setInstanceType(getVmTemplate().getTemplateType() == VmEntityType.INSTANCE_TYPE); + parameters.setClusterIndependent(getVmTemplate().getTemplateType() == VmEntityType.INSTANCE_TYPE || isBlankTemplate()); parameters.setId(templateId); parameters.setAction(getParameters().getWatchdog().getAction()); @@ -228,7 +228,7 @@ } else { WatchdogParameters watchdogParameters = new WatchdogParameters(); watchdogParameters.setVm(false); - watchdogParameters.setInstanceType(getVmTemplate().getTemplateType() == VmEntityType.INSTANCE_TYPE); + watchdogParameters.setClusterIndependent(getVmTemplate().getTemplateType() == VmEntityType.INSTANCE_TYPE || isBlankTemplate()); watchdogParameters.setId(templateId); if (getParameters().getWatchdog() == null) { @@ -279,4 +279,11 @@ } } + protected boolean isBlankTemplate() { + if (getVmTemplate() != null) { + return VmTemplateHandler.BLANK_VM_TEMPLATE_ID.equals(getVmTemplate().getId()); + } + + return false; + } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/WatchdogParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/WatchdogParameters.java index 3a4ea78..89f0372 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/WatchdogParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/WatchdogParameters.java @@ -14,9 +14,9 @@ boolean vm; /** - * true if the watchog must be set in the instanceType, false otherwise + * true if the watchog must be set in a cluster independent entity (e.g. instance type or blank template), false otherwise */ - boolean instanceType; + boolean clusterIndependent; @NotNull Guid id; @@ -48,12 +48,12 @@ return vm; } - public boolean isInstanceType() { - return instanceType; + public boolean isClusterIndependent() { + return clusterIndependent; } - public void setInstanceType(boolean instanceType) { - this.instanceType = instanceType; + public void setClusterIndependent(boolean clusterIndependent) { + this.clusterIndependent = clusterIndependent; } public void setVm(boolean vm) { -- To view, visit http://gerrit.ovirt.org/37903 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icdaa438ff674dab599d04c94e97724e8c51700f9 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tomas Jelinek <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
