From 3f8fdca4a21906d77ab61d75ab162edf6e1448c4 Mon Sep 17 00:00:00 2001 From: guochuyicmri Date: Wed, 14 Nov 2018 19:23:18 +0800 Subject: fix ns instance instantiation bug Change-Id: I6cecb862aaaad7f6f1f3c7208b682942dd8df8c3 Issue-ID: USECASEUI-160 Signed-off-by: guochuyicmri --- .../src/app/components/e2e-creation/e2e-creation.component.ts | 8 +------- .../src/app/services/services-list/services-list.component.ts | 8 ++++++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.ts b/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.ts index 213df2b8..d45978ae 100644 --- a/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.ts +++ b/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.ts @@ -188,15 +188,9 @@ export class E2eCreationComponent implements OnInit { }) this.nsTemplateParameters.vnfs.forEach((vnf)=>{ let vnfparams = { - vnfProfileId: vnf.vnf_id, + vnfProfileId: vnf.properties.id, locationConstraints: { vimid: vnf.value.id, - accessinfo: { - tenant: "" - }, - accessInfo: { - tenant: "" - } } } this.ns_service2.locationConstraints.push(vnfparams); diff --git a/usecaseui-portal/src/app/services/services-list/services-list.component.ts b/usecaseui-portal/src/app/services/services-list/services-list.component.ts index 003e897f..e742ee39 100644 --- a/usecaseui-portal/src/app/services/services-list/services-list.component.ts +++ b/usecaseui-portal/src/app/services/services-list/services-list.component.ts @@ -532,8 +532,8 @@ export class ServicesListComponent implements OnInit { let createParams = "?ns_instance_id=" + data.nsInstanceId + "&customerId="+this.customerSelected.id + "&serviceType="+this.serviceTypeSelected.name + - "&serviceDomain="+"SITE" + - "&parentServiceInstanceId="+this.parentServiceInstanceId; + "&serviceDomain="+ this.templateTypeSelected + + "&parentServiceInstanceId="; // step2 this.createNsService(createParams,obj.step2).then((jobid)=>{ @@ -572,6 +572,10 @@ export class ServicesListComponent implements OnInit { let mypromise = new Promise((res,rej)=>{ this.myhttp.nsCreateInstance2(id,obj) .subscribe((data)=>{ + if(data.status == "FAILED"){ + console.log("instantiate ns service data :" + JSON.stringify(data)); + return false; + } res(data.jobId); }) }) -- cgit 1.2.3-korg