aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortragait <rahul.tyagi@est.tech>2021-09-02 11:11:50 +0100
committertragait <rahul.tyagi@est.tech>2021-09-02 11:18:28 +0100
commit88cadd3f3aaa22cccb0d2159cf57fb2b84d440a2 (patch)
tree7a6b4818772366fe4a89540011f33bcc13e0ba64
parentc0708c6435480a3a1f5c4c8a95f21cfd1d76c6df (diff)
fix dmi base path in ncmp
Issue-ID: CPS-617 Signed-off-by: tragait <rahul.tyagi@est.tech> Change-Id: I3a0018c6054febfea5d9c4aa1c0e62f8aa1c160b
-rw-r--r--cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/operation/DmiOperations.java10
-rw-r--r--cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/operation/DmiOperationsSpec.groovy8
2 files changed, 9 insertions, 9 deletions
diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/operation/DmiOperations.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/operation/DmiOperations.java
index 8896b9fd59..d6feaf3adf 100644
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/operation/DmiOperations.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/operation/DmiOperations.java
@@ -48,7 +48,7 @@ public class DmiOperations {
}
private DmiRestClient dmiRestClient;
- private static final String DMI_API_PATH = "/dmi/api";
+ private static final String DMI_API_PATH = "/dmi";
private static final String DMI_CM_HANDLE_PATH = "/v1/ch/{cmHandle}";
private static final String DMI_CM_HANDLE_DATASTORE_PATH = DMI_CM_HANDLE_PATH + "/data/ds";
private static final String URL_SEPARATOR = "/";
@@ -65,7 +65,7 @@ public class DmiOperations {
/**
* Get resources from DMI.
*
- * @param dmiServiceName dmi base path
+ * @param dmiServiceName dmi service name
* @param cmHandle cmHandle
* @param resourceName name of the resource(s)
* @return {@code ResponseEntity} response entity
@@ -135,17 +135,17 @@ public class DmiOperations {
* This method creates the resource data from pass-through running data store for given cm handle
* identifier on given resource using dmi client.
*
- * @param dmiBasePath dmi base path
+ * @param dmiServiceName dmi service name
* @param cmHandle network resource identifier
* @param resourceId resource identifier
* @param jsonBody json body for put operation
* @return {@code ResponseEntity} response entity
*/
- public ResponseEntity<Void> createResourceDataPassThroughRunningFromDmi(final String dmiBasePath,
+ public ResponseEntity<Void> createResourceDataPassThroughRunningFromDmi(final String dmiServiceName,
final String cmHandle,
final String resourceId,
final String jsonBody) {
- final var stringBuilder = getStringBuilderForPassThroughRunningUrl(dmiBasePath,
+ final var stringBuilder = getStringBuilderForPassThroughRunningUrl(dmiServiceName,
cmHandle, resourceId, DataStoreEnum.PASSTHROUGH_RUNNING);
return dmiRestClient.postOperationWithJsonData(stringBuilder.toString(), jsonBody, new HttpHeaders());
}
diff --git a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/operation/DmiOperationsSpec.groovy b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/operation/DmiOperationsSpec.groovy
index 3c9b164408..987ab2bca1 100644
--- a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/operation/DmiOperationsSpec.groovy
+++ b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/operation/DmiOperationsSpec.groovy
@@ -41,7 +41,7 @@ class DmiOperationsSpec extends Specification {
def 'call get resource data for pass-through:operational datastore from DMI.'() {
given: 'expected url'
- def expectedUrl = 'testDmiBasePath/dmi/api/v1/ch/testCmhandle/data/ds' +
+ def expectedUrl = 'testDmiBasePath/dmi/v1/ch/testCmhandle/data/ds' +
'/ncmp-datastore:passthrough-operational/testResourceId?fields=testFieldsQuery&depth=10'
when: 'get resource data is called to DMI'
objectUnderTest.getResourceDataOperationalFromDmi('testDmiBasePath',
@@ -56,7 +56,7 @@ class DmiOperationsSpec extends Specification {
}
def 'call get resource data for pass-through:running datastore from DMI.'() {
given: 'expected url'
- def expectedUrl = 'testDmiBasePath/dmi/api/v1/ch/testCmhandle/data/ds' +
+ def expectedUrl = 'testDmiBasePath/dmi/v1/ch/testCmhandle/data/ds' +
'/ncmp-datastore:passthrough-running/testResourceId?fields=testFieldsQuery&depth=10'
when: 'get resource data is called to DMI'
objectUnderTest.getResourceDataPassThroughRunningFromDmi('testDmiBasePath',
@@ -71,7 +71,7 @@ class DmiOperationsSpec extends Specification {
}
def 'call create resource data for pass-through:running datastore from DMI.'() {
given: 'expected url'
- def expectedUrl = 'testDmiBasePath/dmi/api/v1/ch/testCmhandle/data/ds' +
+ def expectedUrl = 'testDmiBasePath/dmi/v1/ch/testCmhandle/data/ds' +
'/ncmp-datastore:passthrough-running/testResourceId'
when: 'get resource data is called to DMI'
objectUnderTest.createResourceDataPassThroughRunningFromDmi('testDmiBasePath',
@@ -84,7 +84,7 @@ class DmiOperationsSpec extends Specification {
def 'Call get resource from dmi.'() {
given: 'expected url'
- def expectedUrl = 'testDmiBasePath/dmi/api/v1/ch/testCmhandle/modules'
+ def expectedUrl = 'testDmiBasePath/dmi/v1/ch/testCmhandle/modules'
when: 'get resource data is called to dmi'
objectUnderTest.getResourceFromDmi('testDmiBasePath',
'testCmhandle',