Tal Nisan has posted comments on this change. Change subject: engine: Improve iSCSI Bond CDA validation ......................................................................
Patch Set 10: (14 comments) http://gerrit.ovirt.org/#/c/26931/10/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/IscsiBondValidatorTest.java File backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/IscsiBondValidatorTest.java: Line 1: package org.ovirt.engine.core.bll.validator; Line 2: Line 3: import static junit.framework.Assert.assertEquals; > please use org.junit.Assert Done Line 4: Line 5: import static org.mockito.Matchers.any; Line 6: import static org.mockito.Mockito.doReturn; Line 7: http://gerrit.ovirt.org/#/c/26931/10/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties File frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties: Line 578: NETWORKS_NOT_IN_SYNC=Cannot ${action} ${type}. The following Networks' definitions on the Network Interfaces are different than those on the Logical Networks. Please synchronize the Network Interfaces before editing the networks: ${NETWORKS_NOT_IN_SYNC}. Line 579: NETWORK_INTERFACES_ALREADY_SPECIFIED=Cannot ${action} ${type}. The following Network Interfaces were specified more than once: ${NETWORK_INTERFACES_ALREADY_SPECIFIED_LIST}. Line 580: ACTION_TYPE_FAILED_EXTERNAL_NETWORKS_CANNOT_BE_PROVISIONED=Cannot ${action} ${type}. The following external networks cannot be configured on host via 'Setup Networks': ${ACTION_TYPE_FAILED_EXTERNAL_NETWORKS_CANNOT_BE_PROVISIONED_LIST}. Line 581: NETWORKS_ALREADY_ATTACHED_TO_IFACES=Cannot ${action} ${type}. The following Logical Networks are attached to more than one Network Interface: ${NETWORKS_ALREADY_ATTACHED_TO_IFACES_LIST}. Line 582: NETWORK_INTERFACES_DONT_EXIST=Cannot ${action} ${type}. The following Network Interfaces don't exist on the Host: ${NETWORK_INTERFACES_DONT_EXIST_LIST}. > "...Interfaces don't exist..." Done in a previous patch Line 583: NETWORKS_DONT_EXIST_IN_CLUSTER=Cannot ${action} ${type}. The following Logical Networks don't exist in the Host's Cluster: ${NETWORKS_DONT_EXIST_IN_CLUSTER_LIST}. Line 584: NETWORKS_DONT_EXIST_IN_DATA_CENTER=Cannot ${action} ${type}. The following Logical Networks: ${networkIds} don't exist in the Data Center: ${dataCenterId}. Line 585: NETWORK_BONDS_INVALID_SLAVE_COUNT=Cannot ${action} ${type}. The following Bonds consist of less than two Network Interfaces: ${NETWORK_BONDS_INVALID_SLAVE_COUNT_LIST}. Line 586: NETWORK_INTERFACES_NOT_EXCLUSIVELY_USED_BY_NETWORK=Cannot ${action} ${type}. The following Network Interfaces can have only a single VM Logical Network, or at most one non-VM Logical Network and/or several VLAN Logical Networks: ${NETWORK_INTERFACES_NOT_EXCLUSIVELY_USED_BY_NETWORK_LIST}. Line 579: NETWORK_INTERFACES_ALREADY_SPECIFIED=Cannot ${action} ${type}. The following Network Interfaces were specified more than once: ${NETWORK_INTERFACES_ALREADY_SPECIFIED_LIST}. Line 580: ACTION_TYPE_FAILED_EXTERNAL_NETWORKS_CANNOT_BE_PROVISIONED=Cannot ${action} ${type}. The following external networks cannot be configured on host via 'Setup Networks': ${ACTION_TYPE_FAILED_EXTERNAL_NETWORKS_CANNOT_BE_PROVISIONED_LIST}. Line 581: NETWORKS_ALREADY_ATTACHED_TO_IFACES=Cannot ${action} ${type}. The following Logical Networks are attached to more than one Network Interface: ${NETWORKS_ALREADY_ATTACHED_TO_IFACES_LIST}. Line 582: NETWORK_INTERFACES_DONT_EXIST=Cannot ${action} ${type}. The following Network Interfaces don't exist on the Host: ${NETWORK_INTERFACES_DONT_EXIST_LIST}. Line 583: NETWORKS_DONT_EXIST_IN_CLUSTER=Cannot ${action} ${type}. The following Logical Networks don't exist in the Host's Cluster: ${NETWORKS_DONT_EXIST_IN_CLUSTER_LIST}. > "...Networks don't exist..." Done in a previous patch Line 584: NETWORKS_DONT_EXIST_IN_DATA_CENTER=Cannot ${action} ${type}. The following Logical Networks: ${networkIds} don't exist in the Data Center: ${dataCenterId}. Line 585: NETWORK_BONDS_INVALID_SLAVE_COUNT=Cannot ${action} ${type}. The following Bonds consist of less than two Network Interfaces: ${NETWORK_BONDS_INVALID_SLAVE_COUNT_LIST}. Line 586: NETWORK_INTERFACES_NOT_EXCLUSIVELY_USED_BY_NETWORK=Cannot ${action} ${type}. The following Network Interfaces can have only a single VM Logical Network, or at most one non-VM Logical Network and/or several VLAN Logical Networks: ${NETWORK_INTERFACES_NOT_EXCLUSIVELY_USED_BY_NETWORK_LIST}. Line 587: NETWORK_CANNOT_DETACH_NETWORK_USED_BY_VMS=Cannot ${action} ${type}. The following VMs are actively using the Logical Network: ${NETWORK_CANNOT_DETACH_NETWORK_USED_BY_VMS_LIST}. Please stop the VMs and try again. Line 580: ACTION_TYPE_FAILED_EXTERNAL_NETWORKS_CANNOT_BE_PROVISIONED=Cannot ${action} ${type}. The following external networks cannot be configured on host via 'Setup Networks': ${ACTION_TYPE_FAILED_EXTERNAL_NETWORKS_CANNOT_BE_PROVISIONED_LIST}. Line 581: NETWORKS_ALREADY_ATTACHED_TO_IFACES=Cannot ${action} ${type}. The following Logical Networks are attached to more than one Network Interface: ${NETWORKS_ALREADY_ATTACHED_TO_IFACES_LIST}. Line 582: NETWORK_INTERFACES_DONT_EXIST=Cannot ${action} ${type}. The following Network Interfaces don't exist on the Host: ${NETWORK_INTERFACES_DONT_EXIST_LIST}. Line 583: NETWORKS_DONT_EXIST_IN_CLUSTER=Cannot ${action} ${type}. The following Logical Networks don't exist in the Host's Cluster: ${NETWORKS_DONT_EXIST_IN_CLUSTER_LIST}. Line 584: NETWORKS_DONT_EXIST_IN_DATA_CENTER=Cannot ${action} ${type}. The following Logical Networks: ${networkIds} don't exist in the Data Center: ${dataCenterId}. > "...don't exist..." Done Line 585: NETWORK_BONDS_INVALID_SLAVE_COUNT=Cannot ${action} ${type}. The following Bonds consist of less than two Network Interfaces: ${NETWORK_BONDS_INVALID_SLAVE_COUNT_LIST}. Line 586: NETWORK_INTERFACES_NOT_EXCLUSIVELY_USED_BY_NETWORK=Cannot ${action} ${type}. The following Network Interfaces can have only a single VM Logical Network, or at most one non-VM Logical Network and/or several VLAN Logical Networks: ${NETWORK_INTERFACES_NOT_EXCLUSIVELY_USED_BY_NETWORK_LIST}. Line 587: NETWORK_CANNOT_DETACH_NETWORK_USED_BY_VMS=Cannot ${action} ${type}. The following VMs are actively using the Logical Network: ${NETWORK_CANNOT_DETACH_NETWORK_USED_BY_VMS_LIST}. Please stop the VMs and try again. Line 588: NON_VM_NETWORK_CANNOT_SUPPORT_STP=Cannot ${action} ${type}. STP can only be enabled on VM Networks. Line 581: NETWORKS_ALREADY_ATTACHED_TO_IFACES=Cannot ${action} ${type}. The following Logical Networks are attached to more than one Network Interface: ${NETWORKS_ALREADY_ATTACHED_TO_IFACES_LIST}. Line 582: NETWORK_INTERFACES_DONT_EXIST=Cannot ${action} ${type}. The following Network Interfaces don't exist on the Host: ${NETWORK_INTERFACES_DONT_EXIST_LIST}. Line 583: NETWORKS_DONT_EXIST_IN_CLUSTER=Cannot ${action} ${type}. The following Logical Networks don't exist in the Host's Cluster: ${NETWORKS_DONT_EXIST_IN_CLUSTER_LIST}. Line 584: NETWORKS_DONT_EXIST_IN_DATA_CENTER=Cannot ${action} ${type}. The following Logical Networks: ${networkIds} don't exist in the Data Center: ${dataCenterId}. Line 585: NETWORK_BONDS_INVALID_SLAVE_COUNT=Cannot ${action} ${type}. The following Bonds consist of less than two Network Interfaces: ${NETWORK_BONDS_INVALID_SLAVE_COUNT_LIST}. > "...following Bonds consist..." Done in a previous patch Line 586: NETWORK_INTERFACES_NOT_EXCLUSIVELY_USED_BY_NETWORK=Cannot ${action} ${type}. The following Network Interfaces can have only a single VM Logical Network, or at most one non-VM Logical Network and/or several VLAN Logical Networks: ${NETWORK_INTERFACES_NOT_EXCLUSIVELY_USED_BY_NETWORK_LIST}. Line 587: NETWORK_CANNOT_DETACH_NETWORK_USED_BY_VMS=Cannot ${action} ${type}. The following VMs are actively using the Logical Network: ${NETWORK_CANNOT_DETACH_NETWORK_USED_BY_VMS_LIST}. Please stop the VMs and try again. Line 588: NON_VM_NETWORK_CANNOT_SUPPORT_STP=Cannot ${action} ${type}. STP can only be enabled on VM Networks. Line 589: NETWORK_MTU_DIFFERENCES=Cannot ${action} ${type}. The following Logical Networks don't have the same MTU value: ${NETWORK_MTU_DIFFERENCES_LIST}. Line 585: NETWORK_BONDS_INVALID_SLAVE_COUNT=Cannot ${action} ${type}. The following Bonds consist of less than two Network Interfaces: ${NETWORK_BONDS_INVALID_SLAVE_COUNT_LIST}. Line 586: NETWORK_INTERFACES_NOT_EXCLUSIVELY_USED_BY_NETWORK=Cannot ${action} ${type}. The following Network Interfaces can have only a single VM Logical Network, or at most one non-VM Logical Network and/or several VLAN Logical Networks: ${NETWORK_INTERFACES_NOT_EXCLUSIVELY_USED_BY_NETWORK_LIST}. Line 587: NETWORK_CANNOT_DETACH_NETWORK_USED_BY_VMS=Cannot ${action} ${type}. The following VMs are actively using the Logical Network: ${NETWORK_CANNOT_DETACH_NETWORK_USED_BY_VMS_LIST}. Please stop the VMs and try again. Line 588: NON_VM_NETWORK_CANNOT_SUPPORT_STP=Cannot ${action} ${type}. STP can only be enabled on VM Networks. Line 589: NETWORK_MTU_DIFFERENCES=Cannot ${action} ${type}. The following Logical Networks don't have the same MTU value: ${NETWORK_MTU_DIFFERENCES_LIST}. > "...Networks don't have..." Done in a previous patch Line 590: NETWORK_MTU_OVERRIDE_NOT_SUPPORTED=Cannot ${action} ${type}. Overriding MTU is not supported for this Data Center's compatibility version. Line 591: ACTION_TYPE_FAILED_MIGRATION_NETWORK_IS_NOT_SUPPORTED=Cannot ${action} ${type}. Migration network is not supported for this cluster version. Line 592: ACTION_TYPE_FAILED_PROVIDER_DOESNT_EXIST=Cannot ${action} ${type}. The provider doesn't exist in the system. Line 593: ACTION_TYPE_FAILED_PROVIDER_NETWORKS_USED=Cannot ${action} ${type}. Several external networks (${NETWORK_NAMES_COUNTER}) are being used by virtual machines and/or templates:\n${NETWORK_NAMES}\n - Please resolve the external networks usage first and try again. Line 588: NON_VM_NETWORK_CANNOT_SUPPORT_STP=Cannot ${action} ${type}. STP can only be enabled on VM Networks. Line 589: NETWORK_MTU_DIFFERENCES=Cannot ${action} ${type}. The following Logical Networks don't have the same MTU value: ${NETWORK_MTU_DIFFERENCES_LIST}. Line 590: NETWORK_MTU_OVERRIDE_NOT_SUPPORTED=Cannot ${action} ${type}. Overriding MTU is not supported for this Data Center's compatibility version. Line 591: ACTION_TYPE_FAILED_MIGRATION_NETWORK_IS_NOT_SUPPORTED=Cannot ${action} ${type}. Migration network is not supported for this cluster version. Line 592: ACTION_TYPE_FAILED_PROVIDER_DOESNT_EXIST=Cannot ${action} ${type}. The provider doesn't exist in the system. > "...provider doesn't exist..." Done in a previous patch Line 593: ACTION_TYPE_FAILED_PROVIDER_NETWORKS_USED=Cannot ${action} ${type}. Several external networks (${NETWORK_NAMES_COUNTER}) are being used by virtual machines and/or templates:\n${NETWORK_NAMES}\n - Please resolve the external networks usage first and try again. Line 594: ACTION_TYPE_FAILED_EXTERNAL_NETWORK_ALREADY_EXISTS=Cannot ${action} ${type}. The external network already exists as '${NetworkName}' in the data center. Line 595: ACTION_TYPE_FAILED_EXTERNAL_NETWORK_MUST_BE_VM_NETWORK=Cannot ${action} ${type}. An external network cannot be a non-VM network. Line 596: ACTION_TYPE_FAILED_EXTERNAL_NETWORK_DETAILS_CANNOT_BE_EDITED=Cannot ${action} ${type}. External network details (except name and description) cannot be changed. Line 1148: # Iscsi Bond Line 1149: VALIDATION_ISCSI_BOND_NAME_MAX=iSCSI bond name must not exceed 50 characters Line 1150: VALIDATION_ISCSI_BOND_NAME_NOT_NULL=iSCSI bond name is required Line 1151: VALIDATION_ISCSI_BOND_DESCRIPTION_MAX=iSCSI bond description must not exceed 4000 characters Line 1152: VALIDATION_ISCSI_BOND_NAME_INVALID_CHARACTER=iSCSI Bond name must be formed from alpha-numeric characters or "-_." > 1) "...or "-_." " Done in a previous patch Line 1153: VALIDATION_SCSI_BOND_DESCRIPTION_INVALID=iSCSI Bond description must be formed only from alpha-numeric characters and special characters that conform to the standard ASCII character set. Line 1154: Line 1155: ISCSI_BOND_NOT_EXIST=Cannot ${action} ${type}. The specified iSCSI bond doesn't exist. Line 1156: ISCSI_BOND_WITH_SAME_NAME_EXIST_IN_DATA_CENTER=Cannot ${action} ${type}. iSCSI bond with the same name already exists in the Data Center. Line 1149: VALIDATION_ISCSI_BOND_NAME_MAX=iSCSI bond name must not exceed 50 characters Line 1150: VALIDATION_ISCSI_BOND_NAME_NOT_NULL=iSCSI bond name is required Line 1151: VALIDATION_ISCSI_BOND_DESCRIPTION_MAX=iSCSI bond description must not exceed 4000 characters Line 1152: VALIDATION_ISCSI_BOND_NAME_INVALID_CHARACTER=iSCSI Bond name must be formed from alpha-numeric characters or "-_." Line 1153: VALIDATION_SCSI_BOND_DESCRIPTION_INVALID=iSCSI Bond description must be formed only from alpha-numeric characters and special characters that conform to the standard ASCII character set. > "iSCSI Bond description..." Done in a previous patch Line 1154: Line 1155: ISCSI_BOND_NOT_EXIST=Cannot ${action} ${type}. The specified iSCSI bond doesn't exist. Line 1156: ISCSI_BOND_WITH_SAME_NAME_EXIST_IN_DATA_CENTER=Cannot ${action} ${type}. iSCSI bond with the same name already exists in the Data Center. Line 1157: ISCSI_BOND_NOT_SUPPORTED=Cannot ${action} ${type}. iSCSI Bond is only supported on Data Center compatibility versions 3.4 and higher. Line 1151: VALIDATION_ISCSI_BOND_DESCRIPTION_MAX=iSCSI bond description must not exceed 4000 characters Line 1152: VALIDATION_ISCSI_BOND_NAME_INVALID_CHARACTER=iSCSI Bond name must be formed from alpha-numeric characters or "-_." Line 1153: VALIDATION_SCSI_BOND_DESCRIPTION_INVALID=iSCSI Bond description must be formed only from alpha-numeric characters and special characters that conform to the standard ASCII character set. Line 1154: Line 1155: ISCSI_BOND_NOT_EXIST=Cannot ${action} ${type}. The specified iSCSI bond doesn't exist. > "...bond doesn't exist." Done in a previous patch Line 1156: ISCSI_BOND_WITH_SAME_NAME_EXIST_IN_DATA_CENTER=Cannot ${action} ${type}. iSCSI bond with the same name already exists in the Data Center. Line 1157: ISCSI_BOND_NOT_SUPPORTED=Cannot ${action} ${type}. iSCSI Bond is only supported on Data Center compatibility versions 3.4 and higher. Line 1158: Line 1159: ACTION_TYPE_FAILED_IDE_INTERFACE_DOES_NOT_SUPPORT_READ_ONLY_ATTR=Cannot ${action} ${type}. An IDE disk can't be read-only. Line 1153: VALIDATION_SCSI_BOND_DESCRIPTION_INVALID=iSCSI Bond description must be formed only from alpha-numeric characters and special characters that conform to the standard ASCII character set. Line 1154: Line 1155: ISCSI_BOND_NOT_EXIST=Cannot ${action} ${type}. The specified iSCSI bond doesn't exist. Line 1156: ISCSI_BOND_WITH_SAME_NAME_EXIST_IN_DATA_CENTER=Cannot ${action} ${type}. iSCSI bond with the same name already exists in the Data Center. Line 1157: ISCSI_BOND_NOT_SUPPORTED=Cannot ${action} ${type}. iSCSI Bond is only supported on Data Center compatibility versions 3.4 and higher. > "iSCSI Bond is..." Done Line 1158: Line 1159: ACTION_TYPE_FAILED_IDE_INTERFACE_DOES_NOT_SUPPORT_READ_ONLY_ATTR=Cannot ${action} ${type}. An IDE disk can't be read-only. Line 1160: Line 1161: ACTION_TYPE_FAILED_STORAGE_CONNECTIONS_CANNOT_BE_ADDED_TO_ISCSI_BOND=Cannot ${action} ${type}. The following storage connections ${connectionIds} cannot be added to the specified iSCSI Bond. \n\ Line 1155: ISCSI_BOND_NOT_EXIST=Cannot ${action} ${type}. The specified iSCSI bond doesn't exist. Line 1156: ISCSI_BOND_WITH_SAME_NAME_EXIST_IN_DATA_CENTER=Cannot ${action} ${type}. iSCSI bond with the same name already exists in the Data Center. Line 1157: ISCSI_BOND_NOT_SUPPORTED=Cannot ${action} ${type}. iSCSI Bond is only supported on Data Center compatibility versions 3.4 and higher. Line 1158: Line 1159: ACTION_TYPE_FAILED_IDE_INTERFACE_DOES_NOT_SUPPORT_READ_ONLY_ATTR=Cannot ${action} ${type}. An IDE disk can't be read-only. > "...disk can't be..." Done in a previous patch Line 1160: Line 1161: ACTION_TYPE_FAILED_STORAGE_CONNECTIONS_CANNOT_BE_ADDED_TO_ISCSI_BOND=Cannot ${action} ${type}. The following storage connections ${connectionIds} cannot be added to the specified iSCSI Bond. \n\ Line 1162: Possible reasons:\n\ Line 1163: - They are not of type iSCSI.\n\ Line 1161: ACTION_TYPE_FAILED_STORAGE_CONNECTIONS_CANNOT_BE_ADDED_TO_ISCSI_BOND=Cannot ${action} ${type}. The following storage connections ${connectionIds} cannot be added to the specified iSCSI Bond. \n\ Line 1162: Possible reasons:\n\ Line 1163: - They are not of type iSCSI.\n\ Line 1164: - Their status is not one of the following: Unknown, Active. InActive.\n\ Line 1165: - They don't belong to the same Data Center as the specified iSCSI Bond. > Three issues I can see with this message: Done Line 1162: Possible reasons:\n\ Line 1163: - They are not of type iSCSI.\n\ Line 1164: - Their status is not one of the following: Unknown, Active. InActive.\n\ Line 1165: - They don't belong to the same Data Center as the specified iSCSI Bond. Line 1166: ACTION_TYPE_FAILED_ISCSI_BOND_NETWORK_CANNOT_BE_REQUIRED=Cannot ${action} ${type}. Required network cannot be a part of an iSCSI Bond. > "...of an iSCSI Bond" Done -- To view, visit http://gerrit.ovirt.org/26931 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1d0ac7e6af6cb87b500740d679af2f13e63dbeb5 Gerrit-PatchSet: 10 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sergey Gotliv <[email protected]> Gerrit-Reviewer: A Burden <[email protected]> Gerrit-Reviewer: Allon Mureinik <[email protected]> Gerrit-Reviewer: Daniel Erez <[email protected]> Gerrit-Reviewer: Maor Lipchuk <[email protected]> Gerrit-Reviewer: Sergey Gotliv <[email protected]> Gerrit-Reviewer: Tal Nisan <[email protected]> Gerrit-Reviewer: Vered Volansky <[email protected]> Gerrit-Reviewer: [email protected] Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
