Skip to content

Commit 8afd114

Browse files
DaanHooglandDaanHoogland
authored
Revert "Network: default egress policy Allow for Isolated networks on fresh i…" (#14116)
This reverts commit e0f3006.
1 parent e0f3006 commit 8afd114

5 files changed

Lines changed: 1 addition & 103 deletions

File tree

‎api/src/test/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmdTest.java‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎engine/schema/src/main/java/com/cloud/offerings/NetworkOfferingVO.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -346,10 +346,6 @@ public boolean isEgressDefaultPolicy() {
346346
return egressdefaultpolicy;
347347
}
348348

349-
public void setEgressDefaultPolicy(boolean egressDefaultPolicy) {
350-
this.egressdefaultpolicy = egressDefaultPolicy;
351-
}
352-
353349
public NetworkOfferingVO(String name, String displayText, TrafficType trafficType, boolean systemOnly, boolean specifyVlan, Integer rateMbps,
354350
Integer multicastRateMbps, boolean isDefault, Availability availability, String tags, Network.GuestType guestType, boolean conserveMode,
355351
boolean specifyIpRanges, boolean isPersistent, boolean internalLb, boolean publicLb, boolean isForVpc) {

‎server/src/main/java/com/cloud/server/ConfigurationServerImpl.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1067,12 +1067,6 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
10671067
Network.GuestType.Isolated, true, false, false, false, true, false);
10681068

10691069
defaultIsolatedSourceNatEnabledNetworkOffering.setState(NetworkOffering.State.Enabled);
1070-
// Default egress policy is Allow on fresh installations, consistent with the
1071-
// createNetworkOffering API default (egressdefaultpolicy=true when not specified).
1072-
// Existing installations are not affected: this method only runs on first boot
1073-
// (guarded by the "init" configuration flag) and persistDefaultNetworkOffering()
1074-
// never updates an already existing offering.
1075-
defaultIsolatedSourceNatEnabledNetworkOffering.setEgressDefaultPolicy(true);
10761070
defaultIsolatedSourceNatEnabledNetworkOffering.setSupportsVmAutoScaling(true);
10771071
defaultIsolatedSourceNatEnabledNetworkOffering = _networkOfferingDao.persistDefaultNetworkOffering(defaultIsolatedSourceNatEnabledNetworkOffering);
10781072

@@ -1090,9 +1084,6 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
10901084
false, true, null, null, true, Availability.Optional, null, Network.GuestType.Isolated, true, true, false, false, false, false);
10911085

10921086
defaultIsolatedEnabledNetworkOffering.setState(NetworkOffering.State.Enabled);
1093-
// This offering carries no Firewall service, so the flag is not enforced anywhere;
1094-
// it is set for consistency so API responses do not advertise a misleading Deny policy.
1095-
defaultIsolatedEnabledNetworkOffering.setEgressDefaultPolicy(true);
10961087
defaultIsolatedEnabledNetworkOffering = _networkOfferingDao.persistDefaultNetworkOffering(defaultIsolatedEnabledNetworkOffering);
10971088

10981089
for (Service service : defaultIsolatedNetworkOfferingProviders.keySet()) {

‎server/src/test/java/com/cloud/server/ConfigurationServerImplTest.java‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
import com.cloud.dc.dao.VlanDao;
2424
import com.cloud.domain.dao.DomainDao;
2525
import com.cloud.network.dao.NetworkDao;
26-
import com.cloud.offering.NetworkOffering;
27-
import com.cloud.offerings.NetworkOfferingVO;
2826
import com.cloud.offerings.dao.NetworkOfferingDao;
2927
import com.cloud.offerings.dao.NetworkOfferingServiceMapDao;
3028
import com.cloud.service.dao.ServiceOfferingDao;
@@ -37,16 +35,12 @@
3735
import org.junit.Assert;
3836
import org.junit.Test;
3937
import org.junit.runner.RunWith;
40-
import org.mockito.ArgumentCaptor;
4138
import org.mockito.InjectMocks;
4239
import org.mockito.Mock;
4340
import org.mockito.Mockito;
4441
import org.mockito.Spy;
4542
import org.mockito.junit.MockitoJUnitRunner;
4643

47-
import java.util.HashMap;
48-
import java.util.Map;
49-
5044
@RunWith(MockitoJUnitRunner.class)
5145
public class ConfigurationServerImplTest {
5246

@@ -128,37 +122,4 @@ public void testUpdateSystemvmPassword() {
128122
//teardown
129123
System.setProperty("user.name", realusername);
130124
}
131-
132-
@Test
133-
public void testCreateDefaultNetworkOfferingsSeedsIsolatedOfferingsWithEgressAllow() {
134-
Mockito.when(_networkOfferingDao.persistDefaultNetworkOffering(Mockito.any(NetworkOfferingVO.class)))
135-
.thenAnswer(invocation -> invocation.getArgument(0));
136-
137-
try (TransactionLegacy txn = TransactionLegacy.open("testCreateDefaultNetworkOfferings")) {
138-
configurationServer.createDefaultNetworkOfferings();
139-
}
140-
141-
ArgumentCaptor<NetworkOfferingVO> captor = ArgumentCaptor.forClass(NetworkOfferingVO.class);
142-
Mockito.verify(_networkOfferingDao, Mockito.atLeastOnce()).persistDefaultNetworkOffering(captor.capture());
143-
144-
Map<String, NetworkOfferingVO> offeringsByName = new HashMap<>();
145-
for (NetworkOfferingVO offering : captor.getAllValues()) {
146-
offeringsByName.putIfAbsent(offering.getUniqueName(), offering);
147-
}
148-
149-
NetworkOfferingVO isolatedSourceNatOffering = offeringsByName.get(NetworkOffering.DefaultIsolatedNetworkOfferingWithSourceNatService);
150-
Assert.assertNotNull(isolatedSourceNatOffering);
151-
Assert.assertTrue("Built-in Isolated source-NAT offering must be seeded with egress default policy Allow on fresh installations",
152-
isolatedSourceNatOffering.isEgressDefaultPolicy());
153-
154-
NetworkOfferingVO isolatedOffering = offeringsByName.get(NetworkOffering.DefaultIsolatedNetworkOffering);
155-
Assert.assertNotNull(isolatedOffering);
156-
Assert.assertTrue("Built-in Isolated (no source-NAT) offering must be seeded with egress default policy Allow on fresh installations",
157-
isolatedOffering.isEgressDefaultPolicy());
158-
159-
NetworkOfferingVO sharedOffering = offeringsByName.get(NetworkOffering.DefaultSharedNetworkOffering);
160-
Assert.assertNotNull(sharedOffering);
161-
Assert.assertFalse("Built-in Shared offering seeding must remain unchanged",
162-
sharedOffering.isEgressDefaultPolicy());
163-
}
164125
}

‎ui/src/views/offering/AddNetworkOffering.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,7 @@ export default {
704704
isolation: 'dedicated',
705705
conservemode: true,
706706
availability: 'optional',
707-
egressdefaultpolicy: 'allow',
707+
egressdefaultpolicy: 'deny',
708708
ispublic: this.isPublic,
709709
nsxsupportlb: true,
710710
routingmode: 'static'

0 commit comments

Comments
 (0)