aboutsummaryrefslogtreecommitdiffstats
path: root/models-interactions/model-actors/actor.test/src
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2020-08-21 13:43:08 -0400
committerJim Hahn <jrh3@att.com>2020-10-27 14:55:15 -0400
commit19ef8b24a98c09a349e6ae7309f535a0135463f6 (patch)
treed988e5a58865ae6f3a38dcb31e4f195f18e59946 /models-interactions/model-actors/actor.test/src
parent6b29d2c19e288148171db0c0e446e18dcd46effd (diff)
Make Actors event-agnostic
Removed event and event-context code from the Actor code. Also removed the preprocessing steps from the Actor code, giving the application complete control over any preprocessing. Also fixed a bug wherein the APPC actor was treating the AAI_RESOURCE_VNF property as a String instead of as a GenericVnf. Issue-ID: POLICY-2746-actor Change-Id: Ibc05fe39ffedc0bc461abf10e6a960861ac70119 Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'models-interactions/model-actors/actor.test/src')
-rw-r--r--models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicOperation.java83
-rw-r--r--models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicBidirectionalTopicOperationTest.java1
-rw-r--r--models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicHttpOperationTest.java1
-rw-r--r--models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicOperationTest.java35
4 files changed, 4 insertions, 116 deletions
diff --git a/models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicOperation.java b/models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicOperation.java
index cdedbf401..bb7f34b61 100644
--- a/models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicOperation.java
+++ b/models-interactions/model-actors/actor.test/src/main/java/org/onap/policy/controlloop/actor/test/BasicOperation.java
@@ -21,34 +21,22 @@
package org.onap.policy.controlloop.actor.test;
import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
import java.util.Map;
-import java.util.TreeMap;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor;
import javax.ws.rs.core.Response;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.onap.policy.aai.AaiConstants;
-import org.onap.policy.aai.AaiCqResponse;
import org.onap.policy.common.utils.coder.Coder;
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.common.utils.time.PseudoExecutor;
-import org.onap.policy.controlloop.VirtualControlLoopEvent;
import org.onap.policy.controlloop.actorserviceprovider.ActorService;
-import org.onap.policy.controlloop.actorserviceprovider.Operation;
import org.onap.policy.controlloop.actorserviceprovider.OperationOutcome;
-import org.onap.policy.controlloop.actorserviceprovider.OperationResult;
-import org.onap.policy.controlloop.actorserviceprovider.Operator;
-import org.onap.policy.controlloop.actorserviceprovider.controlloop.ControlLoopEventContext;
-import org.onap.policy.controlloop.actorserviceprovider.impl.OperationPartial;
import org.onap.policy.controlloop.actorserviceprovider.parameters.ControlLoopOperationParams;
-import org.onap.policy.controlloop.actorserviceprovider.spi.Actor;
/**
* Superclass for various Operation tests.
@@ -76,27 +64,9 @@ public class BasicOperation {
@Mock
protected ActorService service;
- @Mock
- protected Actor guardActor;
- @Mock
- protected Operator guardOperator;
- @Mock
- protected Operation guardOperation;
- @Mock
- protected Actor cqActor;
- @Mock
- protected Operator cqOperator;
- @Mock
- protected Operation cqOperation;
- @Mock
- protected AaiCqResponse cqResponse;
- protected CompletableFuture<OperationOutcome> cqFuture;
protected CompletableFuture<Response> future;
protected ControlLoopOperationParams params;
- protected Map<String, String> enrichment;
- protected VirtualControlLoopEvent event;
- protected ControlLoopEventContext context;
protected OperationOutcome outcome;
protected PseudoExecutor executor;
@@ -125,64 +95,27 @@ public class BasicOperation {
public void setUpBasic() {
MockitoAnnotations.initMocks(this);
- cqFuture = new CompletableFuture<>();
future = new CompletableFuture<>();
executor = new PseudoExecutor();
makeContext();
- when(service.getActor(OperationPartial.GUARD_ACTOR_NAME)).thenReturn(guardActor);
- when(guardActor.getOperator(OperationPartial.GUARD_OPERATION_NAME)).thenReturn(guardOperator);
- when(guardOperator.buildOperation(any())).thenReturn(guardOperation);
-
- outcome = params.makeOutcome(TARGET_ENTITY);
- outcome.setResult(OperationResult.SUCCESS);
- when(guardOperation.start()).thenReturn(CompletableFuture.completedFuture(outcome));
-
- when(service.getActor(AaiConstants.ACTOR_NAME)).thenReturn(cqActor);
- when(cqActor.getOperator("CustomQuery")).thenReturn(cqOperator);
- when(cqOperator.buildOperation(any())).thenReturn(cqOperation);
-
- when(cqOperation.start()).thenReturn(cqFuture);
-
// get a fresh outcome
outcome = params.makeOutcome(TARGET_ENTITY);
}
/**
- * Reinitializes {@link #enrichment}, {@link #event}, {@link #context}, and
- * {@link #params}.
+ * Reinitializes {@link #params}.
* <p/>
* Note: {@link #params} is configured to use {@link #executor}.
*/
protected void makeContext() {
- enrichment = new TreeMap<>(makeEnrichment());
-
- event = new VirtualControlLoopEvent();
- event.setRequestId(REQ_ID);
- event.setAai(enrichment);
- event.setClosedLoopControlName(CL_NAME);
- event.setPolicyName(EVENT_POLICY_NAME);
- event.setPolicyVersion(EVENT_POLICY_VERSION);
- event.setVersion(EVENT_VERSION);
-
- context = new ControlLoopEventContext(event);
-
- params = ControlLoopOperationParams.builder().executor(executor).context(context).actorService(service)
+ params = ControlLoopOperationParams.builder().executor(executor).requestId(REQ_ID).actorService(service)
.actor(actorName).operation(operationName).targetEntity(TARGET_ENTITY).payload(makePayload())
.build();
}
- /**
- * Makes enrichment data.
- *
- * @return enrichment data
- */
- protected Map<String, String> makeEnrichment() {
- return new TreeMap<>();
- }
-
/**
* Makes payload data.
@@ -218,16 +151,4 @@ public class BasicOperation {
assertEquals(expected, json);
}
-
- /**
- * Provides a response to a custom query.
- *
- * @param cq response to provide
- */
- protected void provideCqResponse(AaiCqResponse cq) {
- context.setProperty(AaiCqResponse.CONTEXT_KEY, cq);
- OperationOutcome outcome2 = params.makeOutcome(TARGET_ENTITY);
- outcome2.setResult(OperationResult.SUCCESS);
- cqFuture.complete(outcome2);
- }
}
diff --git a/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicBidirectionalTopicOperationTest.java b/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicBidirectionalTopicOperationTest.java
index 17ddb391a..6cccc5cb7 100644
--- a/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicBidirectionalTopicOperationTest.java
+++ b/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicBidirectionalTopicOperationTest.java
@@ -103,7 +103,6 @@ public class BasicBidirectionalTopicOperationTest {
@Test
public void testSetUp() {
assertNotNull(oper.config);
- assertNotNull(oper.context);
assertNotNull(oper.outcome);
assertNotNull(oper.executor);
}
diff --git a/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicHttpOperationTest.java b/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicHttpOperationTest.java
index 2327fec00..62c19b80a 100644
--- a/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicHttpOperationTest.java
+++ b/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicHttpOperationTest.java
@@ -64,7 +64,6 @@ public class BasicHttpOperationTest {
assertEquals(200, oper.rawResponse.getStatus());
assertNotNull(oper.future);
assertEquals(BasicHttpOperation.BASE_URI, oper.client.getBaseUrl());
- assertNotNull(oper.context);
assertNotNull(oper.outcome);
assertNotNull(oper.executor);
}
diff --git a/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicOperationTest.java b/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicOperationTest.java
index 60d3ddd31..fe06ad52f 100644
--- a/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicOperationTest.java
+++ b/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicOperationTest.java
@@ -24,19 +24,13 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
import java.util.Map;
-import java.util.concurrent.CompletableFuture;
import org.junit.Before;
import org.junit.Test;
-import org.onap.policy.aai.AaiCqResponse;
import org.onap.policy.common.utils.coder.CoderException;
import org.onap.policy.common.utils.resources.ResourceUtils;
-import org.onap.policy.controlloop.actorserviceprovider.OperationOutcome;
-import org.onap.policy.controlloop.actorserviceprovider.OperationResult;
import org.onap.policy.controlloop.actorserviceprovider.Util;
-import org.onap.policy.controlloop.actorserviceprovider.impl.OperationPartial;
public class BasicOperationTest {
private static final String ACTOR = "my-actor";
@@ -67,39 +61,24 @@ public class BasicOperationTest {
@Test
public void testSetUp() throws Exception {
assertNotNull(oper.future);
- assertNotNull(oper.context);
assertNotNull(oper.outcome);
assertNotNull(oper.executor);
- assertNotNull(oper.guardOperation);
-
- CompletableFuture<OperationOutcome> future = oper.service.getActor(OperationPartial.GUARD_ACTOR_NAME)
- .getOperator(OperationPartial.GUARD_OPERATION_NAME).buildOperation(null).start();
- assertTrue(future.isDone());
- assertEquals(OperationResult.SUCCESS, future.get().getResult());
}
@Test
public void testMakeContext() {
oper.makeContext();
- assertTrue(oper.enrichment.isEmpty());
-
- assertSame(BasicHttpOperation.REQ_ID, oper.event.getRequestId());
- assertSame(oper.enrichment, oper.event.getAai());
-
- assertSame(oper.event, oper.context.getEvent());
-
- assertSame(oper.context, oper.params.getContext());
assertSame(oper.service, oper.params.getActorService());
assertSame(oper.executor, oper.params.getExecutor());
assertEquals(ACTOR, oper.params.getActor());
assertEquals(OPERATION, oper.params.getOperation());
+ assertSame(BasicHttpOperation.REQ_ID, oper.params.getRequestId());
assertEquals(BasicHttpOperation.TARGET_ENTITY, oper.params.getTargetEntity());
}
@Test
- public void testMakeEnrichment_testMakePayload() {
- assertTrue(oper.makeEnrichment().isEmpty());
+ public void testMakePayload() {
assertNull(oper.makePayload());
}
@@ -108,14 +87,4 @@ public class BasicOperationTest {
Map<String, Object> map = Util.translateToMap("", ResourceUtils.getResourceAsString("actual.json"));
oper.verifyRequest("expected.json", map, "svc-request-id", "vnf-id");
}
-
- @Test
- public void testProvideCqResponse() throws Exception {
- AaiCqResponse cq = new AaiCqResponse("{}");
- oper.provideCqResponse(cq);
-
- assertSame(cq, oper.context.getProperty(AaiCqResponse.CONTEXT_KEY));
- assertTrue(oper.cqFuture.isDone());
- assertEquals(OperationResult.SUCCESS, oper.cqFuture.get().getResult());
- }
}