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>
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
};
}
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
};
}
diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
index 7724414..b806737 100644
--- a/src/assets/i18n/de.json
+++ b/src/assets/i18n/de.json
@@ -41,6 +41,7 @@
"MODIFIED": "Geändert",
"NODATAMSG": "Keine Daten in der Tabelle verfügbar",
"SHORTNAME": "Kurzer Name",
+ "PRODUCTNAME":"Produktname",
"IDENTIFIER": "Kennung",
"DESCRIPTION": "Beschreibung",
"VENDOR": "Verkäuferin",
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 9e0c5a0..faef909 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -41,6 +41,7 @@
"MODIFIED": "Modified",
"NODATAMSG": "No data available in table",
"SHORTNAME": "Short Name",
+ "PRODUCTNAME":"Product Name",
"IDENTIFIER": "Identifier",
"DESCRIPTION": "Description",
"VENDOR": "Vendor",
diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json
index dd9d08b..335ed7d 100644
--- a/src/assets/i18n/es.json
+++ b/src/assets/i18n/es.json
@@ -41,6 +41,7 @@
"MODIFIED": "Modificado",
"NODATAMSG": "No hay datos disponibles en la tabla",
"SHORTNAME": "Nombre corto",
+ "PRODUCTNAME":"Nombre del producto",
"IDENTIFIER": "Identificador",
"DESCRIPTION": "Descripción",
"VENDOR": "Vendedor",
diff --git a/src/assets/i18n/pt.json b/src/assets/i18n/pt.json
index 48a9fbe..ffd94a5 100644
--- a/src/assets/i18n/pt.json
+++ b/src/assets/i18n/pt.json
@@ -41,6 +41,7 @@
"PACKAGES": "Pacotes",
"NODATAMSG": "Sem dados disponíveis na tabela",
"SHORTNAME": "Nome curto",
+ "PRODUCTNAME":"Nome do Produto",
"IDENTIFIER": "Identificador",
"DESCRIPTION": "Descrição",
"VENDOR": "Fornecedor",
diff --git a/src/models/NSDModel.ts b/src/models/NSDModel.ts
index c8aa257..354ccde 100644
--- a/src/models/NSDModel.ts
+++ b/src/models/NSDModel.ts
@@ -23,10 +23,10 @@
/** Interface for NSData */
export interface NSData {
- shortName: string;
+ shortName?: string;
identifier: string;
description: string;
- vendor: string;
+ vendor?: string;
version: string;
page?: string;
name?: string;
diff --git a/src/models/VNFDModel.ts b/src/models/VNFDModel.ts
index 908f552..364d37e 100644
--- a/src/models/VNFDModel.ts
+++ b/src/models/VNFDModel.ts
@@ -93,6 +93,7 @@
_admin: VNFDAdminDetails;
'short-name': string;
vendor: string;
+ 'product-name'?: string;
}
/** Interface for MGMT */
@@ -213,12 +214,13 @@
export interface VNFData {
name?: string;
id?: string;
- shortName: string;
+ shortName?: string;
identifier: string;
description: string;
- vendor: string;
+ vendor?: string;
version: string;
'type'?: string;
+ productName?: string;
}
/** Interface for the Tick */