Merge "Update operation passthrough running - Service Layer"

diff --combined cps-ncmp-rest/src/main/java/org/onap/cps/ncmp/rest/controller/NetworkCmProxyController.java
index 075b451,3e2bdd9..449a434
--- 1/cps-ncmp-rest/src/main/java/org/onap/cps/ncmp/rest/controller/NetworkCmProxyController.java
--- 2/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
@@@ -133,9 -133,11 +133,11 @@@ public class NetworkCmProxyController i
      }
  
      @Override
-     public ResponseEntity<Object> updateResourceDataRunningForCmHandle(final String cmHandle,
-         final String resourceIdentifier, final String requestBody, final String contentType) {
-         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
+     public ResponseEntity<Object> updateResourceDataRunningForCmHandle(final String resourceIdentifier,
+         final String cmHandle, final String requestBody, final String contentType) {
+         networkCmProxyDataService.updateResourceDataPassThroughRunningForCmHandle(cmHandle,
+             resourceIdentifier, requestBody, contentType);
+         return new ResponseEntity<>(HttpStatus.OK);
      }
  
      /**
@@@ -217,7 -219,8 +219,7 @@@
          final List<ConditionProperties> conditionProperties =
              conditions.getConditions().stream().collect(Collectors.toList());
          final CmHandles cmHandles = new CmHandles();
 -        final Collection<String> cmHandleIdentifiers = processConditions(conditionProperties);
 -        cmHandleIdentifiers.forEach(cmHandle -> cmHandles.setCmHandles(toCmHandleProperties(cmHandle)));
 +        cmHandles.setCmHandles(toCmHandleProperties(processConditions(conditionProperties)));
          return ResponseEntity.ok(cmHandles);
      }
  
@@@ -253,13 -256,11 +255,13 @@@
          return moduleNames;
      }
  
 -    private CmHandleProperties toCmHandleProperties(final String cmHandleId) {
 +    private CmHandleProperties toCmHandleProperties(final Collection<String> cmHandleIdentifiers) {
          final CmHandleProperties cmHandleProperties = new CmHandleProperties();
 -        final CmHandleProperty cmHandleProperty = new CmHandleProperty();
 -        cmHandleProperty.setCmHandleId(cmHandleId);
 -        cmHandleProperties.add(cmHandleProperty);
 +        for (final String cmHandleIdentifier : cmHandleIdentifiers) {
 +            final CmHandleProperty cmHandleProperty = new CmHandleProperty();
 +            cmHandleProperty.setCmHandleId(cmHandleIdentifier);
 +            cmHandleProperties.add(cmHandleProperty);
 +        }
          return cmHandleProperties;
      }
  

diff --combined cps-ncmp-rest/src/test/groovy/org/onap/cps/ncmp/rest/controller/NetworkCmProxyControllerSpec.groovy
index cca62b9,cb3dc6f..e96b27d
--- 1/cps-ncmp-rest/src/test/groovy/org/onap/cps/ncmp/rest/controller/NetworkCmProxyControllerSpec.groovy
--- 2/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
@@@ -171,7 -171,7 +171,7 @@@ class NetworkCmProxyControllerSpec exte
              response.contentAsString.contains('"leaf":"value"')
      }
  
-     def 'Get Resource Data from pass-through operational.' () {
+     def 'Get Resource Data from passthrough operational.' () {
          given: 'resource data url'
              def getUrl = "$ncmpBasePathV1/ch/testCmHandle/data/ds/ncmp-datastore:passthrough-operational" +
                      "?resourceIdentifier=parent/child&options=(a=1,b=2)"
@@@ -190,7 -190,7 +190,7 @@@
              response.status == HttpStatus.OK.value()
      }
  
-     def 'Get Resource Data from pass-through running with #scenario value in resource identifier param.' () {
+     def 'Get Resource Data from passthrough running with #scenario value in resource identifier param.' () {
          given: 'resource data url'
              def getUrl = "$ncmpBasePathV1/ch/testCmHandle/data/ds/ncmp-datastore:passthrough-running" +
                      "?resourceIdentifier=" + resourceIdentifier + "&options=(a=1,b=2)"
@@@ -219,7 -219,7 +219,7 @@@
              '? needs to be encoded as %3F' | 'idWith%3F'
      }
  
-     def 'Create Resource Data from pass-through running with #scenario.' () {
+     def 'Create Resource Data from passthrough running with #scenario.' () {
          given: 'resource data url'
              def getUrl = "$ncmpBasePathV1/ch/testCmHandle/data/ds/ncmp-datastore:passthrough-running" +
                      "?resourceIdentifier=parent/child"
@@@ -258,8 -258,8 +258,8 @@@
          given: 'an endpoint and json data'
              def searchesEndpoint = "$ncmpBasePathV1/ch/searches"
              String jsonData = TestUtils.getResourceFileContent('cmhandle-search.json')
 -        and: 'the service method is invoked with module names and returns a cm handle id'
 -            mockNetworkCmProxyDataService.executeCmHandleHasAllModulesSearch(['module1', 'module2']) >> ['some-cmhandle-id']
 +        and: 'the service method is invoked with module names and returns two cm handle ids'
 +            mockNetworkCmProxyDataService.executeCmHandleHasAllModulesSearch(['module1', 'module2']) >> ['some-cmhandle-id1', 'some-cmhandle-id2']
          when: 'the searches api is invoked'
              def response = mvc.perform(post(searchesEndpoint)
                      .contentType(MediaType.APPLICATION_JSON)
@@@ -267,7 -267,7 +267,7 @@@
          then: 'response status returns OK'
              response.status == HttpStatus.OK.value()
          and: 'the expected response content is returned'
 -            response.contentAsString == '{"cmHandles":[{"cmHandleId":"some-cmhandle-id"}]}'
 +            response.contentAsString == '{"cmHandles":[{"cmHandleId":"some-cmhandle-id1"},{"cmHandleId":"some-cmhandle-id2"}]}'
      }
  
      def 'Call execute cm handle searches with unrecognized condition name.'() {
@@@ -279,10 -279,10 +279,10 @@@
                      .contentType(MediaType.APPLICATION_JSON)
                      .content(jsonData)).andReturn().response
          then: 'an empty cm handle identifier is returned'
 -            response.contentAsString == '{"cmHandles":null}'
 +            response.contentAsString == '{"cmHandles":[]}'
      }
  
-     def 'Update resource data in passthrough-running datastore.' () {
+     def 'Update resource data from passthrough running.' () {
          given: 'update resource data url'
              def updateUrl = "$ncmpBasePathV1/ch/testCmHandle/data/ds/ncmp-datastore:passthrough-running" +
                      "?resourceIdentifier=parent/child"
@@@ -292,8 -292,11 +292,11 @@@
                              .contentType(MediaType.APPLICATION_JSON_VALUE)
                              .accept(MediaType.APPLICATION_JSON_VALUE).content('some-request-body')
              ).andReturn().response
-         then: 'the response status is not implemented'
-             response.status == HttpStatus.NOT_IMPLEMENTED.value()
+         then: 'ncmp service method to update resource is called'
+             1 * mockNetworkCmProxyDataService.updateResourceDataPassThroughRunningForCmHandle('testCmHandle',
+                     'parent/child', 'some-request-body', 'application/json;charset=UTF-8')
+         and: 'the response status is OK'
+             response.status == HttpStatus.OK.value()
      }
  }