diff options
| author |   guochuyicmri <guochuyi@chinamobile.com> | 2019-05-24 17:42:52 +0800 |
|---|---|---|
| committer | guochuyicmri <guochuyi@chinamobile.com> | 2019-05-24 17:48:43 +0800 |
| commit | 4fa6adb91b4a31cd26d24d834477a1fa94d2a83d (patch) | |
| tree | c83f20e1b50a33ee2f977152677056d67dd9eea2 /usecaseui-portal/src/app/ccvpn-creation | |
| parent | 094dd6840bfa4cebc120b0735797ff3617371296 (diff) | |
Fix instance instantiation for CCVPN
Change-Id: Iaf7e4d15c95aa9de0e4cace09b365ce409201d32
Issue-ID: USECASEUI-220
Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>
Diffstat (limited to 'usecaseui-portal/src/app/ccvpn-creation')
| -rw-r--r-- | usecaseui-portal/src/app/ccvpn-creation/ccvpn-creation.component.ts | 8 |
1 files changed, 4 insertions, 4 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){ |