From 14e41af3117a7c8c758cf887da5918356720c730 Mon Sep 17 00:00:00 2001
From: guochuyicmri <guochuyi@chinamobile.com>
Date: Mon, 13 May 2019 18:12:00 +0800
Subject: Fix instance instantiation for CCVPN

Change-Id: Id97cb60f537e550854c18d845d54e7e44ad895d2
Issue-ID: USECASEUI-220
Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>
---
 usecaseui-portal/src/app/myhttp.service.ts | 19 ++++++++++++-------
 1 file 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() {
-- 
cgit 1.2.3-korg