remove FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE

Issue-ID: VID-721
Signed-off-by: Eylon Malin <eylon.malin@intl.att.com>
Change-Id: I80e3f8edbc187acaf13fdcc089ba15da33dc0ec5

9 files changed, 2 insertions, 39 deletions

diff --git a/vid-webpack-master/cypress/integration/iFrames/collectionResource.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/collectionResource.e2e.ts
index 25c2fbbfa..c4bcaa1a4 100644
--- a/vid-webpack-master/cypress/integration/iFrames/collectionResource.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/collectionResource.e2e.ts
@@ -1592,7 +1592,6 @@ describe('Drawing board : Collection resource', function () {
           "FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS": true,
           "FLAG_NETWORK_TO_ASYNC_INSTANTIATION": false,
           "FLAG_DEFAULT_VNF": true,
-          "FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE": true,
           "FLAG_ASYNC_ALACARTE_VFMODULE": true,
           "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
           "FLAG_ASYNC_ALACARTE_VNF": true,
diff --git a/vid-webpack-master/cypress/integration/iFrames/drawingBoard.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/drawingBoard.e2e.ts
index 33829fbfe..3d7288b27 100644
--- a/vid-webpack-master/cypress/integration/iFrames/drawingBoard.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/drawingBoard.e2e.ts
@@ -5608,7 +5608,6 @@ describe('Drawing board', function () {
           "FLAG_A_LA_CARTE_AUDIT_INFO": true,
           "FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST": true,
           "FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS": true,
-          "FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE": false,
           "FLAG_1902_NEW_VIEW_EDIT": false,
           "FLAG_1810_IDENTIFY_SERVICE_FOR_NEW_UI": false,
           "FLAG_1902_VNF_GROUPING": false,
diff --git a/vid-webpack-master/cypress/integration/iFrames/pnf.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/pnf.e2e.ts
index 0a17fc907..6f88d8094 100644
--- a/vid-webpack-master/cypress/integration/iFrames/pnf.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/pnf.e2e.ts
@@ -1453,7 +1453,6 @@ function initDrawingBoardWithFourPnf(serviceModelId: string, pnfName: string) {
           "FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS": true,
           "FLAG_NETWORK_TO_ASYNC_INSTANTIATION": false,
           "FLAG_DEFAULT_VNF": true,
-          "FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE": true,
           "FLAG_ASYNC_ALACARTE_VFMODULE": true,
           "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
           "FLAG_ASYNC_ALACARTE_VNF": true,
diff --git a/vid-webpack-master/cypress/integration/iFrames/resume.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/resume.e2e.ts
index 2d4d631b3..ab13f92fe 100644
--- a/vid-webpack-master/cypress/integration/iFrames/resume.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/resume.e2e.ts
@@ -67,38 +67,13 @@ describe('Resume tests', function () {
       cy.screenshot();
     });
 
-    it(`Resume Defect 710619 - with flag FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE is ON`, function () {
+    it(`Resume Defect 710619`, function () {
       cy.visit('/serviceModels.htm#/instantiate?subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&subscriberName=SILVIA ROBBINS&serviceType=TYLER%20SILVIA&serviceInstanceId=dedd680f-f3bd-46d8-97c7-b6fc28db9317&aaiModelVersionId=4b60252a-bf6c-40df-9db5-98b4c363fdf4&isPermitted=true').then(()=>{
         cy.wait('@service-complexService');
         checkResumeAndPopup("dpa2bccfx5992v_base_module","vfModuleTreeNode-assigned");
       });
      });
 
-    it(`Resume Defect 710619 - with flag FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE is OFF`, function () {
-
-      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/flags.cypress.json').then((res) => {
-        cy.server()
-          .route({
-            method: 'GET',
-            delay :  0,
-            status :  200,
-            url : Cypress.config('baseUrl') + "/flags**",
-            response : {
-              "FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST" : true,
-              "FLAG_ADD_MSO_TESTAPI_FIELD": true,
-              "FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE": false
-            }
-          }).as('initFlags');
-      });
-
-      cy.visit('/serviceModels.htm#/instantiate?subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&subscriberName=SILVIA ROBBINS&serviceType=TYLER%20SILVIA&serviceInstanceId=dedd680f-f3bd-46d8-97c7-b6fc28db9317&aaiModelVersionId=4b60252a-bf6c-40df-9db5-98b4c363fdf4&isPermitted=true');
-      cy.wait('@service-complexService');
-
-      checkResumeAndPopup("dpa2bccfx5992v_base_module","vfModuleTreeNode-assigned");
-
-    });
-
-
     function checkResumeAndPopup(vfModuleName:string, vfModuleClassName:string)  {
       cy.get('div').find('.' + vfModuleClassName)
         .getElementByDataTestsId('resumeVFModuleButton-' + vfModuleName).click().then(()=> {
diff --git a/vid-webpack-master/cypress/integration/iFrames/softDeleteAndResume.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/softDeleteAndResume.e2e.ts
index ef1db6864..f390488a6 100644
--- a/vid-webpack-master/cypress/integration/iFrames/softDeleteAndResume.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/softDeleteAndResume.e2e.ts
@@ -83,7 +83,6 @@ describe('Soft delete tests', function () {
             status :  200,
             url : Cypress.config('baseUrl') + "/flags**",
             response : {
-              "FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE": true,
               "FLAG_VF_MODULE_RESUME_STATUS_CREATE": false
             }
           }).as('initFlags');
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/flags.cypress.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/flags.cypress.json
index 53038ed4e..0c7bf5e65 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/flags.cypress.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/flags.cypress.json
@@ -10,7 +10,6 @@
   "FLAG_A_LA_CARTE_AUDIT_INFO": true,
   "FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST": true,
   "FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS": true,
-  "FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE": true,
   "FLAG_1902_NEW_VIEW_EDIT": true,
   "FLAG_VF_MODULE_RESUME_STATUS_CREATE": true,
   "FLAG_1906_COMPONENT_INFO": true,
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vrf/vrfModal/networkStep/network.step.service.spec.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vrf/vrfModal/networkStep/network.step.service.spec.ts
index 5d502c2da..b3ea99e0e 100644
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vrf/vrfModal/networkStep/network.step.service.spec.ts
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vrf/vrfModal/networkStep/network.step.service.spec.ts
@@ -99,7 +99,6 @@ describe('Network step service', () => {
           "FLAG_A_LA_CARTE_AUDIT_INFO": true,
           "FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST": true,
           "FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS": true,
-          "FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE": true,
           "FLAG_1902_NEW_VIEW_EDIT": true,
           "FLAG_VF_MODULE_RESUME_STATUS_CREATE": true,
           "FLAG_1906_COMPONENT_INFO": true
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.spec.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.spec.ts
index 53854ac7b..4efb18bc3 100644
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.spec.ts
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.spec.ts
@@ -478,7 +478,6 @@ function getStore() {
         "FLAG_A_LA_CARTE_AUDIT_INFO": true,
         "FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST": true,
         "FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS": true,
-        "FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE": true,
         "FLAG_1902_NEW_VIEW_EDIT": true,
         "FLAG_1810_IDENTIFY_SERVICE_FOR_NEW_UI": false,
         "FLAG_1902_VNF_GROUPING": true,
diff --git a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vnfGroupGenerator/vnfGroup.control.generator.spec.ts b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vnfGroupGenerator/vnfGroup.control.generator.spec.ts
index 49f1aa3ae..cb99184e6 100644
--- a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vnfGroupGenerator/vnfGroup.control.generator.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vnfGroupGenerator/vnfGroup.control.generator.spec.ts
@@ -6,11 +6,7 @@ import {BasicControlGenerator} from "../basic.control.generator";
 import {AaiService} from "../../../../services/aaiService/aai.service";
 import {GenericFormService} from "../../generic-form.service";
 import {FormBuilder} from "@angular/forms";
-import {
-  FormControlModel,
-  ValidatorModel,
-  ValidatorOptions
-} from "../../../../models/formControlModels/formControl.model";
+import {FormControlModel, ValidatorModel, ValidatorOptions} from "../../../../models/formControlModels/formControl.model";
 import {LogService} from "../../../../utils/log/log.service";
 import {VnfGroupControlGenerator} from "./vnfGroup.control.generator";
 import {Observable} from "rxjs";
@@ -35,7 +31,6 @@ class MockAppStore<T> {
           "FLAG_A_LA_CARTE_AUDIT_INFO": true,
           "FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST": true,
           "FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS": true,
-          "FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE": true,
           "FLAG_1902_NEW_VIEW_EDIT": true
         }
       },