From eeef2ae7d17fcff7fbd33614972ad42f495e7998 Mon Sep 17 00:00:00 2001 From: DylanB95EST Date: Tue, 30 Nov 2021 15:07:35 +0000 Subject: Support Delete operation for ds Passtrough-Running in NCMP 1/3 Add delete operation for passthrough running within cps-ncmp. Issue-ID: CPS-638 Change-Id: I360672adc1f0f5c8eb351391c94f2d4fa913d0b4 Signed-off-by: DylanB95EST --- .../cps/ncmp/api/impl/operations/DmiRequestBody.java | 3 ++- .../api/impl/NetworkCmProxyDataServiceImplSpec.groovy | 16 ++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) (limited to 'cps-ncmp-service/src') diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/operations/DmiRequestBody.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/operations/DmiRequestBody.java index a635f0bc8..26feeeaf4 100644 --- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/operations/DmiRequestBody.java +++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/operations/DmiRequestBody.java @@ -38,7 +38,8 @@ public class DmiRequestBody { READ("read"), CREATE("create"), UPDATE("update"), - PATCH("patch"); + PATCH("patch"), + DELETE("delete"); private String value; OperationEnum(final String value) { diff --git a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/NetworkCmProxyDataServiceImplSpec.groovy b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/NetworkCmProxyDataServiceImplSpec.groovy index 8bb0ee280..c396a2ef2 100644 --- a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/NetworkCmProxyDataServiceImplSpec.groovy +++ b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/NetworkCmProxyDataServiceImplSpec.groovy @@ -97,7 +97,7 @@ class NetworkCmProxyDataServiceImplSpec extends Specification { 1 * mockCpsDataService.saveListElements(expectedDataspaceName, cmHandle, xpath, jsonData, noTimestamp) } - def 'Write resource data for passthrough running from dmi using POST #scenario cm handle properties.'() { + def 'Write resource data for pass-through running from dmi using POST #scenario cm handle properties.'() { given: 'a data node' def dataNode = getDataNode(includeCmHandleProperties) and: 'cpsDataService returns valid datanode' @@ -117,7 +117,7 @@ class NetworkCmProxyDataServiceImplSpec extends Specification { 'without' | false || '{}' } - def 'Write resource data for passthrough running from dmi using POST "not found" response (from DMI).'() { + def 'Write resource data for pass-through running from dmi using POST "not found" response (from DMI).'() { given: 'a data node' def dataNode = getDataNode(true) and: 'cpsDataService returns valid dataNode' @@ -147,7 +147,7 @@ class NetworkCmProxyDataServiceImplSpec extends Specification { fetchDescendantsOption << FetchDescendantsOption.values() } - def 'Get resource data for passthrough operational from dmi.'() { + def 'Get resource data for pass-through operational from dmi.'() { given: 'a data node' def dataNode = getDataNode(true) and: 'get data node is called' @@ -169,7 +169,7 @@ class NetworkCmProxyDataServiceImplSpec extends Specification { response == 'result-json' } - def 'Get resource data for passthrough operational from dmi with Json Processing Exception.'() { + def 'Get resource data for pass-through operational from dmi with Json Processing Exception.'() { given: 'a data node' def dataNode = getDataNode(true) and: 'cps data service returns valid data node' @@ -192,7 +192,7 @@ class NetworkCmProxyDataServiceImplSpec extends Specification { exceptionThrown.details == 'DMI status code: 404, DMI response body: NOK-json' } - def 'Get resource data for passthrough operational from dmi return NOK response.'() { + def 'Get resource data for pass-through operational from dmi return NOK response.'() { given: 'a data node' def dataNode = getDataNode(true) and: 'cps data service returns valid data node' @@ -216,7 +216,7 @@ class NetworkCmProxyDataServiceImplSpec extends Specification { exceptionThrown.details.contains('NOK-json') } - def 'Get resource data for passthrough running from dmi.'() { + def 'Get resource data for pass-through running from dmi.'() { given: 'a data node' def dataNode = getDataNode(true) and: 'cpsDataService returns valid data node' @@ -237,7 +237,7 @@ class NetworkCmProxyDataServiceImplSpec extends Specification { response == '{result-json}' } - def 'Get resource data for passthrough running from dmi return NOK response.'() { + def 'Get resource data for pass-through running from dmi return NOK response.'() { given: 'a data node' def dataNode = getDataNode(true) and: 'cpsDataService returns valid dataNode' @@ -295,7 +295,7 @@ class NetworkCmProxyDataServiceImplSpec extends Specification { 1 * mockCpsDataService.replaceNodeTree(expectedDataspaceName, cmHandle, xpath, jsonData, noTimestamp) } - def 'Update resource data for passthrough running from dmi using POST #scenario cm handle properties.'() { + def 'Update resource data for pass-through running from dmi using POST #scenario cm handle properties.'() { given: 'a data node' def dataNode = getDataNode(includeCmHandleProperties) and: 'cpsDataService returns valid datanode' -- cgit 1.2.3-korg