Alissa Bonas has uploaded a new change for review.

Change subject: engine: Improve error msg in vdsmErrors.properties
......................................................................

engine: Improve error msg in vdsmErrors.properties

Improve error message of case when not being able
to access the master storage domain.
The fix is in VdsmErrors.properties

Change-Id: Iac0b46cfd1cd3f0bf353f5aecd5781b4baa14d6d
Bug-Url: https://bugzilla.redhat.com/975006
Signed-off-by: Alissa Bonas <[email protected]>
---
M backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties
M 
frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties
M 
frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties
3 files changed, 35 insertions(+), 35 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/04/16004/1

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 10aa585..396ac15 100644
--- 
a/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties
+++ 
b/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties
@@ -9,7 +9,7 @@
 GeneralException=General Exception
 HostIdMismatch=Host id not found or does not match manager host id
 ImageDeleteError=Could not remove all files
-ImageDoesNotExistInDomainError=Image does not exist in domain
+ImageDoesNotExistInDomainError=Image does not exist in domain
 ImageIsNotEmpty=Image is not empty
 ImageMissingFromVm=Image missing from VM
 ImagePathError=Image path does not exist or cannot be accessed/created
@@ -53,7 +53,7 @@
 StorageDomainFSNotMounted=Storage domain remote path not mounted
 StorageDomainLayoutError=Storage domain layout corrupted
 StorageDomainMasterCopyError=Error copying master storage domain's data
-StorageDomainMasterError=Error marking master storage domain
+StorageDomainMasterError=Cannot access master storage domain
 StorageDomainMasterUnmountError=Error unmounting master storage domain
 StorageDomainMetadataCreationError=Error creating a storage domain's metadata
 StorageDomainMetadataFileMissing=Could not retrieve metadata file name for 
domain
@@ -206,7 +206,7 @@
 CannotModifyVolumeTime=Cannot change volume's modify time
 CannotDeleteVolume=Volume deletion error
 CannotDeleteSharedVolume=Shared Volume cannot be deleted
-NonLeafVolumeNotWritable=Volume cannot be accessed to writes, it's not a leaf 
volume
+NonLeafVolumeNotWritable=Volume cannot be accessed to writes, it's not a leaf 
volume
 VolumeCopyError=Volume copy failed
 ImageIsNotLegalChain=Image is not a legal chain
 CouldNotValideTemplateOnTargetDomain=Cannot validate template on target domain
@@ -325,26 +325,26 @@
 GlusterSyntaxErrorException=Syntax error
 GlusterMissingArgumentException=Missing argument
 GlusterCmdExecFailedException=Command execution failed
-GlusterXmlErrorException=XML error
+GlusterXmlErrorException=XML error
 GlusterVolumeCreateFailed=Gluster Volume Create Failed
 GlusterVolumeStartFailed=Gluster Volume Start Failed
 GlusterVolumeStopFailed=Gluster Volume Stop Failed
 AddBricksToGlusterVolumeFailed=Gluster Volume Add Brick(s) Failed.
-GlusterVolumeSetOptionFailed=Gluster Volume Set Option Failed
+GlusterVolumeSetOptionFailed=Gluster Volume Set Option Failed
 GlusterVolumeRebalanceStartFailed=Gluster Volume Rebalance Start Failed
 GlusterVolumeDeleteFailed=Gluster Volume Delete Failed
 GlusterVolumeReplaceBrickStartFailed=Gluster Volume Replace Brick Start Failed
 GlusterVolumeListFailed=Failed to fetch Gluster Volume List
 GlusterVolumeOptionInfoFailed=Failed to fetch Gluster Volume Option Info
 GlusterVolumeResetOptionsFailed=Gluster Volume Options Reset Failed
-GlusterVolumeRemoveBricksFailed=Gluster Volume Remove Bricks Failed
+GlusterVolumeRemoveBricksFailed=Gluster Volume Remove Bricks Failed
 GlusterVolumeProfileStartFailed=Gluster Volume Profile Start Failed
 GlusterVolumeProfileStopFailed=Gluster Volume Profile Stop Failed
 GlusterAddHostFailed=Gluster Server Add Failed
 GlusterHostRemoveFailed=Gluster Server Remove Failed
