From 0e1571aa50b192ec0d9881ce0a4fa8f6e683f47d Mon Sep 17 00:00:00 2001
From: Jerry Flood <jflood@att.com>
Date: Tue, 19 Mar 2019 07:19:56 -0400
Subject: Update changelogs for init containers

Issue-ID: OPTFRA-459

Change-Id: Ia8bb43cf9d2b1063d836d6af7a1ff188d900cda4
Signed-off-by: Jerry Flood <jflood@att.com>
---
 cmso-database/etc/config/liquibase.properties      | 13 +-----
 .../main/resources/cmso-liquibase-changeLog.xml    |  9 +++-
 .../optimizer-dbchanges/onap-cmso-v1-schema.sql    | 51 --------------------
 .../onap-optimizer-v1-schema.sql                   | 54 ++++++++++++++++++++++
 .../resources/optimizer-liquibase-changeLog.xml    | 48 +++++++++++++++++++
 5 files changed, 111 insertions(+), 64 deletions(-)
 delete mode 100644 cmso-database/src/main/resources/optimizer-dbchanges/onap-cmso-v1-schema.sql
 create mode 100644 cmso-database/src/main/resources/optimizer-dbchanges/onap-optimizer-v1-schema.sql
 create mode 100644 cmso-database/src/main/resources/optimizer-liquibase-changeLog.xml

(limited to 'cmso-database')

diff --git a/cmso-database/etc/config/liquibase.properties b/cmso-database/etc/config/liquibase.properties
index 2454070..e755bf2 100644
--- a/cmso-database/etc/config/liquibase.properties
+++ b/cmso-database/etc/config/liquibase.properties
@@ -1,5 +1,5 @@
 ###
-# Copyright &#194;© 2017-2018 AT&T Intellectual Property. 
+# Copyright © 2017-2019 AT&T Intellectual Property. 
 # Modifications Copyright &#194;© 2018 IBM. 
 #  
 # Licensed under the Apache License, Version 2.0 (the "License"); 
@@ -39,16 +39,5 @@ spring.datasource.tomcat.initialSize=5
 spring.datasource.tomcat.max-active=25
 spring.datasource.tomcat.test-on-borrow=true
 
-
-#changeLogFile=calendar-liquibase-changeLog.xml
 changeLogFile=cmso-liquibase-changeLog.xml
 
-
-#spring.main.web-environment=false
-#outputChangeLogFile=src/main/resources/cmso-output-changelog.xml
-#url=jdbc:mariadb://localhost:3306/calendar
-#url=jdbc:mysql://localhost:3306/cmso
-#username=root
-#password=root
-#driver=org.mariadb.jdbc.Driver
-#driver=com.mysql.jdbc.Driver
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
--- 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"?>
 <!--
-  Copyright © 2017-2018 AT&T Intellectual Property.
+  Copyright © 2017-2019 AT&T Intellectual Property.
   Modifications Copyright © 2018 IBM.
   
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -45,4 +45,11 @@
 		<sqlFile path="cmso-dbchangelog/onap-cmso-v1-schema.sql" />
 	</changeSet>
 
+	<changeSet author="ONAP" id="cmso-v1.1-schema1">
+		<sqlFile path="cmso-dbchangelog/onap-cmso-v1.1-drop-indices.sql" />
+		<sqlFile path="cmso-dbchangelog/onap-cmso-v1.1-add-uuid.sql" />
+		<sqlFile path="cmso-dbchangelog/onap-cmso-v1.1-restore-indices.sql" />
+		<sqlFile path="cmso-dbchangelog/onap-cmso-v1.1-drop-ids.sql" />
+	</changeSet>
+
 </databaseChangeLog>
