Tal Nisan has uploaded a new change for review. Change subject: core: Moved command to use CDA message variable add method ......................................................................
core: Moved command to use CDA message variable add method Moved the command classes to use the CDA message variable addition method instead of adding a formatted/concatted string Change-Id: If907a2b8ef62a4dc38d90a7d420bca36737cbcd3 Signed-off-by: Tal Nisan <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddEventSubscriptionCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVMClusterCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ForceSelectSPMCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDiskAlignmentCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HotSetNumberOfCpusCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginBaseCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveDisksCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVdsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpgradeOvirtNodeInternalCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/DeleteGlusterVolumeCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterAsyncCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StartGlusterVolumeCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StopGlusterVolumeCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/DetachNetworkFromVdsInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddLocalStorageDomainCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommon.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ReconstructMasterDomainCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStorageServerConnectionCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageServerConnectionCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommandTest.java 38 files changed, 73 insertions(+), 74 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/27/27427/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddEventSubscriptionCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddEventSubscriptionCommand.java index 0535530..dfac54e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddEventSubscriptionCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddEventSubscriptionCommand.java @@ -47,7 +47,7 @@ retValue = ValidateAdd(eventNotificationMethod, getParameters().getEventSubscriber(), user); } } else { - addCanDoActionMessage(String.format("$eventName %1$s", eventName)); + addCanDoActionMessageVariable("eventName", eventName); addCanDoActionMessage(VdcBllMessages.EN_UNSUPPORTED_NOTIFICATION_EVENT); retValue = false; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java index c200bc2..03bc995 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java @@ -79,7 +79,7 @@ protected void setActionMessageParameters() { addCanDoActionMessage(VdcBllMessages.VAR__ACTION__ADD); addCanDoActionMessage(VdcBllMessages.VAR__TYPE__HOST); - addCanDoActionMessage(String.format("$server %1$s", getParameters().getvds().getHostName())); + addCanDoActionMessageVariable("server", getParameters().getvds().getHostName()); } @Override @@ -415,7 +415,7 @@ e ); addCanDoActionMessage(VdcBllMessages.VDS_SECURITY_CONNECTION_ERROR); - addCanDoActionMessage(String.format("$ErrorMessage %1$s", e.getMessage())); + addCanDoActionMessageVariable("ErrorMessage", e.getMessage()); return failCanDoAction(VdcBllMessages.VDS_CANNOT_AUTHENTICATE_TO_SERVER); } catch (Exception e) { log.errorFormat( diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java index 6f5e667..95c5e14 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java @@ -135,7 +135,7 @@ if (getVdsGroup().supportsGlusterService() && !GlusterFeatureSupported.gluster(getVdsGroup().getcompatibility_version())) { addCanDoActionMessage(VdcBllMessages.GLUSTER_NOT_SUPPORTED); - addCanDoActionMessage(String.format("$compatibilityVersion %1$s", getVdsGroup().getcompatibility_version().getValue())); + addCanDoActionMessageVariable("compatibilityVersion", getVdsGroup().getcompatibility_version().getValue()); result = false; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java index bf99076..c96f65f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java @@ -117,8 +117,8 @@ vmFromConfiguration = getVmFromConfiguration(); if (vmFromConfiguration == null) { addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_VM_SNAPSHOT_HAS_NO_CONFIGURATION); - addCanDoActionMessage(String.format("$VmName %1$s", getVmName())); - addCanDoActionMessage(String.format("$SnapshotName %1$s", getSnapshotName())); + addCanDoActionMessageVariable("VmName", getVmName()); + addCanDoActionMessageVariable("SnapshotName", getSnapshotName()); return false; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java index 03a1a41..8d7b8ff 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java @@ -82,7 +82,7 @@ if (((DiskImage) disk).getImageStatus() == ImageStatus.LOCKED) { addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_DISKS_LOCKED); - addCanDoActionMessage(String.format("$%1$s %2$s", "diskAliases", disk.getDiskAlias())); + addCanDoActionMessageVariable("diskAliases", disk.getDiskAlias()); return false; } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java index b6fb01f..d5bf547 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java @@ -186,7 +186,7 @@ } private void addNoUpServerMessage(VDSGroup cluster) { - addCanDoActionMessage(String.format("$clusterName %1$s", cluster.getName())); + addCanDoActionMessageVariable("clusterName", cluster.getName()); addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_NO_UP_SERVER_FOUND); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVMClusterCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVMClusterCommand.java index 21535b5..f9b87aa 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVMClusterCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVMClusterCommand.java @@ -177,7 +177,7 @@ } if (missingNets.length() > 0) { addCanDoActionMessage(VdcBllMessages.MOVE_VM_CLUSTER_MISSING_NETWORK); - addCanDoActionMessage(String.format("$networks %1$s", missingNets.toString())); + addCanDoActionMessageVariable("networks", missingNets.toString()); return false; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java index c964f84..7e4d6c9 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java @@ -131,7 +131,7 @@ } } else { addCanDoActionMessage(VdcBllMessages.VDS_FENCE_DISABLED_AT_QUIET_TIME); - addCanDoActionMessage(String.format("$seconds %1$s", secondsLeftToNextPmOp)); + addCanDoActionMessageVariable("seconds", secondsLeftToNextPmOp); } } else { addCanDoActionMessage(VdcBllMessages.VDS_FENCE_DISABLED_AT_SYSTEM_STARTUP_INTERVAL); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ForceSelectSPMCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ForceSelectSPMCommand.java index 2a94b50..abd402e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ForceSelectSPMCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ForceSelectSPMCommand.java @@ -74,7 +74,7 @@ protected void setActionMessageParameters() { addCanDoActionMessage(VdcBllMessages.VAR__ACTION__FORCE_SELECT); addCanDoActionMessage(VdcBllMessages.VAR__TYPE__SPM); - addCanDoActionMessage(String.format("$%1$s %2$s", "VdsName", getVds().getName())); + addCanDoActionMessageVariable("VdsName", getVds().getName()); } private boolean isAsyncTasksRunningOnPool(Guid storagePoolId) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDiskAlignmentCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDiskAlignmentCommand.java index ad5a02c..158cf53 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDiskAlignmentCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDiskAlignmentCommand.java @@ -102,7 +102,7 @@ } if (getVm() == null) { - addCanDoActionMessage(String.format("$diskAliases %1$s", getDiskAlias())); + addCanDoActionMessageVariable("diskAliases", getDiskAlias()); return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_DISK_IS_NOT_VM_DISK); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HotSetNumberOfCpusCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HotSetNumberOfCpusCommand.java index 3a4cd46..e9fa93b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HotSetNumberOfCpusCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HotSetNumberOfCpusCommand.java @@ -95,7 +95,7 @@ protected void setActionMessageParameters() { addCanDoActionMessage(VdcBllMessages.VAR__ACTION__HOT_SET_CPUS); addCanDoActionMessage(VdcBllMessages.VAR__TYPE__VM); - addCanDoActionMessage(String.format("$clusterVersion %1$s", getVm().getVdsGroupCompatibilityVersion() )); - addCanDoActionMessage(String.format("$architecture %1$s", getVm().getClusterArch())); + addCanDoActionMessageVariable("clusterVersion", getVm().getVdsGroupCompatibilityVersion()); + addCanDoActionMessageVariable("architecture", getVm().getClusterArch()); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginBaseCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginBaseCommand.java index 8364663..82b7009 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginBaseCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginBaseCommand.java @@ -361,14 +361,14 @@ boolean addedUserPasswordExpiredCDA = false; if (outputMap.<String> get(Authn.InvokeKeys.CREDENTIALS_CHANGE_URL) != null) { addCanDoActionMessage(VdcBllMessages.USER_PASSWORD_EXPIRED_CHANGE_URL_PROVIDED); - addCanDoActionMessage(String.format("$URL %1$s", - outputMap.<String> get(Authn.InvokeKeys.CREDENTIALS_CHANGE_URL))); + addCanDoActionMessageVariable("URL", + outputMap.<String>get(Authn.InvokeKeys.CREDENTIALS_CHANGE_URL)); addedUserPasswordExpiredCDA = true; } if (outputMap.<String> get(Authn.InvokeKeys.USER_MESSAGE) != null) { addCanDoActionMessage(VdcBllMessages.USER_PASSWORD_EXPIRED_CHANGE_MSG_PROVIDED); - addCanDoActionMessage(String.format("$MSG %1$s", - outputMap.<String> get(Authn.InvokeKeys.USER_MESSAGE))); + addCanDoActionMessageVariable("MSG", + outputMap.<String>get(Authn.InvokeKeys.USER_MESSAGE)); addedUserPasswordExpiredCDA = true; } if (!addedUserPasswordExpiredCDA) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveDisksCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveDisksCommand.java index b6271a4..72d9cb4 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveDisksCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveDisksCommand.java @@ -82,15 +82,14 @@ private void addDisksDeactivatedMessage(List<MoveDiskParameters> moveDiskParamsList) { setActionMessageParameters(); - addCanDoActionMessage(String.format("$%1$s %2$s", "diskAliases", - StringUtils.join(getDisksAliases(moveDiskParamsList), ", "))); + addCanDoActionMessageVariable("diskAliases", StringUtils.join(getDisksAliases(moveDiskParamsList), ", ")); addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_MOVE_DISKS_MIXED_PLUGGED_STATUS); getReturnValue().setCanDoAction(false); } private void addInvalidVmStateMessage(VM vm){ setActionMessageParameters(); - addCanDoActionMessage(String.format("$%1$s %2$s", "VmName", vm.getName())); + addCanDoActionMessageVariable("VmName", vm.getName()); addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_VM_IS_NOT_DOWN_OR_UP); getReturnValue().setCanDoAction(false); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java index bce37f4..a1c63cf 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java @@ -249,7 +249,7 @@ imagesOnStorageDomain = (List<Guid>) returnValue.getReturnValue(); alreadyRetrieved.put(targetStorageDomainId, imagesOnStorageDomain); } else { - addCanDoActionMessage(String.format("$sdName %1$s", getStorageDomain(targetStorageDomainId).getName())); + addCanDoActionMessageVariable("sdName", getStorageDomain(targetStorageDomainId).getName()); addCanDoActionMessage(VdcBllMessages.ERROR_GET_IMAGE_LIST); return false; } @@ -363,8 +363,8 @@ for (VmNic iface : ifaces) { if (!StringUtils.isEmpty(iface.getMacAddress())) { if(!VALIDATE_MAC_ADDRESS.matcher(iface.getMacAddress()).matches()) { - addCanDoActionMessage("$IfaceName " + iface.getName()); - addCanDoActionMessage("$MacAddress " + iface.getMacAddress()); + addCanDoActionMessageVariable("IfaceName ", iface.getName()); + addCanDoActionMessageVariable("MacAddress ", iface.getMacAddress()); addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_NETWORK_INTERFACE_MAC_INVALID); return false; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterDiskCommand.java index 71a8f9a..755e483 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterDiskCommand.java @@ -34,22 +34,22 @@ protected boolean canDoAction() { // Currently this only supports importing images and does not work with luns. if (getParameters().getDiskImage().getDiskStorageType() != DiskStorageType.IMAGE) { - addCanDoActionMessage("$diskId " + getParameters().getDiskImage().getId()); - addCanDoActionMessage("$storageType " + getParameters().getDiskImage().getDiskStorageType()); + addCanDoActionMessageVariable("diskId", getParameters().getDiskImage().getId()); + addCanDoActionMessageVariable("storageType", getParameters().getDiskImage().getDiskStorageType()); addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_UNSUPPORTED_DISK_STORAGE_TYPE); return false; } if (!validate(new StorageDomainValidator(getStorageDomain()).isDomainExistAndActive())) { - addCanDoActionMessage("$diskId " + getParameters().getDiskImage().getId()); - addCanDoActionMessage("$domainId " + getStorageDomainId()); + addCanDoActionMessageVariable("diskId", getParameters().getDiskImage().getId()); + addCanDoActionMessageVariable("domainId", getStorageDomainId()); addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_DOMAIN_UNAVAILABLE); return false; } if (!getStorageDomain().getStorageDomainType().isDataDomain()) { - addCanDoActionMessage("$domainId " + getParameters().getStorageDomainId()); - addCanDoActionMessage("$domainType " + getStorageDomain().getStorageDomainType()); + addCanDoActionMessageVariable("domainId", getParameters().getStorageDomainId()); + addCanDoActionMessageVariable("domainType", getStorageDomain().getStorageDomainType()); addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_DOMAIN_TYPE_UNSUPPORTED); return false; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java index 3eea4d0..86ce6b8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java @@ -197,7 +197,7 @@ List<String> vmNames = getNamesOfDerivedVmsFromTemplate(diskImage); if (!vmNames.isEmpty()) { addCanDoActionMessage(VdcBllMessages.VMT_CANNOT_REMOVE_DETECTED_DERIVED_VM); - addCanDoActionMessage(String.format("$vmsList %1$s", StringUtils.join(vmNames, ","))); + addCanDoActionMessageVariable("vmsList", StringUtils.join(vmNames, ",")); return false; } return true; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVdsCommand.java index ba12b85..a2b6154 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVdsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVdsCommand.java @@ -101,7 +101,7 @@ } else if (upServer == null && clusterHasMultipleHosts()) { // fail if there is no up server in cluster, and if host being removed is not // the last server in cluster - addCanDoActionMessage(String.format("$clusterName %1$s", getVdsGroup().getName())); + addCanDoActionMessageVariable("clusterName", getVdsGroup().getName()); returnValue = failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_NO_UP_SERVER_FOUND); } } else { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java index 99841a8..fdbb71a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java @@ -121,7 +121,7 @@ } if (!problematicDomains.isEmpty()) { addCanDoActionMessage(VdcBllMessages.VMT_CANNOT_REMOVE_DOMAINS_LIST_MISMATCH); - addCanDoActionMessage(String.format("$domainsList %1$s", StringUtils.join(problematicDomains, ","))); + addCanDoActionMessageVariable("domainsList", StringUtils.join(problematicDomains, ",")); return false; } getParameters().setRemoveTemplateFromDb(allDomainsList.size() == storageDomainsList.size()); @@ -165,7 +165,7 @@ if (!problematicVmNames.isEmpty()) { addCanDoActionMessage(VdcBllMessages.VMT_CANNOT_REMOVE_DETECTED_DERIVED_VM); - addCanDoActionMessage(String.format("$vmsList %1$s", StringUtils.join(problematicVmNames, ","))); + addCanDoActionMessageVariable("vmsList", StringUtils.join(problematicVmNames, ",")); return false; } @@ -179,7 +179,7 @@ } addCanDoActionMessage(VdcBllMessages.VMT_CANNOT_REMOVE_BASE_WITH_VERSIONS); - addCanDoActionMessage(String.format("$versionsList %1$s", StringUtils.join(templateVersionsNames, ","))); + addCanDoActionMessageVariable("versionsList", StringUtils.join(templateVersionsNames, ",")); return false; } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java index dcfd41b..96f1b34 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java @@ -337,7 +337,7 @@ if (getVdsGroup().supportsGlusterService() && !GlusterFeatureSupported.gluster(getVdsGroup().getcompatibility_version())) { addCanDoActionMessage(VdcBllMessages.GLUSTER_NOT_SUPPORTED); - addCanDoActionMessage(String.format("$compatibilityVersion %1$s", getVdsGroup().getcompatibility_version().getValue())); + addCanDoActionMessageVariable("compatibilityVersion", getVdsGroup().getcompatibility_version().getValue()); result = false; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java index de14f97..f99ecc7 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java @@ -449,7 +449,7 @@ } if (!vmsWithBoot.isEmpty()) { - addCanDoActionMessage(String.format("$VmsName %1$s", StringUtils.join(vmsWithBoot.toArray(), ", "))); + addCanDoActionMessageVariable("VmsName", StringUtils.join(vmsWithBoot.toArray(), ", ")); return new ValidationResult(VdcBllMessages.ACTION_TYPE_FAILED_VMS_BOOT_IN_USE); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpgradeOvirtNodeInternalCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpgradeOvirtNodeInternalCommand.java index f4a4cb7..b58962f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpgradeOvirtNodeInternalCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpgradeOvirtNodeInternalCommand.java @@ -96,7 +96,7 @@ RpmVersion ovirtHostOsVersion = VdsHandler.getOvirtHostOsVersion(getVds()); if (!isISOCompatible(iso, ovirtHostOsVersion)) { addCanDoActionMessage(VdcBllMessages.VDS_CANNOT_UPGRADE_BETWEEN_MAJOR_VERSION); - addCanDoActionMessage(String.format("$IsoVersion %1$s", ovirtHostOsVersion.getMajor())); + addCanDoActionMessageVariable("IsoVersion", ovirtHostOsVersion.getMajor()); return false; } _iso = iso; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java index f02027f..61458b3f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java @@ -525,7 +525,7 @@ if (!VmPayload.isPayloadSizeLegal(content)) { Integer lengthInKb = 2 * Config.<Integer> getValue(ConfigValues.PayloadSize) / Kb; addCanDoActionMessage(VdcBllMessages.VMPAYLOAD_SIZE_EXCEEDED); - addCanDoActionMessage(String.format("$size %1$s", lengthInKb.toString())); + addCanDoActionMessageVariable("size", lengthInKb.toString()); returnValue = false; break; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeCommand.java index d19d3d3..65db005 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeCommand.java @@ -101,7 +101,7 @@ if (volumeNameExists(volume.getName())) { addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_GLUSTER_VOLUME_NAME_ALREADY_EXISTS); - addCanDoActionMessage(String.format("$volumeName %1$s", volume.getName())); + addCanDoActionMessageVariable("volumeName", volume.getName()); return false; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/DeleteGlusterVolumeCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/DeleteGlusterVolumeCommand.java index 197c35e..1ad27a5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/DeleteGlusterVolumeCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/DeleteGlusterVolumeCommand.java @@ -37,7 +37,7 @@ GlusterVolumeEntity volume = getGlusterVolume(); if (volume.isOnline()) { addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_GLUSTER_VOLUME_IS_UP); - addCanDoActionMessage(String.format("$volumeName %1$s", volume.getName())); + addCanDoActionMessageVariable("volumeName", volume.getName()); return false; } return true; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterAsyncCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterAsyncCommandBase.java index 6ea55e3..37cc54f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterAsyncCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterAsyncCommandBase.java @@ -50,8 +50,8 @@ @Override protected void setActionMessageParameters() { - addCanDoActionMessage(String.format("$volumeName %1$s", getGlusterVolumeName())); - addCanDoActionMessage(String.format("$vdsGroup %1$s", getVdsGroupName())); + addCanDoActionMessageVariable("volumeName", getGlusterVolumeName()); + addCanDoActionMessageVariable("vdsGroup", getVdsGroupName()); } protected Map<String, String> getStepMessageMap(JobExecutionStatus status) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterCommandBase.java index 9ff894e..bab92da 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterCommandBase.java @@ -100,7 +100,7 @@ upServer = getUpServer(); if (upServer == null) { - addCanDoActionMessage(String.format("$clusterName %1$s", getVdsGroup().getName())); + addCanDoActionMessageVariable("clusterName", getVdsGroup().getName()); addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_NO_UP_SERVER_FOUND); return false; } @@ -151,7 +151,7 @@ for (GlusterBrickEntity brick : newBricks) { if (bricks.contains(brick.getQualifiedName())) { addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_DUPLICATE_BRICKS); - addCanDoActionMessage(String.format("$brick %1$s", brick.getQualifiedName())); + addCanDoActionMessageVariable("brick", brick.getQualifiedName()); return false; } bricks.add(brick.getQualifiedName()); @@ -160,9 +160,9 @@ getGlusterBrickDao().getBrickByServerIdAndDirectory(brick.getServerId(), brick.getBrickDirectory()); if (existingBrick != null) { addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_BRICK_ALREADY_EXISTS_IN_VOLUME); - addCanDoActionMessage(String.format("$brick %1$s", brick.getQualifiedName())); - addCanDoActionMessage(String.format("$volumeName %1$s", - getGlusterVolumeDao().getById(existingBrick.getVolumeId()).getName())); + addCanDoActionMessageVariable("brick", brick.getQualifiedName()); + addCanDoActionMessageVariable("volumeName", + getGlusterVolumeDao().getById(existingBrick.getVolumeId()).getName()); return false; } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StartGlusterVolumeCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StartGlusterVolumeCommand.java index 0b7ba46..d731d2b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StartGlusterVolumeCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StartGlusterVolumeCommand.java @@ -38,7 +38,7 @@ GlusterVolumeEntity volume = getGlusterVolume(); if (volume.isOnline()) { addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_GLUSTER_VOLUME_ALREADY_STARTED); - addCanDoActionMessage(String.format("$volumeName %1$s", volume.getName())); + addCanDoActionMessageVariable("volumeName", volume.getName()); return false; } return true; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StopGlusterVolumeCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StopGlusterVolumeCommand.java index 748e475..c9a9e40 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StopGlusterVolumeCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StopGlusterVolumeCommand.java @@ -30,8 +30,8 @@ protected void setActionMessageParameters() { addCanDoActionMessage(VdcBllMessages.VAR__ACTION__STOP); addCanDoActionMessage(VdcBllMessages.VAR__TYPE__GLUSTER_VOLUME); - addCanDoActionMessage(String.format("$volumeName %1$s", getGlusterVolumeName())); - addCanDoActionMessage(String.format("$vdsGroup %1$s", getVdsGroupName())); + addCanDoActionMessageVariable("volumeName", getGlusterVolumeName()); + addCanDoActionMessageVariable("vdsGroup", getVdsGroupName()); } @Override @@ -43,7 +43,7 @@ GlusterVolumeEntity volume = getGlusterVolume(); if (!volume.isOnline()) { addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_GLUSTER_VOLUME_ALREADY_STOPPED); - addCanDoActionMessage(String.format("$volumeName %1$s", volume.getName())); + addCanDoActionMessageVariable("volumeName", volume.getName()); return false; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java index f32e34e..6379038 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java @@ -334,7 +334,7 @@ DiskImage diskImage = getDiskImageByImageId(imageId); if (diskImage.isShareable()) { - addCanDoActionMessage(String.format("$%1$s %2$s", "diskAliases", diskImage.getDiskAlias())); + addCanDoActionMessageVariable("diskAliases", diskImage.getDiskAlias()); return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_SHAREABLE_DISK_NOT_SUPPORTED); } 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 7d3e854..1b85903 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 @@ -144,9 +144,9 @@ if (!vmNames.isEmpty()) { addCanDoActionMessage(VdcBllMessages.NETWORK_CANNOT_DETACH_NETWORK_USED_BY_VMS); - addCanDoActionMessage(String.format("$%s_LIST %s", - VdcBllMessages.NETWORK_CANNOT_DETACH_NETWORK_USED_BY_VMS.name(), - StringUtils.join(vmNames, ","))); + addCanDoActionMessageVariable(String.format("$%s_LIST", + VdcBllMessages.NETWORK_CANNOT_DETACH_NETWORK_USED_BY_VMS.name()), + StringUtils.join(vmNames, ",")); return false; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddLocalStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddLocalStorageDomainCommand.java index d90f6e9..ba8e772 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddLocalStorageDomainCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddLocalStorageDomainCommand.java @@ -67,7 +67,7 @@ String rhevhLocalFSPath = Config.<String> getValue(ConfigValues.RhevhLocalFSPath); if (!conn.getconnection().equals(rhevhLocalFSPath)) { addCanDoActionMessage(VdcBllMessages.RHEVH_LOCALFS_WRONG_PATH_LOCATION); - addCanDoActionMessage(String.format("$path %1$s", rhevhLocalFSPath)); + addCanDoActionMessageVariable("path", rhevhLocalFSPath); retVal = false; } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommon.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommon.java index f023ce9..d10f0dc 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommon.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommon.java @@ -56,7 +56,7 @@ } protected boolean prepareFailureMessageForDomains(String domainNames) { - addCanDoActionMessage(String.format("$domainNames %1$s", domainNames)); + addCanDoActionMessageVariable("domainNames", domainNames); return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_CONNECTION_BELONGS_TO_SEVERAL_STORAGE_DOMAINS); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ReconstructMasterDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ReconstructMasterDomainCommand.java index 1ac16e5..d021518 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ReconstructMasterDomainCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ReconstructMasterDomainCommand.java @@ -89,7 +89,7 @@ protected void addInvalidSDStatusMessage(StorageDomainStatus status) { addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_DOMAIN_STATUS_ILLEGAL2); - addCanDoActionMessage(String.format("$status %1$s", status)); + addCanDoActionMessageVariable("status", status); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStorageServerConnectionCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStorageServerConnectionCommand.java index 72a624d..79c5f0c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStorageServerConnectionCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStorageServerConnectionCommand.java @@ -143,18 +143,18 @@ } protected boolean prepareFailureMessageForDomains(String domainNames) { - addCanDoActionMessage(String.format("$domainNames %1$s", domainNames)); + addCanDoActionMessageVariable("domainNames", domainNames); return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_CONNECTION_BELONGS_TO_SEVERAL_STORAGE_DOMAINS); } protected boolean prepareFailureMessageForDisks(String diskNames) { - addCanDoActionMessage(String.format("$diskNames %1$s", diskNames)); + addCanDoActionMessageVariable("diskNames", diskNames); return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_CONNECTION_BELONGS_TO_SEVERAL_DISKS); } protected boolean prepareFailureMessageForDomainsAndDisks(String domainNames, String diskNames) { - addCanDoActionMessage(String.format("$domainNames %1$s", domainNames)); - addCanDoActionMessage(String.format("$diskNames %1$s", diskNames)); + addCanDoActionMessageVariable("domainNames", domainNames); + addCanDoActionMessageVariable("diskNames", diskNames); return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_CONNECTION_BELONGS_TO_SEVERAL_STORAGE_DOMAINS_AND_DISKS); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBase.java index 06b81c8..d3408e6 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBase.java @@ -254,7 +254,7 @@ for (LUNs lun : lunsUsedBySDs) { formattedIds.add(getFormattedLunId(lun, lun.getStorageDomainName())); } - addCanDoActionMessage(String.format("$lunIds %1$s", StringUtils.join(formattedIds, ", "))); + addCanDoActionMessageVariable("lunIds", StringUtils.join(formattedIds, ", ")); } if (!lunsUsedByDisks.isEmpty()) { @@ -263,7 +263,7 @@ for (LUNs lun : lunsUsedByDisks) { formattedIds.add(getFormattedLunId(lun, lun.getDiskAlias())); } - addCanDoActionMessage(String.format("$lunIds %1$s", StringUtils.join(formattedIds, ", "))); + addCanDoActionMessageVariable("lunIds", StringUtils.join(formattedIds, ", ")); } return !lunsUsedBySDs.isEmpty() || !lunsUsedByDisks.isEmpty(); @@ -399,7 +399,7 @@ protected void addStorageDomainStatusIllegalMessage() { addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_DOMAIN_STATUS_ILLEGAL2); - addCanDoActionMessage(String.format("$status %1$s", getStorageDomainStatus())); + addCanDoActionMessageVariable("status", getStorageDomainStatus()); } protected BaseDiskDao getBaseDiskDao() { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageServerConnectionCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageServerConnectionCommandBase.java index 7f75d88..d2e90e6 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageServerConnectionCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageServerConnectionCommandBase.java @@ -91,7 +91,7 @@ protected boolean checkIsConnectionFieldEmpty(StorageServerConnections connection) { if (StringUtils.isEmpty(connection.getconnection())) { String fieldName = getFieldName(connection); - addCanDoActionMessage(String.format("$fieldName %1$s", fieldName)); + addCanDoActionMessageVariable("fieldName", fieldName); addCanDoActionMessage(VdcBllMessages.VALIDATION_STORAGE_CONNECTION_EMPTY_CONNECTION); return true; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommand.java index b52fb8a..2555e01 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommand.java @@ -101,7 +101,7 @@ if (doDomainsUseConnection(newConnectionDetails) || doLunsUseConnection()) { if (storageType.isFileDomain() && domains.size() > 1) { String domainNames = createDomainNamesList(domains); - addCanDoActionMessage(String.format("$domainNames %1$s", domainNames)); + addCanDoActionMessageVariable("domainNames", domainNames); return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_CONNECTION_BELONGS_TO_SEVERAL_STORAGE_DOMAINS); } // Check that the storage domain is in proper state to be edited @@ -135,7 +135,7 @@ if (connection.getstorage_type().isFileDomain()) { boolean isConnectionEditable = isDomainInEditState(domains.get(0)); if (!isConnectionEditable) { - addCanDoActionMessage(String.format("$domainNames %1$s", domains.get(0).getStorageName())); + addCanDoActionMessageVariable("domainNames", domains.get(0).getStorageName()); addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_CONNECTION_UNSUPPORTED_ACTION_FOR_DOMAINS_STATUS); } return isConnectionEditable; @@ -177,18 +177,18 @@ } if (!problematicVMNames.isEmpty()) { if (problematicDomainNames.isEmpty()) { - addCanDoActionMessage(String.format("$vmNames %1$s", prepareEntityNamesForMessage(problematicVMNames))); + addCanDoActionMessageVariable("vmNames", prepareEntityNamesForMessage(problematicVMNames)); addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_CONNECTION_UNSUPPORTED_ACTION_FOR_RUNNING_VMS); } else { - addCanDoActionMessage(String.format("$vmNames %1$s", prepareEntityNamesForMessage(problematicVMNames))); - addCanDoActionMessage(String.format("$domainNames %1$s", prepareEntityNamesForMessage(problematicDomainNames))); + addCanDoActionMessageVariable("vmNames", prepareEntityNamesForMessage(problematicVMNames)); + addCanDoActionMessageVariable("domainNames", prepareEntityNamesForMessage(problematicDomainNames)); addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_CONNECTION_UNSUPPORTED_ACTION_FOR_RUNNING_VMS_AND_DOMAINS_STATUS); } return false; } if (!problematicDomainNames.isEmpty()) { - addCanDoActionMessage(String.format("$domainNames %1$s", prepareEntityNamesForMessage(problematicDomainNames))); + addCanDoActionMessageVariable("domainNames", prepareEntityNamesForMessage(problematicDomainNames)); addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_CONNECTION_UNSUPPORTED_ACTION_FOR_DOMAINS_STATUS); return false; } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommandTest.java index dc51f96..93627f2 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommandTest.java @@ -73,7 +73,7 @@ assertFalse(cmd.checkIfDisksExist(createImageList())); verify(cmd, times(1)).addCanDoActionMessage(VdcBllMessages.ERROR_GET_IMAGE_LIST); - verify(cmd, times(1)).addCanDoActionMessage("$sdName SD"); + verify(cmd, times(1)).addCanDoActionMessageVariable("sdName", "SD"); verify(cmd, times(1)).runVdsCommand(any(VDSCommandType.class), any(GetImagesListVDSCommandParameters.class)); } -- To view, visit http://gerrit.ovirt.org/27427 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If907a2b8ef62a4dc38d90a7d420bca36737cbcd3 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tal Nisan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
