You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by se...@apache.org on 2013/07/12 09:50:57 UTC
[02/50] git commit: updated refs/heads/sdnextensions to bcfb4e6
CLOUDSTACK-2988: API - Template Response - add isdynamicallyscalable property.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ec42d723
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ec42d723
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ec42d723
Branch: refs/heads/sdnextensions
Commit: ec42d7236cd35bde66c1cd0e2362e99093929f7c
Parents: da8b1ef
Author: Jessica Wang <je...@apache.org>
Authored: Wed Jul 10 13:50:23 2013 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Wed Jul 10 13:51:54 2013 -0700
----------------------------------------------------------------------
.../com/cloud/api/query/dao/TemplateJoinDaoImpl.java | 1 +
server/src/com/cloud/api/query/vo/TemplateJoinVO.java | 13 +++++++++++++
setup/db/db/schema-410to420.sql | 1 +
3 files changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec42d723/server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java
index f5b7218..d78580c 100644
--- a/server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java
@@ -144,6 +144,7 @@ public class TemplateJoinDaoImpl extends GenericDaoBase<TemplateJoinVO, Long> im
templateResponse.setFeatured(template.isFeatured());
templateResponse.setExtractable(template.isExtractable() && !(template.getTemplateType() == TemplateType.SYSTEM));
templateResponse.setPasswordEnabled(template.isEnablePassword());
+ templateResponse.setDynamicallyScalable(template.isDynamicallyScalable());
templateResponse.setSshKeyEnabled(template.isEnableSshKey());
templateResponse.setCrossZones(template.isCrossZones());
templateResponse.setFormat(template.getFormat());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec42d723/server/src/com/cloud/api/query/vo/TemplateJoinVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/vo/TemplateJoinVO.java b/server/src/com/cloud/api/query/vo/TemplateJoinVO.java
index 1f2afe9..bb1cfed 100644
--- a/server/src/com/cloud/api/query/vo/TemplateJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/TemplateJoinVO.java
@@ -95,6 +95,9 @@ public class TemplateJoinVO extends BaseViewVO implements ControlledViewEntity {
@Column(name="enable_password")
private boolean enablePassword;
+ @Column(name="dynamically_scalable")
+ private boolean dynamicallyScalable;
+
@Column(name="guest_os_id")
private long guestOSId;
@@ -748,7 +751,17 @@ public class TemplateJoinVO extends BaseViewVO implements ControlledViewEntity {
this.enablePassword = enablePassword;
}
+
+
+ public boolean isDynamicallyScalable() {
+ return dynamicallyScalable;
+ }
+ public void setDynamicallyScalable(boolean dynamicallyScalable) {
+ this.dynamicallyScalable = dynamicallyScalable;
+ }
+
+
public long getGuestOSId() {
return guestOSId;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec42d723/setup/db/db/schema-410to420.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
index c7787f3..2c49cb9 100644
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@ -1882,6 +1882,7 @@ CREATE VIEW `cloud`.`template_view` AS
vm_template.checksum,
vm_template.display_text,
vm_template.enable_password,
+ vm_template.dynamically_scalable,
vm_template.guest_os_id,
guest_os.uuid guest_os_uuid,
guest_os.display_name guest_os_name,