Convert template summary from json to string.

Issue-ID: VID-724
Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com>
Change-Id: Icfe469b538c3dd5f82f95617ebbd6093b9e451dc
Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com>

diff --git a/vid-webpack-master/cypress/integration/iFrames/instantiation.templates.modal.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/instantiation.templates.modal.e2e.ts
index e55b1dc..3786bc5 100644 (file)
--- a/vid-webpack-master/cypress/integration/iFrames/instantiation.templates.modal.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/instantiation.templates.modal.e2e.ts
@@ -38,7 +38,12 @@ describe('Template', () => {
       "serviceModelName": "action-data",
       "serviceModelVersion": "1.0",
       "createdBulkDate": 1525075968000,
-      "isRetryEnabled": true
+      "isRetryEnabled": true,
+      "requestSummary": {
+        "vnf": 2,
+        "vfModule": 3,
+        "network": 1
+      }
     },
     {
       "id": 7,
@@ -139,6 +144,7 @@ describe('Template', () => {
     cy.getElementByDataTestsId(`createDate-${instantiationTemplates[0].jobId}`).contains('2018-04-30 11:12:48');
     cy.getElementByDataTestsId(`instanceName-${instantiationTemplates[0].jobId}`).contains('nWUfl instance name_002');
     cy.getElementByDataTestsId(`instantiationStatus-${instantiationTemplates[0].jobId}`).contains('FAILED');
+    cy.getElementByDataTestsId(`summary-${instantiationTemplates[0].jobId}`).contains('{"vnf":2,"vfModule":3,"network":1}');
     cy.getElementByDataTestsId(`region-${instantiationTemplates[0].jobId}`).contains('hvf6 (WAYNEHOLLAND)');
     cy.getElementByDataTestsId(`tenant-${instantiationTemplates[0].jobId}`).contains('AIN Web Tool-15-D-testalexandria');
     cy.getElementByDataTestsId(`aicZone-${instantiationTemplates[0].jobId}`).contains('NFTJSSSS-NFT1');

diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/instantiationTemplatesModal/instantiation.templates.modal.service.spec.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/instantiationTemplatesModal/instantiation.templates.modal.service.spec.ts
index 2f04411..6540a65 100644 (file)
--- a/vid-webpack-master/src/app/shared/components/genericFormPopup/instantiationTemplatesModal/instantiation.templates.modal.service.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/instantiationTemplatesModal/instantiation.templates.modal.service.spec.ts
@@ -54,6 +54,17 @@ describe('instantiation templates modal service', () => {
     expect(service).toBeDefined();
   });
 
+  test('convert map to json', () => {
+    let result:InstantiationTemplatesRowModel = new InstantiationTemplatesRowModel({
+      "requestSummary": {
+        "vnf": 2,
+        "vfModule": 3,
+        "network": 1
+      }
+    });
+    expect(result.summary).toEqual( "{\"vnf\":2,\"vfModule\":3,\"network\":1}");
+  });
+
 
   test('convertResponseToUI - should return table data', () => {
     const jobs = [{
@@ -92,7 +103,6 @@ describe('instantiation templates modal service', () => {
       "serviceModelName": "ComplexService",
       "serviceModelVersion": "1.0",
       "createdBulkDate": 1524995555000,
-      "isRetryEnabled": false
     }];
     const tableRows: InstantiationTemplatesRowModel[] = service.convertResponseToUI(jobs);
     expect(tableRows).toHaveLength(1);

diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/instantiationTemplatesModal/instantiation.templates.row.model.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/instantiationTemplatesModal/instantiation.templates.row.model.ts
index 6737094..df40da7 100644 (file)
--- a/vid-webpack-master/src/app/shared/components/genericFormPopup/instantiationTemplatesModal/instantiation.templates.row.model.ts
+++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/instantiationTemplatesModal/instantiation.templates.row.model.ts
@@ -18,7 +18,7 @@ export class InstantiationTemplatesRowModel extends InstantiationBase{
     this.createDate = !_.isNil(data.created) ? moment(data.created).format("YYYY-MM-DD HH:mm:ss") : null;
     this.instanceName = this.getInstanceName(data.serviceInstanceName);
     this.instantiationStatus = !_.isNil(data.jobStatus) ? data.jobStatus : null;
-    this.summary = null;
+    this.summary = this.convertRequestSummaryFromMapToString(data.requestSummary);
     this.region = this.getRegion(data.regionId, data.owningEntityName);
     this.tenant = !_.isNil(data.tenantName) ? data.tenantName : null;
     this.aicZone = !_.isNil(data.aicZoneName) ? data.aicZoneName : null;
@@ -46,5 +46,12 @@ export class InstantiationTemplatesRowModel extends InstantiationBase{
     }
     return instanceName;
   }
+
+  convertRequestSummaryFromMapToString = (requestSummary): string => {
+    let myvnf: string = JSON.stringify(requestSummary);
+    return myvnf;
+  }
+
+
 }
 

diff --git a/vid-webpack-master/src/app/shared/server/serviceInfo/serviceInfo.model.ts b/vid-webpack-master/src/app/shared/server/serviceInfo/serviceInfo.model.ts
index 5a2b37a..8e47f0c 100644 (file)
--- a/vid-webpack-master/src/app/shared/server/serviceInfo/serviceInfo.model.ts
+++ b/vid-webpack-master/src/app/shared/server/serviceInfo/serviceInfo.model.ts
@@ -35,6 +35,7 @@ export class ServiceInfoModel extends InstantiationBase{
   auditUserId: string;
   action: ServiceAction;
   isRetryEnabled: boolean;
+  requestSummary:string;
 }
 
 export class ServiceInfoUiModel extends ServiceInfoModel{