diff options
author | leventecsanyi <levente.csanyi@est.tech> | 2023-12-07 14:02:14 +0100 |
---|---|---|
committer | leventecsanyi <levente.csanyi@est.tech> | 2023-12-14 12:50:07 +0100 |
commit | 28b41814dedc2c26c560edd869702ffbfb25d818 (patch) | |
tree | dc2da9a32411df353e232e32c3526122024f10e0 /cps-ncmp-service/src/main | |
parent | 7e94b26a666907cc97d692b8dda8364bb0a0ef45 (diff) |
Update Model to allow Persisting of alternateId
- added new dmi model registry and modified tests
Issue-ID: CPS-1989
Signed-off-by: leventecsanyi <levente.csanyi@est.tech>
Change-Id: I576a5a0704fe28924dcc304c276fec5665b52764
Diffstat (limited to 'cps-ncmp-service/src/main')
-rw-r--r-- | cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/InventoryModelLoader.java | 4 | ||||
-rw-r--r-- | cps-ncmp-service/src/main/resources/models/dmi-registry@2023-11-27.yang (renamed from cps-ncmp-service/src/main/resources/models/dmi-registry@2023-08-23.yang) | 17 |
2 files changed, 15 insertions, 6 deletions
diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/InventoryModelLoader.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/InventoryModelLoader.java index b805cdcd84..a27eb6f7ce 100644 --- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/InventoryModelLoader.java +++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/InventoryModelLoader.java @@ -33,8 +33,8 @@ import org.springframework.stereotype.Service; @Service public class InventoryModelLoader extends AbstractModelLoader { - private static final String NEW_MODEL_FILE_NAME = "dmi-registry@2023-08-23.yang"; - private static final String NEW_SCHEMA_SET_NAME = "dmi-registry-2023-08-23"; + private static final String NEW_MODEL_FILE_NAME = "dmi-registry@2023-11-27.yang"; + private static final String NEW_SCHEMA_SET_NAME = "dmi-registry-2023-11-27"; public InventoryModelLoader(final CpsAdminService cpsAdminService, final CpsModuleService cpsModuleService, diff --git a/cps-ncmp-service/src/main/resources/models/dmi-registry@2023-08-23.yang b/cps-ncmp-service/src/main/resources/models/dmi-registry@2023-11-27.yang index bb7604d91a..808bbdd1bc 100644 --- a/cps-ncmp-service/src/main/resources/models/dmi-registry@2023-08-23.yang +++ b/cps-ncmp-service/src/main/resources/models/dmi-registry@2023-11-27.yang @@ -8,24 +8,29 @@ module dmi-registry { contact "toine.siebelink@est.tech"; + revision "2023-11-27" { + description + "Added alternate-id"; + } + revision "2023-08-23" { description - "Added ModuleSetTag"; + "Added module-set-tag"; } revision "2022-05-10" { description - "Added DataSyncEnabled, SyncState with State, LastSyncTime, DataStoreSyncState with Operational and Running syncstate"; + "Added data-sync-enabled, sync-state with state, last-sync-time, data-store-sync-state with operational and running syncstate"; } revision "2022-02-10" { description - "Added State, LockReason, LockReasonDetails to aid with cmHandle sync and timestamp to aid with retry/timeout scenarios"; + "Added state, lock-reason, lock-reason-details to aid with cmHandle sync and timestamp to aid with retry/timeout scenarios"; } revision "2021-12-13" { description - "Added new list of public additional properties for a Cm-Handle which are exposed to clients of the NCMP interface"; + "Added new list of public-properties and additional-properties for a Cm-Handle which are exposed to clients of the NCMP interface"; } revision "2021-10-20" { @@ -83,6 +88,9 @@ module dmi-registry { leaf module-set-tag { type string; } + leaf alternate-id { + type string; + } list additional-properties { key "name"; @@ -129,3 +137,4 @@ module dmi-registry { } } } + |