server: fix conserve_mode of DefaultIsolatedNetworkOfferingForVpcNetworks #11133

weizhouapache · 2025-07-03T12:04:08Z

Description

This PR fixes the conserve_mode of network offering DefaultIsolatedNetworkOfferingForVpcNetworks is still 0 in fresh installation

mysql> select conserve_mode  from `cloud`.`network_offerings` where name='DefaultIsolatedNetworkOfferingForVpcNetworks'\G
*************************** 1. row ***************************
conserve_mode: 0
1 row in set (0.00 sec)

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?

…orks

weizhouapache · 2025-07-03T12:04:21Z

I am so sorry, this is the 3rd PR for the same issue

🤦

codecov · 2025-07-03T12:11:57Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 17.36%. Comparing base (9fd2b90) to head (2ef290d).
⚠️ Report is 3 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff            @@
##               main   #11133   +/-   ##
=========================================
  Coverage     17.36%   17.36%           
  Complexity    15236    15236           
=========================================
  Files          5886     5886           
  Lines        525645   525645           
  Branches      64156    64156           
=========================================
  Hits          91257    91257           
  Misses       424093   424093           
  Partials      10295    10295

Flag	Coverage Δ
uitests	`3.63% <ø> (ø)`
unittests	`18.40% <ø> (ø)`

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.

DaanHoogland

clgtm, and would this be the last one? ;)

weizhouapache · 2025-07-03T13:52:37Z

clgtm, and would this be the last one? ;)

hope so @DaanHoogland
😆

engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql

sureshanaparti · 2025-07-04T12:26:26Z

@blueorangutan package

…00.sql Co-authored-by: Suresh Kumar Anaparti <[email protected]>

blueorangutan · 2025-07-04T12:28:04Z

@sureshanaparti 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-04T15:20:23Z

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

weizhouapache · 2025-07-05T06:44:35Z

@blueorangutan test

blueorangutan · 2025-07-05T06:46:05Z

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

blueorangutan · 2025-07-05T22:15:49Z

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

Test	Result	Time (s)	Test File

weizhouapache · 2025-07-07T11:32:16Z

@blueorangutan package

weizhouapache · 2025-07-07T11:32:59Z

@DaanHoogland @sureshanaparti
I updated a smoke test to test the conserve mode, hope the issue will be fixed PERMANENTLY.

DaanHoogland · 2025-07-07T12:08:31Z

@blueorangutan package

blueorangutan · 2025-07-07T12:10:04Z

@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-07T13:41:04Z

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

weizhouapache · 2025-07-07T17:18:57Z

@blueorangutan test

blueorangutan · 2025-07-07T17:20:03Z

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

test/integration/smoke/test_network_acl.py

weizhouapache · 2025-08-13T10:51:07Z

@blueorangutan package

blueorangutan · 2025-08-13T10:52:04Z

@weizhouapache 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-08-13T12:05:20Z

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

weizhouapache · 2025-08-13T12:17:07Z

@blueorangutan test ol8 kvm-ol8 keepEnv

blueorangutan · 2025-08-13T12:18:04Z

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

blueorangutan · 2025-08-13T12:41:36Z

[SF] Trillian Build Failed (tid-14058)

test/integration/smoke/test_network_acl.py

weizhouapache · 2025-08-14T07:25:00Z

@blueorangutan package

blueorangutan · 2025-08-14T07:26:04Z

@weizhouapache 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-08-14T08:17:10Z

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

weizhouapache · 2025-08-14T08:30:21Z

@blueorangutan package

blueorangutan · 2025-08-14T08:32:04Z

@weizhouapache 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-08-14T09:44:36Z

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

blueorangutan · 2025-08-15T01:11:39Z

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

Test	Result	Time (s)	Test File
test_13_retrieve_vr_default_files	`Error`	1.12	test_diagnostics.py
test_14_retrieve_vr_one_file	`Error`	1.11	test_diagnostics.py
test_15_retrieve_ssvm_default_files	`Error`	1.11	test_diagnostics.py
test_16_retrieve_ssvm_single_file	`Error`	1.11	test_diagnostics.py
test_17_retrieve_cpvm_default_files	`Error`	1.12	test_diagnostics.py
test_18_retrieve_cpvm_single_file	`Error`	1.12	test_diagnostics.py
test_01_redundant_vpc_site2site_vpn	`Failure`	408.46	test_vpc_vpn.py

