Yair Zaslavsky has uploaded a new change for review. Change subject: core: Remove object_column_white_list from fixtures.xml ......................................................................
core: Remove object_column_white_list from fixtures.xml This fixture is not needed. This is a metadata table and is not changing within tests. It should be created by create_schema.sh and be left as is. A fix was also inserted to the whitelist sql, to change sshkeyfingerpint to be lowercase so VdsDAOTest will not break. Change-Id: I6f0429c322f923f0b3c725270aa51c121ca27129 Signed-off-by: Yair Zaslavsky <[email protected]> --- M backend/manager/modules/dal/src/test/resources/fixtures.xml M packaging/dbscripts/upgrade/post_upgrade/0010_add_object_column_white_list_table.sql 2 files changed, 1 insertion(+), 350 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/03/16703/1 diff --git a/backend/manager/modules/dal/src/test/resources/fixtures.xml b/backend/manager/modules/dal/src/test/resources/fixtures.xml index bb3d1f3..28dcd3d 100644 --- a/backend/manager/modules/dal/src/test/resources/fixtures.xml +++ b/backend/manager/modules/dal/src/test/resources/fixtures.xml @@ -4883,355 +4883,6 @@ </row> </table> - <table name="object_column_white_list"> - <column>object_name</column> - <column>column_name</column> - <row> - <value>vds</value> - <value>anonymous_hugepages</value> - </row> - <row> - <value>vds</value> - <value>build_name</value> - </row> - <row> - <value>vds</value> - <value>cpu_cores</value> - </row> - <row> - <value>vds</value> - <value>cpu_flags</value> - </row> - <row> - <value>vds</value> - <value>cpu_idle</value> - </row> - <row> - <value>vds</value> - <value>cpu_load</value> - </row> - <row> - <value>vds</value> - <value>cpu_model</value> - </row> - <row> - <value>vds</value> - <value>cpu_over_commit_duration_minutes</value> - </row> - <row> - <value>vds</value> - <value>cpu_over_commit_time_stamp</value> - </row> - <row> - <value>vds</value> - <value>cpu_sockets</value> - </row> - <row> - <value>vds</value> - <value>cpu_speed_mh</value> - </row> - <row> - <value>vds</value> - <value>cpu_sys</value> - </row> - <row> - <value>vds</value> - <value>cpu_user</value> - </row> - <row> - <value>vds</value> - <value>guest_overhead</value> - </row> - <row> - <value>vds</value> - <value>high_utilization</value> - </row> - <row> - <value>vds</value> - <value>hooks</value> - </row> - <row> - <value>vds</value> - <value>host_name</value> - </row> - <row> - <value>vds</value> - <value>host_os</value> - </row> - <row> - <value>vds</value> - <value>hypervisor_type</value> - </row> - <row> - <value>vds</value> - <value>if_total_speed</value> - </row> - <row> - <value>vds</value> - <value>ip</value> - </row> - <row> - <value>vds</value> - <value>iscsi_initiator_name</value> - </row> - <row> - <value>vds</value> - <value>kernel_version</value> - </row> - <row> - <value>vds</value> - <value>ksm_cpu_percent</value> - </row> - <row> - <value>vds</value> - <value>ksm_pages</value> - </row> - <row> - <value>vds</value> - <value>ksm_state</value> - </row> - <row> - <value>vds</value> - <value>kvm_enabled</value> - </row> - <row> - <value>vds</value> - <value>kvm_version</value> - </row> - <row> - <value>vds</value> - <value>libvirt_version</value> - </row> - <row> - <value>vds</value> - <value>low_utilization</value> - </row> - <row> - <value>vds</value> - <value>max_vds_memory_over_commit</value> - </row> - <row> - <value>vds</value> - <value>mem_available</value> - </row> - <row> - <value>vds</value> - <value>mem_commited</value> - </row> - <row> - <value>vds</value> - <value>mem_shared</value> - </row> - <row> - <value>vds</value> - <value>net_config_dirty</value> - </row> - <row> - <value>vds</value> - <value>non_operational_reason</value> - </row> - <row> - <value>vds</value> - <value>otp_validity</value> - </row> - <row> - <value>vds</value> - <value>pending_vcpus_count</value> - </row> - <row> - <value>vds</value> - <value>pending_vmem_size</value> - </row> - <row> - <value>vds</value> - <value>physical_mem_mb</value> - </row> - <row> - <value>vds</value> - <value>pm_enabled</value> - </row> - <row> - <value>vds</value> - <value>pm_options</value> - </row> - <row> - <value>vds</value> - <value>pm_password</value> - </row> - <row> - <value>vds</value> - <value>pm_port</value> - </row> - <row> - <value>vds</value> - <value>pm_type</value> - </row> - <row> - <value>vds</value> - <value>pm_user</value> - </row> - <row> - <value>vds</value> - <value>port</value> - </row> - <row> - <value>vds</value> - <value>previous_status</value> - </row> - <row> - <value>vds</value> - <value>recoverable</value> - </row> - <row> - <value>vds</value> - <value>reserved_mem</value> - </row> - <row> - <value>vds</value> - <value>selection_algorithm</value> - </row> - <row> - <value>vds</value> - <value>server_ssl_enabled</value> - </row> - <row> - <value>vds</value> - <value>software_version</value> - </row> - <row> - <value>vds</value> - <value>spice_version</value> - </row> - <row> - <value>vds</value> - <value>spm_status</value> - </row> - <row> - <value>vds</value> - <value>status</value> - </row> - <row> - <value>vds</value> - <value>storage_pool_id</value> - </row> - <row> - <value>vds</value> - <value>storage_pool_name</value> - </row> - <row> - <value>vds</value> - <value>supported_cluster_levels</value> - </row> - <row> - <value>vds</value> - <value>supported_engines</value> - </row> - <row> - <value>vds</value> - <value>swap_free</value> - </row> - <row> - <value>vds</value> - <value>swap_total</value> - </row> - <row> - <value>vds</value> - <value>transparent_hugepages_state</value> - </row> - <row> - <value>vds</value> - <value>usage_cpu_percent</value> - </row> - <row> - <value>vds</value> - <value>usage_mem_percent</value> - </row> - <row> - <value>vds</value> - <value>usage_network_percent</value> - </row> - <row> - <value>vds</value> - <value>vds_group_compatibility_version</value> - </row> - <row> - <value>vds</value> - <value>vds_group_virt_service</value> - </row> - <row> - <value>vds</value> - <value>vds_group_gluster_service</value> - </row> - <row> - <value>vds</value> - <value>vds_group_cpu_name</value> - </row> - <row> - <value>vds</value> - <value>vds_group_description</value> - </row> - <row> - <value>vds</value> - <value>vds_group_id</value> - </row> - <row> - <value>vds</value> - <value>vds_group_name</value> - </row> - <row> - <value>vds</value> - <value>vds_id</value> - </row> - <row> - <value>vds</value> - <value>vds_name</value> - </row> - <row> - <value>vds</value> - <value>vds_spm_id</value> - </row> - <row> - <value>vds</value> - <value>vds_spm_priority</value> - </row> - <row> - <value>vds</value> - <value>vds_strength</value> - </row> - <row> - <value>vds</value> - <value>vds_type</value> - </row> - <row> - <value>vds</value> - <value>vds_unique_id</value> - </row> - <row> - <value>vds</value> - <value>version_name</value> - </row> - <row> - <value>vds</value> - <value>vm_active</value> - </row> - <row> - <value>vds</value> - <value>vm_count</value> - </row> - <row> - <value>vds</value> - <value>vm_migrating</value> - </row> - <row> - <value>vds</value> - <value>vms_cores_count</value> - </row> - <row> - <value>vds</value> - <value>sshkeyfingerprint</value> - </row> -</table> - <table name="gluster_services"> <column>id</column> <column>service_type</column> diff --git a/packaging/dbscripts/upgrade/post_upgrade/0010_add_object_column_white_list_table.sql b/packaging/dbscripts/upgrade/post_upgrade/0010_add_object_column_white_list_table.sql index 9232e72..f5a50c8 100644 --- a/packaging/dbscripts/upgrade/post_upgrade/0010_add_object_column_white_list_table.sql +++ b/packaging/dbscripts/upgrade/post_upgrade/0010_add_object_column_white_list_table.sql @@ -55,7 +55,7 @@ 'otp_validity', 'spm_status', 'supported_cluster_levels', 'supported_engines', 'vds_group_compatibility_version', 'vds_group_virt_service', 'vds_group_gluster_service', 'host_os', 'kvm_version', 'libvirt_version', 'spice_version', 'kernel_version', 'iscsi_initiator_name', 'transparent_hugepages_state', 'anonymous_hugepages', - 'non_operational_reason', 'recoverable', 'sshKeyFingerprint', 'count_threads_as_cores', 'cpu_threads', + 'non_operational_reason', 'recoverable', 'sshkeyfingerprint', 'count_threads_as_cores', 'cpu_threads', 'hw_manufacturer', 'hw_product_name', 'hw_version', 'hw_serial_number', 'hw_uuid', 'hw_family')); -- pm_options are missing END; $function$ -- To view, visit http://gerrit.ovirt.org/16703 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6f0429c322f923f0b3c725270aa51c121ca27129 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yair Zaslavsky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
