Merge "Support Alternate-Id for CPS-E05 id-searches and searchCmHandleIds"

diff --cc cps-ncmp-rest/src/main/java/org/onap/cps/ncmp/rest/controller/NetworkCmProxyInventoryController.java
Simple merge

diff --cc cps-ncmp-rest/src/test/groovy/org/onap/cps/ncmp/rest/controller/NetworkCmProxyInventoryControllerSpec.groovy
Simple merge

diff --cc cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/inventory/NetworkCmProxyInventoryFacade.java
Simple merge

diff --cc cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/impl/inventory/NetworkCmProxyInventoryFacadeSpec.groovy
index a7dd38c,42f0a08..4c554c6
--- 1/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/impl/inventory/NetworkCmProxyInventoryFacadeSpec.groovy
--- 2/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/impl/inventory/NetworkCmProxyInventoryFacadeSpec.groovy
+++ b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/impl/inventory/NetworkCmProxyInventoryFacadeSpec.groovy
@@@ -56,12 -56,12 +56,12 @@@ class NetworkCmProxyInventoryFacadeSpe
          given: 'an (updated) dmi plugin registration'
              def dmiPluginRegistration = Mock(DmiPluginRegistration)
          when: 'the registration is submitted '
 -           objectUnderTest.updateDmiRegistrationAndSyncModule(dmiPluginRegistration)
 +           objectUnderTest.updateDmiRegistration(dmiPluginRegistration)
          then: 'the call is delegated to the cm handle registration service'
 -            1 * mockCmHandleRegistrationService.updateDmiRegistrationAndSyncModule(dmiPluginRegistration)
 +            1 * mockCmHandleRegistrationService.updateDmiRegistration(dmiPluginRegistration)
      }
  
-     def 'Execute cm handle id search for inventory'() {
+     def 'Execute cm handle reference search for inventory'() {
          given: 'a ConditionApiProperties object'
              def conditionProperties = new ConditionProperties()
              conditionProperties.conditionName = 'hasAllProperties'

diff --cc integration-test/src/test/groovy/org/onap/cps/integration/functional/ncmp/RestApiSpec.groovy
Simple merge