commit 79971eb04102e22baa15da92888bed74899e7d90
author Barath Kumar R <barath.r@tataelxsi.co.in> Mon Dec 21 15:42:23 2020 +0530
committer Barath Kumar R <barath.r@tataelxsi.co.in> Fri Jan 08 09:45:05 2021 +0530
tree f69ef9cf5320500b2b9990d12a37f43d8ad32142
parent 42862ae098e72ac875c0cb311ce354ae075707be

Bug 1382 - VNF packages list doesn't show short names

 * The VNF & NS Package list names will be displayed
 * Removed Vendor from both packages
 * The keys where changed based on the SOL006

Change-Id: I48f0884ec300f405325d598edf8a87109a6ff91e
Signed-off-by: Barath Kumar R <barath.r@tataelxsi.co.in>

src/app/packages/ns-packages/NSPackagesComponent.ts

diff --git a/src/app/packages/ns-packages/NSPackagesComponent.ts b/src/app/packages/ns-packages/NSPackagesComponent.ts
index 46366e0..5dc36e7 100644
--- a/src/app/packages/ns-packages/NSPackagesComponent.ts
+++ b/src/app/packages/ns-packages/NSPackagesComponent.ts
@@ -126,11 +126,10 @@
     /** smart table Header Colums @public */
     public generateColumns(): void {
         this.columnLists = {
-            shortName: { title: this.translateService.instant('SHORTNAME'), width: '15%', sortDirection: 'asc' },
-            identifier: { title: this.translateService.instant('IDENTIFIER'), width: '20%' },
+            name: { title: this.translateService.instant('NAME'), width: '15%', sortDirection: 'asc' },
+            identifier: { title: this.translateService.instant('IDENTIFIER'), width: '30%' },
             description: { title: this.translateService.instant('DESCRIPTION'), width: '25%' },
-            vendor: { title: this.translateService.instant('VENDOR'), width: '15%' },
-            version: { title: this.translateService.instant('VERSION'), width: '10%' },
+            version: { title: this.translateService.instant('VERSION'), width: '15%' },
             Actions: {
                 name: 'Actions', width: '15%', filter: false, sort: false, type: 'custom',
                 title: this.translateService.instant('ACTIONS'),
@@ -212,10 +211,9 @@
     /** Generate nsData object from loop and return for the datasource @public */
     public generateNSData(nsdpackagedata: NSDDetails): NSData {
         return {
-            shortName: nsdpackagedata['short-name'],
+            name: nsdpackagedata.name,
             identifier: nsdpackagedata._id,
             description: nsdpackagedata.description,
-            vendor: nsdpackagedata.vendor,
             version: nsdpackagedata.version
         };
     }

src/app/packages/vnf-packages/VNFPackagesComponent.ts

diff --git a/src/app/packages/vnf-packages/VNFPackagesComponent.ts b/src/app/packages/vnf-packages/VNFPackagesComponent.ts
index 13707e1..5e23034 100644
--- a/src/app/packages/vnf-packages/VNFPackagesComponent.ts
+++ b/src/app/packages/vnf-packages/VNFPackagesComponent.ts
@@ -127,7 +127,7 @@
     /** smart table Header Colums @public */
     public generateColumns(): void {
         this.columnLists = {
-            shortName: { title: this.translateService.instant('SHORTNAME'), width: '15%', sortDirection: 'asc' },
+            productName: { title: this.translateService.instant('PRODUCTNAME'), width: '15%', sortDirection: 'asc' },
             identifier: { title: this.translateService.instant('IDENTIFIER'), width: '20%' },
             type: {
                 title: this.translateService.instant('TYPE'),
@@ -142,10 +142,9 @@
                         ]
                     }
                 },
-                width: '10%'
+                width: '15%'
             },
-            description: { title: this.translateService.instant('DESCRIPTION'), width: '20%' },
-            vendor: { title: this.translateService.instant('VENDOR'), width: '10%' },
+            description: { title: this.translateService.instant('DESCRIPTION'), width: '25%' },
             version: { title: this.translateService.instant('VERSION'), width: '10%' },
             Actions: {
                 name: 'Action', width: '15%', filter: false, sort: false, type: 'custom',
@@ -228,11 +227,10 @@
     /** Generate nsData object from loop and return for the datasource @public */
     public generatevnfdData(vnfdpackagedata: VNFDDetails): VNFData {
         return {
-            shortName: vnfdpackagedata['short-name'],
+            productName: vnfdpackagedata['product-name'],
             identifier: vnfdpackagedata._id,
             type: vnfdpackagedata._admin.type,
             description: vnfdpackagedata.description,
-            vendor: vnfdpackagedata.vendor,
             version: vnfdpackagedata.version
         };
     }