Remove compulsory body from delete passthrough request

- yaml spec (please note how order of parameter changed!)
- Updated CSIT test
- Slight improvement of cist setup script to prevent double download

Issue-ID: CPS-836

Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>
Change-Id: Ic3510c9dfe28a3be09f5239ab5c8c4797d4f4792

1 files changed, 3 insertions, 4 deletions

diff --git a/cps-ncmp-rest/src/test/groovy/org/onap/cps/ncmp/rest/controller/NetworkCmProxyControllerSpec.groovy b/cps-ncmp-rest/src/test/groovy/org/onap/cps/ncmp/rest/controller/NetworkCmProxyControllerSpec.groovy
index c75418c78f..a3d8afaf24 100644
--- a/cps-ncmp-rest/src/test/groovy/org/onap/cps/ncmp/rest/controller/NetworkCmProxyControllerSpec.groovy
+++ b/cps-ncmp-rest/src/test/groovy/org/onap/cps/ncmp/rest/controller/NetworkCmProxyControllerSpec.groovy
@@ -318,11 +318,10 @@ class NetworkCmProxyControllerSpec extends Specification {
                      "?resourceIdentifier=parent/child"
         when: 'delete data resource request is performed'
             def response = mvc.perform(
-                delete(url).contentType(MediaType.APPLICATION_JSON).accept(MediaType.APPLICATION_JSON)
-                .content(jsonString)).andReturn().response
-        then: 'the ncmp service method to delete resource is called'
+                delete(url).contentType(MediaType.APPLICATION_JSON).accept(MediaType.APPLICATION_JSON)).andReturn().response
+        then: 'the ncmp service method to delete resource is called (with null as body)'
             1 * mockNetworkCmProxyDataService.writeResourceDataPassThroughRunningForCmHandle('testCmHandle',
-                'parent/child', DELETE, jsonString, 'application/json;charset=UTF-8')
+                'parent/child', DELETE, null, 'application/json;charset=UTF-8')
         and: 'the response is No Content'
             response.status == HttpStatus.NO_CONTENT.value()
     }