From 9431752d5415e71b79a33d35f257fc541012a756 Mon Sep 17 00:00:00 2001
From: Mihaela Stoica <mihaela.stoica@citrix.com>
Date: Fri, 29 Sep 2017 12:48:36 +0100
Subject: [PATCH] CP-24708: Fix the tests

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
---
 XenAdminTests/TestResources/state1.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/XenAdminTests/TestResources/state1.xml b/XenAdminTests/TestResources/state1.xml
index 04099110d..df3f8b579 100644
--- a/XenAdminTests/TestResources/state1.xml
+++ b/XenAdminTests/TestResources/state1.xml
@@ -39,8 +39,8 @@
 <row ref="OpaqueRef:d8879d12-a4c4-0b06-73d2-098414337681" location="https://10.80.226.111/console?ref=OpaqueRef:2119ae24-f104-bf77-295d-13c819059fbb" other_config="()" uuid="be7454ec-5bce-8863-3124-184bc0939b91" port="5900" VM="OpaqueRef:2119ae24-f104-bf77-295d-13c819059fbb" _ref="OpaqueRef:d8879d12-a4c4-0b06-73d2-098414337681" protocol="rfb"/>
 </table>
 <table name="host">
-<row ref="OpaqueRef:7166136b-f599-3e3c-4515-40dae8cbbead" API_version__major="2" tags="('CA-290243' 'Needs attention')" external_auth_type="" sched_policy="credit" API_version__vendor_implementation="()" blobs="()" _ref="OpaqueRef:7166136b-f599-3e3c-4515-40dae8cbbead" external_auth_service_name="" crash_dump_sr="OpaqueRef:8e673ce4-bbd2-23e7-3c1b-fbead967f50f" suspend_image_sr="OpaqueRef:8e673ce4-bbd2-23e7-3c1b-fbead967f50f" name__description="Default install of XenServer" API_version__minor="0" current_operations="()" ha_statefiles="()" cpu_configuration="()" address="10.80.226.111" uuid="c2d00647-dda9-40e3-adfd-4967b3c89f8e" supported_bootloaders="('pygrub' 'eliloader')" logging="()" other_config="(('agent_start_time' '1243006231.') ('boot_time' '1243006191.') ('folder' '/HR') ('multipathhandle' 'dmp') ('multipathing' 'true') ('iscsi_iqn' 'iqn.2009-05.com.xensource.uk:2faef685'))" API_version__vendor="XenSource" name__label="incubus" enabled="true" license_params="(('sku_type' 'XE Enterprise') ('version' '5.0.0') ('serialnumber' 'cbc0b0d4-d961-cf8f-0558-5fedde2caf9e') ('sockets' '2') ('productcode' 'f3a6-a3c0-ed16-c709-b055-8789') ('expiry' '20100131T00:00:00Z') ('name' 'Citrix XenServer Sample License') ('company' '') ('address1' '') ('address2' '') ('city' '') ('state' '') ('postalcode' '') ('country' '') ('sku_marketing_name' 'Citrix Essentials for XenServer') ('restrict_connection' 'false') ('restrict_pooling' 'false') ('restrict_qos' 'false') ('restrict_pool_attached_storage' 'false') ('restrict_netapp' 'false') ('restrict_equalogic' 'false') ('restrict_vlan' 'false') ('enable_xha' 'true') ('restrict_marathon' 'false') ('platform_filter' 'false') ('restrict_email_alerting' 'false') ('restrict_historical_performance' 'false') ('restrict_wlb' 'false') ('restrict_xen_motion' 'false') ('regular_nag_dialog' 'false'))" external_auth_configuration="()" hostname="incubus" software_version="(('product_version' '6.0.0') ('product_brand' 'XenServer') ('build_number' '14395c') ('hg_id' '9e784cde94d3') ('hostname' 'taris-2') ('date' '2009-05-13') ('xapi' '1.3') ('xen' '3.3.1') ('linux' '2.6.18-128.1.6.el5.xs5.5.0.499.1012xen') ('xencenter_min' '1.6') ('xencenter_max' '1.6') ('package-linux' 'installed'))" metrics="OpaqueRef:ab6f96ec-8ee2-0b5d-d6c3-689a87e75635" ha_network_peers="()" boot_free_mem="3075661824" capabilities="('xen-3.0-x86_64' 'xen-3.0-x86_32p' 'hvm-3.0-x86_32' 'hvm-3.0-x86_32p' 'hvm-3.0-x86_64' '')" allowed_operations="('vm_migrate' 'evacuate' 'provision' 'vm_resume' 'vm_start')"/>
-<row ref="OpaqueRef:98461529-e4ad-5052-a71d-e6bf0f11518c" API_version__major="2" tags="()" external_auth_type="" sched_policy="credit" API_version__vendor_implementation="()" blobs="()" _ref="OpaqueRef:98461529-e4ad-5052-a71d-e6bf0f11518c" external_auth_service_name="" crash_dump_sr="OpaqueRef:1e5968c8-28b5-ddd8-584c-8698f7f35326" suspend_image_sr="OpaqueRef:1e5968c8-28b5-ddd8-584c-8698f7f35326" name__description="Default install of XenServer" current_operations="()" API_version__minor="0" ha_statefiles="()" cpu_configuration="()" address="10.80.224.75" uuid="9031e1d4-a3af-4a15-aa3a-43eb2a343695" supported_bootloaders="('pygrub' 'eliloader')" logging="()" other_config="(('agent_start_time' '1242907233.') ('boot_time' '1242294854.') ('multipathing' 'false') ('multipathhandle' 'dmp') ('iscsi_iqn' 'iqn.2009-05.com.xensource.uk:65d1bc0f'))" API_version__vendor="XenSource" name__label="inflames" enabled="true" license_params="(('sku_type' 'XE Enterprise') ('version' '5.0.0') ('serialnumber' 'cbc0b0d4-d961-cf8f-0558-5fedde2caf9e') ('sockets' '2') ('productcode' 'f3a6-a3c0-ed16-c709-b055-8789') ('expiry' '20100131T00:00:00Z') ('name' 'Citrix XenServer Sample License') ('company' '') ('address1' '') ('address2' '') ('city' '') ('state' '') ('postalcode' '') ('country' '') ('sku_marketing_name' 'Citrix Essentials for XenServer') ('restrict_connection' 'false') ('restrict_pooling' 'false') ('restrict_qos' 'false') ('restrict_pool_attached_storage' 'false') ('restrict_netapp' 'false') ('restrict_equalogic' 'false') ('restrict_vlan' 'false') ('enable_xha' 'true') ('restrict_marathon' 'false') ('platform_filter' 'false') ('restrict_email_alerting' 'false') ('restrict_historical_performance' 'false') ('restrict_wlb' 'false') ('restrict_xen_motion' 'false') ('regular_nag_dialog' 'false'))" external_auth_configuration="()" hostname="inflames" software_version="(('product_version' '6.0.0') ('product_brand' 'XenServer') ('build_number' '14395c') ('hg_id' '9e784cde94d3') ('hostname' 'taris-2') ('date' '2009-05-13') ('xapi' '1.3') ('xen' '3.3.1') ('linux' '2.6.18-128.1.6.el5.xs5.5.0.499.1012xen') ('xencenter_min' '1.6') ('xencenter_max' '1.6') ('package-linux' 'installed'))" metrics="OpaqueRef:f8800940-9541-7371-baee-085de9e61ca8" ha_network_peers="()" boot_free_mem="3075665920" capabilities="('xen-3.0-x86_64' 'xen-3.0-x86_32p' 'hvm-3.0-x86_32' 'hvm-3.0-x86_32p' 'hvm-3.0-x86_64' '')" allowed_operations="('vm_migrate' 'evacuate' 'provision' 'vm_resume' 'vm_start')"/>
+<row ref="OpaqueRef:7166136b-f599-3e3c-4515-40dae8cbbead" API_version__major="2" tags="('CA-290243' 'Needs attention')" external_auth_type="" sched_policy="credit" API_version__vendor_implementation="()" blobs="()" _ref="OpaqueRef:7166136b-f599-3e3c-4515-40dae8cbbead" external_auth_service_name="" crash_dump_sr="OpaqueRef:8e673ce4-bbd2-23e7-3c1b-fbead967f50f" suspend_image_sr="OpaqueRef:8e673ce4-bbd2-23e7-3c1b-fbead967f50f" name__description="Default install of XenServer" API_version__minor="0" current_operations="()" ha_statefiles="()" cpu_configuration="()" address="10.80.226.111" uuid="c2d00647-dda9-40e3-adfd-4967b3c89f8e" supported_bootloaders="('pygrub' 'eliloader')" logging="()" other_config="(('agent_start_time' '1243006231.') ('boot_time' '1243006191.') ('folder' '/HR') ('multipathhandle' 'dmp') ('multipathing' 'true') ('iscsi_iqn' 'iqn.2009-05.com.xensource.uk:2faef685'))" API_version__vendor="XenSource" name__label="incubus" enabled="true" license_params="(('sku_type' 'XE Enterprise') ('version' '5.0.0') ('serialnumber' 'cbc0b0d4-d961-cf8f-0558-5fedde2caf9e') ('sockets' '2') ('productcode' 'f3a6-a3c0-ed16-c709-b055-8789') ('expiry' '20200131T00:00:00Z') ('name' 'Citrix XenServer Sample License') ('company' '') ('address1' '') ('address2' '') ('city' '') ('state' '') ('postalcode' '') ('country' '') ('sku_marketing_name' 'Citrix Essentials for XenServer') ('restrict_connection' 'false') ('restrict_pooling' 'false') ('restrict_qos' 'false') ('restrict_pool_attached_storage' 'false') ('restrict_netapp' 'false') ('restrict_equalogic' 'false') ('restrict_vlan' 'false') ('enable_xha' 'true') ('restrict_marathon' 'false') ('platform_filter' 'false') ('restrict_email_alerting' 'false') ('restrict_historical_performance' 'false') ('restrict_wlb' 'false') ('restrict_xen_motion' 'false') ('regular_nag_dialog' 'false'))" external_auth_configuration="()" hostname="incubus" software_version="(('product_version' '6.0.0') ('product_brand' 'XenServer') ('build_number' '14395c') ('hg_id' '9e784cde94d3') ('hostname' 'taris-2') ('date' '2009-05-13') ('xapi' '1.3') ('xen' '3.3.1') ('linux' '2.6.18-128.1.6.el5.xs5.5.0.499.1012xen') ('xencenter_min' '1.6') ('xencenter_max' '1.6') ('package-linux' 'installed'))" metrics="OpaqueRef:ab6f96ec-8ee2-0b5d-d6c3-689a87e75635" ha_network_peers="()" boot_free_mem="3075661824" capabilities="('xen-3.0-x86_64' 'xen-3.0-x86_32p' 'hvm-3.0-x86_32' 'hvm-3.0-x86_32p' 'hvm-3.0-x86_64' '')" allowed_operations="('vm_migrate' 'evacuate' 'provision' 'vm_resume' 'vm_start')"/>
+<row ref="OpaqueRef:98461529-e4ad-5052-a71d-e6bf0f11518c" API_version__major="2" tags="()" external_auth_type="" sched_policy="credit" API_version__vendor_implementation="()" blobs="()" _ref="OpaqueRef:98461529-e4ad-5052-a71d-e6bf0f11518c" external_auth_service_name="" crash_dump_sr="OpaqueRef:1e5968c8-28b5-ddd8-584c-8698f7f35326" suspend_image_sr="OpaqueRef:1e5968c8-28b5-ddd8-584c-8698f7f35326" name__description="Default install of XenServer" current_operations="()" API_version__minor="0" ha_statefiles="()" cpu_configuration="()" address="10.80.224.75" uuid="9031e1d4-a3af-4a15-aa3a-43eb2a343695" supported_bootloaders="('pygrub' 'eliloader')" logging="()" other_config="(('agent_start_time' '1242907233.') ('boot_time' '1242294854.') ('multipathing' 'false') ('multipathhandle' 'dmp') ('iscsi_iqn' 'iqn.2009-05.com.xensource.uk:65d1bc0f'))" API_version__vendor="XenSource" name__label="inflames" enabled="true" license_params="(('sku_type' 'XE Enterprise') ('version' '5.0.0') ('serialnumber' 'cbc0b0d4-d961-cf8f-0558-5fedde2caf9e') ('sockets' '2') ('productcode' 'f3a6-a3c0-ed16-c709-b055-8789') ('expiry' '20200131T00:00:00Z') ('name' 'Citrix XenServer Sample License') ('company' '') ('address1' '') ('address2' '') ('city' '') ('state' '') ('postalcode' '') ('country' '') ('sku_marketing_name' 'Citrix Essentials for XenServer') ('restrict_connection' 'false') ('restrict_pooling' 'false') ('restrict_qos' 'false') ('restrict_pool_attached_storage' 'false') ('restrict_netapp' 'false') ('restrict_equalogic' 'false') ('restrict_vlan' 'false') ('enable_xha' 'true') ('restrict_marathon' 'false') ('platform_filter' 'false') ('restrict_email_alerting' 'false') ('restrict_historical_performance' 'false') ('restrict_wlb' 'false') ('restrict_xen_motion' 'false') ('regular_nag_dialog' 'false'))" external_auth_configuration="()" hostname="inflames" software_version="(('product_version' '6.0.0') ('product_brand' 'XenServer') ('build_number' '14395c') ('hg_id' '9e784cde94d3') ('hostname' 'taris-2') ('date' '2009-05-13') ('xapi' '1.3') ('xen' '3.3.1') ('linux' '2.6.18-128.1.6.el5.xs5.5.0.499.1012xen') ('xencenter_min' '1.6') ('xencenter_max' '1.6') ('package-linux' 'installed'))" metrics="OpaqueRef:f8800940-9541-7371-baee-085de9e61ca8" ha_network_peers="()" boot_free_mem="3075665920" capabilities="('xen-3.0-x86_64' 'xen-3.0-x86_32p' 'hvm-3.0-x86_32' 'hvm-3.0-x86_32p' 'hvm-3.0-x86_64' '')" allowed_operations="('vm_migrate' 'evacuate' 'provision' 'vm_resume' 'vm_start')"/>
 </table>
 <table name="VIF_metrics"/>
 <table name="user">