Routed 27: add subnet for VPC

- add db column for vpc_id - add db record for vpc - remove db record when delete a vpc - add checkConflicts methods - remove duplicated settings - check ipv4 cidr when create subnet
apache · weizhouapache · Apr 29, 2024 · May 24, 2024 · May 25, 2024 · May 28, 2024
commit 77fa42dd49ca26ac2c6414d09f3f221a44de833c
diff --git a/api/src/main/java/com/cloud/network/NetworkService.java b/api/src/main/java/com/cloud/network/NetworkService.java
@@ -83,14 +83,6 @@ public interface NetworkService {
             "allow.end.users.to.specify.vr.mtu", "false", "Allow end users to specify VR MTU",
             true, ConfigKey.Scope.Zone);
 
-    ConfigKey<Integer> RoutedIPv4NetworkMaxCidrSize = new ConfigKey<>("Network", Integer.class,
-            "routed.ipv4.network.max.cidr.size", "32", "The maximum value of the cidr size for isolated networks in ROUTED mode",
-            true, ConfigKey.Scope.Zone);
-
-    ConfigKey<Integer> RoutedIPv4NetworkMinCidrSize = new ConfigKey<>("Network", Integer.class,
-            "routed.ipv4.network.min.cidr.size", "24", "The minimum value of the cidr size for isolated networks in ROUTED mode",
-            true, ConfigKey.Scope.Zone);
-
     List<? extends Network> getIsolatedNetworksOwnedByAccountInZone(long zoneId, Account owner);
 
     IpAddress allocateIP(Account ipOwner, long zoneId, Long networkId, Boolean displayIp, String ipaddress) throws ResourceAllocationException, InsufficientAddressCapacityException,

