Revert "CLOUDSTACK-9708: Router deployment failed due to two threads …

[yadvr]

…start VR simultaneously."

This reverts commit 42e60eb.
This reverts commit 9e20525.

We're seeing some new errors, the PR was merged without trillian tests: #1870

[yadvr]

@blueorangutan package

[blueorangutan]

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

[nitin-maharana]

@rhtyd, Thanks for pointing this out. What is the error you are getting?

[borisstoyanov]

we get this issue @nitin-maharanahttps://issues.apache.org/jira/browse/CLOUDSTACK-10028

[yadvr]

@nitin-maharana I backported few PRs to 4.9, that included the specific change and in recent smoketest runs we're seeing new nic and router tests failing. I'm trying to find and revert the change at least in 4.9 to allow us to pass tests and work towards 4.9.3.0.

[yadvr]

Failing test reference: #2217

[blueorangutan]

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

[yadvr]

@blueorangutan test centos7 vmware55-u3

[blueorangutan]

@rhtyd unsupported parameters provided. Supported mgmt server os are: centos6, centos7, ubuntu. Supported hypervisors are: kvm-centos6, kvm-centos7, kvm-ubuntu, xenserver-65sp1, xenserver-62sp1, vmware-60u2, vmware-55u3, vmware-51u1, vmware-50u1

[yadvr]

@blueorangutan test centos7 vmware-55u3

[blueorangutan]

@rhtyd a Trillian-Jenkins test job (centos7 mgmt + vmware-55u3) has been kicked to run smoke tests

[blueorangutan]

Trillian test result (tid-1309)
Environment: vmware-55u3 (x2), Advanced Networking with Mgmt server 7
Total time taken: 44834 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2220-t1309-vmware-55u3.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_vpc_redundant.py
Test completed. 51 look OK, 3 have error(s)

