Skip to content

VPC: update default network offering for vpc tier to conserve_mode=1 #8309

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
merged 4 commits into from
Dec 18, 2023
Merged

VPC: update default network offering for vpc tier to conserve_mode=1 #8309

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5e33c4f
VPC: update default network offering for vpc tier to conserve_mode=1
weizhouapache Dec 5, 2023
c2d81af
Update server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java
weizhouapache Dec 5, 2023
22d0177
Merge branch 'main' into 4.19-update-vpctier-offering-conserve-mode
harikrishna-patnala Dec 6, 2023
dddd8e7
Update: fix smoke test test_vpc_network
weizhouapache Dec 6, 2023
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
2 changes: 2 additions & 0 deletions engine/schema/src/main/resources/META-INF/db/schema-41810to41900.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@

ALTER TABLE `cloud`.`mshost` MODIFY COLUMN `state` varchar(25);

UPDATE `cloud`.`network_offerings` SET conserve_mode=1 WHERE name='DefaultIsolatedNetworkOfferingForVpcNetworks';

-- Invalidate existing console_session records
UPDATE `cloud`.`console_session` SET removed=now();
-- Modify acquired column in console_session to datetime type
Expand Down
4 changes: 2 additions & 2 deletions server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1809,9 +1809,9 @@ public void validateNtwkOffForVpc(final NetworkOffering guestNtwkOff, final List
* ("No redunant router support when network belnogs to VPC"); }
*/

// 4) Conserve mode should be off
// 4) Conserve mode should be off in elder versions
if (guestNtwkOff.isConserveMode()) {
throw new InvalidParameterValueException("Only networks with conserve mode Off can belong to VPC");
s_logger.info("Creating a network with conserve mode in VPC");
}

// 5) If Netscaler is LB provider make sure it is in dedicated mode
Expand Down