Maor Lipchuk has uploaded a new change for review. Change subject: core: Use validation only if Template is not blank ......................................................................
core: Use validation only if Template is not blank The validation of, same DC when creating a VM from a Template, should only be validated when creating a VMs which does not have Blank Template as their based on image. Blank Template is the default Template for every new created VM, and it is hosted on the default Data Center Change-Id: I06a0c911c50f6ff25d9dca358c6a199fa0cdbb59 Bug Url: https://bugzilla.redhat.com/1125196 Signed-off-by: Maor Lipchuk <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromScratchCommand.java 2 files changed, 2 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/13/31013/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java index 6489dc7..2e6e202 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java @@ -1332,7 +1332,8 @@ } protected boolean isTemplateInValidDc() { - return getVmTemplate().getStoragePoolId().equals(getStoragePoolId()); + return VmTemplateHandler.BLANK_VM_TEMPLATE_ID.equals(getVmTemplateId()) + || getVmTemplate().getStoragePoolId().equals(getStoragePoolId()); } protected void updateProfileOnNic(VmNic iface) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromScratchCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromScratchCommand.java index bc14a5d..99f0273 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromScratchCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromScratchCommand.java @@ -178,10 +178,4 @@ addPermissionSubjectForAdminLevelProperties(permissionList); return permissionList; } - - @Override - protected boolean isTemplateInValidDc() { - return VmTemplateHandler.BLANK_VM_TEMPLATE_ID.equals(getVmTemplateId()) || super.isTemplateInValidDc(); - } - } -- To view, visit http://gerrit.ovirt.org/31013 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I06a0c911c50f6ff25d9dca358c6a199fa0cdbb59 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Maor Lipchuk <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