diff --git a/cmso-database/src/main/resources/optimizer-dbchanges/onap-cmso-v1-schema.sql b/cmso-database/src/main/resources/optimizer-dbchanges/onap-cmso-v1-schema.sql
deleted file mode 100644
index d6e225b..0000000
--- a/cmso-database/src/main/resources/optimizer-dbchanges/onap-cmso-v1-schema.sql
+++ /dev/null
@@ -1,51 +0,0 @@
-CREATE SCHEMA IF NOT EXISTS `optimizer` DEFAULT CHARACTER SET utf8 ;
-
-CREATE TABLE IF NOT EXISTS `optimizer`.`request` (
-  uuid BINARY(16) NOT NULL,
-  request LONGTEXT NOT NULL,
-  created_time BIGINT(20) NULL DEFAULT NULL,
-  request_start BIGINT(20) NULL DEFAULT NULL,
-  request_end BIGINT(20) NULL DEFAULT NULL,
-  status VARCHAR(45) NULL DEFAULT NULL,
-  PRIMARY KEY (`uuid`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
-CREATE TABLE IF NOT EXISTS `optimizer`.`response` (
-  uuid BINARY(16) NOT NULL,
-  repsonse LONGTEXT NULL DEFAULT NULL,
-  delivered_time BIGINT(20) NULL DEFAULT NULL,
-  PRIMARY KEY (`uuid`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
-
-CREATE TABLE IF NOT EXISTS `optimizer`.`topology` (
-  uuid BINARY(16) NOT NULL,
-  topology LONGTEXT NULL DEFAULT NULL,
-  topology_start BIGINT(20) NULL DEFAULT NULL,
-  topology_end BIGINT(20) NULL DEFAULT NULL,
-  topology_retries INT NULL DEFAULT NULL,
-  PRIMARY KEY (`uuid`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
-CREATE TABLE IF NOT EXISTS `optimizer`.`tickets` (
-  uuid BINARY(16) NOT NULL,
-  tickets LONGTEXT NULL DEFAULT NULL,
-  tickets_start BIGINT(20) NULL DEFAULT NULL,
-  tickets_end BIGINT(20) NULL DEFAULT NULL,
-  tickets_retries INT NULL DEFAULT NULL,
-  PRIMARY KEY (`uuid`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
-
-CREATE TABLE IF NOT EXISTS `optimizer`.`optimizer` (
-  uuid BINARY(16) NOT NULL,
-  optimize_response LONGTEXT NULL DEFAULT NULL,
-  optimize_start BIGINT(20) NULL DEFAULT NULL,
-  optimize_end BIGINT(20) NULL DEFAULT NULL,
-  optimize_retries INT NULL DEFAULT NULL,
-  PRIMARY KEY (`uuid`))
-ENGINE = InnoDB
-DEFAULT CHARACTER SET = utf8;
diff --git a/cmso-database/src/main/resources/optimizer-dbchanges/onap-optimizer-v1-schema.sql b/cmso-database/src/main/resources/optimizer-dbchanges/onap-optimizer-v1-schema.sql
new file mode 100644
index 0000000..171cb2d
--- /dev/null
+++ b/cmso-database/src/main/resources/optimizer-dbchanges/onap-optimizer-v1-schema.sql
@@ -0,0 +1,54 @@
+CREATE SCHEMA IF NOT EXISTS `optimizer` DEFAULT CHARACTER SET utf8 ;
+
+CREATE TABLE IF NOT EXISTS `optimizer`.`request` (
+  uuid BINARY(16) NOT NULL,
+  request LONGTEXT NOT NULL,
+  created_time BIGINT(20) NULL DEFAULT NULL,
+  request_start BIGINT(20) NULL DEFAULT NULL,
+  request_end BIGINT(20) NULL DEFAULT NULL,
+  status VARCHAR(45) NULL DEFAULT NULL,
+  PRIMARY KEY (`uuid`))
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8;
+
+CREATE TABLE IF NOT EXISTS `optimizer`.`response` (
+  uuid BINARY(16) NOT NULL,
+  repsonse LONGTEXT NULL DEFAULT NULL,
+  delivered_time BIGINT(20) NULL DEFAULT NULL,
+  PRIMARY KEY (`uuid`))
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8;
+
+
+CREATE TABLE IF NOT EXISTS `optimizer`.`topology` (
+  uuid BINARY(16) NOT NULL,
+  topology LONGTEXT NULL DEFAULT NULL,
+  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;
+
+CREATE TABLE IF NOT EXISTS `optimizer`.`tickets` (
+  uuid BINARY(16) NOT NULL,
+  tickets LONGTEXT NULL DEFAULT NULL,
+  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;
+
+CREATE TABLE IF NOT EXISTS `optimizer`.`optimizer` (
+  uuid BINARY(16) NOT NULL,
+  optimize_response LONGTEXT NULL DEFAULT NULL,
+  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
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>
-- 
cgit 1.2.3-korg