Allow custom NTP servers for CPVM #11210

Pearl1594 · 2025-07-16T00:36:43Z

Description

This PR fixes #11165

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

Screenshots (if appropriate):

How Has This Been Tested?

configured NTP servers through global setting: cpvm.ntp.server.list
Recreated CPVM
queried ntp servers using: ntpq -p and verified content of /etc/ntpsec/ntp.conf

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

codecov · 2025-07-16T00:41:25Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 5.15%. Comparing base (30deec8) to head (a23b06b).

❗ There is a different number of reports uploaded between BASE (30deec8) and HEAD (a23b06b). Click for more details.

HEAD has 1 upload less than BASE

Flag BASE (30deec8) HEAD (a23b06b)

unittests 1 0

Additional details and impacted files

@@              Coverage Diff              @@
##               4.20   #11210       +/-   ##
=============================================
- Coverage     16.15%    5.15%   -11.01%     
=============================================
  Files          5656      417     -5239     
  Lines        497792    38665   -459127     
  Branches      60368     7791    -52577     
=============================================
- Hits          80443     1992    -78451     
+ Misses       408396    36480   -371916     
+ Partials       8953      193     -8760

Flag	Coverage Δ
uitests	`4.37% <ø> (+0.36%)`	⬆️
unittests	`?`

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.

server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java

systemvm/debian/opt/cloud/bin/setup/common.sh

server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java

DaanHoogland

clgtm

DaanHoogland · 2025-07-16T14:27:11Z

@blueorangutan package

blueorangutan · 2025-07-16T14:28:03Z

@DaanHoogland 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 · 2025-07-16T16:14:46Z

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

DaanHoogland · 2025-07-16T19:50:23Z

@blueorangutan test

blueorangutan · 2025-07-16T19:52:03Z

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

weizhouapache

overall lgtm
left two minor comments

engine/api/src/main/java/com/cloud/vm/VirtualMachineGuru.java

...roller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java

blueorangutan · 2025-07-17T11:59:20Z

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

Test	Result	Time (s)	Test File
test_01_deployVMInSharedNetwork	`Failure`	485.62	test_network.py

Pearl1594 · 2025-07-17T15:39:39Z

@blueorangutan package

blueorangutan · 2025-07-17T15:40:04Z

@Pearl1594 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.

sonarqubecloud · 2025-07-17T16:30:50Z

Quality Gate failed

Failed conditions
18.2% Coverage on New Code (required ≥ 40%)

See analysis details on SonarQube Cloud

blueorangutan · 2025-07-17T16:59:58Z

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

weizhouapache

code lgtm

DaanHoogland · 2025-07-18T07:54:48Z

server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java

@@ -1276,6 +1276,10 @@ public boolean finalizeVirtualMachineProfile(VirtualMachineProfile profile, Depl
            buf.append(" vmpassword=").append(configurationDao.getValue("system.vm.password"));
        }

+        if (org.apache.commons.lang3.StringUtils.isNotEmpty(NTPServerConfig.value())) {


Suggested change

if (org.apache.commons.lang3.StringUtils.isNotEmpty(NTPServerConfig.value())) {

if (StringUtils.isNotEmpty(NTPServerConfig.value())) {

the internal proxy object should be used.

Pearl1594 requested review from DaanHoogland, sureshanaparti and weizhouapache July 16, 2025 00:36

boring-cyborg bot added component:networking component:virtual-router labels Jul 16, 2025

weizhouapache reviewed Jul 16, 2025

View reviewed changes

server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java Outdated Show resolved Hide resolved

weizhouapache reviewed Jul 16, 2025

View reviewed changes

systemvm/debian/opt/cloud/bin/setup/common.sh Show resolved Hide resolved

server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java Outdated Show resolved Hide resolved

server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java Outdated Show resolved Hide resolved

Pearl1594 marked this pull request as draft July 16, 2025 00:53

rohityadavcloud added this to the 4.21.0 milestone Jul 16, 2025

boring-cyborg bot added component:compute component:secondary-storage component:ssvm labels Jul 16, 2025

DaanHoogland approved these changes Jul 16, 2025

View reviewed changes

rohityadavcloud approved these changes Jul 16, 2025

View reviewed changes

DaanHoogland added the status:needs-testing label Jul 16, 2025

weizhouapache approved these changes Jul 17, 2025

View reviewed changes

engine/api/src/main/java/com/cloud/vm/VirtualMachineGuru.java Outdated Show resolved Hide resolved

...roller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java Outdated Show resolved Hide resolved

Allow ntp config on cpvm

a23b06b

Pearl1594 force-pushed the setup-cpvm-ntp branch from b5d822b to a23b06b Compare July 17, 2025 15:32

boring-cyborg bot added the component:kvm label Jul 17, 2025

Pearl1594 changed the base branch from main to 4.20 July 17, 2025 15:32

Pearl1594 requested a review from weizhouapache July 17, 2025 15:39

Pearl1594 marked this pull request as ready for review July 17, 2025 15:40

weizhouapache approved these changes Jul 18, 2025

View reviewed changes

DaanHoogland reviewed Jul 18, 2025

View reviewed changes

	if (org.apache.commons.lang3.StringUtils.isNotEmpty(NTPServerConfig.value())) {
	if (StringUtils.isNotEmpty(NTPServerConfig.value())) {

Allow custom NTP servers for CPVM #11210

Are you sure you want to change the base?

Allow custom NTP servers for CPVM #11210

Conversation

Pearl1594 commented Jul 16, 2025

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Screenshots (if appropriate):

How Has This Been Tested?

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

Uh oh!

codecov bot commented Jul 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

DaanHoogland commented Jul 16, 2025

Uh oh!

blueorangutan commented Jul 16, 2025

Uh oh!

blueorangutan commented Jul 16, 2025

Uh oh!

DaanHoogland commented Jul 16, 2025

Uh oh!

blueorangutan commented Jul 16, 2025

Uh oh!

weizhouapache left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

blueorangutan commented Jul 17, 2025

Uh oh!

Pearl1594 commented Jul 17, 2025

Uh oh!

blueorangutan commented Jul 17, 2025

Uh oh!

sonarqubecloud bot commented Jul 17, 2025

Quality Gate failed

Uh oh!

blueorangutan commented Jul 17, 2025

Uh oh!

weizhouapache left a comment

Choose a reason for hiding this comment

Uh oh!

DaanHoogland Jul 18, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

codecov bot commented Jul 16, 2025 •

edited

Loading