This is an automated email from the ASF dual-hosted git repository. DaanHoogland pushed a commit to branch revert-13684-isolated-network-egress-default-allow in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 54a9e005969696466f4c4e5e0f3feeb8d10a58c2 Author: dahn <[email protected]> AuthorDate: Thu Sep 10 11:50:46 2026 +0200 Revert "Network: default egress policy Allow for Isolated networks on fresh i…" This reverts commit e0f3006764d00f18a59945861b50bf55d01f64eb. --- .../network/CreateNetworkOfferingCmdTest.java | 50 ---------------------- .../com/cloud/offerings/NetworkOfferingVO.java | 4 -- .../com/cloud/server/ConfigurationServerImpl.java | 9 ---- .../cloud/server/ConfigurationServerImplTest.java | 39 ----------------- ui/src/views/offering/AddNetworkOffering.vue | 2 +- 5 files changed, 1 insertion(+), 103 deletions(-) diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmdTest.java deleted file mode 100644 index 9c22ecce142..00000000000 --- a/api/src/test/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmdTest.java +++ /dev/null @@ -1,50 +0,0 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - -package org.apache.cloudstack.api.command.admin.network; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; -import org.springframework.test.util.ReflectionTestUtils; - -import static org.junit.Assert.assertEquals; - -@RunWith(MockitoJUnitRunner.class) -public class CreateNetworkOfferingCmdTest { - - @Test - public void testEgressDefaultPolicyIsAllowWhenParameterOmitted() { - CreateNetworkOfferingCmd cmd = new CreateNetworkOfferingCmd(); - assertEquals("createNetworkOffering must default to egress Allow when egressdefaultpolicy is not specified", - Boolean.TRUE, cmd.getEgressDefaultPolicy()); - } - - @Test - public void testEgressDefaultPolicyExplicitDenyIsHonored() { - CreateNetworkOfferingCmd cmd = new CreateNetworkOfferingCmd(); - ReflectionTestUtils.setField(cmd, "egressDefaultPolicy", Boolean.FALSE); - assertEquals(Boolean.FALSE, cmd.getEgressDefaultPolicy()); - } - - @Test - public void testEgressDefaultPolicyExplicitAllowIsHonored() { - CreateNetworkOfferingCmd cmd = new CreateNetworkOfferingCmd(); - ReflectionTestUtils.setField(cmd, "egressDefaultPolicy", Boolean.TRUE); - assertEquals(Boolean.TRUE, cmd.getEgressDefaultPolicy()); - } -} diff --git a/engine/schema/src/main/java/com/cloud/offerings/NetworkOfferingVO.java b/engine/schema/src/main/java/com/cloud/offerings/NetworkOfferingVO.java index e6cdb01ab13..fc22e68985d 100644 --- a/engine/schema/src/main/java/com/cloud/offerings/NetworkOfferingVO.java +++ b/engine/schema/src/main/java/com/cloud/offerings/NetworkOfferingVO.java @@ -346,10 +346,6 @@ public class NetworkOfferingVO implements NetworkOffering { return egressdefaultpolicy; } - public void setEgressDefaultPolicy(boolean egressDefaultPolicy) { - this.egressdefaultpolicy = egressDefaultPolicy; - } - public NetworkOfferingVO(String name, String displayText, TrafficType trafficType, boolean systemOnly, boolean specifyVlan, Integer rateMbps, Integer multicastRateMbps, boolean isDefault, Availability availability, String tags, Network.GuestType guestType, boolean conserveMode, boolean specifyIpRanges, boolean isPersistent, boolean internalLb, boolean publicLb, boolean isForVpc) { diff --git a/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java b/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java index 1901bcae3e0..def564dfdc6 100644 --- a/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java +++ b/server/src/main/java/com/cloud/server/ConfigurationServerImpl.java @@ -1067,12 +1067,6 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio Network.GuestType.Isolated, true, false, false, false, true, false); defaultIsolatedSourceNatEnabledNetworkOffering.setState(NetworkOffering.State.Enabled); - // Default egress policy is Allow on fresh installations, consistent with the - // createNetworkOffering API default (egressdefaultpolicy=true when not specified). - // Existing installations are not affected: this method only runs on first boot - // (guarded by the "init" configuration flag) and persistDefaultNetworkOffering() - // never updates an already existing offering. - defaultIsolatedSourceNatEnabledNetworkOffering.setEgressDefaultPolicy(true); defaultIsolatedSourceNatEnabledNetworkOffering.setSupportsVmAutoScaling(true); defaultIsolatedSourceNatEnabledNetworkOffering = _networkOfferingDao.persistDefaultNetworkOffering(defaultIsolatedSourceNatEnabledNetworkOffering); @@ -1090,9 +1084,6 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio false, true, null, null, true, Availability.Optional, null, Network.GuestType.Isolated, true, true, false, false, false, false); defaultIsolatedEnabledNetworkOffering.setState(NetworkOffering.State.Enabled); - // This offering carries no Firewall service, so the flag is not enforced anywhere; - // it is set for consistency so API responses do not advertise a misleading Deny policy. - defaultIsolatedEnabledNetworkOffering.setEgressDefaultPolicy(true); defaultIsolatedEnabledNetworkOffering = _networkOfferingDao.persistDefaultNetworkOffering(defaultIsolatedEnabledNetworkOffering); for (Service service : defaultIsolatedNetworkOfferingProviders.keySet()) { diff --git a/server/src/test/java/com/cloud/server/ConfigurationServerImplTest.java b/server/src/test/java/com/cloud/server/ConfigurationServerImplTest.java index 895caa36a4a..fd1cb6a6313 100644 --- a/server/src/test/java/com/cloud/server/ConfigurationServerImplTest.java +++ b/server/src/test/java/com/cloud/server/ConfigurationServerImplTest.java @@ -23,8 +23,6 @@ import com.cloud.dc.dao.HostPodDao; import com.cloud.dc.dao.VlanDao; import com.cloud.domain.dao.DomainDao; import com.cloud.network.dao.NetworkDao; -import com.cloud.offering.NetworkOffering; -import com.cloud.offerings.NetworkOfferingVO; import com.cloud.offerings.dao.NetworkOfferingDao; import com.cloud.offerings.dao.NetworkOfferingServiceMapDao; import com.cloud.service.dao.ServiceOfferingDao; @@ -37,16 +35,12 @@ import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.ArgumentCaptor; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.Spy; import org.mockito.junit.MockitoJUnitRunner; -import java.util.HashMap; -import java.util.Map; - @RunWith(MockitoJUnitRunner.class) public class ConfigurationServerImplTest { @@ -128,37 +122,4 @@ public class ConfigurationServerImplTest { //teardown System.setProperty("user.name", realusername); } - - @Test - public void testCreateDefaultNetworkOfferingsSeedsIsolatedOfferingsWithEgressAllow() { - Mockito.when(_networkOfferingDao.persistDefaultNetworkOffering(Mockito.any(NetworkOfferingVO.class))) - .thenAnswer(invocation -> invocation.getArgument(0)); - - try (TransactionLegacy txn = TransactionLegacy.open("testCreateDefaultNetworkOfferings")) { - configurationServer.createDefaultNetworkOfferings(); - } - - ArgumentCaptor<NetworkOfferingVO> captor = ArgumentCaptor.forClass(NetworkOfferingVO.class); - Mockito.verify(_networkOfferingDao, Mockito.atLeastOnce()).persistDefaultNetworkOffering(captor.capture()); - - Map<String, NetworkOfferingVO> offeringsByName = new HashMap<>(); - for (NetworkOfferingVO offering : captor.getAllValues()) { - offeringsByName.putIfAbsent(offering.getUniqueName(), offering); - } - - NetworkOfferingVO isolatedSourceNatOffering = offeringsByName.get(NetworkOffering.DefaultIsolatedNetworkOfferingWithSourceNatService); - Assert.assertNotNull(isolatedSourceNatOffering); - Assert.assertTrue("Built-in Isolated source-NAT offering must be seeded with egress default policy Allow on fresh installations", - isolatedSourceNatOffering.isEgressDefaultPolicy()); - - NetworkOfferingVO isolatedOffering = offeringsByName.get(NetworkOffering.DefaultIsolatedNetworkOffering); - Assert.assertNotNull(isolatedOffering); - Assert.assertTrue("Built-in Isolated (no source-NAT) offering must be seeded with egress default policy Allow on fresh installations", - isolatedOffering.isEgressDefaultPolicy()); - - NetworkOfferingVO sharedOffering = offeringsByName.get(NetworkOffering.DefaultSharedNetworkOffering); - Assert.assertNotNull(sharedOffering); - Assert.assertFalse("Built-in Shared offering seeding must remain unchanged", - sharedOffering.isEgressDefaultPolicy()); - } } diff --git a/ui/src/views/offering/AddNetworkOffering.vue b/ui/src/views/offering/AddNetworkOffering.vue index d9d6f9fac00..4399bce91c4 100644 --- a/ui/src/views/offering/AddNetworkOffering.vue +++ b/ui/src/views/offering/AddNetworkOffering.vue @@ -704,7 +704,7 @@ export default { isolation: 'dedicated', conservemode: true, availability: 'optional', - egressdefaultpolicy: 'allow', + egressdefaultpolicy: 'deny', ispublic: this.isPublic, nsxsupportlb: true, routingmode: 'static'
