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 16.57%. Comparing base (be22bfe) to head (af3dead).
Report is 31 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##               main   #11133    +/-   ##
==========================================
  Coverage     16.57%   16.57%            
- Complexity    13971    13987    +16     
==========================================
  Files          5743     5745     +2     
  Lines        510648   510847   +199     
  Branches      62105    62140    +35     
==========================================
+ Hits          84641    84696    +55     
- Misses       416534   416677   +143     
- Partials       9473     9474     +1

Flag	Coverage Δ
uitests	`3.91% <ø> (+<0.01%)`	⬆️
unittests	`17.47% <ø> (+<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.

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

blueorangutan · 2025-07-08T08:49:19Z

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

Test	Result	Time (s)	Test File
test_network_acl	`Error`	111.36	test_network_acl.py

weizhouapache · 2025-07-10T07:04:02Z

@blueorangutan LLtest keepEnv

blueorangutan · 2025-07-10T07:06:03Z

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

github-actions · 2025-07-15T10:13:07Z

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

Co-authored-by: Suresh Kumar Anaparti <[email protected]>

sureshanaparti · 2025-07-22T04:25:00Z

@weizhouapache can you check the conflicts

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

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

weizhouapache marked this pull request as draft July 10, 2025 07:03

github-actions bot added the status:has-conflicts label Jul 15, 2025

weizhouapache and others added 4 commits July 22, 2025 06:58

Update test/integration/smoke/test_network_acl.py

3b089c9

Co-authored-by: Suresh Kumar Anaparti <[email protected]>

Update test/integration/smoke/test_network_acl.py

c1beb25

Co-authored-by: Suresh Kumar Anaparti <[email protected]>

Update test/integration/smoke/test_network_acl.py

7582bd8

Co-authored-by: Suresh Kumar Anaparti <[email protected]>

Update test/integration/smoke/test_network_acl.py

8577d1e

Co-authored-by: Suresh Kumar Anaparti <[email protected]>

server: fix conserve_mode of DefaultIsolatedNetworkOfferingForVpcNetworks #11133

Are you sure you want to change the base?

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!

Uh oh!

Uh oh!

blueorangutan commented Jul 8, 2025

Uh oh!

weizhouapache commented Jul 10, 2025

Uh oh!

blueorangutan commented Jul 10, 2025

Uh oh!

github-actions bot commented Jul 15, 2025

Uh oh!

sureshanaparti commented Jul 22, 2025

Uh oh!

Uh oh!

codecov bot commented Jul 3, 2025 •

edited

Loading