Merge "Support alternate id for CPS-E05 GetCmHandleDetailsById"

diff --cc cps-ncmp-rest/docs/openapi/ncmp.yml
Simple merge

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

diff --cc cps-ncmp-rest/src/test/groovy/org/onap/cps/ncmp/rest/controller/NetworkCmProxyControllerSpec.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 be2bf87,1657046..9e07de4
--- 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
@@@ -89,20 -90,14 +89,20 @@@ class NetworkCmProxyInventoryFacadeSpe
              assert result.containsAll('cm-handle-1','cm-handle-2')
      }
  
 -    def 'Getting Yang Resources.'() {
 +    def 'Getting Yang Resources for a given #scenario'() {
          when: 'yang resources is called'
 -            objectUnderTest.getYangResourcesModuleReferences('some-cm-handle')
 -        then: 'CPS module services is invoked for the correct dataspace and cm handle'
 +            objectUnderTest.getYangResourcesModuleReferences(cmHandleRef)
 +        then: 'alternate id matcher is called'
 +            mockAlternateIdMatcher.getCmHandleId(cmHandleRef) >> 'some-cm-handle'
 +        and: 'CPS module services is invoked for the correct cm handle'
              1 * mockInventoryPersistence.getYangResourcesModuleReferences('some-cm-handle')
 +        where: 'following cm handle reference is used'
 +            scenario                              | cmHandleRef
 +            'Cm Handle Reference as cm handle-id' | 'some-cm-handle'
 +            'Cm Handle Reference as alternate-id' | 'some-alternate-id'
      }
  
-     def 'Get a cm handle.'() {
+     def 'Get a cm handle details using #scenario'() {
          given: 'the system returns a yang modelled cm handle'
              def dmiServiceName = 'some service name'
              def compositeState = new CompositeState(cmHandleState: CmHandleState.ADVISED,