diff options
| author |   lukegleeson <luke.gleeson@est.tech> | 2022-07-28 17:00:46 +0100 |
|---|---|---|
| committer |   aditya puthuparambil <aditya.puthuparambil@bell.ca> | 2022-08-02 11:14:35 +0000 |
| commit | 0b57f077accd7cf7fa58a8cf69f3e4111f805822 (patch) | |
| tree | 143d3f0b375307581073e693069c15b64cbfcc94 /cps-ncmp-service | |
| parent | 82a550f6b080cb50912d93f7b13ba0fc97a95470 (diff) | |
Incorrect response to {} for cmhandle id-searches
An empty body for the CmHandles id-searches api returns an anchor instead of all cm-handles
Now returns all childnode ids for the dmi-registry
Issue-ID: CPS-1175
Signed-off-by: lukegleeson <luke.gleeson@est.tech>
Change-Id: I358970170a4eb7905e9646605f0f373fbcd78945
Diffstat (limited to 'cps-ncmp-service')
2 files changed, 3 insertions, 3 deletions
diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/NetworkCmProxyCmHandlerQueryServiceImpl.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/NetworkCmProxyCmHandlerQueryServiceImpl.java index d784bcdeac..6696f8e5ad 100644 --- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/NetworkCmProxyCmHandlerQueryServiceImpl.java +++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/NetworkCmProxyCmHandlerQueryServiceImpl.java @@ -217,7 +217,9 @@ public class NetworkCmProxyCmHandlerQueryServiceImpl implements NetworkCmProxyCm } private Set<String> getAllCmHandleIds() { - return inventoryPersistence.getAnchors().parallelStream().map(Anchor::getName).collect(Collectors.toSet()); + return inventoryPersistence.getDataNode("/dmi-registry") + .getChildDataNodes().stream().map(dataNode -> dataNode.getLeaves().get("id").toString()) + .collect(Collectors.toSet()); } private NcmpServiceCmHandle createNcmpServiceCmHandle(final DataNode dataNode) { diff --git a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/NetworkCmProxyCmHandlerQueryServiceSpec.groovy b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/NetworkCmProxyCmHandlerQueryServiceSpec.groovy index 40ec12da87..19c5049021 100644 --- a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/NetworkCmProxyCmHandlerQueryServiceSpec.groovy +++ b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/NetworkCmProxyCmHandlerQueryServiceSpec.groovy @@ -156,8 +156,6 @@ class NetworkCmProxyCmHandlerQueryServiceSpec extends Specification { def cmHandleQueryParameters = new CmHandleQueryServiceParameters() and: 'the inventory persistence returns the dmi registry datanode' inventoryPersistence.getDataNode("/dmi-registry") >> dmiRegistry - and: 'the inventory persistence returns anchors for get anchors' - inventoryPersistence.getAnchors() >> [new Anchor(name: 'PNFDemo1'), new Anchor(name: 'PNFDemo2'), new Anchor(name: 'PNFDemo3'), new Anchor(name: 'PNFDemo4')] when: 'the query is executed for both cm handle ids and details' def returnedCmHandlesJustIds = objectUnderTest.queryCmHandleIds(cmHandleQueryParameters) def returnedCmHandlesWithData = objectUnderTest.queryCmHandles(cmHandleQueryParameters) |