server: fix network creation when ipv4 subnet is dedicated

weizhouapache · Aug 29, 2024 · 83d1915 · 83d1915
1 parent bbc44d3
commit 83d1915
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/api/src/main/java/org/apache/cloudstack/network/RoutedIpv4Manager.java b/api/src/main/java/org/apache/cloudstack/network/RoutedIpv4Manager.java
@@ -118,7 +118,7 @@ public interface RoutedIpv4Manager extends PluggableService, Configurable {
     // Methods for internal calls
     void getOrCreateIpv4SubnetForGuestNetwork(Network network, String networkCidr);
 
-    Ipv4GuestSubnetNetworkMap getOrCreateIpv4SubnetForGuestNetwork(Network network, Integer networkCidrSize);
+    Ipv4GuestSubnetNetworkMap getOrCreateIpv4SubnetForGuestNetwork(Long domainId, Long accountId, Long zoneId, Integer networkCidrSize);
 
     void getOrCreateIpv4SubnetForVpc(Vpc vpc, String networkCidr);
 

diff --git a/server/src/main/java/com/cloud/network/guru/ExternalGuestNetworkGuru.java b/server/src/main/java/com/cloud/network/guru/ExternalGuestNetworkGuru.java
@@ -133,7 +133,7 @@ public Network design(NetworkOffering offering, DeploymentPlan plan, Network use
                 if (userSpecified.getNetworkCidrSize() == null) {
                     throw new InvalidParameterValueException("The network CIDR or CIDR size must be specified.");
                 }
-                Ipv4GuestSubnetNetworkMap subnet = routedIpv4Manager.getOrCreateIpv4SubnetForGuestNetwork(config, userSpecified.getNetworkCidrSize());
+                Ipv4GuestSubnetNetworkMap subnet = routedIpv4Manager.getOrCreateIpv4SubnetForGuestNetwork(owner.getDomainId(), owner.getAccountId(), config.getDataCenterId(), userSpecified.getNetworkCidrSize());
                 if (subnet != null) {
                     final String[] cidrTuple = subnet.getSubnet().split("\\/");
                     config.setGateway(NetUtils.getIpRangeStartIpFromCidr(cidrTuple[0], Long.parseLong(cidrTuple[1])));

diff --git a/server/src/main/java/org/apache/cloudstack/network/RoutedIpv4ManagerImpl.java b/server/src/main/java/org/apache/cloudstack/network/RoutedIpv4ManagerImpl.java
@@ -576,12 +576,12 @@ public void getOrCreateIpv4SubnetForGuestNetwork(Network network, String network
     }
 
     @Override
-    public Ipv4GuestSubnetNetworkMap getOrCreateIpv4SubnetForGuestNetwork(Network network, Integer networkCidrSize) {
-        Ipv4GuestSubnetNetworkMap subnet = getIpv4SubnetForAccount(network.getDomainId(), network.getAccountId(), network.getDataCenterId(), networkCidrSize);
+    public Ipv4GuestSubnetNetworkMap getOrCreateIpv4SubnetForGuestNetwork(Long domainId, Long accountId, Long zoneId, Integer networkCidrSize) {
+        Ipv4GuestSubnetNetworkMap subnet = getIpv4SubnetForAccount(domainId, accountId, zoneId, networkCidrSize);
         if (subnet != null) {
             return subnet;
         }
-        return createIpv4SubnetForAccount(network.getDomainId(), network.getAccountId(), network.getDataCenterId(), networkCidrSize);
+        return createIpv4SubnetForAccount(domainId, accountId, zoneId, networkCidrSize);
     }
 
     @Override