diff options
Diffstat (limited to 'models-interactions/model-actors/actor.aai')
6 files changed, 4 insertions, 264 deletions
diff --git a/models-interactions/model-actors/actor.aai/src/main/java/org/onap/policy/controlloop/actor/aai/AaiCustomQueryOperation.java b/models-interactions/model-actors/actor.aai/src/main/java/org/onap/policy/controlloop/actor/aai/AaiCustomQueryOperation.java index 612fba98d..27dd56c60 100644 --- a/models-interactions/model-actors/actor.aai/src/main/java/org/onap/policy/controlloop/actor/aai/AaiCustomQueryOperation.java +++ b/models-interactions/model-actors/actor.aai/src/main/java/org/onap/policy/controlloop/actor/aai/AaiCustomQueryOperation.java @@ -29,20 +29,15 @@ import javax.ws.rs.client.Invocation.Builder; import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import org.apache.commons.lang3.StringUtils; -import org.onap.policy.aai.AaiConstants; import org.onap.policy.aai.AaiCqResponse; import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure; import org.onap.policy.common.endpoints.utils.NetLoggerUtil.EventType; -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.OperationResult; import org.onap.policy.controlloop.actorserviceprovider.impl.HttpOperation; import org.onap.policy.controlloop.actorserviceprovider.parameters.ControlLoopOperationParams; import org.onap.policy.controlloop.actorserviceprovider.parameters.HttpConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * A&AI Custom Query. Stores the {@link AaiCqResponse} in the context. In addition, if the @@ -51,8 +46,6 @@ import org.slf4j.LoggerFactory; * applies to the vserver, thus the target entity may be set to an empty string. */ public class AaiCustomQueryOperation extends HttpOperation<String> { - private static final Logger logger = LoggerFactory.getLogger(AaiCustomQueryOperation.class); - public static final String NAME = AaiCqResponse.OPERATION; public static final String VSERVER_VSERVER_NAME = "vserver.vserver-name"; @@ -61,9 +54,6 @@ public class AaiCustomQueryOperation extends HttpOperation<String> { private static final List<String> PROPERTY_NAMES = List.of(OperationProperties.AAI_VSERVER_LINK); - // TODO make this configurable - private static final String PREFIX = "/aai/v16"; - /** * Constructs the object. * @@ -74,37 +64,6 @@ public class AaiCustomQueryOperation extends HttpOperation<String> { super(params, config, String.class, PROPERTY_NAMES); } - /** - * Gets the vserver name from the enrichment data. - * - * @return the vserver name - */ - protected String getVserver() { - String vserver = this.params.getContext().getEnrichment().get(VSERVER_VSERVER_NAME); - if (StringUtils.isBlank(vserver)) { - throw new IllegalArgumentException("missing " + VSERVER_VSERVER_NAME + " in enrichment data"); - } - - return vserver; - } - - /** - * Queries the vserver, if necessary. - */ - @Override - protected CompletableFuture<OperationOutcome> startPreprocessorAsync() { - if (params.isPreprocessed()) { - return null; - } - - String vserver = getVserver(); - ControlLoopOperationParams tenantParams = - params.toBuilder().actor(AaiConstants.ACTOR_NAME).operation(AaiGetTenantOperation.NAME) - .targetEntity(vserver).payload(null).retry(null).timeoutSec(null).build(); - - return params.getContext().obtain(AaiGetTenantOperation.getKey(vserver), tenantParams); - } - @Override public void generateSubRequestId(int attempt) { setSubRequestId(String.valueOf(attempt)); @@ -162,24 +121,7 @@ public class AaiCustomQueryOperation extends HttpOperation<String> { * @return the vserver link */ protected String getVserverLink() { - String resourceLink = getProperty(OperationProperties.AAI_VSERVER_LINK); - if (resourceLink != null) { - return resourceLink; - } - - String vserver = getVserver(); - StandardCoderObject tenant = params.getContext().getProperty(AaiGetTenantOperation.getKey(vserver)); - if (tenant == null) { - throw new IllegalStateException("cannot perform custom query - cannot determine resource-link"); - } - - resourceLink = tenant.getString(RESULT_DATA, 0, RESOURCE_LINK); - if (resourceLink == null) { - throw new IllegalArgumentException("cannot perform custom query - no resource-link"); - } - - resourceLink = resourceLink.replace(PREFIX, ""); - return resourceLink; + return getRequiredProperty(OperationProperties.AAI_VSERVER_LINK, "vserver link"); } @Override @@ -199,19 +141,4 @@ public class AaiCustomQueryOperation extends HttpOperation<String> { return outcome; } - - /** - * Injects the response into the context. - */ - @Override - protected CompletableFuture<OperationOutcome> postProcessResponse(OperationOutcome outcome, String url, - Response rawResponse, String response) { - - if (params.getContext() != null) { - logger.info("{}: caching response for {}", getFullName(), params.getRequestId()); - params.getContext().setProperty(AaiCqResponse.CONTEXT_KEY, new AaiCqResponse(response)); - } - - return super.postProcessResponse(outcome, url, rawResponse, response); - } } diff --git a/models-interactions/model-actors/actor.aai/src/main/java/org/onap/policy/controlloop/actor/aai/AaiGetOperation.java b/models-interactions/model-actors/actor.aai/src/main/java/org/onap/policy/controlloop/actor/aai/AaiGetOperation.java index 3fb978d88..a07722383 100644 --- a/models-interactions/model-actors/actor.aai/src/main/java/org/onap/policy/controlloop/actor/aai/AaiGetOperation.java +++ b/models-interactions/model-actors/actor.aai/src/main/java/org/onap/policy/controlloop/actor/aai/AaiGetOperation.java @@ -23,18 +23,13 @@ package org.onap.policy.controlloop.actor.aai; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import java.util.concurrent.CompletableFuture; import javax.ws.rs.client.Invocation.Builder; import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; 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.impl.HttpOperation; import org.onap.policy.controlloop.actorserviceprovider.parameters.ControlLoopOperationParams; import org.onap.policy.controlloop.actorserviceprovider.parameters.HttpConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Superclass of A&AI operators that use "get" to perform their request and store their @@ -42,19 +37,10 @@ import org.slf4j.LoggerFactory; * which they are stored is ${actor}.${operation}.${targetEntity}. */ public class AaiGetOperation extends HttpOperation<StandardCoderObject> { - private static final Logger logger = LoggerFactory.getLogger(AaiGetOperation.class); - public static final int DEFAULT_RETRY = 3; private static final List<String> PROPERTY_NAMES = List.of(OperationProperties.AAI_TARGET_ENTITY); - - /** - * Responses that are retrieved from A&AI are placed in the operation context under - * the name "${propertyPrefix}.${targetEntity}". - */ - private final String propertyPrefix; - /** * Constructs the object. * @@ -63,7 +49,6 @@ public class AaiGetOperation extends HttpOperation<StandardCoderObject> { */ public AaiGetOperation(ControlLoopOperationParams params, HttpConfig config) { super(params, config, StandardCoderObject.class, PROPERTY_NAMES); - this.propertyPrefix = getFullName() + "."; } @Override @@ -108,22 +93,6 @@ public class AaiGetOperation extends HttpOperation<StandardCoderObject> { } /** - * Injects the response into the context. - */ - @Override - protected CompletableFuture<OperationOutcome> postProcessResponse(OperationOutcome outcome, String url, - Response rawResponse, StandardCoderObject response) { - - if (params.getContext() != null) { - String entity = getTargetEntity(); - logger.info("{}: caching response of {} for {}", getFullName(), entity, params.getRequestId()); - params.getContext().setProperty(propertyPrefix + entity, response); - } - - return super.postProcessResponse(outcome, url, rawResponse, response); - } - - /** * Provides a default retry value, if none specified. */ @Override 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 5a5e170dd..61155ce07 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 @@ -21,12 +21,9 @@ 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.verify; @@ -44,33 +41,20 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.mockito.Mock; 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.OperationResult; -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.parameters.HttpConfig; import org.onap.policy.controlloop.actorserviceprovider.parameters.HttpParams; -import org.onap.policy.controlloop.actorserviceprovider.spi.Actor; 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 +79,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); } /** @@ -115,7 +93,6 @@ public class AaiCustomQueryOperationTest extends BasicAaiOperation { params = params.toBuilder().retry(0).timeoutSec(5).executor(blockingExecutor).preprocessed(true).build(); oper = new AaiCustomQueryOperation(params, config); - oper.setProperty(OperationProperties.AAI_TARGET_ENTITY, SIM_VSERVER); oper.setProperty(OperationProperties.AAI_VSERVER_LINK, MY_LINK); @@ -132,16 +109,6 @@ public class AaiCustomQueryOperationTest extends BasicAaiOperation { } @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,18 +119,9 @@ 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)); @@ -173,41 +131,9 @@ public class AaiCustomQueryOperationTest extends BasicAaiOperation { assertEquals(OperationResult.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("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<OperationOutcome> future2 = oper.start(); - - assertEquals(OperationResult.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 +142,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,27 +160,12 @@ 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), OperationResult.SUCCESS, null, null); assertNull(outcome.getResponse()); @@ -278,16 +186,6 @@ 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 OperationResult getResult(CompletableFuture<OperationOutcome> future2) throws InterruptedException, ExecutionException, TimeoutException { @@ -297,25 +195,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; - } - } } diff --git a/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiGetOperationTest.java b/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiGetOperationTest.java index df0dbff98..1cde4c860 100644 --- a/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiGetOperationTest.java +++ b/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiGetOperationTest.java @@ -29,7 +29,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import java.util.Map; -import java.util.concurrent.CompletableFuture; import javax.ws.rs.client.Invocation.Builder; import javax.ws.rs.client.WebTarget; import org.junit.AfterClass; @@ -37,14 +36,11 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.onap.policy.aai.AaiConstants; -import org.onap.policy.common.utils.coder.StandardCoderObject; -import org.onap.policy.controlloop.actorserviceprovider.OperationOutcome; public class AaiGetOperationTest extends BasicAaiOperation { private static final String MY_NAME = "my-operation-name"; private static final String PARAM_NAME = "my-param"; private static final String PARAM_VALUE = "my-value"; - private static final String MY_URL = "my-url"; private AaiGetOperation oper; @@ -105,15 +101,6 @@ public class AaiGetOperationTest extends BasicAaiOperation { } @Test - public void testPostProcessResponse() throws Exception { - StandardCoderObject resp = new StandardCoderObject(); - CompletableFuture<OperationOutcome> future2 = oper.postProcessResponse(outcome, MY_URL, null, resp); - - assertSame(outcome, future2.get()); - assertSame(resp, context.getProperty("AAI.my-operation-name.my-target")); - } - - @Test public void testGetRetry() { // use default if null retry assertEquals(AaiGetOperation.DEFAULT_RETRY, oper.getRetry(null)); diff --git a/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiGetPnfOperationTest.java b/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiGetPnfOperationTest.java index 84f28210e..fb2b770db 100644 --- a/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiGetPnfOperationTest.java +++ b/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiGetPnfOperationTest.java @@ -23,8 +23,6 @@ package org.onap.policy.controlloop.actor.aai; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; @@ -141,11 +139,6 @@ public class AaiGetPnfOperationTest extends BasicAaiOperation { assertEquals(OperationResult.SUCCESS, future2.get().getResult()); - // data should have been cached within the context - StandardCoderObject data = context.getProperty(AaiGetPnfOperation.getKey(TARGET_ENTITY)); - assertNotNull(data); - assertEquals(TEXT, data.getString(INPUT_FIELD)); - assertEquals("1", future2.get().getSubRequestId()); } @@ -168,9 +161,6 @@ public class AaiGetPnfOperationTest extends BasicAaiOperation { assertTrue(future2.isDone()); assertEquals(OperationResult.FAILURE, future2.get().getResult()); - - // data should NOT have been cached within the context - assertNull(context.getProperty(AaiGetPnfOperation.getKey(TARGET_ENTITY))); } @Test diff --git a/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiGetTenantOperationTest.java b/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiGetTenantOperationTest.java index cf9a7a6a1..27495d8fc 100644 --- a/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiGetTenantOperationTest.java +++ b/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiGetTenantOperationTest.java @@ -23,8 +23,6 @@ package org.onap.policy.controlloop.actor.aai; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; @@ -141,11 +139,6 @@ public class AaiGetTenantOperationTest extends BasicAaiOperation { assertEquals(OperationResult.SUCCESS, future2.get().getResult()); - // data should have been cached within the context - StandardCoderObject data = context.getProperty(AaiGetTenantOperation.getKey(TARGET_ENTITY)); - assertNotNull(data); - assertEquals(TEXT, data.getString(INPUT_FIELD)); - assertEquals("1", future2.get().getSubRequestId()); } @@ -168,9 +161,6 @@ public class AaiGetTenantOperationTest extends BasicAaiOperation { assertTrue(future2.isDone()); assertEquals(OperationResult.FAILURE, future2.get().getResult()); - - // data should NOT have been cached within the context - assertNull(context.getProperty(AaiGetTenantOperation.getKey(TARGET_ENTITY))); } @Test |