Alissa Bonas has uploaded a new change for review. Change subject: core: fix attacch to attach ......................................................................
core: fix attacch to attach Fixed typo in 2 error message names. Change-Id: Id8b58c03262196b90611a9bd56bede0e15afd8a5 Signed-off-by: Alissa Bonas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/DetachNetworkFromVdsInterfaceCommand.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, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/96/18396/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/DetachNetworkFromVdsInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/DetachNetworkFromVdsInterfaceCommand.java index f16199a..562fb0a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/DetachNetworkFromVdsInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/DetachNetworkFromVdsInterfaceCommand.java @@ -109,14 +109,14 @@ } if (StringUtils.isEmpty(iface.getNetworkName())) { if (iface.getBonded() != null && iface.getBonded() == true) { - addCanDoActionMessage(VdcBllMessages.NETWORK_BOND_NOT_ATTACCH_TO_NETWORK); + addCanDoActionMessage(VdcBllMessages.NETWORK_BOND_NOT_ATTACH_TO_NETWORK); } else { - addCanDoActionMessage(VdcBllMessages.NETWORK_INTERFACE_NOT_ATTACCH_TO_NETWORK); + addCanDoActionMessage(VdcBllMessages.NETWORK_INTERFACE_NOT_ATTACH_TO_NETWORK); } return false; } else if (!StringUtils.equals(getParameters().getInterface().getNetworkName(), getParameters().getNetwork() .getName())) { - addCanDoActionMessage(VdcBllMessages.NETWORK_INTERFACE_NOT_ATTACCH_TO_NETWORK); + addCanDoActionMessage(VdcBllMessages.NETWORK_INTERFACE_NOT_ATTACH_TO_NETWORK); return false; } 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 4290ad7..52ca36c 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 @@ -404,7 +404,7 @@ NETWORK_INTERFACE_CONNECT_TO_VLAN(ErrorType.CONFLICT), NETWORK_INTERFACE_TEMPLATE_CANNOT_BE_SET(ErrorType.BAD_PARAMETERS), NETWORK_INTERFACE_VM_CANNOT_BE_SET(ErrorType.BAD_PARAMETERS), - NETWORK_INTERFACE_NOT_ATTACCH_TO_NETWORK(ErrorType.CONFLICT), + NETWORK_INTERFACE_NOT_ATTACH_TO_NETWORK(ErrorType.CONFLICT), NETWORK_CANNOT_REMOVE_MANAGEMENT_NETWORK(ErrorType.CONSTRAINT_VIOLATION), NETWORK_BOND_NAME_EXISTS(ErrorType.CONFLICT), NETWORK_BOND_PARAMETERS_INVALID(ErrorType.BAD_PARAMETERS), @@ -412,7 +412,7 @@ NETWORK_CHECK_CONNECTIVITY(ErrorType.BAD_PARAMETERS), NETWORK_INTERFACE_ALREADY_IN_BOND(ErrorType.CONFLICT), NETWORK_BOND_NOT_EXISTS(ErrorType.BAD_PARAMETERS), - NETWORK_BOND_NOT_ATTACCH_TO_NETWORK(ErrorType.BAD_PARAMETERS), + NETWORK_BOND_NOT_ATTACH_TO_NETWORK(ErrorType.BAD_PARAMETERS), NETWORK_BOND_HAVE_ATTACHED_VLANS(ErrorType.CONFLICT), NETWORK_INTERFACE_NOT_EXISTS(ErrorType.BAD_PARAMETERS), NETWORK_INTERFACE_IN_USE_BY_VM(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 53788b6..8b749a8 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties @@ -540,7 +540,7 @@ ACTION_TYPE_FAILED_PM_ENABLED_WITHOUT_AGENT_CREDENTIALS=Cannot ${action} ${type}. Power Management is enabled for Host but Agent credentials are missing. ACTION_TYPE_FAILED_AGENT_NOT_SUPPORTED=Cannot ${action} ${type}. Selected Power Management Agent is not supported. ACTION_TYPE_FAILED_MOM_UPDATE_VDS_VERSION=Cannot ${action} ${type}. The cluster's compatibility version doesn't support MoM Policy update. -NETWORK_BOND_NOT_ATTACCH_TO_NETWORK=Bond is not attached to Network. +NETWORK_BOND_NOT_ATTACH_TO_NETWORK=Bond is not attached to Network. NETWORK_INTERFACE_NOT_ATTACCH_TO_NETWORK=Network Interface is not attached to Logical Network. NETWORK_INTERFACE_IN_USE_BY_VLAN=Bonding cannot be applied on an Interface where VLAN is defined.\n\ -Please remove VLAN from the interface. 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 dac695e..c5548f5 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 @@ -1466,10 +1466,10 @@ String ACTION_TYPE_FAILED_MOM_UPDATE_VDS_VERSION(); @DefaultStringValue("Bond is not attached to Network.") - String NETWORK_BOND_NOT_ATTACCH_TO_NETWORK(); + String NETWORK_BOND_NOT_ATTACH_TO_NETWORK(); @DefaultStringValue("Network Interface is not attached to Logical Network.") - String NETWORK_INTERFACE_NOT_ATTACCH_TO_NETWORK(); + String NETWORK_INTERFACE_NOT_ATTACH_TO_NETWORK(); @DefaultStringValue("Bonding cannot be applied on an Interface where VLAN is defined.\n-Please remove VLAN from the interface.") String NETWORK_INTERFACE_IN_USE_BY_VLAN(); 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 708edba..41feda9 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 @@ -526,8 +526,8 @@ ACTION_TYPE_FAILED_PM_ENABLED_WITHOUT_AGENT=Cannot ${action} ${type}. Power Management is enabled for Host but no Agent type selected. ACTION_TYPE_FAILED_PM_ENABLED_WITHOUT_AGENT_CREDENTIALS=Cannot ${action} ${type}. Power Management is enabled for Host but Agent credentials are missing. ACTION_TYPE_FAILED_AGENT_NOT_SUPPORTED=Cannot ${action} ${type}. Selected Power Management Agent is not supported. -NETWORK_BOND_NOT_ATTACCH_TO_NETWORK=Bond is not attached to Network. -NETWORK_INTERFACE_NOT_ATTACCH_TO_NETWORK=Network Interface is not attached to Logical Network. +NETWORK_BOND_NOT_ATTACH_TO_NETWORK=Bond is not attached to Network. +NETWORK_INTERFACE_NOT_ATTACH_TO_NETWORK=Network Interface is not attached to Logical Network. NETWORK_INTERFACE_IN_USE_BY_VLAN=Bonding cannot be applied on an Interface where VLAN is defined.\n\ -Please remove VLAN from the interface. NETWORK_ALREADY_ATTACHED_TO_CLUSTER=Logical Network is already attached to Cluster. 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 297e832..4ba4b73 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 @@ -544,8 +544,8 @@ ACTION_TYPE_FAILED_PM_ENABLED_WITHOUT_AGENT_CREDENTIALS=Cannot ${action} ${type}. Power Management is enabled for Host but Agent credentials are missing. ACTION_TYPE_FAILED_AGENT_NOT_SUPPORTED=Cannot ${action} ${type}. Selected Power Management Agent is not supported. ACTION_TYPE_FAILED_MOM_UPDATE_VDS_VERSION=Cannot ${action} ${type}. The cluster's compatibility version doesn't support MoM Policy update. -NETWORK_BOND_NOT_ATTACCH_TO_NETWORK=Bond is not attached to Network. -NETWORK_INTERFACE_NOT_ATTACCH_TO_NETWORK=Network Interface is not attached to Logical Network. +NETWORK_BOND_NOT_ATTACH_TO_NETWORK=Bond is not attached to Network. +NETWORK_INTERFACE_NOT_ATTACH_TO_NETWORK=Network Interface is not attached to Logical Network. NETWORK_INTERFACE_IN_USE_BY_VLAN=Bonding cannot be applied on an Interface where VLAN is defined.\n\ -Please remove VLAN from the interface. NETWORK_ALREADY_ATTACHED_TO_CLUSTER=Logical Network is already attached to Cluster. -- To view, visit http://gerrit.ovirt.org/18396 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id8b58c03262196b90611a9bd56bede0e15afd8a5 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alissa Bonas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
