You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ko...@apache.org on 2015/01/31 13:08:17 UTC
[6/8] git commit: updated refs/heads/volume-upload to 121ff19
volume-upload: getUploadParamsForVolume/Template response differs from spec
Fixed the response parameters
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2fa4a475
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2fa4a475
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2fa4a475
Branch: refs/heads/volume-upload
Commit: 2fa4a475aa3498e7051aedf9c83bfa5816ff0aa9
Parents: ae21f44
Author: Koushik Das <ko...@apache.org>
Authored: Thu Jan 29 11:33:42 2015 +0530
Committer: Koushik Das <ko...@apache.org>
Committed: Sat Jan 31 17:23:13 2015 +0530
----------------------------------------------------------------------
api/src/org/apache/cloudstack/api/ApiConstants.java | 1 +
.../api/response/GetUploadParamsResponse.java | 14 +++++++-------
2 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2fa4a475/api/src/org/apache/cloudstack/api/ApiConstants.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/ApiConstants.java b/api/src/org/apache/cloudstack/api/ApiConstants.java
index 066df9d..54604f3 100755
--- a/api/src/org/apache/cloudstack/api/ApiConstants.java
+++ b/api/src/org/apache/cloudstack/api/ApiConstants.java
@@ -190,6 +190,7 @@ public class ApiConstants {
public static final String PORTAL = "portal";
public static final String PORTABLE_IP_ADDRESS = "portableipaddress";
public static final String PORT_FORWARDING_SERVICE_ID = "portforwardingserviceid";
+ public static final String POST_URL = "postURL";
public static final String PRIVATE_INTERFACE = "privateinterface";
public static final String PRIVATE_IP = "privateip";
public static final String PRIVATE_PORT = "privateport";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2fa4a475/api/src/org/apache/cloudstack/api/response/GetUploadParamsResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/GetUploadParamsResponse.java b/api/src/org/apache/cloudstack/api/response/GetUploadParamsResponse.java
index 7426d9f7..b9be06e 100644
--- a/api/src/org/apache/cloudstack/api/response/GetUploadParamsResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/GetUploadParamsResponse.java
@@ -33,7 +33,7 @@ public class GetUploadParamsResponse extends BaseResponse {
@Param(description = "the template/volume ID")
private UUID id;
- @SerializedName(ApiConstants.URL)
+ @SerializedName(ApiConstants.POST_URL)
@Param(description = "POST url to upload the file to")
private URL postURL;
@@ -41,19 +41,19 @@ public class GetUploadParamsResponse extends BaseResponse {
@Param(description = "encrypted data to be sent in the POST request.")
private String metadata;
- @SerializedName(ApiConstants.TIMEOUT)
+ @SerializedName(ApiConstants.EXPIRES)
@Param(description = "the timestamp after which the signature expires")
- private String timeout;
+ private String expires;
@SerializedName(ApiConstants.SIGNATURE)
@Param(description = "signature to be sent in the POST request.")
private String signature;
- public GetUploadParamsResponse(UUID id, URL postURL, String metadata, String timeout, String signature) {
+ public GetUploadParamsResponse(UUID id, URL postURL, String metadata, String expires, String signature) {
this.id = id;
this.postURL = postURL;
this.metadata = metadata;
- this.timeout = timeout;
+ this.expires = expires;
this.signature = signature;
setObjectName("getuploadparams");
}
@@ -74,8 +74,8 @@ public class GetUploadParamsResponse extends BaseResponse {
this.metadata = metadata;
}
- public void setTimeout(String timeout) {
- this.timeout = timeout;
+ public void setTimeout(String expires) {
+ this.expires = expires;
}
public void setSignature(String signature) {