aboutsummaryrefslogtreecommitdiffstats
path: root/cps-ri/src/main/resources/changelog/db
diff options
context:
space:
mode:
authorJosephKeenan <joseph.keenan@est.tech>2021-11-23 12:18:28 +0000
committerJosephKeenan <joseph.keenan@est.tech>2021-11-25 15:40:10 +0000
commit20b4f9cf0b662de4a7665b2a82593ef0205f5e06 (patch)
treeab849ff17b861f246c328e421e8dcfc8ceb9e851 /cps-ri/src/main/resources/changelog/db
parentbc742a1dbe39a3269abab9e62a9d489f460144b0 (diff)
Allow separate registration of DMIDataPlugin and DmiModelPugin
Moved relevant code from NetworkCmProxyDataServiceImp to DmiOperations Split DmiOperations into DMiData... and DMIModelOperations Merged update-operation changes Added tests for error message validation in NetworkCmProxyDataServiceImplSpec Removede @Service from DMIOperations and added @component to DmiDataOperations & DmiModelOperations Verify sync robot test is now hardened Added exitonfailure so robot tests stop after first encountered failed test Issue-ID: CPS-736 Change-Id: I0b40931cc8cd4fc0452328a0a7e0f60e6fc38d0a Signed-off-by: JosephKeenan <joseph.keenan@est.tech> Signed-off-by: ToineSiebelink <toine.siebelink@est.tech> Signed-off-by: DylanB95EST <dylan.byrne@est.tech>
Diffstat (limited to 'cps-ri/src/main/resources/changelog/db')
-rw-r--r--cps-ri/src/main/resources/changelog/db/changes/09-loadData-dmi-registry-schema-set.yaml50
-rw-r--r--cps-ri/src/main/resources/changelog/db/changes/data/dmi/schema_set_yang_resources@2021-10-20.csv3
-rw-r--r--cps-ri/src/main/resources/changelog/db/changes/data/dmi/yang_resource@2021-10-20.csv53
3 files changed, 105 insertions, 1 deletions
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 d9be36a155..fe2428e0c3 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
@@ -111,4 +111,52 @@ databaseChangeLog:
tableName: 'anchor'
rollback:
- sql:
- sql: delete from anchor where name = 'ncmp-dmi-registry' \ No newline at end of file
+ sql: delete from anchor where name = 'ncmp-dmi-registry'
+
+ - changeSet:
+ author: cps
+ label: dmi-registry-schema-preload
+ id: 9.5
+ loadUpdateData:
+ encoding: UTF-8
+ file: 'changelog/db/changes/data/dmi/yang_resource@2021-10-20.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-10-20.yang'
+
+ - changeSet:
+ author: cps
+ label: dmi-registry-schema-preload
+ id: 9.6
+ loadUpdateData:
+ encoding: UTF-8
+ file: 'changelog/db/changes/data/dmi/schema_set_yang_resources@2021-10-20.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-10-20.yang')
diff --git a/cps-ri/src/main/resources/changelog/db/changes/data/dmi/schema_set_yang_resources@2021-10-20.csv b/cps-ri/src/main/resources/changelog/db/changes/data/dmi/schema_set_yang_resources@2021-10-20.csv
new file mode 100644
index 0000000000..d419fc92b4
--- /dev/null
+++ b/cps-ri/src/main/resources/changelog/db/changes/data/dmi/schema_set_yang_resources@2021-10-20.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-10-20.yang')
+
diff --git a/cps-ri/src/main/resources/changelog/db/changes/data/dmi/yang_resource@2021-10-20.csv b/cps-ri/src/main/resources/changelog/db/changes/data/dmi/yang_resource@2021-10-20.csv
new file mode 100644
index 0000000000..80caea2142
--- /dev/null
+++ b/cps-ri/src/main/resources/changelog/db/changes/data/dmi/yang_resource@2021-10-20.csv
@@ -0,0 +1,53 @@
+name|content|checksum
+dmi-registry@2021-10-20.yang|"module dmi-registry {
+
+ yang-version 1.1;
+
+ namespace \"org:onap:cps:ncmp\";
+
+ prefix dmi-reg;
+
+ organization \"Nordix Foundation\";
+
+ contact \"rahul.tyagi@est.tech\";
+
+ revision \"2021-10-20\" {
+ description
+ \"Added dmi-data-service-name & dmi-model-service-name to allow separate DMI instances for each responsibility\";
+ }
+
+ 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;
+ }
+ }
+ }
+ }
+}
+"|f9145662dfc97363297dc1c06b8bde3a8621c658abefd56946faaab240714181
AME} mso_pass=${GLOBAL_INJECTED_OPENSTACK_SO_ENCRYPTED_PASSWORD} admin_tenant=${GLOBAL_INJECTED_OPENSTACK_TENANT_ID} member_role=admin identity_server_type=KEYSTONE_V3 authentication_type=USERNAME_PASSWORD project_domain_name=${GLOBAL_INJECTED_OPENSTACK_DOMAIN_ID} user_domain_name=${GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN} ${auth}= Create List ${GLOBAL_SO_CATDB_USERNAME} ${GLOBAL_SO_PASSWORD} Run Keyword If '${GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION}'=='v3' SO.Upsert Cloud Configuration ${GLOBAL_SO_CATDB_ENDPOINT} ${GLOBAL_SO_CLOUD_CONFIG_PATH} ${GLOBAL_TEMPLATE_FOLDER} ${GLOBAL_SO_CLOUD_CONFIG_TEMPLATE} ${arguments} auth=${auth} Initialize vCPE Models [Tags] distributeVCPE Load vCPE Models Demonstration Initialize Customer [Tags] InitCustomer Load Customer Demonstration Load Customer SDN-ETHERNET-INTERNET Initialize Models [Tags] InitDistribution Load Models Demonstration Preload VNF [Tags] PreloadDemo Preload User Model ${VNF_NAME} ${MODULE_NAME} ${SERVICE} ${SERVICE_INSTANCE_ID} Preload VNF GRA [Tags] PreloadDemoGRA Set Global Variable ${API_TYPE} GRA_API Preload User Model ${VNF_NAME} ${MODULE_NAME} ${SERVICE} ${SERVICE_INSTANCE_ID} Create APPC Mount Point [Tags] APPCMountPointDemo APPC Mount Point ${MODULE_NAME} Instantiate VFW [Tags] instantiateVFW Instantiate VNF vFW base_vfw Instantiate Demo VFWCL [Tags] instantiateDemoVFWCL Instantiate Demo VNF vFWCL base_vpkg Instantiate Demo VFWCL GRA [Tags] instantiateDemoVFWCLGRA Set Global Variable ${API_TYPE} GRA_API Instantiate Demo VNF vFWCL base_vpkg Instantiate VFWCL [Tags] instantiateVFWCL Instantiate VNF vFWCL base_vpkg Instantiate VFWCL GRA [Tags] instantiateVFWCLGRA Set Global Variable ${API_TYPE} GRA_API Instantiate VNF vFWCL base_vpkg Instantiate VFWCL DANOS [Tags] instantiateVFWCLDN Set Global Variable ${API_TYPE} GRA_API Instantiate VNF vFWCLDN base_vpkg Instantiate VLB GRA [Tags] instantiateVLBGRA Set Global Variable ${API_TYPE} GRA_API Instantiate VNF vLB base_vpkg Instantiate VFWDT GRA [Tags] instantiateVFWDTGRA Set Global Variable ${API_TYPE} GRA_API Instantiate VNF vFWDT base_vpkg Instantiate VFWDT [Tags] instantiateVFWDT Instantiate VNF vFWDT base_vpkg Instantiate VLB_CDS [Tags] instantiateVLB_CDS Instantiate VNF CDS vLB_CDS demoVLB_CDS Delete Instantiated VNF [Documentation] This test assumes all necessary variables are loaded via the variable file create in Save For Delete ... The Teardown VNF needs to be in the teardown step of the test case... [Tags] deleteVNF Setup Browser Login To VID GUI Delete VNF ${TENANT_NAME} ${VVG_SERVER_ID} ${CUSTOMER_NAME} ${SERVICE_INSTANCE_ID} ${STACK_NAMES} ${REVERSE_HEATBRIDGE} [Teardown] Teardown VNF ${CUSTOMER_NAME} ${CATALOG_SERVICE_ID} ${CATALOG_RESOURCE_IDS} #Run Heatbridge # [Documentation] # ... Try to run heatbridge # [Tags] heatbridge # Execute Heatbridge ${HB_STACK} ${HB_VNF} ${HB_SERVICE} ${HB_IPV4_OAM_ADDRESS} Preload APPC CDT GUI [Documentation] ... APPC CDT Preload Demo [Tags] APPCCDTPreloadDemo Setup Browser Preload APPC CDT GUI Distribute vFWNG CDS Model [Documentation] Distribute vFWNG for CDS [Tags] DistributeVFWNG [Timeout] 600 Model Distribution For Directory service=vFWNG cds=vfwng Distribute Demo vFWDT Model [Documentation] Distribute Demo vFWDT (does not delete model after distribution) [Tags] DistributeDemoVFWDT [Timeout] 600 Model Distribution For Directory service=vFWDT Download Service CSAR To Robot [Tags] downloadCsar Download CSAR ${CATALOG_SERVICE_ID}