From 7ac7c4e9d8df491fe1aca6782103592181ef6969 Mon Sep 17 00:00:00 2001
From: Kruthi Bhat <krutbhat@att.com>
Date: Thu, 5 Nov 2020 17:51:25 +0530
Subject: Fix for removing 'Show Audit Info' for individual instance on Drawing
 Board

Issue-ID: VID-917
Change-Id: Ice4bde260e9b2f09fe4178fc704e89efdf6c1da8
Signed-off-by: rachitha.ramappa@att.com
---
 .../integration/iFrames/auditInfo.modal.e2e.ts     |  4 +++
 .../iFrames/viewEditAddNewInstace.e2e.ts           | 33 ++++++++++++++++++++++
 2 files changed, 37 insertions(+)

(limited to 'vid-webpack-master/cypress')

diff --git a/vid-webpack-master/cypress/integration/iFrames/auditInfo.modal.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/auditInfo.modal.e2e.ts
index cd7844ad1..15bde5ceb 100644
--- a/vid-webpack-master/cypress/integration/iFrames/auditInfo.modal.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/auditInfo.modal.e2e.ts
@@ -128,6 +128,7 @@ function getExpectedResult() {
     {
       "requestId": "1fc2ef3b-26f0-4e62-a00a-6a31502d39e2",
       "instanceName": "zrdm54cfmgw01_sup_1",
+      "instanceId":"5fd7eb77-34c6-4cb9-adf7-03297d85e7ed",
       "modelType": "vfModule",
       "instanceType": "createInstance",
       "startTime": "Mon, 24 Aug 2020 22:54:29 GMT",
@@ -138,6 +139,7 @@ function getExpectedResult() {
     {
       "requestId": "a4e43d9e-4813-42e4-94bf-c5c6f22ed0bc",
       "instanceName": "zrdm54cfmgw01_base",
+      "instanceId":"5fd7eb77-34c6-4cb9-adf7-03297d85e9cc",
       "modelType": "vfModule",
       "instanceType": "createInstance",
       "startTime": "Mon, 24 Aug 2020 22:44:42 GMT",
@@ -148,6 +150,7 @@ function getExpectedResult() {
     {
       "requestId": "f1aa7175-c237-4b56-ba64-7cb728a38ff2",
       "instanceName": "zrdm54cfmgw01",
+      "instanceId":"f5c72b2c-8e32-43db-9c42-f2b7901c69d8",
       "modelType": "vnf",
       "instanceType": "createInstance",
       "startTime": "Mon, 24 Aug 2020 22:38:18 GMT",
@@ -158,6 +161,7 @@ function getExpectedResult() {
     {
       "requestId": "7ba7900c-3e51-4d87-b1b4-3c53bdfaaa7d",
       "instanceName": "zrdm54cfmgw01_svc",
+      "instanceId":"de46c407-9f9b-4f2f-b1c3-be1c6599b957",
       "modelType": "service",
       "instanceType": "createInstance",
       "startTime": "Mon, 24 Aug 2020 22:37:53 GMT",
diff --git a/vid-webpack-master/cypress/integration/iFrames/viewEditAddNewInstace.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/viewEditAddNewInstace.e2e.ts
index d4fea70fe..d07d3cc9f 100644
--- a/vid-webpack-master/cypress/integration/iFrames/viewEditAddNewInstace.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/viewEditAddNewInstace.e2e.ts
@@ -112,6 +112,39 @@ describe('View Edit page: Add a second instance', () =>{
 
   });
 
+  it(`Open Audit info modal for the service instance, verify show audit info is not available for individual instance`, () =>{
+    const serviceType = 'Mobility';
+    const subscriberId = 'a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb';
+    const serviceModelId = '82255513-e19f-46e5-bdfb-957c6bf57b82';
+    const serviceInstanceId = 'e6cc1c4f-05f7-49bc-8e86-ac2eb92baaaa';
+
+    cy.initDrawingBoardUserPermission();
+    cy.route(`**/rest/models/services/${serviceModelId}`,
+      'fixture:../support/jsonBuilders/mocks/jsons/add_vnf/add_vnf_model.json')
+    .as('serviceModelAddVnf');
+
+    cy.route(`**/aai_get_service_instance_topology/${subscriberId}/${serviceType}/${serviceInstanceId}`,
+      'fixture:../support/jsonBuilders/mocks/jsons/add_vnf/add_vnf_instance.json')
+    .as('serviceInstanceAddVnf');
+
+    cy.openIframe(`app/ui/#/servicePlanning/EDIT?serviceModelId=${serviceModelId}&subscriberId=${subscriberId}&serviceType=${serviceType}&serviceInstanceId=${serviceInstanceId}`);
+    cy.getElementByDataTestsId('node-c8087818-6f3e-4451-b339-111a1a3e7970-iperf_vnf_2002_by5924 0-menu-btn').click({force: true}).then(() => {
+        cy.getElementByDataTestsId('context-menu-showAuditInfo').should('not.be.visible');
+      
+    });
+    cy.readFile('../vid-automation/src/test/resources/a-la-carte/auditInfoMSOALaCarteNew.json').then((res) => {
+    cy.initAuditInfoMSOALaCarteNew(res);
+    cy.getElementByDataTestsId('openMenuBtn').click({force:true}).then(() => {
+      cy.getElementByDataTestsId('context-menu-header-audit-item').click({force: true}).then(() => {
+
+        cy.setViewportToSmallPopup();
+        })
+    })
+
+    });
+    
+
+  });
 
   function mockAsyncBulkResponse() {
     cy.server().route({
-- 
cgit 1.2.3-korg