Fix URL length to 2048 for all url fields in VO
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a59ee03f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a59ee03f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a59ee03f Branch: refs/heads/master Commit: a59ee03fd79806dcb3a8842c318e2cd06895183f Parents: 88cd182 Author: Marc-Aurèle Brothier <[email protected]> Authored: Fri May 27 08:16:05 2016 +0200 Committer: Marc-Aurèle Brothier <[email protected]> Committed: Fri May 27 08:16:05 2016 +0200 ---------------------------------------------------------------------- .../cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java | 2 +- engine/schema/src/com/cloud/host/HostVO.java | 2 +- engine/schema/src/com/cloud/storage/UploadVO.java | 2 +- engine/schema/src/com/cloud/storage/VMTemplateHostVO.java | 2 +- engine/schema/src/com/cloud/storage/VMTemplateVO.java | 2 +- engine/schema/src/com/cloud/storage/VolumeHostVO.java | 2 +- .../org/apache/cloudstack/storage/datastore/db/ImageStoreVO.java | 2 +- .../cloudstack/storage/datastore/db/TemplateDataStoreVO.java | 4 ++-- .../cloudstack/storage/datastore/db/VolumeDataStoreVO.java | 4 ++-- .../org/apache/cloudstack/storage/db/ObjectInDataStoreVO.java | 2 +- server/src/com/cloud/api/query/vo/ImageStoreJoinVO.java | 2 +- setup/db/db/schema-471to480.sql | 2 ++ 12 files changed, 15 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a59ee03f/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java ---------------------------------------------------------------------- diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java index efa34df..eece93a 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java @@ -329,7 +329,7 @@ public class EngineHostVO implements EngineHost, Identity { @Column(name = "cpus") private Integer cpus; - @Column(name = "url") + @Column(name = "url", length = 2048) private String storageUrl; @Column(name = "speed") http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a59ee03f/engine/schema/src/com/cloud/host/HostVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/host/HostVO.java b/engine/schema/src/com/cloud/host/HostVO.java index c5938d6..4d1896c 100644 --- a/engine/schema/src/com/cloud/host/HostVO.java +++ b/engine/schema/src/com/cloud/host/HostVO.java @@ -337,7 +337,7 @@ public class HostVO implements Host { @Column(name = "cpus") private Integer cpus; - @Column(name = "url") + @Column(name = "url", length = 2048) private String storageUrl; @Column(name = "speed") http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a59ee03f/engine/schema/src/com/cloud/storage/UploadVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/storage/UploadVO.java b/engine/schema/src/com/cloud/storage/UploadVO.java index c49b28b..dda5c38 100644 --- a/engine/schema/src/com/cloud/storage/UploadVO.java +++ b/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") http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a59ee03f/engine/schema/src/com/cloud/storage/VMTemplateHostVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/storage/VMTemplateHostVO.java b/engine/schema/src/com/cloud/storage/VMTemplateHostVO.java index 4ba5088..fc4d9c1 100644 --- a/engine/schema/src/com/cloud/storage/VMTemplateHostVO.java +++ b/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") http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a59ee03f/engine/schema/src/com/cloud/storage/VMTemplateVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/storage/VMTemplateVO.java b/engine/schema/src/com/cloud/storage/VMTemplateVO.java index dd2b35a..d28c23b 100644 --- a/engine/schema/src/com/cloud/storage/VMTemplateVO.java +++ b/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") http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a59ee03f/engine/schema/src/com/cloud/storage/VolumeHostVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/storage/VolumeHostVO.java b/engine/schema/src/com/cloud/storage/VolumeHostVO.java index 56a9a92..d086f2d 100644 --- a/engine/schema/src/com/cloud/storage/VolumeHostVO.java +++ b/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") http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a59ee03f/engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreVO.java b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreVO.java index 2d1a3ed..2c70677 100644 --- a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/ImageStoreVO.java +++ b/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) http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a59ee03f/engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreVO.java b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreVO.java index bb05300..024f056 100644 --- a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreVO.java +++ b/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") http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a59ee03f/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java index 91d4ef7..68baab2 100644 --- a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java +++ b/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") http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a59ee03f/engine/storage/src/org/apache/cloudstack/storage/db/ObjectInDataStoreVO.java ---------------------------------------------------------------------- diff --git a/engine/storage/src/org/apache/cloudstack/storage/db/ObjectInDataStoreVO.java b/engine/storage/src/org/apache/cloudstack/storage/db/ObjectInDataStoreVO.java index df9c836..f1d9323 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/db/ObjectInDataStoreVO.java +++ b/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") http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a59ee03f/server/src/com/cloud/api/query/vo/ImageStoreJoinVO.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/vo/ImageStoreJoinVO.java b/server/src/com/cloud/api/query/vo/ImageStoreJoinVO.java index 99f61c3..6d9f038 100644 --- a/server/src/com/cloud/api/query/vo/ImageStoreJoinVO.java +++ b/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") http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a59ee03f/setup/db/db/schema-471to480.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-471to480.sql b/setup/db/db/schema-471to480.sql index b79af7f..4eb924d 100644 --- a/setup/db/db/schema-471to480.sql +++ b/setup/db/db/schema-471to480.sql @@ -27,3 +27,5 @@ 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); +ALTER TABLE `cloud`.`host` MODIFY COLUMN `url` varchar(2048);
