diff options
| -rw-r--r-- | vid-automation/src/test/java/org/onap/vid/api/InstantiationTemplatesApiTest.java | 11 | ||||
| -rw-r--r-- | vid-webpack-master/cypress/integration/iFrames/instantiation.templates.modal.e2e.ts | 162 |
2 files changed, 65 insertions, 108 deletions
diff --git a/vid-automation/src/test/java/org/onap/vid/api/InstantiationTemplatesApiTest.java b/vid-automation/src/test/java/org/onap/vid/api/InstantiationTemplatesApiTest.java index cf3d508e8..9d84e965d 100644 --- a/vid-automation/src/test/java/org/onap/vid/api/InstantiationTemplatesApiTest.java +++ b/vid-automation/src/test/java/org/onap/vid/api/InstantiationTemplatesApiTest.java @@ -138,13 +138,12 @@ public class InstantiationTemplatesApiTest extends AsyncInstantiationBase { String jobId = postAsyncInstanceRequest(request); - assertThat(fetchRecentTemplateInfo(request.at("/modelInfo/modelVersionId").asText()), allOf( - jsonPartEquals("jobId", jobId), + assertThat(fetchTemplateInfo(request.at("/modelInfo/modelVersionId").asText(), jobId), jsonPartEquals("requestSummary", ImmutableMap.of( "vnf", 1L, "vfModule", 2L, "volumeGroup", 1L - )))); + ))); } @Test @@ -157,8 +156,7 @@ public class InstantiationTemplatesApiTest extends AsyncInstantiationBase { String jobId = postAsyncInstanceRequest(request); - assertThat(fetchRecentTemplateInfo(request.at("/modelInfo/modelVersionId").asText()), allOf( - jsonPartEquals("jobId", jobId), + assertThat(fetchTemplateInfo(request.at("/modelInfo/modelVersionId").asText(), jobId), allOf( jsonEquals(templateInfoFromFile()).when(IGNORING_VALUES), // Assert only field types jsonEquals(templateInfoFromFile()).whenIgnoringPaths( // Ignore the fields where values are always changing @@ -169,8 +167,9 @@ public class InstantiationTemplatesApiTest extends AsyncInstantiationBase { ))); } - private JsonNode fetchRecentTemplateInfo(String serviceModelId) { + private JsonNode fetchTemplateInfo(String serviceModelId, String jobId) { return stream(restTemplate.getForObject(getTemplateInfoUrl(serviceModelId), JsonNode[].class)) + .filter(it -> it.at("/jobId").asText().equals(jobId)) .findFirst() .orElseGet(() -> { throw new AssertionError(getTemplateInfoUrl(serviceModelId) + " returned zero results"); 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 dd17e7db5..7fb7ea584 100644 --- a/vid-webpack-master/cypress/integration/iFrames/instantiation.templates.modal.e2e.ts +++ b/vid-webpack-master/cypress/integration/iFrames/instantiation.templates.modal.e2e.ts @@ -1,89 +1,45 @@ ///<reference path="../../../node_modules/cypress/types/index.d.ts"/> describe('Template', () => { - - const instantiationTemplates = [ - { - "id": 8, - "created": 1525075968000, - "modified": 1525075971000, - "action": "INSTANTIATE", - "createdId": null, - "modifiedId": null, - "rowNum": null, - "auditUserId": null, - "auditTrail": null, - "jobId": "5c2cd8e5-27d0-42e3-85a1-85db5eaba459", - "templateId": "d42ba7c8-9e19-4e34-ae2c-d8af3f24498e", - "userId": "16807000", - "aLaCarte": false, - "msoRequestId": "c0011670-0e1a-4b74-945d-8bf5aede1d9c", - "jobStatus": "FAILED", - "statusModifiedDate": 1525075968000, - "hidden": false, - "pause": false, - "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", - "owningEntityName": "WayneHolland", - "project": "WATKINS", - "aicZoneId": "NFT1", - "aicZoneName": "NFTJSSSS-NFT1", - "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054", - "tenantName": "AIN Web Tool-15-D-testalexandria", - "regionId": "hvf6", - "regionName": null, - "serviceType": "TYLER SILVIA", - "subscriberName": "e433710f-9217-458d-a79d-1c7aff376d89", - "serviceInstanceId": null, - "serviceInstanceName": "nWUfl instance name_002", - "serviceModelId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", - "serviceModelName": "action-data", - "serviceModelVersion": "1.0", - "createdBulkDate": 1525075968000, - "isRetryEnabled": true, - "requestSummary": { - "vnf": 1, - "vfModule": 2, - "volumeGroup": 1 - } - }, - { - "id": 7, - "created": 1525075968000, - "modified": 1525075971000, - "action": "INSTANTIATE", - "createdId": null, - "modifiedId": null, - "rowNum": null, - "auditUserId": null, - "auditTrail": null, - "jobId": "13063a83-924e-4500-a3a1-e53d1b58450b", - "templateId": "d42ba7c8-9e19-4e34-ae2c-d8af3f24498e", - "userId": "17807000", - "aLaCarte": false, - "msoRequestId": "c0011670-0e1a-4b74-945d-8bf5aede1d9d", - "jobStatus": "IN_PROGRESS", - "statusModifiedDate": 1525075968000, - "hidden": false, - "pause": false, - "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", - "owningEntityName": "WayneHolland", - "project": "WATKINS", - "aicZoneId": "NFT1", - "aicZoneName": "NFTJSSSS-NFT1", - "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054", - "tenantName": "AIN Web Tool-15-D-testalexandria", - "regionId": "hvf6", - "regionName": null, - "serviceType": "TYLER SILVIA", - "subscriberName": "e433710f-9217-458d-a79d-1c7aff376d89", - "serviceInstanceId": null, - "serviceInstanceName": "nWUfl instance name_001", - "serviceModelId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", - "serviceModelName": "action-data", - "serviceModelVersion": "1.0", - "createdBulkDate": 1525075968000, - "isRetryEnabled": false - } - ]; + const templateJobIdFromE2EFile = 'ef3430f8-6350-454c-a7c2-89ba301522c1'; + + const aSecondTemplateInfo = { + id: 7, + created: 1525075968000, + modified: 1525075971000, + action: "INSTANTIATE", + createdId: null, + modifiedId: null, + rowNum: null, + auditUserId: null, + auditTrail: null, + jobId: "13063a83-924e-4500-a3a1-e53d1b58450b", + templateId: "d42ba7c8-9e19-4e34-ae2c-d8af3f24498e", + userId: "17807000", + aLaCarte: false, + msoRequestId: "c0011670-0e1a-4b74-945d-8bf5aede1d9d", + jobStatus: "IN_PROGRESS", + statusModifiedDate: 1525075968000, + hidden: false, + pause: false, + owningEntityId: "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", + owningEntityName: "WayneHolland", + project: "WATKINS", + aicZoneId: "NFT1", + aicZoneName: "NFTJSSSS-NFT1", + tenantId: "bae71557c5bb4d5aac6743a4e5f1d054", + tenantName: "AIN Web Tool-15-D-testalexandria", + regionId: "hvf6", + regionName: null, + serviceType: "TYLER SILVIA", + subscriberName: "e433710f-9217-458d-a79d-1c7aff376d89", + serviceInstanceId: null, + serviceInstanceName: "nWUfl instance name_001", + serviceModelId: "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + serviceModelName: "action-data", + serviceModelVersion: "1.0", + createdBulkDate: 1525075968000, + isRetryEnabled: false + }; beforeEach(() => { cy.clearSessionStorage(); @@ -107,8 +63,13 @@ describe('Template', () => { }).as('initFlags'); }); - cy.route(Cypress.config('baseUrl') + "/instantiationTemplates**", instantiationTemplates); - cy.route(Cypress.config('baseUrl') + "/getuserID", '16807000'); + cy.readFile('fixture:../../../vid-automation/src/test/resources/asyncInstantiation/vidRequestCreateBulkOfMacro__template_info.json').then((templateInfoFromE2EFile)=>{ + cy.route(Cypress.config('baseUrl') + "/instantiationTemplates?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd", + [ templateInfoFromE2EFile, aSecondTemplateInfo ] + ) + }); + + cy.route(Cypress.config('baseUrl') + "/getuserID", 'us16807000'); cy.openPopupIframe('/app/ui/#/servicePopup?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd&isCreate=true'); @@ -124,8 +85,7 @@ describe('Template', () => { .getElementByDataTestsId('template-modal-title').contains('Templates') // Check Modal header .getElementByDataTestsId('description-part-1').contains('The following list presents previous instantiations done for this model in this version.') .getElementByDataTestsId('description-part-2').contains('You may use one of them as a baseline for your instantiation or start from scratch.') - .getElementByDataTestsId('description-part-3').contains('Once you selecting one allows you to change the data before start instantiating.') - + .getElementByDataTestsId('description-part-3').contains('Once you selecting one allows you to change the data before start instantiating.'); //check table headers cy.get(`#header-userId`).contains('User ID'); @@ -137,19 +97,19 @@ describe('Template', () => { cy.get(`#header-aicZone`).contains('AIC Zone'); // check table body row - cy.getElementByDataTestsId(`userId-${instantiationTemplates[0].jobId}`).contains('16807000'); - 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: 1, vfModule: 2, volumeGroup: 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'); + cy.getElementByDataTestsId(`userId-${templateJobIdFromE2EFile}`).contains('16807000'); + cy.getElementByDataTestsId(`createDate-${templateJobIdFromE2EFile}`).contains('2019-12-26 11:57:05'); + cy.getElementByDataTestsId(`instanceName-${templateJobIdFromE2EFile}`).contains('SERVICE_NAME'); + cy.getElementByDataTestsId(`instantiationStatus-${templateJobIdFromE2EFile}`).contains('IN_PROGRESS'); + cy.getElementByDataTestsId(`summary-${templateJobIdFromE2EFile}`).contains('vnf: 1, vfModule: 2, volumeGroup: 1'); + cy.getElementByDataTestsId(`region-${templateJobIdFromE2EFile}`).contains('hvf3 (SOMENAME)'); + cy.getElementByDataTestsId(`tenant-${templateJobIdFromE2EFile}`).contains('greatTenant'); + cy.getElementByDataTestsId(`aicZone-${templateJobIdFromE2EFile}`).contains('NFTJSSSS-NFT1'); //check load button is disabled cy.getElementByDataTestsId('LoadTemplateButton').should('be.disabled'); - cy.getElementByDataTestsId('row-5c2cd8e5-27d0-42e3-85a1-85db5eaba459').click(); + cy.getElementByDataTestsId(`row-${templateJobIdFromE2EFile}`).click(); cy.getElementByDataTestsId('LoadTemplateButton').should('not.be.disabled'); //filter by userId @@ -164,18 +124,16 @@ describe('Template', () => { cy.getElementByDataTestsId('templateButton').contains('Template') .getElementByDataTestsId('templateButton').click({force: true}) // Open template Modal - const serviceModelId = 'e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0'; - const jobId = '5c2cd8e5-27d0-42e3-85a1-85db5eaba459'; + const serviceModelId = '5c9e863f-2716-467b-8799-4a67f378dcaa'; const vidBaseUrl = `http://localhost:8080/vid/serviceModels.htm`; - cy.getElementByDataTestsId('row-5c2cd8e5-27d0-42e3-85a1-85db5eaba459').click(); + cy.getElementByDataTestsId(`row-${templateJobIdFromE2EFile}`).click(); cy.getElementByDataTestsId('LoadTemplateButton').click().setViewportToDefault(); cy.location().should((loc) => { - expect(loc.toString()).to.eq(`${vidBaseUrl}#/servicePlanning/RECREATE?serviceModelId=${serviceModelId}&jobId=${jobId}`); + expect(loc.toString()).to.eq(`${vidBaseUrl}#/servicePlanning/RECREATE?serviceModelId=${serviceModelId}&jobId=${templateJobIdFromE2EFile}`); }); }); - }); |