etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cloudStack 3.0 - extract template, extract ISO - zoneId is no longer required.

This commit is contained in:
Jessica Wang 2011-12-20 18:50:07 -08:00
parent 7d51e9fe12
commit eb9973d344
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/com/cloud/api/commands/ExtractIsoCmd.java
View File

@ -52,7 +52,7 @@ public class ExtractIsoCmd extends BaseAsyncCmd {
private String url;
@IdentityMapper(entityTableName="data_center")
@Parameter(name=ApiConstants.ZONE_ID, type=CommandType.LONG, required=true, description="the ID of the zone where the ISO is originally located")
@Parameter(name=ApiConstants.ZONE_ID, type=CommandType.LONG, required=false, description="the ID of the zone where the ISO is originally located")
private Long zoneId;
@Parameter(name=ApiConstants.MODE, type=CommandType.STRING, required=true, description="the mode of extraction - HTTP_DOWNLOAD or FTP_UPLOAD")

2
api/src/com/cloud/api/commands/ExtractTemplateCmd.java
View File

@ -52,7 +52,7 @@ public class ExtractTemplateCmd extends BaseAsyncCmd {
private String url;
@IdentityMapper(entityTableName="data_center")
@Parameter(name=ApiConstants.ZONE_ID, type=CommandType.LONG, required=true, description="the ID of the zone where the ISO is originally located" )
@Parameter(name=ApiConstants.ZONE_ID, type=CommandType.LONG, required=false, description="the ID of the zone where the ISO is originally located" )
private Long zoneId;
@Parameter(name=ApiConstants.MODE, type=CommandType.STRING, required=true, description="the mode of extraction - HTTP_DOWNLOAD or FTP_UPLOAD")

28
ui/scripts/templates.js
View File

@ -376,8 +376,12 @@
}
},
action: function(args) {
var apiCmd = "extractTemplate&mode=HTTP_DOWNLOAD&id=" + args.context.templates[0].id;
if(args.context.templates[0].zoneid != null)
apiCmd += "&zoneid=" + args.context.templates[0].zoneid;
$.ajax({
url: createURL("extractTemplate&id=" + args.context.templates[0].id + "&zoneid=" + args.context.templates[0].zoneid + "&mode=HTTP_DOWNLOAD"),
url: createURL(apiCmd),
dataType: "json",
async: true,
success: function(json) {
@ -622,9 +626,13 @@
return htmlMsg2;
}
},
action: function(args) {
action: function(args) {
var apiCmd = "extractTemplate&mode=HTTP_DOWNLOAD&id=" + args.context.templates[0].id;
if(args.context.templates[0].zoneid != null)
apiCmd += "&zoneid=" + args.context.templates[0].zoneid;
$.ajax({
url: createURL("extractTemplate&id=" + args.context.templates[0].id + "&zoneid=" + args.context.templates[0].zoneid + "&mode=HTTP_DOWNLOAD"),
url: createURL(apiCmd),
dataType: "json",
async: true,
success: function(json) {
@ -1065,8 +1073,12 @@
}
},
action: function(args) {
var apiCmd = "extractIso&mode=HTTP_DOWNLOAD&id=" + args.context.isos[0].id;
if(args.context.isos[0].zoneid != null)
apiCmd += "&zoneid=" + args.context.isos[0].zoneid;
$.ajax({
url: createURL("extractIso&id=" + args.context.isos[0].id + "&zoneid=" + args.context.isos[0].zoneid + "&mode=HTTP_DOWNLOAD"),
url: createURL(apiCmd),
dataType: "json",
async: true,
success: function(json) {
@ -1311,9 +1323,13 @@
return htmlMsg2;
}
},
action: function(args) {
action: function(args) {
var apiCmd = "extractIso&mode=HTTP_DOWNLOAD&id=" + args.context.isos[0].id;
if(args.context.isos[0].zoneid != null)
apiCmd += "&zoneid=" + args.context.isos[0].zoneid;
$.ajax({
url: createURL("extractIso&id=" + args.context.isos[0].id + "&zoneid=" + args.context.isos[0].zoneid + "&mode=HTTP_DOWNLOAD"),
url: createURL(apiCmd),
dataType: "json",
async: true,
success: function(json) {