diff options
Diffstat (limited to 'vid-automation/src/main/java/vid/automation/test/test/ViewEditWithDrawingBoardTest.java')
| -rw-r--r-- | vid-automation/src/main/java/vid/automation/test/test/ViewEditWithDrawingBoardTest.java | 221 |
1 files changed, 143 insertions, 78 deletions
diff --git a/vid-automation/src/main/java/vid/automation/test/test/ViewEditWithDrawingBoardTest.java b/vid-automation/src/main/java/vid/automation/test/test/ViewEditWithDrawingBoardTest.java index 724e68065..76cc7a44b 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/ViewEditWithDrawingBoardTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/ViewEditWithDrawingBoardTest.java @@ -1,80 +1,77 @@ package vid.automation.test.test; -import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.SERVICE_NAME; -import static org.testng.AssertJUnit.assertTrue; -import static vid.automation.test.infra.ModelInfo.aLaCarteVnfGroupingService; -import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND; -import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET; -import static vid.automation.test.services.SimulatorApi.registerExpectationFromPresets; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMultimap; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.UUID; -import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset; -import org.onap.simulator.presetGenerator.presets.aai.PresetAAIFilterServiceInstanceById; -import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetServicesGet; -import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubDetailsGetSpecificService; -import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubDetailsWithoutInstancesGetSpecificService; -import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; -import org.onap.simulator.presetGenerator.presets.aai.PresetAAIModelsByInvariantIdGet; -import org.onap.simulator.presetGenerator.presets.aai.PresetAAIStandardQueryGet; +import org.onap.simulator.presetGenerator.presets.aai.*; import org.onap.simulator.presetGenerator.presets.ecompportal_att.PresetGetSessionSlotCheckIntervalGet; -import org.onap.simulator.presetGenerator.presets.mso.PresetMSOAddOrRemoveOneInstanceGroupMember; -import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService; -import org.onap.simulator.presetGenerator.presets.mso.PresetMSODeleteInstanceGroup; -import org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet; -import org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames; +import org.onap.simulator.presetGenerator.presets.mso.*; import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceMetadataGet; import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceToscaModelGet; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.testng.annotations.Test; import vid.automation.test.Constants; +import vid.automation.test.infra.Click; import vid.automation.test.infra.FeatureTogglingTest; import vid.automation.test.infra.Features; -import vid.automation.test.infra.Wait; +import vid.automation.test.infra.ModelInfo; import vid.automation.test.sections.DrawingBoardPage; -import vid.automation.test.sections.VidBasePage; import vid.automation.test.services.SimulatorApi; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIStandardQueryGet.defaultPlacement; +import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.SERVICE_NAME; +import static vid.automation.test.Constants.DrawingBoard.CONTEXT_MENU_BUTTON_HEADER; +import static vid.automation.test.Constants.DrawingBoard.CONTEXT_MENU_HEADER_RESUME_ITEM; +import static vid.automation.test.infra.ModelInfo.aLaCarteVnfGroupingService; +import static vid.automation.test.infra.ModelInfo.collectionResourceForResume; +import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET; +import static vid.automation.test.services.SimulatorApi.registerExpectationFromPresets; + public class ViewEditWithDrawingBoardTest extends VidBaseTestCase { - private final String RELATED_VNF_UUID1 = "a9f1b136-11ed-471f-8d77-f123c7501a01"; - private final String RELATED_VNF_UUID2 = "963b67e1-079a-404e-abef-b745d770bd85"; - private final String RELATED_VNF_UUID3 = "5a34a4f4-81a4-4eed-871b-f0b1187160d4"; + private static final String MSO_COMPLETE_STATUS = "COMPLETE"; private static final String COMPLETED = "COMPLETED"; private String vnfGroupInstanceId; - private String vnfGroupInstanceName; - private String serviceInstanceName; - private String serviceInstanceId = "b9af7c1d-a2d7-4370-b747-1b266849ad32"; - String subscriberId = "e433710f-9217-458d-a79d-1c7aff376d89"; - String serviceType = "TYLER SILVIA"; - String serviceReqId = "3cf5ea96-6b34-4945-b5b1-4a7798b1caf2"; + private String serviceInstanceToDeleteName; + private String vnf1Name; + private String subscriberId = "e433710f-9217-458d-a79d-1c7aff376d89"; + private String serviceType = "TYLER SILVIA"; + private String serviceInstanceToResumeName; @FeatureTogglingTest(Features.FLAG_1902_VNF_GROUPING) @Test public void testDeleteVnfGroupWithMembers() { - String vnf1Name = registerServiceInstanceTopologyExpectationOnAAIAndGetVnf1Name(); - final ImmutableMap<PresetMSOServiceInstanceGen2WithNames.Keys, String> names = ImmutableMap.of(SERVICE_NAME, serviceInstanceName); - - - List<BasePreset> presets = ImmutableList.of( - new PresetAAIGetSubscribersGet(), - new PresetAAIGetServicesGet(), - new PresetAAIFilterServiceInstanceById(subscriberId, serviceType, serviceInstanceId), - new PresetAAIGetSubDetailsGetSpecificService(subscriberId, serviceType, "Active", aLaCarteVnfGroupingService, serviceInstanceId), - new PresetAAIGetSubDetailsWithoutInstancesGetSpecificService(subscriberId, serviceType), - new PresetSDCGetServiceMetadataGet(aLaCarteVnfGroupingService), - new PresetSDCGetServiceToscaModelGet(aLaCarteVnfGroupingService), - new PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService(names, 0, serviceReqId) + String serviceInstanceId = "b9af7c1d-a2d7-4370-b747-1b266849ad32"; + String serviceReqId = "3cf5ea96-6b34-4945-b5b1-4a7798b1caf2"; + + //createPresetsForServiceInstanceTopologyExpectationOnAAIAndGetVnf1Name init serviceInstanceToDeleteName + final List<BasePreset> presetsForGetTopology = createPresetsForServiceInstanceTopologyExpectationOnAAIAndGetVnf1Name(serviceInstanceId); + final ImmutableMap<PresetMSOServiceInstanceGen2WithNames.Keys, String> names = ImmutableMap.of(SERVICE_NAME, serviceInstanceToDeleteName); + SimulatorApi.registerExpectationFromPresetsCollections(ImmutableList.of( + presetsForSearchAndEdit(aLaCarteVnfGroupingService, subscriberId, serviceType, serviceInstanceId), + presetsForGetTopology, + ImmutableList.of( + new PresetAAIModelsByInvariantIdGet(ImmutableList.of(aLaCarteVnfGroupingService.modelInvariantId)), + new PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService(names, 0, serviceReqId) + ) + ), + CLEAR_THEN_SET); + + registerMsoPresetForRemoveInstanceGroupMember(); + searchEditAndWaitForCompletion( + serviceInstanceId, + serviceInstanceToDeleteName, + () -> hoverAndClickMenuByName(vnf1Name, "daeb6568-cef8-417f-9075-ed259ce59f48-groupingservicefortest..ResourceInstanceGroup..0", Constants.InstantiationStatus.CONTEXT_MENU_DELETE) ); + } - SimulatorApi.registerExpectationFromPresets(presets, APPEND); - registerMsoPreset(); + protected void searchEditAndWaitForCompletion(String serviceInstanceId, String serviceInstanceName, Runnable action) { GeneralUIUtils.ultimateWait(); goToExistingInstanceById(serviceInstanceId); GeneralUIUtils.ultimateWait(); @@ -82,23 +79,14 @@ public class ViewEditWithDrawingBoardTest extends VidBaseTestCase { DrawingBoardPage drawingBoardPage = new DrawingBoardPage(); drawingBoardPage.goToIframe(); GeneralUIUtils.ultimateWait(); - hoverAndClickMenuByName(vnf1Name, "daeb6568-cef8-417f-9075-ed259ce59f48-groupingservicefortest..ResourceInstanceGroup..0", Constants.InstantiationStatus.CONTEXT_MENU_DELETE); - GeneralUIUtils.ultimateWait(); - drawingBoardPage.clickDeployButton(); - - - VidBasePage.goOutFromIframe(); - GeneralUIUtils.ultimateWait(); - drawingBoardPage.goToIframe(); + action.run(); GeneralUIUtils.ultimateWait(); - - DrawingBoardPage.ServiceStatusChecker serviceStatusChecker = new DrawingBoardPage.ServiceStatusChecker(serviceInstanceName, Collections.singleton(COMPLETED)); - boolean statusIsShown = Wait.waitFor(serviceStatusChecker, null, 10, 1); - assertTrue("Service "+serviceInstanceName+" wasn't completed after in time", statusIsShown); - + drawingBoardPage.screenshotDeployDialog(serviceInstanceId); + drawingBoardPage.deploy(); + drawingBoardPage.verifyServiceCompletedOnTime(serviceInstanceName, "Service " + serviceInstanceName); } - public void registerMsoPreset(){ + public void registerMsoPresetForRemoveInstanceGroupMember() { String vnfGroupRequestId = UUID.randomUUID().toString(); String firstMemberRequestId = UUID.randomUUID().toString(); String secondMemberRequestId = UUID.randomUUID().toString(); @@ -129,18 +117,23 @@ public class ViewEditWithDrawingBoardTest extends VidBaseTestCase { } - public String registerServiceInstanceTopologyExpectationOnAAIAndGetVnf1Name() { + public List<BasePreset> createPresetsForServiceInstanceTopologyExpectationOnAAIAndGetVnf1Name(String serviceInstanceId) { + + final String RELATED_VNF_UUID1 = "a9f1b136-11ed-471f-8d77-f123c7501a01"; + final String RELATED_VNF_UUID2 = "963b67e1-079a-404e-abef-b745d770bd85"; + final String RELATED_VNF_UUID3 = "5a34a4f4-81a4-4eed-871b-f0b1187160d4"; + PresetAAIStandardQueryGet relatedVnf1 = PresetAAIStandardQueryGet.ofVnf(RELATED_VNF_UUID1, "7a6ee536-f052-46fa-aa7e-2fca9d674c44", "7a6ee536-f052-46fa-aa7e-2fca9d674c44", - "", ImmutableMultimap.of()); + "", ImmutableMultimap.of(), defaultPlacement()); PresetAAIStandardQueryGet relatedVnf2 = PresetAAIStandardQueryGet.ofVnf(RELATED_VNF_UUID2, "d6557200-ecf2-4641-8094-5393ae3aae60","d6557200-ecf2-4641-8094-5393ae3aae60", - "", ImmutableMultimap.of()); + "", ImmutableMultimap.of(), defaultPlacement()); PresetAAIStandardQueryGet relatedVnf3 = PresetAAIStandardQueryGet.ofVnf(RELATED_VNF_UUID3, "d6557200-ecf2-4641-8094-5393ae3aae60","d6557200-ecf2-4641-8094-5393ae3aae60", - "", ImmutableMultimap.of()); + "", ImmutableMultimap.of(), defaultPlacement()); final PresetAAIStandardQueryGet vnfGroup1 = PresetAAIStandardQueryGet.ofInstanceGroup("vnfGroup-type", "Teresa Bradley", @@ -158,21 +151,93 @@ public class ViewEditWithDrawingBoardTest extends VidBaseTestCase { .putAll("instance-group", vnfGroup1.getReqPath(), vnfGroup2.getReqPath()) .build() ); - SimulatorApi.registerExpectationFromPresets(ImmutableList.of( + + serviceInstanceToDeleteName = serviceInstance.getInstanceName(); + vnfGroupInstanceId = vnfGroup1.getInstanceId(); + vnf1Name = vnfGroup1.getInstanceName(); + return ImmutableList.of( serviceInstance, - vnfGroup1,vnfGroup2, relatedVnf1, relatedVnf2, relatedVnf3, - new PresetAAIModelsByInvariantIdGet(ImmutableList.of(aLaCarteVnfGroupingService.modelInvariantId)), + vnfGroup1, vnfGroup2, relatedVnf1, relatedVnf2, relatedVnf3); + } + + private List<BasePreset> presetsForSearchAndEdit(ModelInfo modelInfo, String subscriberId, String serviceType, String serviceInstanceId) { + return ImmutableList.of( new PresetGetSessionSlotCheckIntervalGet(), new PresetAAIGetSubscribersGet(), - new PresetSDCGetServiceMetadataGet(aLaCarteVnfGroupingService), - new PresetSDCGetServiceToscaModelGet(aLaCarteVnfGroupingService) - ), CLEAR_THEN_SET); + new PresetSDCGetServiceMetadataGet(modelInfo), + new PresetSDCGetServiceToscaModelGet(modelInfo), + new PresetAAIGetServicesGet(), + new PresetAAIFilterServiceInstanceById(subscriberId, serviceType, serviceInstanceId), + new PresetAAIGetSubDetailsGetSpecificService(subscriberId, serviceType, "Assigned", modelInfo, serviceInstanceId), + new PresetAAIGetSubDetailsWithoutInstancesGetSpecificService(subscriberId, serviceType) + ); + } - serviceInstanceName = serviceInstance.getInstanceName(); - vnfGroupInstanceName = vnfGroup1.getInstanceName(); - vnfGroupInstanceId = vnfGroup1.getInstanceId(); - return vnfGroupInstanceName; + @FeatureTogglingTest({Features.FLAG_1908_COLLECTION_RESOURCE_NEW_INSTANTIATION_UI, Features.FLAG_1908_RESUME_MACRO_SERVICE}) + @Test + public void testResumeServiceInstanceWithCollectionResource() { + + String serviceInstanceId = "0d7b5429-da18-475b-8b67-1b8c0a596f68"; + String serviceReqId = "405652f4-ceb3-4a75-9474-8aea71480a77"; //from PresetMSOOrchestrationRequestsGetByServiceInstanceId + + //createPresetsForServiceInstanceTopologyExpectationOnAAIAndGetVnf1Name init serviceInstanceToDeleteName + final List<BasePreset> presetsForGetTopology = createPresetsForGetTopologyOfServiceInstanceWithCRandInstanceGroup(serviceInstanceId); + SimulatorApi.registerExpectationFromPresetsCollections(ImmutableList.of( + presetsForSearchAndEdit(collectionResourceForResume, subscriberId, serviceType, serviceInstanceId), + presetsForGetTopology, + createPresetsForResume(serviceInstanceId, serviceReqId) + ), + CLEAR_THEN_SET); + + searchEditAndWaitForCompletion( + serviceInstanceId, + serviceInstanceToResumeName, //side effect of createPresetsForGetTopologyOfServiceInstanceWithCRandInstanceGroup + () -> { + Click.byTestId(CONTEXT_MENU_BUTTON_HEADER); + Click.byTestId(CONTEXT_MENU_HEADER_RESUME_ITEM); + }); } + private List<BasePreset> createPresetsForResume(String serviceInstanceId, String serviceReqId) { + String resumeRequestId = UUID.randomUUID().toString(); + return ImmutableList.of( + new PresetMSOOrchestrationRequestsGetByServiceInstanceId(serviceInstanceId), + new PresetMSOResumeRequest(serviceReqId, resumeRequestId, serviceInstanceId, "us16807000"), + new PresetMSOOrchestrationRequestGet(MSO_COMPLETE_STATUS, resumeRequestId) + ); + } + + private List<BasePreset> createPresetsForGetTopologyOfServiceInstanceWithCRandInstanceGroup(String serviceInstanceId) { + PresetAAIStandardQueryGet instanceGroup = PresetAAIStandardQueryGet.ofInstanceGroup( + "L3-NETWORK", "SUB_INTERFACE", ImmutableMultimap.of(), + "868b109c-9481-4a18-891b-af974db7705a", "dd182d7d-6949-4b90-b3cc-5befe400742e"); + + PresetAAIStandardQueryGet cr = PresetAAIStandardQueryGet.ofCollectionResource( + "Assigned", + ImmutableMultimap.of("instance-group", instanceGroup.getReqPath()), + "081ceb56-eb71-4566-a72d-3e7cbee5cdf1", + "ce8c98bc-4691-44fb-8ff0-7a47487c11c4" + ); + + PresetAAIStandardQueryGet service = PresetAAIStandardQueryGet.ofServiceInstance( + serviceInstanceId, + "INFRASTRUCTURE", "", collectionResourceForResume.modelVersionId, + collectionResourceForResume.modelInvariantId, + subscriberId, + serviceType, + "Assigned", + ImmutableMultimap.of("collection", cr.getReqPath()) + ); + + PresetAAIModelsByInvariantIdGetForServiceWithCR aaiModelsPreset = new PresetAAIModelsByInvariantIdGetForServiceWithCR( + ImmutableList.of( + "868b109c-9481-4a18-891b-af974db7705a", + "081ceb56-eb71-4566-a72d-3e7cbee5cdf1", + collectionResourceForResume.modelInvariantId)); + + serviceInstanceToResumeName = service.getInstanceName(); + + return ImmutableList.of(service, cr, instanceGroup, aaiModelsPreset); + } } |