From 4fa6adb91b4a31cd26d24d834477a1fa94d2a83d Mon Sep 17 00:00:00 2001 From: guochuyicmri Date: Fri, 24 May 2019 17:42:52 +0800 Subject: Fix instance instantiation for CCVPN Change-Id: Iaf7e4d15c95aa9de0e4cace09b365ce409201d32 Issue-ID: USECASEUI-220 Signed-off-by: guochuyicmri --- .../src/app/ccvpn-creation/ccvpn-creation.component.ts | 8 ++++---- usecaseui-portal/src/app/ccvpn-detail/ccvpn-detail.component.ts | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/usecaseui-portal/src/app/ccvpn-creation/ccvpn-creation.component.ts b/usecaseui-portal/src/app/ccvpn-creation/ccvpn-creation.component.ts index 719dc52e..ed30baa0 100644 --- a/usecaseui-portal/src/app/ccvpn-creation/ccvpn-creation.component.ts +++ b/usecaseui-portal/src/app/ccvpn-creation/ccvpn-creation.component.ts @@ -102,7 +102,7 @@ export class CcvpnCreationComponent implements OnInit { if (item["required"] != undefined) { this.templateParameters["sotnvpn"]["sdwanvpnresource_list"].push(item); } - if (item["required"] == undefined && Object.keys(item).length == 1 && Object.keys(item)[0].search("sitelan") != -1 && item[Object.keys(item)[0]] instanceof Array === true) { + if (item["required"] == undefined && Object.keys(item).length == 1 && Object.keys(item)[0].search("site") != -1 && item[Object.keys(item)[0]] instanceof Array === true) { this.templateParameters["sotnvpn"]["sdwansitelan_list"] = item[Object.keys(item)[0]] let sitelanKey = {}; sitelanKey[Object.keys(item)[0]] = []; @@ -122,7 +122,7 @@ export class CcvpnCreationComponent implements OnInit { sitelanKey[Object.keys(item)[0]] = []; this.bodyTemplateParameter[items].push(sitelanKey); } - if (item["required"] == undefined && Object.keys(item).length == 1 && Object.keys(item)[0].search("sitewan") != -1 && item[Object.keys(item)[0]] instanceof Array === true) { + if (item["required"] == undefined && Object.keys(item).length == 1 && Object.keys(item)[0].search("site") != -1 && Object.keys(item)[0].search("device") == -1 && item[Object.keys(item)[0]] instanceof Array === true) { this.templateParameters["site"]["sdwansitewan_list"] = item[Object.keys(item)[0]]; let sitelanKey = {}; sitelanKey[Object.keys(item)[0]] = []; @@ -632,7 +632,7 @@ export class CcvpnCreationComponent implements OnInit { if(item.search("site") != -1){ siteresource = item; this.bodyTemplateParameter[item].map((items,index) => { - if(Object.keys(items)[0].search("site") != -1){ + if(Object.keys(items)[0].search("site") != -1 && Object.keys(items)[0].search("device") == -1){ sitewan = Object.keys(items)[0] } if(Object.keys(items)[0].search("device") != -1){ @@ -658,7 +658,7 @@ export class CcvpnCreationComponent implements OnInit { }); this.siteTableData.forEach((item, index) => { Object.keys(item).map((items,index) => { - if(items.search("site") != -1 && item[items] instanceof Array === true){ + if(items.search("site") != -1 && Object.keys(item)[0].search("device") == -1 && item[items] instanceof Array === true){ this.modifyJosnKey(item,items,sitewan) } if(items.search("device") != -1){ diff --git a/usecaseui-portal/src/app/ccvpn-detail/ccvpn-detail.component.ts b/usecaseui-portal/src/app/ccvpn-detail/ccvpn-detail.component.ts index 1af2b437..c11b159e 100644 --- a/usecaseui-portal/src/app/ccvpn-detail/ccvpn-detail.component.ts +++ b/usecaseui-portal/src/app/ccvpn-detail/ccvpn-detail.component.ts @@ -107,7 +107,7 @@ export class CcvpnDetailComponent implements OnInit { let sdwanvpnresource_list = inputs[items][0]; Object.keys(sdwanvpnresource_list).forEach((its) => { let input = {}; - if(its.search("sitelan") != -1 && sdwanvpnresource_list[its] instanceof Array === true){ + if(its.search("site") != -1 && sdwanvpnresource_list[its] instanceof Array === true){ Object.keys(sdwanvpnresource_list[its][0]).forEach((i) => { let input1 = {}; input1[i] = sdwanvpnresource_list[its][i]; @@ -143,7 +143,7 @@ export class CcvpnDetailComponent implements OnInit { sitelanKey[its] = []; this.bodyTemplateParameter[items].push(sitelanKey); } - if(its.search("site") != -1 && sdwansiteresource_list[its] instanceof Array === true){ + if(its.search("site") != -1 && its.search("device") == -1 && sdwansiteresource_list[its] instanceof Array === true){ this.templateParameters["site"]["sdwansitewan_list"][0] = sdwansiteresource_list[its][0]; let sitelanKey = {}; sitelanKey[its] = []; @@ -763,7 +763,7 @@ export class CcvpnDetailComponent implements OnInit { if(item.search("site") != -1){ siteresource = item; this.bodyTemplateParameter[item].map((items,index) => { - if(Object.keys(items)[0].search("site") != -1){ + if(Object.keys(items)[0].search("site") != -1 && Object.keys(items)[0].search("device") == -1){ sitewan = Object.keys(items)[0] } if(Object.keys(items)[0].search("device") != -1){ @@ -789,7 +789,7 @@ export class CcvpnDetailComponent implements OnInit { }); this.siteTableData.forEach((item, index) => { Object.keys(item).map((items,index) => { - if(items.search("site") != -1 && item[items] instanceof Array === true){ + if(items.search("site") != -1 && items.search("device") == -1 && item[items] instanceof Array === true){ this.modifyJosnKey(item,items,sitewan) } if(items.search("device") != -1){ -- cgit 1.2.3-korg