-GlusterPeerListFailed=Gluster Peer List Failed
-GlusterVolumeStatusFailed=Could not fetch advanced volume details
-GlusterVolumeProfileInfoFailed=Gluster Volume Profile Info Failed
+GlusterPeerListFailed=Gluster Peer List Failed
+GlusterVolumeStatusFailed=Could not fetch advanced volume details
+GlusterVolumeProfileInfoFailed=Gluster Volume Profile Info Failed
 GlusterHookFailed=Gluster hook operation  failed
 GlusterHookEnableFailed=Failed to enable gluster hook
 GlusterHookDisableFailed=Failed to disable gluster hook
@@ -361,11 +361,11 @@
 GlusterServiceActionNotSupported=Gluster service action not supported
 GlusterServiceManageFailed=Manage (start/stop/restart) service failed
 GlusterServiceNotSupported=Gluster service not supported
-
+
 CANT_RECONSTRUCT_WHEN_A_DOMAIN_IN_POOL_IS_LOCKED=Can't reconstruct the Master 
Domain when the Data Center contains Domains in Locked state.\nPlease wait 
until the operation for these Domains ends before trying to reconstruct the 
Master Domain again.
 NO_IMPLEMENTATION=Not implemented
-FailedToPlugDisk=Failed to hot-plug disk
-FailedToUnPlugDisk=Failed to hot-unplug disk
+FailedToPlugDisk=Failed to hot-plug disk
+FailedToUnPlugDisk=Failed to hot-unplug disk
 VOLUME_WAS_NOT_PREPARED_BEFORE_TEARDOWN=Volume was not prepared before being 
torn down
 IncorrectType=Incorrect Volume Preallocate Type
 IMAGES_NOT_SUPPORTED_ERROR=This domain does not support images
@@ -374,26 +374,26 @@
 VOLUME_GROUP_BLOCK_SIZE_ERROR=Volume Group block size error
 DEVICE_BLOCK_SIZE_NOT_SUPPORTED=Volume Group block size error, please check 
your Volume Group configuration, Supported block size is 512 bytes.
 HOST_ALREADY_EXISTS=Cannot add Host. Host with same characteristics already 
exists.
-NO_ACTIVE_ISO_DOMAIN_IN_DATA_CENTER=There is no active ISO Domain in Data 
Center.
-PROVIDER_FAILURE=Failed to communicate with the external provider.
-PROVIDER_IMPORT_CERTIFICATE_CHAIN_ERROR=Failed to import provider certificate 
chain.
-PROVIDER_SSL_FAILURE=SSL problem while trying to connect to the external 
provider.
+NO_ACTIVE_ISO_DOMAIN_IN_DATA_CENTER=There is no active ISO Domain in Data 
Center.
+PROVIDER_FAILURE=Failed to communicate with the external provider.
+PROVIDER_IMPORT_CERTIFICATE_CHAIN_ERROR=Failed to import provider certificate 
chain.
+PROVIDER_SSL_FAILURE=SSL problem while trying to connect to the external 
provider.
 MIGRATION_DEST_INVALID_HOSTNAME=Migration destination has an invalid hostname
