Merge "Add withTrustLevel condition to CmHandle Query API"

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

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

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

diff --cc cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/inventory/CmHandleQueriesImpl.java
index c4e3fd0,f684f2e..e5cf8ed
--- 1/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/inventory/CmHandleQueriesImpl.java
--- 2/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/inventory/CmHandleQueriesImpl.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/inventory/CmHandleQueriesImpl.java
@@@ -59,9 -61,18 +61,18 @@@ public class CmHandleQueriesImpl implem
          return queryCmHandleAnyProperties(publicPropertyQueryPairs, PropertyType.PUBLIC);
      }
  
+     @Override
+     public Collection<String> queryCmHandlesByTrustLevel(final Map<String, String> trustLevelPropertyQueryPairs) {
+         final String trustLevelProperty = trustLevelPropertyQueryPairs.values().iterator().next();
+         final TrustLevel targetTrustLevel = TrustLevel.valueOf(trustLevelProperty);
+ 
+         final TrustLevelFilter trustLevelFilter = new TrustLevelFilter(targetTrustLevel, trustLevelPerCmHandle);
+         return trustLevelFilter.getAllCmHandleIdsByTargetTrustLevel();
+     }
+ 
      @Override
      public List<DataNode> queryCmHandlesByState(final CmHandleState cmHandleState) {
 -        return queryCmHandleDataNodesByCpsPath("//state[@cm-handle-state=\"" + cmHandleState + "\"]",
 +        return queryCmHandleAncestorsByCpsPath("//state[@cm-handle-state=\"" + cmHandleState + "\"]",
              INCLUDE_ALL_DESCENDANTS);
      }
  

diff --cc cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/NetworkCmProxyCmHandleQueryServiceSpec.groovy
Simple merge

diff --cc cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/NetworkCmProxyDataServiceImplSpec.groovy
Simple merge

diff --cc cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/inventory/CmHandleQueriesImplSpec.groovy
Simple merge