Fix conserve mode for VPC Source NAT IP and extend conserve mode for VPC offerings #12487

nvazquez · 2026-01-21T15:28:02Z

Description

This PR extends the conserve mode for VPCs tiers added on the previous PRs: #8309, #10744 by allowing:

If the VPC tier offering uses conserve mode, then the public IP used for Source NAT can be reused for multiple services (it was previously restricted to Source NAT only)

This PR also introduces the following changes:

Introduce conserve mode for VPC offerings
When a VPC is created from a VPC offering using conserve mode: public IP rules can be created on different VPC tiers (when conserve mode = false, the rules are restricted to a single VPC tier).

Fixes: #8317

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?

nvazquez · 2026-01-21T15:28:46Z

@blueorangutan package

blueorangutan · 2026-01-21T15:30:36Z

@nvazquez a [SL] Jenkins job has been kicked to build packages. It will be bundled with no SystemVM templates. I'll keep you posted as I make progress.

codecov · 2026-01-21T15:36:23Z

Codecov Report

❌ Patch coverage is 6.89655% with 54 lines in your changes missing coverage. Please review.
✅ Project coverage is 17.85%. Comparing base (1b0a036) to head (9e3eeb7).
⚠️ Report is 64 commits behind head on main.

Files with missing lines	Patch %	Lines
...om/cloud/network/firewall/FirewallManagerImpl.java	14.28%	7 Missing and 5 partials ⚠️
...n/java/com/cloud/network/IpAddressManagerImpl.java	0.00%	8 Missing and 2 partials ⚠️
...e/cloudstack/api/response/VpcOfferingResponse.java	0.00%	6 Missing ⚠️
...main/java/com/cloud/network/vpc/VpcOfferingVO.java	0.00%	6 Missing ⚠️
...ck/api/command/admin/vpc/CreateVPCOfferingCmd.java	0.00%	3 Missing ⚠️
...rg/apache/cloudstack/api/response/VpcResponse.java	0.00%	3 Missing ⚠️
...java/com/cloud/api/query/vo/VpcOfferingJoinVO.java	0.00%	3 Missing ⚠️
...loud/network/lb/LoadBalancingRulesManagerImpl.java	0.00%	3 Missing ⚠️
...ain/java/com/cloud/network/vpc/VpcManagerImpl.java	40.00%	2 Missing and 1 partial ⚠️
...and/user/firewall/CreatePortForwardingRuleCmd.java	0.00%	1 Missing ⚠️
... and 4 more

Additional details and impacted files

@@            Coverage Diff             @@
##               main   #12487    +/-   ##
==========================================
  Coverage     17.84%   17.85%            
- Complexity    15980    15997    +17     
==========================================
  Files          5929     5930     +1     
  Lines        531084   531360   +276     
  Branches      64914    64955    +41     
==========================================
+ Hits          94783    94863    +80     
- Misses       425686   425872   +186     
- Partials      10615    10625    +10

Flag	Coverage Δ
uitests	`3.58% <ø> (-0.01%)`	⬇️
unittests	`18.94% <6.89%> (+<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-21T16:05:08Z

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

nvazquez · 2026-01-21T18:58:21Z

@blueorangutan package

blueorangutan · 2026-01-21T19:00:35Z

@nvazquez a [SL] Jenkins job has been kicked to build packages. It will be bundled with no SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2026-01-21T19:40:01Z

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

nvazquez · 2026-01-21T20:31:01Z

@blueorangutan package

blueorangutan · 2026-01-21T20:32:36Z

@nvazquez a [SL] Jenkins job has been kicked to build packages. It will be bundled with no SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2026-01-21T21:10:55Z

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

nvazquez · 2026-01-21T21:12:43Z

@blueorangutan test keepEnv

blueorangutan · 2026-01-21T21:14:34Z

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

blueorangutan · 2026-01-22T13:29:06Z

[SF] Trillian test result (tid-15239)
Environment: kvm-ol8 (x2), zone: Advanced Networking with Mgmt server ol8
Total time taken: 55566 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr12487-t15239-kvm-ol8.zip
Smoke tests completed. 147 look OK, 3 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.70	test_kubernetes_clusters.py
test_02_list_cpvm_vm	`Failure`	0.03	test_ssvm.py
test_04_cpvm_internals	`Failure`	0.04	test_ssvm.py
test_01_redundant_vpc_site2site_vpn	`Failure`	392.36	test_vpc_vpn.py

nvazquez · 2026-01-27T05:13:52Z

@blueorangutan package

blueorangutan · 2026-01-27T05:16:05Z

@nvazquez a [SL] Jenkins job has been kicked to build packages. It will be bundled with no SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2026-01-27T05:54:18Z

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

sureshanaparti

clgtm

sureshanaparti · 2026-01-27T05:59:34Z

@blueorangutan package

blueorangutan · 2026-01-27T06:00:04Z

@sureshanaparti a [SL] Jenkins job has been kicked to build packages. It will be bundled with no SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2026-01-27T06:51:19Z

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

weizhouapache · 2026-01-27T08:03:57Z

@blueorangutan package

blueorangutan · 2026-01-27T08:06:05Z

@weizhouapache a [SL] Jenkins job has been kicked to build packages. It will be bundled with no SystemVM templates. I'll keep you posted as I make progress.

weizhouapache

@nvazquez

can we create VPC offering with conserve mode via API and UI ?
can you add smoke tests ?
- source nat can be used by vpc tiers
- other public Ips too

weizhouapache · 2026-01-27T08:16:15Z

engine/schema/src/main/resources/META-INF/db/schema-42210to42300.sql

    CONSTRAINT `fk_webhook_filter__webhook_id` FOREIGN KEY(`webhook_id`) REFERENCES `webhook`(`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.vpc_offerings','conserve_mode', 'tinyint(1) unsigned NULL DEFAULT 0');


