diff options
| author |   leventecsanyi <levente.csanyi@est.tech> | 2024-08-05 15:46:59 +0200 |
|---|---|---|
| committer | leventecsanyi <levente.csanyi@est.tech> | 2024-08-26 12:39:09 +0200 |
| commit | 658f4d4786b7f7290d91d3d16e99c405c176d686 (patch) | |
| tree | 51e4bedf47b246baabd3e3e462ff8b924f9a22d9 /dmi-service | |
| parent | 636c228c5d646e7c919bc5ce135fa2967b3fef5a (diff) | |
Fixed URL for data job result
- fixed opeanapi and stub
- updated pnp simulator image
Issue-ID: CPS-2296
Signed-off-by: leventecsanyi <levente.csanyi@est.tech>
Change-Id: I6654762256097f9deb8ce40cfc8014bed67cb269
Diffstat (limited to 'dmi-service')
3 files changed, 5 insertions, 7 deletions
diff --git a/dmi-service/openapi/openapi-datajob.yml b/dmi-service/openapi/openapi-datajob.yml index 09e23a9e..569fa19f 100644 --- a/dmi-service/openapi/openapi-datajob.yml +++ b/dmi-service/openapi/openapi-datajob.yml @@ -73,14 +73,13 @@ paths: responses: "501": $ref: '#/components/responses/NotImplemented' - /v1/dataJob/{requestId}/dataProducerJob/{dataProducerJobId}/result: + /v1/cmwriteJob/dataProducer/{dataProducerId}/dataProducerJob/{dataProducerJobId}/result: get: description: Retrieve the result of a data job. operationId: getDataJobResult parameters: - - $ref: '#/components/parameters/requestIdInPath' + - $ref: '#/components/parameters/dataProducerIdInPath' - $ref: '#/components/parameters/dataProducerJobIdInPath' - - $ref: '#/components/parameters/dataProducerIdInQuery' - $ref: '#/components/parameters/destinationInQuery' tags: - dmi-datajob diff --git a/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/datajobs/rest/controller/DmiDatajobsRestController.java b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/datajobs/rest/controller/DmiDatajobsRestController.java index 6ab56f57..8376e4a3 100644 --- a/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/datajobs/rest/controller/DmiDatajobsRestController.java +++ b/dmi-service/src/main/java/org/onap/cps/ncmp/dmi/datajobs/rest/controller/DmiDatajobsRestController.java @@ -70,15 +70,14 @@ public class DmiDatajobsRestController implements DmiDatajobApi { /** * This method is not implemented for ONAP DMI plugin. * - * @param dataProducerJobId Identifier for the data producer job (required) * @param dataProducerId Identifier for the data producer as a query parameter (required) + * @param dataProducerJobId Identifier for the data producer job (required) * @param destination The destination of the results, Kafka topic name or s3 bucket name (required) * @return ResponseEntity Response entity indicating the method is not implemented */ @Override - public ResponseEntity<Void> getDataJobResult(final String requestId, + public ResponseEntity<Void> getDataJobResult(final String dataProducerId, final String dataProducerJobId, - final String dataProducerId, final String destination) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } diff --git a/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/datajobs/rest/controller/DmiDatajobsRestControllerSpec.groovy b/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/datajobs/rest/controller/DmiDatajobsRestControllerSpec.groovy index 17354e65..e2669c46 100644 --- a/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/datajobs/rest/controller/DmiDatajobsRestControllerSpec.groovy +++ b/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/datajobs/rest/controller/DmiDatajobsRestControllerSpec.groovy @@ -82,7 +82,7 @@ class DmiDatajobsRestControllerSpec extends Specification{ def 'get result request should return 501 HTTP Status' () { given: 'URL to get the result of a data job' - def getStatus = "${basePathV1}/dataJob/some-identifier/dataProducerJob/some-producer-job-identifier/result?dataProducerId=some-data-producer-identifier&destination=some-destination" + def getStatus = "${basePathV1}/cmwriteJob/dataProducer/some-identifier/dataProducerJob/some-producer-job-identifier/result?destination=some-destination" when: 'the request is performed' def response = mvc.perform( get(getStatus) |