Skip to content

Fix simulator test failures on main #13608

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
weizhouapache merged 1 commit into from
Jul 14, 2026
+3 −5
Merged

Fix simulator test failures on main #13608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 2 deletions server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7267,8 +7267,6 @@ public NetworkOffering createNetworkOffering(final NetworkOfferingBaseCmd cmd) {
forVpc = false;
} else if (service == Service.NetworkACL) {
forVpc = true;
} else if (service == Service.Firewall) {
forVpc = true;
}
}

Expand Down
6 changes: 3 additions & 3 deletions test/integration/component/test_vpc_offerings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -868,10 +868,10 @@ def test_06_vpc_off_invalid_services(self):

# Validate the following
# 1. Creating VPC Offering with services NOT supported by VPC
# like Firewall should not be allowed
# like SecurityGroup should not be allowed

self.logger.debug("Creating a VPC offering with Firewall")
self.services["vpc_offering"]["supportedservices"] = 'Dhcp,Dns,PortForwarding,Firewall,Vpn,SourceNat,Lb,UserData,StaticNat'
self.logger.debug("Creating a VPC offering with SecurityGroup")
self.services["vpc_offering"]["supportedservices"] = 'Dhcp,Dns,PortForwarding,SecurityGroup,Vpn,SourceNat,Lb,UserData,StaticNat'

with self.assertRaises(Exception):
VpcOffering.create(
Expand Down
Loading