[4.9] CLOUDSTACK-9356: FIX Cannot add users in VPC VPN

[ustcweizhou]

This happens if VPC has redundant VRs.
The results from VRs are combined in commit 13eb789.
This PR simply separates the results to two parts and check them if there are two VRs.

[yadvr]

@blueorangutan package

[blueorangutan]

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

[blueorangutan]

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

[yadvr]

@blueorangutan test

[blueorangutan]

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

[blueorangutan]

Trillian test result (tid-883)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 33531 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr1903-t883-kvm-centos7.zip
Intermitten failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermitten failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Test completed. 46 look ok, 2 have error(s)

Test	Result	Time (s)	Test File
test_02_redundant_VPC_default_routes	Failure	864.37	test_vpc_redundant.py
test_04_rvpc_privategw_static_routes	Failure	370.91	test_privategw_acl.py
test_01_vpc_site2site_vpn	Success	150.49	test_vpc_vpn.py
test_01_vpc_remote_access_vpn	Success	61.30	test_vpc_vpn.py
test_01_redundant_vpc_site2site_vpn	Success	235.86	test_vpc_vpn.py
test_02_VPC_default_routes	Success	282.35	test_vpc_router_nics.py
test_01_VPC_nics_after_destroy	Success	459.32	test_vpc_router_nics.py
test_05_rvpc_multi_tiers	Success	517.05	test_vpc_redundant.py
test_04_rvpc_network_garbage_collector_nics	Success	1408.57	test_vpc_redundant.py
test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers	Success	537.91	test_vpc_redundant.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL	Success	1264.82	test_vpc_redundant.py
test_09_delete_detached_volume	Success	156.60	test_volumes.py
test_08_resize_volume	Success	156.50	test_volumes.py
test_07_resize_fail	Success	161.59	test_volumes.py
test_06_download_detached_volume	Success	156.34	test_volumes.py
test_05_detach_volume	Success	155.92	test_volumes.py
test_04_delete_attached_volume	Success	151.24	test_volumes.py
test_03_download_attached_volume	Success	156.42	test_volumes.py
test_02_attach_volume	Success	126.00	test_volumes.py
test_01_create_volume	Success	622.27	test_volumes.py
test_deploy_vm_multiple	Success	273.56	test_vm_life_cycle.py
test_deploy_vm	Success	0.03	test_vm_life_cycle.py
test_advZoneVirtualRouter	Success	0.03	test_vm_life_cycle.py
test_10_attachAndDetach_iso	Success	26.62	test_vm_life_cycle.py
test_09_expunge_vm	Success	125.21	test_vm_life_cycle.py
test_08_migrate_vm	Success	35.94	test_vm_life_cycle.py
test_07_restore_vm	Success	0.13	test_vm_life_cycle.py
test_06_destroy_vm	Success	125.89	test_vm_life_cycle.py
test_03_reboot_vm	Success	125.97	test_vm_life_cycle.py
test_02_start_vm	Success	5.15	test_vm_life_cycle.py
test_01_stop_vm	Success	40.36	test_vm_life_cycle.py
test_CreateTemplateWithDuplicateName	Success	75.75	test_templates.py
test_08_list_system_templates	Success	0.04	test_templates.py
test_07_list_public_templates	Success	0.05	test_templates.py
test_05_template_permissions	Success	0.07	test_templates.py
test_04_extract_template	Success	5.25	test_templates.py
test_03_delete_template	Success	5.11	test_templates.py
test_02_edit_template	Success	90.16	test_templates.py
test_01_create_template	Success	35.42	test_templates.py
test_10_destroy_cpvm	Success	131.73	test_ssvm.py
test_09_destroy_ssvm	Success	163.61	test_ssvm.py
test_08_reboot_cpvm	Success	101.35	test_ssvm.py
test_07_reboot_ssvm	Success	133.83	test_ssvm.py
test_06_stop_cpvm	Success	131.53	test_ssvm.py
test_05_stop_ssvm	Success	133.69	test_ssvm.py
test_04_cpvm_internals	Success	0.98	test_ssvm.py
test_03_ssvm_internals	Success	3.34	test_ssvm.py
test_02_list_cpvm_vm	Success	0.15	test_ssvm.py
test_01_list_sec_storage_vm	Success	0.13	test_ssvm.py
test_01_snapshot_root_disk	Success	11.25	test_snapshots.py
test_04_change_offering_small	Success	242.71	test_service_offerings.py
test_03_delete_service_offering	Success	0.04	test_service_offerings.py
test_02_edit_service_offering	Success	0.06	test_service_offerings.py
test_01_create_service_offering	Success	0.12	test_service_offerings.py
test_02_sys_template_ready	Success	0.14	test_secondary_storage.py
test_01_sys_vm_start	Success	0.20	test_secondary_storage.py
test_09_reboot_router	Success	40.39	test_routers.py
test_08_start_router	Success	30.30	test_routers.py
test_07_stop_router	Success	10.16	test_routers.py
test_06_router_advanced	Success	0.06	test_routers.py
test_05_router_basic	Success	0.04	test_routers.py
test_04_restart_network_wo_cleanup	Success	5.72	test_routers.py
test_03_restart_network_cleanup	Success	60.57	test_routers.py
test_02_router_internal_adv	Success	1.05	test_routers.py
test_01_router_internal_basic	Success	0.58	test_routers.py
test_router_dns_guestipquery	Success	76.75	test_router_dns.py
test_router_dns_externalipquery	Success	0.08	test_router_dns.py
test_router_dhcphosts	Success	278.69	test_router_dhcphosts.py
test_router_dhcp_opts	Success	21.70	test_router_dhcphosts.py
test_01_updatevolumedetail	Success	0.10	test_resource_detail.py
test_01_reset_vm_on_reboot	Success	166.17	test_reset_vm_on_reboot.py
test_createRegion	Success	0.04	test_regions.py
test_create_pvlan_network	Success	5.23	test_pvlan.py
test_dedicatePublicIpRange	Success	0.42	test_public_ip_range.py
test_03_vpc_privategw_restart_vpc_cleanup	Success	495.87	test_privategw_acl.py
test_02_vpc_privategw_static_routes	Success	360.94	test_privategw_acl.py
test_01_vpc_privategw_acl	Success	82.91	test_privategw_acl.py
test_01_primary_storage_nfs	Success	35.81	test_primary_storage.py
test_createPortablePublicIPRange	Success	15.19	test_portable_publicip.py
test_createPortablePublicIPAcquire	Success	15.51	test_portable_publicip.py
test_isolate_network_password_server	Success	89.56	test_password_server.py
test_UpdateStorageOverProvisioningFactor	Success	0.15	test_over_provisioning.py
test_oobm_zchange_password	Success	30.75	test_outofbandmanagement.py
test_oobm_multiple_mgmt_server_ownership	Success	16.33	test_outofbandmanagement.py
test_oobm_issue_power_status	Success	5.27	test_outofbandmanagement.py
test_oobm_issue_power_soft	Success	15.35	test_outofbandmanagement.py
test_oobm_issue_power_reset	Success	15.37	test_outofbandmanagement.py
test_oobm_issue_power_on	Success	15.34	test_outofbandmanagement.py
test_oobm_issue_power_off	Success	15.33	test_outofbandmanagement.py
test_oobm_issue_power_cycle	Success	15.32	test_outofbandmanagement.py
test_oobm_enabledisable_across_clusterzones	Success	82.65	test_outofbandmanagement.py
test_oobm_enable_feature_valid	Success	5.17	test_outofbandmanagement.py
test_oobm_enable_feature_invalid	Success	0.10	test_outofbandmanagement.py
test_oobm_disable_feature_valid	Success	5.18	test_outofbandmanagement.py
test_oobm_disable_feature_invalid	Success	0.10	test_outofbandmanagement.py
test_oobm_configure_invalid_driver	Success	0.08	test_outofbandmanagement.py
test_oobm_configure_default_driver	Success	0.08	test_outofbandmanagement.py
test_oobm_background_powerstate_sync	Success	23.48	test_outofbandmanagement.py
test_extendPhysicalNetworkVlan	Success	15.33	test_non_contigiousvlan.py
test_01_nic	Success	404.13	test_nic.py
test_releaseIP	Success	268.23	test_network.py
test_reboot_router	Success	404.26	test_network.py
test_public_ip_user_account	Success	10.25	test_network.py
test_public_ip_admin_account	Success	40.30	test_network.py
test_network_rules_acquired_public_ip_3_Load_Balancer_Rule	Success	66.82	test_network.py
test_network_rules_acquired_public_ip_2_nat_rule	Success	61.52	test_network.py
test_network_rules_acquired_public_ip_1_static_nat_rule	Success	120.72	test_network.py
test_delete_account	Success	298.32	test_network.py
test_02_port_fwd_on_non_src_nat	Success	55.68	test_network.py
test_01_port_fwd_on_src_nat	Success	111.79	test_network.py
test_nic_secondaryip_add_remove	Success	202.59	test_multipleips_per_nic.py
login_test_saml_user	Success	19.26	test_login.py
test_assign_and_removal_lb	Success	133.16	test_loadbalance.py
test_02_create_lb_rule_non_nat	Success	187.46	test_loadbalance.py
test_01_create_lb_rule_src_nat	Success	187.48	test_loadbalance.py
test_03_list_snapshots	Success	0.06	test_list_ids_parameter.py
test_02_list_templates	Success	0.04	test_list_ids_parameter.py
test_01_list_volumes	Success	0.03	test_list_ids_parameter.py
test_07_list_default_iso	Success	0.06	test_iso.py
test_05_iso_permissions	Success	0.07	test_iso.py
test_04_extract_Iso	Success	5.20	test_iso.py
test_03_delete_iso	Success	95.12	test_iso.py
test_02_edit_iso	Success	0.06	test_iso.py
test_01_create_iso	Success	21.13	test_iso.py
test_04_rvpc_internallb_haproxy_stats_on_all_interfaces	Success	198.11	test_internal_lb.py
test_03_vpc_internallb_haproxy_stats_on_all_interfaces	Success	142.90	test_internal_lb.py
test_02_internallb_roundrobin_1RVPC_3VM_HTTP_port80	Success	504.47	test_internal_lb.py
test_01_internallb_roundrobin_1VPC_3VM_HTTP_port80	Success	409.72	test_internal_lb.py
test_dedicateGuestVlanRange	Success	10.27	test_guest_vlan_range.py
test_UpdateConfigParamWithScope	Success	0.14	test_global_settings.py
test_rolepermission_lifecycle_update	Success	6.20	test_dynamicroles.py
test_rolepermission_lifecycle_list	Success	6.00	test_dynamicroles.py
test_rolepermission_lifecycle_delete	Success	5.86	test_dynamicroles.py
test_rolepermission_lifecycle_create	Success	5.91	test_dynamicroles.py
test_rolepermission_lifecycle_concurrent_updates	Success	6.01	test_dynamicroles.py
test_role_lifecycle_update_role_inuse	Success	6.07	test_dynamicroles.py
test_role_lifecycle_update	Success	10.99	test_dynamicroles.py
test_role_lifecycle_list	Success	5.93	test_dynamicroles.py
test_role_lifecycle_delete	Success	10.97	test_dynamicroles.py
test_role_lifecycle_create	Success	6.04	test_dynamicroles.py
test_role_inuse_deletion	Success	6.19	test_dynamicroles.py
test_role_account_acls_multiple_mgmt_servers	Success	8.19	test_dynamicroles.py
test_role_account_acls	Success	8.28	test_dynamicroles.py
test_default_role_deletion	Success	6.03	test_dynamicroles.py
test_04_create_fat_type_disk_offering	Success	0.08	test_disk_offerings.py
test_03_delete_disk_offering	Success	0.04	test_disk_offerings.py
test_02_edit_disk_offering	Success	0.05	test_disk_offerings.py
test_02_create_sparse_type_disk_offering	Success	0.07	test_disk_offerings.py
test_01_create_disk_offering	Success	0.12	test_disk_offerings.py
test_deployvm_userdispersing	Success	40.97	test_deploy_vms_with_varied_deploymentplanners.py
test_deployvm_userconcentrated	Success	20.58	test_deploy_vms_with_varied_deploymentplanners.py
test_deployvm_firstfit	Success	55.67	test_deploy_vms_with_varied_deploymentplanners.py
test_deployvm_userdata_post	Success	10.38	test_deploy_vm_with_userdata.py
test_deployvm_userdata	Success	71.39	test_deploy_vm_with_userdata.py
test_02_deploy_vm_root_resize	Success	6.00	test_deploy_vm_root_resize.py
test_01_deploy_vm_root_resize	Success	6.03	test_deploy_vm_root_resize.py
test_00_deploy_vm_root_resize	Success	207.56	test_deploy_vm_root_resize.py
test_deploy_vm_from_iso	Success	207.39	test_deploy_vm_iso.py
test_DeployVmAntiAffinityGroup	Success	65.99	test_affinity_groups.py
test_03_delete_vm_snapshots	Skipped	0.00	test_vm_snapshots.py
test_02_revert_vm_snapshots	Skipped	0.00	test_vm_snapshots.py
test_01_test_vm_volume_snapshot	Skipped	0.00	test_vm_snapshots.py
test_01_create_vm_snapshots	Skipped	0.00	test_vm_snapshots.py
test_06_copy_template	Skipped	0.00	test_templates.py
test_static_role_account_acls	Skipped	0.02	test_staticroles.py
test_01_scale_vm	Skipped	0.00	test_scale_vm.py
test_01_primary_storage_iscsi	Skipped	0.04	test_primary_storage.py
test_06_copy_iso	Skipped	0.00	test_iso.py
test_deploy_vgpu_enabled_vm	Skipped	0.01	test_deploy_vgpu_enabled_vm.py

[yadvr]

LGTM. @karuturi let's merge this?

[borisstoyanov]

LGTM based on test results and code review