Merge "Update operation passthrough running - Service Layer"

[cps.git] / cps-ncmp-service / src / main / java / org / onap / cps / ncmp / api / impl / operation / DmiOperations.java

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 f7421cd..40a47ec 100644 (file)
--- 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
@@ -22,7 +22,6 @@ package org.onap.cps.ncmp.api.impl.operation;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 import lombok.Getter;
-import org.jetbrains.annotations.NotNull;
 import org.onap.cps.ncmp.api.impl.client.DmiRestClient;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseEntity;
@@ -165,7 +164,6 @@ public class DmiOperations {
         return dmiRestClient.postOperationWithJsonData(stringBuilder.toString(), jsonBody, new HttpHeaders());
     }
 
-    @NotNull
     private String getDmiResourceUrl(final String dmiServiceName,
                                      final String cmHandle,
                                      final String resourceName) {
@@ -176,7 +174,23 @@ public class DmiOperations {
         return stringBuilder.toString();
     }
 
-    @NotNull
+    /**
+     * This method updates the resource data from pass-through running data store for the cm handle identifier on given
+     * resource using dmi client.
+     *
+     * @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<String> updateResourceDataPassThroughRunningFromDmi(final String dmiServiceName,
+        final String cmHandle, final String resourceId, final String jsonBody) {
+        final StringBuilder stringBuilder =
+            getStringBuilderForPassThroughUrl(dmiServiceName, cmHandle, resourceId, DataStoreEnum.PASSTHROUGH_RUNNING);
+        return dmiRestClient.postOperationWithJsonData(stringBuilder.toString(), jsonBody, new HttpHeaders());
+    }
+
     private String getDmiDatastoreUrl(final String dmiServiceName,
                                       final String cmHandle,
                                       final String resourceId,
@@ -188,7 +202,6 @@ public class DmiOperations {
         return stringBuilder.toString();
     }
 
-    @NotNull
     private StringBuilder getStringBuilderForPassThroughUrl(final String dmiServiceName,
                                                             final String cmHandle,
                                                             final String resourceId,