Skip to content

Add XenServer 7.1 and 7.2 interoperablility - #2346

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

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

Conversation

@PaulAngus

@PaulAngusPaulAngus commented Nov 29, 2017

Copy link
Copy Markdown
Member

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
Copy Markdown
MemberAuthor

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

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

@blueorangutan

Copy link
Copy Markdown

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

@PaulAngus

Copy link
Copy Markdown
MemberAuthor

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)

TestResultTime (s)Test File
test_05_rvpc_multi_tiersFailure370.94test_vpc_redundant.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACLFailure367.70test_vpc_redundant.py
test_04_rvpc_privategw_static_routesFailure575.20test_privategw_acl.py
test_assign_and_removal_lbFailure115.41test_loadbalance.py
test_02_create_lb_rule_non_natFailure115.40test_loadbalance.py
test_01_create_lb_rule_src_natFailure115.41test_loadbalance.py
test_05_iso_permissionsFailure0.04test_iso.py
test_02_edit_isoFailure0.04test_iso.py
test_01_scale_vmError20.17test_scale_vm.py
test_09_copy_delete_templateSkipped0.01test_templates.py
test_06_copy_templateSkipped0.00test_templates.py
test_static_role_account_aclsSkipped0.01test_staticroles.py
test_11_ss_nfs_version_on_ssvmSkipped0.01test_ssvm.py
test_vm_nic_adapter_vmxnet3Skipped0.00test_nic_adapter_type.py
test_nested_virtualization_vmwareSkipped0.00test_nested_virtualization.py
test_06_copy_isoSkipped0.00test_iso.py
test_06_verify_guest_lspci_againSkipped0.00test_deploy_virtio_scsi_vm.py
test_05_change_vm_ostype_restartSkipped0.00test_deploy_virtio_scsi_vm.py
test_04_verify_guest_lspciSkipped0.00test_deploy_virtio_scsi_vm.py
test_03_verify_libvirt_attach_diskSkipped0.00test_deploy_virtio_scsi_vm.py
test_02_verify_libvirt_after_restartSkipped0.00test_deploy_virtio_scsi_vm.py
test_01_verify_libvirtSkipped0.00test_deploy_virtio_scsi_vm.py
test_deploy_vgpu_enabled_vmSkipped0.02test_deploy_vgpu_enabled_vm.py
test_3d_gpu_supportSkipped0.03test_deploy_vgpu_enabled_vm.py

@PaulAngus

Copy link
Copy Markdown
MemberAuthor

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

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

@blueorangutan

Copy link
Copy Markdown

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

@blueorangutan

Copy link
Copy Markdown

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)

TestResultTime (s)Test File
test_01_vpc_remote_access_vpnFailure131.34test_vpc_vpn.py
test_05_rvpc_multi_tiersFailure433.12test_vpc_redundant.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACLFailure455.45test_vpc_redundant.py
test_07_resize_failFailure45.62test_volumes.py
test_02_RVR_Network_FW_PF_SSH_default_routes_egress_falseFailure428.81test_routers_network_ops.py
test_04_rvpc_privategw_static_routesFailure499.96test_privategw_acl.py
test_03_vpc_privategw_restart_vpc_cleanupFailure374.30test_privategw_acl.py
test_02_vpc_privategw_static_routesFailure384.39test_privategw_acl.py
test_01_vpc_privategw_aclFailure107.01test_privategw_acl.py
ContextSuite context=TestVPCRedundancy>:teardownError524.52test_vpc_redundant.py
test_06_download_detached_volumeError20.29test_volumes.py
test_01_volume_usageError20.79test_usage.py
test_01_scale_vmError20.23test_scale_vm.py
test_09_copy_delete_templateSkipped0.02test_templates.py
test_06_copy_templateSkipped0.00test_templates.py
test_static_role_account_aclsSkipped0.02test_staticroles.py
test_11_ss_nfs_version_on_ssvmSkipped0.02test_ssvm.py
test_vm_nic_adapter_vmxnet3Skipped0.00test_nic_adapter_type.py
test_03_nic_multiple_vmwareSkipped1.10test_nic.py
test_nested_virtualization_vmwareSkipped0.00test_nested_virtualization.py
test_06_copy_isoSkipped0.00test_iso.py
test_list_ha_for_host_validSkipped0.06test_hostha_simulator.py
test_list_ha_for_host_invalidSkipped0.02test_hostha_simulator.py
test_list_ha_for_hostSkipped0.03test_hostha_simulator.py
test_hostha_enable_feature_without_setting_providerSkipped0.03test_hostha_simulator.py
test_hostha_enable_feature_validSkipped0.03test_hostha_simulator.py
test_hostha_disable_feature_validSkipped0.02test_hostha_simulator.py
test_hostha_configure_invalid_providerSkipped0.03test_hostha_simulator.py
test_hostha_configure_default_driverSkipped0.03test_hostha_simulator.py
test_ha_verify_fsm_recoveringSkipped0.02test_hostha_simulator.py
test_ha_verify_fsm_fencedSkipped0.03test_hostha_simulator.py
test_ha_verify_fsm_degradedSkipped0.03test_hostha_simulator.py
test_ha_verify_fsm_availableSkipped0.03test_hostha_simulator.py
test_ha_multiple_mgmt_server_ownershipSkipped0.02test_hostha_simulator.py
test_ha_list_providersSkipped0.03test_hostha_simulator.py
test_ha_enable_feature_invalidSkipped0.02test_hostha_simulator.py
test_ha_disable_feature_invalidSkipped0.03test_hostha_simulator.py
test_ha_configure_enabledisable_across_clusterzonesSkipped0.02test_hostha_simulator.py
test_configure_ha_provider_validSkipped0.02test_hostha_simulator.py
test_configure_ha_provider_invalidSkipped0.04test_hostha_simulator.py
test_remove_ha_provider_not_possibleSkipped0.04test_hostha_kvm.py
test_hostha_kvm_host_recoveringSkipped0.03test_hostha_kvm.py
test_hostha_kvm_host_fencingSkipped0.03test_hostha_kvm.py
test_hostha_kvm_host_degradedSkipped0.03test_hostha_kvm.py
test_hostha_enable_ha_when_host_in_maintenanceSkipped0.04test_hostha_kvm.py
test_hostha_enable_ha_when_host_disconectedSkipped0.04test_hostha_kvm.py
test_hostha_enable_ha_when_host_disabledSkipped0.04test_hostha_kvm.py
test_hostha_configure_default_driverSkipped0.04test_hostha_kvm.py
test_disable_oobm_ha_state_ineligibleSkipped0.04test_hostha_kvm.py
test_06_verify_guest_lspci_againSkipped0.00test_deploy_virtio_scsi_vm.py
test_05_change_vm_ostype_restartSkipped0.00test_deploy_virtio_scsi_vm.py
test_04_verify_guest_lspciSkipped0.00test_deploy_virtio_scsi_vm.py
test_03_verify_libvirt_attach_diskSkipped0.00test_deploy_virtio_scsi_vm.py
test_02_verify_libvirt_after_restartSkipped0.00test_deploy_virtio_scsi_vm.py
test_01_verify_libvirtSkipped0.00test_deploy_virtio_scsi_vm.py
test_deploy_vgpu_enabled_vmSkipped0.03test_deploy_vgpu_enabled_vm.py
test_3d_gpu_supportSkipped0.04test_deploy_vgpu_enabled_vm.py

