Merge changes Ia06b7afe,I31b646b4

* changes:
  remove FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD
  remove FLAG_DEFAULT_VNF

30 files changed, 29 insertions, 89 deletions

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 507ebbe2b..5da64653e 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
@@ -36,8 +36,6 @@ public enum Features implements Feature {
     FLAG_UNASSIGN_SERVICE,
     FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS,
     FLAG_SHOW_VERIFY_SERVICE, // AKA POMBA
-    FLAG_DEFAULT_VNF,
-    FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD,
     FLAG_RESTRICTED_SELECT,
     FLAG_5G_IN_NEW_INSTANTIATION_UI,
     FLAG_ASYNC_ALACARTE_VNF,
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 a45f6db34..2a0cb5b88 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
@@ -10,8 +10,6 @@ FLAG_HANDLE_SO_WORKFLOWS = true
 FLAG_CREATE_ERROR_REPORTS = true
 FLAG_SHOW_VERIFY_SERVICE = true
 FLAG_DUPLICATE_VNF = true
-FLAG_DEFAULT_VNF = true
-FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD = true
 FLAG_RESTRICTED_SELECT = false
 FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS = true
 FLAG_A_LA_CARTE_AUDIT_INFO=true
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 461d63fbc..58f677abc 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
@@ -22,8 +22,6 @@ FLAG_ENABLE_WEBPACK_MODERN_UI = false
 FLAG_ASYNC_JOBS = false
 FLAG_NETWORK_TO_ASYNC_INSTANTIATION = false
 FLAG_DUPLICATE_VNF = false
-FLAG_DEFAULT_VNF = false
-FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD = false
 FLAG_SHIFT_VFMODULE_PARAMS_TO_VNF = false
 FLAG_A_LA_CARTE_AUDIT_INFO = false
 FLAG_5G_IN_NEW_INSTANTIATION_UI = false
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 ffc09efd4..cdf30e28d 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
@@ -12,8 +12,6 @@ public enum Features implements Feature {
     FLAG_UNASSIGN_SERVICE,
     FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS,
     FLAG_SHOW_VERIFY_SERVICE,
-    FLAG_DEFAULT_VNF,
-    FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD,
     FLAG_RESTRICTED_SELECT,
     FLAG_5G_IN_NEW_INSTANTIATION_UI,
     FLAG_ASYNC_ALACARTE_VNF,
diff --git a/vid-automation/src/main/java/vid/automation/test/test/NewServiceInstanceTest.java b/vid-automation/src/main/java/vid/automation/test/test/NewServiceInstanceTest.java
index 00a1e6433..2a7c59f01 100644
--- a/vid-automation/src/main/java/vid/automation/test/test/NewServiceInstanceTest.java
+++ b/vid-automation/src/main/java/vid/automation/test/test/NewServiceInstanceTest.java
@@ -239,7 +239,7 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest {
         prepareServicePreset(macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetails, false);
 
         final String serviceInstanceName = createMacroService(serviceData, true);
-        createVnf(serviceData, true, true, serviceInstanceName);
+        createVnf(serviceData, true, serviceInstanceName);
 
         createVfModule(serviceData, serviceInstanceName, false, false);
 
@@ -294,7 +294,7 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest {
         });
 
         doReduxStep(reduxStates, randomAlphabetic, startInStep, reduxForStep, i, mode, () ->
-                createVnf(serviceData, false, true, serviceInstanceName)
+                createVnf(serviceData, false, serviceInstanceName)
         );
 
         final String vnfInstanceName2 = randomAlphabetic + "instanceName";
@@ -302,7 +302,7 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest {
 
         doReduxStep(reduxStates, randomAlphabetic, startInStep, reduxForStep, i, mode, () ->
                 createVnf(new VnfData(vnfName2 + " 0", "afacccf6-397d-45d6-b5ae-94c39734b168", vnfInstanceName2, false),
-                        false, Features.FLAG_DEFAULT_VNF.isActive(), serviceInstanceName)
+                        false, serviceInstanceName)
         );
 
         doReduxStep(reduxStates, randomAlphabetic, startInStep, reduxForStep, i, mode, () ->
@@ -534,11 +534,7 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest {
 
     //@Step("edit vf module and just set name")
     private void editVfModuleAndJustSetName(String vfModuleName, String vfModuleUUID) {
-        if (Features.FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD.isActive()) {
-            hoverAndClickEditButton(vfModuleUUID + "-" + vfModuleName);
-        } else {
-            drawingBoardPage.clickAddButtonByNodeName(vfModuleName);
-        }
+        hoverAndClickEditButton(vfModuleUUID + "-" + vfModuleName);
         Input.text("VF instance name ZERO", "instanceName");
         Click.byTestId(VNF_SET_BUTTON_TEST_ID);
     }
@@ -555,7 +551,7 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest {
         prepareServicePreset(macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetails, false);
 
         final String serviceInstanceName = createMacroService(serviceData, true);
-        createVnf(serviceData, true, true, serviceInstanceName);
+        createVnf(serviceData, true, serviceInstanceName);
         createVfModule(serviceData, serviceInstanceName, true, false);
 
     }
@@ -572,7 +568,7 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest {
         prepareServicePreset(macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetailsVnfEcompNamingFalse, false);
 
         final String serviceInstanceName = createMacroService(serviceData, true);
-        createVnf(serviceData, true, true, serviceInstanceName);
+        createVnf(serviceData, true, serviceInstanceName);
         createVfModule(serviceData, serviceInstanceName, true, false);
 
     }
@@ -589,7 +585,7 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest {
         prepareServicePreset(macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetailsVnfEcompNamingFalse, false);
 
         final String serviceInstanceName = createMacroService(serviceData, true);
-        createVnf(serviceData, true, true, serviceInstanceName);
+        createVnf(serviceData, true, serviceInstanceName);
         clickRemoveVfModule(vfModule0UUID, vfModule0Name);
         createVfModule(serviceData, serviceInstanceName, false, true);
 
@@ -700,7 +696,7 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest {
         loadServicePopup(serviceModelInfo.modelVersionId);
         fillALaCarteServicePopup(serviceInstanceName);
 
-        createVnf(vnfData, false, true, serviceInstanceName);
+        createVnf(vnfData, false, serviceInstanceName);
         createVfModule(serviceData, serviceInstanceName, true, false);
         serviceData.vfData =  new VfData("vocg_1804_vf0..Vocg1804Vf..ocgmgr..module-1", true, 0, 1, emptyList(), "9c219e70-1177-494b-8977-1395c9f9168c", vgName);
         createVfModule(serviceData, serviceInstanceName, false, false);
@@ -776,7 +772,7 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest {
         prepareServicePreset(macroSriovWithDynamicFieldsEcompNamingTruePartialModelDetails, false);
 
         final String serviceInstanceName = createMacroService(serviceData, true);
-        createVnf(serviceData, true, true, serviceInstanceName);
+        createVnf(serviceData, true, serviceInstanceName);
         clickRemoveVfModule(vfModule0UUID, vfModule0Name);
         createVfModule(serviceData, serviceInstanceName, false, false);
 
@@ -1143,23 +1139,23 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest {
     }
 
     //@Step("create vnf")
-    private void createVnf(ServiceData serviceData, boolean tryCancelsAndReentries, boolean addedByDefault, String serviceInstanceName) {
-        createVnf(serviceData.vnfData, tryCancelsAndReentries, addedByDefault, serviceInstanceName);
+    private void createVnf(ServiceData serviceData, boolean tryCancelsAndReentries, String serviceInstanceName) {
+        createVnf(serviceData.vnfData, tryCancelsAndReentries, serviceInstanceName);
     }
 
     private void createNetwork(VnfData vnfData, boolean tryCancelsAndReentries, boolean addedByDefault, String serviceInstanceName) {
         createVnf(vnfData, tryCancelsAndReentries, addedByDefault, serviceInstanceName, true);
     }
 
-    private void createVnf(VnfData vnfData, boolean tryCancelsAndReentries, boolean addedByDefault, String serviceInstanceName) {
-        createVnf(vnfData, tryCancelsAndReentries, addedByDefault, serviceInstanceName, false);
+    private void createVnf(VnfData vnfData, boolean tryCancelsAndReentries, String serviceInstanceName) {
+        createVnf(vnfData, tryCancelsAndReentries, true, serviceInstanceName, false);
     }
 
     private void createVnf(VnfData vnfData, boolean tryCancelsAndReentries, boolean addedByDefault, String serviceInstanceName, boolean isNetwork) {
         BrowseASDCPage browseASDCPage = new BrowseASDCPage();
 
         String nodeToEdit = extractNodeToEdit(vnfData);
-        if (addedByDefault && Features.FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD.isActive()) {
+        if (addedByDefault) {
             hoverAndClickEditButton(nodeToEdit);
         } else {
             drawingBoardPage.clickAddButtonByNodeName(vnfData.vnfName);
@@ -1335,13 +1331,11 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest {
     }
 
     private void clickEditVfModule(ServiceData serviceData) {
-        if (Features.FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD.isActive()) {
-            hoverAndClickEditButton(serviceData.vfData.uuid + "-" + serviceData.vfData.vfName);
-        }
+        hoverAndClickEditButton(serviceData.vfData.uuid + "-" + serviceData.vfData.vfName);
     }
 
     private void clickAddVfModule(ServiceData serviceData, boolean addedByDefault) {
-        if (Features.FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD.isActive() && addedByDefault) {
+        if (addedByDefault) {
             return;
         }
         System.out.println("VFModule should be added 'manually'");
@@ -1356,10 +1350,8 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest {
     }
 
     private void clickRemoveVfModule(String vfModuleId, String vfModuleName) {
-        if (Features.FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD.isActive()) {
-            System.out.println("will remove " + vfModule0Name);
-            hoverAndClickDeleteButton(vfModuleId + "-" + vfModuleName);
-        }
+        System.out.println("will remove " + vfModule0Name);
+        hoverAndClickDeleteButton(vfModuleId + "-" + vfModuleName);
     }
 
     private void assertPauseOnPausePointsVisibility(boolean visibility) {
diff --git a/vid-automation/src/main/resources/NewServiceInstanceTest/createNewServiceInstance_macro_validPopupDataAndUI__dynamicFieldsEcompNamingFalse.json b/vid-automation/src/main/resources/NewServiceInstanceTest/createNewServiceInstance_macro_validPopupDataAndUI__dynamicFieldsEcompNamingFalse.json
index 591603fe0..d8aebc746 100644
--- a/vid-automation/src/main/resources/NewServiceInstanceTest/createNewServiceInstance_macro_validPopupDataAndUI__dynamicFieldsEcompNamingFalse.json
+++ b/vid-automation/src/main/resources/NewServiceInstanceTest/createNewServiceInstance_macro_validPopupDataAndUI__dynamicFieldsEcompNamingFalse.json
@@ -4,14 +4,12 @@
     "flags": {
       "FLAG_NETWORK_TO_ASYNC_INSTANTIATION": false,
       "FLAG_SHOW_ASSIGNMENTS": true,
-      "FLAG_DEFAULT_VNF": true,
       "FLAG_A_LA_CARTE_AUDIT_INFO": true,
       "FLAG_SHOW_VERIFY_SERVICE": true,
       "FLAG_ASYNC_ALACARTE_VFMODULE": false,
       "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
       "FLAG_ASYNC_ALACARTE_VNF": true,
       "FLAG_SERVICE_MODEL_CACHE": true,
-      "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": true,
       "FLAG_SUPPLEMENTARY_FILE": true,
       "FLAG_ADD_MSO_TESTAPI_FIELD": true,
       "FLAG_5G_IN_NEW_INSTANTIATION_UI": true,
diff --git a/vid-automation/src/test/resources/features.properties b/vid-automation/src/test/resources/features.properties
index 1bb1cc6c6..a1a6cf733 100644
--- a/vid-automation/src/test/resources/features.properties
+++ b/vid-automation/src/test/resources/features.properties
@@ -3,8 +3,6 @@ FLAG_NETWORK_TO_ASYNC_INSTANTIATION = false
 FLAG_SERVICE_MODEL_CACHE = true
 FLAG_SHOW_ASSIGNMENTS = true
 FLAG_SHOW_VERIFY_SERVICE = true
-FLAG_DEFAULT_VNF = true
-FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD = true
 FLAG_RESTRICTED_SELECT = false
 FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS = true
 FLAG_A_LA_CARTE_AUDIT_INFO=true
diff --git a/vid-webpack-master/cypress/integration/iFrames/collectionResource.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/collectionResource.e2e.ts
index c4bcaa1a4..55c43d01b 100644
--- a/vid-webpack-master/cypress/integration/iFrames/collectionResource.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/collectionResource.e2e.ts
@@ -1591,7 +1591,6 @@ describe('Drawing board : Collection resource', function () {
           "FLAG_EXP_CREATE_RESOURCES_IN_PARALLEL": false,
           "FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS": true,
           "FLAG_NETWORK_TO_ASYNC_INSTANTIATION": false,
-          "FLAG_DEFAULT_VNF": true,
           "FLAG_ASYNC_ALACARTE_VFMODULE": true,
           "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
           "FLAG_ASYNC_ALACARTE_VNF": true,
@@ -1600,7 +1599,6 @@ describe('Drawing board : Collection resource', function () {
           "FLAG_SERVICE_MODEL_CACHE": true,
           "FLAG_1902_RETRY_JOB": true,
           "FLAG_EXP_ANY_ALACARTE_NEW_INSTANTIATION_UI": true,
-          "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": true,
           "FLAG_1906_AAI_SUB_DETAILS_REDUCE_DEPTH": true,
           "FLAG_VF_MODULE_RESUME_STATUS_CREATE": true,
           "FLAG_SUPPLEMENTARY_FILE": true,
diff --git a/vid-webpack-master/cypress/integration/iFrames/drawingBoard.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/drawingBoard.e2e.ts
index 3d7288b27..db1c086c4 100644
--- a/vid-webpack-master/cypress/integration/iFrames/drawingBoard.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/drawingBoard.e2e.ts
@@ -581,7 +581,6 @@ describe('Drawing board', function () {
           "FLAG_NETWORK_TO_ASYNC_INSTANTIATION": false,
           "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
           "FLAG_SERVICE_MODEL_CACHE": true,
-          "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": false,
           "FLAG_1906_COMPONENT_INFO" : false
         },
         "type": "[FLAGS] Update"
@@ -2209,7 +2208,6 @@ describe('Drawing board', function () {
           "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
           "FLAG_SHOW_VERIFY_SERVICE": false,
           "FLAG_SERVICE_MODEL_CACHE": true,
-          "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": true,
           "FLAG_ADD_MSO_TESTAPI_FIELD": true
         },
         "type": "[FLAGS] Update"
@@ -3860,7 +3858,6 @@ describe('Drawing board', function () {
           "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
           "FLAG_SHOW_VERIFY_SERVICE": false,
           "FLAG_SERVICE_MODEL_CACHE": true,
-          "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": true,
           "FLAG_ADD_MSO_TESTAPI_FIELD": true
         },
         "type": "[FLAGS] Update"
@@ -5603,8 +5600,6 @@ describe('Drawing board', function () {
           "FLAG_SERVICE_MODEL_CACHE": true,
           "FLAG_SHOW_ASSIGNMENTS": true,
           "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
-          "FLAG_DEFAULT_VNF": true,
-          "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": true,
           "FLAG_A_LA_CARTE_AUDIT_INFO": true,
           "FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST": true,
           "FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS": true,
@@ -6295,7 +6290,6 @@ describe('Drawing board', function () {
           "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
           "FLAG_SHOW_VERIFY_SERVICE": false,
           "FLAG_SERVICE_MODEL_CACHE": true,
-          "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": false,
           "FLAG_ADD_MSO_TESTAPI_FIELD": true,
           "FLAG_SUPPLEMENTARY_FILE": true
         },
diff --git a/vid-webpack-master/cypress/integration/iFrames/network.popup.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/network.popup.e2e.ts
index 2f310b4fb..2baab721c 100644
--- a/vid-webpack-master/cypress/integration/iFrames/network.popup.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/network.popup.e2e.ts
@@ -213,7 +213,6 @@ describe('Network popup', function () {
             "FLAG_SHOW_VERIFY_SERVICE": false,
             "FLAG_SERVICE_MODEL_CACHE": true,
             "FLAG_ADVANCED_PORTS_FILTER": true,
-            "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": false,
             "FLAG_REGION_ID_FROM_REMOTE": true,
             "FLAG_ADD_MSO_TESTAPI_FIELD": true
           },
diff --git a/vid-webpack-master/cypress/integration/iFrames/pnf.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/pnf.e2e.ts
index 6f88d8094..7257cbb76 100644
--- a/vid-webpack-master/cypress/integration/iFrames/pnf.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/pnf.e2e.ts
@@ -1452,7 +1452,6 @@ function initDrawingBoardWithFourPnf(serviceModelId: string, pnfName: string) {
           "FLAG_EXP_CREATE_RESOURCES_IN_PARALLEL": false,
           "FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS": true,
           "FLAG_NETWORK_TO_ASYNC_INSTANTIATION": false,
-          "FLAG_DEFAULT_VNF": true,
           "FLAG_ASYNC_ALACARTE_VFMODULE": true,
           "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
           "FLAG_ASYNC_ALACARTE_VNF": true,
@@ -1461,7 +1460,6 @@ function initDrawingBoardWithFourPnf(serviceModelId: string, pnfName: string) {
           "FLAG_SERVICE_MODEL_CACHE": true,
           "FLAG_1902_RETRY_JOB": true,
           "FLAG_EXP_ANY_ALACARTE_NEW_INSTANTIATION_UI": true,
-          "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": true,
           "FLAG_1906_AAI_SUB_DETAILS_REDUCE_DEPTH": true,
           "FLAG_VF_MODULE_RESUME_STATUS_CREATE": true,
           "FLAG_SUPPLEMENTARY_FILE": true,
diff --git a/vid-webpack-master/cypress/integration/iFrames/vnf.popup.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/vnf.popup.e2e.ts
index 7a35491be..5e85dce71 100644
--- a/vid-webpack-master/cypress/integration/iFrames/vnf.popup.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/vnf.popup.e2e.ts
@@ -96,7 +96,6 @@ describe('Vnf popup', function () {
             "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
             "FLAG_SHOW_VERIFY_SERVICE": false,
             "FLAG_SERVICE_MODEL_CACHE": true,
-            "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": false,
             "FLAG_ADD_MSO_TESTAPI_FIELD": true
           },
           "type": "[FLAGS] Update"
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 0c7bf5e65..85e091742 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
@@ -5,8 +5,6 @@
   "FLAG_SERVICE_MODEL_CACHE": false,
   "FLAG_SHOW_ASSIGNMENTS": true,
   "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
-  "FLAG_DEFAULT_VNF": true,
-  "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": true,
   "FLAG_A_LA_CARTE_AUDIT_INFO": true,
   "FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST": true,
   "FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS": true,
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/available-models-tree/available-models-tree.component.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/available-models-tree/available-models-tree.component.ts
index b5c9598dd..fb1172945 100644
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/available-models-tree/available-models-tree.component.ts
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/available-models-tree/available-models-tree.component.ts
@@ -150,7 +150,7 @@ export class AvailableModelsTreeComponent {
     let isAlaCarte: boolean = Utils.isALaCarte(this.serviceHierarchy.service.vidNotions.instantiationType);
     let isEcompGeneratedNaming: boolean = data.isEcompGeneratedNaming;
     let type: string = data.type;
-    if (!this.store.getState().global.flags['FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD'] || node.data.type === ServiceNodeTypes.VF ||
+    if (node.data.type === ServiceNodeTypes.VF ||
       this._availableModelsTreeService.shouldOpenDialog(type, dynamicInputs, isEcompGeneratedNaming)) {
       this._iframeService.addClassOpenModal(this.parentElementClassName);
       node.data.onAddClick(node, serviceId);
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 b3ea99e0e..6ad640317 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
@@ -94,8 +94,6 @@ describe('Network step service', () => {
           "FLAG_SHOW_ASSIGNMENTS": true,
           "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
           "FLAG_DUPLICATE_VNF": true,
-          "FLAG_DEFAULT_VNF": true,
-          "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": true,
           "FLAG_A_LA_CARTE_AUDIT_INFO": true,
           "FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST": true,
           "FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS": 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 4efb18bc3..b330b72dc 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
@@ -473,8 +473,6 @@ function getStore() {
         "FLAG_SERVICE_MODEL_CACHE": true,
         "FLAG_SHOW_ASSIGNMENTS": true,
         "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
-        "FLAG_DEFAULT_VNF": true,
-        "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": true,
         "FLAG_A_LA_CARTE_AUDIT_INFO": true,
         "FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST": true,
         "FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS": true,
diff --git a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/networkGenerator/network.control.generator.spec.ts b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/networkGenerator/network.control.generator.spec.ts
index 14d14668a..0bb278a8e 100644
--- a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/networkGenerator/network.control.generator.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/networkGenerator/network.control.generator.spec.ts
@@ -7,11 +7,7 @@ import {GenericFormService} from "../../generic-form.service";
 import {FormBuilder} from "@angular/forms";
 import {LogService} from "../../../../utils/log/log.service";
 import {FormControlNames, NetworkControlGenerator} from "./network.control.generator";
-import {
-  FormControlModel,
-  ValidatorModel,
-  ValidatorOptions
-} from "../../../../models/formControlModels/formControl.model";
+import {FormControlModel, ValidatorModel, ValidatorOptions} from "../../../../models/formControlModels/formControl.model";
 import {FeatureFlagsService} from "../../../../services/featureFlag/feature-flags.service";
 
 class MockAppStore<T> {
@@ -25,7 +21,6 @@ class MockAppStore<T> {
       "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
       "FLAG_SHOW_VERIFY_SERVICE": false,
       "FLAG_SERVICE_MODEL_CACHE": true,
-      "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": false,
       "FLAG_ADD_MSO_TESTAPI_FIELD": true
     },
     "type": "[FLAGS] Update"
diff --git a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/service.control.generator.spec.ts b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/service.control.generator.spec.ts
index f644a7c7e..6bcec09c4 100644
--- a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/service.control.generator.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/service.control.generator.spec.ts
@@ -25,7 +25,6 @@ class MockAppStore<T> {
           "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
           "FLAG_SHOW_VERIFY_SERVICE": false,
           "FLAG_SERVICE_MODEL_CACHE": true,
-          "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": false,
           "FLAG_ADD_MSO_TESTAPI_FIELD": true
         },
         "type": "[FLAGS] Update"
diff --git a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vfModuleGenerator/vfModule.control.generator.spec.ts b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vfModuleGenerator/vfModule.control.generator.spec.ts
index 28c92f565..deb1a784a 100644
--- a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vfModuleGenerator/vfModule.control.generator.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vfModuleGenerator/vfModule.control.generator.spec.ts
@@ -6,11 +6,7 @@ import {AaiService} from "../../../../services/aaiService/aai.service";
 import {GenericFormService} from "../../generic-form.service";
 import {FormBuilder} from "@angular/forms";
 import {LogService} from "../../../../utils/log/log.service";
-import {
-  FormControlModel,
-  ValidatorModel,
-  ValidatorOptions
-} from "../../../../models/formControlModels/formControl.model";
+import {FormControlModel, ValidatorModel, ValidatorOptions} from "../../../../models/formControlModels/formControl.model";
 import {FormControlNames, VfModuleControlGenerator} from "./vfModule.control.generator";
 import {FeatureFlagsService} from "../../../../services/featureFlag/feature-flags.service";
 import {VfModuleInstance} from "../../../../models/vfModuleInstance";
@@ -27,7 +23,6 @@ class MockAppStore<T> {
           "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
           "FLAG_SHOW_VERIFY_SERVICE": false,
           "FLAG_SERVICE_MODEL_CACHE": true,
-          "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": false,
           "FLAG_ADD_MSO_TESTAPI_FIELD": true
         },
         "type": "[FLAGS] Update"
diff --git a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vnfGenerator/vnf.control.generator.spec.ts b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vnfGenerator/vnf.control.generator.spec.ts
index 9230ccfa7..9782f0ee3 100644
--- a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vnfGenerator/vnf.control.generator.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vnfGenerator/vnf.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 {VnfControlGenerator} from "./vnf.control.generator";
 import {Observable} from "rxjs";
@@ -29,7 +25,6 @@ class MockAppStore<T> {
           "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
           "FLAG_SHOW_VERIFY_SERVICE": false,
           "FLAG_SERVICE_MODEL_CACHE": true,
-          "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": false,
           "FLAG_ADD_MSO_TESTAPI_FIELD": true
         },
         "type": "[FLAGS] Update"
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 cb99184e6..81cfd9614 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
@@ -26,8 +26,6 @@ class MockAppStore<T> {
           "FLAG_SERVICE_MODEL_CACHE": false,
           "FLAG_SHOW_ASSIGNMENTS": true,
           "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
-          "FLAG_DEFAULT_VNF": true,
-          "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": true,
           "FLAG_A_LA_CARTE_AUDIT_INFO": true,
           "FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST": true,
           "FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS": true,
diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/generic-form-popup.service.spec.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/generic-form-popup.service.spec.ts
index a36ed9c4c..63c980cd5 100644
--- a/vid-webpack-master/src/app/shared/components/genericFormPopup/generic-form-popup.service.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/generic-form-popup.service.spec.ts
@@ -33,7 +33,6 @@ class MockAppStore<T>{
           "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
           "FLAG_SHOW_VERIFY_SERVICE": false,
           "FLAG_SERVICE_MODEL_CACHE": true,
-          "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": false,
           "FLAG_ADD_MSO_TESTAPI_FIELD": true
         },
         "type": "[FLAGS] Update"
diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/basic.popup.service.spec.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/basic.popup.service.spec.ts
index c2024afe2..f5e07e7e5 100644
--- a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/basic.popup.service.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/basic.popup.service.spec.ts
@@ -33,7 +33,7 @@ class MockReduxStore<T> {
           "FLAG_SHOW_VERIFY_SERVICE": false,
           "FLAG_SERVICE_MODEL_CACHE": true,
           "FLAG_ADVANCED_PORTS_FILTER": true,
-          "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": false,
+          MERGE_OBJECT_BY_PATH
           "FLAG_REGION_ID_FROM_REMOTE": true,
           "FLAG_ADD_MSO_TESTAPI_FIELD": true
         },
diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/network/network.popup.service.spec.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/network/network.popup.service.spec.ts
index 6c20beccc..2a0a4c47e 100644
--- a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/network/network.popup.service.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/network/network.popup.service.spec.ts
@@ -30,7 +30,7 @@ class MockReduxStore<T> {
           "FLAG_SHOW_VERIFY_SERVICE": false,
           "FLAG_SERVICE_MODEL_CACHE": true,
           "FLAG_ADVANCED_PORTS_FILTER": true,
-          "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": false,
+          MERGE_OBJECT_BY_PATH
           "FLAG_REGION_ID_FROM_REMOTE": true,
           "FLAG_ADD_MSO_TESTAPI_FIELD": true
         },
diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/service/service.popup.service.spec.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/service/service.popup.service.spec.ts
index f1e3af006..ccfaacd0d 100644
--- a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/service/service.popup.service.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/service/service.popup.service.spec.ts
@@ -31,7 +31,6 @@ class MockReduxStore<T> {
           "FLAG_SHOW_VERIFY_SERVICE": false,
           "FLAG_SERVICE_MODEL_CACHE": true,
           "FLAG_ADVANCED_PORTS_FILTER": true,
-          "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": false,
           "FLAG_REGION_ID_FROM_REMOTE": true,
           "FLAG_ADD_MSO_TESTAPI_FIELD": true
         },
diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/service/service.popup.service.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/service/service.popup.service.ts
index 757536d13..e2033aa74 100644
--- a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/service/service.popup.service.ts
+++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/service/service.popup.service.ts
@@ -164,7 +164,7 @@ export class ServicePopupService implements GenericPopupInterface {
       this._store.dispatch(updateServiceInstance(formValues, serviceModel.modelVersionId));
     }
 
-    if (this._store.getState().global.flags['FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD'] && isCreateMode) {
+    if (isCreateMode) {
       this._defaultDataGeneratorService.updateReduxOnFirstSet(serviceModel.modelVersionId, formValues);
     }
   };
diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popuop.service.spec.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popuop.service.spec.ts
index 296db3469..6c487102f 100644
--- a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popuop.service.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popuop.service.spec.ts
@@ -30,7 +30,6 @@ class MockReduxStore<T> {
           "FLAG_SHOW_VERIFY_SERVICE": false,
           "FLAG_SERVICE_MODEL_CACHE": true,
           "FLAG_ADVANCED_PORTS_FILTER": true,
-          "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": false,
           "FLAG_REGION_ID_FROM_REMOTE": true,
           "FLAG_ADD_MSO_TESTAPI_FIELD": true
         },
diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vnf/vnf.popup.service.spec.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vnf/vnf.popup.service.spec.ts
index 5f0347350..8c90655d7 100644
--- a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vnf/vnf.popup.service.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vnf/vnf.popup.service.spec.ts
@@ -30,7 +30,7 @@ class MockReduxStore<T> {
           "FLAG_SHOW_VERIFY_SERVICE": false,
           "FLAG_SERVICE_MODEL_CACHE": true,
           "FLAG_ADVANCED_PORTS_FILTER": true,
-          "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": false,
+          MERGE_OBJECT_BY_PATH
           "FLAG_REGION_ID_FROM_REMOTE": true,
           "FLAG_ADD_MSO_TESTAPI_FIELD": true
         },
diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vnfGroup/vnfGroup.popup.service.spec.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vnfGroup/vnfGroup.popup.service.spec.ts
index f0d50fd18..3a81e5b2b 100644
--- a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vnfGroup/vnfGroup.popup.service.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vnfGroup/vnfGroup.popup.service.spec.ts
@@ -30,7 +30,6 @@ class MockReduxStore<T> {
           "FLAG_SHOW_VERIFY_SERVICE": false,
           "FLAG_SERVICE_MODEL_CACHE": true,
           "FLAG_ADVANCED_PORTS_FILTER": true,
-          "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": false,
           "FLAG_REGION_ID_FROM_REMOTE": true,
           "FLAG_ADD_MSO_TESTAPI_FIELD": true
         },
diff --git a/vid-webpack-master/src/app/shared/services/defaultDataServiceGenerator/default.data.generator.service.ts b/vid-webpack-master/src/app/shared/services/defaultDataServiceGenerator/default.data.generator.service.ts
index 3046b332a..a3cb475a0 100644
--- a/vid-webpack-master/src/app/shared/services/defaultDataServiceGenerator/default.data.generator.service.ts
+++ b/vid-webpack-master/src/app/shared/services/defaultDataServiceGenerator/default.data.generator.service.ts
@@ -186,7 +186,7 @@ export class DefaultDataGeneratorService {
       for (let networkUUID in serviceHierarchy.networks) {
         const isEcompGeneratedNaming = this.getIsEcompGeneratedNaming(serviceHierarchy.networks[networkUUID]);
         let min_vnf_instances_greater_than_0 = serviceHierarchy.networks[networkUUID].properties['min_instances'] && serviceHierarchy.networks[networkUUID].properties['min_instances'] > 0;
-        if(this.store.getState().global.flags['FLAG_DEFAULT_VNF'] &&  min_vnf_instances_greater_than_0)
+        if(min_vnf_instances_greater_than_0)
         {
           this.createNetworkInstanceReduxIfNotExist(
             serviceId,
@@ -203,7 +203,7 @@ export class DefaultDataGeneratorService {
       for (let vnfGroupUUID in serviceHierarchy.vnfGroups) {
         const isEcompGeneratedNaming = this.getIsEcompGeneratedNaming(serviceHierarchy.vnfGroups[vnfGroupUUID]);
         let min_vnf_group_instances_greater_than_0 = serviceHierarchy.vnfGroups[vnfGroupUUID].properties['min_instances'] && serviceHierarchy.vnfGroups[vnfGroupUUID].properties['min_instances'] > 0;
-        if(this.store.getState().global.flags['FLAG_DEFAULT_VNF'] &&  min_vnf_group_instances_greater_than_0)
+        if(min_vnf_group_instances_greater_than_0)
         {
           this.createVnfGroupInstanceReduxIfNotExist(
             serviceId,
@@ -244,7 +244,7 @@ export class DefaultDataGeneratorService {
         }
 
         let min_vnf_instances_greater_than_0 = serviceHierarchy.vnfs[vnfUUID].properties['min_instances'] && serviceHierarchy.vnfs[vnfUUID].properties['min_instances'] > 0;
-        if(this.store.getState().global.flags['FLAG_DEFAULT_VNF'] &&  min_vnf_instances_greater_than_0)
+        if(min_vnf_instances_greater_than_0)
         {
           this.createVNFInstanceReduxIfNotExist(
             serviceId,