* 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.
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.
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,
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
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
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",
\r
populate_popup_vfModule(serviceObject, vfModule, vnf);\r
\r
- if (featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE)) {\r
-\r
- if (DataService.getLoggedInUserId()) {\r
- openVfModuleWithHomingDataModal(COMPONENT.DELETE, vfModule);\r
- }\r
- else {\r
- AaiService.getLoggedInUserID(function (response) {\r
- var userID = response.data;\r
- DataService.setLoggedInUserId(userID);\r
- openVfModuleWithHomingDataModal(COMPONENT.DELETE, vfModule);\r
- });\r
- }\r
+ if (DataService.getLoggedInUserId()) {\r
+ openVfModuleWithHomingDataModal(COMPONENT.DELETE, vfModule);\r
}\r
else {\r
- $scope.$broadcast(COMPONENT.DELETE_RESUME_COMPONENT, {\r
- componentId: COMPONENT.VF_MODULE,\r
- callbackFunction: deleteOrResumeCallback,\r
- dialogMethod: COMPONENT.DELETE\r
+ AaiService.getLoggedInUserID(function (response) {\r
+ var userID = response.data;\r
+ DataService.setLoggedInUserId(userID);\r
+ openVfModuleWithHomingDataModal(COMPONENT.DELETE, vfModule);\r
});\r
}\r
console.log("Removing VF-Module", vfModule);\r
DataService.setVfModuleInstanceName(vfModule.object[FIELD.ID.VF_MODULE_NAME]);\r
setCurrentServiceModelInfoFromScope();\r
\r
- if (featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE)) {\r
-\r
- if (DataService.getLoggedInUserId()) {\r
- openVfModuleWithHomingDataModal(COMPONENT.RESUME, vfModule);\r
- }\r
- else {\r
- AaiService.getLoggedInUserID(function (response) {\r
- var userID = response.data;\r
- DataService.setLoggedInUserId(userID);\r
- openVfModuleWithHomingDataModal(COMPONENT.RESUME, vfModule);\r
- });\r
- }\r
+ if (DataService.getLoggedInUserId()) {\r
+ openVfModuleWithHomingDataModal(COMPONENT.RESUME, vfModule);\r
}\r
else {\r
- $scope.$broadcast(COMPONENT.DELETE_RESUME_COMPONENT, {\r
- componentId: COMPONENT.VF_MODULE,\r
- volumeGroups: vfModule.volumeGroups,\r
- callbackFunction: deleteOrResumeCallback,\r
- dialogMethod: COMPONENT.RESUME\r
+ AaiService.getLoggedInUserID(function (response) {\r
+ var userID = response.data;\r
+ DataService.setLoggedInUserId(userID);\r
+ openVfModuleWithHomingDataModal(COMPONENT.RESUME, vfModule);\r
});\r
}\r
};\r
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,
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();
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();
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
"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,
"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,
"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,
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(()=> {
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');
"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,
"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
"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,
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";
"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
}
},