diff options
Diffstat (limited to 'controlloop')
12 files changed, 686 insertions, 18 deletions
diff --git a/controlloop/common/controller-frankfurt/src/test/java/org/onap/policy/controlloop/FrankfurtBase.java b/controlloop/common/controller-frankfurt/src/test/java/org/onap/policy/controlloop/FrankfurtBase.java index 6e3380ee4..0ff3de505 100644 --- a/controlloop/common/controller-frankfurt/src/test/java/org/onap/policy/controlloop/FrankfurtBase.java +++ b/controlloop/common/controller-frankfurt/src/test/java/org/onap/policy/controlloop/FrankfurtBase.java @@ -63,6 +63,8 @@ import org.onap.policy.common.utils.coder.CoderException; import org.onap.policy.common.utils.coder.StandardCoder; import org.onap.policy.common.utils.resources.ResourceUtils; import org.onap.policy.controlloop.drl.legacy.ControlLoopParams; +import org.onap.policy.controlloop.eventmanager.ControlLoopEventManager2; +import org.onap.policy.drools.controller.DroolsController; import org.onap.policy.drools.persistence.SystemPersistence; import org.onap.policy.drools.persistence.SystemPersistenceConstants; import org.onap.policy.drools.protocol.coders.EventProtocolCoderConstants; @@ -119,6 +121,14 @@ public abstract class FrankfurtBase { SystemPersistenceConstants.getManager().setConfigurationDir("src/test/resources/config"); } + protected void resetFacts() { + DroolsController drools = controller.getDrools(); + drools.delete(ToscaPolicy.class); + drools.delete(ControlLoopParams.class); + drools.delete(ControlLoopEventManager2.class); + drools.delete(VirtualControlLoopEvent.class); + } + /** * Sets up overall logging. */ @@ -355,6 +365,12 @@ public abstract class FrankfurtBase { assertEquals(ControlLoopNotificationType.OPERATION, notif.getNotification()); assertEquals(policyName + ".EVENT.MANAGER.PROCESSING", notif.getPolicyName()); assertThat(notif.getMessage()).startsWith("Guard result").endsWith("Permit"); + + await().until(() -> !policyClMgt.getMessages().isEmpty()); + notif = policyClMgt.getMessages().remove(); + assertEquals(ControlLoopNotificationType.OPERATION, notif.getNotification()); + assertEquals(policyName + ".EVENT.MANAGER.PROCESSING", notif.getPolicyName()); + assertThat(notif.getMessage()).startsWith("actor="); } /** diff --git a/controlloop/common/controller-frankfurt/src/test/java/org/onap/policy/controlloop/VcpeTest.java b/controlloop/common/controller-frankfurt/src/test/java/org/onap/policy/controlloop/VcpeTest.java new file mode 100644 index 000000000..ff3f7427a --- /dev/null +++ b/controlloop/common/controller-frankfurt/src/test/java/org/onap/policy/controlloop/VcpeTest.java @@ -0,0 +1,206 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP + * ================================================================================ + * Copyright (C) 2019-2020 AT&T Intellectual Property. 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.controlloop; + +import static org.awaitility.Awaitility.await; +import static org.junit.Assert.assertEquals; + +import java.io.IOException; +import java.nio.file.Paths; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.onap.policy.appclcm.AppcLcmDmaapWrapper; +import org.onap.policy.common.utils.coder.CoderException; +import org.onap.policy.common.utils.coder.StandardCoder; +import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy; + +/** + * VCPE Use Case Tests. + */ +public class VcpeTest extends FrankfurtBase { + + /** + * VCPE Tosca Policy File. + */ + private static final String TOSCA_LEGACY_POLICY_VCPE = "src/test/resources/vcpe/tosca-legacy-vcpe.json"; + private static final String TOSCA_COMPLIANT_POLICY_VCPE = "src/test/resources/vcpe/tosca-compliant-vcpe.json"; + + /* + * VCPE Use case Messages. + */ + private static final String APPC_SUCCESS = "src/test/resources/vcpe/vcpe.appc.success.json"; + private static final String ONSET_1 = "src/test/resources/vcpe/vcpe.onset.1.json"; + private static final String ONSET_2 = "src/test/resources/vcpe/vcpe.onset.2.json"; + private static final String ONSET_3 = "src/test/resources/vcpe/vcpe.onset.3.json"; + + /* + * Topic trackers used by the VCPE use case. + */ + private TopicCallback<VirtualControlLoopNotification> policyClMgt; + private TopicCallback<AppcLcmDmaapWrapper> appcLcmRead; + private TopicCallback<AppcLcmDmaapWrapper> appcLcmWrite; + + /* + * VCPE Tosca Policy. + */ + private ToscaPolicy policy; + + /** + * Prepare PDP-D Framework for testing. + */ + @BeforeClass + public static void prepareResouces() throws InterruptedException, CoderException, IOException { + initConfigDir(); + setupLogging(); + preparePdpD(); + setUpHttpClients(); + setupSimulators(); + } + + /** + * Take down the resources used by the test framework. + */ + @AfterClass + public static void takeDownResources() { + stopPdpD(); + stopSimulators(); + } + + /** + * Observe Topics. + */ + @Before + public void topicsRegistration() { + resetFacts(); + + policyClMgt = createTopicSinkCallback(POLICY_CL_MGT_TOPIC, VirtualControlLoopNotification.class); + appcLcmRead = createTopicSinkCallbackPlain(APPC_LCM_READ_TOPIC, AppcLcmDmaapWrapper.class, new StandardCoder()); + appcLcmWrite = createTopicSourceCallback(APPC_LCM_WRITE_TOPIC, AppcLcmDmaapWrapper.class); + } + + /** + * Unregister Topic Callbacks. + */ + @After + public void topicsUnregistration() throws InterruptedException { + if (policyClMgt != null) { + policyClMgt.unregister(); + } + + if (appcLcmRead != null) { + appcLcmRead.unregister(); + } + + if (appcLcmWrite != null) { + appcLcmWrite.unregister(); + } + } + + /** + * Sunny Day with Legacy Tosca Policy. + */ + @Test + public void sunnyDayLegacy() throws InterruptedException, CoderException, IOException { + assertEquals(0, controller.getDrools().factCount(CONTROLLER_NAME)); + policy = setupPolicyFromFile(TOSCA_LEGACY_POLICY_VCPE); + assertEquals(2, controller.getDrools().factCount(CONTROLLER_NAME)); + + sunnyDay(); + } + + /** + * Sunny Day with Tosca Compliant Policy. + */ + @Test + public void sunnyDayCompliant() throws InterruptedException, CoderException, IOException { + assertEquals(0, controller.getDrools().factCount(CONTROLLER_NAME)); + policy = setupPolicyFromFile(TOSCA_COMPLIANT_POLICY_VCPE); + assertEquals(2, controller.getDrools().factCount(CONTROLLER_NAME)); + + sunnyDay(); + } + + /** + * An ONSET flood prevention test that injects a few ONSETs at once. It attempts to + * simulate the flooding behavior of the DCAE TCA microservice. TCA could blast tenths + * or hundreds of ONSETs within sub-second intervals. + */ + @Test + public void onsetFloodPrevention() throws IOException, InterruptedException, CoderException { + assertEquals(0, controller.getDrools().factCount(CONTROLLER_NAME)); + policy = setupPolicyFromFile(TOSCA_LEGACY_POLICY_VCPE); + assertEquals(2, controller.getDrools().factCount(CONTROLLER_NAME)); + + injectOnTopic(DCAE_TOPIC, Paths.get(ONSET_1)); + injectOnTopic(DCAE_TOPIC, Paths.get(ONSET_2)); + injectOnTopic(DCAE_TOPIC, Paths.get(ONSET_3)); + + assertEquals(1, controller.getDrools().facts(CONTROLLER_NAME, VirtualControlLoopEvent.class).stream().count()); + assertEquals(1, controller.getDrools().facts(CONTROLLER_NAME, CanonicalOnset.class).stream().count()); + assertEquals(controller.getDrools().facts(CONTROLLER_NAME, CanonicalOnset.class).get(0), + controller.getDrools().facts(CONTROLLER_NAME, VirtualControlLoopEvent.class).get(0)); + + sunnyDay(); + } + + /** + * Sunny day scenario for the VCPE use case. + */ + public void sunnyDay() throws IOException { + + /* Inject an ONSET event over the DCAE topic */ + injectOnTopic(DCAE_TOPIC, Paths.get(ONSET_1)); + + /* Wait to acquire a LOCK and a PDP-X PERMIT */ + waitForLockAndPermit(policy, policyClMgt); + + /* --- VCPE Operation Execution --- */ + + /* + * Ensure that an APPC RESTART request was sent in response to the matching ONSET + */ + await().until(() -> !appcLcmRead.getMessages().isEmpty()); + AppcLcmDmaapWrapper appcreq = appcLcmRead.getMessages().remove(); + assertEquals("restart", appcreq.getRpcName()); + + /* Inject a 400 APPC Response Return over the APPC topic */ + injectOnTopic(APPC_LCM_WRITE_TOPIC, Paths.get(APPC_SUCCESS), + appcreq.getBody().getInput().getCommonHeader().getSubRequestId()); + + /* Ensure that RESTART response is received */ + await().until(() -> !appcLcmWrite.getMessages().isEmpty()); + assertEquals("restart", appcLcmWrite.getMessages().peek().getRpcName()); + assertEquals(400, appcLcmWrite.getMessages().remove().getBody().getOutput().getStatus().getCode()); + + /* --- VCPE Operation Completed --- */ + + /* Ensure that the VCPE RESTART Operation is successfully completed */ + await().until(() -> !policyClMgt.getMessages().isEmpty()); + assertEquals(ControlLoopNotificationType.OPERATION_SUCCESS, + policyClMgt.getMessages().remove().getNotification()); + + /* --- VCPE Transaction Completed --- */ + waitForFinalSuccess(policy, policyClMgt); + } +} diff --git a/controlloop/common/controller-frankfurt/src/test/java/org/onap/policy/controlloop/VdnsTest.java b/controlloop/common/controller-frankfurt/src/test/java/org/onap/policy/controlloop/VdnsTest.java new file mode 100644 index 000000000..c9963a4ec --- /dev/null +++ b/controlloop/common/controller-frankfurt/src/test/java/org/onap/policy/controlloop/VdnsTest.java @@ -0,0 +1,139 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP + * ================================================================================ + * Copyright (C) 2020 AT&T Intellectual Property. 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.controlloop; + +import static org.awaitility.Awaitility.await; +import static org.junit.Assert.assertEquals; + +import java.io.IOException; +import java.nio.file.Paths; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.onap.policy.common.utils.coder.CoderException; +import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy; + +/** + * VDNS Use Case Tests. + */ +public class VdnsTest extends FrankfurtBase { + + /** + * VDNS Tosca Policy File. + */ + private static final String TOSCA_COMPLIANT_POLICY_VDNS = "src/test/resources/vdns/tosca-compliant-vdns.json"; + + /* + * VDNS Use case Messages. + */ + private static final String ONSET = "src/test/resources/vdns/vdns.onset.json"; + + /* + * Topic trackers used by the VDNS use case. + */ + private TopicCallback<VirtualControlLoopNotification> policyClMgt; + + /* + * VDNS Tosca Policy. + */ + private ToscaPolicy policy; + + /** + * Prepare PDP-D Framework for testing. + */ + @BeforeClass + public static void prepareResouces() throws InterruptedException, IOException { + initConfigDir(); + setupLogging(); + preparePdpD(); + setUpHttpClients(); + setupSimulators(); + } + + /** + * Take down the resources used by the test framework. + */ + @AfterClass + public static void takeDownResources() { + stopPdpD(); + stopSimulators(); + } + + /** + * Observe Topics. + */ + @Before + public void topicsRegistration() { + policyClMgt = createTopicSinkCallback(POLICY_CL_MGT_TOPIC, VirtualControlLoopNotification.class); + } + + /** + * Unregister Topic Callbacks and uninstall the policy. + */ + @After + public void topicsUnregistration() throws InterruptedException { + if (policyClMgt != null) { + policyClMgt.unregister(); + } + + // uninstall the policy + assertEquals(2, controller.getDrools().factCount(CONTROLLER_NAME)); + if (policy != null) { + deletePolicy(policy); + } + assertEquals(0, controller.getDrools().factCount(CONTROLLER_NAME)); + } + + /** + * Sunny Day with Tosca Compliant Policy. + */ + @Test + public void sunnyDayCompliant() throws InterruptedException, CoderException, IOException { + assertEquals(0, controller.getDrools().factCount(CONTROLLER_NAME)); + policy = setupPolicyFromFile(TOSCA_COMPLIANT_POLICY_VDNS); + assertEquals(2, controller.getDrools().factCount(CONTROLLER_NAME)); + + sunnyDay(); + } + + /** + * Sunny day scenario for the VCPE use case. + */ + private void sunnyDay() throws IOException { + + /* Inject an ONSET event over the DCAE topic */ + injectOnTopic(DCAE_TOPIC, Paths.get(ONSET)); + + /* Wait to acquire a LOCK and a PDP-X PERMIT */ + waitForLockAndPermit(policy, policyClMgt); + + /* Ensure that the VDNS SO Operation was successfully completed */ + + await().until(() -> !policyClMgt.getMessages().isEmpty()); + assertEquals(ControlLoopNotificationType.OPERATION_SUCCESS, + policyClMgt.getMessages().remove().getNotification()); + + /* --- VDNS Transaction Completed --- */ + waitForFinalSuccess(policy, policyClMgt); + } +} diff --git a/controlloop/common/controller-frankfurt/src/test/java/org/onap/policy/controlloop/VfwTest.java b/controlloop/common/controller-frankfurt/src/test/java/org/onap/policy/controlloop/VfwTest.java new file mode 100644 index 000000000..2d0cb7630 --- /dev/null +++ b/controlloop/common/controller-frankfurt/src/test/java/org/onap/policy/controlloop/VfwTest.java @@ -0,0 +1,188 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP + * ================================================================================ + * Copyright (C) 2020 AT&T Intellectual Property. 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.controlloop; + +import static org.awaitility.Awaitility.await; +import static org.junit.Assert.assertEquals; + +import java.io.IOException; +import java.nio.file.Paths; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.onap.policy.appc.Request; +import org.onap.policy.appc.Response; +import org.onap.policy.common.utils.coder.CoderException; +import org.onap.policy.common.utils.coder.StandardCoderInstantAsMillis; +import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy; + +/** + * VFW Use Case Tests. + */ +public class VfwTest extends FrankfurtBase { + + /** + * VFW Tosca Policy File. + */ + private static final String TOSCA_LEGACY_POLICY_VFW = "src/test/resources/vfw/tosca-vfw.json"; + private static final String TOSCA_COMPLIANT_POLICY_VFW = "src/test/resources/vfw/tosca-compliant-vfw.json"; + + /* + * VFW Use case Messages. + */ + private static final String APPC_SUCCESS = "src/test/resources/vfw/vfw.appc.success.json"; + private static final String ONSET = "src/test/resources/vfw/vfw.onset.json"; + + /* + * Topic trackers used by the VFW use case. + */ + private TopicCallback<VirtualControlLoopNotification> policyClMgt; + private TopicCallback<Response> appcClSource; + private TopicCallback<Request> appcClSink; + + /* + * VFW Tosca Policy. + */ + private ToscaPolicy policy; + + /** + * Prepare PDP-D Framework for testing. + */ + @BeforeClass + public static void prepareResouces() throws InterruptedException, IOException { + initConfigDir(); + setupLogging(); + preparePdpD(); + setUpHttpClients(); + setupSimulators(); + } + + /** + * Take down the resources used by the test framework. + */ + @AfterClass + public static void takeDownResources() { + stopPdpD(); + stopSimulators(); + } + + /** + * Observe Topics. + */ + @Before + public void topicsRegistration() { + policyClMgt = createTopicSinkCallback(POLICY_CL_MGT_TOPIC, VirtualControlLoopNotification.class); + appcClSink = createTopicSinkCallbackPlain(APPC_CL_TOPIC, Request.class, new StandardCoderInstantAsMillis()); + appcClSource = createTopicSourceCallback(APPC_CL_TOPIC, Response.class); + } + + /** + * Unregister Topic Callbacks. + */ + @After + public void topicsUnregistration() throws InterruptedException { + if (policyClMgt != null) { + policyClMgt.unregister(); + } + + if (appcClSource != null) { + appcClSource.unregister(); + } + + if (appcClSink != null) { + appcClSink.unregister(); + } + + // uninstall the policy + assertEquals(2, controller.getDrools().factCount(CONTROLLER_NAME)); + if (policy != null) { + deletePolicy(policy); + } + assertEquals(0, controller.getDrools().factCount(CONTROLLER_NAME)); + } + + /** + * Sunny Day with Legacy Tosca Policy. + */ + @Test + public void sunnyDayLegacy() throws InterruptedException, CoderException, IOException { + assertEquals(0, controller.getDrools().factCount(CONTROLLER_NAME)); + policy = setupPolicyFromFile(TOSCA_LEGACY_POLICY_VFW); + assertEquals(2, controller.getDrools().factCount(CONTROLLER_NAME)); + + sunnyDay(); + } + + /** + * Sunny Day with Tosca Compliant Policy. + */ + @Test + public void sunnyDayCompliant() throws InterruptedException, CoderException, IOException { + assertEquals(0, controller.getDrools().factCount(CONTROLLER_NAME)); + policy = setupPolicyFromFile(TOSCA_COMPLIANT_POLICY_VFW); + assertEquals(2, controller.getDrools().factCount(CONTROLLER_NAME)); + + sunnyDay(); + } + + /** + * Sunny day scenario for the VFW use case. + */ + private void sunnyDay() throws IOException { + + /* Inject an ONSET event over the DCAE topic */ + injectOnTopic(DCAE_TOPIC, Paths.get(ONSET)); + + /* Wait to acquire a LOCK and a PDP-X PERMIT */ + waitForLockAndPermit(policy, policyClMgt); + + /* --- VFW Operation Execution --- */ + + /* + * Ensure that an APPC RESTART request was sent in response to the matching ONSET + */ + await().until(() -> !appcClSink.getMessages().isEmpty()); + Request appcreq = appcClSink.getMessages().remove(); + assertEquals("ModifyConfig", appcreq.getAction()); + + /* + * Inject a 400 APPC Response Return over the APPC topic, with appropriate + * subRequestId + */ + injectOnTopic(APPC_CL_TOPIC, Paths.get(APPC_SUCCESS), appcreq.getCommonHeader().getSubRequestId()); + + /* Ensure that RESTART response is received */ + await().until(() -> !appcClSource.getMessages().isEmpty()); + assertEquals("SUCCESS", appcClSource.getMessages().remove().getStatus().getValue()); + + /* --- VFW Operation Completed --- */ + + /* Ensure that the VFW RESTART Operation is successfully completed */ + await().until(() -> !policyClMgt.getMessages().isEmpty()); + assertEquals(ControlLoopNotificationType.OPERATION_SUCCESS, + policyClMgt.getMessages().remove().getNotification()); + + /* --- VFW Transaction Completed --- */ + waitForFinalSuccess(policy, policyClMgt); + } +} diff --git a/controlloop/common/controller-frankfurt/src/test/resources/vcpe/vcpe.onset.2.json b/controlloop/common/controller-frankfurt/src/test/resources/vcpe/vcpe.onset.2.json index b8c76514e..d08ee47cd 100644 --- a/controlloop/common/controller-frankfurt/src/test/resources/vcpe/vcpe.onset.2.json +++ b/controlloop/common/controller-frankfurt/src/test/resources/vcpe/vcpe.onset.2.json @@ -3,7 +3,7 @@ "closedLoopAlarmStart": 1463679805324, "closedLoopEventClient": "DCAE_INSTANCE_ID.dcae-tca", "closedLoopEventStatus": "ONSET", - "requestID": "8cf3cd05-1218-4224-931b-601494ffe55b", + "requestID": "664be3d2-6c12-4f4b-a3e7-c349acced200", "target_type": "VNF", "target": "generic-vnf.vnf-id", "AAI": { diff --git a/controlloop/common/controller-frankfurt/src/test/resources/vcpe/vcpe.onset.3.json b/controlloop/common/controller-frankfurt/src/test/resources/vcpe/vcpe.onset.3.json index 40f29b3cf..74a94eb0a 100644 --- a/controlloop/common/controller-frankfurt/src/test/resources/vcpe/vcpe.onset.3.json +++ b/controlloop/common/controller-frankfurt/src/test/resources/vcpe/vcpe.onset.3.json @@ -4,7 +4,7 @@ "closedLoopAlarmEnd": 1570722876324999, "closedLoopEventClient": "DCAE_INSTANCE_ID.dcae-tca", "closedLoopEventStatus": "ONSET", - "requestID": "8cf3cd05-1218-4224-931b-601494ffe55b", + "requestID": "664be3d2-6c12-4f4b-a3e7-c349acced200", "target_type": "VNF", "target": "generic-vnf.vnf-id", "AAI": { diff --git a/controlloop/common/controller-frankfurt/src/test/resources/vdns/tosca-compliant-vdns.json b/controlloop/common/controller-frankfurt/src/test/resources/vdns/tosca-compliant-vdns.json new file mode 100644 index 000000000..1f4cb4125 --- /dev/null +++ b/controlloop/common/controller-frankfurt/src/test/resources/vdns/tosca-compliant-vdns.json @@ -0,0 +1,48 @@ +{ + "type": "onap.policies.controlloop.operational.common.Drools", + "type_version": "1.0.0", + "version": "1.0.0", + "name": "operational.scale.up", + "metadata": { + "policy-id": "operational.scale.up" + }, + "properties": { + "id": "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3", + "timeout": 60, + "abatement": false, + "trigger": "unique-policy-id-1-scale-up", + "operations": [ + { + "id": "unique-policy-id-1-scale-up", + "description": "Scale up", + "operation": { + "actor": "SO", + "operation": "VF Module Create", + "target": { + "targetType": "VFMODULE", + "entityIds": { + "modelInvariantId": "e6130d03-56f1-4b0a-9a1d-e1b2ebc30e0e", + "modelVersionId": "94b18b1d-cc91-4f43-911a-e6348665f292", + "modelName": "VfwclVfwsnkBbefb8ce2bde..base_vfw..module-0", + "modelVersion": 1, + "modelCustomizationId": "47958575-138f-452a-8c8d-d89b595f8164" + } + }, + "payload": { + "requestParameters": "{\"usePreload\":true,\"userParams\":[]}", + "configurationParameters": "[{\"ip-addr\":\"$.vf-module-topology.vf-module-parameters.param[9]\",\"oam-ip-addr\":\"$.vf-module-topology.vf-module-parameters.param[16]\",\"enabled\":\"$.vf-module-topology.vf-module-parameters.param[23]\"}]" + } + }, + "timeout": 30, + "retries": 0, + "success": "final_success", + "failure": "final_failure", + "failure_timeout": "final_failure_timeout", + "failure_retries": "final_failure_retries", + "failure_exception": "final_failure_exception", + "failure_guard": "final_failure_guard" + } + ], + "controllerName": "frankfurt" + } +} diff --git a/controlloop/common/controller-frankfurt/src/test/resources/vdns/vdns.onset.json b/controlloop/common/controller-frankfurt/src/test/resources/vdns/vdns.onset.json new file mode 100644 index 000000000..13f690952 --- /dev/null +++ b/controlloop/common/controller-frankfurt/src/test/resources/vdns/vdns.onset.json @@ -0,0 +1,16 @@ +{ + "closedLoopControlName": "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3", + "closedLoopAlarmStart": 1463679805324, + "closedLoopEventClient": "microservice.stringmatcher", + "closedLoopEventStatus": "ONSET", + "requestID": "c7c6a4aa-bb61-4a15-b831-ba1472dd4a65", + "target_type": "VNF", + "target": "vserver.vserver-name", + "AAI": { + "vserver.is-closed-loop-disabled": "false", + "vserver.prov-status": "ACTIVE", + "vserver.vserver-name": "OzVServer" + }, + "from": "DCAE", + "version": "1.0.2" +} diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager2.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager2.java index dc2b513a6..f2e99a9ad 100644 --- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager2.java +++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager2.java @@ -25,6 +25,7 @@ import static org.onap.policy.controlloop.ControlLoopTargetType.VM; import static org.onap.policy.controlloop.ControlLoopTargetType.VNF; import java.io.Serializable; +import java.util.Collections; import java.util.HashMap; import java.util.LinkedList; import java.util.Map; @@ -268,11 +269,11 @@ public class ControlLoopEventManager2 implements ManagerContext, Serializable { } catch (ControlLoopException | RuntimeException e) { // processor problem - this is fatal logger.warn("{}: cannot start next step for {}", closedLoopControlName, requestId, e); + finalResult = FinalResult.FINAL_FAILURE_EXCEPTION; notification = makeNotification(); notification.setNotification(ControlLoopNotificationType.FINAL_FAILURE); notification.setMessage("Policy processing aborted due to policy error"); notification.setHistory(controlLoopHistory); - finalResult = FinalResult.FINAL_FAILURE_EXCEPTION; } } @@ -301,8 +302,6 @@ public class ControlLoopEventManager2 implements ManagerContext, Serializable { VirtualControlLoopEvent event = context.getEvent(); - notification.setHistory(operation.getHistory()); - switch (operation.getState()) { case LOCK_DENIED: notification.setNotification(ControlLoopNotificationType.REJECTED); @@ -327,6 +326,11 @@ public class ControlLoopEventManager2 implements ManagerContext, Serializable { notification.setMessage("Guard result for " + operation.getActor() + " " + operation.getOperation() + " is Deny"); break; + case OPERATION_STARTED: + notification.setNotification(ControlLoopNotificationType.OPERATION); + notification.setMessage(operation.getOperationMessage()); + notification.setHistory(Collections.emptyList()); + break; case OPERATION_SUCCESS: notification.setNotification(ControlLoopNotificationType.OPERATION_SUCCESS); break; @@ -375,7 +379,7 @@ public class ControlLoopEventManager2 implements ManagerContext, Serializable { * @return a new notification */ public VirtualControlLoopNotification makeNotification() { - VirtualControlLoopNotification notif = new VirtualControlLoopNotification(); + VirtualControlLoopNotification notif = new VirtualControlLoopNotification(context.getEvent()); notif.setNotification(ControlLoopNotificationType.OPERATION); notif.setFrom("policy"); notif.setPolicyScope(policyScope); @@ -384,7 +388,7 @@ public class ControlLoopEventManager2 implements ManagerContext, Serializable { if (finalResult == null) { ControlLoopOperationManager2 oper = currentOperation.get(); if (oper != null) { - notif.setMessage(oper.getOperationMessage()); + notif.setMessage(oper.getOperationHistory()); notif.setHistory(oper.getHistory()); } } diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager2.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager2.java index 6bdaa1575..b880fd190 100644 --- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager2.java +++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager2.java @@ -76,6 +76,7 @@ public class ControlLoopOperationManager2 implements Serializable { GUARD_STARTED, GUARD_PERMITTED, GUARD_DENIED, + OPERATION_STARTED, OPERATION_SUCCESS, OPERATION_FAILURE, CONTROL_LOOP_TIMEOUT @@ -197,6 +198,7 @@ public class ControlLoopOperationManager2 implements Serializable { attempt = ControlLoopOperationManager2.this.attempts; policyResult = outcome.getResult(); clOperation = outcome.toControlLoopOperation(); + clOperation.setTarget(policy.getTarget().toString()); } } @@ -356,7 +358,7 @@ public class ControlLoopOperationManager2 implements Serializable { * @param outcome outcome provided to the callback */ private void onStart(OperationOutcome outcome) { - if (GUARD_ACTOR.equals(outcome.getActor())) { + if (outcome.isFor(actor, operation) || GUARD_ACTOR.equals(outcome.getActor())) { addOutcome(outcome); } } @@ -477,10 +479,23 @@ public class ControlLoopOperationManager2 implements Serializable { break; default: - // operation completed - ++attempts; + if (outcome.getEnd() == null) { + // operation started + ++attempts; + state = State.OPERATION_STARTED; + operationHistory.add(new Operation(outcome)); + break; + } + + /* + * Operation completed. If the last entry was a "start" (i.e., "end" field + * is null), then replace it. Otherwise, just add the completion. + */ state = (outcome.getResult() == PolicyResult.SUCCESS ? State.OPERATION_SUCCESS : State.OPERATION_FAILURE); + if (!operationHistory.isEmpty() && operationHistory.peekLast().getClOperation().getEnd() == null) { + operationHistory.removeLast(); + } operationHistory.add(new Operation(outcome)); storeOperationInDataBase(); break; diff --git a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager2Test.java b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager2Test.java index 522d9f57b..d09c2c88b 100644 --- a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager2Test.java +++ b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager2Test.java @@ -137,14 +137,17 @@ public class ControlLoopEventManager2Test { when(oper1.getActor()).thenReturn("First"); when(oper1.getOperation()).thenReturn("OperationA"); when(oper1.getOperationMessage()).thenReturn("message-A"); + when(oper1.getOperationHistory()).thenReturn("history-A"); when(oper2.getActor()).thenReturn("Second"); when(oper2.getOperation()).thenReturn("OperationB"); when(oper2.getOperationMessage()).thenReturn("message-B"); + when(oper2.getOperationHistory()).thenReturn("history-B"); when(oper3.getActor()).thenReturn("Third"); when(oper3.getOperation()).thenReturn("OperationC"); when(oper3.getOperationMessage()).thenReturn("message-C"); + when(oper3.getOperationHistory()).thenReturn("history-C"); when(workMem.getFactHandle(any())).thenReturn(factHandle); @@ -365,13 +368,17 @@ public class ControlLoopEventManager2Test { mgr.updated(oper1); verifyNotification(ControlLoopNotificationType.OPERATION, "Guard result for First OperationA is Deny"); + when(oper1.getState()).thenReturn(State.OPERATION_STARTED); + mgr.updated(oper1); + verifyNotification(ControlLoopNotificationType.OPERATION, "message-A"); + when(oper1.getState()).thenReturn(State.OPERATION_SUCCESS); mgr.updated(oper1); - verifyNotification(ControlLoopNotificationType.OPERATION_SUCCESS, "message-A"); + verifyNotification(ControlLoopNotificationType.OPERATION_SUCCESS, "history-A"); when(oper1.getState()).thenReturn(State.OPERATION_FAILURE); mgr.updated(oper1); - verifyNotification(ControlLoopNotificationType.OPERATION_FAILURE, "message-A"); + verifyNotification(ControlLoopNotificationType.OPERATION_FAILURE, "history-A"); // should still be active assertTrue(mgr.isActive()); @@ -427,6 +434,9 @@ public class ControlLoopEventManager2Test { @Test public void testMakeNotification() throws ControlLoopException { + // before started + assertNotNull(mgr.makeNotification()); + mgr.start(); nextStep(oper1, true, PolicyResult.SUCCESS); @@ -434,7 +444,7 @@ public class ControlLoopEventManager2Test { // check notification while running VirtualControlLoopNotification notif = mgr.getNotification(); - assertEquals("message-A", notif.getMessage()); + assertEquals("history-A", notif.getMessage()); List<ControlLoopOperation> history = notif.getHistory(); assertNotNull(history); diff --git a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager2Test.java b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager2Test.java index a14cc1708..e946d2edc 100644 --- a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager2Test.java +++ b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager2Test.java @@ -188,6 +188,9 @@ public class ControlLoopOperationManager2Test { assertEquals(ControlLoopOperationManager2.State.GUARD_PERMITTED, mgr.getState()); assertTrue(mgr.nextStep()); + assertEquals(ControlLoopOperationManager2.State.OPERATION_STARTED, mgr.getState()); + + assertTrue(mgr.nextStep()); assertEquals(ControlLoopOperationManager2.State.OPERATION_SUCCESS, mgr.getState()); assertFalse(mgr.nextStep()); @@ -196,7 +199,7 @@ public class ControlLoopOperationManager2Test { assertEquals(PolicyResult.SUCCESS, outcome.getResult()); assertTrue(outcome.isFinalOutcome()); - verify(mgrctx, times(3)).updated(mgr); + verify(mgrctx, times(4)).updated(mgr); } /** @@ -204,7 +207,7 @@ public class ControlLoopOperationManager2Test { */ @Test public void testStartDetmTargetException() { - policy.setTarget(null); + policy.setTarget(new Target()); mgr.start(REMAINING_MS); runToCompletion(); @@ -454,13 +457,16 @@ public class ControlLoopOperationManager2Test { assertEquals(ControlLoopOperationManager2.State.GUARD_PERMITTED, mgr.getState()); assertTrue(mgr.nextStep()); + assertEquals(ControlLoopOperationManager2.State.OPERATION_STARTED, mgr.getState()); + + assertTrue(mgr.nextStep()); assertEquals(ControlLoopOperationManager2.State.OPERATION_SUCCESS, mgr.getState()); assertFalse(mgr.nextStep()); assertEquals(PolicyResult.SUCCESS, mgr.getOutcomes().peek().getResult()); - verify(mgrctx, times(3)).updated(mgr); + verify(mgrctx, times(4)).updated(mgr); } @Test @@ -600,10 +606,13 @@ public class ControlLoopOperationManager2Test { assertEquals(ControlLoopOperationManager2.State.GUARD_PERMITTED, mgr.getState()); assertTrue(mgr.nextStep()); + assertEquals(ControlLoopOperationManager2.State.OPERATION_STARTED, mgr.getState()); + + assertTrue(mgr.nextStep()); assertEquals(ControlLoopOperationManager2.State.OPERATION_SUCCESS, mgr.getState()); assertFalse(mgr.nextStep()); - verify(mgrctx, times(3)).updated(mgr); + verify(mgrctx, times(4)).updated(mgr); verifyDb(1, PolicyResult.SUCCESS, null); } @@ -627,6 +636,9 @@ public class ControlLoopOperationManager2Test { assertEquals(ControlLoopOperationManager2.State.GUARD_PERMITTED, mgr.getState()); assertTrue(mgr.nextStep()); + assertEquals(ControlLoopOperationManager2.State.OPERATION_STARTED, mgr.getState()); + + assertTrue(mgr.nextStep()); assertEquals(ControlLoopOperationManager2.State.OPERATION_FAILURE, mgr.getState()); verifyDb(1, PolicyResult.FAILURE, null); @@ -637,6 +649,9 @@ public class ControlLoopOperationManager2Test { runToCompletion(); assertTrue(mgr.nextStep()); + assertEquals(ControlLoopOperationManager2.State.OPERATION_STARTED, mgr.getState()); + + assertTrue(mgr.nextStep()); assertEquals(ControlLoopOperationManager2.State.OPERATION_FAILURE, mgr.getState()); verifyDb(2, PolicyResult.FAILURE, null); @@ -646,13 +661,16 @@ public class ControlLoopOperationManager2Test { genOpOutcome(); assertTrue(mgr.nextStep()); + assertEquals(ControlLoopOperationManager2.State.OPERATION_STARTED, mgr.getState()); + + assertTrue(mgr.nextStep()); assertEquals(ControlLoopOperationManager2.State.OPERATION_SUCCESS, mgr.getState()); verifyDb(3, PolicyResult.SUCCESS, null); assertThat(mgr.toString()).contains("attempts=3"); assertFalse(mgr.nextStep()); - verify(mgrctx, times(5)).updated(mgr); + verify(mgrctx, times(8)).updated(mgr); } @Test @@ -802,8 +820,16 @@ public class ControlLoopOperationManager2Test { runToCompletion(); + // guard start assertTrue(mgr.nextStep()); + + // guard permit assertTrue(mgr.nextStep()); + + // operation start + assertTrue(mgr.nextStep()); + + // operation success assertFalse(mgr.nextStep()); } |