From 0e857982e51084c6816dcbc08ef341b2b1a8765d Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Sun, 1 Mar 2026 17:24:39 +0100 Subject: [PATCH] Migrate from flyway to liquibase Issue-ID: SO-4248 Change-Id: I6eac710d803eee03f41a0c959abf0f7c91441817 Signed-off-by: Fiete Ostkamp --- adapters/mso-catalog-db-adapter/pom.xml | 4 +- ...figMigration.java => CloudConfigMigration.java} | 73 +++-- .../src/main/resources/application.yaml | 6 +- .../resources/db/changelog/db.changelog-master.xml | 305 +++++++++++++++++++++ .../catalogdb/CatalogDbAdapterBaseTest.java | 2 +- .../src/test/resources/application-test.yaml | 20 +- .../resources/db/changelog/db.changelog-test.xml | 16 ++ .../src/test/resources/logback-test.xml | 6 +- .../src/test/resources/application-nomigrate.yaml | 28 +- .../src/test/resources/schema.sql | 44 ++- adapters/mso-requests-db-adapter/pom.xml | 4 +- .../src/main/resources/application.yaml | 6 +- .../resources/db/changelog/db.changelog-master.xml | 121 ++++++++ .../src/test/resources/application-test.yaml | 14 +- .../resources/db/changelog/db.changelog-test.xml | 16 ++ .../src/test/resources/logback-test.xml | 4 +- asdc-controller/src/test/resources/schema.sql | 58 ++-- common/common/src/test/resources/logback-test.xml | 2 +- cxf-logging/src/test/resources/logback-test.xml | 14 +- .../src/main/resources/logger/logback-spring.xml | 2 +- docs/developer_info/Cxf_Logging.rst | 11 +- .../src/test/resources/schema.sql | 50 ++-- mso-catalog-db/src/test/resources/schema.sql | 46 ++-- 23 files changed, 685 insertions(+), 167 deletions(-) rename adapters/mso-catalog-db-adapter/src/main/java/db/migration/{R__CloudConfigMigration.java => CloudConfigMigration.java} (85%) create mode 100644 adapters/mso-catalog-db-adapter/src/main/resources/db/changelog/db.changelog-master.xml create mode 100644 adapters/mso-catalog-db-adapter/src/test/resources/db/changelog/db.changelog-test.xml create mode 100644 adapters/mso-requests-db-adapter/src/main/resources/db/changelog/db.changelog-master.xml create mode 100644 adapters/mso-requests-db-adapter/src/test/resources/db/changelog/db.changelog-test.xml diff --git a/adapters/mso-catalog-db-adapter/pom.xml b/adapters/mso-catalog-db-adapter/pom.xml index a129cdfbcf..d3815d6469 100644 --- a/adapters/mso-catalog-db-adapter/pom.xml +++ b/adapters/mso-catalog-db-adapter/pom.xml @@ -163,8 +163,8 @@ test - org.flywaydb - flyway-core + org.liquibase + liquibase-core io.micrometer diff --git a/adapters/mso-catalog-db-adapter/src/main/java/db/migration/R__CloudConfigMigration.java b/adapters/mso-catalog-db-adapter/src/main/java/db/migration/CloudConfigMigration.java similarity index 85% rename from adapters/mso-catalog-db-adapter/src/main/java/db/migration/R__CloudConfigMigration.java rename to adapters/mso-catalog-db-adapter/src/main/java/db/migration/CloudConfigMigration.java index 70b0da7e25..6634467969 100644 --- a/adapters/mso-catalog-db-adapter/src/main/java/db/migration/R__CloudConfigMigration.java +++ b/adapters/mso-catalog-db-adapter/src/main/java/db/migration/CloudConfigMigration.java @@ -32,8 +32,13 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; import java.util.Collection; -import org.flywaydb.core.api.MigrationVersion; -import org.flywaydb.core.api.migration.BaseJavaMigration; +import liquibase.change.custom.CustomTaskChange; +import liquibase.database.Database; +import liquibase.database.jvm.JdbcConnection; +import liquibase.exception.CustomChangeException; +import liquibase.exception.SetupException; +import liquibase.exception.ValidationErrors; +import liquibase.resource.ResourceAccessor; import org.onap.so.db.catalog.beans.CloudIdentity; import org.onap.so.db.catalog.beans.CloudSite; import org.onap.so.db.catalog.beans.CloudifyManager; @@ -49,17 +54,43 @@ import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; * (application-{profile}.yaml) and persist data (when not already present) to the catalod database. */ @JsonIgnoreProperties(ignoreUnknown = true) -public class R__CloudConfigMigration extends BaseJavaMigration { - private static final Logger logger = LoggerFactory.getLogger(R__CloudConfigMigration.class); +public class CloudConfigMigration implements CustomTaskChange { + private static final Logger logger = LoggerFactory.getLogger(CloudConfigMigration.class); private static final ObjectMapper mapper = new ObjectMapper(new YAMLFactory()); - public static final String FLYWAY = "FLYWAY"; + public static final String MIGRATION = "MIGRATION"; @JsonProperty("cloud_config") private CloudConfig cloudConfig; @Override - public boolean isUndo() { - return false; + public void execute(Database database) throws CustomChangeException { + try { + JdbcConnection jdbcConnection = (JdbcConnection) database.getConnection(); + Connection connection = jdbcConnection.getWrappedConnection(); + migrate(connection); + } catch (Exception e) { + throw new CustomChangeException("CloudConfigMigration failed", e); + } + } + + @Override + public String getConfirmationMessage() { + return "CloudConfigMigration completed successfully"; + } + + @Override + public void setUp() throws SetupException { + // no setup required + } + + @Override + public void setFileOpener(ResourceAccessor resourceAccessor) { + // not used + } + + @Override + public ValidationErrors validate(Database database) { + return new ValidationErrors(); } public void migrate(Connection connection) throws Exception { @@ -81,7 +112,7 @@ public class R__CloudConfigMigration extends BaseJavaMigration { logger.debug("No CloudConfig defined in {}", configLocation); // Try the application.yaml file - try (InputStream stream = R__CloudConfigMigration.class.getResourceAsStream(getApplicationYamlName())) { + try (InputStream stream = CloudConfigMigration.class.getResourceAsStream(getApplicationYamlName())) { cloudConfiguration = loadCloudConfig(stream); } @@ -106,7 +137,7 @@ public class R__CloudConfigMigration extends BaseJavaMigration { } private CloudConfig loadCloudConfig(InputStream stream) throws IOException { - R__CloudConfigMigration cloudConfigMigration = mapper.readValue(stream, R__CloudConfigMigration.class); + CloudConfigMigration cloudConfigMigration = mapper.readValue(stream, CloudConfigMigration.class); CloudConfig cloudConfiguration = cloudConfigMigration.getCloudConfig(); if (cloudConfiguration != null) { @@ -153,7 +184,7 @@ public class R__CloudConfigMigration extends BaseJavaMigration { cloudIdentity.getIdentityAuthenticationType() != null ? cloudIdentity.getIdentityAuthenticationType().name() : null); - ps.setString(10, FLYWAY); + ps.setString(10, MIGRATION); ps.setString(11, cloudIdentity.getProjectDomainName()); ps.setString(12, cloudIdentity.getUserDomainName()); ps.executeUpdate(); @@ -187,7 +218,7 @@ public class R__CloudConfigMigration extends BaseJavaMigration { ps.setString(6, cloudSite.getCloudifyId()); ps.setString(7, cloudSite.getPlatform()); ps.setString(8, cloudSite.getOrchestrator()); - ps.setString(9, FLYWAY); + ps.setString(9, MIGRATION); ps.executeUpdate(); } } @@ -216,29 +247,11 @@ public class R__CloudConfigMigration extends BaseJavaMigration { ps.setString(3, cloudifyManager.getUsername()); ps.setString(4, cloudifyManager.getPassword()); ps.setString(5, cloudifyManager.getVersion()); - ps.setString(6, FLYWAY); + ps.setString(6, MIGRATION); ps.executeUpdate(); } } } } } - - public MigrationVersion getVersion() { - return null; - } - - public String getDescription() { - return "R_CloudConfigMigration"; - } - - public Integer getChecksum() { - return Math.toIntExact(System.currentTimeMillis() / 1000); - } - - @Override - public void migrate(org.flywaydb.core.api.migration.Context context) throws Exception { - migrate(context.getConnection()); - - } } diff --git a/adapters/mso-catalog-db-adapter/src/main/resources/application.yaml b/adapters/mso-catalog-db-adapter/src/main/resources/application.yaml index ada9dca095..47d5db2731 100644 --- a/adapters/mso-catalog-db-adapter/src/main/resources/application.yaml +++ b/adapters/mso-catalog-db-adapter/src/main/resources/application.yaml @@ -26,13 +26,11 @@ spring: pool-name: catdb-pool registerMbeans: true - flyway: - baseline-on-migrate: false + liquibase: + change-log: classpath:db/changelog/db.changelog-master.xml url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb user: ${DB_ADMIN_USERNAME} password: ${DB_ADMIN_PASSWORD} - outOfOrder: true - validateOnMigrate: false jpa: show-sql: true hibernate: diff --git a/adapters/mso-catalog-db-adapter/src/main/resources/db/changelog/db.changelog-master.xml b/adapters/mso-catalog-db-adapter/src/main/resources/db/changelog/db.changelog-master.xml new file mode 100644 index 0000000000..5d1527a14b --- /dev/null +++ b/adapters/mso-catalog-db-adapter/src/main/resources/db/changelog/db.changelog-master.xml @@ -0,0 +1,305 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/CatalogDbAdapterBaseTest.java b/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/CatalogDbAdapterBaseTest.java index 97ae149a6c..4410b009a9 100644 --- a/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/CatalogDbAdapterBaseTest.java +++ b/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/CatalogDbAdapterBaseTest.java @@ -48,7 +48,7 @@ public class CatalogDbAdapterBaseTest { static void configureProperties(DynamicPropertyRegistry registry) { int port = SocketUtils.findAvailableTcpPort(); registry.add("spring.datasource.url", () -> String.format("jdbc:mariadb://localhost:%s/catalogdb", port)); - registry.add("spring.flyway.url", () -> String.format("jdbc:mariadb://localhost:%s/catalogdb", port)); + registry.add("spring.liquibase.url", () -> String.format("jdbc:mariadb://localhost:%s/catalogdb", port)); registry.add("mariaDB4j.port", () -> port); } } diff --git a/adapters/mso-catalog-db-adapter/src/test/resources/application-test.yaml b/adapters/mso-catalog-db-adapter/src/test/resources/application-test.yaml index 09262f9f58..bc98ae481b 100644 --- a/adapters/mso-catalog-db-adapter/src/test/resources/application-test.yaml +++ b/adapters/mso-catalog-db-adapter/src/test/resources/application-test.yaml @@ -1,7 +1,7 @@ # TEST FILE catalog.db.endpoint: http://localhost:${wiremock.server.port} -ssl-enable: false +ssl-enable: false mso: site-name: localDevEnv logPath: logs @@ -20,12 +20,12 @@ spring: driver-class-name: org.mariadb.jdbc.Driver initialization-mode: always data: classpath*:data.sql - flyway: - baseline-on-migrate: false + liquibase: + change-log: classpath:db/changelog/db.changelog-test.xml url: jdbc:mariadb://localhost:3307/catalogdb user: root password: password - jpa: + jpa: generate-ddl: false show-sql: false hibernate: @@ -37,7 +37,7 @@ spring: ddl-auto: validate security: usercredentials: - - + - username: test password: '$2a$12$Zi3AuYcZoZO/gBQyUtST2.F5N6HqcTtaNci2Et.ufsQhski56srIu' role: BPEL-Client @@ -45,15 +45,15 @@ spring: username: bpel password: '$2a$12$1xyutEZNfjGewIZRfKaE8eZE99f5sYFUmmM80BobI65KNjmcK0JuO' role: BPEL-Client - - + - username: mso_admin password: '$2a$12$tidKuu.h88E2nuL95pTVY.ZOYMN/1dp29A9b1o.0GFDsVVSYlMkHa' - role: ACTUATOR + role: ACTUATOR mariaDB4j: - dataDir: + dataDir: port: 3307 databaseName: catalogdb - + server: port: ${wiremock.server.port} tomcat: @@ -72,7 +72,7 @@ management: export: prometheus: enabled: true # Whether exporting of metrics to Prometheus is enabled. - step: 1m # Step size (i.e. reporting frequency) to use. + step: 1m # Step size (i.e. reporting frequency) to use. cloud_config: identity_services: diff --git a/adapters/mso-catalog-db-adapter/src/test/resources/db/changelog/db.changelog-test.xml b/adapters/mso-catalog-db-adapter/src/test/resources/db/changelog/db.changelog-test.xml new file mode 100644 index 0000000000..eaaa346a59 --- /dev/null +++ b/adapters/mso-catalog-db-adapter/src/test/resources/db/changelog/db.changelog-test.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + diff --git a/adapters/mso-catalog-db-adapter/src/test/resources/logback-test.xml b/adapters/mso-catalog-db-adapter/src/test/resources/logback-test.xml index 7c795eedab..92fbf90946 100644 --- a/adapters/mso-catalog-db-adapter/src/test/resources/logback-test.xml +++ b/adapters/mso-catalog-db-adapter/src/test/resources/logback-test.xml @@ -25,7 +25,7 @@ - + @@ -37,11 +37,11 @@ - + - \ No newline at end of file + diff --git a/adapters/mso-openstack-adapters/src/test/resources/application-nomigrate.yaml b/adapters/mso-openstack-adapters/src/test/resources/application-nomigrate.yaml index 20384465a1..27f3372863 100644 --- a/adapters/mso-openstack-adapters/src/test/resources/application-nomigrate.yaml +++ b/adapters/mso-openstack-adapters/src/test/resources/application-nomigrate.yaml @@ -34,7 +34,7 @@ org: delete: pollTimeout: 300 pollInterval: 15 - tenant: + tenant: default_x_aic_orm_client_string: ONAP-SO default_keystone_url_version: /v2.0 default_keystone_reg_ex: "/[vV][0-9]" @@ -51,12 +51,12 @@ org: valet: base_url: http://localhost:${wiremock.server.port} base_path: /api/valet/placement/v1/ - valet_auth: + valet_auth: po: retryCodes: 504 retryDelay: 5 retryCount: 3 - + server-port: 8080 ssl-enable: false tomcat: @@ -79,35 +79,33 @@ spring: jdbc-url: jdbc:mariadb://localhost:3307/catalogdb username: root password: password - driver-class-name: org.mariadb.jdbc.Driver + driver-class-name: org.mariadb.jdbc.Driver initialization-mode: always - jpa: + jpa: generate-ddl: false show-sql: false - hibernate: + hibernate: ddl-auto: none naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy enable-lazy-load-no-trans: true database-platform: org.hibernate.dialect.MySQL5InnoDBDialect - flyway: - baseline-on-migrate: true - out-of-order: true - ignore-missing-migrations: true + liquibase: + enabled: false security: usercredentials: - - + - username: test password: '$2a$12$Zi3AuYcZoZO/gBQyUtST2.F5N6HqcTtaNci2Et.ufsQhski56srIu' - role: MSO-Client + role: MSO-Client mariaDB4j: - dataDir: + dataDir: port: 3307 databaseName: catalogdb #Actuator -management: +management: endpoints: enabled-by-default: false endpoint: @@ -129,4 +127,4 @@ appc: write: APPC-TEST-AMDOCS1-DEV3 sdnc: read: SDNC-LCM-READ - write: SDNC-LCM-WRITE \ No newline at end of file + write: SDNC-LCM-WRITE diff --git a/adapters/mso-openstack-adapters/src/test/resources/schema.sql b/adapters/mso-openstack-adapters/src/test/resources/schema.sql index 44fbbd9be6..9318d4ddd7 100644 --- a/adapters/mso-openstack-adapters/src/test/resources/schema.sql +++ b/adapters/mso-openstack-adapters/src/test/resources/schema.sql @@ -393,25 +393,39 @@ CREATE TABLE `external_service_to_internal_model_mapping` ( /*!40101 SET character_set_client = @saved_cs_client */; -- --- Table structure for table `flyway_schema_history` +-- Table structure for Liquibase tracking tables -- -DROP TABLE IF EXISTS `flyway_schema_history`; +DROP TABLE IF EXISTS `DATABASECHANGELOGLOCK`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; -CREATE TABLE `flyway_schema_history` ( - `installed_rank` int(11) NOT NULL, - `version` varchar(50) DEFAULT NULL, - `description` varchar(200) NOT NULL, - `type` varchar(20) NOT NULL, - `script` varchar(1000) NOT NULL, - `checksum` int(11) DEFAULT NULL, - `installed_by` varchar(100) NOT NULL, - `installed_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `execution_time` int(11) NOT NULL, - `success` tinyint(1) NOT NULL, - PRIMARY KEY (`installed_rank`), - KEY `flyway_schema_history_s_idx` (`success`) +CREATE TABLE `DATABASECHANGELOGLOCK` ( + `ID` int(11) NOT NULL, + `LOCKED` tinyint(1) NOT NULL, + `LOCKGRANTED` datetime DEFAULT NULL, + `LOCKEDBY` varchar(255) DEFAULT NULL, + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +/*!40101 SET character_set_client = @saved_cs_client */; + +DROP TABLE IF EXISTS `DATABASECHANGELOG`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `DATABASECHANGELOG` ( + `ID` varchar(255) NOT NULL, + `AUTHOR` varchar(255) NOT NULL, + `FILENAME` varchar(255) NOT NULL, + `DATEEXECUTED` datetime NOT NULL, + `ORDEREXECUTED` int(11) NOT NULL, + `EXECTYPE` varchar(10) NOT NULL, + `MD5SUM` varchar(35) DEFAULT NULL, + `DESCRIPTION` varchar(255) DEFAULT NULL, + `COMMENTS` varchar(255) DEFAULT NULL, + `TAG` varchar(255) DEFAULT NULL, + `LIQUIBASE` varchar(20) DEFAULT NULL, + `CONTEXTS` varchar(255) DEFAULT NULL, + `LABELS` varchar(255) DEFAULT NULL, + `DEPLOYMENT_ID` varchar(10) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1; /*!40101 SET character_set_client = @saved_cs_client */; diff --git a/adapters/mso-requests-db-adapter/pom.xml b/adapters/mso-requests-db-adapter/pom.xml index 40d1f307ca..4397d1ba01 100644 --- a/adapters/mso-requests-db-adapter/pom.xml +++ b/adapters/mso-requests-db-adapter/pom.xml @@ -70,8 +70,8 @@ true - org.flywaydb - flyway-core + org.liquibase + liquibase-core true diff --git a/adapters/mso-requests-db-adapter/src/main/resources/application.yaml b/adapters/mso-requests-db-adapter/src/main/resources/application.yaml index 13512ba559..62abbe9fe0 100644 --- a/adapters/mso-requests-db-adapter/src/main/resources/application.yaml +++ b/adapters/mso-requests-db-adapter/src/main/resources/application.yaml @@ -25,9 +25,9 @@ spring: driver-class-name: org.mariadb.jdbc.Driver pool-name: reqdb-pool registerMbeans: true - flyway: - baseline-on-migrate: false - url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/requestdb + liquibase: + change-log: classpath:db/changelog/db.changelog-master.xml + url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/requestdb user: ${DB_ADMIN_USERNAME} password: ${DB_ADMIN_PASSWORD} jpa: diff --git a/adapters/mso-requests-db-adapter/src/main/resources/db/changelog/db.changelog-master.xml b/adapters/mso-requests-db-adapter/src/main/resources/db/changelog/db.changelog-master.xml new file mode 100644 index 0000000000..996667a8af --- /dev/null +++ b/adapters/mso-requests-db-adapter/src/main/resources/db/changelog/db.changelog-master.xml @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/adapters/mso-requests-db-adapter/src/test/resources/application-test.yaml b/adapters/mso-requests-db-adapter/src/test/resources/application-test.yaml index 522e6bb7a3..2071755230 100644 --- a/adapters/mso-requests-db-adapter/src/test/resources/application-test.yaml +++ b/adapters/mso-requests-db-adapter/src/test/resources/application-test.yaml @@ -25,15 +25,15 @@ spring: driver-class-name: org.mariadb.jdbc.Driver initialize: true initialization-mode: never - flyway: - baseline-on-migrate: false + liquibase: + change-log: classpath:db/changelog/db.changelog-test.xml url: jdbc:mariadb://localhost:3307/requestdb user: root password: password - jpa: + jpa: generate-ddl: false show-sql: false - hibernate: + hibernate: ddl-auto: validate naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy enable-lazy-load-no-trans: true @@ -44,12 +44,12 @@ spring: username: bpel password: '$2a$12$1xyutEZNfjGewIZRfKaE8eZE99f5sYFUmmM80BobI65KNjmcK0JuO' role: BPEL-Client - - + - username: mso_admin password: '$2a$12$tidKuu.h88E2nuL95pTVY.ZOYMN/1dp29A9b1o.0GFDsVVSYlMkHa' role: ACTUATOR mariaDB4j: - dataDir: + dataDir: port: 3307 databaseName: requestdb @@ -65,4 +65,4 @@ management: export: prometheus: enabled: true # Whether exporting of metrics to Prometheus is enabled. - step: 1m # Step size (i.e. reporting frequency) to use. \ No newline at end of file + step: 1m # Step size (i.e. reporting frequency) to use. diff --git a/adapters/mso-requests-db-adapter/src/test/resources/db/changelog/db.changelog-test.xml b/adapters/mso-requests-db-adapter/src/test/resources/db/changelog/db.changelog-test.xml new file mode 100644 index 0000000000..eaaa346a59 --- /dev/null +++ b/adapters/mso-requests-db-adapter/src/test/resources/db/changelog/db.changelog-test.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + diff --git a/adapters/mso-requests-db-adapter/src/test/resources/logback-test.xml b/adapters/mso-requests-db-adapter/src/test/resources/logback-test.xml index c676d7fd8d..cdeb78b33f 100644 --- a/adapters/mso-requests-db-adapter/src/test/resources/logback-test.xml +++ b/adapters/mso-requests-db-adapter/src/test/resources/logback-test.xml @@ -25,7 +25,7 @@ - + @@ -45,4 +45,4 @@ - \ No newline at end of file + diff --git a/asdc-controller/src/test/resources/schema.sql b/asdc-controller/src/test/resources/schema.sql index 83be71e5e2..5b6e39a2a4 100644 --- a/asdc-controller/src/test/resources/schema.sql +++ b/asdc-controller/src/test/resources/schema.sql @@ -396,25 +396,39 @@ CREATE TABLE `external_service_to_internal_model_mapping` ( /*!40101 SET character_set_client = @saved_cs_client */; -- --- Table structure for table `flyway_schema_history` +-- Table structure for Liquibase tracking tables -- -DROP TABLE IF EXISTS `flyway_schema_history`; +DROP TABLE IF EXISTS `DATABASECHANGELOGLOCK`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; -CREATE TABLE `flyway_schema_history` ( - `installed_rank` int(11) NOT NULL, - `version` varchar(50) DEFAULT NULL, - `description` varchar(200) NOT NULL, - `type` varchar(20) NOT NULL, - `script` varchar(1000) NOT NULL, - `checksum` int(11) DEFAULT NULL, - `installed_by` varchar(100) NOT NULL, - `installed_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `execution_time` int(11) NOT NULL, - `success` tinyint(1) NOT NULL, - PRIMARY KEY (`installed_rank`), - KEY `flyway_schema_history_s_idx` (`success`) +CREATE TABLE `DATABASECHANGELOGLOCK` ( + `ID` int(11) NOT NULL, + `LOCKED` tinyint(1) NOT NULL, + `LOCKGRANTED` datetime DEFAULT NULL, + `LOCKEDBY` varchar(255) DEFAULT NULL, + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +/*!40101 SET character_set_client = @saved_cs_client */; + +DROP TABLE IF EXISTS `DATABASECHANGELOG`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `DATABASECHANGELOG` ( + `ID` varchar(255) NOT NULL, + `AUTHOR` varchar(255) NOT NULL, + `FILENAME` varchar(255) NOT NULL, + `DATEEXECUTED` datetime NOT NULL, + `ORDEREXECUTED` int(11) NOT NULL, + `EXECTYPE` varchar(10) NOT NULL, + `MD5SUM` varchar(35) DEFAULT NULL, + `DESCRIPTION` varchar(255) DEFAULT NULL, + `COMMENTS` varchar(255) DEFAULT NULL, + `TAG` varchar(255) DEFAULT NULL, + `LIQUIBASE` varchar(20) DEFAULT NULL, + `CONTEXTS` varchar(255) DEFAULT NULL, + `LABELS` varchar(255) DEFAULT NULL, + `DEPLOYMENT_ID` varchar(10) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1; /*!40101 SET character_set_client = @saved_cs_client */; @@ -1214,7 +1228,7 @@ CREATE TABLE IF NOT EXISTS `pnf_resource_customization` ( CREATE TABLE IF NOT EXISTS `pnf_resource_customization_to_service` ( `SERVICE_MODEL_UUID` varchar(200) NOT NULL, `RESOURCE_MODEL_CUSTOMIZATION_UUID` varchar(200) NOT NULL, - PRIMARY KEY (`SERVICE_MODEL_UUID`,`RESOURCE_MODEL_CUSTOMIZATION_UUID`) + PRIMARY KEY (`SERVICE_MODEL_UUID`,`RESOURCE_MODEL_CUSTOMIZATION_UUID`) )ENGINE=InnoDB DEFAULT CHARSET=latin1; @@ -1535,7 +1549,7 @@ CREATE TABLE `archived_infra_requests` ( `CONFIGURATION_NAME` varchar(200) DEFAULT NULL, `OPERATIONAL_ENV_ID` varchar(45) DEFAULT NULL, `OPERATIONAL_ENV_NAME` varchar(200) DEFAULT NULL, - `REQUEST_URL` varchar(500) DEFAULT NULL, + `REQUEST_URL` varchar(500) DEFAULT NULL, PRIMARY KEY (`REQUEST_ID`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; @@ -1569,7 +1583,7 @@ CREATE TABLE `watchdog_service_mod_ver_id_lookup` ( `DISTRIBUTION_ID` varchar(45) NOT NULL, `SERVICE_MODEL_VERSION_ID` varchar(45) NOT NULL, `DISTRIBUTION_NOTIFICATION` LONGTEXT NULL, - `CONSUMER_ID` varchar(200) NULL, + `CONSUMER_ID` varchar(200) NULL, `CREATE_TIME` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `MODIFY_TIME` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (`DISTRIBUTION_ID`,`SERVICE_MODEL_VERSION_ID`) @@ -1585,7 +1599,7 @@ CREATE TABLE `activate_operational_env_service_model_distribution_status` ( `WORKLOAD_CONTEXT` varchar(80) NOT NULL, `CREATE_TIME` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `MODIFY_TIME` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, - `VNF_OPERATIONAL_ENV_ID` varchar(45) NOT NULL, + `VNF_OPERATIONAL_ENV_ID` varchar(45) NOT NULL, PRIMARY KEY (`OPERATIONAL_ENV_ID`,`SERVICE_MODEL_VERSION_ID`,`REQUEST_ID`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; @@ -1617,7 +1631,7 @@ create table operation_status ( FINISHED_AT datetime NOT NULL, primary key (SERVICE_ID,OPERATION_ID) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; - + create table resource_operation_status ( SERVICE_ID varchar(255) not null, OPERATION_ID varchar(255) not null, @@ -1661,7 +1675,3 @@ create table if not exists model ( CONSTRAINT uk1_model UNIQUE (`MODEL_TYPE`, `MODEL_VERSION_ID`), FOREIGN KEY (`RECIPE`) REFERENCES `model_recipe` (`MODEL_ID`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=latin1; - - - - diff --git a/common/common/src/test/resources/logback-test.xml b/common/common/src/test/resources/logback-test.xml index a039f5ec37..f3168855d2 100644 --- a/common/common/src/test/resources/logback-test.xml +++ b/common/common/src/test/resources/logback-test.xml @@ -56,7 +56,7 @@ - + diff --git a/cxf-logging/src/test/resources/logback-test.xml b/cxf-logging/src/test/resources/logback-test.xml index 28dd35fab6..9af33e115d 100644 --- a/cxf-logging/src/test/resources/logback-test.xml +++ b/cxf-logging/src/test/resources/logback-test.xml @@ -7,9 +7,9 @@ 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. @@ -55,16 +55,16 @@ - - + + - + - + @@ -73,4 +73,4 @@ - \ No newline at end of file + diff --git a/deployment-configs/src/main/resources/logger/logback-spring.xml b/deployment-configs/src/main/resources/logger/logback-spring.xml index a12693013e..eac5ff0152 100644 --- a/deployment-configs/src/main/resources/logger/logback-spring.xml +++ b/deployment-configs/src/main/resources/logger/logback-spring.xml @@ -201,7 +201,7 @@ name="org.camunda.bpm.engine.impl.persistence.entity.JobEntity.level" level="${LOG_LEVEL:-DEBUG}" /> - + diff --git a/docs/developer_info/Cxf_Logging.rst b/docs/developer_info/Cxf_Logging.rst index ea2bbf56ce..968e7b58f0 100644 --- a/docs/developer_info/Cxf_Logging.rst +++ b/docs/developer_info/Cxf_Logging.rst @@ -27,7 +27,7 @@ mso-infrastructure-bpmn. cxf-logging dependency for using in other components: ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - + org.onap.so cxf-logging @@ -38,9 +38,9 @@ cxf-logging dependency for using in other components: pom.xml: +++++++++ - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 @@ -189,8 +189,8 @@ Here we can do configure the logger properties for the cxf-logging. - - + + @@ -207,4 +207,3 @@ Here we can do configure the logger properties for the cxf-logging. - diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/schema.sql b/mso-api-handlers/mso-api-handler-infra/src/test/resources/schema.sql index e0ec216399..f6a7276b33 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/schema.sql +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/schema.sql @@ -396,25 +396,39 @@ CREATE TABLE `external_service_to_internal_model_mapping` ( /*!40101 SET character_set_client = @saved_cs_client */; -- --- Table structure for table `flyway_schema_history` +-- Table structure for Liquibase tracking tables -- -DROP TABLE IF EXISTS `flyway_schema_history`; +DROP TABLE IF EXISTS `DATABASECHANGELOGLOCK`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; -CREATE TABLE `flyway_schema_history` ( - `installed_rank` int(11) NOT NULL, - `version` varchar(50) DEFAULT NULL, - `description` varchar(200) NOT NULL, - `type` varchar(20) NOT NULL, - `script` varchar(1000) NOT NULL, - `checksum` int(11) DEFAULT NULL, - `installed_by` varchar(100) NOT NULL, - `installed_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `execution_time` int(11) NOT NULL, - `success` tinyint(1) NOT NULL, - PRIMARY KEY (`installed_rank`), - KEY `flyway_schema_history_s_idx` (`success`) +CREATE TABLE `DATABASECHANGELOGLOCK` ( + `ID` int(11) NOT NULL, + `LOCKED` tinyint(1) NOT NULL, + `LOCKGRANTED` datetime DEFAULT NULL, + `LOCKEDBY` varchar(255) DEFAULT NULL, + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +/*!40101 SET character_set_client = @saved_cs_client */; + +DROP TABLE IF EXISTS `DATABASECHANGELOG`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `DATABASECHANGELOG` ( + `ID` varchar(255) NOT NULL, + `AUTHOR` varchar(255) NOT NULL, + `FILENAME` varchar(255) NOT NULL, + `DATEEXECUTED` datetime NOT NULL, + `ORDEREXECUTED` int(11) NOT NULL, + `EXECTYPE` varchar(10) NOT NULL, + `MD5SUM` varchar(35) DEFAULT NULL, + `DESCRIPTION` varchar(255) DEFAULT NULL, + `COMMENTS` varchar(255) DEFAULT NULL, + `TAG` varchar(255) DEFAULT NULL, + `LIQUIBASE` varchar(20) DEFAULT NULL, + `CONTEXTS` varchar(255) DEFAULT NULL, + `LABELS` varchar(255) DEFAULT NULL, + `DEPLOYMENT_ID` varchar(10) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1; /*!40101 SET character_set_client = @saved_cs_client */; @@ -1345,7 +1359,7 @@ CREATE TABLE `archived_infra_requests` ( `CONFIGURATION_NAME` varchar(200) DEFAULT NULL, `OPERATIONAL_ENV_ID` varchar(45) DEFAULT NULL, `OPERATIONAL_ENV_NAME` varchar(200) DEFAULT NULL, - `REQUEST_URL` varchar(500) DEFAULT NULL, + `REQUEST_URL` varchar(500) DEFAULT NULL, `RESOURCE_STATUS_MESSAGE` longtext, PRIMARY KEY (`REQUEST_ID`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; @@ -1394,7 +1408,7 @@ CREATE TABLE `activate_operational_env_service_model_distribution_status` ( `WORKLOAD_CONTEXT` varchar(80) NOT NULL, `CREATE_TIME` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `MODIFY_TIME` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, - `VNF_OPERATIONAL_ENV_ID` varchar(45) NOT NULL, + `VNF_OPERATIONAL_ENV_ID` varchar(45) NOT NULL, PRIMARY KEY (`OPERATIONAL_ENV_ID`,`SERVICE_MODEL_VERSION_ID`,`REQUEST_ID`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; @@ -1426,7 +1440,7 @@ create table operation_status ( FINISHED_AT datetime NOT NULL, primary key (SERVICE_ID,OPERATION_ID) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; - + create table resource_operation_status ( SERVICE_ID varchar(255) not null, OPERATION_ID varchar(255) not null, diff --git a/mso-catalog-db/src/test/resources/schema.sql b/mso-catalog-db/src/test/resources/schema.sql index cf1b188a21..5320677e9f 100644 --- a/mso-catalog-db/src/test/resources/schema.sql +++ b/mso-catalog-db/src/test/resources/schema.sql @@ -395,25 +395,39 @@ CREATE TABLE `external_service_to_internal_model_mapping` ( /*!40101 SET character_set_client = @saved_cs_client */; -- --- Table structure for table `flyway_schema_history` +-- Table structure for Liquibase tracking tables -- -DROP TABLE IF EXISTS `flyway_schema_history`; +DROP TABLE IF EXISTS `DATABASECHANGELOGLOCK`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; -CREATE TABLE `flyway_schema_history` ( - `installed_rank` int(11) NOT NULL, - `version` varchar(50) DEFAULT NULL, - `description` varchar(200) NOT NULL, - `type` varchar(20) NOT NULL, - `script` varchar(1000) NOT NULL, - `checksum` int(11) DEFAULT NULL, - `installed_by` varchar(100) NOT NULL, - `installed_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `execution_time` int(11) NOT NULL, - `success` tinyint(1) NOT NULL, - PRIMARY KEY (`installed_rank`), - KEY `flyway_schema_history_s_idx` (`success`) +CREATE TABLE `DATABASECHANGELOGLOCK` ( + `ID` int(11) NOT NULL, + `LOCKED` tinyint(1) NOT NULL, + `LOCKGRANTED` datetime DEFAULT NULL, + `LOCKEDBY` varchar(255) DEFAULT NULL, + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; +/*!40101 SET character_set_client = @saved_cs_client */; + +DROP TABLE IF EXISTS `DATABASECHANGELOG`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `DATABASECHANGELOG` ( + `ID` varchar(255) NOT NULL, + `AUTHOR` varchar(255) NOT NULL, + `FILENAME` varchar(255) NOT NULL, + `DATEEXECUTED` datetime NOT NULL, + `ORDEREXECUTED` int(11) NOT NULL, + `EXECTYPE` varchar(10) NOT NULL, + `MD5SUM` varchar(35) DEFAULT NULL, + `DESCRIPTION` varchar(255) DEFAULT NULL, + `COMMENTS` varchar(255) DEFAULT NULL, + `TAG` varchar(255) DEFAULT NULL, + `LIQUIBASE` varchar(20) DEFAULT NULL, + `CONTEXTS` varchar(255) DEFAULT NULL, + `LABELS` varchar(255) DEFAULT NULL, + `DEPLOYMENT_ID` varchar(10) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1; /*!40101 SET character_set_client = @saved_cs_client */; @@ -1411,7 +1425,7 @@ CREATE TABLE IF NOT EXISTS `processing_flags` ( `ENDPOINT` varchar(200) NOT NULL, `DESCRIPTION` longtext NOT NULL, `CREATION_TIMESTAMP` timestamp NULL DEFAULT current_timestamp(), - `UPDATE_TIMESTAMP` timestamp NULL DEFAULT current_timestamp(), + `UPDATE_TIMESTAMP` timestamp NULL DEFAULT current_timestamp(), PRIMARY KEY (`ID`), UNIQUE KEY `UK_processing_flags` (`FLAG`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; -- 2.16.6