From a53db0c68f3efd0b22cc1531d6e48b54a7e163a5 Mon Sep 17 00:00:00 2001 From: "SANDHYA.JS" Date: Fri, 23 May 2025 11:44:39 +0530 Subject: [PATCH] Fix Bug 2405: NS instance Day 2 operation issue - Resolved the ID issue for day2 operation Change-Id: I6e48e0c27108f750fc9479834986c479dec0ca43 Signed-off-by: SANDHYA.JS --- .../instances/ns-primitive/NSPrimitiveComponent.ts | 14 +++++--------- .../NSInstancesActionComponent.ts | 3 ++- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/app/instances/ns-primitive/NSPrimitiveComponent.ts b/src/app/instances/ns-primitive/NSPrimitiveComponent.ts index cf60b57..5ddb197 100644 --- a/src/app/instances/ns-primitive/NSPrimitiveComponent.ts +++ b/src/app/instances/ns-primitive/NSPrimitiveComponent.ts @@ -155,11 +155,7 @@ export class NSPrimitiveComponent implements OnInit { */ public ngOnInit(): void { /** Setting up initial value for NSD */ - this.dataService.currentMessage.subscribe((event: NSData): void => { - if (event.identifier !== undefined || event.identifier !== '' || event.identifier !== null) { - this.nsdId = event.identifier; - } - }); + this.nsdId = this.params.nsID; this.getMemberVnfIndex(); this.initializeForm(); } @@ -379,8 +375,8 @@ export class NSPrimitiveComponent implements OnInit { this.kduList = []; this.vduList = []; this.primitiveList = []; - df['vdu-profile'].forEach((vduProfile: VDUPROFILE): void => { - day12Operation.forEach((element: VDUCONFIG): void => { + df['vdu-profile']?.forEach((vduProfile: VDUPROFILE): void => { + day12Operation?.forEach((element: VDUCONFIG): void => { if (element.id === vduProfile.id) { const vduDataObj: VDUPROFILE = this.generateVDUData(element); this.vduList.push(vduDataObj); @@ -394,8 +390,8 @@ export class NSPrimitiveComponent implements OnInit { this.vduList = []; this.primitiveList = []; if (!isNullOrUndefined(vnfInstances.kdu)) { - vnfInstances.kdu.forEach((kduData: KDUPRIMITIVELEVEL): void => { - day12Operation.forEach((element: VDUCONFIG): void => { + vnfInstances.kdu?.forEach((kduData: KDUPRIMITIVELEVEL): void => { + day12Operation?.forEach((element: VDUCONFIG): void => { if (element.id === kduData.name) { const kduDataObj: KDUPRIMITIVELEVEL = this.generateKDUData(kduData, element); this.kduList.push(kduDataObj); diff --git a/src/app/utilities/ns-instances-action/NSInstancesActionComponent.ts b/src/app/utilities/ns-instances-action/NSInstancesActionComponent.ts index 74f1518..8ae776f 100644 --- a/src/app/utilities/ns-instances-action/NSInstancesActionComponent.ts +++ b/src/app/utilities/ns-instances-action/NSInstancesActionComponent.ts @@ -198,7 +198,8 @@ export class NSInstancesActionComponent { memberIndex: this.value.memberIndex, nsConfig: this.value.nsConfig, name: this.value.NsdName, - id: this.value.constituent + id: this.value.constituent, + nsID: this.instanceID }; } -- 2.25.1