weizhouapache · 2025-08-15T05:54:19Z

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

Test Result Time (s) Test File
test_13_retrieve_vr_default_files Error 1.12 test_diagnostics.py
test_14_retrieve_vr_one_file Error 1.11 test_diagnostics.py
test_15_retrieve_ssvm_default_files Error 1.11 test_diagnostics.py
test_16_retrieve_ssvm_single_file Error 1.11 test_diagnostics.py
test_17_retrieve_cpvm_default_files Error 1.12 test_diagnostics.py
test_18_retrieve_cpvm_single_file Error 1.12 test_diagnostics.py
test_01_redundant_vpc_site2site_vpn Failure 408.46 test_vpc_vpn.py

smoke test failure with test_network_acl is fixed

sureshanaparti

clgtm

rosi-shapeblue

LGTM - tested and verified the fix

The _conserve_mode_ is 1 in fresh CS installation

blueorangutan · 2025-08-16T03:22:20Z

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

Test	Result	Time (s)	Test File
test_13_retrieve_vr_default_files	`Error`	1.11	test_diagnostics.py
test_14_retrieve_vr_one_file	`Error`	1.10	test_diagnostics.py
test_15_retrieve_ssvm_default_files	`Error`	1.12	test_diagnostics.py
test_16_retrieve_ssvm_single_file	`Error`	1.10	test_diagnostics.py
test_17_retrieve_cpvm_default_files	`Error`	1.12	test_diagnostics.py
test_18_retrieve_cpvm_single_file	`Error`	1.11	test_diagnostics.py
test_01_deployVMInSharedNetwork	`Failure`	423.25	test_network.py
ContextSuite context=TestVPCRedundancy>:setup	`Error`	0.00	test_vpc_redundant.py
test_01_redundant_vpc_site2site_vpn	`Failure`	95.00	test_vpc_vpn.py
test_01_vpc_site2site_vpn_multiple_options	`Failure`	8.58	test_vpc_vpn.py
test_01_vpc_remote_access_vpn	`Failure`	7.35	test_vpc_vpn.py
test_01_vpc_site2site_vpn	`Failure`	6.55	test_vpc_vpn.py
test_02_cancel_host_maintenace_with_migration_jobs	`Error`	1.66	test_host_maintenance.py
test_03_cancel_host_maintenace_with_migration_jobs_failure	`Error`	1.73	test_host_maintenance.py
test_01_cancel_host_maintenance_ssh_enabled_agent_connected	`Failure`	15.61	test_host_maintenance.py
test_03_cancel_host_maintenance_ssh_disabled_agent_connected	`Failure`	18.74	test_host_maintenance.py
test_04_cancel_host_maintenance_ssh_disabled_agent_disconnected	`Failure`	32.41	test_host_maintenance.py
ContextSuite context=TestHostMaintenanceAgents>:teardown	`Error`	33.56	test_host_maintenance.py