-MIGRATION_CANCEL_ERROR=Migration not in progress
-MIGRATION_CANCEL_ERROR_NO_VM=Cancel migration has failed. Please try again in 
a few moments and track the VM's event log for details.
-DB=Database error.
-DB_NO_SUCH_VM=Could not find VM in Database.
-MAC_POOL_NO_MACS_LEFT=No available MAC addresses left in the MAC Address Pool.
-MAC_POOL_NOT_INITIALIZED=MAC Address Pool is not defined. Please check your 
configuration using Configuration Tool.
-MAC_ADDRESS_IS_IN_USE=Mac Address is in use.
-RESOURCE_MANAGER_CANT_ALLOC_VDS_MIGRATION=Migration operation canceled, no 
available Destination Host.
-RESOURCE_MANAGER_MIGRATION_FAILED_AT_DST=Migration failed. Probably due to an 
error on destination Host.
-RESOURCE_MANAGER_VDS_NOT_FOUND=Host not found.
-VM_TEMPLATE_CANT_LOCATE_DISKS_IN_DB=Cannot locate the Templates' disks in the 
database.
-VM_WITH_SAME_NAME_EXIST=VM with the same name already exists.
-SNAPSHOT_FAILED=Live snapshot failed.
-# Gluster engine errors
-NO_UP_SERVER_FOUND=No server found in Up status.
-ACTIVATE_NIC_FAILED=Failed to activate VM Network Interface.
+MIGRATION_CANCEL_ERROR=Migration not in progress
+MIGRATION_CANCEL_ERROR_NO_VM=Cancel migration has failed. Please try again in 
a few moments and track the VM's event log for details.
+DB=Database error.
+DB_NO_SUCH_VM=Could not find VM in Database.
+MAC_POOL_NO_MACS_LEFT=No available MAC addresses left in the MAC Address Pool.
+MAC_POOL_NOT_INITIALIZED=MAC Address Pool is not defined. Please check your 
configuration using Configuration Tool.
+MAC_ADDRESS_IS_IN_USE=Mac Address is in use.
+RESOURCE_MANAGER_CANT_ALLOC_VDS_MIGRATION=Migration operation canceled, no 
available Destination Host.
+RESOURCE_MANAGER_MIGRATION_FAILED_AT_DST=Migration failed. Probably due to an 
error on destination Host.
+RESOURCE_MANAGER_VDS_NOT_FOUND=Host not found.
+VM_TEMPLATE_CANT_LOCATE_DISKS_IN_DB=Cannot locate the Templates' disks in the 
database.
+VM_WITH_SAME_NAME_EXIST=VM with the same name already exists.
+SNAPSHOT_FAILED=Live snapshot failed.
+# Gluster engine errors
+NO_UP_SERVER_FOUND=No server found in Up status.
+ACTIVATE_NIC_FAILED=Failed to activate VM Network Interface.
 DEACTIVATE_NIC_FAILED=Failed to deactivate VM Network Interface.
-UPDATE_VNIC_FAILED=Failed to update VM Network Interface.
+UPDATE_VNIC_FAILED=Failed to update VM Network Interface.
diff --git 
a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties
 
b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties
index 424bb1e..bf3287e 100644
--- 
a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties
+++ 
b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties
@@ -51,7 +51,7 @@
 StorageDomainFSNotMounted=Storage domain remote path not mounted
 StorageDomainLayoutError=Storage domain layout corrupted
 StorageDomainMasterCopyError=Error copying master storage domain's data
-StorageDomainMasterError=Error marking master storage domain
+StorageDomainMasterError=Cannot access master storage domain
 StorageDomainMasterUnmountError=Error unmounting master storage domain
 StorageDomainMetadataCreationError=Error creating a storage domain's metadata
 StorageDomainMetadataFileMissing=Could not retrieve metadata file name for 
domain
diff --git 
a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties
 
b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties
index 77c7f08..0924ff2 100644
--- 
a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties
+++ 
b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties
@@ -51,7 +51,7 @@
 StorageDomainFSNotMounted=Storage domain remote path not mounted
 StorageDomainLayoutError=Storage domain layout corrupted
 StorageDomainMasterCopyError=Error copying master storage domain's data
-StorageDomainMasterError=Error marking master storage domain
+StorageDomainMasterError=Cannot access master storage domain
 StorageDomainMasterUnmountError=Error unmounting master storage domain
 StorageDomainMetadataCreationError=Error creating a storage domain's metadata
 StorageDomainMetadataFileMissing=Could not retrieve metadata file name for 
domain


-- 
To view, visit http://gerrit.ovirt.org/16004
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac0b46cfd1cd3f0bf353f5aecd5781b4baa14d6d
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

Reply via email to