Test	Result	Time (s)	Test File
test_02_redundant_VPC_default_routes	Failure	1080.63	test_vpc_redundant.py
test_02_RVR_Network_FW_PF_SSH_default_routes_egress_false	Failure	433.62	test_routers_network_ops.py
test_01_RVR_Network_FW_PF_SSH_default_routes_egress_true	Failure	442.58	test_routers_network_ops.py
test_04_rvpc_privategw_static_routes	Failure	681.03	test_privategw_acl.py
test_01_vpc_site2site_vpn	Success	370.03	test_vpc_vpn.py
test_01_vpc_remote_access_vpn	Success	241.60	test_vpc_vpn.py
test_01_redundant_vpc_site2site_vpn	Success	641.31	test_vpc_vpn.py
test_02_VPC_default_routes	Success	310.93	test_vpc_router_nics.py
test_01_VPC_nics_after_destroy	Success	692.53	test_vpc_router_nics.py
test_05_rvpc_multi_tiers	Success	599.19	test_vpc_redundant.py
test_04_rvpc_network_garbage_collector_nics	Success	1472.41	test_vpc_redundant.py
test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers	Success	675.37	test_vpc_redundant.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL	Success	1159.18	test_vpc_redundant.py
test_09_delete_detached_volume	Success	30.71	test_volumes.py
test_06_download_detached_volume	Success	55.51	test_volumes.py
test_05_detach_volume	Success	100.22	test_volumes.py
test_04_delete_attached_volume	Success	10.13	test_volumes.py
test_03_download_attached_volume	Success	20.24	test_volumes.py
test_02_attach_volume	Success	59.09	test_volumes.py
test_01_create_volume	Success	441.93	test_volumes.py
test_03_delete_vm_snapshots	Success	275.16	test_vm_snapshots.py
test_02_revert_vm_snapshots	Success	188.91	test_vm_snapshots.py
test_01_create_vm_snapshots	Success	128.88	test_vm_snapshots.py
test_deploy_vm_multiple	Success	297.15	test_vm_life_cycle.py
test_deploy_vm	Success	0.02	test_vm_life_cycle.py
test_advZoneVirtualRouter	Success	0.02	test_vm_life_cycle.py
test_10_attachAndDetach_iso	Success	26.69	test_vm_life_cycle.py
test_09_expunge_vm	Success	125.15	test_vm_life_cycle.py
test_08_migrate_vm	Success	55.73	test_vm_life_cycle.py
test_07_restore_vm	Success	0.10	test_vm_life_cycle.py
test_06_destroy_vm	Success	10.14	test_vm_life_cycle.py
test_03_reboot_vm	Success	10.12	test_vm_life_cycle.py
test_02_start_vm	Success	30.21	test_vm_life_cycle.py
test_01_stop_vm_forced	Success	5.12	test_vm_life_cycle.py
test_01_stop_vm	Success	10.12	test_vm_life_cycle.py
test_CreateTemplateWithDuplicateName	Success	346.90	test_templates.py
test_08_list_system_templates	Success	0.03	test_templates.py
test_07_list_public_templates	Success	0.03	test_templates.py
test_05_template_permissions	Success	0.05	test_templates.py
test_04_extract_template	Success	35.40	test_templates.py
test_03_delete_template	Success	5.08	test_templates.py
test_02_edit_template	Success	90.10	test_templates.py
test_01_create_template	Success	100.67	test_templates.py
test_10_destroy_cpvm	Success	261.53	test_ssvm.py
test_09_destroy_ssvm	Success	263.52	test_ssvm.py
test_08_reboot_cpvm	Success	186.30	test_ssvm.py
test_07_reboot_ssvm	Success	157.90	test_ssvm.py
test_06_stop_cpvm	Success	201.60	test_ssvm.py
test_05_stop_ssvm	Success	173.09	test_ssvm.py
test_04_cpvm_internals	Success	1.07	test_ssvm.py
test_03_ssvm_internals	Success	3.04	test_ssvm.py
test_02_list_cpvm_vm	Success	0.09	test_ssvm.py
test_01_list_sec_storage_vm	Success	0.09	test_ssvm.py
test_02_list_snapshots_with_removed_data_store	Success	183.87	test_snapshots.py
test_01_snapshot_root_disk	Success	76.16	test_snapshots.py
test_04_change_offering_small	Success	98.35	test_service_offerings.py
test_03_delete_service_offering	Success	0.03	test_service_offerings.py
test_02_edit_service_offering	Success	0.06	test_service_offerings.py
test_01_create_service_offering	Success	0.07	test_service_offerings.py
test_02_sys_template_ready	Success	0.09	test_secondary_storage.py
test_01_sys_vm_start	Success	0.12	test_secondary_storage.py
test_03_RVR_Network_check_router_state	Success	344.64	test_routers_network_ops.py
test_02_isolate_network_FW_PF_default_routes_egress_false	Success	251.20	test_routers_network_ops.py
test_01_isolate_network_FW_PF_default_routes_egress_true	Success	270.65	test_routers_network_ops.py
test_02_routervm_iptables_policies	Success	247.37	test_routers_iptables_default_policy.py
test_01_single_VPC_iptables_policies	Success	409.27	test_routers_iptables_default_policy.py
test_09_reboot_router	Success	160.79	test_routers.py
test_08_start_router	Success	135.70	test_routers.py
test_07_stop_router	Success	25.17	test_routers.py
test_06_router_advanced	Success	0.04	test_routers.py
test_05_router_basic	Success	0.03	test_routers.py
test_04_restart_network_wo_cleanup	Success	5.54	test_routers.py
test_03_restart_network_cleanup	Success	180.90	test_routers.py
test_02_router_internal_adv	Success	0.85	test_routers.py
test_01_router_internal_basic	Success	0.42	test_routers.py
test_router_dns_guestipquery	Success	76.72	test_router_dns.py
test_router_dns_externalipquery	Success	0.06	test_router_dns.py
test_router_dhcphosts	Success	135.51	test_router_dhcphosts.py
test_router_dhcp_opts	Success	21.36	test_router_dhcphosts.py
test_01_updatevolumedetail	Success	5.09	test_resource_detail.py
test_01_reset_vm_on_reboot	Success	55.44	test_reset_vm_on_reboot.py
test_createRegion	Success	0.06	test_regions.py
test_create_pvlan_network	Success	5.14	test_pvlan.py
test_dedicatePublicIpRange	Success	0.28	test_public_ip_range.py
test_03_vpc_privategw_restart_vpc_cleanup	Success	1071.12	test_privategw_acl.py
test_02_vpc_privategw_static_routes	Success	569.58	test_privategw_acl.py
test_01_vpc_privategw_acl	Success	146.79	test_privategw_acl.py
test_01_primary_storage_nfs	Success	38.23	test_primary_storage.py
test_createPortablePublicIPRange	Success	10.15	test_portable_publicip.py
test_createPortablePublicIPAcquire	Success	15.32	test_portable_publicip.py
test_isolate_network_password_server	Success	86.26	test_password_server.py
test_UpdateStorageOverProvisioningFactor	Success	0.09	test_over_provisioning.py
test_oobm_zchange_password	Success	30.59	test_outofbandmanagement.py
test_oobm_multiple_mgmt_server_ownership	Success	16.26	test_outofbandmanagement.py
test_oobm_issue_power_status	Success	10.22	test_outofbandmanagement.py
test_oobm_issue_power_soft	Success	10.28	test_outofbandmanagement.py
test_oobm_issue_power_reset	Success	15.32	test_outofbandmanagement.py
test_oobm_issue_power_on	Success	15.23	test_outofbandmanagement.py
test_oobm_issue_power_off	Success	10.21	test_outofbandmanagement.py
test_oobm_issue_power_cycle	Success	15.23	test_outofbandmanagement.py
test_oobm_enabledisable_across_clusterzones	Success	82.21	test_outofbandmanagement.py
test_oobm_enable_feature_valid	Success	5.11	test_outofbandmanagement.py
test_oobm_enable_feature_invalid	Success	0.06	test_outofbandmanagement.py
test_oobm_disable_feature_valid	Success	0.10	test_outofbandmanagement.py
test_oobm_disable_feature_invalid	Success	0.09	test_outofbandmanagement.py
test_oobm_configure_invalid_driver	Success	0.05	test_outofbandmanagement.py
test_oobm_configure_default_driver	Success	0.05	test_outofbandmanagement.py
test_oobm_background_powerstate_sync	Success	23.32	test_outofbandmanagement.py
test_extendPhysicalNetworkVlan	Success	15.27	test_non_contigiousvlan.py
test_01_nic	Success	534.47	test_nic.py
test_network_acl	Success	171.24	test_network_acl.py
test_releaseIP	Success	357.75	test_network.py
test_reboot_router	Success	618.97	test_network.py
test_public_ip_user_account	Success	10.20	test_network.py
test_public_ip_admin_account	Success	40.21	test_network.py
test_network_rules_acquired_public_ip_3_Load_Balancer_Rule	Success	66.39	test_network.py
test_network_rules_acquired_public_ip_2_nat_rule	Success	61.44	test_network.py
test_network_rules_acquired_public_ip_1_static_nat_rule	Success	123.66	test_network.py
test_delete_account	Success	392.64	test_network.py
test_02_port_fwd_on_non_src_nat	Success	55.58	test_network.py
test_01_port_fwd_on_src_nat	Success	112.20	test_network.py
test_nic_secondaryip_add_remove	Success	242.11	test_multipleips_per_nic.py
test_list_zones_metrics	Success	0.17	test_metrics_api.py
test_list_volumes_metrics	Success	5.36	test_metrics_api.py
test_list_vms_metrics	Success	146.13	test_metrics_api.py
test_list_pstorage_metrics	Success	0.21	test_metrics_api.py
test_list_infrastructure_metrics	Success	0.32	test_metrics_api.py
test_list_hosts_metrics	Success	0.26	test_metrics_api.py
test_list_clusters_metrics	Success	0.23	test_metrics_api.py
login_test_saml_user	Success	17.78	test_login.py
test_assign_and_removal_lb	Success	135.01	test_loadbalance.py
test_02_create_lb_rule_non_nat	Success	193.82	test_loadbalance.py
test_01_create_lb_rule_src_nat	Success	188.58	test_loadbalance.py
test_03_list_snapshots	Success	0.06	test_list_ids_parameter.py
test_02_list_templates	Success	0.03	test_list_ids_parameter.py
test_01_list_volumes	Success	0.02	test_list_ids_parameter.py
test_07_list_default_iso	Success	0.04	test_iso.py
test_05_iso_permissions	Success	0.05	test_iso.py
test_04_extract_Iso	Success	5.12	test_iso.py
test_03_delete_iso	Success	95.11	test_iso.py
test_02_edit_iso	Success	0.06	test_iso.py
test_01_create_iso	Success	20.77	test_iso.py
test_04_rvpc_internallb_haproxy_stats_on_all_interfaces	Success	523.68	test_internal_lb.py
test_03_vpc_internallb_haproxy_stats_on_all_interfaces	Success	372.97	test_internal_lb.py
test_02_internallb_roundrobin_1RVPC_3VM_HTTP_port80	Success	848.89	test_internal_lb.py
test_01_internallb_roundrobin_1VPC_3VM_HTTP_port80	Success	678.17	test_internal_lb.py
test_dedicateGuestVlanRange	Success	10.21	test_guest_vlan_range.py
test_UpdateConfigParamWithScope	Success	0.12	test_global_settings.py
test_rolepermission_lifecycle_update	Success	5.84	test_dynamicroles.py
test_rolepermission_lifecycle_list	Success	5.65	test_dynamicroles.py
test_rolepermission_lifecycle_delete	Success	5.57	test_dynamicroles.py
test_rolepermission_lifecycle_create	Success	5.61	test_dynamicroles.py
test_rolepermission_lifecycle_concurrent_updates	Success	5.74	test_dynamicroles.py
test_role_lifecycle_update_role_inuse	Success	5.67	test_dynamicroles.py
test_role_lifecycle_update	Success	10.66	test_dynamicroles.py
test_role_lifecycle_list	Success	5.63	test_dynamicroles.py
test_role_lifecycle_delete	Success	5.62	test_dynamicroles.py
test_role_lifecycle_create	Success	5.62	test_dynamicroles.py
test_role_inuse_deletion	Success	5.61	test_dynamicroles.py
test_role_account_acls_multiple_mgmt_servers	Success	7.21	test_dynamicroles.py
test_role_account_acls	Success	7.33	test_dynamicroles.py
test_default_role_deletion	Success	5.69	test_dynamicroles.py
test_04_create_fat_type_disk_offering	Success	0.06	test_disk_offerings.py
test_03_delete_disk_offering	Success	0.03	test_disk_offerings.py
test_02_edit_disk_offering	Success	0.04	test_disk_offerings.py
test_02_create_sparse_type_disk_offering	Success	0.06	test_disk_offerings.py
test_01_create_disk_offering	Success	0.09	test_disk_offerings.py
test_deployvm_userdispersing	Success	55.70	test_deploy_vms_with_varied_deploymentplanners.py
test_deployvm_userconcentrated	Success	95.80	test_deploy_vms_with_varied_deploymentplanners.py
test_deployvm_firstfit	Success	201.15	test_deploy_vms_with_varied_deploymentplanners.py
test_deployvm_userdata_post	Success	20.38	test_deploy_vm_with_userdata.py
test_deployvm_userdata	Success	120.92	test_deploy_vm_with_userdata.py
test_02_deploy_vm_root_resize	Success	5.57	test_deploy_vm_root_resize.py
test_01_deploy_vm_root_resize	Success	5.58	test_deploy_vm_root_resize.py
test_00_deploy_vm_root_resize	Success	5.67	test_deploy_vm_root_resize.py
test_deploy_vm_from_iso	Success	226.78	test_deploy_vm_iso.py
test_DeployVmAntiAffinityGroup_in_project	Success	337.19	test_affinity_groups_projects.py
test_DeployVmAntiAffinityGroup	Success	156.12	test_affinity_groups.py
test_08_resize_volume	Skipped	5.08	test_volumes.py
test_07_resize_fail	Skipped	10.21	test_volumes.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_01_scale_vm	Skipped	33.45	test_scale_vm.py
test_01_primary_storage_iscsi	Skipped	0.02	test_primary_storage.py
test_vm_nic_adapter_vmxnet3	Skipped	0.00	test_nic_adapter_type.py
test_06_copy_iso	Skipped	0.00	test_iso.py
test_deploy_vgpu_enabled_vm	Skipped	0.00	test_deploy_vgpu_enabled_vm.py

[yadvr]

Given nic and router tests are passing, I'll merge this. @nitin-maharana kindly re-submit a fix that does not break the tests.