Updating get module schema request body

Issue-ID: CPS-706
Signed-off-by: niamhcore <niamh.core@est.tech>
Change-Id: I92d241c4ccde77aaaf8aa5a3903437016edf65d0

2 files changed, 4 insertions, 23 deletions

diff --git a/src/test/groovy/org/onap/cps/ncmp/dmi/rest/controller/DmiRestControllerSpec.groovy b/src/test/groovy/org/onap/cps/ncmp/dmi/rest/controller/DmiRestControllerSpec.groovy
index 3bc1f3be..ac78928d 100644
--- a/src/test/groovy/org/onap/cps/ncmp/dmi/rest/controller/DmiRestControllerSpec.groovy
+++ b/src/test/groovy/org/onap/cps/ncmp/dmi/rest/controller/DmiRestControllerSpec.groovy
@@ -65,7 +65,7 @@ class DmiRestControllerSpec extends Specification {
         given: 'REST endpoint for getting all modules'
             def getModuleUrl = "$basePathV1/ch/node1/modules"
         and: 'get modules for cm-handle returns a json'
-            def json = '{"operation" : "read", "cmHandleProperties" : {}}'
+            def json = '{"cmHandleProperties" : {}}'
             def moduleSetSchema = new ModuleSetSchemas(namespace:'some-namespace',
                                                         moduleName:'some-moduleName',
                                                         revision:'some-revision')
@@ -101,7 +101,7 @@ class DmiRestControllerSpec extends Specification {
         given: 'REST endpoint for getting all modules'
             def getModuleUrl = "$basePathV1/ch/node1/modules"
         and: 'given request body and get modules for cm-handle throws #exceptionClass'
-            def json = '{"operation" : "read", "cmHandleProperties" : {}}'
+            def json = '{"cmHandleProperties" : {}}'
             mockDmiService.getModulesForCmHandle('node1') >> { throw Mock(exceptionClass) }
         when: 'post is invoked'
             def response = mvc.perform( post(getModuleUrl)
@@ -150,7 +150,7 @@ class DmiRestControllerSpec extends Specification {
     def 'Retrieve module resources.'() {
         given: 'an endpoint and json data'
             def getModulesEndpoint = "$basePathV1/ch/some-cm-handle/moduleResources"
-            String jsonData = getJsonDataForGetModules('read')
+            String jsonData = TestUtils.getResourceFileContent('GetModules.json')
         and: 'the DMI service returns the yang resources'
             ModuleReference moduleReference1 = new ModuleReference(name: 'ietf-yang-library', revision: '2016-06-21')
             ModuleReference moduleReference2 = new ModuleReference(name: 'nc-notifications', revision: '2008-07-14')
@@ -169,22 +169,10 @@ class DmiRestControllerSpec extends Specification {
             response.getContentAsString() == '[{"yangSource":"\\"some-data\\"","moduleName":"NAME","revision":"REVISION"}]'
     }
 
-    def 'Retrieve module resources with invalid operation.'() {
-        given: 'an endpoint and json data with invalid operation value'
-            def getModulesEndpoint = "$basePathV1/ch/some-cm-handle/moduleResources"
-            def jsonData = getJsonDataForGetModules('invalid operation')
-        when: 'get module resource api is invoked'
-            def response = mvc.perform(post(getModulesEndpoint)
-                .contentType(MediaType.APPLICATION_JSON)
-                .content(jsonData)).andReturn().response
-        then: 'a conflict status is returned'
-            response.status == HttpStatus.CONFLICT.value()
-    }
-
     def 'Retrieve module resources with exception handling.'() {
         given: 'an endpoint and json data'
             def getModulesEndpoint = "$basePathV1/ch/some-cm-handle/moduleResources"
-            String jsonData = getJsonDataForGetModules('read')
+            String jsonData = TestUtils.getResourceFileContent('GetModules.json')
         and: 'the service method is invoked to get module resources and throws an exception'
             mockDmiService.getModuleResources('some-cm-handle', _) >> { throw Mock(ModuleResourceNotFoundException.class) }
         when: 'get module resource api is invoked'
@@ -267,10 +255,4 @@ class DmiRestControllerSpec extends Specification {
             '? needs to be encoded as %3F' | 'idWith%3F'
 
     }
-
-    def getJsonDataForGetModules(operation) {
-        def jsonData = TestUtils.getResourceFileContent('GetModules.json')
-        return jsonData.replace('${operation-for-test}', operation)
-    }
-
 }
diff --git a/src/test/resources/GetModules.json b/src/test/resources/GetModules.json
index 98e41672..57f5aefd 100644
--- a/src/test/resources/GetModules.json
+++ b/src/test/resources/GetModules.json
@@ -1,5 +1,4 @@
 {
-  "operation": "${operation-for-test}",
   "data": {
     "modules": [
       {