From 702a8d21d0b45e3494a4d17ae281ab473523b8cc Mon Sep 17 00:00:00 2001 From: Eylon Malin Date: Thu, 28 Nov 2019 16:33:12 +0200 Subject: remove FLAG_DEFAULT_VNF Issue-ID: VID-721 Signed-off-by: Eylon Malin Change-Id: I31b646b4dd5a81c4904a77c0386e27137a76a9fd --- .../java/vid/automation/test/infra/Features.java | 1 - .../test/test/NewServiceInstanceTest.java | 24 +++++++++++----------- ...upDataAndUI__dynamicFieldsEcompNamingFalse.json | 1 - .../src/test/resources/features.properties | 1 - 4 files changed, 12 insertions(+), 15 deletions(-) (limited to 'vid-automation') 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..8f07586d5 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,7 +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, 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..048c09334 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, () -> @@ -555,7 +555,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 +572,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 +589,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 +700,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 +776,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,16 +1143,16 @@ 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) { 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..dd186e9ec 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,7 +4,6 @@ "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, diff --git a/vid-automation/src/test/resources/features.properties b/vid-automation/src/test/resources/features.properties index 1bb1cc6c6..dc258ba22 100644 --- a/vid-automation/src/test/resources/features.properties +++ b/vid-automation/src/test/resources/features.properties @@ -3,7 +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 -- cgit 1.2.3-korg