Skip to content

Add XenServer 7.1 and 7.2 interoperablility#2346

Merged
yadvr merged 2 commits intoapache:masterfrom
PaulAngus:master
Dec 15, 2017
Merged

Add XenServer 7.1 and 7.2 interoperablility#2346
yadvr merged 2 commits intoapache:masterfrom
PaulAngus:master

Conversation

@PaulAngus
Copy link
Member

@PaulAngus PaulAngus commented Nov 29, 2017 •
edited
Loading

Add XenServer 7.1 and 7.2 interoperablility
Add hypervisor to capabilities list and add guest OS mappings (copied from 7.0.0 mappings initially)
Deprecated mappings not added

links to
https://issues.apache.org/jira/browse/CLOUDSTACK-9839

@PaulAngus
Copy link
Member Author

PaulAngus commented Nov 29, 2017

@blueorangutan package

@blueorangutan
Copy link

blueorangutan commented Nov 29, 2017

@PaulAngus a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan
Copy link

blueorangutan commented Nov 29, 2017

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1322

@PaulAngus
Copy link
Member Author

PaulAngus commented Nov 30, 2017

results of test run against XenServer 7.1

Intermitten failure detected: /marvin/tests/smoke/test_deploy_vm_iso.py
Intermitten failure detected: /marvin/tests/smoke/test_iso.py
Intermitten failure detected: /marvin/tests/smoke/test_loadbalance.py
Intermitten failure detected: /marvin/tests/smoke/test_network.py
Intermitten failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermitten failure detected: /marvin/tests/smoke/test_scale_vm.py
Intermitten failure detected: /marvin/tests/smoke/test_ssvm.py
Intermitten failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Test completed. 51 look OK, 5 have error(s)

Test Result Time (s) Test File
test_05_rvpc_multi_tiers Failure 370.94 test_vpc_redundant.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL Failure 367.70 test_vpc_redundant.py
test_04_rvpc_privategw_static_routes Failure 575.20 test_privategw_acl.py
test_assign_and_removal_lb Failure 115.41 test_loadbalance.py
test_02_create_lb_rule_non_nat Failure 115.40 test_loadbalance.py
test_01_create_lb_rule_src_nat Failure 115.41 test_loadbalance.py
test_05_iso_permissions Failure 0.04 test_iso.py
test_02_edit_iso Failure 0.04 test_iso.py
test_01_scale_vm Error 20.17 test_scale_vm.py
test_09_copy_delete_template Skipped 0.01 test_templates.py
test_06_copy_template Skipped 0.00 test_templates.py
test_static_role_account_acls Skipped 0.01 test_staticroles.py
test_11_ss_nfs_version_on_ssvm Skipped 0.01 test_ssvm.py
test_vm_nic_adapter_vmxnet3 Skipped 0.00 test_nic_adapter_type.py
test_nested_virtualization_vmware Skipped 0.00 test_nested_virtualization.py
test_06_copy_iso Skipped 0.00 test_iso.py
test_06_verify_guest_lspci_again Skipped 0.00 test_deploy_virtio_scsi_vm.py
test_05_change_vm_ostype_restart Skipped 0.00 test_deploy_virtio_scsi_vm.py
test_04_verify_guest_lspci Skipped 0.00 test_deploy_virtio_scsi_vm.py
test_03_verify_libvirt_attach_disk Skipped 0.00 test_deploy_virtio_scsi_vm.py
test_02_verify_libvirt_after_restart Skipped 0.00 test_deploy_virtio_scsi_vm.py
test_01_verify_libvirt Skipped 0.00 test_deploy_virtio_scsi_vm.py
test_deploy_vgpu_enabled_vm Skipped 0.02 test_deploy_vgpu_enabled_vm.py
test_3d_gpu_support Skipped 0.03 test_deploy_vgpu_enabled_vm.py

@PaulAngus
Copy link
Member Author

PaulAngus commented Nov 30, 2017

@blueorangutan package

@blueorangutan
Copy link

