Maor Lipchuk has uploaded a new change for review. Change subject: core: Remove hyphen from non-responsive ......................................................................
core: Remove hyphen from non-responsive Change non-responsive to non responsive to stay consistent with the rest of our statuses (e.g. "Non Operational") Change-Id: I12df92b594850bff145a9383fa9eaf0138004b8e Signed-off-by: Maor Lipchuk <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MaintenanceNumberOfVdssCommand.java M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties M backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties M backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties M backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/EngineMonitorService.java M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties 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 10 files changed, 25 insertions(+), 25 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/67/16667/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MaintenanceNumberOfVdssCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MaintenanceNumberOfVdssCommand.java index 6b0192a..64b4bcd 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MaintenanceNumberOfVdssCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MaintenanceNumberOfVdssCommand.java @@ -301,7 +301,7 @@ } /** - * If found hosts which are non-responsive and has VM's on them, add the host names to the message. + * If found hosts which are non responsive and has VM's on them, add the host names to the message. * * @param hostNotRespondingList * - List of non responsive hosts with running VM's on them. 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 646ff6f..b94dabd 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties @@ -61,8 +61,8 @@ USER_FAILED_POPULATE_DATA=Failed to get User data from Directory Server. USER_FAILED_SET_USER_ROLE=Failed set User Role, operation canceled VDS_CANNOT_MAINTENANCE_VDS_IS_NOT_RESPONDING_WITH_VMS=Cannot switch Host to Maintenance mode.\n\ - Host still has running VMs on it and is in Non-Responsive state. -VDS_CANNOT_MAINTENANCE_VDS_IS_NOT_RESPONDING_AND_IS_SPM=Cannot switch Host to Maintenance mode.\nHost is Storage Pool Manager and is in Non-Responsive state.\n\ + Host still has running VMs on it and is in Non Responsive state. +VDS_CANNOT_MAINTENANCE_VDS_IS_NOT_RESPONDING_AND_IS_SPM=Cannot switch Host to Maintenance mode.\nHost is Storage Pool Manager and is in Non Responsive state.\n\ - If power management is configured, engine will try to fence the host automatically.\n\ - Otherwise, either bring the node back up, or release the SPM resource.\n\ To do so, verify that the node is really down by right clicking on the host and confirm that the node was shutdown manually. @@ -82,7 +82,7 @@ VDS_PROTOCOL_ERROR=Internal error: Host protocol error. VDS_RESPONSE_ERROR=Internal error: Host response error VDS_STATUS_NOT_VALID_FOR_STOP=Cannot perform Stop operation, Host has to be in Maintenance mode in order to be stopped. -VDS_STATUS_NOT_VALID_FOR_START=Cannot perform Start operation, Host has to be in one of the following statuses: Down ,Non-Responsive or Maintenance. +VDS_STATUS_NOT_VALID_FOR_START=Cannot perform Start operation, Host has to be in one of the following statuses: Down ,Non Responsive or Maintenance. VDS_NO_VDS_PROXY_FOUND=Cannot ${action} ${type}.\n\ There is no other Host in the Data Center that can be used to test the Power Management settings. VDS_FAILED_FENCE_VIA_PROXY_CONNECTION=Connection to Host via proxy failed. Please verify that power management is available, and that the provided connection parameters are correct. diff --git a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties index 3b6fb11..9a0c19c 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties @@ -189,7 +189,7 @@ HOST_REFRESH_CAPABILITIES_FAILED=Failed to refresh the capabilities of host ${VdsName}. VDS_DETECTED=Detected new Host ${VdsName}. Host state was set to ${VdsStatus}. VDS_DETECTED=State was set to ${VdsStatus} for host ${VdsName}. -VDS_FAILURE=Host ${VdsName} is non-responsive. +VDS_FAILURE=Host ${VdsName} is non responsive. VDS_MAINTENANCE=Host ${VdsName} was switched to Maintenance Mode. VDS_MAINTENANCE_FAILED=Failed to switch Host ${VdsName} to Maintenance mode. VDS_RECOVER=Host ${VdsName} is rebooting. @@ -327,8 +327,8 @@ MAC_ADDRESSES_POOL_NOT_INITIALIZED=Mac Address Pool is not initialized. ${Message} USER_PASSWORD_CHANGED=Password changed successfully for ${UserName} USER_PASSWORD_CHANGE_FAILED=Failed to change password. (User: ${UserName}) -USER_CLEAR_UNKNOWN_VMS=All VMs' status on Non-Responsive Host ${VdsName} were changed to 'Down' by ${UserName} -USER_FAILED_CLEAR_UNKNOWN_VMS=Failed to clear VMs' status on Non-Responsive Host ${VdsName}. (User: ${UserName}). +USER_CLEAR_UNKNOWN_VMS=All VMs' status on Non Responsive Host ${VdsName} were changed to 'Down' by ${UserName} +USER_FAILED_CLEAR_UNKNOWN_VMS=Failed to clear VMs' status on Non Responsive Host ${VdsName}. (User: ${UserName}). CERTIFICATE_FILE_NOT_FOUND=Could not find oVirt Engine Certificate file. VDS_RUN_IN_NO_KVM_MODE=Host ${VdsName} running without virtualization hardware acceleration VDS_VERSION_NOT_SUPPORTED_FOR_CLUSTER=Host ${VdsName} is compatible with versions (${VdsSupportedVersions}) and cannot join Cluster ${VdsGroupName} which is set to version ${CompatibilityVersion}. @@ -524,7 +524,7 @@ VDS_ALERT_FENCE_IS_NOT_CONFIGURED=Failed to verify Power Management configuration for Host ${VdsName}. VDS_ALERT_FENCE_TEST_FAILED=Power Management test failed for Host ${VdsName}.${Reason} VDS_ALERT_FENCE_OPERATION_FAILED=Failed to power fence host ${VdsName}. Please check the host status and it's power management settings, and then manually reboot it and click "Confirm Host Has Been Rebooted" -VDS_ALERT_FENCE_OPERATION_SKIPPED=Host ${VdsName} became non-responsive. It has no power management configured. Please check the host status, manually reboot it, and click "Confirm Host Has Been Rebooted" +VDS_ALERT_FENCE_OPERATION_SKIPPED=Host ${VdsName} became non responsive. It has no power management configured. Please check the host status, manually reboot it, and click "Confirm Host Has Been Rebooted" VDS_ALERT_FENCE_NO_PROXY_HOST=There is no other host in the data center that can be used to test the power management settings. VDS_ALERT_FENCE_STATUS_VERIFICATION_FAILED=Failed to verify Host ${Host} ${Status} status, Please ${Status} Host ${Host} manually. VDS_ALERT_SECONDARY_AGENT_USED_FOR_FENCE_OPERATION=Secondary fence agent was used to ${Operation} Host ${VdsName} diff --git a/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties b/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties index a1b4893..952b70d 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties @@ -112,7 +112,7 @@ MissParam=Missing required parameter nfsErr=Storage Domain access timeout noConPeer=Could not connect to peer host -nonresp=Guest agent non-responsive +nonresp=Guest agent non responsive noVM=Desktop does not exist noVmType=Unsupported VM type outOfMem=Not enough free memory to create Desktop diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/EngineMonitorService.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/EngineMonitorService.java index 24245bf..602fd83 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/EngineMonitorService.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/EngineMonitorService.java @@ -38,7 +38,7 @@ /** * Class uses to monitor the oVirt Engineanager service by sampling its health servlet. Upon response other than code 200, * will report to <i>audit_log</i> table upon ENGINE error. <br> - * If a server state was change from non-responsive to responsive, will report the status change. <br> + * If a server state was change from non responsive to responsive, will report the status change. <br> * The monitor service is detached from the notification service, being executed as a separated thread, with different * execution rate. */ @@ -278,7 +278,7 @@ if (statusChanged || repeatNonResponsiveNotification) { if (isResponsive) { - // if server is up, report only if its status was changed from non-responsive. + // if server is up, report only if its status was changed from non responsive. if (statusChanged) { insertEventIntoAuditLogSafe(AuditLogType.VDC_START, AuditLogSeverity.NORMAL, @@ -286,18 +286,18 @@ "Failed auditing event down (for responsive server)."); } } else { - // reports an error for non-responsive server + // reports an error for non responsive server if(new File(pidFile).exists()) { // assumed crash, since the pid file is still there insertEventIntoAuditLogSafe(AuditLogType.VDC_STOP, AuditLogSeverity.ERROR, ENGINE_NOT_RESPONDING_ERROR, - "Failed auditing event up (for crashed non-responsive server)."); + "Failed auditing event up (for crashed non responsive server)."); } else { insertEventIntoAuditLogSafe(AuditLogType.VDC_STOP, AuditLogSeverity.WARNING, ENGINE_NOT_RESPONDING_ERROR, - "Failed auditing event up (for stopped non-responsive server)."); + "Failed auditing event up (for stopped non responsive server)."); } } } 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 3777a64..81a86c5 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 @@ -142,10 +142,10 @@ @DefaultStringValue("Failed set User Role, operation canceled") String USER_FAILED_SET_USER_ROLE(); - @DefaultStringValue("Cannot switch Host to Maintenance mode.\nHost still has running VMs on it and is in Non-Responsive state.") + @DefaultStringValue("Cannot switch Host to Maintenance mode.\nHost still has running VMs on it and is in Non Responsive state.") String VDS_CANNOT_MAINTENANCE_VDS_IS_NOT_RESPONDING_WITH_VMS(); - @DefaultStringValue("Cannot switch Host to Maintenance mode.\nHost is Storage Pool Manager and is in Non-Responsive state.\n" + @DefaultStringValue("Cannot switch Host to Maintenance mode.\nHost is Storage Pool Manager and is in Non Responsive state.\n" + "- If power management is configured, engine will try to fence automatically.\n" + @@ -193,7 +193,7 @@ @DefaultStringValue("Cannot perform Stop operation, Host has to be in Maintenance mode in order to be stopped.") String VDS_STATUS_NOT_VALID_FOR_STOP(); - @DefaultStringValue("Cannot perform Start operation, Host has to be in one of the following statuses: Down ,Non-Responsive or Maintenance.") + @DefaultStringValue("Cannot perform Start operation, Host has to be in one of the following statuses: Down ,Non Responsive or Maintenance.") String VDS_STATUS_NOT_VALID_FOR_START(); @DefaultStringValue("There is no other Host in the Data Center that can be used to test the Power Management settings.") diff --git a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties index 8619459..a504dc0 100644 --- a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties +++ b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties @@ -17,7 +17,7 @@ StoragePoolStatus___Uninitialized=Uninitialized StoragePoolStatus___Up=Up StoragePoolStatus___NotOperational=Not Operational -StoragePoolStatus___Problematic=Non-Responsive +StoragePoolStatus___Problematic=Non Responsive StoragePoolStatus___Contend=Contending StorageType___ALL=All StorageType___FCP=Fibre Channel diff --git a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties index 7f1e478..dee49b5 100644 --- a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties +++ b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties @@ -88,7 +88,7 @@ EventNotificationEntity___DWH=Data Warehouse Events: EventNotificationEntity___GlusterHook=Gluster Hook Events: EventNotificationEntity___GlusterService=Gluster Service: -AuditLogType___VDS_FAILURE=Host is non-responsive +AuditLogType___VDS_FAILURE=Host is non responsive AuditLogType___USER_VDS_MAINTENANCE=Host was switched to Maintenance Mode AuditLogType___USER_VDS_MAINTENANCE_MIGRATION_FAILED=Failed to switch Host to Maintenance mode AuditLogType___VDS_MAINTENANCE=Host was switched to Maintenance Mode 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 1e0a112..caf4274 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 @@ -61,8 +61,8 @@ USER_FAILED_POPULATE_DATA=Failed to get User data from Directory Server. USER_FAILED_SET_USER_ROLE=Failed set User Role, operation canceled VDS_CANNOT_MAINTENANCE_VDS_IS_NOT_RESPONDING_WITH_VMS=Cannot switch Host to Maintenance mode.\n\ - Host still has running VMs on it and is in Non-Responsive state. -VDS_CANNOT_MAINTENANCE_VDS_IS_NOT_RESPONDING_AND_IS_SPM=Cannot switch Host to Maintenance mode.\nHost is Storage Pool Manager and is in Non-Responsive state.\n\ + Host still has running VMs on it and is in Non Responsive state. +VDS_CANNOT_MAINTENANCE_VDS_IS_NOT_RESPONDING_AND_IS_SPM=Cannot switch Host to Maintenance mode.\nHost is Storage Pool Manager and is in Non Responsive state.\n\ - If power management is configured, engine will try to fence the host automatically.\n\ - Otherwise, either bring the node back up, or release the SPM resource.\n\ To do so, verify that the node is really down by right clicking on the host and confirm that the node was shutdown manually. @@ -82,7 +82,7 @@ VDS_PROTOCOL_ERROR=Internal error: Host protocol error. VDS_RESPONSE_ERROR=Internal error: Host response error VDS_STATUS_NOT_VALID_FOR_STOP=Cannot perform Stop operation, Host has to be in Maintenance mode in order to be stopped. -VDS_STATUS_NOT_VALID_FOR_START=Cannot perform Start operation, Host has to be in one of the following statuses: Down ,Non-Responsive or Maintenance. +VDS_STATUS_NOT_VALID_FOR_START=Cannot perform Start operation, Host has to be in one of the following statuses: Down ,Non Responsive or Maintenance. VDS_NO_VDS_PROXY_FOUND=Cannot ${action} ${type}.\n\ There is no other Host in the Data Center that can be used to test the Power Management settings. VDS_FAILED_FENCE_VIA_PROXY_CONNECTION=Connection to Host via proxy failed. Please verify that power management is available, and that the provided connection parameters are correct. 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 48b3c85..bd347ed 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 @@ -61,8 +61,8 @@ USER_FAILED_POPULATE_DATA=Failed to get User data from Directory Server. USER_FAILED_SET_USER_ROLE=Failed set User Role, operation canceled VDS_CANNOT_MAINTENANCE_VDS_IS_NOT_RESPONDING_WITH_VMS=Cannot switch Host to Maintenance mode.\n\ - Host still has running VMs on it and is in Non-Responsive state. -VDS_CANNOT_MAINTENANCE_VDS_IS_NOT_RESPONDING_AND_IS_SPM=Cannot switch Host to Maintenance mode.\nHost is Storage Pool Manager and is in Non-Responsive state.\n\ + Host still has running VMs on it and is in Non Responsive state. +VDS_CANNOT_MAINTENANCE_VDS_IS_NOT_RESPONDING_AND_IS_SPM=Cannot switch Host to Maintenance mode.\nHost is Storage Pool Manager and is in Non Responsive state.\n\ - If power management is configured, engine will try to fence the host automatically.\n\ - Otherwise, either bring the node back up, or release the SPM resource.\n\ To do so, verify that the node is really down by right clicking on the host and confirm that the node was shutdown manually. @@ -82,7 +82,7 @@ VDS_PROTOCOL_ERROR=Internal error: Host protocol error. VDS_RESPONSE_ERROR=Internal error: Host response error VDS_STATUS_NOT_VALID_FOR_STOP=Cannot perform Stop operation, Host has to be in Maintenance mode in order to be stopped. -VDS_STATUS_NOT_VALID_FOR_START=Cannot perform Start operation, Host has to be in one of the following statuses: Down ,Non-Responsive or Maintenance. +VDS_STATUS_NOT_VALID_FOR_START=Cannot perform Start operation, Host has to be in one of the following statuses: Down ,Non Responsive or Maintenance. VDS_NO_VDS_PROXY_FOUND=There is no other Host in the Data Center that can be used to test the Power Management settings. VDS_FAILED_FENCE_VIA_PROXY_CONNECTION=Connection to Host via proxy failed. Please verify that power management is available, and that the provided connection parameters are correct. VDS_STATUS_NOT_VALID_FOR_UPDATE=Cannot ${action} ${type}. Host parameters cannot be modified while Host is operational.\n\ -- To view, visit http://gerrit.ovirt.org/16667 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I12df92b594850bff145a9383fa9eaf0138004b8e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Maor Lipchuk <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
