From: adheli.tavares Date: Wed, 11 Jun 2025 12:41:40 +0000 (+0100) Subject: Remove VFC from drools X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=1a0026d9370342724dffdd6c4d9f96faa936d917;p=policy%2Fdrools-applications.git Remove VFC from drools Issue-ID: POLICY-5385 Change-Id: Icaa1cb1b664a37995ec6ce9e17b72eaa13d2854c Signed-off-by: adheli.tavares --- diff --git a/controlloop/common/controller-usecases/pom.xml b/controlloop/common/controller-usecases/pom.xml index 1588e99c9..80a70d8ac 100644 --- a/controlloop/common/controller-usecases/pom.xml +++ b/controlloop/common/controller-usecases/pom.xml @@ -98,12 +98,6 @@ ${policy.models.version} provided - - org.onap.policy.models.policy-models-interactions.model-impl - vfc - ${policy.models.version} - provided - org.onap.policy.drools-applications.controlloop.common eventmanager diff --git a/controlloop/common/controller-usecases/src/test/java/org/onap/policy/controlloop/UsecasesTest.java b/controlloop/common/controller-usecases/src/test/java/org/onap/policy/controlloop/UsecasesTest.java index 6674680cd..dc75e8f16 100644 --- a/controlloop/common/controller-usecases/src/test/java/org/onap/policy/controlloop/UsecasesTest.java +++ b/controlloop/common/controller-usecases/src/test/java/org/onap/policy/controlloop/UsecasesTest.java @@ -3,7 +3,7 @@ * ONAP * ================================================================================ * Copyright (C) 2020-2022 AT&T Intellectual Property. All rights reserved. - * Modifications Copyright (C) 2023-2024 Nordix Foundation. + * Modifications Copyright (C) 2023-2025 OpenInfra Foundation Europe. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,7 +30,6 @@ import org.onap.policy.controlloop.common.rules.test.DroolsRuleTest; import org.onap.policy.controlloop.common.rules.test.Listener; import org.onap.policy.controlloop.common.rules.test.NamedRunner; import org.onap.policy.controlloop.common.rules.test.TestNames; -import org.onap.policy.drools.apps.controller.usecases.UsecasesEventManager; import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy; import org.onap.policy.simulators.Util; @@ -50,13 +49,13 @@ class UsecasesTest extends DroolsRuleTest { * Sets up statics. */ @BeforeAll - public static void setUpBeforeClass() { + static void setUpBeforeClass() { initStatics(CONTROLLER_NAME); rules.configure("src/main/resources"); httpClients.addClients("usecases"); - simulators.start(Util::buildAaiSim, Util::buildSoSim, Util::buildVfcSim, Util::buildXacmlSim, - Util::buildSdncSim); + simulators.start(Util::buildAaiSim, Util::buildSoSim, Util::buildXacmlSim, + Util::buildSdncSim); rules.start(); } @@ -65,7 +64,7 @@ class UsecasesTest extends DroolsRuleTest { * Cleans up statics. */ @AfterAll - public static void tearDownAfterClass() { + static void tearDownAfterClass() { finishStatics(); } @@ -73,7 +72,7 @@ class UsecasesTest extends DroolsRuleTest { * Sets up. */ @BeforeEach - public void setUp() { + void setUp() { init(); } @@ -81,7 +80,7 @@ class UsecasesTest extends DroolsRuleTest { * Tears down. */ @AfterEach - public void tearDown() { + void tearDown() { finish(); } @@ -90,37 +89,33 @@ class UsecasesTest extends DroolsRuleTest { String policyName = policy.getIdentifier().getName(); policyClMgt.await(notif -> notif.getNotification() == ControlLoopNotificationType.ACTIVE - && "EVENT.MANAGER.ACCEPT".equals(notif.getPolicyScope()) - && policyName.equals(notif.getPolicyName())); + && "EVENT.MANAGER.ACCEPT".equals(notif.getPolicyScope()) + && policyName.equals(notif.getPolicyName())); policyClMgt.await(notif -> notif.getNotification() == ControlLoopNotificationType.OPERATION - && "EVENT.MANAGER.PROCESS.GUARD.OUTCOME".equals(notif.getPolicyScope()) - && policyName.equals(notif.getPolicyName()) - && notif.getMessage().startsWith("Sending guard query")); + && "EVENT.MANAGER.PROCESS.GUARD.OUTCOME".equals(notif.getPolicyScope()) + && policyName.equals(notif.getPolicyName()) + && notif.getMessage().startsWith("Sending guard query")); policyClMgt.await(notif -> notif.getNotification() == ControlLoopNotificationType.OPERATION - && "EVENT.MANAGER.PROCESS.GUARD.OUTCOME".equals(notif.getPolicyScope()) - && policyName.equals(notif.getPolicyName()) - && notif.getMessage().startsWith("Guard result") - && notif.getMessage().endsWith("Permit")); + && "EVENT.MANAGER.PROCESS.GUARD.OUTCOME".equals(notif.getPolicyScope()) + && policyName.equals(notif.getPolicyName()) + && notif.getMessage().startsWith("Guard result") + && notif.getMessage().endsWith("Permit")); policyClMgt.await(notif -> notif.getNotification() == ControlLoopNotificationType.OPERATION - && "EVENT.MANAGER.PROCESS.POLICY.STARTED".equals(notif.getPolicyScope()) - && policyName.equals(notif.getPolicyName()) - && notif.getMessage().startsWith("actor=")); + && "EVENT.MANAGER.PROCESS.POLICY.STARTED".equals(notif.getPolicyScope()) + && policyName.equals(notif.getPolicyName()) + && notif.getMessage().startsWith("actor=")); } @Override protected VirtualControlLoopNotification waitForFinal(ToscaPolicy policy, - Listener policyClMgt, ControlLoopNotificationType finalType) { + Listener policyClMgt, + ControlLoopNotificationType finalType) { return policyClMgt.await(notif -> notif.getNotification() == finalType - && "EVENT.MANAGER.FINAL".equals(notif.getPolicyScope()) - && (policy.getIdentifier().getName()).equals(notif.getPolicyName())); - } - - @Override - protected long getCreateCount() { - return UsecasesEventManager.getCreateCount(); + && "EVENT.MANAGER.FINAL".equals(notif.getPolicyScope()) + && (policy.getIdentifier().getName()).equals(notif.getPolicyName())); } } diff --git a/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/GetTargetEntityOperation2Test.java b/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/GetTargetEntityOperation2Test.java index d4dbbe271..3a622bbcb 100644 --- a/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/GetTargetEntityOperation2Test.java +++ b/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/GetTargetEntityOperation2Test.java @@ -3,7 +3,7 @@ * ONAP * ================================================================================ * Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. - * Modifications Copyright (C) 2023 Nordix Foundation. + * Modifications Copyright (C) 2023,2025 OpenInfra Foundation Europe. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -63,7 +63,7 @@ class GetTargetEntityOperation2Test { * Sets up. */ @BeforeEach - public void setUp() { + void setUp() { event = new VirtualControlLoopEvent(); event.setTarget("pnf.pnf-name"); event.setAai(Map.of("pnf.pnf-name", MY_PNF)); @@ -160,17 +160,6 @@ class GetTargetEntityOperation2Test { verifyTarget(MY_VNF); } - /** - * Tests detmTarget() when the target type is unknown. - */ - @Test - void testDetmTargetUnknownType() { - when(params.getTargetType()).thenReturn(TargetType.VFC); - enrichTarget(VSERVER_NAME); - assertThatIllegalArgumentException().isThrownBy(() -> oper.getPropertyNames()) - .withMessage("The target type is not supported"); - } - @Test void testDetmPnfTargetPnf() { assertThat(oper.getPropertyNames()).isEmpty(); @@ -207,17 +196,6 @@ class GetTargetEntityOperation2Test { assertThatIllegalArgumentException().isThrownBy(() -> oper.getPropertyNames()).withMessage("Target is null"); } - /** - * Tests detmVfModuleTarget() when the target is the vserver name. - */ - @Test - void testDetmVfModuleTargetVserverName() { - when(params.getTargetType()).thenReturn(TargetType.VM); - enrichTarget(VSERVER_NAME); - assertThat(oper.getPropertyNames()).isEmpty(); - verifyTarget(MY_VNF); - } - /** * Tests detmVfModuleTarget() when the target is the VNF ID. */ diff --git a/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/LockOperation2Test.java b/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/LockOperation2Test.java index f0348ac9a..a58a767ae 100644 --- a/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/LockOperation2Test.java +++ b/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/LockOperation2Test.java @@ -3,7 +3,7 @@ * ONAP * ================================================================================ * Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. - * Modifications Copyright (C) 2023 Nordix Foundation. + * Modifications Copyright (C) 2023,2025 OpenInfra Foundation Europe. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,45 +31,31 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.util.List; -import java.util.Map; import java.util.concurrent.CompletableFuture; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.onap.aai.domain.yang.GenericVnf; -import org.onap.policy.controlloop.VirtualControlLoopEvent; import org.onap.policy.controlloop.actorserviceprovider.OperationOutcome; import org.onap.policy.controlloop.actorserviceprovider.OperationProperties; import org.onap.policy.controlloop.actorserviceprovider.parameters.ControlLoopOperationParams; import org.onap.policy.controlloop.eventmanager.StepContext; class LockOperation2Test { - private static final String MY_PNF = "my-pnf"; - private static final String MY_VNF = "my-vnf"; private static final String MY_ACTOR = "my-actor"; private static final String MY_OPERATION = "my-operation"; private final StepContext stepContext = mock(StepContext.class); private final ControlLoopOperationParams params = mock(ControlLoopOperationParams.class); - private VirtualControlLoopEvent event; private CompletableFuture future; - private GenericVnf vnf; private LockOperation2 oper; /** * Sets up. */ @BeforeEach - public void setUp() { - event = new VirtualControlLoopEvent(); - event.setTarget("pnf.pnf-name"); - event.setAai(Map.of("pnf.pnf-name", MY_PNF)); - + void setUp() { future = new CompletableFuture<>(); - vnf = new GenericVnf(); - vnf.setVnfId(MY_VNF); - when(stepContext.requestLock(anyString())).thenReturn(future); when(params.getActor()).thenReturn(MY_ACTOR); diff --git a/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/UsecasesEventManagerTest.java b/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/UsecasesEventManagerTest.java index 79ada39d2..cb1253ebf 100644 --- a/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/UsecasesEventManagerTest.java +++ b/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/UsecasesEventManagerTest.java @@ -3,7 +3,7 @@ * ONAP * ================================================================================ * Copyright (C) 2020-2021, 2023 AT&T Intellectual Property. All rights reserved. - * Modifications Copyright (C) 2023-2024 Nordix Foundation. + * Modifications Copyright (C) 2023-2025 OpenInfra Foundation Europe. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -58,10 +58,8 @@ import org.onap.policy.controlloop.actorserviceprovider.Operation; import org.onap.policy.controlloop.actorserviceprovider.OperationOutcome; import org.onap.policy.controlloop.actorserviceprovider.OperationProperties; import org.onap.policy.controlloop.actorserviceprovider.OperationResult; -import org.onap.policy.controlloop.actorserviceprovider.Operator; import org.onap.policy.controlloop.actorserviceprovider.TargetType; import org.onap.policy.controlloop.actorserviceprovider.parameters.ControlLoopOperationParams; -import org.onap.policy.controlloop.actorserviceprovider.spi.Actor; import org.onap.policy.controlloop.drl.legacy.ControlLoopParams; import org.onap.policy.controlloop.eventmanager.ActorConstants; import org.onap.policy.controlloop.eventmanager.EventManagerServices; @@ -92,16 +90,14 @@ class UsecasesEventManagerTest { private static final String SIMPLE_OPERATION = "OperationA"; private static final String MY_TARGET = "my-target"; private static final String EVENT_MGR_SIMPLE_YAML = - "../eventmanager/src/test/resources/eventManager/event-mgr-simple.yaml"; + "../eventmanager/src/test/resources/eventManager/event-mgr-simple.yaml"; private static final Coder yamlCoder = new StandardYamlCoder(); private static final String OUTCOME_MSG = "my outcome message"; private final PolicyEngine engineMgr = mock(PolicyEngine.class); private final WorkingMemory workMem = mock(WorkingMemory.class); private final InternalFactHandle factHandle = mock(InternalFactHandle.class); - private final Operator policyOperator = mock(Operator.class); private final Operation policyOperation = mock(Operation.class); - private final Actor policyActor = mock(Actor.class); private final EventManagerServices services = mock(EventManagerServices.class); private final OperationHistoryDataManager dataMgr = mock(OperationHistoryDataManager.class); private final ExecutorService executor = mock(ExecutorService.class); @@ -118,7 +114,7 @@ class UsecasesEventManagerTest { * Sets up. */ @BeforeEach - public void setUp() throws ControlLoopException, CoderException { + void setUp() throws ControlLoopException, CoderException { when(services.getDataManager()).thenReturn(dataMgr); when(workMem.getFactHandle(any())).thenReturn(factHandle); @@ -137,7 +133,7 @@ class UsecasesEventManagerTest { params.setPolicyScope(POLICY_SCOPE); params.setPolicyVersion(POLICY_VERSION); - loadPolicy(EVENT_MGR_SIMPLE_YAML); + loadPolicy(); locks = new ArrayList<>(); @@ -153,37 +149,37 @@ class UsecasesEventManagerTest { event.setAai(addAai(orig, UsecasesConstants.VSERVER_IS_CLOSED_LOOP_DISABLED, "true")); assertThatThrownBy(() -> new UsecasesEventManager(services, params, event, workMem)) - .hasMessage("is-closed-loop-disabled is set to true on VServer or VNF"); + .hasMessage("is-closed-loop-disabled is set to true on VServer or VNF"); // vserver ACTIVE event.setAai(addAai(orig, UsecasesConstants.VSERVER_PROV_STATUS, - UsecasesConstants.PROV_STATUS_ACTIVE.toUpperCase())); + UsecasesConstants.PROV_STATUS_ACTIVE.toUpperCase())); assertThatCode(() -> new UsecasesEventManager(services, params, event, workMem)).doesNotThrowAnyException(); // vserver active event.setAai(addAai(orig, UsecasesConstants.VSERVER_PROV_STATUS, - UsecasesConstants.PROV_STATUS_ACTIVE.toLowerCase())); + UsecasesConstants.PROV_STATUS_ACTIVE.toLowerCase())); assertThatCode(() -> new UsecasesEventManager(services, params, event, workMem)).doesNotThrowAnyException(); // vserver inactive event.setAai(addAai(orig, UsecasesConstants.VSERVER_PROV_STATUS, "inactive")); assertThatThrownBy(() -> new UsecasesEventManager(services, params, event, workMem)) - .hasMessage("prov-status is not ACTIVE on VServer or VNF"); + .hasMessage("prov-status is not ACTIVE on VServer or VNF"); // vnf ACTIVE event.setAai(addAai(orig, UsecasesConstants.GENERIC_VNF_PROV_STATUS, - UsecasesConstants.PROV_STATUS_ACTIVE.toUpperCase())); + UsecasesConstants.PROV_STATUS_ACTIVE.toUpperCase())); assertThatCode(() -> new UsecasesEventManager(services, params, event, workMem)).doesNotThrowAnyException(); // vnf active event.setAai(addAai(orig, UsecasesConstants.GENERIC_VNF_PROV_STATUS, - UsecasesConstants.PROV_STATUS_ACTIVE.toLowerCase())); + UsecasesConstants.PROV_STATUS_ACTIVE.toLowerCase())); assertThatCode(() -> new UsecasesEventManager(services, params, event, workMem)).doesNotThrowAnyException(); // vnf inactive event.setAai(addAai(orig, UsecasesConstants.GENERIC_VNF_PROV_STATUS, "inactive")); assertThatThrownBy(() -> new UsecasesEventManager(services, params, event, workMem)) - .hasMessage("prov-status is not ACTIVE on VServer or VNF"); + .hasMessage("prov-status is not ACTIVE on VServer or VNF"); // valid event.setAai(orig); @@ -192,7 +188,7 @@ class UsecasesEventManagerTest { // invalid event.setTarget("unknown-target"); assertThatThrownBy(() -> new UsecasesEventManager(services, params, event, workMem)) - .isInstanceOf(ControlLoopException.class); + .isInstanceOf(ControlLoopException.class); } @Test @@ -309,8 +305,8 @@ class UsecasesEventManagerTest { @Test void testLoadPreprocessorStepsNeedTargetEntity() { stepa = new Step2(mgr, ControlLoopOperationParams.builder() - .targetType(TargetType.toTargetType(event.getTargetType())).targetEntityIds(Map.of()).build(), - event) { + .targetType(TargetType.toTargetType(event.getTargetType())).targetEntityIds(Map.of()).build(), + event) { @Override public List getPropertyNames() { return List.of(OperationProperties.AAI_TARGET_ENTITY); @@ -373,10 +369,13 @@ class UsecasesEventManagerTest { var outcome = makeOutcome(); mgr.addToHistory(outcome); - mgr.storeInDataBase(mgr.getPartialHistory().peekLast()); + var historyLast = mgr.getPartialHistory().peekLast(); + assertNotNull(historyLast); + + mgr.storeInDataBase(historyLast); verify(dataMgr).store(REQ_ID.toString(), event.getClosedLoopControlName(), event, null, - mgr.getPartialHistory().peekLast().getClOperation()); + historyLast.getClOperation()); } @Test @@ -434,15 +433,15 @@ class UsecasesEventManagerTest { event.setTarget("unknown-target"); assertThatCode(() -> mgr.checkEventSyntax(event)).isInstanceOf(ControlLoopException.class) - .hasMessage("target field invalid"); + .hasMessage("target field invalid"); event.setTarget(null); assertThatCode(() -> mgr.checkEventSyntax(event)).isInstanceOf(ControlLoopException.class) - .hasMessage("No target field"); + .hasMessage("No target field"); event.setRequestId(null); assertThatCode(() -> mgr.checkEventSyntax(event)).isInstanceOf(ControlLoopException.class) - .hasMessage("No request ID"); + .hasMessage("No request ID"); } @Test @@ -455,22 +454,22 @@ class UsecasesEventManagerTest { event.setClosedLoopEventStatus(null); assertThatCode(() -> mgr.checkEventSyntax(event)).isInstanceOf(ControlLoopException.class) - .hasMessage("Invalid value in closedLoopEventStatus"); + .hasMessage("Invalid value in closedLoopEventStatus"); } @Test void testValidateAaiData() { event.setTargetType("unknown-target-type"); assertThatCode(() -> mgr.checkEventSyntax(event)).isInstanceOf(ControlLoopException.class) - .hasMessage("The target type is not supported"); + .hasMessage("The target type is not supported"); event.setTargetType(null); assertThatCode(() -> mgr.checkEventSyntax(event)).isInstanceOf(ControlLoopException.class) - .hasMessage("The Target type is null"); + .hasMessage("The Target type is null"); event.setAai(null); assertThatCode(() -> mgr.checkEventSyntax(event)).isInstanceOf(ControlLoopException.class) - .hasMessage("AAI is null"); + .hasMessage("AAI is null"); // VM case event.setTargetType(ControlLoopTargetType.VM); @@ -511,7 +510,7 @@ class UsecasesEventManagerTest { event.setAai(Map.of()); assertThatCode(() -> mgr.checkEventSyntax(event)).isInstanceOf(ControlLoopException.class).hasMessage( - "generic-vnf.vnf-id or generic-vnf.vnf-name or vserver.vserver-name information missing"); + "generic-vnf.vnf-id or generic-vnf.vnf-name or vserver.vserver-name information missing"); } @Test @@ -522,7 +521,7 @@ class UsecasesEventManagerTest { event.setAai(Map.of()); assertThatCode(() -> mgr.checkEventSyntax(event)).isInstanceOf(ControlLoopException.class) - .hasMessage("AAI PNF object key pnf-name is missing"); + .hasMessage("AAI PNF object key pnf-name is missing"); } @Test @@ -531,15 +530,15 @@ class UsecasesEventManagerTest { event.setAai(addAai(orig, UsecasesConstants.VSERVER_IS_CLOSED_LOOP_DISABLED, "true")); assertThatThrownBy(() -> new UsecasesEventManager(services, params, event, workMem)) - .isInstanceOf(IllegalStateException.class); + .isInstanceOf(IllegalStateException.class); event.setAai(addAai(orig, UsecasesConstants.GENERIC_VNF_IS_CLOSED_LOOP_DISABLED, "true")); assertThatThrownBy(() -> new UsecasesEventManager(services, params, event, workMem)) - .isInstanceOf(IllegalStateException.class); + .isInstanceOf(IllegalStateException.class); event.setAai(addAai(orig, UsecasesConstants.PNF_IS_IN_MAINT, "true")); assertThatThrownBy(() -> new UsecasesEventManager(services, params, event, workMem)) - .isInstanceOf(IllegalStateException.class); + .isInstanceOf(IllegalStateException.class); } @Test @@ -551,14 +550,14 @@ class UsecasesEventManagerTest { event.setAai(addAai(orig, UsecasesConstants.VSERVER_PROV_STATUS, "inactive")); assertThatThrownBy(() -> new UsecasesEventManager(services, params, event, workMem)) - .isInstanceOf(IllegalStateException.class); + .isInstanceOf(IllegalStateException.class); event.setAai(addAai(orig, UsecasesConstants.GENERIC_VNF_PROV_STATUS, "ACTIVE")); assertThatCode(() -> new UsecasesEventManager(services, params, event, workMem)).doesNotThrowAnyException(); event.setAai(addAai(orig, UsecasesConstants.GENERIC_VNF_PROV_STATUS, "inactive")); assertThatThrownBy(() -> new UsecasesEventManager(services, params, event, workMem)) - .isInstanceOf(IllegalStateException.class); + .isInstanceOf(IllegalStateException.class); } @Test @@ -568,7 +567,7 @@ class UsecasesEventManagerTest { for (var value : Arrays.asList("yes", "y", "true", "t", "yEs", "trUe")) { event.setAai(addAai(orig, UsecasesConstants.VSERVER_IS_CLOSED_LOOP_DISABLED, value)); assertThatThrownBy(() -> new UsecasesEventManager(services, params, event, workMem)) - .isInstanceOf(IllegalStateException.class); + .isInstanceOf(IllegalStateException.class); } event.setAai(addAai(orig, UsecasesConstants.VSERVER_IS_CLOSED_LOOP_DISABLED, "false")); @@ -579,15 +578,15 @@ class UsecasesEventManagerTest { } - private Map addAai(Map original, String key, String value) { Map map = new TreeMap<>(original); map.put(key, value); return map; } - private void loadPolicy(String fileName) throws CoderException { - var template = yamlCoder.decode(ResourceUtils.getResourceAsString(fileName), ToscaServiceTemplate.class); + private void loadPolicy() throws CoderException { + var template = yamlCoder.decode(ResourceUtils.getResourceAsString( + UsecasesEventManagerTest.EVENT_MGR_SIMPLE_YAML), ToscaServiceTemplate.class); tosca = template.getToscaTopologyTemplate().getPolicies().get(0).values().iterator().next(); params.setToscaPolicy(tosca); @@ -654,7 +653,7 @@ class UsecasesEventManagerTest { private static final long serialVersionUID = 1L; public MyManager(EventManagerServices services, ControlLoopParams params, VirtualControlLoopEvent event, - WorkingMemory workMem) throws ControlLoopException { + WorkingMemory workMem) throws ControlLoopException { super(services, params, event, workMem); } diff --git a/controlloop/common/controller-usecases/src/test/resources/config/event-manager.properties b/controlloop/common/controller-usecases/src/test/resources/config/event-manager.properties index 8ca428a2d..ae1204d83 100644 --- a/controlloop/common/controller-usecases/src/test/resources/config/event-manager.properties +++ b/controlloop/common/controller-usecases/src/test/resources/config/event-manager.properties @@ -3,7 +3,7 @@ # ONAP # =============================================================================== # Copyright (C) 2020-2022 AT&T Intellectual Property. All rights reserved. -# Modifications Copyright (C) 2023-2024 Nordix Foundation. +# Modifications Copyright (C) 2023-2025 OpenInfra Foundation Europe. All rights reserved. # =============================================================================== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -83,9 +83,3 @@ actor.service.SO.pollWaitSec=20 actor.service.SO.operations.VF\ Module\ Create.path=serviceInstantiation/v7/serviceInstances actor.service.SO.operations.VF\ Module\ Delete.path=serviceInstances/v7 -actor.service.VFC.clientName=VFC -actor.service.VFC.pollPath=jobs -actor.service.VFC.maxPolls=20 -actor.service.VFC.pollWaitSec=20 -actor.service.VFC.operations.Restart.path=ns -actor.service.VFC.operations.Restart.timeoutSec=60 diff --git a/controlloop/common/controller-usecases/src/test/resources/config/usecases-http-client.properties b/controlloop/common/controller-usecases/src/test/resources/config/usecases-http-client.properties index 72764bccc..1b74d91aa 100644 --- a/controlloop/common/controller-usecases/src/test/resources/config/usecases-http-client.properties +++ b/controlloop/common/controller-usecases/src/test/resources/config/usecases-http-client.properties @@ -3,6 +3,7 @@ # ONAP # ================================================================================ # Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. +# Modifications Copyright (C) 2025 OpenInfra Foundation Europe. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -43,10 +44,3 @@ http.client.services.SO.managed=true http.client.services.SO.host=localhost http.client.services.SO.port=6667 http.client.services.SO.contextUriPath= - -http.client.services.VFC.managed=true -http.client.services.VFC.host=localhost -http.client.services.VFC.port=6668 -http.client.services.VFC.userName=VFC -http.client.services.VFC.password=VFC -http.client.services.VFC.contextUriPath=api/nslcm/v1 diff --git a/controlloop/common/feature-controlloop-utils/src/main/java/org/onap/policy/drools/apps/controlloop/feature/utils/ControlLoopUtilsFeature.java b/controlloop/common/feature-controlloop-utils/src/main/java/org/onap/policy/drools/apps/controlloop/feature/utils/ControlLoopUtilsFeature.java index bc6bbd729..c8aa2cf3b 100644 --- a/controlloop/common/feature-controlloop-utils/src/main/java/org/onap/policy/drools/apps/controlloop/feature/utils/ControlLoopUtilsFeature.java +++ b/controlloop/common/feature-controlloop-utils/src/main/java/org/onap/policy/drools/apps/controlloop/feature/utils/ControlLoopUtilsFeature.java @@ -3,7 +3,7 @@ * ONAP * ================================================================================ * Copyright (C) 2017-2019, 2021 AT&T Intellectual Property. All rights reserved. - * Modifications Copyright (C) 2023 Nordix Foundation. + * Modifications Copyright (C) 2023,2025 OpenInfra Foundation Europe. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,7 +41,6 @@ public class ControlLoopUtilsFeature implements PolicyEngineFeatureApi { try { Util.buildAaiSim(); Util.buildSoSim(); - Util.buildVfcSim(); Util.buildXacmlSim(); Util.buildSdncSim(); } catch (final InterruptedException e) {