Eli Mesika has uploaded a new change for review. Change subject: core: Add error messages for new commands. ......................................................................
core: Add error messages for new commands. Change-Id: I1c7a5da46f9202a4a84f54b9bc6c9e2afcde81e4 Signed-off-by: Eli Mesika <[email protected]> Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=872719 --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties 5 files changed, 73 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/58/16158/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java index 8fee683..5169d1e 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java @@ -40,6 +40,10 @@ // External Event VAR__TYPE__EXTERNAL_EVENT, + // External Tasks + VAR__TYPE__EXTERNAL_JOB, + VAR__TYPE__EXTERNAL_STEP, + VAR__ACTION__RUN, VAR__ACTION__REMOVE, VAR__ACTION__ADD, @@ -80,6 +84,8 @@ VAR__ACTION__ENABLE, VAR__ACTION__DISABLE, VAR__ACTION__REFRESH, + VAR__ACTION__END, + VAR__ACTION__CLEAR, // Host statuses replacements VAR__HOST_STATUS__UP, @@ -695,6 +701,13 @@ ACTION_TYPE_FAILED_EXTERNAL_EVENT_NOT_FOUND(ErrorType.BAD_PARAMETERS), ACTION_TYPE_FAILED_EXTERNAL_EVENT_ILLEGAL_OPERATION(ErrorType.BAD_PARAMETERS), + // External Tasks + ACTION_TYPE_EMPTY_DESCRIPTION(ErrorType.BAD_PARAMETERS), + ACTION_TYPE_NOT_EXTERNAL(ErrorType.BAD_PARAMETERS), + ACTION_TYPE_NO_PARENT(ErrorType.BAD_PARAMETERS), + ACTION_TYPE_NO_JOB(ErrorType.BAD_PARAMETERS), + ACTION_TYPE_NO_STEP(ErrorType.BAD_PARAMETERS), + //watchdog WATCHDOG_NOT_FOUND(ErrorType.BAD_PARAMETERS), WATCHDOG_ALREADY_EXISTS(ErrorType.CONFLICT), diff --git a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties index 22a7e97..f6d1782 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties @@ -900,6 +900,17 @@ ACTION_TYPE_FAILED_EXTERNAL_EVENT_NOT_FOUND=Cannot ${action} ${type}.External Event does not exist. ACTION_TYPE_FAILED_EXTERNAL_EVENT_ILLRGAL_OPERATION=Cannot ${action} ${type}.Only Alerts can be removed. +# External Tasks Errors Messages +VAR__TYPE__EXTERNAL_JOB=$type External Job +VAR__TYPE__EXTERNAL_STEP=$type External Step +VAR__ACTION__END=$action End +VAR__ACTION__CLEAR=$action Clear +ACTION_TYPE_EMPTY_DESCRIPTION=Cannot ${action} ${type}. Description can not be empty. +ACTION_TYPE_NOT_EXTERNAL=Cannot ${action} ${type}. External steps can be added only to external jobs or steps. +ACTION_TYPE_NO_PARENT=Cannot ${action} ${type}. Step should be a child of the Job or other Step. +ACTION_TYPE_NO_JOB=Cannot ${action} ${type}. Job not found. +ACTION_TYPE_NO_STEP=Cannot ${action} ${type}. Step not found. + # Register disk error ACTION_TYPE_FAILED_UNSUPPORTED_DISK_STORAGE_TYPE=Cannot register disk ${diskId}. Its storage type ${storageType} is not supported. ACTION_TYPE_FAILED_STORAGE_DOMAIN_UNAVAILABLE=Cannot register disk ${diskId} on storage domain ${domainId} as it is unavailable. diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java index dc708cc..c475c6e 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java @@ -2351,6 +2351,33 @@ @DefaultStringValue("Cannot ${action} ${type}.Only Alerts can be removed.") String ACTION_TYPE_FAILED_EXTERNAL_EVENT_ILLRGAL_OPERATION(); + @DefaultStringValue("$type External Job.") + String VAR__TYPE__EXTERNAL_JOB(); + + @DefaultStringValue("$type External Step.") + String VAR__TYPE__EXTERNAL_STEP(); + + @DefaultStringValue("$action End.") + String VAR__ACTION__END(); + + @DefaultStringValue("$action Clear.") + String VAR__ACTION__CLEAR(); + + @DefaultStringValue("Cannot ${action} ${type}. Description can not be empty.") + String ACTION_TYPE_EMPTY_DESCRIPTION(); + + @DefaultStringValue("Cannot ${action} ${type}. External steps can be added only to external jobs or steps.") + String ACTION_TYPE_NOT_EXTERNAL(); + + @DefaultStringValue("Cannot ${action} ${type}. Step should be a child of the Job or other Step.") + String ACTION_TYPE_NO_PARENT(); + + @DefaultStringValue("Cannot ${action} ${type}. Job not found.") + String ACTION_TYPE_NO_JOB(); + + @DefaultStringValue("Cannot ${action} ${type}. Step not found.") + String ACTION_TYPE_NO_STEP(); + @DefaultStringValue("Cannot ${action} ${type}. Gluster hook id is required.") String ACTION_TYPE_FAILED_GLUSTER_HOOK_ID_IS_REQUIRED(); diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties index 6430ece..b1acad4 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties @@ -819,3 +819,14 @@ ACTION_TYPE_FAILED_EXTERNAL_EVENT_NOT_FOUND=Cannot ${action} ${type}.External Event does not exist. ACTION_TYPE_FAILED_EXTERNAL_EVENT_ILLRGAL_OPERATION=Cannot ${action} ${type}.Only Alerts can be removed. FAILED_TO_RUN_LDAP_QUERY=Failed to run LDAP query, please contact your system administrator. + +# External Tasks Errors Messages +VAR__TYPE__EXTERNAL_JOB=$type External Job +VAR__TYPE__EXTERNAL_STEP=$type External Step +VAR__ACTION__END=$action End +VAR__ACTION__CLEAR=$action Clear +ACTION_TYPE_EMPTY_DESCRIPTION=Cannot ${action} ${type}. Description can not be empty. +ACTION_TYPE_NOT_EXTERNAL=Cannot ${action} ${type}. External steps can be added only to external jobs or steps. +ACTION_TYPE_NO_PARENT=Cannot ${action} ${type}. Step should be a child of the Job or other Step. +ACTION_TYPE_NO_JOB=Cannot ${action} ${type}. Job not found. +ACTION_TYPE_NO_STEP=Cannot ${action} ${type}. Step not found. diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties index 13a3220..0a64e82 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties @@ -878,3 +878,14 @@ ACTION_TYPE_FAILED_EXTERNAL_EVENT_NOT_FOUND=Cannot ${action} ${type}.External Event does not exist. ACTION_TYPE_FAILED_EXTERNAL_EVENT_ILLRGAL_OPERATION=Cannot ${action} ${type}.Only Alerts can be removed. FAILED_TO_RUN_LDAP_QUERY=Failed to run LDAP query, please check server logs for more info. + +# External Tasks Errors Messages +VAR__TYPE__EXTERNAL_JOB=$type External Job +VAR__TYPE__EXTERNAL_STEP=$type External Step +VAR__ACTION__END=$action End +VAR__ACTION__CLEAR=$action Clear +ACTION_TYPE_EMPTY_DESCRIPTION=Cannot ${action} ${type}. Description can not be empty. +ACTION_TYPE_NOT_EXTERNAL=Cannot ${action} ${type}. External steps can be added only to external jobs or steps. +ACTION_TYPE_NO_PARENT=Cannot ${action} ${type}. Step should be a child of the Job or other Step. +ACTION_TYPE_NO_JOB=Cannot ${action} ${type}. Job not found. +ACTION_TYPE_NO_STEP=Cannot ${action} ${type}. Step not found. -- To view, visit http://gerrit.ovirt.org/16158 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1c7a5da46f9202a4a84f54b9bc6c9e2afcde81e4 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Eli Mesika <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
