diff options
Diffstat (limited to 'models-interactions/model-actors/actor.vfc')
2 files changed, 28 insertions, 3 deletions
diff --git a/models-interactions/model-actors/actor.vfc/src/main/java/org/onap/policy/controlloop/actor/vfc/VfcOperation.java b/models-interactions/model-actors/actor.vfc/src/main/java/org/onap/policy/controlloop/actor/vfc/VfcOperation.java index d5ee44a5d..8bd4630d6 100644 --- a/models-interactions/model-actors/actor.vfc/src/main/java/org/onap/policy/controlloop/actor/vfc/VfcOperation.java +++ b/models-interactions/model-actors/actor.vfc/src/main/java/org/onap/policy/controlloop/actor/vfc/VfcOperation.java @@ -20,10 +20,12 @@ package org.onap.policy.controlloop.actor.vfc; +import java.util.List; import java.util.concurrent.CompletableFuture; import javax.ws.rs.core.Response; import org.apache.commons.lang3.StringUtils; import org.onap.policy.controlloop.actorserviceprovider.OperationOutcome; +import org.onap.policy.controlloop.actorserviceprovider.OperationProperties; import org.onap.policy.controlloop.actorserviceprovider.controlloop.ControlLoopEventContext; import org.onap.policy.controlloop.actorserviceprovider.impl.HttpOperation; import org.onap.policy.controlloop.actorserviceprovider.parameters.ControlLoopOperationParams; @@ -44,6 +46,14 @@ public abstract class VfcOperation extends HttpOperation<VfcResponse> { public static final String REQ_PARAM_NM = "requestParameters"; public static final String CONFIG_PARAM_NM = "configurationParameters"; + // @formatter:off + private static final List<String> PROPERTY_NAMES = List.of( + OperationProperties.ENRICHMENT_SERVICE_INSTANCE_ID, + OperationProperties.ENRICHMENT_VSERVER_ID, + OperationProperties.ENRICHMENT_VSERVER_NAME, + OperationProperties.ENRICHMENT_GENERIC_VNF_ID); + // @formatter:on + /** * Job ID extracted from the first response. */ @@ -57,7 +67,7 @@ public abstract class VfcOperation extends HttpOperation<VfcResponse> { * @param config configuration for this operation */ public VfcOperation(ControlLoopOperationParams params, HttpConfig config) { - super(params, config, VfcResponse.class); + super(params, config, VfcResponse.class, PROPERTY_NAMES); setUsePolling(); } @@ -180,14 +190,14 @@ public abstract class VfcOperation extends HttpOperation<VfcResponse> { additionalParams.setActionInfo(vmActionInfo); VfcHealRequest healRequest = new VfcHealRequest(); - healRequest.setVnfInstanceId(params.getContext().getEvent().getAai().get(GENERIC_VNF_ID)); + healRequest.setVnfInstanceId(params.getContext().getEnrichment().get(GENERIC_VNF_ID)); healRequest.setCause(getName()); healRequest.setAdditionalParams(additionalParams); VfcRequest request = new VfcRequest(); request.setHealRequest(healRequest); request.setNsInstanceId(serviceInstance); - request.setRequestId(context.getEvent().getRequestId()); + request.setRequestId(params.getRequestId()); return request; } diff --git a/models-interactions/model-actors/actor.vfc/src/test/java/org/onap/policy/controlloop/actor/vfc/RestartTest.java b/models-interactions/model-actors/actor.vfc/src/test/java/org/onap/policy/controlloop/actor/vfc/RestartTest.java index ed072f761..46666456a 100644 --- a/models-interactions/model-actors/actor.vfc/src/test/java/org/onap/policy/controlloop/actor/vfc/RestartTest.java +++ b/models-interactions/model-actors/actor.vfc/src/test/java/org/onap/policy/controlloop/actor/vfc/RestartTest.java @@ -20,10 +20,12 @@ package org.onap.policy.controlloop.actor.vfc; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import java.util.List; import java.util.concurrent.CompletableFuture; import org.apache.commons.lang3.tuple.Pair; import org.junit.AfterClass; @@ -32,6 +34,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.onap.policy.common.endpoints.http.client.HttpClientFactoryInstance; import org.onap.policy.controlloop.actorserviceprovider.OperationOutcome; +import org.onap.policy.controlloop.actorserviceprovider.OperationProperties; import org.onap.policy.controlloop.actorserviceprovider.parameters.HttpPollingConfig; import org.onap.policy.controlloop.actorserviceprovider.parameters.HttpPollingParams; import org.onap.policy.controlloop.policy.PolicyResult; @@ -89,6 +92,18 @@ public class RestartTest extends BasicVfcOperation { } @Test + public void testGetPropertyNames() { + // @formatter:off + assertThat(restartOper.getPropertyNames()).isEqualTo( + List.of( + OperationProperties.ENRICHMENT_SERVICE_INSTANCE_ID, + OperationProperties.ENRICHMENT_VSERVER_ID, + OperationProperties.ENRICHMENT_VSERVER_NAME, + OperationProperties.ENRICHMENT_GENERIC_VNF_ID)); + // @formatter:on + } + + @Test public void testMakeRequest() { Pair<String, VfcRequest> resultPair = restartOper.makeRequest(); assertNotNull(resultPair.getLeft()); |