Skip to content

server: fix conserve_mode of DefaultIsolatedNetworkOfferingForVpcNetworks #11133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sureshanaparti merged 9 commits into from
Aug 15, 2025
Merged

server: fix conserve_mode of DefaultIsolatedNetworkOfferingForVpcNetworks #11133

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4543df7
server: fix conserve_mode of DefaultIsolatedNetworkOfferingForVpcNetw…
weizhouapache Jul 3, 2025
7243cd3
Update engine/schema/src/main/resources/META-INF/db/schema-42010to421…
weizhouapache Jul 4, 2025
af3dead
test: update test_network_acl.py to test conserve mode
weizhouapache Jul 7, 2025
3b089c9
Update test/integration/smoke/test_network_acl.py
weizhouapache Jul 21, 2025
c1beb25
Update test/integration/smoke/test_network_acl.py
weizhouapache Jul 21, 2025
7582bd8
Update test/integration/smoke/test_network_acl.py
weizhouapache Jul 21, 2025
8577d1e
Update test/integration/smoke/test_network_acl.py
weizhouapache Jul 21, 2025
08af6dd
Merge remote-tracking branch 'apache/main' into 4.21-fix-vpc-conserve…
weizhouapache Aug 13, 2025
2ef290d
Update test/integration/smoke/test_network_acl.py
weizhouapache Aug 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,3 +203,6 @@ SET `sort_key` = CASE
ELSE `sort_key`
END;
-- End: Changes for Guest OS category cleanup

-- Re-apply VPC: update default network offering for vpc tier to conserve_mode=1 (#8309)
UPDATE `cloud`.`network_offerings` SET conserve_mode=1 WHERE name='DefaultIsolatedNetworkOfferingForVpcNetworks';
2 changes: 1 addition & 1 deletion server/src/main/java/com/cloud/server/ConfigurationServerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1121,7 +1121,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
NetworkOfferingVO defaultNetworkOfferingForVpcNetworks =
new NetworkOfferingVO(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworks,
"Offering for Isolated Vpc networks with Source Nat service enabled", TrafficType.Guest, false, false, null, null, true, Availability.Optional,
null, Network.GuestType.Isolated, false, false, false, false, true, true);
null, Network.GuestType.Isolated, true, false, false, false, true, true);

defaultNetworkOfferingForVpcNetworks.setState(NetworkOffering.State.Enabled);
defaultNetworkOfferingForVpcNetworks.setSupportsVmAutoScaling(true);
Expand Down
Loading