Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

do not take down the VPN on public IP config changes#2065

Merged
yadvr merged 1 commit intoapache:4.9apache/cloudstack:4.9from
swill:fix_vpn_reset_4.9swill/cloudstack:fix_vpn_reset_4.9Copy head branch name to clipboard
Jul 23, 2017
Merged

do not take down the VPN on public IP config changes#2065
yadvr merged 1 commit intoapache:4.9apache/cloudstack:4.9from
swill:fix_vpn_reset_4.9swill/cloudstack:fix_vpn_reset_4.9Copy head branch name to clipboard

Conversation

@swill
Copy link
Contributor

@swill swill commented Apr 25, 2017

This fix is similar to the 4.10 fix found here: #2062

NOTE: I have not tested this fix since I do not have a 4.9 environment. We need confirmation from the people who raised the concern that this does in-fact fix their issue before this is merged.

@borisstoyanov can you run trillian tests against this please?

@swill swill mentioned this pull request Apr 25, 2017
Merged
@luhaijiao
Copy link

luhaijiao commented Apr 26, 2017

Hi, Will
We have tested this fix. The remote VPN connection is now working fine while network changes taken.
However, we noticed if we try to add/delete VPN accounts, the connection will be disconnected again.
It seems the issue is not completely fixed yet.

@yadvr
Copy link
Member

yadvr commented Jul 22, 2017

@blueorangutan package

@blueorangutan
Copy link

blueorangutan commented Jul 22, 2017

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

@blueorangutan
Copy link

blueorangutan commented Jul 22, 2017

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

@yadvr
Copy link
Member

yadvr commented Jul 22, 2017

@blueorangutan test

@blueorangutan
Copy link

blueorangutan commented Jul 22, 2017

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

@blueorangutan
Copy link

blueorangutan commented Jul 22, 2017

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

