Frank Kobzik has uploaded a new change for review. Change subject: core: Allow VM sorting according to missing fields ......................................................................
core: Allow VM sorting according to missing fields This patch makes it possible to sort search results according to fqdn, migration_progress_percent and run_on_vds_name fields. This enhancement was needed as we also want to sort by these fields in the ui. Change-Id: Id3580a6ac17a1e56bf9de1de09f3ef3a22bbefd4 Signed-off-by: Frantisek Kobzik <[email protected]> Bug-Url: https://bugzilla.redhat.com/1103715 --- M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VmConditionFieldAutoCompleter.java 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/14/28314/1 diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VmConditionFieldAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VmConditionFieldAutoCompleter.java index 332e521..f1a1a90 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VmConditionFieldAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VmConditionFieldAutoCompleter.java @@ -27,6 +27,7 @@ public static final String CPU_USAGE = "CPU_USAGE"; public static final String MEM_USAGE = "MEM_USAGE"; public static final String NETWORK_USAGE = "NETWORK_USAGE"; + public static final String MIGRATION_PROGRESS_PERCENT = "MIGRATION_PROGRESS_PERCENT"; public static final String MEMORY = "MEMORY"; public static final String APPS = "APPS"; public static final String CLUSTER = "CLUSTER"; @@ -46,6 +47,8 @@ mVerbs.add(COMMENT); mVerbs.add(STATUS); mVerbs.add(IP); + mVerbs.add(HOST); + mVerbs.add(FQDN); mVerbs.add(UPTIME); mVerbs.add(OS); mVerbs.add(CREATIONDATE); @@ -54,6 +57,7 @@ mVerbs.add(MEM_USAGE); mVerbs.add(NETWORK_USAGE); mVerbs.add(MEMORY); + mVerbs.add(MIGRATION_PROGRESS_PERCENT); mVerbs.add(APPS); mVerbs.add(CLUSTER); mVerbs.add(POOL); @@ -73,6 +77,7 @@ getTypeDictionary().put(COMMENT, String.class); getTypeDictionary().put(STATUS, VMStatus.class); getTypeDictionary().put(IP, String.class); + getTypeDictionary().put(FQDN, String.class); getTypeDictionary().put(UPTIME, TimeSpan.class); getTypeDictionary().put(OS, String.class); getTypeDictionary().put(CREATIONDATE, Date.class); @@ -80,6 +85,7 @@ getTypeDictionary().put(CPU_USAGE, Integer.class); getTypeDictionary().put(MEM_USAGE, Integer.class); getTypeDictionary().put(NETWORK_USAGE, Integer.class); + getTypeDictionary().put(MIGRATION_PROGRESS_PERCENT, Integer.class); getTypeDictionary().put(MEMORY, Integer.class); getTypeDictionary().put(APPS, String.class); getTypeDictionary().put(CLUSTER, String.class); @@ -99,6 +105,7 @@ columnNameDict.put(COMMENT, "vm_comment"); columnNameDict.put(STATUS, "status"); columnNameDict.put(IP, "vm_ip"); + columnNameDict.put(FQDN, "vm_fqdn"); columnNameDict.put(UPTIME, "elapsed_time"); columnNameDict.put(OS, "vm_os"); columnNameDict.put(CREATIONDATE, "vm_creation_date"); @@ -106,6 +113,7 @@ columnNameDict.put(MEM_USAGE, "usage_mem_percent"); columnNameDict.put(NETWORK_USAGE, "usage_network_percent"); columnNameDict.put(CPU_USAGE, "usage_cpu_percent"); + columnNameDict.put(MIGRATION_PROGRESS_PERCENT, "migration_progress_percent"); columnNameDict.put(MEMORY, "vm_mem_size_mb"); columnNameDict.put(APPS, "app_list"); columnNameDict.put(CLUSTER, "vds_group_name"); @@ -137,7 +145,8 @@ if (UPTIME.equals(fieldName) || CREATIONDATE.equals(fieldName)) { return BiggerOrSmallerRelationAutoCompleter.INSTANCE; } else if (CPU_USAGE.equals(fieldName) || MEM_USAGE.equals(fieldName) - || MEM_USAGE.equals(fieldName) || NETWORK_USAGE.equals(fieldName)) { + || MEM_USAGE.equals(fieldName) || NETWORK_USAGE.equals(fieldName) + || MIGRATION_PROGRESS_PERCENT.equals(fieldName)) { return NumericConditionRelationAutoCompleter.INSTANCE; } else if (TAG.equals(fieldName)) { return StringOnlyEqualConditionRelationAutoCompleter.INSTANCE; -- To view, visit http://gerrit.ovirt.org/28314 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id3580a6ac17a1e56bf9de1de09f3ef3a22bbefd4 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Frank Kobzik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
