Merge "Error reporting when registering cm handle with alternate id 2 - update scenario"

diff --combined cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/NetworkCmProxyDataServiceImpl.java
index 8c02106,42076a4..4c905bf
--- 1/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/NetworkCmProxyDataServiceImpl.java
--- 2/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/NetworkCmProxyDataServiceImpl.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/NetworkCmProxyDataServiceImpl.java
@@@ -154,11 -154,10 +154,11 @@@ public class NetworkCmProxyDataServiceI
  
      @Override
      public void executeDataOperationForCmHandles(final String topicParamInQuery,
 -                                                 final DataOperationRequest
 -                                                     dataOperationRequest,
 -                                                 final String requestId) {
 -        dmiDataOperations.requestResourceDataFromDmi(topicParamInQuery, dataOperationRequest, requestId);
 +                                                 final DataOperationRequest dataOperationRequest,
 +                                                 final String requestId,
 +                                                 final String authorization) {
 +        dmiDataOperations.requestResourceDataFromDmi(topicParamInQuery, dataOperationRequest, requestId,
 +                authorization);
      }
  
      @Override
@@@ -424,7 -423,7 +424,7 @@@
          final List<NcmpServiceCmHandle> cmHandlesToBeCreated,
          final List<CmHandleRegistrationResponse> cmHandleRegistrationResponses) {
          final Collection<String> rejectedCmHandleIds = alternateIdChecker
-             .getIdsOfCmHandlesWithRejectedAlternateId(cmHandlesToBeCreated);
+             .getIdsOfCmHandlesWithRejectedAlternateId(cmHandlesToBeCreated, AlternateIdChecker.Operation.CREATE);
          cmHandleRegistrationResponses.addAll(CmHandleRegistrationResponse.createFailureResponses(
              rejectedCmHandleIds, ALTERNATE_ID_ALREADY_ASSOCIATED));
          return rejectedCmHandleIds;

diff --combined cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/NetworkCmProxyDataServiceImplSpec.groovy
index 5e837ac,5b3ffe5..74016e4
--- 1/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/NetworkCmProxyDataServiceImplSpec.groovy
--- 2/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
@@@ -158,9 -158,9 +158,9 @@@ class NetworkCmProxyDataServiceImplSpe
          given: 'cpsDataService returns valid data node'
              def dataOperationRequest = getDataOperationRequest(datastoreName)
          when: 'request resource data for data operation is called'
 -            objectUnderTest.executeDataOperationForCmHandles('some topic', dataOperationRequest, 'requestId')
 +            objectUnderTest.executeDataOperationForCmHandles('some topic', dataOperationRequest, 'requestId', NO_AUTH_HEADER)
          then: 'request resource data for data operation returns expected response'
 -            1 * mockDmiDataOperations.requestResourceDataFromDmi('some topic', dataOperationRequest, 'requestId')
 +            1 * mockDmiDataOperations.requestResourceDataFromDmi('some topic', dataOperationRequest, 'requestId', NO_AUTH_HEADER)
          where: 'the following data stores are used'
              datastoreName << [PASSTHROUGH_RUNNING.datastoreName, PASSTHROUGH_OPERATIONAL.datastoreName]
      }
@@@ -274,7 -274,7 +274,7 @@@
              dmiPluginRegistration.createdCmHandles = [ncmpServiceCmHandle]
              mockDmiPluginRegistration.getCreatedCmHandles() >> [ncmpServiceCmHandle]
          and: 'no rejected cm handles because of alternate ids'
-             mockAlternateIdChecker.getIdsOfCmHandlesWithRejectedAlternateId(_) >> []
+             mockAlternateIdChecker.getIdsOfCmHandlesWithRejectedAlternateId(*_) >> []
          when: 'parse and create cm handle in dmi registration then sync module'
              mockDmiPluginRegistration.createdCmHandles = ['test-cm-handle-id']
              objectUnderTest.processCreatedCmHandles(mockDmiPluginRegistration, new DmiPluginRegistrationResponse())