summaryrefslogtreecommitdiffstats
path: root/cps-nf-proxy-service/src
diff options
context:
space:
mode:
authorniamhcore <niamh.core@est.tech>2021-02-26 10:13:48 +0000
committerniamhcore <niamh.core@est.tech>2021-02-26 17:21:02 +0000
commitb5d573b02c7d1376e92e59887371965a2fb43c25 (patch)
tree366dd39ab6391c1dc5adbfd684eee943d65b6e6a /cps-nf-proxy-service/src
parentd3609db46635b9bdb0a49a7d0e18ebe144bb7f29 (diff)
CPS-240 - Create REST End-point on NF-Proxy for DataNode Update & cpsPath Query
Issue-ID: CPS-240 Signed-off-by: niamhcore <niamh.core@est.tech> Change-Id: I2aed92f8ab34282b12e23ae7807a391446165eb0
Diffstat (limited to 'cps-nf-proxy-service/src')
-rw-r--r--cps-nf-proxy-service/src/main/java/org/onap/cps/nfproxy/api/NfProxyDataService.java38
-rwxr-xr-xcps-nf-proxy-service/src/main/java/org/onap/cps/nfproxy/api/impl/NfProxyDataServiceImpl.java26
-rw-r--r--cps-nf-proxy-service/src/test/groovy/org/onap/cps/api/impl/NfProxyDataServiceImplSpec.groovy68
3 files changed, 126 insertions, 6 deletions
diff --git a/cps-nf-proxy-service/src/main/java/org/onap/cps/nfproxy/api/NfProxyDataService.java b/cps-nf-proxy-service/src/main/java/org/onap/cps/nfproxy/api/NfProxyDataService.java
index 644dfab117..ce47d70019 100644
--- a/cps-nf-proxy-service/src/main/java/org/onap/cps/nfproxy/api/NfProxyDataService.java
+++ b/cps-nf-proxy-service/src/main/java/org/onap/cps/nfproxy/api/NfProxyDataService.java
@@ -1,6 +1,7 @@
/*
* ============LICENSE_START=======================================================
* Copyright (C) 2021 highstreet technologies GmbH
+ * Copyright (C) 2021 Nordix Foundation
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,6 +20,7 @@
package org.onap.cps.nfproxy.api;
+import java.util.Collection;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.onap.cps.spi.FetchDescendantsOption;
import org.onap.cps.spi.model.DataNode;
@@ -31,14 +33,44 @@ public interface NfProxyDataService {
/**
* Retrieves datanode by XPath for a given cm handle.
*
- * @param cmHandle The identifier for a network function, network element, subnetwork or any other
- * cm object by managed NF-Proxy
+ * @param cmHandle The identifier for a network function, network element, subnetwork or any other cm
+ * object by managed NF-Proxy
* @param xpath xpath
* @param fetchDescendantsOption defines the scope of data to fetch: either single node or all the descendant nodes
* (recursively) as well
* @return data node object
*/
DataNode getDataNode(@NonNull String cmHandle, @NonNull String xpath,
- @NonNull FetchDescendantsOption fetchDescendantsOption);
+ @NonNull FetchDescendantsOption fetchDescendantsOption);
+
+ /**
+ * Get datanodes for the given cm handle by cps path.
+ *
+ * @param cmHandle The identifier for a network function, network element, subnetwork or any other cm object by
+ * managed NF-Proxy
+ * @param cpsPath cps path
+ * @return a collection of datanodes
+ */
+ Collection<DataNode> queryDataNodes(@NonNull String cmHandle, @NonNull String cpsPath);
+
+ /**
+ * Updates data node for given cm handle using xpath to parent node.
+ *
+ * @param cmHandle The identifier for a network function, network element, subnetwork or any other cm object
+ * by managed NF-Proxy
+ * @param parentNodeXpath xpath to parent node
+ * @param jsonData json data
+ */
+ void updateNodeLeaves(@NonNull String cmHandle, @NonNull String parentNodeXpath, @NonNull String jsonData);
+
+ /**
+ * Replaces existing data node content including descendants.
+ *
+ * @param cmHandle The identifier for a network function, network element, subnetwork or any other cm object
+ * by managed NF-Proxy
+ * @param parentNodeXpath xpath to parent node
+ * @param jsonData json data
+ */
+ void replaceNodeTree(@NonNull String cmHandle, @NonNull String parentNodeXpath, @NonNull String jsonData);
}
diff --git a/cps-nf-proxy-service/src/main/java/org/onap/cps/nfproxy/api/impl/NfProxyDataServiceImpl.java b/cps-nf-proxy-service/src/main/java/org/onap/cps/nfproxy/api/impl/NfProxyDataServiceImpl.java
index d30702e773..bb15591a92 100755
--- a/cps-nf-proxy-service/src/main/java/org/onap/cps/nfproxy/api/impl/NfProxyDataServiceImpl.java
+++ b/cps-nf-proxy-service/src/main/java/org/onap/cps/nfproxy/api/impl/NfProxyDataServiceImpl.java
@@ -1,6 +1,7 @@
/*
* ============LICENSE_START=======================================================
* Copyright (C) 2021 highstreet technologies GmbH
+ * Copyright (C) 2021 Nordix Foundation
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,8 +20,9 @@
package org.onap.cps.nfproxy.api.impl;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import java.util.Collection;
import org.onap.cps.api.CpsDataService;
+import org.onap.cps.api.CpsQueryService;
import org.onap.cps.nfproxy.api.NfProxyDataService;
import org.onap.cps.spi.FetchDescendantsOption;
import org.onap.cps.spi.model.DataNode;
@@ -35,9 +37,27 @@ public class NfProxyDataServiceImpl implements NfProxyDataService {
@Autowired
private CpsDataService cpsDataService;
+ @Autowired
+ private CpsQueryService cpsQueryService;
+
@Override
- public DataNode getDataNode(@NonNull final String cmHandle, @NonNull final String xpath,
- @NonNull final FetchDescendantsOption fetchDescendantsOption) {
+ public DataNode getDataNode(final String cmHandle, final String xpath,
+ final FetchDescendantsOption fetchDescendantsOption) {
return cpsDataService.getDataNode(NF_PROXY_DATASPACE_NAME, cmHandle, xpath, fetchDescendantsOption);
}
+
+ @Override
+ public Collection<DataNode> queryDataNodes(final String cmHandle, final String cpsPath) {
+ return cpsQueryService.queryDataNodes(NF_PROXY_DATASPACE_NAME, cmHandle, cpsPath);
+ }
+
+ @Override
+ public void updateNodeLeaves(final String cmHandle, final String parentNodeXpath, final String jsonData) {
+ cpsDataService.updateNodeLeaves(NF_PROXY_DATASPACE_NAME, cmHandle, parentNodeXpath, jsonData);
+ }
+
+ @Override
+ public void replaceNodeTree(final String cmHandle, final String parentNodeXpath, final String jsonData) {
+ cpsDataService.replaceNodeTree(NF_PROXY_DATASPACE_NAME, cmHandle, parentNodeXpath, jsonData);
+ }
}
diff --git a/cps-nf-proxy-service/src/test/groovy/org/onap/cps/api/impl/NfProxyDataServiceImplSpec.groovy b/cps-nf-proxy-service/src/test/groovy/org/onap/cps/api/impl/NfProxyDataServiceImplSpec.groovy
new file mode 100644
index 0000000000..f89f80e301
--- /dev/null
+++ b/cps-nf-proxy-service/src/test/groovy/org/onap/cps/api/impl/NfProxyDataServiceImplSpec.groovy
@@ -0,0 +1,68 @@
+/*
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2021 Nordix Foundation
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.cps.api.impl
+
+import org.onap.cps.api.CpsDataService
+import org.onap.cps.api.CpsQueryService
+import org.onap.cps.nfproxy.api.impl.NfProxyDataServiceImpl
+import spock.lang.Specification
+
+class NfProxyDataServiceImplSpec extends Specification {
+ def objectUnderTest = new NfProxyDataServiceImpl()
+ def mockcpsDataService = Mock(CpsDataService)
+ def mockcpsQueryService = Mock(CpsQueryService)
+
+ def setup() {
+ objectUnderTest.cpsDataService = mockcpsDataService
+ objectUnderTest.cpsQueryService = mockcpsQueryService
+ }
+
+ def cmHandle = 'some handle'
+ def expectedDataspaceName = 'NFP-Operational'
+
+ def 'Query data nodes by cps path.'() {
+ given: 'a cm Handle and a cps path'
+ def cpsPath = '/cps-path'
+ when: 'queryDataNodes is invoked'
+ objectUnderTest.queryDataNodes(cmHandle, cpsPath)
+ then: 'the persistence service is called once with the correct parameters'
+ 1 * mockcpsQueryService.queryDataNodes(expectedDataspaceName, cmHandle, cpsPath)
+ }
+
+ def 'Update data node leaves.'() {
+ given: 'a cm Handle and a cps path'
+ def xpath = '/xpath'
+ def jsonData = 'some json'
+ when: 'updateNodeLeaves is invoked'
+ objectUnderTest.updateNodeLeaves(cmHandle, xpath, jsonData)
+ then: 'the persistence service is called once with the correct parameters'
+ 1 * mockcpsDataService.updateNodeLeaves(expectedDataspaceName, cmHandle, xpath, jsonData)
+ }
+
+ def 'Replace data node tree.'() {
+ given: 'a cm Handle and a cps path'
+ def xpath = '/xpath'
+ def jsonData = 'some json'
+ when: 'replaceNodeTree is invoked'
+ objectUnderTest.replaceNodeTree(cmHandle, xpath, jsonData)
+ then: 'the persistence service is called once with the correct parameters'
+ 1 * mockcpsDataService.replaceNodeTree(expectedDataspaceName, cmHandle, xpath, jsonData)
+ }
+}