diff options
| author |   aditya puthuparambil <aditya.puthuparambil@bell.ca> | 2022-01-21 12:23:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2022-01-21 12:23:11 +0000 |
| commit | db1e983f40be1db7bca5acacf5a3369d74a29c95 (patch) | |
| tree | b552087409b305e12fce2844d7e994d30481b99e /cps-ncmp-rest | |
| parent | 87b991eb6502c20f441d00faa953f82de04fe12d (diff) | |
| parent | ecd7f5e418c17d8f0f3f12af4fd0a543084e8254 (diff) | |
Merge "patch operation for ncmp running"
Diffstat (limited to 'cps-ncmp-rest')
3 files changed, 48 insertions, 4 deletions
diff --git a/cps-ncmp-rest/docs/openapi/components.yaml b/cps-ncmp-rest/docs/openapi/components.yaml index d9bd49a097..e63f9c0b84 100644 --- a/cps-ncmp-rest/docs/openapi/components.yaml +++ b/cps-ncmp-rest/docs/openapi/components.yaml @@ -151,6 +151,50 @@ components: - authors: - Philip Pullman + dataSamplePatchRequest: + summary: Sample patch request + description: Sample patch request body + value: + ietf-restconf:yang-patch: + patch-id: patch-1 + edit: + - edit-id: edit1 + operation: merge + target: / + value: + test:bookstore: + bookstore-name: Chapters + categories: + - code: '01' + name: Science + books: + - authors: + - Author1 + - Author2 + - code: '02' + name: Arts + books: + - authors: + - Author3 + - edit-id: edit2 + operation: merge + target: / + value: + test:bookstore: + bookstore-name: Novels + categories: + - code: '03' + name: History + books: + - authors: + - Iain M. Banks + - Ursula K. Le Guin + - code: '04' + name: Fiction + books: + - authors: + - Philip Pullman + dataSampleResponse: summary: Sample response description: Sample response for selecting 'sample 1'. diff --git a/cps-ncmp-rest/docs/openapi/ncmp.yml b/cps-ncmp-rest/docs/openapi/ncmp.yml index 71b4f1c453..d80ec6508e 100755 --- a/cps-ncmp-rest/docs/openapi/ncmp.yml +++ b/cps-ncmp-rest/docs/openapi/ncmp.yml @@ -165,12 +165,12 @@ resourceDataForPassthroughRunning: requestBody: required: true content: - application/json: + '*/*': schema: type: object examples: dataSampleRequest: - $ref: 'components.yaml#/components/examples/dataSampleRequest' + $ref: 'components.yaml#/components/examples/dataSamplePatchRequest' responses: 200: $ref: 'components.yaml#/components/responses/Ok' diff --git a/cps-ncmp-rest/src/main/java/org/onap/cps/ncmp/rest/controller/NetworkCmProxyController.java b/cps-ncmp-rest/src/main/java/org/onap/cps/ncmp/rest/controller/NetworkCmProxyController.java index a97852fe2b..f2f43c9897 100755 --- a/cps-ncmp-rest/src/main/java/org/onap/cps/ncmp/rest/controller/NetworkCmProxyController.java +++ b/cps-ncmp-rest/src/main/java/org/onap/cps/ncmp/rest/controller/NetworkCmProxyController.java @@ -118,9 +118,9 @@ public class NetworkCmProxyController implements NetworkCmProxyApi { public ResponseEntity<Object> patchResourceDataRunningForCmHandle(final String resourceIdentifier, final String cmHandle, final Object requestBody, final String contentType) { - networkCmProxyDataService.writeResourceDataPassThroughRunningForCmHandle(cmHandle, + final Object responseObject = networkCmProxyDataService.writeResourceDataPassThroughRunningForCmHandle(cmHandle, resourceIdentifier, PATCH, GSON.toJson(requestBody), contentType); - return new ResponseEntity<>(HttpStatus.OK); + return ResponseEntity.ok(responseObject); } /** |