add a comment to the column ?

weizhouapache · 2026-01-27T08:16:48Z

engine/schema/src/main/resources/META-INF/db/schema-42210to42300.sql

 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.vpc_offerings','conserve_mode', 'tinyint(1) unsigned NULL DEFAULT 0');
+UPDATE `cloud`.`vpc_offerings` SET conserve_mode=1 WHERE name='Default VPC offering';


I am not sure if we need to update the value
what about "Redundant VPC offering" ?

blueorangutan · 2026-01-27T08:52:37Z

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

Fix conserve mode for VPC Source NAT and extend rules for VPC tiers

ca62353

boring-cyborg bot added component:api component:networking component:UI component:vpc labels Jan 21, 2026

Fix unit test

5ade2b3

Fixes

3fd969b

nvazquez marked this pull request as ready for review January 27, 2026 05:09

nvazquez requested review from DaanHoogland, Pearl1594, shwstppr, sureshanaparti and weizhouapache January 27, 2026 05:10

nvazquez added this to the 4.23.0 milestone Jan 27, 2026

nvazquez changed the title ~~Fix conserve mode for VPC Source NAT IP and extend rules for VPC tiers~~ Fix conserve mode for VPC Source NAT IP and extend conserve mode for VPC offerings Jan 27, 2026

sureshanaparti approved these changes Jan 27, 2026

View reviewed changes

sureshanaparti added the status:needs-testing label Jan 27, 2026

weizhouapache reviewed Jan 27, 2026

View reviewed changes

Pass conserve mode on create VPC Offering

9e3eeb7

nvazquez marked this pull request as draft January 27, 2026 15:11

Fix conserve mode for VPC Source NAT IP and extend conserve mode for VPC offerings #12487

Are you sure you want to change the base?

Fix conserve mode for VPC Source NAT IP and extend conserve mode for VPC offerings #12487

Conversation

nvazquez commented Jan 21, 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!

nvazquez commented Jan 21, 2026

Uh oh!

blueorangutan commented Jan 21, 2026

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

blueorangutan commented Jan 21, 2026

Uh oh!

nvazquez commented Jan 21, 2026

Uh oh!

blueorangutan commented Jan 21, 2026

Uh oh!

blueorangutan commented Jan 21, 2026

Uh oh!

nvazquez commented Jan 21, 2026

Uh oh!

blueorangutan commented Jan 21, 2026

Uh oh!

blueorangutan commented Jan 21, 2026

Uh oh!

nvazquez commented Jan 21, 2026

Uh oh!

blueorangutan commented Jan 21, 2026

Uh oh!

blueorangutan commented Jan 22, 2026

Uh oh!

nvazquez commented Jan 27, 2026

Uh oh!

blueorangutan commented Jan 27, 2026

Uh oh!

blueorangutan commented Jan 27, 2026

Uh oh!

sureshanaparti left a comment

Choose a reason for hiding this comment

Uh oh!

sureshanaparti commented Jan 27, 2026

Uh oh!

blueorangutan commented Jan 27, 2026

Uh oh!

blueorangutan commented Jan 27, 2026

Uh oh!

weizhouapache commented Jan 27, 2026

Uh oh!

blueorangutan commented Jan 27, 2026

Uh oh!

weizhouapache left a comment

Choose a reason for hiding this comment

Uh oh!

weizhouapache Jan 27, 2026

Choose a reason for hiding this comment

Uh oh!

weizhouapache Jan 27, 2026

Choose a reason for hiding this comment

Uh oh!

blueorangutan commented Jan 27, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

nvazquez commented Jan 21, 2026 •

edited

Loading

codecov bot commented Jan 21, 2026 •

edited

Loading