From 4543df74918aae20f33dd41ba38b36a4cdf531dc Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Thu, 3 Jul 2025 14:00:44 +0200 Subject: [PATCH 1/8] server: fix conserve_mode of DefaultIsolatedNetworkOfferingForVpcNetworks --- .../src/main/resources/META-INF/db/schema-42010to42100.sql | 3 +++ .../main/java/com/cloud/server/ConfigurationServerImpl.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql b/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql index 5a50b96d8f2a..b6742a668809 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql @@ -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'; diff --git a/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java b/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java index 0c836d7347db..37c303ca003c 100644 --- a/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java +++ b/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java @@ -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); From 7243cd3f75e8368dcd8978ec7938cd8faef38769 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 4 Jul 2025 14:27:52 +0200 Subject: [PATCH 2/8] Update engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql Co-authored-by: Suresh Kumar Anaparti --- .../src/main/resources/META-INF/db/schema-42010to42100.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql b/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql index b6742a668809..c11235c90a03 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql @@ -205,4 +205,4 @@ 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'; +UPDATE `cloud`.`network_offerings` SET conserve_mode = 1 WHERE name = 'DefaultIsolatedNetworkOfferingForVpcNetworks'; From af3dead5df1b5c770e05654c6b7dc19d1dc20ec4 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Mon, 7 Jul 2025 13:31:00 +0200 Subject: [PATCH 3/8] test: update test_network_acl.py to test conserve mode --- test/integration/smoke/test_network_acl.py | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/test/integration/smoke/test_network_acl.py b/test/integration/smoke/test_network_acl.py index 0914f4dc2d4e..4f7f4c934ff6 100644 --- a/test/integration/smoke/test_network_acl.py +++ b/test/integration/smoke/test_network_acl.py @@ -125,6 +125,32 @@ def test_network_acl(self): self.assertTrue(vm.state == 'Running', "VM is not running") self.debug("VM %s deployed in VPC %s" %(vm.id, vpc.id)) + # 6) Acquire a Public IP, and add Load Balancing Rule + public_ip = PublicIPAddress.create( + self.apiclient, + zoneid=self.zone.id, + accountid=self.account.name, + domainid= self.domain.id, + vpcid= vpc.id + ) + LoadBalancerRule.create( + self.apiclient, + self.services["lbrule"], + ipaddressid=public_ip.ipaddress.id, + accountid=self.account.name, + vpcid= vpc.id, + networkid=ntwk.id, + domainid=self.account.domainid) + + # 7) Add Port Forwarding Rule with same Public IP to test conserve mode + NATRule.create( + self.apiclient, + self.virtual_machine, + self.services["natrule"], + ipaddressid=public_ip.ipaddress.id, + vpcid= vpc.id, + networkid=ntwk.id) + @classmethod def tearDownClass(cls): try: From 3b089c9cd84cd1421215c1b23ff740da88b1dd1f Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Tue, 22 Jul 2025 06:58:13 +0800 Subject: [PATCH 4/8] Update test/integration/smoke/test_network_acl.py Co-authored-by: Suresh Kumar Anaparti --- test/integration/smoke/test_network_acl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/smoke/test_network_acl.py b/test/integration/smoke/test_network_acl.py index 4f7f4c934ff6..db1882b3d151 100644 --- a/test/integration/smoke/test_network_acl.py +++ b/test/integration/smoke/test_network_acl.py @@ -130,7 +130,7 @@ def test_network_acl(self): self.apiclient, zoneid=self.zone.id, accountid=self.account.name, - domainid= self.domain.id, + domainid=self.domain.id, vpcid= vpc.id ) LoadBalancerRule.create( From c1beb259f4b414b24eca742ea33fb97d1fb77838 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Tue, 22 Jul 2025 06:58:20 +0800 Subject: [PATCH 5/8] Update test/integration/smoke/test_network_acl.py Co-authored-by: Suresh Kumar Anaparti --- test/integration/smoke/test_network_acl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/smoke/test_network_acl.py b/test/integration/smoke/test_network_acl.py index db1882b3d151..0e0df3f80050 100644 --- a/test/integration/smoke/test_network_acl.py +++ b/test/integration/smoke/test_network_acl.py @@ -131,7 +131,7 @@ def test_network_acl(self): zoneid=self.zone.id, accountid=self.account.name, domainid=self.domain.id, - vpcid= vpc.id + vpcid=vpc.id ) LoadBalancerRule.create( self.apiclient, From 7582bd80851aee0dbfc4fbcd7ee7ad75fd42c2df Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Tue, 22 Jul 2025 06:58:27 +0800 Subject: [PATCH 6/8] Update test/integration/smoke/test_network_acl.py Co-authored-by: Suresh Kumar Anaparti --- test/integration/smoke/test_network_acl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/smoke/test_network_acl.py b/test/integration/smoke/test_network_acl.py index 0e0df3f80050..4abfc803006d 100644 --- a/test/integration/smoke/test_network_acl.py +++ b/test/integration/smoke/test_network_acl.py @@ -138,7 +138,7 @@ def test_network_acl(self): self.services["lbrule"], ipaddressid=public_ip.ipaddress.id, accountid=self.account.name, - vpcid= vpc.id, + vpcid=vpc.id, networkid=ntwk.id, domainid=self.account.domainid) From 8577d1e25ceb5e285e62e617c1cfde0416a2b716 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Tue, 22 Jul 2025 06:58:33 +0800 Subject: [PATCH 7/8] Update test/integration/smoke/test_network_acl.py Co-authored-by: Suresh Kumar Anaparti --- test/integration/smoke/test_network_acl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/smoke/test_network_acl.py b/test/integration/smoke/test_network_acl.py index 4abfc803006d..8a22266d5836 100644 --- a/test/integration/smoke/test_network_acl.py +++ b/test/integration/smoke/test_network_acl.py @@ -148,7 +148,7 @@ def test_network_acl(self): self.virtual_machine, self.services["natrule"], ipaddressid=public_ip.ipaddress.id, - vpcid= vpc.id, + vpcid=vpc.id, networkid=ntwk.id) @classmethod From 2ef290d57227616eb98afafc51b63a96afbf82f8 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Thu, 14 Aug 2025 09:24:40 +0200 Subject: [PATCH 8/8] Update test/integration/smoke/test_network_acl.py --- test/integration/smoke/test_network_acl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/smoke/test_network_acl.py b/test/integration/smoke/test_network_acl.py index 8a22266d5836..b6a660a1156b 100644 --- a/test/integration/smoke/test_network_acl.py +++ b/test/integration/smoke/test_network_acl.py @@ -145,7 +145,7 @@ def test_network_acl(self): # 7) Add Port Forwarding Rule with same Public IP to test conserve mode NATRule.create( self.apiclient, - self.virtual_machine, + vm, self.services["natrule"], ipaddressid=public_ip.ipaddress.id, vpcid=vpc.id,