summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Shen <shentao@chinamobile.com>2019-05-14 06:45:09 +0000
committerGerrit Code Review <gerrit@onap.org>2019-05-14 06:45:09 +0000
commit0ce9d4de32e9eb2f11b922ef85814349a17203ee (patch)
tree26589ca305fc270368429a540848fd06e16c211b
parent160c72c0944c2551a72eab2931452d029373f145 (diff)
parent14e41af3117a7c8c758cf887da5918356720c730 (diff)
Merge "Fix instance instantiation for CCVPN"
-rw-r--r--usecaseui-portal/src/app/myhttp.service.ts19
1 files changed, 12 insertions, 7 deletions
diff --git a/usecaseui-portal/src/app/myhttp.service.ts b/usecaseui-portal/src/app/myhttp.service.ts
index 58fc7034..6ed8f6ef 100644
--- a/usecaseui-portal/src/app/myhttp.service.ts
+++ b/usecaseui-portal/src/app/myhttp.service.ts
@@ -31,6 +31,7 @@ export class MyhttpService {
servicesTableData: this.baseUrl + '/uui-lcm/service-instances',
serviceTemplates: this.baseUrl + "/uui-lcm/service-templates",
templateParameters: this.baseUrl + "/uui-lcm/fetchTemplateInfo",
+ e2etemplateParameters: this.baseUrl + "/uui-lcm/service-templates/" + "*_*" + "?toscaModelPath=",
nstemplateParameters: this.baseUrl + "/uui-lcm/fetchNsTemplateData",
vimInfo: this.baseUrl + "/uui-lcm/locations/",
sdnControllers: this.baseUrl + "/uui-lcm/sdnc-controllers/",
@@ -98,15 +99,19 @@ export class MyhttpService {
let body = {
csarId: template.id,
inputs: ""
- }
+ };
return this.http.post<any>(this.url.nstemplateParameters, body);
+ }else if(type == "e2e"){
+ let url = this.url.e2etemplateParameters.replace("*_*", template.uuid) + template.toscaModelURL;
+ return this.http.get<any>(url);
+ }else {
+ let body = {
+ csarId: template.uuid,
+ packageType: "Service",
+ inputs: ""
+ };
+ return this.http.post<any>(this.url.templateParameters, body);
}
- let body = {
- csarId: template.uuid,
- packageType: "",
- inputs: ""
- };
- return this.http.post<any>(this.url.templateParameters, body);
}
getVimInfo() {