…orks (apache#11133) * server: fix conserve_mode of DefaultIsolatedNetworkOfferingForVpcNetworks * test: update test_network_acl.py to test conserve mode * Update test/integration/smoke/test_network_acl.py Co-authored-by: Suresh Kumar Anaparti <[email protected]>

server: fix conserve_mode of DefaultIsolatedNetworkOfferingForVpcNetw…

4543df7

…orks

boring-cyborg bot added the component:management-server label Jul 3, 2025

DaanHoogland approved these changes Jul 3, 2025

View reviewed changes

sureshanaparti reviewed Jul 4, 2025

View reviewed changes

engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql Outdated Show resolved Hide resolved

sureshanaparti added this to the 4.21.0 milestone Jul 4, 2025

sureshanaparti added this to Apache CloudStack 4.21.0 Jul 4, 2025

sureshanaparti moved this to In Progress in Apache CloudStack 4.21.0 Jul 4, 2025

Update engine/schema/src/main/resources/META-INF/db/schema-42010to421…

7243cd3

…00.sql Co-authored-by: Suresh Kumar Anaparti <[email protected]>

test: update test_network_acl.py to test conserve mode

af3dead

boring-cyborg bot added component:integration-test Python Warning... Python code Ahead! labels Jul 7, 2025

weizhouapache marked this pull request as ready for review July 7, 2025 11:33

sureshanaparti reviewed Jul 8, 2025

View reviewed changes

test/integration/smoke/test_network_acl.py Outdated Show resolved Hide resolved

sureshanaparti reviewed Jul 8, 2025

View reviewed changes

test/integration/smoke/test_network_acl.py Outdated Show resolved Hide resolved

github-actions bot removed the status:has-conflicts label Aug 13, 2025

weizhouapache commented Aug 14, 2025

View reviewed changes

test/integration/smoke/test_network_acl.py Outdated Show resolved Hide resolved

Update test/integration/smoke/test_network_acl.py

2ef290d

weizhouapache marked this pull request as ready for review August 14, 2025 07:25

sureshanaparti approved these changes Aug 15, 2025

View reviewed changes

sureshanaparti added the status:needs-testing label Aug 15, 2025

rosi-shapeblue self-assigned this Aug 15, 2025

rosi-shapeblue added status:testing and removed status:needs-testing labels Aug 15, 2025

rosi-shapeblue approved these changes Aug 15, 2025

View reviewed changes

rosi-shapeblue removed the status:testing label Aug 15, 2025

sureshanaparti merged commit 03da8cb into apache:main Aug 15, 2025
26 checks passed

github-project-automation bot moved this from In Progress to Done in Apache CloudStack 4.21.0 Aug 15, 2025

DaanHoogland deleted the 4.21-fix-vpc-conserve-mode branch August 15, 2025 12:58

server: fix conserve_mode of DefaultIsolatedNetworkOfferingForVpcNetworks #11133

server: fix conserve_mode of DefaultIsolatedNetworkOfferingForVpcNetworks #11133

Uh oh!

Conversation

weizhouapache commented Jul 3, 2025

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!

weizhouapache commented Jul 3, 2025

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

weizhouapache commented Jul 3, 2025

Uh oh!

Uh oh!

sureshanaparti commented Jul 4, 2025

Uh oh!

blueorangutan commented Jul 4, 2025

Uh oh!

blueorangutan commented Jul 4, 2025

Uh oh!

weizhouapache commented Jul 5, 2025

Uh oh!

blueorangutan commented Jul 5, 2025

Uh oh!

blueorangutan commented Jul 5, 2025

Uh oh!

weizhouapache commented Jul 7, 2025

Uh oh!

weizhouapache commented Jul 7, 2025

Uh oh!

DaanHoogland commented Jul 7, 2025

Uh oh!

blueorangutan commented Jul 7, 2025

Uh oh!

blueorangutan commented Jul 7, 2025

Uh oh!

weizhouapache commented Jul 7, 2025

Uh oh!

blueorangutan commented Jul 7, 2025

Uh oh!

Uh oh!

Uh oh!

weizhouapache commented Aug 13, 2025

Uh oh!

blueorangutan commented Aug 13, 2025

Uh oh!

blueorangutan commented Aug 13, 2025

Uh oh!

weizhouapache commented Aug 13, 2025

Uh oh!

blueorangutan commented Aug 13, 2025

Uh oh!

blueorangutan commented Aug 13, 2025

Uh oh!

Uh oh!

weizhouapache commented Aug 14, 2025

Uh oh!

blueorangutan commented Aug 14, 2025

Uh oh!

blueorangutan commented Aug 14, 2025

Uh oh!

weizhouapache commented Aug 14, 2025

Uh oh!

blueorangutan commented Aug 14, 2025

Uh oh!

blueorangutan commented Aug 14, 2025

Uh oh!

blueorangutan commented Aug 15, 2025

codecov bot commented Jul 3, 2025 •

edited

Loading