From 44cf6499e6f59d646c5d2ab874df103a0bed095b Mon Sep 17 00:00:00 2001 From: shikha0203 Date: Wed, 3 Sep 2025 17:35:14 +0100 Subject: [PATCH] update and use cm data job subscription model Issue-ID: CPS-2971 Change-Id: I68368d5253e4e8aacfc4279527202acf91caa6e2 Signed-off-by: shikha0203 --- .../org/onap/cps/ncmp/init/CmDataSubscriptionModelLoader.java | 2 +- ...@2025-07-16.yang => cm-data-job-subscriptions@2025-09-03.yang} | 8 ++++---- .../onap/cps/ncmp/init/CmDataSubscriptionModelLoaderSpec.groovy | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) rename cps-ncmp-service/src/main/resources/models/{cm-data-job-subscriptions@2025-07-16.yang => cm-data-job-subscriptions@2025-09-03.yang} (67%) 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 4b8a95cee1..e4645dc40b 100644 --- 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 940bce1eb0..4476ef8702 100644 --- 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 d26afb4be5..14ed5f0566 100644 --- 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) -- 2.16.6