Merge branch 'merge/feature-vpc-ipv6' into feature/vpc-ipv6

This closes #3

Author: wilderrodrigues

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

@@ -115,6 +115,8 @@ public class ApiConstants {
     public static final String GSLB_STICKY_SESSION_METHOD = "gslbstickysessionmethodname";
     public static final String GSLB_LBRULE_WEIGHT_MAP = "gslblbruleweightsmap";
     public static final String GUEST_CIDR_ADDRESS = "guestcidraddress";
+    public static final String IP6_SUPER_CIDR_ADDRESS = "ip6supercidraddress";
+    public static final String AUTONOMOUS_NUMBER = "asnumber";
     public static final String GUEST_VLAN_RANGE = "guestvlanrange";
     public static final String HA_ENABLE = "haenable";
     public static final String HOST_ID = "hostid";

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

@@ -58,6 +58,12 @@ public class CreateZoneCmd extends BaseCmd {
     @Parameter(name = ApiConstants.GUEST_CIDR_ADDRESS, type = CommandType.STRING, description = "the guest CIDR address for the Zone")
     private String guestCidrAddress;
 
+    @Parameter(name = ApiConstants.IP6_SUPER_CIDR_ADDRESS, type = CommandType.STRING, description = "the IPv6 super CIDR address for the Zone. IPv6 CIDR of all the VPCs in this zone should be within this CIDR")
+    private String ip6SuperCidrAddress;
+
+    @Parameter(name = ApiConstants.AUTONOMOUS_NUMBER, type = CommandType.STRING, description = "private autonomous system number for the Zone")
+    private String asNumber;
+
     @Parameter(name = ApiConstants.INTERNAL_DNS1, type = CommandType.STRING, required = true, description = "the first internal DNS for the Zone")
     private String internalDns1;
 
@@ -112,6 +118,14 @@ public String getGuestCidrAddress() {
         return guestCidrAddress;
     }
 
+    public String getIp6SuperCidrAddress() {
+        return ip6SuperCidrAddress;
+    }
+
+    public String getAsNumber() {
+        return asNumber;
+    }
+
     public String getInternalDns1() {
         return internalDns1;
     }

api/src/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java

@@ -19,8 +19,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
-
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
@@ -30,6 +28,7 @@
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.ZoneResponse;
 import org.apache.cloudstack.context.CallContext;
+import org.apache.log4j.Logger;
 
 import com.cloud.dc.DataCenter;
 import com.cloud.user.Account;
@@ -60,6 +59,12 @@ public class UpdateZoneCmd extends BaseCmd {
     @Parameter(name = ApiConstants.GUEST_CIDR_ADDRESS, type = CommandType.STRING, description = "the guest CIDR address for the Zone")
     private String guestCidrAddress;
 
+    @Parameter(name = ApiConstants.IP6_SUPER_CIDR_ADDRESS, type = CommandType.STRING, description = "the IPv6 super CIDR address for the Zone. IPv6 CIDR of all the VPCs in this zone should be within this CIDR")
+    private String ip6SuperCidrAddress;
+
+    @Parameter(name = ApiConstants.AUTONOMOUS_NUMBER, type = CommandType.STRING, description = "private autonomous system number for the Zone")
+    private String asNumber;
+
     @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = ZoneResponse.class, required = true, description = "the ID of the Zone")
     private Long id;
 
@@ -111,6 +116,14 @@ public String getGuestCidrAddress() {
         return guestCidrAddress;
     }
 
+    public String getIp6SuperCidrAddress() {
+        return ip6SuperCidrAddress;
+    }
+
+    public String getAsNumber() {
+        return asNumber;
+    }
+
     public Long getId() {
         return id;
     }

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

@@ -29,7 +29,6 @@
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 
-@SuppressWarnings("unused")
 @EntityReference(value = DataCenter.class)
 public class ZoneResponse extends BaseResponse {
     @SerializedName(ApiConstants.ID)
@@ -72,6 +71,14 @@ public class ZoneResponse extends BaseResponse {
     @Param(description = "the guest CIDR address for the Zone")
     private String guestCidrAddress;
 
+    @SerializedName(ApiConstants.IP6_SUPER_CIDR_ADDRESS)
+    @Param(description = "the IPv6 super CIDR address for the Zone. IPv6 CIDR of all the VPCs in this zone should be within this CIDR")
+    private String ip6SuperCidrAddress;
+
+    @SerializedName(ApiConstants.AUTONOMOUS_NUMBER)
+    @Param(description = "private autonomous system number for the Zone")
+    private String asNumber;
+
     //TODO - generate description
     @SerializedName("status")
     private String status;
@@ -164,6 +171,14 @@ public void setGuestCidrAddress(String guestCidrAddress) {
         this.guestCidrAddress = guestCidrAddress;
     }
 
+    public void setIp6SuperCidrAddress(String ip6SuperCidrAddress) {
+        this.ip6SuperCidrAddress = ip6SuperCidrAddress;
+    }
+
+    public void setAsNumber(String asNumber) {
+        this.asNumber = asNumber;
+    }
+
     public void setStatus(String status) {
         this.status = status;
     }

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

@@ -149,19 +149,19 @@ HostPodVO createPod(long userId, String podName, long zoneId, String gateway, St
      * @param guestCidr
      * @param zoneType
      * @param allocationState
-     * @param networkDomain
-     *            TODO
+     * @param networkDomainTODO
      * @param isSecurityGroupEnabled
-     *            TODO
-     * @param ip6Dns1 TODO
-     * @param ip6Dns2 TODO
+     * @param ip6Dns1
+     * @param ip6Dns2
+     * @param ip6SuperCidr
+     * @param asNumber
      * @return
      * @throws
      * @throws
      */
-    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);
+    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 ip6SuperCidr, String asNumber);
 
     /**
      * Deletes a VLAN from the database, along with all of its IP addresses. Will not delete VLANs that have allocated

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

@@ -96,4 +96,8 @@ public interface DataCenterDao extends GenericDao<DataCenterVO, Long> {
     List<DataCenterVO> findByKeyword(String keyword);
 
     List<DataCenterVO> listAllZones();
+
+    DataCenterVO findByIp6SuperCidr(String ip6SuperCidr);
+
+    DataCenterVO findByAsn(String asNumber);
 }

engine/schema/src/com/cloud/dc/dao/DataCenterDaoImpl.java

@@ -61,6 +61,8 @@ public class DataCenterDaoImpl extends GenericDaoBase<DataCenterVO, Long> implem
     private static final Logger s_logger = Logger.getLogger(DataCenterDaoImpl.class);
 
     protected SearchBuilder<DataCenterVO> NameSearch;
+    protected SearchBuilder<DataCenterVO> Ip6SuperCidrSearch;
+    protected SearchBuilder<DataCenterVO> AsnSearch;
     protected SearchBuilder<DataCenterVO> ListZonesByDomainIdSearch;
     protected SearchBuilder<DataCenterVO> PublicZonesSearch;
     protected SearchBuilder<DataCenterVO> ChildZonesSearch;
@@ -91,6 +93,20 @@ public DataCenterVO findByName(String name) {
         return findOneBy(sc);
     }
 
+    @Override
+    public DataCenterVO findByIp6SuperCidr(String ip6SuperCidr) {
+        SearchCriteria<DataCenterVO> sc = Ip6SuperCidrSearch.create();
+        sc.setParameters("ip6SuperNetworkCidr", ip6SuperCidr);
+        return findOneBy(sc);
+    }
+
+    @Override
+    public DataCenterVO findByAsn(String asNumber) {
+        SearchCriteria<DataCenterVO> sc = AsnSearch.create();
+        sc.setParameters("asNumber", asNumber);
+        return findOneBy(sc);
+    }
+
     @Override
     public DataCenterVO findByToken(String zoneToken) {
         SearchCriteria<DataCenterVO> sc = TokenSearch.create();
@@ -323,6 +339,15 @@ public DataCenterDaoImpl() {
         NameSearch.and("name", NameSearch.entity().getName(), SearchCriteria.Op.EQ);
         NameSearch.done();
 
+        Ip6SuperCidrSearch = createSearchBuilder();
+        Ip6SuperCidrSearch.and("ip6SuperNetworkCidr", Ip6SuperCidrSearch.entity().getIp6SuperNetworkCidr(), SearchCriteria.Op.EQ);
+        Ip6SuperCidrSearch.done();
+
+
+        AsnSearch = createSearchBuilder();
+        AsnSearch.and("asNumber", AsnSearch.entity().getAsNumber(), SearchCriteria.Op.EQ);
+        AsnSearch.done();
+
         ListZonesByDomainIdSearch = createSearchBuilder();
         ListZonesByDomainIdSearch.and("domainId", ListZonesByDomainIdSearch.entity().getDomainId(), SearchCriteria.Op.EQ);
         ListZonesByDomainIdSearch.done();

plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ManagementServerMock.java

@@ -386,7 +386,7 @@ private void locateZone() {
             ConfigurationManager mgr = (ConfigurationManager)_configService;
             _zone =
                 mgr.createZone(User.UID_SYSTEM, "default", "8.8.8.8", null, "8.8.4.4", null, null /* cidr */, "ROOT", Domain.ROOT_DOMAIN, NetworkType.Advanced, null,
-                    null /* networkDomain */, false, false, null, null);
+                    null /* networkDomain */, false, false, null, null, null, null);
         }
     }