Gilad Chaplik has uploaded a new change for review. Change subject: webadmin: import: validate quota in enforce mode (#855635) ......................................................................
webadmin: import: validate quota in enforce mode (#855635) https://bugzilla.redhat.com/855635 Import VM/Template dialogs: Perform a client side validation on quota availability, when quota in enforce mode. Change-Id: Ic2fc674c18e805cdd2b54a32b85f037e8d4fca5f Signed-off-by: Gilad Chaplik <gchap...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java 2 files changed, 23 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/60/8060/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java index 1f61b8a..7bb234b 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java @@ -142,6 +142,13 @@ ImportVmModel importVmModel = (ImportVmModel) model; ArrayList<Quota> quotaList = (ArrayList<Quota>) ((VdcQueryReturnValue) returnValue).getReturnValue(); + if (quotaList.isEmpty() + && QuotaEnforcementTypeEnum.HARD_ENFORCEMENT.equals(storagePool.getQuotaEnforcementType())) { + showCloseMessage(ConstantsManager.getInstance() + .getConstants() + .missingQuotaClusterEnforceMode()); + return; + } importVmModel.getClusterQuota().setItems(quotaList); } })); @@ -246,10 +253,18 @@ List<VdcQueryReturnValue> returnValueList = result.getReturnValues(); for (int i = 0; i < filteredStorageDomains.size(); i++) { + ArrayList<Quota> quotaList = (ArrayList<Quota>) returnValueList.get(i) + .getReturnValue(); + if (quotaList.isEmpty() + && QuotaEnforcementTypeEnum.HARD_ENFORCEMENT.equals(storagePool.getQuotaEnforcementType())) { + showCloseMessage(ConstantsManager.getInstance() + .getConstants() + .missingQuotaStorageEnforceMode()); + return; + } storageQuotaMap.put( filteredStorageDomains.get(i).getId(), - (ArrayList<Quota>) returnValueList.get(i) - .getReturnValue()); + quotaList); } initDisksStorageDomainsList(); } diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java index aea4662..6fe51a0 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java @@ -1527,4 +1527,10 @@ @DefaultStringValue("Template cannot be found in the system, VM(s) cannot be imported") String errorTemplateCannotBeFoundMessage(); + @DefaultStringValue("Missing Quota for the selected Storage Domain(s), Please define proper Quota") + String missingQuotaStorageEnforceMode(); + + @DefaultStringValue("Missing Quota for the selected Cluster, Please define proper Quota") + String missingQuotaClusterEnforceMode(); + } -- To view, visit http://gerrit.ovirt.org/8060 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic2fc674c18e805cdd2b54a32b85f037e8d4fca5f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Gilad Chaplik <gchap...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
