X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=models-interactions%2Fmodel-actors%2Factor.sdnr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fcontrolloop%2Factor%2Fsdnr%2FSdnrOperation.java;h=7e57bcccd0fbfecfbabb095d2b60059cf25a1209;hb=865100d2bbaafac77f1d9e637bca81adc03c4c44;hp=40face7fa1467ae9aee1d62fb4bec46441c61403;hpb=fc99c7710aaaf5f3c1f663e344db61e72b0de90b;p=policy%2Fmodels.git diff --git a/models-interactions/model-actors/actor.sdnr/src/main/java/org/onap/policy/controlloop/actor/sdnr/SdnrOperation.java b/models-interactions/model-actors/actor.sdnr/src/main/java/org/onap/policy/controlloop/actor/sdnr/SdnrOperation.java index 40face7fa..7e57bcccd 100644 --- a/models-interactions/model-actors/actor.sdnr/src/main/java/org/onap/policy/controlloop/actor/sdnr/SdnrOperation.java +++ b/models-interactions/model-actors/actor.sdnr/src/main/java/org/onap/policy/controlloop/actor/sdnr/SdnrOperation.java @@ -2,7 +2,8 @@ * ============LICENSE_START======================================================= * SdnrOperation * ================================================================================ - * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2020-2021 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,15 +22,13 @@ package org.onap.policy.controlloop.actor.sdnr; import java.util.List; -import java.util.concurrent.CompletableFuture; -import org.onap.policy.controlloop.ControlLoopResponse; -import org.onap.policy.controlloop.VirtualControlLoopEvent; 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.BidirectionalTopicOperation; import org.onap.policy.controlloop.actorserviceprovider.parameters.BidirectionalTopicConfig; import org.onap.policy.controlloop.actorserviceprovider.parameters.ControlLoopOperationParams; import org.onap.policy.controlloop.actorserviceprovider.topic.SelectorKey; -import org.onap.policy.controlloop.policy.PolicyResult; import org.onap.policy.sdnr.PciBody; import org.onap.policy.sdnr.PciCommonHeader; import org.onap.policy.sdnr.PciMessage; @@ -47,6 +46,8 @@ public class SdnrOperation extends BidirectionalTopicOperation PROPERTY_NAMES = List.of(OperationProperties.EVENT_PAYLOAD); + /** * Keys used to match the response with the request listener. The sub request ID is a * UUID, so it can be used to uniquely identify the response. @@ -58,7 +59,7 @@ public class SdnrOperation extends BidirectionalTopicOperation startPreprocessorAsync() { - return startGuardAsync(); - } - /* * NOTE: This should avoid throwing exceptions, so that a ControlLoopResponse can be * added to the outcome. Consequently, it returns FAILURE if a required field is @@ -88,105 +84,75 @@ public class SdnrOperation extends BidirectionalTopicOperation Status.SUCCESS; + case FAILURE, PARTIAL_FAILURE -> Status.FAILURE; + case ERROR, REJECT -> { logger.warn("SDNR request was not accepted, code={}", code); - return Status.FAILURE; - case ACCEPTED: - default: + yield Status.FAILURE; + } + default -> // awaiting a "final" response - return Status.STILL_WAITING; - } + Status.STILL_WAITING; + }; } /** * Sets the message to the status description, if available. */ @Override - public OperationOutcome setOutcome(OperationOutcome outcome, PolicyResult result, PciMessage responseWrapper) { + public OperationOutcome setOutcome(OperationOutcome outcome, OperationResult result, PciMessage responseWrapper) { + outcome.setResponse(responseWrapper); + if (responseWrapper.getBody() == null || responseWrapper.getBody().getOutput() == null) { - outcome.setControlLoopResponse(makeControlLoopResponse(null)); return setOutcome(outcome, result); } - PciResponse response = responseWrapper.getBody().getOutput(); - if (response.getStatus() == null || response.getStatus().getValue() == null) { - outcome.setControlLoopResponse(makeControlLoopResponse(response.getPayload())); + var pciResponse = responseWrapper.getBody().getOutput(); + if (pciResponse.getStatus() == null || pciResponse.getStatus().getValue() == null) { return setOutcome(outcome, result); } outcome.setResult(result); - outcome.setMessage(response.getStatus().getValue()); - outcome.setControlLoopResponse(makeControlLoopResponse(response.getPayload())); + outcome.setMessage(pciResponse.getStatus().getValue()); return outcome; } - /** - * Converts the SDNR response to a ControlLoopResponse. - * - * @param responsePayload payload from the response - * - * @return a new ControlLoopResponse - */ - private ControlLoopResponse makeControlLoopResponse(String responsePayload) { - VirtualControlLoopEvent event = params.getContext().getEvent(); - - ControlLoopResponse clRsp = new ControlLoopResponse(); - clRsp.setPayload(responsePayload); - clRsp.setFrom(params.getActor()); - clRsp.setTarget("DCAE"); - clRsp.setClosedLoopControlName(event.getClosedLoopControlName()); - clRsp.setPolicyName(event.getPolicyName()); - clRsp.setPolicyVersion(event.getPolicyVersion()); - clRsp.setRequestId(event.getRequestId()); - clRsp.setVersion(event.getVersion()); - - return clRsp; - } - @Override protected PciMessage makeRequest(int attempt) { - VirtualControlLoopEvent onset = params.getContext().getEvent(); String subRequestId = getSubRequestId(); /* Construct an SDNR request using pci Model */ - PciMessage dmaapRequest = new PciMessage(); + var dmaapRequest = new PciMessage(); dmaapRequest.setVersion("1.0"); - dmaapRequest.setCorrelationId(onset.getRequestId() + "-" + subRequestId); + dmaapRequest.setCorrelationId(params.getRequestId() + "-" + subRequestId); dmaapRequest.setType("request"); dmaapRequest.setRpcName(params.getOperation().toLowerCase()); /* This is the actual request that is placed in the dmaap wrapper. */ - final PciRequest sdnrRequest = new PciRequest(); + final var sdnrRequest = new PciRequest(); /* The common header is a required field for all SDNR requests. */ - PciCommonHeader requestCommonHeader = new PciCommonHeader(); - requestCommonHeader.setRequestId(onset.getRequestId()); + var requestCommonHeader = new PciCommonHeader(); + requestCommonHeader.setRequestId(params.getRequestId()); requestCommonHeader.setSubRequestId(subRequestId); sdnrRequest.setCommonHeader(requestCommonHeader); - sdnrRequest.setPayload(onset.getPayload()); + sdnrRequest.setPayload(getRequiredProperty(OperationProperties.EVENT_PAYLOAD, "event payload")); sdnrRequest.setAction(params.getOperation()); /* * Once the pci request is constructed, add it into the body of the dmaap wrapper. */ - PciBody body = new PciBody(); + var body = new PciBody(); body.setInput(sdnrRequest); dmaapRequest.setBody(body);