X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=models-interactions%2Fmodel-actors%2Factor.so%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fpolicy%2Fcontrolloop%2Factor%2Fso%2FBasicSoOperation.java;h=1e38861e2f9e051c587e8c87d1ba4fb573fed463;hb=e3938e43b8a1f02f74368ecb75c38530285feac0;hp=aaecb46a8565cfe5a6828a49f17423379e117710;hpb=afe5abed95c6cbfe239066e267d9c10a71f20623;p=policy%2Fmodels.git diff --git a/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/BasicSoOperation.java b/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/BasicSoOperation.java index aaecb46a8..1e38861e2 100644 --- a/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/BasicSoOperation.java +++ b/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/BasicSoOperation.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. @@ -20,8 +21,7 @@ package org.onap.policy.controlloop.actor.so; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.when; +import static org.mockito.Mockito.lenient; import java.util.Collections; import java.util.HashMap; @@ -29,14 +29,14 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import org.mockito.Mock; -import org.onap.policy.aai.AaiCqResponse; import org.onap.policy.common.endpoints.event.comm.bus.internal.BusTopicParams; import org.onap.policy.common.endpoints.http.client.HttpClientFactoryInstance; import org.onap.policy.common.endpoints.http.server.HttpServletServerFactoryInstance; -import org.onap.policy.common.gson.GsonMessageBodyHandler; import org.onap.policy.controlloop.actor.test.BasicHttpOperation; +import org.onap.policy.controlloop.actorserviceprovider.TargetType; import org.onap.policy.controlloop.actorserviceprovider.Util; -import org.onap.policy.controlloop.policy.Target; +import org.onap.policy.controlloop.actorserviceprovider.parameters.ControlLoopOperationParams; +import org.onap.policy.controlloop.actorserviceprovider.parameters.HttpPollingConfig; import org.onap.policy.simulators.SoSimulatorJaxRs; import org.onap.policy.so.SoRequest; import org.onap.policy.so.SoRequestParameters; @@ -47,7 +47,7 @@ import org.onap.policy.so.SoResponse; /** * Superclass for various operator tests. */ -public abstract class BasicSoOperation extends BasicHttpOperation { +public abstract class BasicSoOperation extends BasicHttpOperation { protected static final String[] IGNORE_FIELDS = {"RequestID", "subRequestID", "seconds", "nanos"}; public static final String MODEL_CUSTOM_ID = "my-model-customization-id"; @@ -57,15 +57,16 @@ public abstract class BasicSoOperation extends BasicHttpOperation { public static final String MODEL_VERS_ID = "my-model-version-id"; public static final String SUBSCRIPTION_SVC_TYPE = "my-subscription-service-type"; public static final String MY_PATH = "my-path"; - public static final String PATH_GET = "my-path-get/"; - public static final int MAX_GETS = 3; - public static final int WAIT_SEC_GETS = 20; + public static final String POLL_PATH = "my-poll-path/"; + public static final int MAX_POLLS = 3; + public static final int POLL_WAIT_SEC = 20; public static final Integer VF_COUNT = 10; @Mock - protected SoConfig config; + protected HttpPollingConfig config; - protected Target target; + protected TargetType targetType; + protected Map targetEntities = new HashMap<>(); protected SoResponse response; /** @@ -93,7 +94,7 @@ public abstract class BasicSoOperation extends BasicHttpOperation { BusTopicParams clientParams = BusTopicParams.builder().clientName(MY_CLIENT).basePath("").hostname("localhost") .managed(true).port(org.onap.policy.simulators.Util.SOSIM_SERVER_PORT) - .serializationProvider(GsonMessageBodyHandler.class.getName()).build(); + .build(); HttpClientFactoryInstance.getClientFactory().build(clientParams); SoSimulatorJaxRs.setRequirePolling(true); @@ -124,8 +125,8 @@ public abstract class BasicSoOperation extends BasicHttpOperation { response.setRequestReferences(ref); ref.setRequestId(REQ_ID.toString()); - when(rawResponse.getStatus()).thenReturn(200); - when(rawResponse.readEntity(String.class)).thenReturn(coder.encode(response)); + lenient().when(rawResponse.getStatus()).thenReturn(200); + lenient().when(rawResponse.readEntity(String.class)).thenReturn(coder.encode(response)); initConfig(); } @@ -133,25 +134,27 @@ public abstract class BasicSoOperation extends BasicHttpOperation { @Override protected void initConfig() { super.initConfig(); - when(config.getClient()).thenReturn(client); - when(config.getPath()).thenReturn(MY_PATH); - when(config.getMaxGets()).thenReturn(MAX_GETS); - when(config.getPathGet()).thenReturn(PATH_GET); - when(config.getWaitSecGet()).thenReturn(WAIT_SEC_GETS); + lenient().when(config.getClient()).thenReturn(client); + lenient().when(config.getPath()).thenReturn(MY_PATH); + lenient().when(config.getMaxPolls()).thenReturn(MAX_POLLS); + lenient().when(config.getPollPath()).thenReturn(POLL_PATH); + lenient().when(config.getPollWaitSec()).thenReturn(POLL_WAIT_SEC); } @Override protected void makeContext() { super.makeContext(); - target = new Target(); - target.setModelCustomizationId(MODEL_CUSTOM_ID); - target.setModelInvariantId(MODEL_INVAR_ID); - target.setModelName(MODEL_NAME); - target.setModelVersion(MODEL_VERSION); - target.setModelVersionId(MODEL_VERS_ID); + targetType = TargetType.VNF; - params = params.toBuilder().target(target).build(); + targetEntities = new HashMap<>(); + targetEntities.put(ControlLoopOperationParams.PARAMS_ENTITY_MODEL_CUSTOMIZATION_ID, MODEL_CUSTOM_ID); + targetEntities.put(ControlLoopOperationParams.PARAMS_ENTITY_MODEL_INVARIANT_ID, MODEL_INVAR_ID); + targetEntities.put(ControlLoopOperationParams.PARAMS_ENTITY_MODEL_NAME, MODEL_NAME); + targetEntities.put(ControlLoopOperationParams.PARAMS_ENTITY_MODEL_VERSION, MODEL_VERSION); + targetEntities.put(ControlLoopOperationParams.PARAMS_ENTITY_MODEL_VERSION_ID, MODEL_VERS_ID); + + params = params.toBuilder().targetType(targetType).targetEntityIds(targetEntities).build(); } @Override @@ -170,9 +173,4 @@ public abstract class BasicSoOperation extends BasicHttpOperation { return payload; } - - protected AaiCqResponse makeCqResponse() { - when(cqResponse.getVfModuleCount(any(), any(), any())).thenReturn(VF_COUNT); - return cqResponse; - } }