update and use cm data job subscription model

Issue-ID: CPS-2971
Change-Id: I68368d5253e4e8aacfc4279527202acf91caa6e2
Signed-off-by: shikha0203 <shivani.khare@est.tech>

diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/CmDataSubscriptionModelLoader.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/CmDataSubscriptionModelLoader.java
index 4b8a95c..e4645dc 100644 (file)
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/CmDataSubscriptionModelLoader.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/CmDataSubscriptionModelLoader.java
@@ -34,7 +34,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class CmDataSubscriptionModelLoader extends AbstractModelLoader {
 
-    private static final String MODEL_FILE_NAME = "cm-data-job-subscriptions@2025-07-16.yang";
+    private static final String MODEL_FILE_NAME = "cm-data-job-subscriptions@2025-09-03.yang";
     private static final String SCHEMA_SET_NAME = "cm-data-job-subscriptions";
     private static final String ANCHOR_NAME = "cm-data-job-subscriptions";
     private static final String REGISTRY_DATA_NODE_NAME = "dataJob";

diff --git a/cps-ncmp-service/src/main/resources/models/cm-data-job-subscriptions@2025-07-16.yang b/cps-ncmp-service/src/main/resources/models/cm-data-job-subscriptions@2025-09-03.yang
similarity index 67%
rename from cps-ncmp-service/src/main/resources/models/cm-data-job-subscriptions@2025-07-16.yang
rename to cps-ncmp-service/src/main/resources/models/cm-data-job-subscriptions@2025-09-03.yang
index 940bce1..4476ef8 100644 (file)
--- a/cps-ncmp-service/src/main/resources/models/cm-data-job-subscriptions@2025-07-16.yang
+++ b/cps-ncmp-service/src/main/resources/models/cm-data-job-subscriptions@2025-09-03.yang
@@ -4,17 +4,17 @@ module cps-data-job-subscriptions {
 
     prefix cps-djs;
 
-    revision "2025-07-16" {
+    revision "2025-09-03" {
         description
             "First release of cm data job (notification) subscriptions model";
     }
 
     container dataJob {
         list subscription {
-            key "alternateId dataTypeId";
-            leaf alternateId { type string; }
-            leaf dataTypeId { type string; }
+            key "dataNodeSelector";
+            leaf dataNodeSelector { type string; }
             leaf-list dataJobId { type string; }
+            leaf status { type string; }
         }
     }
 }
\ No newline at end of file

diff --git a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/init/CmDataSubscriptionModelLoaderSpec.groovy b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/init/CmDataSubscriptionModelLoaderSpec.groovy
index d26afb4..14ed5f0 100644 (file)
--- a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/init/CmDataSubscriptionModelLoaderSpec.groovy
+++ b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/init/CmDataSubscriptionModelLoaderSpec.groovy
@@ -50,7 +50,7 @@ class CmDataSubscriptionModelLoaderSpec extends Specification {
     def loggingListAppender
 
     void setup() {
-        expectedYangResourcesToContentMap = objectUnderTest.mapYangResourcesToContent('cm-data-job-subscriptions@2025-07-16.yang')
+        expectedYangResourcesToContentMap = objectUnderTest.mapYangResourcesToContent('cm-data-job-subscriptions@2025-09-03.yang')
         logger.setLevel(Level.DEBUG)
         loggingListAppender = new ListAppender()
         logger.addAppender(loggingListAppender)