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

18 files changed, 38 insertions, 105 deletions

diff --git a/features.properties.md b/features.properties.md
index 20db29813..82d7da8de 100644
--- a/features.properties.md
+++ b/features.properties.md
@@ -71,11 +71,6 @@
     * Delete Macro service
 
  
-* FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE
-
-  Enable soft delete for vf-module in view/edit page for a-la-carte only.
-
-  
 * FLAG_1810_AAI_LOCAL_CACHE
 
   Enables the caching of selected AAI responses.
@@ -190,4 +185,4 @@
   Otherwise, MACRO_SERVICES list in vidConfiguration.js is used to identify if it's a macro service (in ng1 code)
 
 * FLAG_2002_VNF_PLATFORM_MULTI_SELECT
-  When flag is true the platform will appear as a multi select field, if false the platform will be dropdown list.
\ No newline at end of file
+  When flag is true the platform will appear as a multi select field, if false the platform will be dropdown list.
diff --git a/vid-app-common/src/main/java/org/onap/vid/properties/Features.java b/vid-app-common/src/main/java/org/onap/vid/properties/Features.java
index 6a6ac6898..507ebbe2b 100644
--- a/vid-app-common/src/main/java/org/onap/vid/properties/Features.java
+++ b/vid-app-common/src/main/java/org/onap/vid/properties/Features.java
@@ -49,7 +49,6 @@ public enum Features implements Feature {
     FLAG_ENABLE_WEBPACK_MODERN_UI,
     FLAG_1810_CR_LET_SELECTING_COLLECTOR_TYPE_UNCONDITIONALLY,
     FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST,
-    FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE,
     FLAG_1810_AAI_LOCAL_CACHE,
     FLAG_1810_IDENTIFY_SERVICE_FOR_NEW_UI,
     FLAG_1902_NEW_VIEW_EDIT,
diff --git a/vid-app-common/src/main/webapp/WEB-INF/conf/dev.features.properties b/vid-app-common/src/main/webapp/WEB-INF/conf/dev.features.properties
index 7baa08690..a45f6db34 100644
--- a/vid-app-common/src/main/webapp/WEB-INF/conf/dev.features.properties
+++ b/vid-app-common/src/main/webapp/WEB-INF/conf/dev.features.properties
@@ -24,7 +24,6 @@ FLAG_SHIFT_VFMODULE_PARAMS_TO_VNF = true
 FLAG_EXP_ANY_ALACARTE_NEW_INSTANTIATION_UI=false
 FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST=true
 FLAG_1810_CR_LET_SELECTING_COLLECTOR_TYPE_UNCONDITIONALLY=true
-FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE = false
 FLAG_1810_AAI_LOCAL_CACHE = true
 FLAG_1902_NEW_VIEW_EDIT= false
 FLAG_EXP_USE_DEFAULT_HOST_NAME_VERIFIER = false
diff --git a/vid-app-common/src/main/webapp/WEB-INF/conf/onap.features.properties b/vid-app-common/src/main/webapp/WEB-INF/conf/onap.features.properties
index 1f7244c3d..461d63fbc 100644
--- a/vid-app-common/src/main/webapp/WEB-INF/conf/onap.features.properties
+++ b/vid-app-common/src/main/webapp/WEB-INF/conf/onap.features.properties
@@ -9,7 +9,6 @@ FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS = true
 FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS = true
 FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST = true
 FLAG_1810_CR_LET_SELECTING_COLLECTOR_TYPE_UNCONDITIONALLY = true
-FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE = false
 FLAG_1810_AAI_LOCAL_CACHE = true
 FLAG_EXP_USE_DEFAULT_HOST_NAME_VERIFIER = false
 FLAG_HANDLE_SO_WORKFLOWS = true
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js b/vid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js
index 3575c382d..ba9f0f533 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js
@@ -256,7 +256,6 @@ appDS2
       FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS: "FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS",
       FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST: "FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST",
       FLAG_1810_CR_LET_SELECTING_COLLECTOR_TYPE_UNCONDITIONALLY: "FLAG_1810_CR_LET_SELECTING_COLLECTOR_TYPE_UNCONDITIONALLY",
-      FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE: "FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE",
       FLAG_HANDLE_SO_WORKFLOWS: "FLAG_HANDLE_SO_WORKFLOWS",
       FLAG_CREATE_ERROR_REPORTS: "FLAG_CREATE_ERROR_REPORTS",
       FLAG_FLASH_CLOUD_REGION_AND_NF_ROLE_OPTIONAL_SEARCH: "FLAG_FLASH_CLOUD_REGION_AND_NF_ROLE_OPTIONAL_SEARCH",
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js
index 4b6b0f47a..12dd77953 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js
@@ -361,24 +361,14 @@
 

             populate_popup_vfModule(serviceObject, vfModule, vnf);

 

-            if (featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE))  {

-

-                if (DataService.getLoggedInUserId())  {

-                    openVfModuleWithHomingDataModal(COMPONENT.DELETE, vfModule);

-                }

-                else {

-                    AaiService.getLoggedInUserID(function (response) {

-                        var userID = response.data;

-                        DataService.setLoggedInUserId(userID);

-                        openVfModuleWithHomingDataModal(COMPONENT.DELETE, vfModule);

-                    });

-                }

+            if (DataService.getLoggedInUserId())  {

+                openVfModuleWithHomingDataModal(COMPONENT.DELETE, vfModule);

             }

             else {

-                $scope.$broadcast(COMPONENT.DELETE_RESUME_COMPONENT, {

-                    componentId: COMPONENT.VF_MODULE,

-                    callbackFunction: deleteOrResumeCallback,

-                    dialogMethod: COMPONENT.DELETE

+                AaiService.getLoggedInUserID(function (response) {

+                    var userID = response.data;

+                    DataService.setLoggedInUserId(userID);

+                    openVfModuleWithHomingDataModal(COMPONENT.DELETE, vfModule);

                 });

             }

             console.log("Removing VF-Module", vfModule);

@@ -1245,25 +1235,14 @@
             DataService.setVfModuleInstanceName(vfModule.object[FIELD.ID.VF_MODULE_NAME]);

             setCurrentServiceModelInfoFromScope();

 

-            if (featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE))  {

-

-                if (DataService.getLoggedInUserId())  {

-                    openVfModuleWithHomingDataModal(COMPONENT.RESUME, vfModule);

-                }

-                else {

-                    AaiService.getLoggedInUserID(function (response) {

-                        var userID = response.data;

-                        DataService.setLoggedInUserId(userID);

-                        openVfModuleWithHomingDataModal(COMPONENT.RESUME, vfModule);

-                    });

-                }

+            if (DataService.getLoggedInUserId())  {

+                openVfModuleWithHomingDataModal(COMPONENT.RESUME, vfModule);

             }

             else {

-                $scope.$broadcast(COMPONENT.DELETE_RESUME_COMPONENT, {

-                    componentId: COMPONENT.VF_MODULE,

-                    volumeGroups: vfModule.volumeGroups,

-                    callbackFunction: deleteOrResumeCallback,

-                    dialogMethod: COMPONENT.RESUME

+                AaiService.getLoggedInUserID(function (response) {

+                    var userID = response.data;

+                    DataService.setLoggedInUserId(userID);

+                    openVfModuleWithHomingDataModal(COMPONENT.RESUME, vfModule);

                 });

             }

         };

diff --git a/vid-automation/src/main/java/vid/automation/test/infra/Features.java b/vid-automation/src/main/java/vid/automation/test/infra/Features.java
index 208f463d1..ffc09efd4 100644
--- a/vid-automation/src/main/java/vid/automation/test/infra/Features.java
+++ b/vid-automation/src/main/java/vid/automation/test/infra/Features.java
@@ -25,7 +25,6 @@ public enum Features implements Feature {
     FLAG_ENABLE_WEBPACK_MODERN_UI,
     FLAG_1810_CR_LET_SELECTING_COLLECTOR_TYPE_UNCONDITIONALLY,
     FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST,
-    FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE,
     FLAG_1810_AAI_LOCAL_CACHE,
     FLAG_1810_IDENTIFY_SERVICE_FOR_NEW_UI,
     FLAG_1902_NEW_VIEW_EDIT,
diff --git a/vid-automation/src/main/java/vid/automation/test/test/ViewEditServiceInstanceTest.java b/vid-automation/src/main/java/vid/automation/test/test/ViewEditServiceInstanceTest.java
index a24ecb735..cbc28d0b0 100644
--- a/vid-automation/src/main/java/vid/automation/test/test/ViewEditServiceInstanceTest.java
+++ b/vid-automation/src/main/java/vid/automation/test/test/ViewEditServiceInstanceTest.java
@@ -1,42 +1,45 @@
 package vid.automation.test.test;
 
+import static org.apache.logging.log4j.core.util.Assert.isNonEmpty;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.collection.IsEmptyCollection.empty;
+import static org.testng.AssertJUnit.assertEquals;
+import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND;
+
 import com.google.common.collect.ImmutableMap;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import org.hamcrest.MatcherAssert;
 import org.junit.Assert;
 import org.junit.Before;
-import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetNetworkCollectionDetails;
 import org.onap.sdc.ci.tests.utilities.GeneralUIUtils;
+import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetNetworkCollectionDetails;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import vid.automation.test.Constants;
-import vid.automation.test.infra.*;
+import vid.automation.test.infra.Click;
+import vid.automation.test.infra.Exists;
+import vid.automation.test.infra.FeatureTogglingTest;
+import vid.automation.test.infra.Features;
+import vid.automation.test.infra.Get;
+import vid.automation.test.infra.Wait;
 import vid.automation.test.model.User;
 import vid.automation.test.sections.VidBasePage;
 import vid.automation.test.sections.ViewEditPage;
 import vid.automation.test.services.BulkRegistration;
 import vid.automation.test.services.SimulatorApi;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import static org.apache.logging.log4j.core.util.Assert.isNonEmpty;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.collection.IsEmptyCollection.empty;
-import static org.testng.AssertJUnit.assertEquals;
-import static vid.automation.test.infra.Features.FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE;
-import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND;
-
 public class ViewEditServiceInstanceTest extends VidBaseTestCase {
 
     private ViewEditPage viewEditPage = new ViewEditPage();
@@ -115,7 +118,6 @@ public class ViewEditServiceInstanceTest extends VidBaseTestCase {
         deleteInstance(Constants.ViewEdit.DELETE_VF_MODULE_BUTTON_TEST_ID + "aa", Constants.ViewEdit.VF_MODULE_DELETED_SUCCESSFULLY_TEXT);
     }
 
-    @FeatureTogglingTest(value = FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE)
     @Test
     public void softDeleteAndResumeVfModuleInstance_deleteDialogAppears_msoResponseIsOk() {
         SimulatorApi.clearAll();
diff --git a/vid-automation/src/test/resources/features.properties b/vid-automation/src/test/resources/features.properties
index 84522ae2b..1bb1cc6c6 100644
--- a/vid-automation/src/test/resources/features.properties
+++ b/vid-automation/src/test/resources/features.properties
@@ -17,7 +17,6 @@ FLAG_EXP_ANY_ALACARTE_NEW_INSTANTIATION_UI=false
 FLAG_ENABLE_WEBPACK_MODERN_UI = false
 FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST=true
 FLAG_1810_CR_LET_SELECTING_COLLECTOR_TYPE_UNCONDITIONALLY=true
-FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE = true
 FLAG_1810_AAI_LOCAL_CACHE = true
 FLAG_1902_NEW_VIEW_EDIT= false
 FLAG_EXP_USE_DEFAULT_HOST_NAME_VERIFIER = false
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
         }
       },