infra: edge zones (#6840)

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
Co-authored-by: dahn <daan@onecht.net>

Author: shwstppr

api/src/main/java/com/cloud/dc/DataCenter.java

@@ -32,6 +32,10 @@ public enum NetworkType {
         Basic, Advanced,
     }
 
+    public enum Type {
+        Core, Edge,
+    }
+
     String getDns1();
 
     String getDns2();
@@ -83,4 +87,6 @@ public enum NetworkType {
     boolean isLocalStorageEnabled();
 
     int getSortKey();
+
+    Type getType();
 }

api/src/main/java/org/apache/cloudstack/api/ApiConstants.java

@@ -243,6 +243,7 @@ public class ApiConstants {
     public static final String IP_TOTAL = "iptotal";
     public static final String IS_CLEANUP_REQUIRED = "iscleanuprequired";
     public static final String IS_DYNAMIC = "isdynamic";
+    public static final String IS_EDGE = "isedge";
     public static final String IS_EXTRACTABLE = "isextractable";
     public static final String IS_FEATURED = "isfeatured";
     public static final String IS_PORTABLE = "isportable";

api/src/main/java/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java

@@ -50,16 +50,16 @@ public class CreatePodCmd extends BaseCmd {
                description = "the Zone ID in which the Pod will be created")
     private Long zoneId;
 
-    @Parameter(name = ApiConstants.START_IP, type = CommandType.STRING, required = true, description = "the starting IP address for the Pod")
+    @Parameter(name = ApiConstants.START_IP, type = CommandType.STRING, description = "the starting IP address for the Pod")
     private String startIp;
 
     @Parameter(name = ApiConstants.END_IP, type = CommandType.STRING, description = "the ending IP address for the Pod")
     private String endIp;
 
-    @Parameter(name = ApiConstants.NETMASK, type = CommandType.STRING, required = true, description = "the netmask for the Pod")
+    @Parameter(name = ApiConstants.NETMASK, type = CommandType.STRING, description = "the netmask for the Pod")
     private String netmask;
 
-    @Parameter(name = ApiConstants.GATEWAY, type = CommandType.STRING, required = true, description = "the gateway for the Pod")
+    @Parameter(name = ApiConstants.GATEWAY, type = CommandType.STRING, description = "the gateway for the Pod")
     private String gateway;
 
     @Parameter(name = ApiConstants.ALLOCATION_STATE, type = CommandType.STRING, description = "Allocation state of this Pod for allocation of new resources")

api/src/main/java/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java

@@ -87,6 +87,10 @@ public class CreateZoneCmd extends BaseCmd {
     @Parameter(name = ApiConstants.LOCAL_STORAGE_ENABLED, type = CommandType.BOOLEAN, description = "true if local storage offering enabled, false otherwise")
     private Boolean localStorageEnabled;
 
+    @Parameter(name = ApiConstants.IS_EDGE, type = CommandType.BOOLEAN, description = "true if the zone is an edge zone, false otherwise", since = "4.18.0")
+    private Boolean isEdge;
+
+
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -153,6 +157,13 @@ public Boolean getLocalStorageEnabled() {
         return localStorageEnabled;
     }
 
+    public boolean isEdge() {
+        if (isEdge == null) {
+            return false;
+        }
+        return isEdge;
+    }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     @Override

api/src/main/java/org/apache/cloudstack/api/response/ZoneResponse.java

@@ -141,6 +141,10 @@ public class ZoneResponse extends BaseResponseWithAnnotations implements SetReso
     @Param(description = "The maximum value the MTU can have on the VR's public interfaces", since = "4.18.0")
     private Integer routerPublicInterfaceMaxMtu;
 
+    @SerializedName(ApiConstants.TYPE)
+    @Param(description = "the type of the zone - core or edge", since = "4.18.0")
+    String type;
+
     public ZoneResponse() {
         tags = new LinkedHashSet<ResourceTagResponse>();
     }
@@ -352,4 +356,12 @@ public void setRouterPrivateInterfaceMaxMtu(Integer routerPrivateInterfaceMaxMtu
     public void setRouterPublicInterfaceMaxMtu(Integer routerPublicInterfaceMaxMtu) {
         this.routerPublicInterfaceMaxMtu = routerPublicInterfaceMaxMtu;
     }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getType() {
+        return type;
+    }
 }

api/src/test/java/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmdTest.java

@@ -0,0 +1,35 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.command.admin.zone;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+
+public class CreateZoneCmdTest {
+
+    @Test
+    public void isEdge() {
+        CreateZoneCmd createZoneCmd = new CreateZoneCmd();
+        ReflectionTestUtils.setField(createZoneCmd, "isEdge", null);
+        Assert.assertFalse("Null or no isedge param value for API should return false", createZoneCmd.isEdge());
+        ReflectionTestUtils.setField(createZoneCmd, "isEdge", false);
+        Assert.assertFalse("false value for isedge param value for API should return false", createZoneCmd.isEdge());
+        ReflectionTestUtils.setField(createZoneCmd, "isEdge", true);
+        Assert.assertTrue("true value for isedge param value for API should return true", createZoneCmd.isEdge());
+    }
+}

engine/components-api/src/main/java/com/cloud/configuration/ConfigurationManager.java

@@ -127,7 +127,7 @@ public interface ConfigurationManager {
      *
      * @param userId
      * @param podName
-     * @param zoneId
+     * @param zone
      * @param gateway
      * @param cidr
      * @param startIp
@@ -137,7 +137,7 @@ public interface ConfigurationManager {
      *            (true if it is ok to not validate that gateway IP address overlap with Start/End IP of the POD)
      * @return Pod
      */
-    HostPodVO createPod(long userId, String podName, long zoneId, String gateway, String cidr, String startIp, String endIp, String allocationState,
+    HostPodVO createPod(long userId, String podName, DataCenter zone, String gateway, String cidr, String startIp, String endIp, String allocationState,
         boolean skipGatewayOverlapCheck);
 
     /**
@@ -164,7 +164,7 @@ HostPodVO createPod(long userId, String podName, long zoneId, String gateway, St
      */
     DataCenterVO createZone(long userId, String zoneName, String dns1, String dns2, String internalDns1, String internalDns2, String guestCidr, String domain,
         Long domainId, NetworkType zoneType, String allocationState, String networkDomain, boolean isSecurityGroupEnabled, boolean isLocalStorageEnabled, String ip6Dns1,
-        String ip6Dns2);
+        String ip6Dns2, boolean isEdge);
 
     /**
      * Deletes a VLAN from the database, along with all of its IP addresses. Will not delete VLANs that have allocated

engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenterVO.java

@@ -37,6 +37,7 @@
 import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State;
 import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event;
 
+import com.cloud.dc.DataCenter;
 import com.cloud.network.Network.Provider;
 import com.cloud.org.Grouping;
 import com.cloud.utils.NumbersUtil;
@@ -156,6 +157,10 @@ public class EngineDataCenterVO implements EngineDataCenter, Identity {
     @Temporal(value = TemporalType.TIMESTAMP)
     protected Date lastUpdated;
 
+    @Column(name = "type")
+    @Enumerated(value = EnumType.STRING)
+    private DataCenter.Type type;
+
     /**
      * Note that state is intentionally missing the setter.  Any updates to
      * the state machine needs to go through the DAO object because someone
@@ -513,4 +518,9 @@ public void setIp6Dns2(String ip6Dns2) {
     public PartitionType partitionType() {
         return PartitionType.Zone;
     }
+
+    @Override
+    public DataCenter.Type getType() {
+        return type;
+    }
 }

engine/schema/src/main/java/com/cloud/dc/DataCenterVO.java

@@ -138,6 +138,10 @@ public class DataCenterVO implements DataCenter {
     @Column(name = "sort_key")
     int sortKey;
 
+    @Column(name = "type")
+    @Enumerated(value = EnumType.STRING)
+    private DataCenter.Type type;
+
     @Override
     public String getDnsProvider() {
         return dnsProvider;
@@ -472,6 +476,15 @@ public PartitionType partitionType() {
         return PartitionType.Zone;
     }
 
+    @Override
+    public DataCenter.Type getType() {
+        return type;
+    }
+
+    public void setType(Type type) {
+        this.type = type;
+    }
+
     @Override
     public String toString() {
         return String.format("Zone {\"id\": \"%s\", \"name\": \"%s\", \"uuid\": \"%s\"}", id, name, uuid);

engine/schema/src/main/java/com/cloud/dc/dao/DataCenterDao.java

@@ -104,6 +104,8 @@ public Integer getVlan() {
 
     List<DataCenterVO> listEnabledZones();
 
+    List<Long> listEnabledNonEdgeZoneIds();
+
     DataCenterVO findByToken(String zoneToken);
 
     DataCenterVO findByTokenOrIdOrName(String tokenIdOrName);