You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2012/12/23 02:32:06 UTC
[3/3] git commit: api: Annotate template admin api
api: Annotate template admin api
Signed-off-by: Rohit Yadav <bh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9a3deaf8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9a3deaf8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9a3deaf8
Branch: refs/heads/api_refactoring
Commit: 9a3deaf8077ebbe8668c526edc287be1b3c8f5a8
Parents: 93532ea
Author: Rohit Yadav <bh...@apache.org>
Authored: Sat Dec 22 17:11:32 2012 -0800
Committer: Rohit Yadav <bh...@apache.org>
Committed: Sat Dec 22 17:11:32 2012 -0800
----------------------------------------------------------------------
.../command/admin/template/PrepareTemplateCmd.java | 10 +++++-----
.../cloudstack/api/response/TemplateResponse.java | 3 +++
2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9a3deaf8/api/src/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java b/api/src/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java
index cc543c8..579c4b0 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java
@@ -18,11 +18,11 @@ package org.apache.cloudstack.api.command.admin.template;
import java.util.List;
+import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.log4j.Logger;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.IdentityMapper;
import org.apache.cloudstack.api.Implementation;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.ListResponse;
@@ -40,12 +40,12 @@ public class PrepareTemplateCmd extends BaseCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////
- @IdentityMapper(entityTableName="data_center")
- @Parameter(name=ApiConstants.ZONE_ID, required=true, type=CommandType.LONG, description="zone ID of the template to be prepared in primary storage(s).")
+ @Parameter(name=ApiConstants.ZONE_ID, type=CommandType.UUID, entityType = ZoneResponse.class,
+ required=true, description="zone ID of the template to be prepared in primary storage(s).")
private Long zoneId;
- @IdentityMapper(entityTableName="vm_template")
- @Parameter(name=ApiConstants.TEMPLATE_ID, required=true, type=CommandType.LONG, description="template ID of the template to be prepared in primary storage(s).")
+ @Parameter(name=ApiConstants.TEMPLATE_ID, type=CommandType.UUID, entityType = TemplateResponse.class,
+ required=true, description="template ID of the template to be prepared in primary storage(s).")
private Long templateId;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9a3deaf8/api/src/org/apache/cloudstack/api/response/TemplateResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/TemplateResponse.java b/api/src/org/apache/cloudstack/api/response/TemplateResponse.java
index d9daf3a..17ddcad 100644
--- a/api/src/org/apache/cloudstack/api/response/TemplateResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/TemplateResponse.java
@@ -20,12 +20,15 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
+import com.cloud.template.VirtualMachineTemplate;
import org.apache.cloudstack.api.ApiConstants;
import com.cloud.serializer.Param;
import com.cloud.storage.Storage.ImageFormat;
import com.google.gson.annotations.SerializedName;
import org.apache.cloudstack.api.BaseResponse;
+import org.apache.cloudstack.api.Entity;
+@Entity(value=VirtualMachineTemplate.class)
@SuppressWarnings("unused")
public class TemplateResponse extends BaseResponse implements ControlledEntityResponse {
@SerializedName(ApiConstants.ID) @Param(description="the template ID")