X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=models-interactions%2Fmodel-actors%2Factor.aai%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fpolicy%2Fcontrolloop%2Factor%2Faai%2FAaiCustomQueryOperationTest.java;h=dd6d0ec18f32ca2f9422735a5b82c443d3c6fd38;hb=e3938e43b8a1f02f74368ecb75c38530285feac0;hp=8e8b8f150eaad5e12bb0b8302456362ca3af7423;hpb=43aaa62cdf9a7dadfb6d688f1fe83c5bd355a86d;p=policy%2Fmodels.git diff --git a/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiCustomQueryOperationTest.java b/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiCustomQueryOperationTest.java index 8e8b8f150..dd6d0ec18 100644 --- a/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiCustomQueryOperationTest.java +++ b/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiCustomQueryOperationTest.java @@ -3,6 +3,7 @@ * ONAP * ================================================================================ * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2023 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,14 +22,12 @@ package org.onap.policy.controlloop.actor.aai; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.assertj.core.api.Assertions.assertThatIllegalStateException; 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 static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -44,33 +43,23 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.mockito.Mock; +import org.junit.runner.RunWith; +import org.mockito.junit.MockitoJUnitRunner; import org.onap.policy.aai.AaiConstants; import org.onap.policy.aai.AaiCqResponse; -import org.onap.policy.common.endpoints.http.client.HttpClientFactory; import org.onap.policy.common.endpoints.http.client.HttpClientFactoryInstance; import org.onap.policy.common.utils.coder.StandardCoder; -import org.onap.policy.common.utils.coder.StandardCoderObject; import org.onap.policy.controlloop.actorserviceprovider.OperationOutcome; import org.onap.policy.controlloop.actorserviceprovider.OperationProperties; -import org.onap.policy.controlloop.actorserviceprovider.Util; -import org.onap.policy.controlloop.actorserviceprovider.impl.HttpOperation; -import org.onap.policy.controlloop.actorserviceprovider.impl.HttpOperator; -import org.onap.policy.controlloop.actorserviceprovider.parameters.ControlLoopOperationParams; +import org.onap.policy.controlloop.actorserviceprovider.OperationResult; import org.onap.policy.controlloop.actorserviceprovider.parameters.HttpConfig; import org.onap.policy.controlloop.actorserviceprovider.parameters.HttpParams; -import org.onap.policy.controlloop.actorserviceprovider.spi.Actor; -import org.onap.policy.controlloop.policy.PolicyResult; +@RunWith(MockitoJUnitRunner.class) public class AaiCustomQueryOperationTest extends BasicAaiOperation { private static final StandardCoder coder = new StandardCoder(); private static final String MY_LINK = "my-link"; - private static final String MY_VSERVER = "my-vserver-name"; - private static final String SIM_VSERVER = "OzVServer"; - - @Mock - private Actor tenantActor; private AaiCustomQueryOperation oper; @@ -95,14 +84,8 @@ public class AaiCustomQueryOperationTest extends BasicAaiOperation { public void setUp() throws Exception { super.setUpBasic(); - params.getContext().getEnrichment().put(AaiCustomQueryOperation.VSERVER_VSERVER_NAME, MY_VSERVER); - - MyTenantOperator tenantOperator = new MyTenantOperator(); - - when(service.getActor(AaiConstants.ACTOR_NAME)).thenReturn(tenantActor); - when(tenantActor.getOperator(AaiGetTenantOperation.NAME)).thenReturn(tenantOperator); - oper = new AaiCustomQueryOperation(params, config); + oper.setProperty(OperationProperties.AAI_VSERVER_LINK, MY_LINK); } /** @@ -113,14 +96,13 @@ public class AaiCustomQueryOperationTest extends BasicAaiOperation { HttpParams opParams = HttpParams.builder().clientName(MY_CLIENT).path("v16/query").build(); config = new HttpConfig(blockingExecutor, opParams, HttpClientFactoryInstance.getClientFactory()); - params = params.toBuilder().retry(0).timeoutSec(5).executor(blockingExecutor).preprocessed(true).build(); + params = params.toBuilder().retry(0).timeoutSec(5).executor(blockingExecutor).build(); oper = new AaiCustomQueryOperation(params, config); - oper.setProperty(OperationProperties.AAI_TARGET_ENTITY, SIM_VSERVER); oper.setProperty(OperationProperties.AAI_VSERVER_LINK, MY_LINK); outcome = oper.start().get(); - assertEquals(PolicyResult.SUCCESS, outcome.getResult()); + assertEquals(OperationResult.SUCCESS, outcome.getResult()); assertNotNull(outcome.getResponse()); } @@ -131,16 +113,6 @@ public class AaiCustomQueryOperationTest extends BasicAaiOperation { assertEquals(AaiCustomQueryOperation.NAME, oper.getName()); } - @Test - public void testGetVserver() { - assertEquals(MY_VSERVER, oper.getVserver()); - - // try without enrichment data - params.getContext().getEnrichment().remove(AaiCustomQueryOperation.VSERVER_VSERVER_NAME); - assertThatIllegalArgumentException().isThrownBy(() -> oper.getVserver()) - .withMessage("missing " + AaiCustomQueryOperation.VSERVER_VSERVER_NAME + " in enrichment data"); - } - @Test public void testGetPropertyNames() { assertThat(oper.getPropertyNames()).isEqualTo(List.of(OperationProperties.AAI_VSERVER_LINK)); @@ -152,62 +124,21 @@ public class AaiCustomQueryOperationTest extends BasicAaiOperation { assertEquals("3", oper.getSubRequestId()); } - /** - * Tests startPreprocessorAsync(), when preprocessing is disabled. - */ - @Test - public void testStartPreprocessorAsyncDisabled() { - params = params.toBuilder().preprocessed(true).build(); - assertNull(new AaiCustomQueryOperation(params, config).startPreprocessorAsync()); - } - @Test @SuppressWarnings("unchecked") - public void testStartOperationAsync_testStartPreprocessorAsync_testMakeRequest_testPostProcess() throws Exception { + public void testStartOperationAsync_testMakeRequest() throws Exception { // need two responses when(rawResponse.readEntity(String.class)).thenReturn(makeTenantReply()).thenReturn(makeCqReply()); - when(webAsync.get(any(InvocationCallback.class))).thenAnswer(provideResponse(rawResponse)); + lenient().when(webAsync.get(any(InvocationCallback.class))).thenAnswer(provideResponse(rawResponse)); when(webAsync.put(any(), any(InvocationCallback.class))).thenAnswer(provideResponse(rawResponse, 1)); CompletableFuture future2 = oper.start(); - assertEquals(PolicyResult.SUCCESS, getResult(future2)); - - // tenant response should have been cached within the context - assertNotNull(context.getProperty(AaiGetTenantOperation.getKey(MY_VSERVER))); - - // custom query response should have been cached within the context - AaiCqResponse cqData = context.getProperty(AaiCqResponse.CONTEXT_KEY); - assertNotNull(cqData); + assertEquals(OperationResult.SUCCESS, getResult(future2)); assertEquals("1", future2.get().getSubRequestId()); } - /** - * Tests when preprocessor step is not needed. - */ - @Test - @SuppressWarnings("unchecked") - public void testStartOperationAsync_testStartPreprocessorAsyncNotNeeded() throws Exception { - // pre-load the tenant data - final StandardCoderObject data = preloadTenantData(); - - // only need one response - when(rawResponse.readEntity(String.class)).thenReturn(makeCqReply()); - when(webAsync.put(any(), any(InvocationCallback.class))).thenAnswer(provideResponse(rawResponse, 1)); - - CompletableFuture future2 = oper.start(); - - assertEquals(PolicyResult.SUCCESS, getResult(future2)); - - // should not have replaced tenant response - assertSame(data, context.getProperty(AaiGetTenantOperation.getKey(MY_VSERVER))); - - // custom query response should have been cached within the context - AaiCqResponse cqData = context.getProperty(AaiCqResponse.CONTEXT_KEY); - assertNotNull(cqData); - } - @Test public void testMakeHeaders() { verifyHeaders(oper.makeHeaders()); @@ -216,9 +147,6 @@ public class AaiCustomQueryOperationTest extends BasicAaiOperation { @Test @SuppressWarnings("unchecked") public void testMakeRequest_testGetVserverLink() throws Exception { - // preload - preloadTenantData(); - when(rawResponse.readEntity(String.class)).thenReturn(makeCqReply()); when(webAsync.put(any(), any(InvocationCallback.class))).thenAnswer(provideResponse(rawResponse, 1)); @@ -237,32 +165,17 @@ public class AaiCustomQueryOperationTest extends BasicAaiOperation { } @Test - public void testGetVserverLinkViaProperty() throws Exception { + public void testGetVserverLink() throws Exception { oper.setProperty(OperationProperties.AAI_VSERVER_LINK, MY_LINK); assertEquals(MY_LINK, oper.getVserverLink()); } - @Test - public void testGetVserverLinkNoTenantData() throws Exception { - assertThatIllegalStateException().isThrownBy(() -> oper.getVserverLink()) - .withMessage("cannot perform custom query - cannot determine resource-link"); - } - - @Test - public void testGetVserverLinkNoResourceLink() throws Exception { - // pre-load EMPTY tenant data - preloadTenantData(new StandardCoderObject()); - - assertThatIllegalArgumentException().isThrownBy(() -> oper.getVserverLink()) - .withMessage("cannot perform custom query - no resource-link"); - } - @Test public void testSetOutcome() { - outcome = oper.setOutcome(params.makeOutcome(null), PolicyResult.SUCCESS, null, null); + outcome = oper.setOutcome(params.makeOutcome(), OperationResult.SUCCESS, null, null); assertNull(outcome.getResponse()); - outcome = oper.setOutcome(params.makeOutcome(null), PolicyResult.SUCCESS, null, "{}"); + outcome = oper.setOutcome(params.makeOutcome(), OperationResult.SUCCESS, null, "{}"); assertTrue(outcome.getResponse() instanceof AaiCqResponse); } @@ -278,18 +191,8 @@ public class AaiCustomQueryOperationTest extends BasicAaiOperation { return "{}"; } - private StandardCoderObject preloadTenantData() throws Exception { - StandardCoderObject data = coder.decode(makeTenantReply(), StandardCoderObject.class); - preloadTenantData(data); - return data; - } - - private void preloadTenantData(StandardCoderObject data) { - context.setProperty(AaiGetTenantOperation.getKey(MY_VSERVER), data); - context.setProperty(AaiGetTenantOperation.getKey(SIM_VSERVER), data); - } - private PolicyResult getResult(CompletableFuture future2) + private OperationResult getResult(CompletableFuture future2) throws InterruptedException, ExecutionException, TimeoutException { executor.runAll(100); @@ -297,25 +200,4 @@ public class AaiCustomQueryOperationTest extends BasicAaiOperation { return future2.get().getResult(); } - - protected class MyTenantOperator extends HttpOperator { - public MyTenantOperator() { - super(AaiConstants.ACTOR_NAME, AaiGetTenantOperation.NAME); - - HttpParams http = HttpParams.builder().clientName(MY_CLIENT).path(PATH).timeoutSec(1).build(); - - configure(Util.translateToMap(AaiGetTenantOperation.NAME, http)); - start(); - } - - @Override - public HttpOperation buildOperation(ControlLoopOperationParams params) { - return new AaiGetTenantOperation(params, getCurrentConfig()); - } - - @Override - protected HttpClientFactory getClientFactory() { - return factory; - } - } }