blueorangutan commented Nov 30, 2017

@PaulAngus a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan
Copy link

blueorangutan commented Nov 30, 2017

Packaging result: ✔centos6 ✔centos7 ✖debian. JID-1327

@blueorangutan
Copy link

blueorangutan commented Dec 1, 2017

Trillian test result (tid-1718)
Environment: xenserver-72 (x2), Advanced Networking with Mgmt server 7
Total time taken: 48789 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2346-t1718-xenserver-72.zip
Intermitten failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermitten failure detected: /marvin/tests/smoke/test_routers_network_ops.py
Intermitten failure detected: /marvin/tests/smoke/test_scale_vm.py
Intermitten failure detected: /marvin/tests/smoke/test_usage.py
Intermitten failure detected: /marvin/tests/smoke/test_volumes.py
Intermitten failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Intermitten failure detected: /marvin/tests/smoke/test_vpc_vpn.py
Test completed. 60 look OK, 7 have error(s)

Test Result Time (s) Test File
test_01_vpc_remote_access_vpn Failure 131.34 test_vpc_vpn.py
test_05_rvpc_multi_tiers Failure 433.12 test_vpc_redundant.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL Failure 455.45 test_vpc_redundant.py
test_07_resize_fail Failure 45.62 test_volumes.py
test_02_RVR_Network_FW_PF_SSH_default_routes_egress_false Failure 428.81 test_routers_network_ops.py
test_04_rvpc_privategw_static_routes Failure 499.96 test_privategw_acl.py
test_03_vpc_privategw_restart_vpc_cleanup Failure 374.30 test_privategw_acl.py
test_02_vpc_privategw_static_routes Failure 384.39 test_privategw_acl.py
test_01_vpc_privategw_acl Failure 107.01 test_privategw_acl.py
ContextSuite context=TestVPCRedundancy>:teardown Error 524.52 test_vpc_redundant.py
test_06_download_detached_volume Error 20.29 test_volumes.py
test_01_volume_usage Error 20.79 test_usage.py
test_01_scale_vm Error 20.23 test_scale_vm.py
test_09_copy_delete_template Skipped 0.02 test_templates.py
test_06_copy_template Skipped 0.00 test_templates.py
test_static_role_account_acls Skipped 0.02 test_staticroles.py
test_11_ss_nfs_version_on_ssvm Skipped 0.02 test_ssvm.py
test_vm_nic_adapter_vmxnet3 Skipped 0.00 test_nic_adapter_type.py
test_03_nic_multiple_vmware Skipped 1.10 test_nic.py
test_nested_virtualization_vmware Skipped 0.00 test_nested_virtualization.py
test_06_copy_iso Skipped 0.00 test_iso.py
test_list_ha_for_host_valid Skipped 0.06 test_hostha_simulator.py
test_list_ha_for_host_invalid Skipped 0.02 test_hostha_simulator.py
test_list_ha_for_host Skipped 0.03 test_hostha_simulator.py
test_hostha_enable_feature_without_setting_provider Skipped 0.03 test_hostha_simulator.py
test_hostha_enable_feature_valid Skipped 0.03 test_hostha_simulator.py
test_hostha_disable_feature_valid Skipped 0.02 test_hostha_simulator.py
test_hostha_configure_invalid_provider Skipped 0.03 test_hostha_simulator.py
test_hostha_configure_default_driver Skipped 0.03 test_hostha_simulator.py
test_ha_verify_fsm_recovering Skipped 0.02 test_hostha_simulator.py
test_ha_verify_fsm_fenced Skipped 0.03 test_hostha_simulator.py
test_ha_verify_fsm_degraded Skipped 0.03 test_hostha_simulator.py
test_ha_verify_fsm_available Skipped 0.03 test_hostha_simulator.py
test_ha_multiple_mgmt_server_ownership Skipped 0.02 test_hostha_simulator.py
test_ha_list_providers Skipped 0.03 test_hostha_simulator.py
test_ha_enable_feature_invalid Skipped 0.02 test_hostha_simulator.py
test_ha_disable_feature_invalid Skipped 0.03 test_hostha_simulator.py
test_ha_configure_enabledisable_across_clusterzones Skipped 0.02 test_hostha_simulator.py
test_configure_ha_provider_valid Skipped 0.02 test_hostha_simulator.py
test_configure_ha_provider_invalid Skipped 0.04 test_hostha_simulator.py
test_remove_ha_provider_not_possible Skipped 0.04 test_hostha_kvm.py
test_hostha_kvm_host_recovering Skipped 0.03 test_hostha_kvm.py
test_hostha_kvm_host_fencing Skipped 0.03 test_hostha_kvm.py
test_hostha_kvm_host_degraded Skipped 0.03 test_hostha_kvm.py
test_hostha_enable_ha_when_host_in_maintenance Skipped 0.04 test_hostha_kvm.py
test_hostha_enable_ha_when_host_disconected Skipped 0.04 test_hostha_kvm.py
test_hostha_enable_ha_when_host_disabled Skipped 0.04 test_hostha_kvm.py
test_hostha_configure_default_driver Skipped 0.04 test_hostha_kvm.py
test_disable_oobm_ha_state_ineligible Skipped 0.04 test_hostha_kvm.py
test_06_verify_guest_lspci_again Skipped 0.00 test_deploy_virtio_scsi_vm.py
test_05_change_vm_ostype_restart Skipped 0.00 test_deploy_virtio_scsi_vm.py
test_04_verify_guest_lspci Skipped 0.00 test_deploy_virtio_scsi_vm.py
test_03_verify_libvirt_attach_disk Skipped 0.00 test_deploy_virtio_scsi_vm.py
test_02_verify_libvirt_after_restart Skipped 0.00 test_deploy_virtio_scsi_vm.py
test_01_verify_libvirt Skipped 0.00 test_deploy_virtio_scsi_vm.py
test_deploy_vgpu_enabled_vm Skipped 0.03 test_deploy_vgpu_enabled_vm.py
test_3d_gpu_support Skipped 0.04 test_deploy_vgpu_enabled_vm.py

