Skip to content

Commit 5eca121

Browse files
committed
network: address review comments on the egress allowed offering (PR 14286)
Rename the NetworkOfferingVO constructor parameter egressdefaultpolicy to egressDefaultPolicy to match the field, and log the service instead of the whole service map entry in the default offering trace messages.
1 parent 229b48b commit 5eca121

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ public NetworkOfferingVO(String name, String displayText, TrafficType trafficTyp
384384
public NetworkOfferingVO(String name, String displayText, TrafficType trafficType, boolean systemOnly, boolean specifyVlan, Integer rateMbps,
385385
Integer multicastRateMbps, boolean isDefault, Availability availability, String tags, Network.GuestType guestType, boolean conserveMode, boolean dedicatedLb,
386386
boolean sharedSourceNat, boolean redundantRouter, boolean elasticIp, boolean elasticLb, boolean specifyIpRanges, boolean inline, boolean isPersistent,
387-
boolean associatePublicIP, boolean publicLb, boolean internalLb, boolean isForVpc, boolean egressdefaultpolicy, boolean supportsStrechedL2, boolean supportsPublicAccess) {
387+
boolean associatePublicIP, boolean publicLb, boolean internalLb, boolean isForVpc, boolean egressDefaultPolicy, boolean supportsStrechedL2, boolean supportsPublicAccess) {
388388
this(name,
389389
displayText,
390390
trafficType,
@@ -408,7 +408,7 @@ public NetworkOfferingVO(String name, String displayText, TrafficType trafficTyp
408408
this.elasticLb = elasticLb;
409409
this.inline = inline;
410410
this.eipAssociatePublicIp = associatePublicIP;
411-
this.egressDefaultPolicy = egressdefaultpolicy;
411+
this.egressDefaultPolicy = egressDefaultPolicy;
412412
this.supportsStrechedL2 = supportsStrechedL2;
413413
this.supportsPublicAccess = supportsPublicAccess;
414414
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1086,13 +1086,13 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
10861086
new NetworkOfferingServiceMapVO(defaultIsolatedSourceNatEnabledNetworkOffering.getId(), service,
10871087
defaultIsolatedSourceNatEnabledNetworkOfferingProviders.get(service));
10881088
_ntwkOfferingServiceMapDao.persist(offService);
1089-
logger.trace("Added service {} for the network offering: {}", offService, defaultIsolatedSourceNatEnabledNetworkOffering.getUniqueName());
1089+
logger.trace("Added service {} for the network offering: {}", service, defaultIsolatedSourceNatEnabledNetworkOffering.getUniqueName());
10901090

10911091
offService =
10921092
new NetworkOfferingServiceMapVO(defaultIsolatedSourceNatEnabledNetworkOfferingWithDefaultEgressAllowed.getId(), service,
10931093
defaultIsolatedSourceNatEnabledNetworkOfferingProviders.get(service));
10941094
_ntwkOfferingServiceMapDao.persist(offService);
1095-
logger.trace("Added service {} for the network offering: {}", offService, defaultIsolatedSourceNatEnabledNetworkOfferingWithDefaultEgressAllowed.getUniqueName());
1095+
logger.trace("Added service {} for the network offering: {}", service, defaultIsolatedSourceNatEnabledNetworkOfferingWithDefaultEgressAllowed.getUniqueName());
10961096
}
10971097

10981098
// Offering #4

0 commit comments

Comments
 (0)