Fix liquibase changeset so we can upgrade from H to I

- Undo (accidental) changes in orginal liquiubase cahnge set (03)
(see commit : https://gerrit.onap.org/r/c/cps/+/119061)
- Add new changeset for required changed related to checksum calcualtion
- There is a incorrect field name (checkstyle instead of checksum) in 03-loadData-schema-set.yaml
 but it seems to be ignored/overruled by the .csv import. If we change it liquibase report an checksum error during upgrade
i.e were are not allowed to touch the file!

Issue-ID: CPS-310

Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>
Change-Id: I00c94e3f1ddab7c9c54aac1294019ec7cd51634f

diff --git a/cps-ri/src/main/resources/changelog/changelog-master.yaml b/cps-ri/src/main/resources/changelog/changelog-master.yaml
index 921eeec..460089c 100644 (file)
--- a/cps-ri/src/main/resources/changelog/changelog-master.yaml
+++ b/cps-ri/src/main/resources/changelog/changelog-master.yaml
@@ -27,3 +27,6 @@ databaseChangeLog:
       file: changelog/db/changes/05-loadData-fragment.yaml
   - include:
       file: changelog/db/changes/06-delete-not-required-fragment-index.yaml
+  - include:
+      file: changelog/db/changes/07-update-yang-resource-checksums.yaml
+

diff --git a/cps-ri/src/main/resources/changelog/db/changes/07-update-yang-resource-checksums.yaml b/cps-ri/src/main/resources/changelog/db/changes/07-update-yang-resource-checksums.yaml
new file mode 100644 (file)
index 0000000..c3ab784
--- /dev/null
+++ b/cps-ri/src/main/resources/changelog/db/changes/07-update-yang-resource-checksums.yaml
@@ -0,0 +1,27 @@
+databaseChangeLog:
+  - changeSet:
+      id:  7
+      author:  cps
+      comment: Change checsum on yang resource due to new hash algoritm
+      changes:
+        -  update:
+             columns:
+               -  column:
+                    name:  checksum
+                    value:  417a7b14944f6236ad0e2b1ef956158c050cff9b74e3561ca80af32d11be240b
+             tableName:  yang_resource
+             where:  checksum='fd06e465f26f1e7d0253bbf77e7e55e1'
+        -  update:
+             columns:
+               -  column:
+                    name:  checksum
+                    value:  436fef591eba7f38d1a0c5e3cbd3c122f01ab41dfab37cc5a9cbca1ed53b29fb
+             tableName:  yang_resource
+             where:  checksum='0337045143fa2e592243243f82699b93'
+        -  update:
+             columns:
+               -  column:
+                    name:  checksum
+                    value:  25516798613f862ad20831e59ba02b75ecdc9c6f5547ed5d90bda76143bf0112
+             tableName:  yang_resource
+             where:  checksum='57d603ee9ab0c49355ad0695c0709c93'

diff --git a/cps-ri/src/main/resources/changelog/db/changes/data/yang_resource.csv b/cps-ri/src/main/resources/changelog/db/changes/data/yang_resource.csv
index 93db7df..4dd3127 100644 (file)
--- a/cps-ri/src/main/resources/changelog/db/changes/data/yang_resource.csv
+++ b/cps-ri/src/main/resources/changelog/db/changes/data/yang_resource.csv
@@ -455,7 +455,7 @@ ietf-inet-types.yang|"module ietf-inet-types {
                 Identifiers (URIs)\";
   }
 
-}"|417a7b14944f6236ad0e2b1ef956158c050cff9b74e3561ca80af32d11be240b
+}"|fd06e465f26f1e7d0253bbf77e7e55e1
 cps-ran-schema-model2021-01-28.yang|"module cps-ran-schema-model {
   yang-version 1.1;
   namespace \"org:onap:ccsdk:features:sdnr:northbound:cps-ran-schema-model\";
@@ -1753,7 +1753,7 @@ cps-ran-schema-model2021-01-28.yang|"module cps-ran-schema-model {
         \"Target NR Cell Identifier. It consists of NR Cell
          Identifier (NCI) and Physical Cell Identifier of the target NR cell
          (nRPCI).\";
-    "|436fef591eba7f38d1a0c5e3cbd3c122f01ab41dfab37cc5a9cbca1ed53b29fb
+    "|0337045143fa2e592243243f82699b93
 ietf-yang-types.yang|"module ietf-yang-types {
 
   namespace \"urn:ietf:params:xml:ns:yang:ietf-yang-types\";
@@ -2233,4 +2233,4 @@ ietf-yang-types.yang|"module ietf-yang-types {
        notation, i.e., four octets written as decimal numbers
        and separated with the ''.'' (full stop) character.\";
   }
-}"|25516798613f862ad20831e59ba02b75ecdc9c6f5547ed5d90bda76143bf0112
+}"|57d603ee9ab0c49355ad0695c0709c93