2 files changed, 112 insertions, 22 deletions
diff --git a/vid-webpack-master/cypress/integration/iFrames/instantiation-templates.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/instantiation-templates.e2e.ts
index 3c53d262f..0075dc240 100644
--- a/vid-webpack-master/cypress/integration/iFrames/instantiation-templates.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/instantiation-templates.e2e.ts
@@ -1,3 +1,6 @@
+import * as _ from "lodash";
+import {PropertyPath} from "lodash";
+
 describe('Drawing Board: Instantiation Templates', function () {
 
   describe('Instantiation templates ', () => {
@@ -78,30 +81,66 @@ describe('Drawing Board: Instantiation Templates', function () {
 
       });
 
+      [
+        {desc: "with changes", modifySomeValues: true},
+        {desc: "without changes", modifySomeValues: false},
+      ].forEach((testCase) => {
+
+        it(`Given a stored template - edit service vnf and vfmodule ${testCase.desc} - deploy request should be ${testCase.desc}`, function () {
+
+          loadDrawingBoardWithRecreateMode();
+
+          //edit service
+          cy.openServiceContextMenu();
+          cy.getElementByDataTestsId("context-menu-header-edit-item").click();
+          if (testCase.modifySomeValues) {
+            cy.clearInput("instanceName");
+            cy.typeToInput("instanceName", "different.instance.name");
+          }
+          cy.getElementByDataTestsId('form-set').click();
+
+          // edit vnf
+          editNode("node-21ae311e-432f-4c54-b855-446d0b8ded72-vProbe_NC_VNF 0");
+          if (testCase.modifySomeValues) {
+            cy.selectPlatformValue('platform');
+            cy.selectDropdownOptionByText("tenant", "CESAR-100-D-spjg61909");
+          }
+          cy.getElementByDataTestsId('form-set').click();
+
+          //edit vf module
+          editNode("node-c5b26cc1-a66f-4b69-aa23-6abc7c647c88-vprobe_nc_vnf0..VprobeNcVnf..FE_base_module..module-0");
+          if (testCase.modifySomeValues) {
+            cy.getElementByDataTestsId('sdncPreLoad').click();
+          }
+          cy.getElementByDataTestsId('form-set').click();
+
+          // Then...
+          let vnfPath = [
+            "vnfs", "vProbe_NC_VNF 0"
+          ];
+          let vfModule_0Path = [
+            ...vnfPath, "vfModules",
+            "vprobe_nc_vnf0..VprobeNcVnf..FE_base_module..module-0",
+            "vprobe_nc_vnf0..VprobeNcVnf..FE_base_module..module-0ahubg",
+          ];
+
+          assertThatBodyFromDeployRequestEqualsToFile(testCase.modifySomeValues ? [
+            {path: ["instanceName"], value: "different.instance.name"},
+            {path: ["existingNames", "vprobe_nc_service_dg_new_si"], value: undefined},
+            {path: ["existingNames", "different.instance.name"], value: ""},
+
+            {path: [...vnfPath, "platformName"], value: "xxx1,platform"},
+            {path: [...vnfPath, "tenantId"], value: "f2f3830e4c984d45bcd00e1a04158a79"},
+
+            {path: [...vfModule_0Path, "sdncPreLoad"], value: true},
+          ] : []);
+        })
 
-      it('Given a stored template - edit service vnf and vfmodule without changes - deploy request should be without changes', function () {
-
-        loadDrawingBoardWithRecreateMode();
-
-        //open - set edit service
-        cy.openServiceContextMenu()
-        .getElementByDataTestsId("context-menu-header-edit-item").click()
-        .getElementByDataTestsId('form-set').click();
-
-        //open - set edit vnf
-        editNode("node-21ae311e-432f-4c54-b855-446d0b8ded72-vProbe_NC_VNF 0")
-        .getElementByDataTestsId('form-set').click();
-
-        //open - set edit vf
-        editNode("node-c5b26cc1-a66f-4b69-aa23-6abc7c647c88-vprobe_nc_vnf0..VprobeNcVnf..FE_base_module..module-0")
-        .getElementByDataTestsId('form-set').click();
-
-        assertThatBodyFromDeployRequestEqualsToFile();
       });
 
-      });
     });
   });
+});
 
 function loadDrawingBoardWithRecreateMode() {
   const serviceModelId = '6cfeeb18-c2b0-49df-987a-da47493c8e38';
@@ -145,17 +184,24 @@ function assertThatBodyFromDeployRequestEqualsToTemplateFromBackEnd() {
 }
 
 
-function assertThatBodyFromDeployRequestEqualsToFile() {
+function assertThatBodyFromDeployRequestEqualsToFile(deviationFromExpected: { path: PropertyPath, value: any }[] = []) {
   cy.getDrawingBoardDeployBtn().click();
   cy.wait('@expectedPostAsyncInstantiation').then(xhr => {
 
     cy.readFile('../vid-automation/src/test/resources/asyncInstantiation/templates__instance_from_template__set_without_modify1.json').then((expectedResult) => {
+      setDeviationInExpected(expectedResult, deviationFromExpected);
       cy.deepCompare(xhr.request.body, expectedResult);
     });
 
   });
 }
 
+function setDeviationInExpected(expectedResult: any, deviation: { path: PropertyPath; value: any }[]) {
+  for (const caveat of deviation) {
+    _.set(expectedResult, caveat.path, caveat.value);
+  }
+}
+
   //We use this function because the deployService() on drawing-board-header.component class
   // changes rollbackOnFailure value from string type to boolean.
   function convertRollbackOnFailureValueFromStringToBoolean(expectedResult: any) {
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 3caa4e81d..b2d3eb578 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
@@ -39,6 +39,44 @@ describe('Template', () => {
       "serviceModelVersion": "1.0",
       "createdBulkDate": 1525075968000,
       "isRetryEnabled": true
+    },
+    {
+      "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
     }
   ];
 
@@ -65,6 +103,7 @@ describe('Template', () => {
     });
 
     cy.route(Cypress.config('baseUrl') + "/asyncInstantiation**", asyncInstantiation);
+    cy.route(Cypress.config('baseUrl') + "/getuserID", '16807000');
 
     cy.openIframe('/app/ui/#/servicePopup?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd&isCreate=true');
 
@@ -106,9 +145,14 @@ describe('Template', () => {
 
 
     //check load button is disabled
-    cy.getElementByDataTestsId('LoadTemplateButton').should('be.disabled')
+    cy.getElementByDataTestsId('LoadTemplateButton').should('be.disabled');
     cy.getElementByDataTestsId('row-5c2cd8e5-27d0-42e3-85a1-85db5eaba459').click();
-    cy.getElementByDataTestsId('LoadTemplateButton').should('not.be.disabled')
+    cy.getElementByDataTestsId('LoadTemplateButton').should('not.be.disabled');
+
+    //filter by userId
+    cy.get('.member-table-row').should('have.length', 2);
+    cy.getElementByDataTestsId('filterByUserIdTestId').click();
+    cy.get('.member-table-row').should('have.length', 1);
 
   });