diff options
Diffstat (limited to 'models-interactions/model-actors/actor.so')
6 files changed, 67 insertions, 9 deletions
diff --git a/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SoOperation.java b/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SoOperation.java index cb9ec9c40..f269ea078 100644 --- a/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SoOperation.java +++ b/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SoOperation.java @@ -86,9 +86,10 @@ public abstract class SoOperation extends HttpOperation<SoResponse> { * * @param params operation parameters * @param config configuration for this operation + * @param propertyNames names of properties required by this operation */ - public SoOperation(ControlLoopOperationParams params, HttpPollingConfig config) { - super(params, config, SoResponse.class); + public SoOperation(ControlLoopOperationParams params, HttpPollingConfig config, List<String> propertyNames) { + super(params, config, SoResponse.class, propertyNames); setUsePolling(); diff --git a/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/VfModuleCreate.java b/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/VfModuleCreate.java index c56bc222f..fcd48b1a5 100644 --- a/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/VfModuleCreate.java +++ b/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/VfModuleCreate.java @@ -20,6 +20,7 @@ package org.onap.policy.controlloop.actor.so; +import java.util.List; import java.util.Map; import java.util.concurrent.CompletableFuture; import javax.ws.rs.client.Entity; @@ -35,6 +36,7 @@ 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.controlloop.actorserviceprovider.OperationOutcome; +import org.onap.policy.controlloop.actorserviceprovider.OperationProperties; import org.onap.policy.controlloop.actorserviceprovider.parameters.ControlLoopOperationParams; import org.onap.policy.controlloop.actorserviceprovider.parameters.HttpPollingConfig; import org.onap.policy.so.SoModelInfo; @@ -57,6 +59,15 @@ public class VfModuleCreate extends SoOperation { private static final String PATH_PREFIX = "/"; + // @formatter:off + private static final List<String> PROPERTY_NAMES = List.of( + OperationProperties.AAI_MODEL_SERVICE, + OperationProperties.AAI_MODEL_VNF, + OperationProperties.AAI_MODEL_CLOUD_REGION, + OperationProperties.AAI_MODEL_TENANT, + OperationProperties.DATA_VF_COUNT); + // @formatter:off + /** * Constructs the object. * @@ -64,7 +75,7 @@ public class VfModuleCreate extends SoOperation { * @param config configuration for this operation */ public VfModuleCreate(ControlLoopOperationParams params, HttpPollingConfig config) { - super(params, config); + super(params, config, PROPERTY_NAMES); // ensure we have the necessary parameters validateTarget(); diff --git a/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/VfModuleDelete.java b/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/VfModuleDelete.java index dc8b0d606..b7afb696c 100644 --- a/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/VfModuleDelete.java +++ b/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/VfModuleDelete.java @@ -28,6 +28,7 @@ import java.net.http.HttpResponse; import java.net.http.HttpResponse.BodyHandlers; import java.nio.charset.StandardCharsets; import java.util.Base64; +import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.CompletableFuture; @@ -46,6 +47,7 @@ import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure; import org.onap.policy.common.endpoints.http.client.HttpClient; import org.onap.policy.common.endpoints.utils.NetLoggerUtil.EventType; import org.onap.policy.controlloop.actorserviceprovider.OperationOutcome; +import org.onap.policy.controlloop.actorserviceprovider.OperationProperties; import org.onap.policy.controlloop.actorserviceprovider.parameters.ControlLoopOperationParams; import org.onap.policy.controlloop.actorserviceprovider.parameters.HttpPollingConfig; import org.onap.policy.controlloop.actorserviceprovider.pipeline.PipelineControllerFuture; @@ -66,6 +68,15 @@ public class VfModuleDelete extends SoOperation { private static final String PATH_PREFIX = "/"; + // @formatter:off + private static final List<String> PROPERTY_NAMES = List.of( + OperationProperties.AAI_MODEL_SERVICE, + OperationProperties.AAI_MODEL_VNF, + OperationProperties.AAI_MODEL_CLOUD_REGION, + OperationProperties.AAI_MODEL_TENANT, + OperationProperties.DATA_VF_COUNT); + // @formatter:on + /** * Constructs the object. * @@ -73,7 +84,7 @@ public class VfModuleDelete extends SoOperation { * @param config configuration for this operation */ public VfModuleDelete(ControlLoopOperationParams params, HttpPollingConfig config) { - super(params, config); + super(params, config, PROPERTY_NAMES); // ensure we have the necessary parameters validateTarget(); diff --git a/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/SoOperationTest.java b/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/SoOperationTest.java index 46d96fded..7314c59fa 100644 --- a/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/SoOperationTest.java +++ b/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/SoOperationTest.java @@ -60,6 +60,9 @@ public class SoOperationTest extends BasicSoOperation { private static final String VF_COUNT_KEY = SoConstants.VF_COUNT_PREFIX + "[my-model-customization-id][my-model-invariant-id][my-model-version-id]"; + + private static final List<String> PROP_NAMES = Collections.emptyList(); + private SoOperation oper; /** @@ -71,7 +74,7 @@ public class SoOperationTest extends BasicSoOperation { initConfig(); - oper = new SoOperation(params, config) {}; + oper = new SoOperation(params, config, PROP_NAMES) {}; } @Test @@ -83,7 +86,7 @@ public class SoOperationTest extends BasicSoOperation { // check when Target is null params = params.toBuilder().target(null).build(); - assertThatIllegalArgumentException().isThrownBy(() -> new SoOperation(params, config) {}) + assertThatIllegalArgumentException().isThrownBy(() -> new SoOperation(params, config, PROP_NAMES) {}) .withMessageContaining("Target information"); } @@ -222,7 +225,7 @@ public class SoOperationTest extends BasicSoOperation { // try with null target params = params.toBuilder().target(null).build(); - assertThatIllegalArgumentException().isThrownBy(() -> new SoOperation(params, config) {}) + assertThatIllegalArgumentException().isThrownBy(() -> new SoOperation(params, config, PROP_NAMES) {}) .withMessageContaining("missing Target"); } @@ -258,7 +261,7 @@ public class SoOperationTest extends BasicSoOperation { // null payload params = params.toBuilder().payload(null).build(); - oper = new SoOperation(params, config) {}; + oper = new SoOperation(params, config, PROP_NAMES) {}; assertTrue(oper.buildRequestParameters().isEmpty()); } @@ -278,7 +281,7 @@ public class SoOperationTest extends BasicSoOperation { // null payload params = params.toBuilder().payload(null).build(); - oper = new SoOperation(params, config) {}; + oper = new SoOperation(params, config, PROP_NAMES) {}; assertTrue(oper.buildConfigurationParameters().isEmpty()); } diff --git a/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/VfModuleCreateTest.java b/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/VfModuleCreateTest.java index 94268646d..0db209dad 100644 --- a/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/VfModuleCreateTest.java +++ b/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/VfModuleCreateTest.java @@ -20,6 +20,7 @@ package org.onap.policy.controlloop.actor.so; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -30,6 +31,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import java.util.List; import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ForkJoinPool; @@ -50,6 +52,7 @@ import org.onap.policy.aai.AaiCqResponse; import org.onap.policy.common.endpoints.http.client.HttpClientFactoryInstance; import org.onap.policy.common.utils.coder.CoderException; import org.onap.policy.controlloop.actorserviceprovider.OperationOutcome; +import org.onap.policy.controlloop.actorserviceprovider.OperationProperties; import org.onap.policy.controlloop.actorserviceprovider.parameters.ControlLoopOperationParams; import org.onap.policy.controlloop.actorserviceprovider.parameters.HttpPollingConfig; import org.onap.policy.controlloop.actorserviceprovider.parameters.HttpPollingParams; @@ -116,6 +119,19 @@ public class VfModuleCreateTest extends BasicSoOperation { } @Test + public void testGetPropertyNames() { + // @formatter:off + assertThat(oper.getPropertyNames()).isEqualTo( + List.of( + OperationProperties.AAI_MODEL_SERVICE, + OperationProperties.AAI_MODEL_VNF, + OperationProperties.AAI_MODEL_CLOUD_REGION, + OperationProperties.AAI_MODEL_TENANT, + OperationProperties.DATA_VF_COUNT)); + // @formatter:on + } + + @Test public void testStartPreprocessorAsync() throws Exception { // insert CQ data so it's there for the check context.setProperty(AaiCqResponse.CONTEXT_KEY, makeCqResponse()); diff --git a/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/VfModuleDeleteTest.java b/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/VfModuleDeleteTest.java index d7b53411b..7c37dc900 100644 --- a/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/VfModuleDeleteTest.java +++ b/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/VfModuleDeleteTest.java @@ -20,6 +20,7 @@ package org.onap.policy.controlloop.actor.so; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -39,6 +40,7 @@ import java.net.http.HttpResponse; import java.net.http.HttpResponse.BodyHandlers; import java.nio.charset.StandardCharsets; import java.util.Base64; +import java.util.List; import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ForkJoinPool; @@ -63,6 +65,7 @@ import org.onap.policy.aai.AaiCqResponse; import org.onap.policy.common.endpoints.http.client.HttpClientFactoryInstance; import org.onap.policy.common.utils.coder.CoderException; import org.onap.policy.controlloop.actorserviceprovider.OperationOutcome; +import org.onap.policy.controlloop.actorserviceprovider.OperationProperties; import org.onap.policy.controlloop.actorserviceprovider.parameters.ControlLoopOperationParams; import org.onap.policy.controlloop.actorserviceprovider.parameters.HttpPollingConfig; import org.onap.policy.controlloop.actorserviceprovider.parameters.HttpPollingParams; @@ -145,6 +148,19 @@ public class VfModuleDeleteTest extends BasicSoOperation { } @Test + public void testGetPropertyNames() { + // @formatter:off + assertThat(oper.getPropertyNames()).isEqualTo( + List.of( + OperationProperties.AAI_MODEL_SERVICE, + OperationProperties.AAI_MODEL_VNF, + OperationProperties.AAI_MODEL_CLOUD_REGION, + OperationProperties.AAI_MODEL_TENANT, + OperationProperties.DATA_VF_COUNT)); + // @formatter:on + } + + @Test public void testStartPreprocessorAsync() throws Exception { // insert CQ data so it's there for the check context.setProperty(AaiCqResponse.CONTEXT_KEY, makeCqResponse()); |