Update changelogs for init containers

Issue-ID: OPTFRA-459

Change-Id: Ia8bb43cf9d2b1063d836d6af7a1ff188d900cda4
Signed-off-by: Jerry Flood <jflood@att.com>

diff --git a/cmso-database/etc/config/liquibase.properties b/cmso-database/etc/config/liquibase.properties
index 2454070..e755bf2 100644 (file)
--- a/cmso-database/etc/config/liquibase.properties
+++ b/cmso-database/etc/config/liquibase.properties
@@ -1,5 +1,5 @@
 ###\r
-# Copyright © 2017-2018 AT&T Intellectual Property. \r
+# Copyright © 2017-2019 AT&T Intellectual Property. \r
 # Modifications Copyright © 2018 IBM. \r
 #  \r
 # Licensed under the Apache License, Version 2.0 (the "License"); \r
@@ -39,16 +39,5 @@ spring.datasource.tomcat.initialSize=5
 spring.datasource.tomcat.max-active=25\r
 spring.datasource.tomcat.test-on-borrow=true\r
 \r
-\r
-#changeLogFile=calendar-liquibase-changeLog.xml\r
 changeLogFile=cmso-liquibase-changeLog.xml\r
 \r
-\r
-#spring.main.web-environment=false\r
-#outputChangeLogFile=src/main/resources/cmso-output-changelog.xml\r
-#url=jdbc:mariadb://localhost:3306/calendar\r
-#url=jdbc:mysql://localhost:3306/cmso\r
-#username=root\r
-#password=root\r
-#driver=org.mariadb.jdbc.Driver\r
-#driver=com.mysql.jdbc.Driver\r

diff --git a/cmso-database/src/main/resources/cmso-liquibase-changeLog.xml b/cmso-database/src/main/resources/cmso-liquibase-changeLog.xml
index 0bc23c1..bf45ff9 100644 (file)
--- a/cmso-database/src/main/resources/cmso-liquibase-changeLog.xml
+++ b/cmso-database/src/main/resources/cmso-liquibase-changeLog.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
 <!--\r
-  Copyright © 2017-2018 AT&T Intellectual Property.\r
+  Copyright © 2017-2019 AT&T Intellectual Property.\r
   Modifications Copyright © 2018 IBM.\r
   \r
   Licensed under the Apache License, Version 2.0 (the "License");\r
@@ -45,4 +45,11 @@
                <sqlFile path="cmso-dbchangelog/onap-cmso-v1-schema.sql" />\r
        </changeSet>\r
 \r
+       <changeSet author="ONAP" id="cmso-v1.1-schema1">\r
+               <sqlFile path="cmso-dbchangelog/onap-cmso-v1.1-drop-indices.sql" />\r
+               <sqlFile path="cmso-dbchangelog/onap-cmso-v1.1-add-uuid.sql" />\r
+               <sqlFile path="cmso-dbchangelog/onap-cmso-v1.1-restore-indices.sql" />\r
+               <sqlFile path="cmso-dbchangelog/onap-cmso-v1.1-drop-ids.sql" />\r
+       </changeSet>\r
+\r
 </databaseChangeLog>\r

diff --git a/cmso-database/src/main/resources/optimizer-dbchanges/onap-cmso-v1-schema.sql b/cmso-database/src/main/resources/optimizer-dbchanges/onap-optimizer-v1-schema.sql
similarity index 91%
rename from cmso-database/src/main/resources/optimizer-dbchanges/onap-cmso-v1-schema.sql
rename to cmso-database/src/main/resources/optimizer-dbchanges/onap-optimizer-v1-schema.sql
index d6e225b..171cb2d 100644 (file)
--- a/cmso-database/src/main/resources/optimizer-dbchanges/onap-cmso-v1-schema.sql
+++ b/cmso-database/src/main/resources/optimizer-dbchanges/onap-optimizer-v1-schema.sql
@@ -26,6 +26,7 @@ CREATE TABLE IF NOT EXISTS `optimizer`.`topology` (
   topology_start BIGINT(20) NULL DEFAULT NULL,
   topology_end BIGINT(20) NULL DEFAULT NULL,
   topology_retries INT NULL DEFAULT NULL,
+  topology_polling_interval INT NULL DEFAULT NULL,
   PRIMARY KEY (`uuid`))
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8;
@@ -36,6 +37,7 @@ CREATE TABLE IF NOT EXISTS `optimizer`.`tickets` (
   tickets_start BIGINT(20) NULL DEFAULT NULL,
   tickets_end BIGINT(20) NULL DEFAULT NULL,
   tickets_retries INT NULL DEFAULT NULL,
+  topology_polling_interval INT NULL DEFAULT NULL,
   PRIMARY KEY (`uuid`))
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8;
@@ -46,6 +48,7 @@ CREATE TABLE IF NOT EXISTS `optimizer`.`optimizer` (
   optimize_start BIGINT(20) NULL DEFAULT NULL,
   optimize_end BIGINT(20) NULL DEFAULT NULL,
   optimize_retries INT NULL DEFAULT NULL,
+  optimize_polling_interval INT NULL DEFAULT NULL,
   PRIMARY KEY (`uuid`))
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8;

diff --git a/cmso-database/src/main/resources/optimizer-liquibase-changeLog.xml b/cmso-database/src/main/resources/optimizer-liquibase-changeLog.xml
new file mode 100644 (file)
index 0000000..e735975
--- /dev/null
+++ b/cmso-database/src/main/resources/optimizer-liquibase-changeLog.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  Copyright © 2017-2019 AT&T Intellectual Property.
+  Modifications Copyright © 2018 IBM.
+  
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  
+  
+  Unless otherwise specified, all documentation contained herein is licensed
+  under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+  you may not use this documentation except in compliance with the License.
+  You may obtain a copy of the License at
+  
+          https://creativecommons.org/licenses/by/4.0/
+  
+  Unless required by applicable law or agreed to in writing, documentation
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<databaseChangeLog
+       xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+       xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd">
+
+       <changeSet author="ONAP" id="optimizer-v1-schema1">
+               <preConditions onFail="MARK_RAN">
+                       <not>
+                               <tableExists schemaName="optimizer" tableName="request" />
+                       </not>
+               </preConditions>
+               <sqlFile path="optimizer-dbchanges/onap-optimizer-v1-schema.sql" />
+       </changeSet>
+
+</databaseChangeLog>