Ravi Nori has uploaded a new change for review. Change subject: core : Search VMs based on MAC address ......................................................................
core : Search VMs based on MAC address Users should be able to search for VMs from Webadmin-Portal Search bar using a search query filtering on mac address: Vms: Vnic.mac = 00:1a:4a:b4:9b:a8 Change-Id: I42229383647c4494ffab75af1ad6e619ad02fe5f Bug-Url: https://bugzilla.redhat.com/1016916 Signed-off-by: Ravi Nori <rn...@redhat.com> --- M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkInterfaceConditionFieldAutoCompleter.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VmConditionFieldAutoCompleter.java M packaging/dbscripts/create_views.sql 3 files changed, 7 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/48/25848/1 diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkInterfaceConditionFieldAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkInterfaceConditionFieldAutoCompleter.java index 0e5f568..89ab61e 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkInterfaceConditionFieldAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkInterfaceConditionFieldAutoCompleter.java @@ -3,19 +3,23 @@ public class NetworkInterfaceConditionFieldAutoCompleter extends BaseConditionFieldAutoCompleter { private static final String NETWORK_NAME = "NETWORK_NAME"; + private static final String MAC_ADDR = "MAC"; public NetworkInterfaceConditionFieldAutoCompleter() { // Building the basic verbs dict. mVerbs.add(NETWORK_NAME); + mVerbs.add(MAC_ADDR); // Building the autoCompletion dict. buildCompletions(); // Building the types dict. getTypeDictionary().put(NETWORK_NAME, String.class); + getTypeDictionary().put(MAC_ADDR, String.class); // building the ColumnName dict. columnNameDict.put(NETWORK_NAME, "network_name"); + columnNameDict.put(MAC_ADDR, "mac_addr"); // Building the validation dict. buildBasicValidationTable(); 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 bb0618c..a3b4590 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 @@ -19,7 +19,6 @@ mVerbs.add("COMMENT"); mVerbs.add("STATUS"); mVerbs.add("IP"); - mVerbs.add("MAC"); mVerbs.add("UPTIME"); mVerbs.add("DOMAIN"); mVerbs.add("OS"); @@ -48,7 +47,6 @@ getTypeDictionary().put("COMMENT", String.class); getTypeDictionary().put("STATUS", VMStatus.class); getTypeDictionary().put("IP", String.class); - getTypeDictionary().put("MAC", String.class); getTypeDictionary().put("UPTIME", TimeSpan.class); getTypeDictionary().put("DOMAIN", String.class); getTypeDictionary().put("OS", String.class); @@ -76,7 +74,6 @@ columnNameDict.put("COMMENT", "vm_comment"); columnNameDict.put("STATUS", "status"); columnNameDict.put("IP", "vm_ip"); - columnNameDict.put("MAC", "vm_interface_mac_addr"); columnNameDict.put("UPTIME", "elapsed_time"); columnNameDict.put("OS", "vm_os"); columnNameDict.put("CREATIONDATE", "vm_creation_date"); @@ -88,7 +85,6 @@ columnNameDict.put("APPS", "app_list"); columnNameDict.put("CLUSTER", "vds_group_name"); columnNameDict.put("POOL", "vm_pool_name"); - // mColumnNameDict.Add("NOTE", "note"); columnNameDict.put("LOGGEDINUSER", "guest_cur_user_name"); columnNameDict.put("TAG", "tag_name"); columnNameDict.put("DATACENTER", "storage_pool_name"); diff --git a/packaging/dbscripts/create_views.sql b/packaging/dbscripts/create_views.sql index 448e9f0..0705653 100644 --- a/packaging/dbscripts/create_views.sql +++ b/packaging/dbscripts/create_views.sql @@ -619,8 +619,7 @@ vm_dynamic.last_watchdog_event as last_watchdog_event, vm_dynamic.last_watchdog_action as last_watchdog_action, vm_dynamic.is_run_once as is_run_once, vm_dynamic.vm_fqdn as vm_fqdn, vm_dynamic.cpu_name as cpu_name, vm_dynamic.current_cd as current_cd, vm_static.instance_type_id as instance_type_id, vm_static.image_type_id as image_type_id, vds_groups.architecture as architecture, vm_static.original_template_id as original_template_id, vm_static.original_template_name as original_template_name, vm_dynamic.last_stop_time as last_stop_time, vm_static.migration_downtime as migration_downtime, vm_static.template_version_number as template_version_number, - vm_static.serial_number_policy as serial_number_policy, vm_static.custom_serial_number as custom_serial_number, - vm_interface.mac_addr as vm_interface_mac_addr + vm_static.serial_number_policy as serial_number_policy, vm_static.custom_serial_number as custom_serial_number FROM vm_static INNER JOIN vm_dynamic ON vm_static.vm_guid = vm_dynamic.vm_guid INNER JOIN vm_static AS vm_templates ON vm_static.vmt_guid = vm_templates.vm_guid INNER JOIN @@ -630,8 +629,7 @@ and vds_groups.storage_pool_id = storage_pool.id LEFT OUTER JOIN quota ON vm_static.quota_id = quota.id LEFT OUTER JOIN vds_static ON vm_dynamic.run_on_vds = vds_static.vds_id LEFT OUTER JOIN -vm_pool_map_view ON vm_static.vm_guid = vm_pool_map_view.vm_guid LEFT OUTER JOIN -vm_interface ON vm_static.vm_guid = vm_interface.vm_guid +vm_pool_map_view ON vm_static.vm_guid = vm_pool_map_view.vm_guid WHERE vm_static.entity_type = 'VM'; @@ -663,7 +661,7 @@ vms.instance_type_id as instance_type_id, vms.image_type_id as image_type_id, vms.architecture as architecture, vms.original_template_id as original_template_id, vms.original_template_name as original_template_name, vms.migration_downtime as migration_downtime, vms.template_version_number as template_version_number, vms.current_cd as current_cd, - vms.serial_number_policy as serial_number_policy, vms.custom_serial_number as custom_serial_number, vms.vm_interface_mac_addr as vm_interface_mac_addr + vms.serial_number_policy as serial_number_policy, vms.custom_serial_number as custom_serial_number FROM vms LEFT OUTER JOIN tags_vm_map_view ON vms.vm_guid = tags_vm_map_view.vm_id LEFT OUTER JOIN vm_device ON vm_device.vm_id = vms.vm_guid LEFT OUTER JOIN -- To view, visit http://gerrit.ovirt.org/25848 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I42229383647c4494ffab75af1ad6e619ad02fe5f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ravi Nori <rn...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