@PaulAngus
Copy link
Member Author

PaulAngus commented Dec 12, 2017

@blueorangutan package

@blueorangutan
Copy link

blueorangutan commented Dec 12, 2017

@PaulAngus a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan
Copy link

blueorangutan commented Dec 12, 2017

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1368

@blueorangutan
Copy link

blueorangutan commented Dec 13, 2017

Trillian test result (tid-1776)
Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7
Total time taken: 34238 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2346-t1776-xenserver-71.zip
Test completed. Failed tests results shown below:

Test Result Time (s) Test File
test_01_vpc_privategw_acl Failure 96.93 test_privategw_acl.py
test_02_vpc_privategw_static_routes Failure 288.67 test_privategw_acl.py
test_03_vpc_privategw_restart_vpc_cleanup Failure 268.71 test_privategw_acl.py
test_04_rvpc_privategw_static_routes Failure 530.57 test_privategw_acl.py
test_01_RVR_Network_FW_PF_SSH_default_routes_egress_true Failure 462.78 test_routers_network_ops.py
test_02_RVR_Network_FW_PF_SSH_default_routes_egress_false Failure 449.27 test_routers_network_ops.py
test_01_scale_vm Error 25.52 test_scale_vm.py
test_02_create_template_with_checksum_sha1 Error 5.23 test_templates.py
test_03_create_template_with_checksum_sha256 Error 5.24 test_templates.py
test_04_create_template_with_checksum_md5 Error 5.28 test_templates.py
test_01_volume_usage Error 20.79 test_usage.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL Failure 481.20 test_vpc_redundant.py
test_05_rvpc_multi_tiers Failure 478.46 test_vpc_redundant.py
test_01_vpc_remote_access_vpn Failure 126.41 test_vpc_vpn.py

@blueorangutan
Copy link

blueorangutan commented Dec 13, 2017

