Gilad Chaplik has uploaded a new change for review. Change subject: webadmin: rename quota limit labels ......................................................................
webadmin: rename quota limit labels Quota grace and threshold labels should be renamed to hard and soft limit respectively, also in searchBackend. Change-Id: I889f019b18b23c3b666d4d8e14a614103123fc30 Signed-off-by: Gilad Chaplik <[email protected]> --- M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/QuotaConditionFieldAutoCompleter.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java 2 files changed, 22 insertions(+), 21 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/68/14168/1 diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/QuotaConditionFieldAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/QuotaConditionFieldAutoCompleter.java index 5ae197d..e3d59ca 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/QuotaConditionFieldAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/QuotaConditionFieldAutoCompleter.java @@ -6,10 +6,10 @@ private static final String name = "NAME"; private static final String storagePoolName = "STORAGEPOOLNAME"; private static final String description = "DESCRIPTION"; - private static final String thresholdVdsGroupPercentage = "THRESHOLDVDSGROUPPERCENTAGE"; - private static final String thresholdStoragePercentage = "THRESHOLDSTORAGEPERCENTAGE"; - private static final String graceVdsGrouPercentage = "GRACEVDSGROUPPERCENTAGE"; - private static final String graceStoragePercentage = "GRACESTORAGEPERCENTAGE"; + private static final String clusterSoftLimit = "CLUSTERSOFTLIMIT"; + private static final String storageSoftLimit = "STORAGESOFTLIMIT"; + private static final String clusterHardLimit = "CLUSTERHARDLIMIT"; + private static final String storageHardLimit = "STORAGEHARDLIMIT"; private static final String enforcementType = "ENFORCEMENTTYPE"; @@ -18,10 +18,10 @@ mVerbs.put(name, name); mVerbs.put(storagePoolName, storagePoolName); mVerbs.put(description, description); - mVerbs.put(thresholdStoragePercentage, thresholdStoragePercentage); - mVerbs.put(thresholdVdsGroupPercentage, thresholdVdsGroupPercentage); - mVerbs.put(graceStoragePercentage, graceStoragePercentage); - mVerbs.put(graceVdsGrouPercentage, graceVdsGrouPercentage); + mVerbs.put(storageSoftLimit, storageSoftLimit); + mVerbs.put(clusterSoftLimit, clusterSoftLimit); + mVerbs.put(storageHardLimit, storageHardLimit); + mVerbs.put(clusterHardLimit, clusterHardLimit); mVerbs.put(enforcementType, enforcementType); // Building the autoCompletion dict. @@ -31,20 +31,20 @@ getTypeDictionary().put(name, String.class); getTypeDictionary().put(storagePoolName, String.class); getTypeDictionary().put(description, String.class); - getTypeDictionary().put(thresholdStoragePercentage, Integer.class); - getTypeDictionary().put(thresholdVdsGroupPercentage, Integer.class); - getTypeDictionary().put(graceStoragePercentage, Integer.class); - getTypeDictionary().put(graceVdsGrouPercentage, Integer.class); + getTypeDictionary().put(storageSoftLimit, Integer.class); + getTypeDictionary().put(clusterSoftLimit, Integer.class); + getTypeDictionary().put(storageHardLimit, Integer.class); + getTypeDictionary().put(clusterHardLimit, Integer.class); getTypeDictionary().put(enforcementType, QuotaEnforcementTypeEnum.class); // building the ColumnName dict. columnNameDict.put(name, "quota_name"); columnNameDict.put(storagePoolName, "storage_pool_name"); columnNameDict.put(description, "description"); - columnNameDict.put(thresholdVdsGroupPercentage, "threshold_vds_group_percentage"); - columnNameDict.put(thresholdStoragePercentage, "threshold_storage_percentage"); - columnNameDict.put(graceStoragePercentage, "grace_storage_percentage"); - columnNameDict.put(graceVdsGrouPercentage, "grace_vds_group_percentage"); + columnNameDict.put(clusterSoftLimit, "threshold_vds_group_percentage"); + columnNameDict.put(storageSoftLimit, "threshold_storage_percentage"); + columnNameDict.put(storageHardLimit, "grace_storage_percentage"); + columnNameDict.put(clusterHardLimit, "grace_vds_group_percentage"); columnNameDict.put(enforcementType, "quota_enforcement_type"); // Building the validation dict. diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java index 7ae679e..d4a7a42 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java @@ -605,7 +605,8 @@ @DefaultStringValue("CPU Threads") String clusterPopupCpuThreadsPanelTitle(); - @DefaultStringValue("Allow guests to use host threads as virtual CPU cores, utilizing AMD Clustered MultiThreading or Intel" + + @DefaultStringValue("Allow guests to use host threads as virtual CPU cores, utilizing AMD Clustered MultiThreading or Intel" + + " Hyper-Threading technology on the virtualization host. Enabling this option may be useful for less" + " CPU-intensive workloads, or to run guests with CPU configurations that would otherwise be restricted.") String clusterPopupCpuThreadsInfo(); @@ -2491,16 +2492,16 @@ @DefaultStringValue("Max Std Allocated") String maxStdAllocatedBrickAdvancedLabel(); - @DefaultStringValue("Cluster Threshold") + @DefaultStringValue("Cluster Soft Limit") String quotaClusterThreshold(); - @DefaultStringValue("Cluster Grace") + @DefaultStringValue("Cluster Hard Limit") String quotaClusterGrace(); - @DefaultStringValue("Storage Threshold") + @DefaultStringValue("Storage Soft Limit") String quotaStorageThreshold(); - @DefaultStringValue("Storage Grace") + @DefaultStringValue("Storage Hard Limit") String quotaStorageGrace(); @DefaultStringValue("Clone All VMs") -- To view, visit http://gerrit.ovirt.org/14168 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I889f019b18b23c3b666d4d8e14a614103123fc30 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Gilad Chaplik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
