summaryrefslogtreecommitdiffstats
path: root/usecaseui-portal/src
diff options
context:
space:
mode:
authorguochuyicmri <guochuyi@chinamobile.com>2019-05-13 18:12:00 +0800
committerguochuyicmri <guochuyi@chinamobile.com>2019-05-13 18:12:05 +0800
commit14e41af3117a7c8c758cf887da5918356720c730 (patch)
tree7b60c161d7ec9afb0646c1a6e299559729228eba /usecaseui-portal/src
parent572a0457a0fb11ce239e5e9d3666b1387fa93442 (diff)
Fix instance instantiation for CCVPN
Change-Id: Id97cb60f537e550854c18d845d54e7e44ad895d2 Issue-ID: USECASEUI-220 Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>
Diffstat (limited to 'usecaseui-portal/src')
-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() {