Skip to content

Commit 9e3366c

Browse files
committed
framework: do not configure Source NAT when implement a network
1 parent 7bb291b commit 9e3366c

1 file changed

Lines changed: 0 additions & 25 deletions

File tree

framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/network/NetworkExtensionElement.java

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import com.cloud.dc.dao.VlanDao;
3838
import com.cloud.deploy.DeployDestination;
3939
import com.cloud.exception.ConcurrentOperationException;
40-
import com.cloud.exception.InsufficientAddressCapacityException;
4140
import com.cloud.exception.InsufficientCapacityException;
4241
import com.cloud.exception.ResourceUnavailableException;
4342
import com.cloud.host.dao.HostDao;
@@ -55,7 +54,6 @@
5554
import com.cloud.network.dao.PhysicalNetworkVO;
5655
import com.cloud.network.PhysicalNetworkServiceProvider;
5756
import com.cloud.network.PublicIpAddress;
58-
import com.cloud.network.addr.PublicIp;
5957
import com.cloud.network.dao.FirewallRulesDao;
6058
import com.cloud.network.dao.IPAddressDao;
6159
import com.cloud.network.dao.IPAddressVO;
@@ -446,29 +444,6 @@ public boolean implement(Network network, NetworkOffering offering, DeployDestin
446444
return false;
447445
}
448446

449-
// Step 3: Configure source NAT if supported.
450-
if (canHandle(network, Service.SourceNat)) {
451-
try {
452-
Account owner = context != null ? context.getAccount() : null;
453-
PublicIp sourceNatIp = null;
454-
if (owner != null) {
455-
sourceNatIp = ipAddressManager.assignSourceNatIpAddressToGuestNetwork(owner, network);
456-
}
457-
if (sourceNatIp == null) {
458-
PublicIpAddress existingIp = networkModel.getSourceNatIpAddressForGuestNetwork(owner, network);
459-
if (existingIp != null) {
460-
applyIps(network, List.of(existingIp), Set.of(Service.SourceNat));
461-
}
462-
} else {
463-
applyIps(network, List.of(sourceNatIp), Set.of(Service.SourceNat));
464-
}
465-
} catch (InsufficientAddressCapacityException e) {
466-
logger.warn("Could not assign source NAT IP for network {}: {}", network.getId(), e.getMessage());
467-
} catch (Exception e) {
468-
logger.warn("Failed to configure source NAT IP for network {}: {}", network.getId(), e.getMessage(), e);
469-
}
470-
}
471-
472447
return true;
473448
}
474449

0 commit comments

Comments
 (0)