Merge pull request #1567 from exoscale/CLOUDSTACK-9238

CLOUDSTACK-9238: Fix URL length to 2048 for all url fields in VOI will update the PR to add max field length in the API commands too

* pr/1567:
  API: update url field max length
  not needed on host table
  Fix URL length to 2048 for all url fields in VO

Signed-off-by: Will Stevens <williamstevens@gmail.com>

api/src/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java

@@ -49,7 +49,7 @@ public class AddImageStoreCmd extends BaseCmd {
     @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "the name for the image store")
     private String name;
 
-    @Parameter(name = ApiConstants.URL, type = CommandType.STRING, description = "the URL for the image store")
+    @Parameter(name = ApiConstants.URL, type = CommandType.STRING, length = 2048, description = "the URL for the image store")
     private String url;
 
     @Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, description = "the Zone ID for the image store")

api/src/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmd.java

@@ -45,7 +45,7 @@ public class CreateSecondaryStagingStoreCmd extends BaseCmd {
     //////////////// API parameters /////////////////////
     /////////////////////////////////////////////////////
 
-    @Parameter(name = ApiConstants.URL, type = CommandType.STRING, required = true, description = "the URL for the staging store")
+    @Parameter(name = ApiConstants.URL, type = CommandType.STRING, required = true, length = 2048, description = "the URL for the staging store")
     private String url;
 
     @Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, description = "the Zone ID for the staging store")

api/src/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java

@@ -49,7 +49,7 @@ public class ExtractIsoCmd extends BaseAsyncCmd {
     @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = TemplateResponse.class, required = true, description = "the ID of the ISO file")
     private Long id;
 
