Restart xl2tpd service when the VPN configuration is modified by vishesh92 · Pull Request #12422 · apache/cloudstack

vishesh92 · 2026-01-14T08:05:54Z

Description

Fixes #12195

Types of changes

Breaking change (fix or feature that would cause existing functionality to change)
New feature (non-breaking change which adds functionality)
Bug fix (non-breaking change which fixes an issue)
Enhancement (improves an existing feature and functionality)
Cleanup (Code refactoring and cleanup, that may add test cases)
Build/CI
Test (unit or integration test code)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Major
Minor

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

Copilot

Copilot wasn't able to review any files in this pull request.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

vishesh92 · 2026-01-14T08:07:08Z

@blueorangutan package

blueorangutan · 2026-01-14T08:08:06Z

@vishesh92 a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

codecov · 2026-01-14T08:14:08Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 17.59%. Comparing base (b5fd39f) to head (ef7b083).
⚠️ Report is 102 commits behind head on 4.22.

Additional details and impacted files

@@             Coverage Diff              @@
##               4.22   #12422      +/-   ##
============================================
- Coverage     17.59%   17.59%   -0.01%     
+ Complexity    15601    15597       -4     
============================================
  Files          5910     5910              
  Lines        529780   529780              
  Branches      64729    64729              
============================================
- Hits          93226    93202      -24     
- Misses       426060   426084      +24     
  Partials      10494    10494

