framework: configure allocated source NAT when implement a network

Author: weizhouapache

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

@@ -37,7 +37,6 @@
 import com.cloud.dc.dao.VlanDao;
 import com.cloud.deploy.DeployDestination;
 import com.cloud.exception.ConcurrentOperationException;
-import com.cloud.exception.InsufficientAddressCapacityException;
 import com.cloud.exception.InsufficientCapacityException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.host.dao.HostDao;
@@ -449,21 +448,12 @@ public boolean implement(Network network, NetworkOffering offering, DeployDestin
         // Step 3: Configure source NAT if supported.
         if (canHandle(network, Service.SourceNat)) {
             try {
-                Account owner = context != null ? context.getAccount() : null;
+                Account owner = accountService.getAccount(network.getAccountId());
                 PublicIp sourceNatIp = null;
-                if (owner != null) {
-                    sourceNatIp = ipAddressManager.assignSourceNatIpAddressToGuestNetwork(owner, network);
+                PublicIpAddress existingIp = networkModel.getSourceNatIpAddressForGuestNetwork(owner, network);
+                if (existingIp != null) {
+                    applyIps(network, List.of(existingIp), Set.of(Service.SourceNat));
                 }
-                if (sourceNatIp == null) {
-                    PublicIpAddress existingIp = networkModel.getSourceNatIpAddressForGuestNetwork(owner, network);
-                    if (existingIp != null) {
-                        applyIps(network, List.of(existingIp), Set.of(Service.SourceNat));
-                    }
-                } else {
-                    applyIps(network, List.of(sourceNatIp), Set.of(Service.SourceNat));
-                }
-            } catch (InsufficientAddressCapacityException e) {
-                logger.warn("Could not assign source NAT IP for network {}: {}", network.getId(), e.getMessage());
             } catch (Exception e) {
                 logger.warn("Failed to configure source NAT IP for network {}: {}", network.getId(), e.getMessage(), e);
             }