Fix Bug 2292: Invalid Member VNF index in Manual Scaling after NS Update remove operation
- Will get member vnf index value from vnfinstances api instead
of nsinstances api in manual scaling.
- Also made code refactoring in other components to avoid linting issue
Change-Id: I30de65c6fe23ddbf560ab45a8505759c4adb5978
Signed-off-by: SANDHYA.JS <sandhya.j@tataelxsi.co.in>
diff --git a/src/app/utilities/vm-migration/VmMigrationComponent.ts b/src/app/utilities/vm-migration/VmMigrationComponent.ts
index e53ea11..b629497 100644
--- a/src/app/utilities/vm-migration/VmMigrationComponent.ts
+++ b/src/app/utilities/vm-migration/VmMigrationComponent.ts
@@ -29,7 +29,7 @@
import { VMMIGRATION } from 'NSInstanceModel';
import { RestService } from 'RestService';
import { SharedService } from 'SharedService';
-import { VDUR, VNFInstanceDetails } from 'VNFInstanceModel';
+import { InstanceData, VDUR, VNFInstanceDetails } from 'VNFInstanceModel';
/**
* Creating component
@@ -115,30 +115,32 @@
/** Getting MemberVnfIndex using NSDescriptor API @public */
public getMemberVnfIndex(): void {
- const vnfInstanceData: {}[] = [];
this.isLoadingResults = true;
+ const vnfInstanceData: {}[] = [];
this.restService.getResource(environment.VNFINSTANCES_URL).subscribe((vnfInstancesData: VNFInstanceDetails[]): void => {
vnfInstancesData.forEach((vnfData: VNFInstanceDetails): void => {
+ const vnfdRef: string = 'vnfd-ref';
+ const memberIndex: string = 'member-vnf-index-ref';
+ const nsrId: string = 'nsr-id-ref';
const vnfDataObj: {} =
{
- VNFD: vnfData['vnfd-ref'],
+ // eslint-disable-next-line security/detect-object-injection
+ VNFD: vnfData[vnfdRef],
VNFInstanceId: vnfData._id,
- MemberIndex: vnfData['member-vnf-index-ref'],
- NS: vnfData['nsr-id-ref']
+ // eslint-disable-next-line security/detect-object-injection
+ MemberIndex: vnfData[memberIndex],
+ // eslint-disable-next-line security/detect-object-injection
+ NS: vnfData[nsrId]
};
vnfInstanceData.push(vnfDataObj);
});
const nsId: string = 'NS';
// eslint-disable-next-line security/detect-object-injection
this.nsIdFilteredData = vnfInstanceData.filter((vnfdData: {}[]): boolean => vnfdData[nsId] === this.params.id);
- this.nsIdFilteredData.forEach((resVNF: {}[]): void => {
- const memberIndex: string = 'MemberIndex';
- const vnfinstanceID: string = 'VNFInstanceId';
+ this.nsIdFilteredData.forEach((resVNF: InstanceData): void => {
const assignMemberIndex: {} = {
- // eslint-disable-next-line security/detect-object-injection
- id: resVNF[memberIndex],
- // eslint-disable-next-line security/detect-object-injection
- vnfinstanceId: resVNF[vnfinstanceID]
+ id: resVNF.MemberIndex,
+ vnfinstanceId: resVNF.VNFInstanceId
};
this.memberVnfIndex.push(assignMemberIndex);
});
@@ -170,7 +172,6 @@
{
'count-index': vdu['count-index'],
VDU: vdu['vdu-id-ref']
-
};
vnfInstanceData.push(vnfInstanceDataObj);
});