Flag	Coverage Δ
uitests	`3.60% <ø> (ø)`
unittests	`18.66% <ø> (-0.01%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

blueorangutan · 2026-01-14T09:40:34Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 16356

blueorangutan · 2026-01-14T14:20:54Z

[LL] Trillian Build Failed (tid-7166)

Copilot

Copilot wasn't able to review any files in this pull request.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Pearl1594 · 2026-01-15T12:09:37Z

systemvm/debian/opt/cloud/bin/configure.py


                CsHelper.execute("ipsec update")
-                CsHelper.execute("systemctl start xl2tpd")
+                if config_changed:


can we just not use systemctl restart x12tpd?

I am not sure if restarting xl2tpd will drop existing connections or not. So, I didn't want to restart the service unnecessarily.

is systemctl reload x12tpd supported ?

weizhouapache

code lgtm

borisstoyanov · 2026-01-27T10:41:21Z

@blueorangutan test

blueorangutan · 2026-01-27T10:42:06Z

@borisstoyanov a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

DaanHoogland · 2026-01-27T13:49:15Z

@vishesh92 the PR is based off and targeted to 4.22, but the issue and PR are marked for 20.3. Can you resolve that?

vishesh92 · 2026-01-27T14:10:32Z

@vishesh92 the PR is based off and targeted to 4.22, but the issue and PR are marked for 20.3. Can you resolve that?

There are code changes in this file between 4.20 and 4.22 branch. This will result in conflicts during forward merge.

blueorangutan · 2026-01-28T02:35:12Z

[SF] Trillian test result (tid-15304)
Environment: kvm-ol8 (x2), zone: Advanced Networking with Mgmt server ol8
Total time taken: 54131 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr12422-t15304-kvm-ol8.zip
Smoke tests completed. 148 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_03_deploy_and_scale_kubernetes_cluster	`Failure`	26.68	test_kubernetes_clusters.py

DaanHoogland · 2026-01-28T09:40:49Z

@vishesh92 the PR is based off and targeted to 4.22, but the issue and PR are marked for 20.3. Can you resolve that?

There are code changes in this file between 4.20 and 4.22 branch. This will result in conflicts during forward merge.

so, …? the resolution is marking it for milestone 22.1?

vishesh92 · 2026-01-28T09:52:57Z

@vishesh92 the PR is based off and targeted to 4.22, but the issue and PR are marked for 20.3. Can you resolve that?

There are code changes in this file between 4.20 and 4.22 branch. This will result in conflicts during forward merge.

so, …? the resolution is marking it for milestone 22.1?

Yes. Let me update the milestones.

kiranchavala · 2026-01-29T07:57:04Z

@blueorangutan package

blueorangutan · 2026-01-29T07:58:04Z

@kiranchavala a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2026-01-29T09:14:23Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 16612

borisstoyanov · 2026-01-29T13:43:55Z

@blueorangutan test

blueorangutan · 2026-01-29T13:46:04Z

@borisstoyanov a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

blueorangutan · 2026-01-30T04:19:05Z

[SF] Trillian test result (tid-15336)
Environment: kvm-ol8 (x2), zone: Advanced Networking with Mgmt server ol8
Total time taken: 49504 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr12422-t15336-kvm-ol8.zip
Smoke tests completed. 149 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File

borisstoyanov

LGTM

kiranchavala

LGTM

Tested manually by following the steps mentioned in the issue

The VPN client was able to get the correct IP without any restart of the vpc router

whenever there is delete remoteaccessvpn and create remoteaccessvpn

…#12422)

Restart xl2tpd service when the VPN configuration is modified

af1a47b

vishesh92 requested a review from Copilot January 14, 2026 08:05

boring-cyborg bot added component:networking component:virtual-router Python Warning... Python code Ahead! labels Jan 14, 2026

This comment was marked as outdated.

Sign in to view

vishesh92 requested a review from Copilot January 14, 2026 08:06

Copilot AI reviewed Jan 14, 2026

View reviewed changes

vishesh92 requested a review from weizhouapache January 14, 2026 09:35

vishesh92 linked an issue Jan 15, 2026 that may be closed by this pull request

VPN setting changes are not propagated to the Virtual Router #12195

Closed

vishesh92 requested a review from Copilot January 15, 2026 08:18

Copilot AI reviewed Jan 15, 2026

View reviewed changes

Pearl1594 reviewed Jan 15, 2026

View reviewed changes

DaanHoogland added this to the 4.20.3 milestone Jan 15, 2026

Merge branch '4.22' into fixup-restart-xl2tpd-after-config-change

ef7b083

RosiKyu added the status:needs-review label Jan 26, 2026

weizhouapache approved these changes Jan 27, 2026

View reviewed changes

vishesh92 modified the milestones: 4.20.3, 4.22.1 Jan 28, 2026

kiranchavala self-assigned this Jan 29, 2026

borisstoyanov approved these changes Jan 30, 2026

View reviewed changes

borisstoyanov marked this pull request as ready for review January 30, 2026 06:36

vishesh92 added the status:needs-testing label Jan 30, 2026

kiranchavala approved these changes Jan 30, 2026

View reviewed changes

kiranchavala added status:ready-for-merge and removed status:needs-testing labels Jan 30, 2026

kiranchavala merged commit ef60aa5 into apache:4.22 Jan 30, 2026
25 of 26 checks passed

DaanHoogland removed the status:needs-review label Jan 30, 2026

DaanHoogland deleted the fixup-restart-xl2tpd-after-config-change branch January 30, 2026 12:20

DaanHoogland mentioned this pull request Jan 30, 2026

VPN setting changes are not propagated to the Virtual Router #12195

Closed

sureshanaparti added this to Apache CloudStack 4.22.1 Jan 30, 2026

sureshanaparti moved this to In Progress in Apache CloudStack 4.22.1 Jan 30, 2026

sureshanaparti moved this from In Progress to Done in Apache CloudStack 4.22.1 Jan 30, 2026

sandeeplocharla pushed a commit to NetApp/cloudstack that referenced this pull request Feb 6, 2026

Restart xl2tpd service when the VPN configuration is modified (apache…

6aa69ca

…#12422)

Conversation

vishesh92 commented Jan 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

Uh oh!

This comment was marked as outdated.

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

vishesh92 commented Jan 14, 2026

Uh oh!

blueorangutan commented Jan 14, 2026

Uh oh!

codecov bot commented Jan 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

blueorangutan commented Jan 14, 2026

Uh oh!

blueorangutan commented Jan 14, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

Pearl1594 Jan 15, 2026

Choose a reason for hiding this comment

Uh oh!

vishesh92 Jan 16, 2026

Choose a reason for hiding this comment

Uh oh!

weizhouapache Jan 27, 2026

Choose a reason for hiding this comment

Uh oh!

weizhouapache left a comment

Choose a reason for hiding this comment

Uh oh!

borisstoyanov commented Jan 27, 2026

Uh oh!

blueorangutan commented Jan 27, 2026

Uh oh!

DaanHoogland commented Jan 27, 2026

Uh oh!

vishesh92 commented Jan 27, 2026

Uh oh!

blueorangutan commented Jan 28, 2026

Uh oh!

DaanHoogland commented Jan 28, 2026

Uh oh!

vishesh92 commented Jan 28, 2026

Uh oh!

kiranchavala commented Jan 29, 2026

Uh oh!

blueorangutan commented Jan 29, 2026

Uh oh!

blueorangutan commented Jan 29, 2026

Uh oh!

borisstoyanov commented Jan 29, 2026

Uh oh!

blueorangutan commented Jan 29, 2026

Uh oh!

blueorangutan commented Jan 30, 2026

Uh oh!

borisstoyanov left a comment

Choose a reason for hiding this comment

Uh oh!

kiranchavala left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

vishesh92 commented Jan 14, 2026 •

edited

Loading

codecov bot commented Jan 14, 2026 •

edited

Loading