Hello Alissa Bonas,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/18506
to review the following change.
Change subject: core: fix typo in error message name
......................................................................
core: fix typo in error message name
Add missing "t" to "hostname" in error message name.
Change-Id: I2a13b60f0033afbd448b1893956572a27dcf3eda
Signed-off-by: Alissa Bonas <[email protected]>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java
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
6 files changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/06/18506/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java
index 8999eb5..d828c80 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java
@@ -71,7 +71,7 @@
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_NAME_LENGTH_IS_TOO_LONG);
returnValue = false;
} else if (_oldVds.getStatus() != VDSStatus.InstallFailed &&
!_oldVds.getHostName().equals(hostName)) {
-
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_HOSNAME_CANNOT_CHANGE);
+
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_HOSTNAME_CANNOT_CHANGE);
returnValue = false;
}
// check if a name is updated to an existing vds name
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 86ebd95..d194db0 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
@@ -205,7 +205,7 @@
ACTION_TYPE_FAILED_NAME_MAY_NOT_BE_EMPTY(ErrorType.BAD_PARAMETERS),
ACTION_TYPE_FAILED_INVALID_VDS_HOSTNAME(ErrorType.BAD_PARAMETERS),
ACTION_TYPE_FAILED_NAME_MAY_NOT_CONTAIN_SPECIAL_CHARS(ErrorType.BAD_PARAMETERS),
- ACTION_TYPE_FAILED_HOSNAME_CANNOT_CHANGE(ErrorType.BAD_PARAMETERS),
+ ACTION_TYPE_FAILED_HOSTNAME_CANNOT_CHANGE(ErrorType.BAD_PARAMETERS),
ACTION_TYPE_FAILED_HOST_NOT_EXIST(ErrorType.BAD_PARAMETERS),
ACTION_TYPE_FAILED_VM_SNAPSHOT_NOT_IN_PREVIEW(ErrorType.CONFLICT),
ACTION_TYPE_FAILED_SHAREABLE_DISK_NOT_SUPPORTED(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 7199b59..ac9411c 100644
---
a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
+++
b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
@@ -699,7 +699,7 @@
USER_FAILED_TO_AUTHENTICATE_CONNECTION_TIMED_OUT=Authentication Failed.
Connection to Directory server has timed out. Please contact your system
administrator
USER_FAILED_TO_AUTHENTICATE_WRONG_REALM=Authentication Failed. Wrong domain
name was provided for authentication
ACTION_TYPE_FAILED_INVALID_CUSTOM_PROPERTIES_DUPLICATE_KEYS=Cannot ${action}
${type} if some of the specified custom properties appear more than once. The
keys are: ${DuplicateKeys}
-ACTION_TYPE_FAILED_HOSNAME_CANNOT_CHANGE=Host Address can not be modified due
to Security restrictions. In order to change Host Address, Host has to be
reinstalled
+ACTION_TYPE_FAILED_HOSTNAME_CANNOT_CHANGE=Host Address can not be modified due
to Security restrictions. In order to change Host Address, Host has to be
reinstalled
CAN_DO_ACTION_DATABASE_CONNECTION_FAILURE=Action failed due to database
connection failure. Please check connectivity to your Database server.
ACTION_TYPE_FAILED_DESCRIPTION_MAY_NOT_CONTAIN_SPECIAL_CHARS=Cannot ${action}
${type}. The given description contains special characters.\nOnly alpha-numeric
and some special characters that conform to the standard ASCII character set
are allowed.
ACTION_TYPE_FAILED_LINUX_BOOT_PARAMS_MAY_NOT_CONTAIN_TRIMMING_WHITESPACES=Cannot
${action} ${type}. Linux boot parameters contain trimming whitespace
characters.
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 493474e..451c3fb 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
@@ -1877,7 +1877,7 @@
String ACTION_TYPE_FAILED_INVALID_CUSTOM_PROPERTIES_DUPLICATE_KEYS();
@DefaultStringValue("Host Address can not be modified due to Security
restrictions. In order to change Host Address, Host has to be reinstalled")
- String ACTION_TYPE_FAILED_HOSNAME_CANNOT_CHANGE();
+ String ACTION_TYPE_FAILED_HOSTNAME_CANNOT_CHANGE();
@DefaultStringValue("Action failed due to database connection failure.
Please check connectivity to your Database server.")
String CAN_DO_ACTION_DATABASE_CONNECTION_FAILURE();
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 fea8c83..234996b 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
@@ -682,7 +682,7 @@
USER_FAILED_TO_AUTHENTICATE_CONNECTION_TIMED_OUT=Authentication Failed.
Connection to Directory server has timed out. Please contact your system
administrator
USER_FAILED_TO_AUTHENTICATE_WRONG_REALM=Authentication Failed. Wrong domain
name was provided for authentication
ACTION_TYPE_FAILED_INVALID_CUSTOM_PROPERTIES_DUPLICATE_KEYS=Cannot ${action}
${type} if some of the specified custom properties appear more than once. The
keys are: ${DuplicateKeys}
-ACTION_TYPE_FAILED_HOSNAME_CANNOT_CHANGE=Host Address can not be modified due
to Security restrictions. In order to change Host Address, Host has to be
reinstalled
+ACTION_TYPE_FAILED_HOSTNAME_CANNOT_CHANGE=Host Address can not be modified due
to Security restrictions. In order to change Host Address, Host has to be
reinstalled
CAN_DO_ACTION_DATABASE_CONNECTION_FAILURE=Action failed due to database
connection failure. Please check connectivity to your Database server.
ACTION_TYPE_FAILED_DESCRIPTION_MAY_NOT_CONTAIN_SPECIAL_CHARS=Cannot ${action}
${type}. The given description contains special characters.\nOnly alpha-numeric
and some special characters that conform to the standard ASCII character set
are allowed.
ACTION_TYPE_FAILED_LINUX_BOOT_PARAMS_MAY_NOT_CONTAIN_TRIMMING_WHITESPACES=Cannot
${action} ${type}. Linux boot parameters contain trimming whitespace
characters.
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 9c43e9a..0f7ef6d 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
@@ -701,7 +701,7 @@
USER_FAILED_TO_AUTHENTICATE_CONNECTION_TIMED_OUT=Authentication Failed.
Connection to Directory server has timed out. Please contact your system
administrator
USER_FAILED_TO_AUTHENTICATE_WRONG_REALM=Authentication Failed. Wrong domain
name was provided for authentication
ACTION_TYPE_FAILED_INVALID_CUSTOM_PROPERTIES_DUPLICATE_KEYS=Cannot ${action}
${type} if some of the specified custom properties appear more than once. The
keys are: ${DuplicateKeys}
-ACTION_TYPE_FAILED_HOSNAME_CANNOT_CHANGE=Host Address can not be modified due
to Security restrictions. In order to change Host Address, Host has to be
reinstalled
+ACTION_TYPE_FAILED_HOSTNAME_CANNOT_CHANGE=Host Address can not be modified due
to Security restrictions. In order to change Host Address, Host has to be
reinstalled
CAN_DO_ACTION_DATABASE_CONNECTION_FAILURE=Action failed due to database
connection failure. Please check connectivity to your Database server.
ACTION_TYPE_FAILED_DESCRIPTION_MAY_NOT_CONTAIN_SPECIAL_CHARS=Cannot ${action}
${type}. The given description contains special characters.\nOnly alpha-numeric
and some special characters that conform to the standard ASCII character set
are allowed.
ACTION_TYPE_FAILED_LINUX_BOOT_PARAMS_MAY_NOT_CONTAIN_TRIMMING_WHITESPACES=Cannot
${action} ${type}. Linux boot parameters contain trimming whitespace
characters.
--
To view, visit http://gerrit.ovirt.org/18506
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a13b60f0033afbd448b1893956572a27dcf3eda
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.3
Gerrit-Owner: Alon Bar-Lev <[email protected]>
Gerrit-Reviewer: Alissa Bonas <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
