Skip to content

Commit 6de8e01

Browse files
yadvryadvr
committed
Merge remote-tracking branch 'origin/4.14'
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2 parents f66ae34 + dbb6685 commit 6de8e01

5 files changed

Lines changed: 119 additions & 4 deletions

File tree

‎api/src/main/java/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmd.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.apache.cloudstack.api.APICommand;
2222
import org.apache.cloudstack.api.ApiErrorCode;
2323
import org.apache.cloudstack.api.BaseUpdateTemplateOrIsoCmd;
24+
import org.apache.cloudstack.api.Parameter;
2425
import org.apache.cloudstack.api.ResponseObject.ResponseView;
2526
import org.apache.cloudstack.api.ServerApiException;
2627
import org.apache.cloudstack.api.command.user.UserCmd;
@@ -35,6 +36,13 @@ public class UpdateTemplateCmd extends BaseUpdateTemplateOrIsoCmd implements Use
3536
public static final Logger s_logger = Logger.getLogger(UpdateTemplateCmd.class.getName());
3637
private static final String s_name = "updatetemplateresponse";
3738

39+
/////////////////////////////////////////////////////
40+
//////////////// API parameters /////////////////////
41+
/////////////////////////////////////////////////////
42+
43+
@Parameter(name = "templatetype", type = CommandType.STRING, description = "the type of the template")
44+
private String templateType;
45+
3846
/////////////////////////////////////////////////////
3947
/////////////////// Accessors ///////////////////////
4048
/////////////////////////////////////////////////////
@@ -44,6 +52,10 @@ public Boolean getBootable() {
4452
return null;
4553
}
4654

55+
public String getTemplateType() {
56+
return templateType;
57+
}
58+
4759
/////////////////////////////////////////////////////
4860
/////////////// API Implementation///////////////////
4961
/////////////////////////////////////////////////////

‎api/src/main/java/org/apache/cloudstack/api/response/TemplateResponse.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,10 @@ public class TemplateResponse extends BaseResponseWithTagInformation implements
219219
@Param(description = "true if template requires HVM enabled, false otherwise")
220220
private Boolean requiresHvm;
221221

222+
@SerializedName(ApiConstants.URL)
223+
@Param(description = "the URL which the template/iso is registered from")
224+
private String url;
225+
222226
public TemplateResponse() {
223227
tags = new LinkedHashSet<>();
224228
}
@@ -450,4 +454,8 @@ public void addDeployAsIsDetail(String key, String value) {
450454
}
451455
this.deployAsIsDetails.put(key,value);
452456
}
457+
458+
public void setUrl(String url) {
459+
this.url = url;
460+
}
453461
}

‎server/src/main/java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ public TemplateResponse newTemplateResponse(EnumSet<ApiConstants.DomainDetails>
211211
if (templateStatus != null) {
212212
templateResponse.setStatus(templateStatus);
213213
}
214+
templateResponse.setUrl(template.getUrl());
214215
}
215216

216217
if (template.getDataCenterId() > 0) {
@@ -415,6 +416,7 @@ public TemplateResponse newIsoResponse(TemplateJoinVO iso) {
415416
} else {
416417
isoResponse.setStatus("Successfully Installed");
417418
}
419+
isoResponse.setUrl(iso.getUrl());
418420
}
419421

420422
if (iso.getDataCenterId() > 0) {

‎server/src/main/java/com/cloud/template/TemplateManagerImpl.java‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2088,6 +2088,25 @@ private VMTemplateVO updateTemplateOrIso(BaseUpdateTemplateOrIsoCmd cmd) {
20882088
}
20892089
}
20902090