@PaulAngus

Copy link
Copy Markdown
MemberAuthor

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

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

@blueorangutan

Copy link
Copy Markdown

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

@blueorangutan

Copy link
Copy Markdown

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:

TestResultTime (s)Test File
test_01_vpc_privategw_aclFailure96.93test_privategw_acl.py
test_02_vpc_privategw_static_routesFailure288.67test_privategw_acl.py
test_03_vpc_privategw_restart_vpc_cleanupFailure268.71test_privategw_acl.py
test_04_rvpc_privategw_static_routesFailure530.57test_privategw_acl.py
test_01_RVR_Network_FW_PF_SSH_default_routes_egress_trueFailure462.78test_routers_network_ops.py
test_02_RVR_Network_FW_PF_SSH_default_routes_egress_falseFailure449.27test_routers_network_ops.py
test_01_scale_vmError25.52test_scale_vm.py
test_02_create_template_with_checksum_sha1Error5.23test_templates.py
test_03_create_template_with_checksum_sha256Error5.24test_templates.py
test_04_create_template_with_checksum_md5Error5.28test_templates.py
test_01_volume_usageError20.79test_usage.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACLFailure481.20test_vpc_redundant.py
test_05_rvpc_multi_tiersFailure478.46test_vpc_redundant.py
test_01_vpc_remote_access_vpnFailure126.41test_vpc_vpn.py

@blueorangutan

Copy link
Copy Markdown

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:

TestResultTime (s)Test File
test_01_vpc_privategw_aclFailure91.96test_privategw_acl.py
test_02_vpc_privategw_static_routesFailure293.69test_privategw_acl.py
test_03_vpc_privategw_restart_vpc_cleanupFailure329.05test_privategw_acl.py
test_04_rvpc_privategw_static_routesFailure490.44test_privategw_acl.py
test_02_RVR_Network_FW_PF_SSH_default_routes_egress_falseFailure405.92test_routers_network_ops.py
test_01_scale_vmError15.26test_scale_vm.py
test_02_create_template_with_checksum_sha1Error5.22test_templates.py
test_03_create_template_with_checksum_sha256Error5.20test_templates.py
test_04_create_template_with_checksum_md5Error5.21test_templates.py
test_01_volume_usageError20.66test_usage.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACLFailure450.66test_vpc_redundant.py
test_05_rvpc_multi_tiersFailure433.00test_vpc_redundant.py
test_01_vpc_remote_access_vpnFailure96.14test_vpc_vpn.py

@PaulAngusPaulAngus changed the title WIP - Add XenServer 7.1 and 7.2 interoperablilityAdd XenServer 7.1 and 7.2 interoperablilityDec 13, 2017
@yadvryadvr added this to the 4.11 milestone Dec 13, 2017
@syed

syed commented Dec 14, 2017

Copy link
Copy Markdown
Contributor

@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

@yadvryadvr closed this Dec 15, 2017
@yadvr

Copy link
Copy Markdown
Member

@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
Copy Markdown
Member

@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);

@yadvryadvr reopened this Dec 15, 2017
@yadvr

Copy link
Copy Markdown
Member

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:masterDec 15, 2017
@pdion891

Copy link
Copy Markdown
Contributor

+1 !

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@PaulAngus@blueorangutan@syed@yadvr@pdion891