diff --git a/api/src/main/java/org/apache/cloudstack/api/response/Ipv4SubnetForGuestNetworkResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/Ipv4SubnetForGuestNetworkResponse.java
@@ -45,6 +45,10 @@ public class Ipv4SubnetForGuestNetworkResponse extends BaseResponse {
     @Param(description = "subnet of the IPv4 network")
     private String subnet;
 
+    @SerializedName(ApiConstants.STATE)
+    @Param(description = "state of subnet of the IPv4 network")
+    private String state;
+
     @SerializedName(ApiConstants.ZONE_ID)
     @Param(description = "id of zone to which the IPv4 subnet belongs to." )
     private String zoneId;
@@ -89,6 +93,10 @@ public void setSubnet(String subnet) {
         this.subnet = subnet;
     }
 
+    public void setState(String state) {
+        this.state = state;
+    }
+
     public void setNetworkId(String networkId) {
         this.networkId = networkId;
     }

diff --git a/api/src/main/java/org/apache/cloudstack/network/Ipv4GuestSubnetNetworkMap.java b/api/src/main/java/org/apache/cloudstack/network/Ipv4GuestSubnetNetworkMap.java
@@ -38,6 +38,8 @@ enum State {
 
     String getSubnet();
 
+    Long getVpcId();
+
     Long getNetworkId();
 
     State getState();

diff --git a/api/src/main/java/org/apache/cloudstack/network/RoutedIpv4Manager.java b/api/src/main/java/org/apache/cloudstack/network/RoutedIpv4Manager.java
@@ -46,22 +46,16 @@
 
 public interface RoutedIpv4Manager extends PluggableService, Configurable {
 
-    ConfigKey<Integer> RoutedNetworkMaxCidrSize = new ConfigKey<>(ConfigKey.CATEGORY_ADVANCED, Integer.class,
-            "routed.network.max.cidr.size",
-            "30",
-            "The maximum cidr size of routed network.",
-            true,
-            ConfigKey.Scope.Account);
+    ConfigKey<Integer> RoutedIPv4NetworkMaxCidrSize = new ConfigKey<>(ConfigKey.CATEGORY_NETWORK, Integer.class,
+            "routed.ipv4.network.max.cidr.size", "30", "The maximum value of the cidr size for isolated networks in ROUTED mode",
+            true, ConfigKey.Scope.Account);
 
-    ConfigKey<Integer> RoutedNetworkMinCidrSize = new ConfigKey<>(ConfigKey.CATEGORY_ADVANCED, Integer.class,
-            "routed.network.min.cidr.size",
-            "24",
-            "The minimum cidr size of routed network.",
-            true,
-            ConfigKey.Scope.Account);
+    ConfigKey<Integer> RoutedIPv4NetworkMinCidrSize = new ConfigKey<>(ConfigKey.CATEGORY_NETWORK, Integer.class,
+            "routed.ipv4.network.min.cidr.size", "24", "The minimum value of the cidr size for isolated networks in ROUTED mode",
+            true, ConfigKey.Scope.Account);
 
-    ConfigKey<Boolean> RoutedNetworkCidrAutoAllocationEnabled = new ConfigKey<>(ConfigKey.CATEGORY_ADVANCED, Boolean.class,
-            "routed.network.cidr.auto.allocation.enabled",
+    ConfigKey<Boolean> RoutedIPv4NetworkCidrAutoAllocationEnabled = new ConfigKey<>(ConfigKey.CATEGORY_ADVANCED, Boolean.class,
+            "routed.ipv4.network.cidr.auto.allocation.enabled",
             "true",
             "Indicates whether the auto-allocation of network CIDR for routed network is enabled or not.",
             true,
@@ -87,7 +81,9 @@ public interface RoutedIpv4Manager extends PluggableService, Configurable {
 
     boolean deleteIpv4SubnetForGuestNetwork(DeleteIpv4SubnetForGuestNetworkCmd deleteIpv4SubnetForGuestNetworkCmd);
 
-    boolean releaseIpv4SubnetForGuestNetwork(long networkId);
+    void releaseIpv4SubnetForGuestNetwork(long networkId);
+
+    void releaseIpv4SubnetForVpc(long vpcId);
 
     List<? extends Ipv4GuestSubnetNetworkMap> listIpv4GuestSubnetsForGuestNetwork(ListIpv4SubnetsForGuestNetworkCmd listIpv4SubnetsForGuestNetworkCmd);
 
@@ -96,10 +92,14 @@ public interface RoutedIpv4Manager extends PluggableService, Configurable {
     // Methods for internal calls
     void getOrCreateIpv4SubnetForGuestNetwork(Network network, String networkCidr);
 
+    void getOrCreateIpv4SubnetForVpc(Vpc vpc, String networkCidr);
+
     Ipv4GuestSubnetNetworkMap getOrCreateIpv4SubnetForGuestNetwork(Network network, Integer networkCidrSize);
 
     void assignIpv4SubnetToNetwork(String cidr, long networkId);
 
+    void assignIpv4SubnetToVpc(String cidr, long vpcId);
+
     // Methods for Routing firewall rules
     FirewallRule createRoutingFirewallRule(CreateRoutingFirewallRuleCmd createRoutingFirewallRuleCmd) throws NetworkRuleConflictException;
 

diff --git a/engine/schema/src/main/java/org/apache/cloudstack/network/Ipv4GuestSubnetNetworkMapVO.java b/engine/schema/src/main/java/org/apache/cloudstack/network/Ipv4GuestSubnetNetworkMapVO.java
@@ -49,6 +49,9 @@ public class Ipv4GuestSubnetNetworkMapVO implements Ipv4GuestSubnetNetworkMap {
     @Column(name = "subnet")
     private String subnet;
 
+    @Column(name = "vpc_id")
+    private Long vpcId;
+
     @Column(name = "network_id")
     private Long networkId;
 
@@ -97,6 +100,15 @@ public String getSubnet() {
         return subnet;
     }
 
+    @Override
+    public Long getVpcId() {
+        return vpcId;
+    }
+
+    public void setVpcId(Long vpcId) {
+        this.vpcId = vpcId;
+    }
+
     @Override
     public Long getNetworkId() {
         return networkId;

diff --git a/.../schema/src/main/java/org/apache/cloudstack/network/dao/Ipv4GuestSubnetNetworkMapDao.java b/.../schema/src/main/java/org/apache/cloudstack/network/dao/Ipv4GuestSubnetNetworkMapDao.java
@@ -30,7 +30,9 @@ public interface Ipv4GuestSubnetNetworkMapDao extends GenericDao<Ipv4GuestSubnet
     List<Ipv4GuestSubnetNetworkMapVO> listUsedByOtherAccounts(long parentId, Long accountId);
     Ipv4GuestSubnetNetworkMapVO findFirstAvailable(long parentId, long cidrSize);
     Ipv4GuestSubnetNetworkMapVO findByNetworkId(long networkId);
+    Ipv4GuestSubnetNetworkMapVO findByVpcId(long vpcId);
     Ipv4GuestSubnetNetworkMapVO findBySubnet(String subnet);
     List<Ipv4GuestSubnetNetworkMapVO> findSubnetsInStates(Ipv4GuestSubnetNetworkMap.State... states);
     void deleteByParentId(long parentId);
+    List<Ipv4GuestSubnetNetworkMapVO> listAllNoParent();
 }
diff --git a/...ema/src/main/java/org/apache/cloudstack/network/dao/Ipv4GuestSubnetNetworkMapDaoImpl.java b/...ema/src/main/java/org/apache/cloudstack/network/dao/Ipv4GuestSubnetNetworkMapDaoImpl.java
@@ -42,6 +42,7 @@ public class Ipv4GuestSubnetNetworkMapDaoImpl extends GenericDaoBase<Ipv4GuestSu
 
     protected SearchBuilder<Ipv4GuestSubnetNetworkMapVO> ParentStateSearch;
     protected SearchBuilder<Ipv4GuestSubnetNetworkMapVO> ParentIdSearch;
+    protected SearchBuilder<Ipv4GuestSubnetNetworkMapVO> NoParentSearch;
     protected SearchBuilder<Ipv4GuestSubnetNetworkMapVO> NetworkIdSearch;
     protected SearchBuilder<Ipv4GuestSubnetNetworkMapVO> SubnetSearch;
     protected SearchBuilder<Ipv4GuestSubnetNetworkMapVO> StatesSearch;
@@ -60,8 +61,12 @@ public void init() {
         ParentIdSearch = createSearchBuilder();
         ParentIdSearch.and("parentId", ParentIdSearch.entity().getParentId(), SearchCriteria.Op.EQ);
         ParentIdSearch.done();
+        NoParentSearch = createSearchBuilder();
+        NoParentSearch.and("parentId", NoParentSearch.entity().getParentId(), SearchCriteria.Op.NULL);
+        NoParentSearch.done();
         NetworkIdSearch = createSearchBuilder();
         NetworkIdSearch.and("networkId", NetworkIdSearch.entity().getNetworkId(), SearchCriteria.Op.EQ);
+        NetworkIdSearch.and("vpcId", NetworkIdSearch.entity().getVpcId(), SearchCriteria.Op.EQ);
         NetworkIdSearch.done();
         SubnetSearch = createSearchBuilder();
         SubnetSearch.and("subnet", SubnetSearch.entity().getSubnet(), SearchCriteria.Op.EQ);
@@ -129,6 +134,13 @@ public Ipv4GuestSubnetNetworkMapVO findByNetworkId(long networkId) {
         return findOneBy(sc);
     }
 
+    @Override
+    public Ipv4GuestSubnetNetworkMapVO findByVpcId(long vpcId) {
+        SearchCriteria<Ipv4GuestSubnetNetworkMapVO> sc = NetworkIdSearch.create();
+        sc.setParameters("vpcId", vpcId);
+        return findOneBy(sc);
+    }
+
     @Override
     public Ipv4GuestSubnetNetworkMapVO findBySubnet(String subnet) {
         SearchCriteria<Ipv4GuestSubnetNetworkMapVO> sc = SubnetSearch.create();
@@ -149,4 +161,10 @@ public void deleteByParentId(long parentId) {
         sc.setParameters("parentId", parentId);
         remove(sc);
     }
+
+    @Override
+    public List<Ipv4GuestSubnetNetworkMapVO> listAllNoParent() {
+        SearchCriteria<Ipv4GuestSubnetNetworkMapVO> sc = NoParentSearch.create();
+        return listBy(sc, null);
+    }
 }
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41910to42000.sql b/engine/schema/src/main/resources/META-INF/db/schema-41910to42000.sql
@@ -173,6 +173,7 @@ CREATE TABLE `cloud`.`ip4_guest_subnet_network_map` (
    `uuid` varchar(40) DEFAULT NULL,
    `parent_id` bigint(20) unsigned COMMENT 'ip4 guest subnet which subnet belongs to',
    `subnet` varchar(255) NOT NULL COMMENT 'subnet of the ip4 network',
+   `vpc_id` bigint(20) unsigned DEFAULT NULL COMMENT 'VPC which subnet is associated to',
    `network_id` bigint(20) unsigned DEFAULT NULL COMMENT 'network which subnet is associated to',
    `state` varchar(255) NOT NULL COMMENT 'state of the subnet',
    `allocated` datetime default NULL,

diff --git a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
@@ -1381,7 +1381,7 @@ private void checkSharedNetworkCidrOverlap(Long zoneId, long physicalNetworkId,
         }
     }
 
-    void validateNetworkCidrSize(Account caller, Integer cidrSize, String cidr, NetworkOffering networkOffering, long zoneId) {
+    void validateNetworkCidrSize(Account caller, Integer cidrSize, String cidr, NetworkOffering networkOffering, long accountId) {
         if (!GuestType.Isolated.equals(networkOffering.getGuestType())) {
             if (cidrSize != null) {
                 throw new InvalidParameterValueException("network cidr size is only applicable on Isolated networks");
@@ -1391,19 +1391,21 @@ void validateNetworkCidrSize(Account caller, Integer cidrSize, String cidr, Netw
         if (NetworkOffering.RoutingMode.ROUTED.name().equals(networkOffering.getRoutingMode())
                 && routedIpv4Manager.isVirtualRouterGateway(networkOffering)) {
             if (cidr != null) {
-                if (!_accountMgr.isRootAdmin(caller.getId())) {
+                if (!networkOffering.isForVpc() && !_accountMgr.isRootAdmin(caller.getId())) {
                     throw new InvalidParameterValueException("Only root admin can set the gateway/netmask of Isolated networks with ROUTED mode");
                 }
                 return;
             }
             if (cidrSize == null) {
                 throw new InvalidParameterValueException("network cidr or cidr size is required for Isolated networks with ROUTED mode");
             }
-            if (cidrSize > RoutedIPv4NetworkMaxCidrSize.valueIn(zoneId)) {
-                throw new InvalidParameterValueException("network cidr size cannot be bigger than maximum cidr size " + RoutedIPv4NetworkMaxCidrSize.value());
+            Integer maxCidrSize = routedIpv4Manager.RoutedIPv4NetworkMaxCidrSize.valueIn(accountId);
+            if (cidrSize > maxCidrSize) {
+                throw new InvalidParameterValueException("network cidr size cannot be bigger than maximum cidr size " + maxCidrSize);
             }
-            if (cidrSize < RoutedIPv4NetworkMinCidrSize.valueIn(zoneId)) {
-                throw new InvalidParameterValueException("network cidr size cannot be bigger than minimum cidr size " + RoutedIPv4NetworkMinCidrSize.value());
+            Integer minCidrSize = routedIpv4Manager.RoutedIPv4NetworkMinCidrSize.valueIn(accountId);
+            if (cidrSize < minCidrSize) {
+                throw new InvalidParameterValueException("network cidr size cannot be smaller than minimum cidr size " + minCidrSize);
             }
         } else if (cidrSize != null) {
             throw new InvalidParameterValueException("network cidr size is only applicable on Isolated networks with ROUTED mode: " + cidrSize);
@@ -1641,7 +1643,7 @@ public Network createGuestNetwork(CreateNetworkCmd cmd) throws InsufficientCapac
             }
         }
 
-        validateNetworkCidrSize(caller, networkCidrSize, cidr, ntwkOff, zone.getId());
+        validateNetworkCidrSize(caller, networkCidrSize, cidr, ntwkOff, owner.getAccountId());
 
         validateSharedNetworkRouterIPs(gateway, startIP, endIP, netmask, routerIPv4, routerIPv6, startIPv6, endIPv6, ip6Cidr, ntwkOff);
 
@@ -6139,8 +6141,7 @@ public String getConfigComponentName() {
 
     @Override
     public ConfigKey<?>[] getConfigKeys() {
-        return new ConfigKey<?>[] {AllowDuplicateNetworkName, AllowEmptyStartEndIpAddress, VRPrivateInterfaceMtu, VRPublicInterfaceMtu, AllowUsersToSpecifyVRMtu,
-                RoutedIPv4NetworkMaxCidrSize, RoutedIPv4NetworkMinCidrSize};
+        return new ConfigKey<?>[] {AllowDuplicateNetworkName, AllowEmptyStartEndIpAddress, VRPrivateInterfaceMtu, VRPublicInterfaceMtu, AllowUsersToSpecifyVRMtu};
     }
 
     public boolean isDefaultAcl(Long aclId) {

diff --git a/server/src/main/java/com/cloud/network/guru/ExternalGuestNetworkGuru.java b/server/src/main/java/com/cloud/network/guru/ExternalGuestNetworkGuru.java
@@ -127,11 +127,16 @@ public Network design(NetworkOffering offering, DeploymentPlan plan, Network use
         }
         if (NetworkOffering.RoutingMode.ROUTED.name().equals(offering.getRoutingMode())) {
             if (userSpecified.getCidr() != null) {
-                routedIpv4Manager.getOrCreateIpv4SubnetForGuestNetwork(config, userSpecified.getCidr());
+                if (config.getVpcId() == null) {
+                    routedIpv4Manager.getOrCreateIpv4SubnetForGuestNetwork(config, userSpecified.getCidr());
+                }
             } else {
                 if (userSpecified.getNetworkCidrSize() == null) {
                     throw new CloudRuntimeException("The network CIDR or CIDR size must be specified.");
                 }
+                if (config.getVpcId() != null) {
+                    throw new CloudRuntimeException("The network CIDR must be specified for VPC networks.");
+                }
                 Ipv4GuestSubnetNetworkMap subnet = routedIpv4Manager.getOrCreateIpv4SubnetForGuestNetwork(config, userSpecified.getNetworkCidrSize());
                 if (subnet != null) {
                     final String[] cidrTuple = subnet.getSubnet().split("\\/");

diff --git a/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java
@@ -64,6 +64,7 @@
 import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.managed.context.ManagedContextRunnable;
+import org.apache.cloudstack.network.RoutedIpv4Manager;
 import org.apache.cloudstack.query.QueryService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.EnumUtils;
@@ -268,6 +269,8 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
     protected NetworkHelper networkHelper;
     @Inject
     private VpcPrivateGatewayTransactionCallable vpcTxCallable;
+    @Inject
+    RoutedIpv4Manager routedIpv4Manager;
 
     private final ScheduledExecutorService _executor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("VpcChecker"));
     private List<VpcProvider> vpcElements = null;
@@ -1231,6 +1234,11 @@ protected Vpc createVpc(final Boolean displayVpc, final VpcVO vpc) {
                     + "and the hyphen ('-'); can't start or end with \"-\"");
         }
 
+        // get or create Ipv4 subnet for ROUTED VPC
+        if (routedIpv4Manager.isRoutedVpc(vpc)) {
+            routedIpv4Manager.getOrCreateIpv4SubnetForVpc(vpc, cidr);
+        }
+
         VpcVO vpcVO = Transaction.execute(new TransactionCallback<VpcVO>() {
             @Override
             public VpcVO doInTransaction(final TransactionStatus status) {
@@ -1244,6 +1252,10 @@ public VpcVO doInTransaction(final TransactionStatus status) {
         if (vpcVO != null) {
             UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VPC_CREATE, vpcVO.getAccountId(), vpcVO.getZoneId(), vpcVO.getId(), vpcVO.getName(), Vpc.class.getName(), vpcVO.getUuid(), vpcVO.isDisplay());
         }
+        // assign Ipv4 subnet to Routed VPC
+        if (routedIpv4Manager.isRoutedVpc(vpc)) {
+            routedIpv4Manager.assignIpv4SubnetToVpc(cidr, vpc.getId());
+        }
         return vpcVO;
     }
 
@@ -2102,6 +2114,8 @@ public boolean cleanupVpcResources(final long vpcId, final Account caller, final
             _networkAclMgr.deleteNetworkACL(networkAcl);
         }
 
+        routedIpv4Manager.releaseIpv4SubnetForVpc(vpcId);
+
         VpcVO vpc = vpcDao.findById(vpcId);
         annotationDao.removeByEntityType(AnnotationService.EntityType.VPC.name(), vpc.getUuid());
         return success;