From 184b681a516c08abe9ef151090c5f208f5544e0e Mon Sep 17 00:00:00 2001
From: "david.mcweeney" <david.mcweeney@est.tech>
Date: Thu, 2 May 2024 15:14:52 +0100
Subject: CPS-2187 - #5 Add module Set Tag to dmi (single cm handle) data
 request

Change-Id: Iae7e3bac67bb8e5bbb50e4157fdf7daf9fc2220f
Signed-off-by: david.mcweeney <david.mcweeney@est.tech>
Issue-ID: CPS-2187
---
 .../dmi/rest/controller/DmiRestController.java     |  8 ++++----
 .../rest/controller/DmiRestControllerSpec.groovy   | 24 ++++++++++++++++------
 2 files changed, 22 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/main/java/org/onap/cps/ncmp/dmi/rest/controller/DmiRestController.java b/src/main/java/org/onap/cps/ncmp/dmi/rest/controller/DmiRestController.java
index 1dcc6373..47b9fc3e 100644
--- a/src/main/java/org/onap/cps/ncmp/dmi/rest/controller/DmiRestController.java
+++ b/src/main/java/org/onap/cps/ncmp/dmi/rest/controller/DmiRestController.java
@@ -80,16 +80,13 @@ public class DmiRestController implements DmiPluginApi, DmiPluginInternalApi {
         return ResponseEntity.ok(moduleSet);
     }
 
-
     @Override
     public ResponseEntity<YangResources> retrieveModuleResources(
         final String cmHandle,
         final ModuleResourcesReadRequest moduleResourcesReadRequest) {
         final List<ModuleReference> moduleReferences = convertRestObjectToJavaApiObject(moduleResourcesReadRequest);
         final YangResources yangResources = dmiService.getModuleResources(cmHandle, moduleReferences);
-        if (moduleResourcesReadRequest.getModuleSetTag() != null) {
-            log.info("Module set tag received: {}", moduleResourcesReadRequest.getModuleSetTag());
-        }
+        log.info("Module set tag received: {}", moduleResourcesReadRequest.getModuleSetTag());
         return new ResponseEntity<>(yangResources, HttpStatus.OK);
     }
 
@@ -141,7 +138,10 @@ public class DmiRestController implements DmiPluginApi, DmiPluginInternalApi {
                                                         final String resourceIdentifier,
                                                         final String optionsParamInQuery,
                                                         final String topicParamInQuery,
+                                                        final String moduleSetTagParamInQuery,
                                                         final DataAccessRequest dataAccessRequest) {
+
+        log.info("Module set tag received: {}", moduleSetTagParamInQuery);
         if (DatastoreType.PASSTHROUGH_OPERATIONAL == DatastoreType.fromDatastoreName(datastoreName)) {
             return dataAccessPassthroughOperational(resourceIdentifier, cmHandle, dataAccessRequest,
                     optionsParamInQuery, topicParamInQuery);
diff --git a/src/test/groovy/org/onap/cps/ncmp/dmi/rest/controller/DmiRestControllerSpec.groovy b/src/test/groovy/org/onap/cps/ncmp/dmi/rest/controller/DmiRestControllerSpec.groovy
index a23902fa..520e76af 100644
--- a/src/test/groovy/org/onap/cps/ncmp/dmi/rest/controller/DmiRestControllerSpec.groovy
+++ b/src/test/groovy/org/onap/cps/ncmp/dmi/rest/controller/DmiRestControllerSpec.groovy
@@ -21,7 +21,7 @@
 
 package org.onap.cps.ncmp.dmi.rest.controller
 
-import ch.qos.logback.classic.Level
+
 import ch.qos.logback.classic.Logger
 import ch.qos.logback.classic.spi.ILoggingEvent
 import ch.qos.logback.core.read.ListAppender
@@ -221,9 +221,8 @@ class DmiRestControllerSpec extends Specification {
                 .contentType(MediaType.APPLICATION_JSON)
                 .content(jsonData))
         then: 'the module set tag is logged'
-            def loggingEvent = getLoggingEvent()
-            assert loggingEvent.level == Level.INFO
-            assert loggingEvent.formattedMessage.contains('Module set tag received: module-set-tag1')
+            def loggingMessage = getLoggingMessage(0)
+            assert loggingMessage.contains('module-set-tag1')
     }
 
     def 'Get resource data for pass-through operational.'() {
@@ -339,6 +338,19 @@ class DmiRestControllerSpec extends Specification {
             resourceIdentifier << ['passthrough-operational', 'passthrough-running']
     }
 
+    def 'PassThrough logs module set tag'(){
+        given: 'Passthrough read URL and request data with a module set tag (parameter)'
+            def readPassThroughUrl ="${basePathV1}/ch/some-cmHandle/data/ds/ncmp-datastore:" +
+                'passthrough-running?resourceIdentifier=some-resourceIdentifier&moduleSetTag=module-set-tag1'
+            def jsonData = TestUtils.getResourceFileContent('readData.json')
+        when: 'the request is posted'
+            mvc.perform(
+                post(readPassThroughUrl).contentType(MediaType.APPLICATION_JSON).content(jsonData))
+        then: 'response status is OK'
+            def loggingMessage = getLoggingMessage(0)
+            assert loggingMessage.contains('module-set-tag1')
+    }
+
     def 'Get resource data for pass-through running with #scenario value in resource identifier param.'() {
         given: 'Get resource data url'
             def getResourceDataForCmHandleUrl = "${basePathV1}/ch/some-cmHandle/data/ds/ncmp-datastore:passthrough-running" +
@@ -381,7 +393,7 @@ class DmiRestControllerSpec extends Specification {
             assert response.status == 501
     }
 
-    def getLoggingEvent() {
-        return logger.list[0]
+    def getLoggingMessage(int index) {
+        return logger.list[index].formattedMessage
     }
 }
\ No newline at end of file
-- 
cgit