Test Result Time (s) Test File
test_04_rvpc_privategw_static_routes Failure 446.20 test_privategw_acl.py
test_02_list_snapshots_with_removed_data_store Error 0.04 test_snapshots.py
test_01_vpc_site2site_vpn Success 185.33 test_vpc_vpn.py
test_01_vpc_remote_access_vpn Success 86.19 test_vpc_vpn.py
test_01_redundant_vpc_site2site_vpn Success 381.39 test_vpc_vpn.py
test_02_VPC_default_routes Success 334.07 test_vpc_router_nics.py
test_01_VPC_nics_after_destroy Success 573.94 test_vpc_router_nics.py
test_05_rvpc_multi_tiers Success 537.47 test_vpc_redundant.py
test_04_rvpc_network_garbage_collector_nics Success 1458.18 test_vpc_redundant.py
test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers Success 645.87 test_vpc_redundant.py
test_02_redundant_VPC_default_routes Success 922.83 test_vpc_redundant.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL Success 1342.35 test_vpc_redundant.py
test_09_delete_detached_volume Success 156.47 test_volumes.py
test_08_resize_volume Success 156.45 test_volumes.py
test_07_resize_fail Success 156.57 test_volumes.py
test_06_download_detached_volume Success 156.29 test_volumes.py
test_05_detach_volume Success 155.74 test_volumes.py
test_04_delete_attached_volume Success 151.20 test_volumes.py
test_03_download_attached_volume Success 156.42 test_volumes.py
test_02_attach_volume Success 124.74 test_volumes.py
test_01_create_volume Success 619.56 test_volumes.py
test_deploy_vm_multiple Success 277.79 test_vm_life_cycle.py
test_deploy_vm Success 0.03 test_vm_life_cycle.py
test_advZoneVirtualRouter Success 0.02 test_vm_life_cycle.py
test_10_attachAndDetach_iso Success 26.61 test_vm_life_cycle.py
test_09_expunge_vm Success 125.18 test_vm_life_cycle.py
test_08_migrate_vm Success 35.90 test_vm_life_cycle.py
test_07_restore_vm Success 0.15 test_vm_life_cycle.py
test_06_destroy_vm Success 125.80 test_vm_life_cycle.py
test_03_reboot_vm Success 125.86 test_vm_life_cycle.py
test_02_start_vm Success 10.18 test_vm_life_cycle.py
test_01_stop_vm_forced Success 5.16 test_vm_life_cycle.py
test_01_stop_vm Success 35.32 test_vm_life_cycle.py
test_CreateTemplateWithDuplicateName Success 166.19 test_templates.py
test_08_list_system_templates Success 0.04 test_templates.py
test_07_list_public_templates Success 0.07 test_templates.py
test_05_template_permissions Success 0.11 test_templates.py
test_04_extract_template Success 5.17 test_templates.py
test_03_delete_template Success 5.11 test_templates.py
test_02_edit_template Success 90.13 test_templates.py
test_01_create_template Success 45.48 test_templates.py
test_10_destroy_cpvm Success 161.75 test_ssvm.py
test_09_destroy_ssvm Success 163.72 test_ssvm.py
test_08_reboot_cpvm Success 131.62 test_ssvm.py
test_07_reboot_ssvm Success 103.21 test_ssvm.py
test_06_stop_cpvm Success 161.87 test_ssvm.py
test_05_stop_ssvm Success 138.29 test_ssvm.py
test_04_cpvm_internals Success 1.31 test_ssvm.py
test_03_ssvm_internals Success 2.90 test_ssvm.py
test_02_list_cpvm_vm Success 0.12 test_ssvm.py
test_01_list_sec_storage_vm Success 0.13 test_ssvm.py
test_01_snapshot_root_disk Success 16.17 test_snapshots.py
test_04_change_offering_small Success 209.66 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.10 test_service_offerings.py
test_02_sys_template_ready Success 0.13 test_secondary_storage.py
test_01_sys_vm_start Success 0.17 test_secondary_storage.py
test_09_reboot_router Success 30.30 test_routers.py
test_08_start_router Success 25.29 test_routers.py
test_07_stop_router Success 10.15 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.59 test_routers.py
test_03_restart_network_cleanup Success 60.54 test_routers.py
test_02_router_internal_adv Success 1.24 test_routers.py
test_01_router_internal_basic Success 0.62 test_routers.py
test_router_dns_guestipquery Success 76.78 test_router_dns.py
test_router_dns_externalipquery Success 0.07 test_router_dns.py
test_router_dhcphosts Success 328.19 test_router_dhcphosts.py
test_router_dhcp_opts Success 21.71 test_router_dhcphosts.py
test_01_updatevolumedetail Success 0.10 test_resource_detail.py
test_01_reset_vm_on_reboot Success 196.31 test_reset_vm_on_reboot.py
test_createRegion Success 0.04 test_regions.py
test_create_pvlan_network Success 5.24 test_pvlan.py
test_dedicatePublicIpRange Success 0.43 test_public_ip_range.py
test_03_vpc_privategw_restart_vpc_cleanup Success 495.56 test_privategw_acl.py
test_02_vpc_privategw_static_routes Success 476.40 test_privategw_acl.py
test_01_vpc_privategw_acl Success 82.47 test_privategw_acl.py
test_01_primary_storage_nfs Success 35.82 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 90.37 test_password_server.py
test_UpdateStorageOverProvisioningFactor Success 0.13 test_over_provisioning.py
test_oobm_zchange_password Success 30.72 test_outofbandmanagement.py
test_oobm_multiple_mgmt_server_ownership Success 16.35 test_outofbandmanagement.py
test_oobm_issue_power_status Success 10.26 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 10.39 test_outofbandmanagement.py
test_oobm_issue_power_off Success 15.36 test_outofbandmanagement.py
test_oobm_issue_power_cycle Success 10.38 test_outofbandmanagement.py
test_oobm_enabledisable_across_clusterzones Success 87.67 test_outofbandmanagement.py
test_oobm_enable_feature_valid Success 5.16 test_outofbandmanagement.py
test_oobm_enable_feature_invalid Success 0.09 test_outofbandmanagement.py
test_oobm_disable_feature_valid Success 5.17 test_outofbandmanagement.py
test_oobm_disable_feature_invalid Success 0.10 test_outofbandmanagement.py
test_oobm_configure_invalid_driver Success 0.07 test_outofbandmanagement.py
test_oobm_configure_default_driver Success 0.07 test_outofbandmanagement.py
test_oobm_background_powerstate_sync Success 23.41 test_outofbandmanagement.py
test_extendPhysicalNetworkVlan Success 15.29 test_non_contigiousvlan.py
test_01_nic Success 424.20 test_nic.py
test_releaseIP Success 177.53 test_network.py
test_reboot_router Success 443.73 test_network.py
test_public_ip_user_account Success 10.26 test_network.py
test_public_ip_admin_account Success 40.29 test_network.py
test_network_rules_acquired_public_ip_3_Load_Balancer_Rule Success 67.10 test_network.py
test_network_rules_acquired_public_ip_2_nat_rule Success 61.92 test_network.py
test_network_rules_acquired_public_ip_1_static_nat_rule Success 125.03 test_network.py
test_delete_account Success 262.70 test_network.py
test_02_port_fwd_on_non_src_nat Success 55.74 test_network.py
test_01_port_fwd_on_src_nat Success 112.22 test_network.py
test_nic_secondaryip_add_remove Success 202.65 test_multipleips_per_nic.py
test_list_zones_metrics Success 0.23 test_metrics_api.py
test_list_volumes_metrics Success 5.46 test_metrics_api.py
test_list_vms_metrics Success 317.54 test_metrics_api.py
test_list_pstorage_metrics Success 0.33 test_metrics_api.py
test_list_infrastructure_metrics Success 1.02 test_metrics_api.py
test_list_hosts_metrics Success 0.30 test_metrics_api.py
test_list_clusters_metrics Success 0.32 test_metrics_api.py
login_test_saml_user Success 19.16 test_login.py
test_assign_and_removal_lb Success 136.59 test_loadbalance.py
test_02_create_lb_rule_non_nat Success 207.99 test_loadbalance.py
test_01_create_lb_rule_src_nat Success 240.91 test_loadbalance.py
test_03_list_snapshots Success 0.09 test_list_ids_parameter.py
test_02_list_templates Success 0.05 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.06 test_iso.py
test_04_extract_Iso Success 5.16 test_iso.py
test_03_delete_iso Success 95.28 test_iso.py
test_02_edit_iso Success 0.06 test_iso.py
test_01_create_iso Success 21.09 test_iso.py
test_04_rvpc_internallb_haproxy_stats_on_all_interfaces Success 258.06 test_internal_lb.py
test_03_vpc_internallb_haproxy_stats_on_all_interfaces Success 162.50 test_internal_lb.py
test_02_internallb_roundrobin_1RVPC_3VM_HTTP_port80 Success 570.76 test_internal_lb.py
test_01_internallb_roundrobin_1VPC_3VM_HTTP_port80 Success 436.00 test_internal_lb.py
test_dedicateGuestVlanRange Success 10.26 test_guest_vlan_range.py
test_UpdateConfigParamWithScope Success 0.15 test_global_settings.py
test_rolepermission_lifecycle_update Success 6.12 test_dynamicroles.py
test_rolepermission_lifecycle_list Success 5.96 test_dynamicroles.py
test_rolepermission_lifecycle_delete Success 5.84 test_dynamicroles.py
test_rolepermission_lifecycle_create Success 5.86 test_dynamicroles.py
test_rolepermission_lifecycle_concurrent_updates Success 6.13 test_dynamicroles.py
test_role_lifecycle_update_role_inuse Success 5.89 test_dynamicroles.py
test_role_lifecycle_update Success 10.96 test_dynamicroles.py
test_role_lifecycle_list Success 6.00 test_dynamicroles.py
test_role_lifecycle_delete Success 10.89 test_dynamicroles.py
test_role_lifecycle_create Success 5.88 test_dynamicroles.py
test_role_inuse_deletion Success 5.89 test_dynamicroles.py
test_role_account_acls_multiple_mgmt_servers Success 8.04 test_dynamicroles.py
test_role_account_acls Success 8.26 test_dynamicroles.py
test_default_role_deletion Success 6.05 test_dynamicroles.py
test_04_create_fat_type_disk_offering Success 0.07 test_disk_offerings.py
test_03_delete_disk_offering Success 0.06 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.10 test_disk_offerings.py
test_deployvm_userdispersing Success 20.59 test_deploy_vms_with_varied_deploymentplanners.py
test_deployvm_userconcentrated Success 90.99 test_deploy_vms_with_varied_deploymentplanners.py
test_deployvm_firstfit Success 211.53 test_deploy_vms_with_varied_deploymentplanners.py
test_deployvm_userdata_post Success 10.44 test_deploy_vm_with_userdata.py
test_deployvm_userdata Success 50.73 test_deploy_vm_with_userdata.py
test_02_deploy_vm_root_resize Success 5.96 test_deploy_vm_root_resize.py
test_01_deploy_vm_root_resize Success 5.97 test_deploy_vm_root_resize.py
test_00_deploy_vm_root_resize Success 272.84 test_deploy_vm_root_resize.py
test_deploy_vm_from_iso Success 237.70 test_deploy_vm_iso.py
test_DeployVmAntiAffinityGroup Success 151.51 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_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.03 test_primary_storage.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
Copy link
Member

yadvr commented Jul 23, 2017

LGTM based on results. Based on test confirmation from @luhaijiao and comments from @swill and that similar changes from master I'll merge this.

@yadvr yadvr merged commit c566aba into apache:4.9 Jul 23, 2017
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

type:bug

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@swill @luhaijiao @yadvr @blueorangutan @resmo
Morty Proxy This is a proxified and sanitized view of the page, visit original site.