From 63132cec2c18363a8224646039cc23b6144d8e6c Mon Sep 17 00:00:00 2001 From: DylanB95EST Date: Tue, 14 Dec 2021 16:34:38 +0000 Subject: Support 'public' Cm Handle Properties Add support for new Public Additional Properties list to Register CM Handles API Issue-ID: CPS-677 Change-Id: I6efc88734da2416f72f71a403622e519398b502d Signed-off-by: DylanB95EST --- .../09-loadData-dmi-registry-schema-set.yaml | 50 ++++++++++++++++- .../db/changes/data/dmi/generated-csv/README.md | 23 ++++++++ .../dmi/schema_set_yang_resources@2021-12-13.csv | 3 ++ .../data/yang-models/dmi-registry@2021-12-13.yang | 63 ++++++++++++++++++++++ 4 files changed, 138 insertions(+), 1 deletion(-) create mode 100644 cps-ri/src/main/resources/changelog/db/changes/data/dmi/generated-csv/README.md create mode 100644 cps-ri/src/main/resources/changelog/db/changes/data/dmi/schema_set_yang_resources@2021-12-13.csv create mode 100644 cps-ri/src/main/resources/changelog/db/changes/data/yang-models/dmi-registry@2021-12-13.yang (limited to 'cps-ri/src/main/resources/changelog') diff --git a/cps-ri/src/main/resources/changelog/db/changes/09-loadData-dmi-registry-schema-set.yaml b/cps-ri/src/main/resources/changelog/db/changes/09-loadData-dmi-registry-schema-set.yaml index fe2428e0c..723c2b9ec 100644 --- a/cps-ri/src/main/resources/changelog/db/changes/09-loadData-dmi-registry-schema-set.yaml +++ b/cps-ri/src/main/resources/changelog/db/changes/09-loadData-dmi-registry-schema-set.yaml @@ -1,5 +1,5 @@ # ============LICENSE_START======================================================= -# Copyright (C) 2021 Nordix Foundation. +# Copyright (C) 2021-2022 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -160,3 +160,51 @@ databaseChangeLog: delete from schema_set_yang_resources where schema_set_id = (select id from schema_set where name = 'ncmp-dmi-registry-model') and yang_resource_id = (select id from yang_resource where name = 'dmi-registry@2021-10-20.yang') + + - changeSet: + author: cps + label: dmi-registry-schema-preload + id: 9.7 + loadUpdateData: + encoding: UTF-8 + file: 'changelog/db/changes/data/dmi//generated-csv/generated_yang_resource_dmi-registry@2021-12-13.csv' + onlyUpdate: 'false' + primaryKey: 'id' + quotchar: '"' + separator: '|' + tableName: 'yang_resource' + columns: + - column: + header: name + name: name + type: STRING + - column: + header: content + name: content + type: STRING + - column: + header: checksum + name: checksum + type: STRING + rollback: + - sql: + sql: delete from yang_resource where name = 'dmi-registry@2021-12-13.yang' + + - changeSet: + author: cps + label: dmi-registry-schema-preload + id: 9.8 + loadUpdateData: + encoding: UTF-8 + file: 'changelog/db/changes/data/dmi/schema_set_yang_resources@2021-12-13.csv' + quotchar: '"' + primaryKey: 'schema_set_id,yang_resource_id' + separator: '|' + tableName: 'schema_set_yang_resources' + usePreparedStatements: true + rollback: + - sql: + sql: > + delete from schema_set_yang_resources + where schema_set_id = (select id from schema_set where name = 'ncmp-dmi-registry-model') + and yang_resource_id = (select id from yang_resource where name = 'dmi-registry@2021-12-13.yang') \ No newline at end of file diff --git a/cps-ri/src/main/resources/changelog/db/changes/data/dmi/generated-csv/README.md b/cps-ri/src/main/resources/changelog/db/changes/data/dmi/generated-csv/README.md new file mode 100644 index 000000000..212acb900 --- /dev/null +++ b/cps-ri/src/main/resources/changelog/db/changes/data/dmi/generated-csv/README.md @@ -0,0 +1,23 @@ + + +##Placeholder folder for generated CSV files as part of yang models. + +Do not remove this folder \ No newline at end of file diff --git a/cps-ri/src/main/resources/changelog/db/changes/data/dmi/schema_set_yang_resources@2021-12-13.csv b/cps-ri/src/main/resources/changelog/db/changes/data/dmi/schema_set_yang_resources@2021-12-13.csv new file mode 100644 index 000000000..3e8afdd4e --- /dev/null +++ b/cps-ri/src/main/resources/changelog/db/changes/data/dmi/schema_set_yang_resources@2021-12-13.csv @@ -0,0 +1,3 @@ +schema_set_id|yang_resource_id +(select id from schema_set where name='ncmp-dmi-registry-model')|(select id from yang_resource where name='dmi-registry@2021-12-13.yang') + diff --git a/cps-ri/src/main/resources/changelog/db/changes/data/yang-models/dmi-registry@2021-12-13.yang b/cps-ri/src/main/resources/changelog/db/changes/data/yang-models/dmi-registry@2021-12-13.yang new file mode 100644 index 000000000..ed3559bf6 --- /dev/null +++ b/cps-ri/src/main/resources/changelog/db/changes/data/yang-models/dmi-registry@2021-12-13.yang @@ -0,0 +1,63 @@ +module dmi-registry { + + yang-version 1.1; + + namespace "org:onap:cps:ncmp"; + + prefix dmi-reg; + + contact "dylan.byrne@est.tech"; + + revision "2021-05-20" { + description + "Initial Version"; + } + + revision "2021-10-20" { + description + "Added dmi-data-service-name & dmi-model-service-name to allow separate DMI instances for each responsibility"; + } + + revision "2021-12-13" { + description + "Added new list of public additonal properties for a Cm-Handle which are exposed to clients of the NCMP interface"; + } + + container dmi-registry { + list cm-handles { + key "id"; + leaf id { + type string; + } + leaf dmi-service-name { + type string; + } + leaf dmi-data-service-name { + type string; + } + leaf dmi-model-service-name { + type string; + } + + list additional-properties { + key "name"; + leaf name { + type string; + } + leaf value { + type string; + } + } + + list public-properties { + key "name"; + leaf name { + type string; + } + leaf value { + type string; + } + } + } + } +} \ No newline at end of file -- cgit 1.2.3-korg