Routed: check if routed network is enabled when create ipv4 subnet/bgp peer/ASN range/network/vpc

Author: weizhouapache

server/src/main/java/com/cloud/bgp/BGPServiceImpl.java

@@ -24,6 +24,7 @@
 import com.cloud.dc.dao.DataCenterDao;
 import com.cloud.domain.Domain;
 import com.cloud.domain.dao.DomainDao;
+import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.network.Network;
 import com.cloud.network.NetworkModel;
@@ -116,6 +117,9 @@ public ASNumberRange createASNumberRange(long zoneId, long startASNumber, long e
             LOGGER.error(msg);
             throw new InvalidParameterException(msg);
         }
+        if (!routedIpv4Manager.isRoutedNetworkVpcEnabled(zoneId)) {
+            throw new InvalidParameterValueException("Cannot create ASN range as Routed networks and VPCs are not enabled for the zone.");
+        }
         if (startASNumber > endASNumber) {
             String msg = "Please specify a valid AS Number range";
             LOGGER.error(msg);

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java

@@ -6677,6 +6677,13 @@ public NetworkOfferingVO createNetworkOffering(final String name, final String d
                 if (!RoutedIpv4Manager.RoutedNetworkVpcEnabled.value()) {
                     throw new InvalidParameterValueException(String.format("Configuration %s needs to be enabled for Routed networks", RoutedIpv4Manager.RoutedNetworkVpcEnabled.key()));
                 }
+                if (zoneIds != null) {
+                    for (Long zoneId: zoneIds) {
+                        if (!RoutedIpv4Manager.RoutedNetworkVpcEnabled.valueIn(zoneId)) {
+                            throw new InvalidParameterValueException(String.format("Configuration %s needs to be enabled for Routed networks in zone (ID: %s)", RoutedIpv4Manager.RoutedNetworkVpcEnabled.key(), zoneId));
+                        }
+                    }
+                }
                 boolean useVirtualRouterOnly = true;
                 for (Service service : serviceProviderMap.keySet()) {
                     Set<Provider> providers = serviceProviderMap.get(service);

server/src/main/java/com/cloud/network/NetworkServiceImpl.java

@@ -1394,10 +1394,6 @@ void validateNetworkCidrSize(Account caller, Integer cidrSize, String cidr, Netw
         if (ObjectUtils.allNotNull(cidr, cidrSize)) {
             throw new InvalidParameterValueException("network cidr and cidr size are mutually exclusive");
         }
-        if (NetworkOffering.NetworkMode.ROUTED.equals(networkOffering.getNetworkMode())
-                && !routedIpv4Manager.isRoutedNetworkVpcEnabled(zoneId)) {
-            throw new InvalidParameterValueException("Routed network is not enabled in this zone");
-        }
         if (NetworkOffering.NetworkMode.ROUTED.equals(networkOffering.getNetworkMode())
                 && routedIpv4Manager.isVirtualRouterGateway(networkOffering)) {
             if (cidr != null) {
@@ -1655,6 +1651,11 @@ public Network createGuestNetwork(CreateNetworkCmd cmd) throws InsufficientCapac
             }
         }
 
+        if (NetworkOffering.NetworkMode.ROUTED.equals(ntwkOff.getNetworkMode())
+                && !routedIpv4Manager.isRoutedNetworkVpcEnabled(zone.getId())) {
+            throw new InvalidParameterValueException("Routed network is not enabled in this zone");
+        }
+
         if (isNonVpcNetworkSupportingDynamicRouting(ntwkOff) && ntwkOff.isSpecifyAsNumber() && asNumber == null) {
             throw new InvalidParameterValueException("AS number is required for the network but not passed.");
         }

server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java

@@ -500,8 +500,17 @@ public VpcOffering createVpcOffering(CreateVPCOfferingCmd cmd) {
             }
             networkMode = NetworkOffering.NetworkMode.valueOf(networkModeStr);
         }
-        if (NetworkOffering.NetworkMode.ROUTED.equals(networkMode) && !RoutedIpv4Manager.RoutedNetworkVpcEnabled.value()) {
-            throw new InvalidParameterValueException(String.format("Configuration %s needs to be enabled for Routed VPCs", RoutedIpv4Manager.RoutedNetworkVpcEnabled.key()));
+        if (NetworkOffering.NetworkMode.ROUTED.equals(networkMode)) {
+            if (!RoutedIpv4Manager.RoutedNetworkVpcEnabled.value()) {
+                throw new InvalidParameterValueException(String.format("Configuration %s needs to be enabled for Routed VPCs", RoutedIpv4Manager.RoutedNetworkVpcEnabled.key()));
+            }
+            if (zoneIds != null) {
+                for (Long zoneId: zoneIds) {
+                    if (!RoutedIpv4Manager.RoutedNetworkVpcEnabled.valueIn(zoneId)) {
+                        throw new InvalidParameterValueException(String.format("Configuration %s needs to be enabled for Routed VPCs in zone (ID: %s)", RoutedIpv4Manager.RoutedNetworkVpcEnabled.key(), zoneId));
+                    }
+                }
+            }
         }
         boolean specifyAsNumber = cmd.getSpecifyAsNumber();
         String routingModeString = cmd.getRoutingMode();
@@ -1164,6 +1173,11 @@ public Vpc createVpc(final long zoneId, final long vpcOffId, final long vpcOwner
             throw ex;
         }
 
+        if (NetworkOffering.NetworkMode.ROUTED.equals(vpcOff.getNetworkMode())
+                && !routedIpv4Manager.RoutedNetworkVpcEnabled.valueIn(zoneId)) {
+            throw new InvalidParameterValueException("Routed VPC is not enabled in this zone");
+        }
+
         if (NetworkOffering.RoutingMode.Dynamic.equals(vpcOff.getRoutingMode()) && vpcOff.isSpecifyAsNumber() && asNumber == null) {
             throw new InvalidParameterValueException("AS number is required for the VPC but not passed.");
         }
@@ -1261,10 +1275,6 @@ private void validateVpcCidrSize(Account caller, long accountId, VpcOffering vpc
         if (ObjectUtils.allNotNull(cidr, cidrSize)) {
             throw new InvalidParameterValueException("VPC cidr and cidr size are mutually exclusive");
         }
-        if (NetworkOffering.NetworkMode.ROUTED.equals(vpcOffering.getNetworkMode())
-                && !routedIpv4Manager.RoutedNetworkVpcEnabled.valueIn(zoneId)) {
-            throw new InvalidParameterValueException("Routed VPC is not enabled in this zone");
-        }
         if (routedIpv4Manager.isVpcVirtualRouterGateway(vpcOffering)) {
             if (cidr != null) {
                 if (!_accountMgr.isRootAdmin(caller.getId())) {

server/src/main/java/org/apache/cloudstack/network/RoutedIpv4ManagerImpl.java

@@ -217,6 +217,8 @@ public DataCenterIpv4GuestSubnet createDataCenterIpv4GuestSubnet(CreateIpv4Subne
             throw new InvalidParameterValueException("Invalid IPv4 subnet: " + subnet);
         }
 
+        checkIfRoutedNetworkVpcEnabled(zoneId);
+
         // check conflicts
         List<DataCenterIpv4GuestSubnetVO> existingSubnets = dataCenterIpv4GuestSubnetDao.listByDataCenterId(zoneId);
         checkConflicts(existingSubnets, subnet, null);
@@ -1036,6 +1038,8 @@ public BgpPeer createBgpPeer(CreateBgpPeerCmd createBgpPeerCmd) {
         String password = createBgpPeerCmd.getPassword();
         Map<String, String> detailsStr = createBgpPeerCmd.getDetails();
 
+        checkIfRoutedNetworkVpcEnabled(zoneId);
+
         if (ObjectUtils.allNull(ip4Address, ip6Address)) {
             throw new InvalidParameterValueException("At least one of IPv4 and IPv6 address must be specified.");
         }
@@ -1645,4 +1649,10 @@ public void removeBgpPeersByDomainId(long domainId) {
     public Boolean isRoutedNetworkVpcEnabled(long zoneId) {
         return RoutedNetworkVpcEnabled.valueIn(zoneId);
     }
+
+    private void checkIfRoutedNetworkVpcEnabled(long zoneId) {
+        if (!isRoutedNetworkVpcEnabled(zoneId)) {
+            throw new InvalidParameterValueException("Routed networks and VPCs are not enabled for the zone.");
+        }
+    }
 }