engine/schema: create default network offering for vpc tier with conserve_mode=1 for fresh installation #10744

weizhouapache · 2025-04-17T08:06:46Z

Description

with #8309, he default vpc offering of upgraded environments have been updated to conserve_mode=1.
but for fresh installation, the default vpc offering still has conserve_mode=0.

This PR fixes it.

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?

…erve_mode=1 for fresh installation

codecov · 2025-04-17T08:15:49Z

Codecov Report

Attention: Patch coverage is 0% with 1 line in your changes missing coverage. Please review.

Project coverage is 16.01%. Comparing base (207a2c1) to head (53a1c88).
Report is 54 commits behind head on 4.20.

Files with missing lines	Patch %	Lines
...tack/engine/orchestration/NetworkOrchestrator.java	0.00%	1 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##               4.20   #10744      +/-   ##
============================================
- Coverage     16.02%   16.01%   -0.01%     
+ Complexity    13124    13120       -4     
============================================
  Files          5652     5652              
  Lines        495921   495921              
  Branches      60053    60053              
============================================
- Hits          79463    79445      -18     
- Misses       407593   407612      +19     
+ Partials       8865     8864       -1

Flag	Coverage Δ
uitests	`4.00% <ø> (ø)`
unittests	`16.86% <0.00%> (-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

weizhouapache · 2025-04-17T13:23:30Z

@blueorangutan package

blueorangutan · 2025-04-17T13:24: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-04-17T15:04:45Z

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

DaanHoogland · 2025-04-17T15:44:55Z

@blueorangutan test

blueorangutan · 2025-04-17T15:46:03Z

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

blueorangutan · 2025-04-17T16:35:19Z

[SF] Trillian Build Failed (tid-13043)

blueorangutan · 2025-04-19T02:43:39Z

[SF] Trillian test result (tid-13051)
Environment: kvm-ol8 (x2), Advanced Networking with Mgmt server ol8
Total time taken: 57759 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr10744-t13051-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

harikrishna-patnala

LGTM

blueorangutan · 2025-04-23T10:43:22Z

[SF] Trillian Build Failed (tid-13105)

rohityadavcloud · 2025-05-09T05:26:33Z

Is this good to merge @weizhouapache @Pearl1594 @DaanHoogland ?

DaanHoogland · 2025-05-09T07:53:12Z

@Pearl1594 , do you want more testing on this?

Pearl1594

code LGTM. But I wonder if this should go into 4.19

weizhouapache · 2025-05-09T08:15:18Z

code LGTM. But I wonder if this should go into 4.19

@Pearl1594
I can create another PR for 4.19, if you think it is needed

(for DB issue fixed in both 4.19.3 and 4.20.1, we need to create two separated PRs)

Pearl1594 · 2025-05-09T08:21:23Z

I think it would be good to have in 4.19 as well .. but this is good to merge

DaanHoogland · 2025-05-09T08:56:24Z

...hestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java

@@ -595,7 +595,7 @@ public void doInTransactionWithoutResult(final TransactionStatus status) {
                if (_networkOfferingDao.findByUniqueName(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworks) == null) {
                    offering = _configMgr.createNetworkOffering(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworks,
                            "Offering for Isolated VPC networks with Source Nat service enabled", TrafficType.Guest, null, false, Availability.Optional, null,
-                            defaultVPCOffProviders, true, Network.GuestType.Isolated, false, null, false, null, false, false, null, false, null, true, true, false, false, null, null, null,true, null, null, false);
+                            defaultVPCOffProviders, true, Network.GuestType.Isolated, false, null, true, null, false, false, null, false, null, true, true, false, false, null, null, null,true, null, null, false);


so only this needs backporting to 4.19?

this part, and also the SQL to 4.19.2->4.19.3 upgrade schema

checked with Pearl, currently therre is no upgrade path for 4.19.2 to 4.19.3

old envs deployed before 4.19.0 will be good when they upgrade to 4.19.0 or later
the impacted versions are old envs deployed with 4.19.0/4.19.1/4.19.2
they will be good when upgrade to 4.20.1
but they will have the issue when upgade to 4.19.3, if we do not add upgrade path with db change
the db change is quite simple ..

we can backport the java change to 4.19.3, so 4.19.3 fresh env will be fine.

ok, I have a bit of an issue with backporting the sql change, not of principle but because there is no other reason to create an upgrade path yet. I think this issue is too low priority to create the upgrade path for the sake of it. what do you think @Pearl1594 @weizhouapache ?

I agree @DaanHoogland

maybe you can add SQL changes to the description of the PR #10843
in case someone want the fix in 4.19.1/2/3, they can execute the SQL

…erve_mode=1 for fresh installation (apache#10744)

boring-cyborg bot added the component:orchestration label Apr 17, 2025

weizhouapache changed the title ~~engine/schema: Re-apply #8309: VPC: update default network offering for vpc tier to conserve_mode=1~~ engine/schema: create default network offering for vpc tier with conserve_mode=1 for fresh installation Apr 17, 2025

engine/schema: create default network offering for vpc tier with cons…

53a1c88

…erve_mode=1 for fresh installation

weizhouapache force-pushed the 4.20-vpc-conserve-mode branch from 702472b to 53a1c88 Compare April 17, 2025 08:07

DaanHoogland approved these changes Apr 17, 2025

View reviewed changes

weizhouapache marked this pull request as ready for review April 17, 2025 13:23

harikrishna-patnala approved these changes Apr 21, 2025

View reviewed changes

rohityadavcloud added this to the 4.20.1 milestone May 9, 2025

Pearl1594 approved these changes May 9, 2025

View reviewed changes

Pearl1594 merged commit 7e2aa0e into apache:4.20 May 9, 2025
25 of 26 checks passed

DaanHoogland reviewed May 9, 2025

View reviewed changes

DaanHoogland deleted the 4.20-vpc-conserve-mode branch May 9, 2025 09:27

DaanHoogland pushed a commit to shapeblue/cloudstack that referenced this pull request May 9, 2025

engine/schema: create default network offering for vpc tier with cons…

7ee25de

…erve_mode=1 for fresh installation (apache#10744)

DaanHoogland mentioned this pull request May 9, 2025

4.19 vpc conserve mode fix backport #10843

Open

14 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

engine/schema: create default network offering for vpc tier with conserve_mode=1 for fresh installation #10744

engine/schema: create default network offering for vpc tier with conserve_mode=1 for fresh installation #10744

weizhouapache commented Apr 17, 2025

codecov bot commented Apr 17, 2025 •

edited

Loading

DaanHoogland left a comment

weizhouapache commented Apr 17, 2025

blueorangutan commented Apr 17, 2025

blueorangutan commented Apr 17, 2025

DaanHoogland commented Apr 17, 2025

blueorangutan commented Apr 17, 2025

blueorangutan commented Apr 17, 2025

blueorangutan commented Apr 19, 2025

harikrishna-patnala left a comment

blueorangutan commented Apr 23, 2025

rohityadavcloud commented May 9, 2025 •

edited

Loading

DaanHoogland commented May 9, 2025

Pearl1594 left a comment

weizhouapache commented May 9, 2025

Pearl1594 commented May 9, 2025

DaanHoogland May 9, 2025

weizhouapache May 9, 2025

weizhouapache May 9, 2025

DaanHoogland May 9, 2025 •

edited

Loading

weizhouapache May 9, 2025

engine/schema: create default network offering for vpc tier with conserve_mode=1 for fresh installation #10744

engine/schema: create default network offering for vpc tier with conserve_mode=1 for fresh installation #10744

Conversation

weizhouapache commented Apr 17, 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?

codecov bot commented Apr 17, 2025 • edited Loading

Codecov Report

DaanHoogland left a comment

Choose a reason for hiding this comment

weizhouapache commented Apr 17, 2025

blueorangutan commented Apr 17, 2025

blueorangutan commented Apr 17, 2025

DaanHoogland commented Apr 17, 2025

blueorangutan commented Apr 17, 2025

blueorangutan commented Apr 17, 2025

blueorangutan commented Apr 19, 2025

harikrishna-patnala left a comment

Choose a reason for hiding this comment

blueorangutan commented Apr 23, 2025

rohityadavcloud commented May 9, 2025 • edited Loading

DaanHoogland commented May 9, 2025

Pearl1594 left a comment

Choose a reason for hiding this comment

weizhouapache commented May 9, 2025

Pearl1594 commented May 9, 2025

DaanHoogland May 9, 2025

Choose a reason for hiding this comment

weizhouapache May 9, 2025

Choose a reason for hiding this comment

weizhouapache May 9, 2025

Choose a reason for hiding this comment

DaanHoogland May 9, 2025 • edited Loading

Choose a reason for hiding this comment

weizhouapache May 9, 2025

Choose a reason for hiding this comment

codecov bot commented Apr 17, 2025 •

edited

Loading

rohityadavcloud commented May 9, 2025 •

edited

Loading

DaanHoogland May 9, 2025 •

edited

Loading