2091+
// update template type
2092+
TemplateType templateType = null;
2093+
if (cmd instanceof UpdateTemplateCmd) {
2094+
String newType = ((UpdateTemplateCmd)cmd).getTemplateType();
2095+
if (newType != null) {
2096+
if (!_accountService.isRootAdmin(account.getId())) {
2097+
throw new PermissionDeniedException("Parameter templatetype can only be specified by a Root Admin, permission denied");
2098+
}
2099+
try {
2100+
templateType = TemplateType.valueOf(newType.toUpperCase());
2101+
} catch (IllegalArgumentException ex) {
2102+
throw new InvalidParameterValueException("Please specify a valid templatetype: ROUTING / SYSTEM / USER / BUILTIN / PERHOST");
2103+
}
2104+
}
2105+
if (templateType != null && cmd.isRoutingType() != null && (TemplateType.ROUTING.equals(templateType) != cmd.isRoutingType())) {
2106+
throw new InvalidParameterValueException("Please specify a valid templatetype (consistent with isrouting parameter).");
2107+
}
2108+
}
2109+
20912110
// update is needed if any of the fields below got filled by the user
20922111
boolean updateNeeded =
20932112
!(name == null &&
@@ -2101,6 +2120,7 @@ private VMTemplateVO updateTemplateOrIso(BaseUpdateTemplateOrIsoCmd cmd) {
21012120
sortKey == null &&
21022121
isDynamicallyScalable == null &&
21032122
isRoutingTemplate == null &&
2123+
templateType == null &&
21042124
(! cleanupDetails && details == null) //update details in every case except this one
21052125
);
21062126
if (!updateNeeded) {
@@ -2178,9 +2198,13 @@ private VMTemplateVO updateTemplateOrIso(BaseUpdateTemplateOrIsoCmd cmd) {
21782198
if (isRoutingTemplate != null) {
21792199
if (isRoutingTemplate) {
21802200
template.setTemplateType(TemplateType.ROUTING);
2201+
} else if (templateType != null) {
2202+
template.setTemplateType(templateType);
21812203
} else {
21822204
template.setTemplateType(TemplateType.USER);
21832205
}
2206+
} else if (templateType != null) {
2207+
template.setTemplateType(templateType);
21842208
}
21852209

21862210
if (cleanupDetails) {

‎ui/scripts/templates.js‎

Lines changed: 73 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1336,9 +1336,15 @@
13361336
name: args.data.name,
13371337
displaytext: args.data.displaytext,
13381338
ostypeid: args.data.ostypeid,
1339+
templatetype: args.data.templatetype,
13391340
passwordenabled: (args.data.passwordenabled == "on"),
13401341
isdynamicallyscalable: (args.data.isdynamicallyscalable == "on")
13411342
};
1343+
if (args.data.isrouting != null) {
1344+
$.extend(data, {
1345+
isrouting: (args.data.isrouting === 'on')
1346+
});
1347+
}
13421348
$.ajax({
13431349
url: createURL('updateTemplate'),
13441350
data: data,
@@ -1835,7 +1841,7 @@
18351841
if (isAdmin()) {
18361842
hiddenFields = [];
18371843
} else {
1838-
hiddenFields = ["hypervisor", 'xenserverToolsVersion61plus'];
1844+
hiddenFields = ["hypervisor", 'xenserverToolsVersion61plus', 'isrouting'];
18391845
}
18401846

18411847
if ('templates' in args.context && args.context.templates[0].hypervisor != 'XenServer') {
@@ -1867,6 +1873,9 @@
18671873
}
18681874
}
18691875

1876+
if (!('templates' in args.context && args.context.templates[0].domainid == g_domainid && args.context.templates[0].account == g_account) && !isAdmin()) {
1877+
hiddenFields.push('url');
1878+
}
18701879
return hiddenFields;
18711880
},
18721881

@@ -1980,6 +1989,19 @@
19801989
}
19811990
},
19821991

1992+
isrouting: {
1993+
label: 'label.routing',
1994+
isBoolean: true,
1995+
isEditable: function() {
1996+
if (isAdmin()) {
1997+
return true;
1998+
} else {
1999+
return false;
2000+
}
2001+
},
2002+
converter: cloudStack.converters.toBooleanText
2003+
},
2004+
19832005
crossZones: {
19842006
label: 'label.cross.zones',
19852007
converter: cloudStack.converters.toBooleanText
@@ -2002,9 +2024,45 @@
20022024
label: 'label.created',
20032025
converter: cloudStack.converters.toLocalDate
20042026
},
2027+
url: {
2028+
label: 'label.url'
2029+
},
20052030

20062031
templatetype: {
2007-
label: 'label.type'
2032+
label: 'label.type',
2033+
isEditable: function() {
2034+
if (isAdmin()) {
2035+
return true;
2036+
} else {
2037+
return false;
2038+
}
2039+
},
2040+
select: function(args) {
2041+
var items = [];
2042+
items.push({
2043+
id: 'ROUTING',
2044+
description: 'ROUTING'
2045+
});
2046+
items.push({
2047+
id: 'SYSTEM',
2048+
description: 'SYSTEM'
2049+
});
2050+
items.push({
2051+
id: 'BUILTIN',
2052+
description: 'BUILTIN'
2053+
});
2054+
items.push({
2055+
id: 'PERHOST',
2056+
description: 'PERHOST'
2057+
});
2058+
items.push({
2059+
id: 'USER',
2060+
description: 'USER'
2061+
});
2062+
args.response.success({
2063+
data: items
2064+
});
2065+
}
20082066
},
20092067

20102068
id: {
@@ -2034,6 +2092,11 @@
20342092
else
20352093
jsonObj.xenserverToolsVersion61plus = false;
20362094
}
2095+
if (jsonObj.templatetype == 'ROUTING') {
2096+
jsonObj.isrouting = true;
2097+
} else {
2098+
jsonObj.isrouting = false;
2099+
}
20372100

20382101
args.response.success({
20392102
actionFilter: templateActionfilter,
@@ -3175,6 +3238,7 @@
31753238
//zoneid: args.context.isos[0].zoneid, //can't update template/ISO in only one zone. It always get updated in all zones.
31763239
name: args.data.name,
31773240
displaytext: args.data.displaytext,
3241+
bootable: (args.data.bootable == "on"),
31783242
ostypeid: args.data.ostypeid
31793243
};
31803244
$.ajax({
@@ -3662,6 +3726,8 @@
36623726
},
36633727
bootable: {
36643728
label: 'label.bootable',
3729+
isBoolean: true,
3730+
isEditable: true,
36653731
converter: cloudStack.converters.toBooleanText
36663732
},
36673733
ispublic: {
@@ -3722,6 +3788,9 @@
37223788
created: {
37233789
label: 'label.created',
37243790
converter: cloudStack.converters.toLocalDate
3791+
},
3792+
url: {
3793+
label: 'label.url'
37253794
}
37263795
}],
37273796

@@ -4057,7 +4126,7 @@
40574126

40584127
// "Edit Template", "Copy Template", "Create VM"
40594128
if ((isAdmin() == false && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account) && !(jsonObj.domainid == g_domainid && cloudStack.context.projects && jsonObj.projectid == cloudStack.context.projects[0].id)) //if neither root-admin, nor the same account, nor the same project
4060-
|| jsonObj.templatetype == "SYSTEM" || jsonObj.isready == false) {
4129+
|| jsonObj.isready == false) {
40614130
//do nothing
40624131
} else {
40634132
allowedActions.push("edit");
@@ -4067,7 +4136,7 @@
40674136

40684137
// "Download Template" , "Update Template Permissions"
40694138
if (((isAdmin() == false && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account) && !(jsonObj.domainid == g_domainid && cloudStack.context.projects && jsonObj.projectid == cloudStack.context.projects[0].id))) //if neither root-admin, nor the same account, nor the same project
4070-
|| (jsonObj.isready == false) || jsonObj.templatetype == "SYSTEM") {
4139+
|| (jsonObj.isready == false)) {
40714140
//do nothing
40724141
} else {
40734142
if (jsonObj.isextractable){

0 commit comments

Comments
 (0)