Fix Bug 2296: Newly Created Ns should come first in NG-UI
- Sorted the list using created Date in descending order
- Incorrect Information in "Expires in " section of Admin user :
Changed it to N/A
- VIM Resource Overview: RAM Value should be rounded off :
Rounded off the value to 2 decimal points
- Fixed the key issue in topology
Change-Id: I634aee0b4e4540386c5108232746f56959bcc838
Signed-off-by: SANDHYA.JS <sandhya.j@tataelxsi.co.in>
diff --git a/src/app/instances/ns-instances/NSInstancesComponent.ts b/src/app/instances/ns-instances/NSInstancesComponent.ts
index 5cc5519..e7de4a7 100644
--- a/src/app/instances/ns-instances/NSInstancesComponent.ts
+++ b/src/app/instances/ns-instances/NSInstancesComponent.ts
@@ -144,9 +144,13 @@
/** Generate smart table row title and filters @public */
public generateTableColumn(): void {
this.columnList = {
- name: { title: this.translateService.instant('NAME'), width: '15%', sortDirection: 'asc' },
+ name: { title: this.translateService.instant('NAME'), width: '15%' },
identifier: { title: this.translateService.instant('IDENTIFIER'), width: '20%' },
NsdName: { title: this.translateService.instant('NSDNAME'), width: '15%' },
+ 'create-time': {
+ title: this.translateService.instant('DATE'), width: '15%', sortDirection: 'desc',
+ compareFunction: this.sharedService.compareFunction
+ },
OperationalStatus: {
title: this.translateService.instant('OPERATIONALSTATUS'), width: '10%', type: 'html',
filter: {
@@ -244,7 +248,8 @@
nsd: nsdInstanceData.nsd,
'nsd-id': nsdInstanceData['nsd-id'],
vcaStatus: nsdInstanceData.vcaStatus,
- constituent: nsdInstanceData['constituent-vnfr-ref']
+ constituent: nsdInstanceData['constituent-vnfr-ref'],
+ 'create-time': this.sharedService.convertEpochTime(Number(nsdInstanceData['create-time']))
};
this.nsInstanceData.push(nsDataObj);
});
diff --git a/src/app/instances/ns-topology/NSTopologyComponent.html b/src/app/instances/ns-topology/NSTopologyComponent.html
index d500535..084f90e 100644
--- a/src/app/instances/ns-topology/NSTopologyComponent.html
+++ b/src/app/instances/ns-topology/NSTopologyComponent.html
@@ -113,7 +113,7 @@
</tr>
<tr>
<td>Vnfd Id</td>
- <td>{{(vnfr.vnfdID)?vnfr.vnfdID:'-'}}</td>
+ <td>{{(vnfr.vnfdId)?vnfr.vnfdId:'-'}}</td>
</tr>
<tr>
<td>Member index</td>
diff --git a/src/app/instances/pdu-instances/PDUInstancesComponent.ts b/src/app/instances/pdu-instances/PDUInstancesComponent.ts
index 5c25279..6a2ca34 100644
--- a/src/app/instances/pdu-instances/PDUInstancesComponent.ts
+++ b/src/app/instances/pdu-instances/PDUInstancesComponent.ts
@@ -124,10 +124,13 @@
public generateTableColumn(): void {
this.columnList = {
identifier: { title: this.translateService.instant('IDENTIFIER'), width: '25%' },
- name: { title: this.translateService.instant('NAME'), width: '20%', sortDirection: 'asc' },
+ name: { title: this.translateService.instant('NAME'), width: '20%' },
type: { title: this.translateService.instant('TYPE'), width: '15%' },
usageState: { title: this.translateService.instant('USAGESTATE'), width: '15%' },
- CreatedAt: { title: this.translateService.instant('CREATEDAT'), width: '15%' },
+ CreatedAt: {
+ title: this.translateService.instant('CREATEDAT'), width: '15%', sortDirection: 'desc',
+ compareFunction: this.sharedService.compareFunction
+ },
Actions: {
name: 'Action', width: '10%', filter: false, sort: false, type: 'custom',
title: this.translateService.instant('ACTIONS'),
diff --git a/src/app/instances/vnf-instances/VNFInstancesComponent.ts b/src/app/instances/vnf-instances/VNFInstancesComponent.ts
index 90bb6fe..c27384d 100644
--- a/src/app/instances/vnf-instances/VNFInstancesComponent.ts
+++ b/src/app/instances/vnf-instances/VNFInstancesComponent.ts
@@ -118,7 +118,7 @@
/** Generate smart table row title and filters @public */
public generateTableColumn(): void {
this.columnList = {
- identifier: { title: this.translateService.instant('IDENTIFIER'), width: '25%', sortDirection: 'asc' },
+ identifier: { title: this.translateService.instant('IDENTIFIER'), width: '25%' },
VNFD: {
title: this.translateService.instant('VNFD'), width: '20%', type: 'custom',
valuePrepareFunction: (cell: VNFInstanceData, row: VNFInstanceData): VNFInstanceData => row,
@@ -126,7 +126,10 @@
},
MemberIndex: { title: this.translateService.instant('MEMBERINDEX'), width: '15%' },
NS: { title: this.translateService.instant('NS'), width: '20%' },
- CreatedAt: { title: this.translateService.instant('CREATEDAT'), width: '15%' },
+ CreatedAt: {
+ title: this.translateService.instant('CREATEDAT'), width: '15%', sortDirection: 'desc',
+ compareFunction: this.sharedService.compareFunction
+ },
Actions: {
name: 'Action', width: '5%', filter: false, sort: false, type: 'custom',
title: this.translateService.instant('ACTIONS'),