-    @Parameter(name = ApiConstants.URL, type = CommandType.STRING, required = false, description = "the URL to which the ISO would be extracted")
+    @Parameter(name = ApiConstants.URL, type = CommandType.STRING, required = false, length = 2048, description = "the URL to which the ISO would be extracted")
     private String url;
 
     @Parameter(name = ApiConstants.ZONE_ID,

api/src/org/apache/cloudstack/api/command/user/iso/RegisterIsoCmd.java

@@ -78,7 +78,7 @@ public class RegisterIsoCmd extends BaseCmd {
                description = "the ID of the OS type that best represents the OS of this ISO. If the ISO is bootable this parameter needs to be passed")
     private Long osTypeId;
 
-    @Parameter(name = ApiConstants.URL, type = CommandType.STRING, required = true, description = "the URL to where the ISO is currently being hosted")
+    @Parameter(name = ApiConstants.URL, type = CommandType.STRING, required = true, length = 2048, description = "the URL to where the ISO is currently being hosted")
     private String url;
 
     @Parameter(name=ApiConstants.ZONE_ID, type=CommandType.UUID, entityType = ZoneResponse.class,

api/src/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java

@@ -113,6 +113,7 @@ public class CreateTemplateCmd extends BaseAsyncCreateCmd {
 
     @Parameter(name = ApiConstants.URL,
                type = CommandType.STRING,
+               length = 2048,
                description = "Optional, only for baremetal hypervisor. The directory name where template stored on CIFS server")
     private String url;
 

api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java

@@ -49,7 +49,7 @@ public class ExtractTemplateCmd extends BaseAsyncCmd {
     @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = TemplateResponse.class, required = true, description = "the ID of the template")
     private Long id;
 
-    @Parameter(name = ApiConstants.URL, type = CommandType.STRING, required = false, description = "the url to which the ISO would be extracted")
+    @Parameter(name = ApiConstants.URL, type = CommandType.STRING, required = false, length = 2048, description = "the url to which the ISO would be extracted")
     private String url;
 
     @Parameter(name = ApiConstants.ZONE_ID,

api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java

@@ -104,6 +104,7 @@ public class RegisterTemplateCmd extends BaseCmd {
     @Parameter(name = ApiConstants.URL,
                type = CommandType.STRING,
                required = true,
+               length = 2048,
                description = "the URL of where the template is hosted. Possible URL include http:// and https://")
     private String url;
 

api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java

@@ -54,7 +54,7 @@ public class ExtractVolumeCmd extends BaseAsyncCmd {
             required=true, description="the ID of the volume")
     private Long id;
 
-    @Parameter(name = ApiConstants.URL, type = CommandType.STRING, required = false, description = "the url to which the volume would be extracted")
+    @Parameter(name = ApiConstants.URL, type = CommandType.STRING, required = false, length = 2048, description = "the url to which the volume would be extracted")
     private String url;
 
     @Parameter(name = ApiConstants.ZONE_ID,

api/src/org/apache/cloudstack/api/command/user/volume/UploadVolumeCmd.java

@@ -62,6 +62,7 @@ public class UploadVolumeCmd extends BaseAsyncCmd {
     @Parameter(name = ApiConstants.URL,
                type = CommandType.STRING,
                required = true,
+               length = 2048,
                description = "the URL of where the volume is hosted. Possible URL include http:// and https://")
     private String url;
 

engine/schema/src/com/cloud/storage/UploadVO.java

@@ -77,7 +77,7 @@ public class UploadVO implements Upload {
     @Column(name = "job_id")
     private String jobId;
 
-    @Column(name = "url")
+    @Column(name = "url", length = 2048)
     private String uploadUrl;
 
     @Column(name = "install_path")

engine/schema/src/com/cloud/storage/VMTemplateHostVO.java

@@ -84,7 +84,7 @@ public class VMTemplateHostVO implements VMTemplateStorageResourceAssoc, DataObj
     @Column(name = "install_path")
     private String installPath;
 
-    @Column(name = "url")
+    @Column(name = "url", length = 2048)
     private String downloadUrl;
 
     @Column(name = "is_copy")

engine/schema/src/com/cloud/storage/VMTemplateVO.java

@@ -63,7 +63,7 @@ public class VMTemplateVO implements VirtualMachineTemplate {
     @Column(name = "type")
     private Storage.TemplateType templateType;
 
-    @Column(name = "url")
+    @Column(name = "url", length = 2048)
     private String url = null;
 
     @Column(name = "hvm")

engine/schema/src/com/cloud/storage/VolumeHostVO.java

@@ -93,7 +93,7 @@ public class VolumeHostVO implements InternalIdentity, DataObjectInStore {
     @Column(name = "install_path")
     private String installPath;
 
-    @Column(name = "url")
+    @Column(name = "url", length = 2048)
     private String downloadUrl;
 
     @Column(name = "format")

engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreVO.java

@@ -51,7 +51,7 @@ public class ImageStoreVO implements ImageStore {
     @Column(name = "protocol", nullable = false)
     private String protocol;
 
-    @Column(name = "url", nullable = false)
+    @Column(name = "url", nullable = false, length = 2048)
     private String url;
 
     @Column(name = "image_provider_name", nullable = false)

engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreVO.java

@@ -95,10 +95,10 @@ public class TemplateDataStoreVO implements StateObject<ObjectInDataStoreStateMa
     @Column(name = "install_path")
     private String installPath;
 
-    @Column(name = "url")
+    @Column(name = "url", length = 2048)
     private String downloadUrl;
 
-    @Column(name = "download_url")
+    @Column(name = "download_url", length = 2048)
     private String extractUrl;
 
     @Column(name = "download_url_created")

engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java

@@ -96,10 +96,10 @@ public class VolumeDataStoreVO implements StateObject<ObjectInDataStoreStateMach
     @Column(name = "install_path")
     private String installPath;
 
-    @Column(name = "url")
+    @Column(name = "url", length = 2048)
     private String downloadUrl;
 
-    @Column(name = "download_url")
+    @Column(name = "download_url", length = 2048)
     private String extractUrl;
 
     @Column(name = "download_url_created")

engine/storage/src/org/apache/cloudstack/storage/db/ObjectInDataStoreVO.java

@@ -78,7 +78,7 @@ public class ObjectInDataStoreVO implements StateObject<ObjectInDataStoreStateMa
     @Column(name = "local_path")
     String localDownloadPath;
 
-    @Column(name = "url")
+    @Column(name = "url", length = 2048)
     private String downloadUrl;
 
     @Column(name = "format")

server/src/com/cloud/api/query/vo/ImageStoreJoinVO.java

@@ -50,7 +50,7 @@ public class ImageStoreJoinVO extends BaseViewVO implements InternalIdentity, Id
     @Column(name = "name")
     private String name;
 
-    @Column(name = "url")
+    @Column(name = "url", length = 2048)
     private String url;
 
     @Column(name = "protocol")

setup/db/db/schema-471to480.sql

@@ -27,3 +27,4 @@ ALTER TABLE `cloud`.`image_store` MODIFY COLUMN `url` varchar(2048);
 ALTER TABLE `cloud`.`template_store_ref` MODIFY COLUMN `url` varchar(2048);
 ALTER TABLE `cloud`.`volume_store_ref` MODIFY COLUMN `url` varchar(2048);
 ALTER TABLE `cloud`.`volume_store_ref` MODIFY COLUMN `download_url` varchar(2048);
+ALTER TABLE `cloud`.`upload` MODIFY COLUMN `url` varchar(2048);