Trillian test result (tid-1777)
Environment: xenserver-72 (x2), Advanced Networking with Mgmt server 7
Total time taken: 30859 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2346-t1777-xenserver-72.zip
Test completed. Failed tests results shown below:

Test Result Time (s) Test File
test_01_vpc_privategw_acl Failure 91.96 test_privategw_acl.py
test_02_vpc_privategw_static_routes Failure 293.69 test_privategw_acl.py
test_03_vpc_privategw_restart_vpc_cleanup Failure 329.05 test_privategw_acl.py
test_04_rvpc_privategw_static_routes Failure 490.44 test_privategw_acl.py
test_02_RVR_Network_FW_PF_SSH_default_routes_egress_false Failure 405.92 test_routers_network_ops.py
test_01_scale_vm Error 15.26 test_scale_vm.py
test_02_create_template_with_checksum_sha1 Error 5.22 test_templates.py
test_03_create_template_with_checksum_sha256 Error 5.20 test_templates.py
test_04_create_template_with_checksum_md5 Error 5.21 test_templates.py
test_01_volume_usage Error 20.66 test_usage.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL Failure 450.66 test_vpc_redundant.py
test_05_rvpc_multi_tiers Failure 433.00 test_vpc_redundant.py
test_01_vpc_remote_access_vpn Failure 96.14 test_vpc_vpn.py

@PaulAngus PaulAngus changed the title WIP - Add XenServer 7.1 and 7.2 interoperablility Add XenServer 7.1 and 7.2 interoperablility Dec 13, 2017
@yadvr yadvr added this to the 4.11 milestone Dec 13, 2017
@syed
Copy link
Contributor

syed commented Dec 14, 2017

@PaulAngus it looks like some merge got things a bit wonky. I've just looked at the commit which has changes in the db migration file. One thing that I would like to point out is that it is missing guest-os to hypervisor mapping. You can see those here which I added for XenServer 7

eabf862#diff-ddcf54a00161e216f9bd9f98a7bbad15

For the most part, they should be the same for XenServer 7.1 and 7.2 as well. @pdion891 had added them for 7.1

@yadvr yadvr closed this Dec 15, 2017
@yadvr
Copy link
Member

yadvr commented Dec 15, 2017

@PaulAngus I tried to rebase and do a force push on your branch and somehow this closed your PR. Now I'm unable to reopen, can you reopen?

@yadvr
Copy link
Member

yadvr commented Dec 15, 2017

@syed I verified Paul's changes are indeed copying the guest os mapping using the following:

INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) SELECT UUID(),'Xenserver', '7.1.0', guest_os_name, guest_os_id, utc_timestamp(), 0  FROM `cloud`.`guest_os_hypervisor` WHERE hypervisor_type='Xenserver' AND hypervisor_version='7.0.0';

....

INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) SELECT UUID(),'Xenserver', '7.2.0', guest_os_name, guest_os_id, utc_timestamp(), 0  FROM `cloud`.`guest_os_hypervisor` WHERE hypervisor_type='Xenserver' AND hypervisor_version='7.1.0' AND guest_os_id not in (1,2,3,4,56,101,56,58,93,94,50,51,87,88,89,90,91,92,26,27,28,29,40,41,42,43,44,45,96,97,107,108,109,110,151,152,153);

@yadvr yadvr reopened this Dec 15, 2017
@yadvr
Copy link
Member

yadvr commented Dec 15, 2017

LGTM bases on test results. I'll merge this one, subsequent changes may be submitted in separate PRs. Thanks.

@yadvr yadvr merged commit b417226 into apache:master Dec 15, 2017
@khos2ow khos2ow mentioned this pull request Dec 18, 2017
Merged
@pdion891
Copy link
Contributor

pdion891 commented Dec 26, 2017

+1 !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

component:XenServer status:waiting-for-reviewer type:enhancement

Projects

None yet

Milestone

4.11.0.0

Development

Successfully merging this pull request may close these issues.

5 participants

@PaulAngus @blueorangutan @syed @yadvr @pdion891