From 38f720752af4d4aad8c4e467a288d9048659f688 Mon Sep 17 00:00:00 2001 From: Rob Daugherty Date: Wed, 14 Mar 2018 02:07:32 -0400 Subject: AT&T 1712 and 1802 release code This is code from AT&T's 1712 and 1802 releases. Change-Id: Ie1e85851e94bc66c4d9514a0226c221939531a04 Issue-ID: SO-425 Signed-off-by: Rob Daugherty --- ...so_catalog_data_load_1710.46.1_to_1802.48.1.sql | 18 ++++ ...talog_schema_upgrade_1710.46.1_to_1802.48.1.sql | 22 +++++ ...uests_schema_upgrade_1710.46.1_to_1802.48.1.sql | 100 +++++++++++++++++++++ .../MariaDB_upgrade_1710.44.1_to_1710.45.1.sql | 20 +++++ .../MariaDB_upgrade_1710.45.1_to_1710.46.1.sql | 20 +++++ 5 files changed, 180 insertions(+) create mode 100644 packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB_onap_mso_catalog_data_load_1710.46.1_to_1802.48.1.sql create mode 100644 packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB_onap_mso_catalog_schema_upgrade_1710.46.1_to_1802.48.1.sql create mode 100644 packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB_onap_mso_requests_schema_upgrade_1710.46.1_to_1802.48.1.sql create mode 100644 packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB_upgrade_1710.44.1_to_1710.45.1.sql create mode 100644 packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB_upgrade_1710.45.1_to_1710.46.1.sql (limited to 'packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade') diff --git a/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB_onap_mso_catalog_data_load_1710.46.1_to_1802.48.1.sql b/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB_onap_mso_catalog_data_load_1710.46.1_to_1802.48.1.sql new file mode 100644 index 0000000000..d15d254464 --- /dev/null +++ b/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB_onap_mso_catalog_data_load_1710.46.1_to_1802.48.1.sql @@ -0,0 +1,18 @@ +-- MSO-817 Insert new vnf_recipe records for "inPlaceSoftwareUpdate" and "applyUpdatedConfig" actions for VID_DEFAULT +-- ----------------------------------------------------------- +SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0; +SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0; +SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='TRADITIONAL,ALLOW_INVALID_DATES'; +-- + +INSERT INTO mso_catalog.VNF_RECIPE ( + VNF_TYPE, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT +) VALUES + ('VID_DEFAULT', 'inPlaceSoftwareUpdate', '1', 'VID_DEFAULT inPlaceSoftwareUpdate', '/mso/async/services/VnfInPlaceUpdate', 180), + ('VID_DEFAULT', 'applyUpdatedConfig', '1', 'VID_DEFAULT applyUpdatedConfig', '/mso/async/services/VnfConfigUpdate', 180); + +-- +SET SQL_MODE=@OLD_SQL_MODE; +SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS; +SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS; +-- \ No newline at end of file diff --git a/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB_onap_mso_catalog_schema_upgrade_1710.46.1_to_1802.48.1.sql b/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB_onap_mso_catalog_schema_upgrade_1710.46.1_to_1802.48.1.sql new file mode 100644 index 0000000000..26650bc4ab --- /dev/null +++ b/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB_onap_mso_catalog_schema_upgrade_1710.46.1_to_1802.48.1.sql @@ -0,0 +1,22 @@ +-- MSO-1224 Add 2 new allottedResource columns in Catalog DB and return in catalog db adapter - AND - +-- MSO-670 To support new ACTION value of "inPlaceSoftwareUpdate" +-- increase ACTION column length to varchar(50) in all *_RECIPE tables in catalog db. +-- ------------------------------------------------------------- +SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0; +SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0; +SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='TRADITIONAL,ALLOW_INVALID_DATES'; +-- + +ALTER TABLE `mso_catalog`.`network_recipe` CHANGE COLUMN `ACTION` `ACTION` VARCHAR(50) NOT NULL ; +ALTER TABLE `mso_catalog`.`service_recipe` CHANGE COLUMN `ACTION` `ACTION` VARCHAR(50) NOT NULL ; +ALTER TABLE `mso_catalog`.`vnf_components_recipe` CHANGE COLUMN `ACTION` `ACTION` VARCHAR(50) NOT NULL ; +ALTER TABLE `mso_catalog`.`vnf_recipe` CHANGE COLUMN `ACTION` `ACTION` VARCHAR(50) NOT NULL ; + +ALTER TABLE `mso_catalog`.`allotted_resource_customization` + ADD COLUMN `PROVIDING_SERVICE_MODEL_UUID` VARCHAR(200) NULL DEFAULT NULL AFTER `MODEL_INSTANCE_NAME`, + ADD COLUMN `PROVIDING_SERVICE_MODEL_NAME` VARCHAR(200) NULL DEFAULT NULL AFTER `PROVIDING_SERVICE_MODEL_INVARIANT_UUID`; + +-- +SET SQL_MODE=@OLD_SQL_MODE; +SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS; +SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS; \ No newline at end of file diff --git a/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB_onap_mso_requests_schema_upgrade_1710.46.1_to_1802.48.1.sql b/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB_onap_mso_requests_schema_upgrade_1710.46.1_to_1802.48.1.sql new file mode 100644 index 0000000000..6ac3fdfb92 --- /dev/null +++ b/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB_onap_mso_requests_schema_upgrade_1710.46.1_to_1802.48.1.sql @@ -0,0 +1,100 @@ +-- MSO-816 mso_requests DB changes to support tenant isolation +-- ----------------------------------------------------------- +SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0; +SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0; +SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='TRADITIONAL,ALLOW_INVALID_DATES'; +-- + +ALTER TABLE `mso_requests`.`infra_active_requests` + ADD COLUMN `OPERATIONAL_ENV_ID` VARCHAR(45) NULL DEFAULT NULL AFTER `CONFIGURATION_NAME`, + ADD COLUMN `OPERATIONAL_ENV_NAME` VARCHAR(200) NULL DEFAULT NULL AFTER `OPERATIONAL_ENV_ID`, + CHANGE COLUMN `REQUEST_SCOPE` `REQUEST_SCOPE` VARCHAR(50) NOT NULL; + +-- + +DROP TABLE IF EXISTS `mso_requests`.`activate_operational_env_per_distributionid_status`; +DROP TABLE IF EXISTS `mso_requests`.`activate_operational_env_service_model_distribution_status`; +DROP TABLE IF EXISTS `mso_requests`.`watchdog_distributionid_status`; +DROP TABLE IF EXISTS `mso_requests`.`watchdog_per_component_distribution_status`; +DROP TABLE IF EXISTS `mso_requests`.`watchdog_service_mod_ver_id_lookup`; + +-- ----------------------------------------------------- +-- Table `mso_requests`.`activate_operational_env_service_model_distribution_status` +-- ----------------------------------------------------- +CREATE TABLE `mso_requests`.`activate_operational_env_service_model_distribution_status` ( + `OPERATIONAL_ENV_ID` VARCHAR(45) NOT NULL, + `SERVICE_MODEL_VERSION_ID` VARCHAR(45) NOT NULL, + `REQUEST_ID` VARCHAR(45) NOT NULL, + `SERVICE_MOD_VER_FINAL_DISTR_STATUS` VARCHAR(45) NULL, + `RECOVERY_ACTION` VARCHAR(30) NULL, + `RETRY_COUNT_LEFT` INT(11) NULL, + `WORKLOAD_CONTEXT` VARCHAR(80) NOT NULL, + `CREATE_TIME` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + `MODIFY_TIME` DATETIME NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`OPERATIONAL_ENV_ID`, `SERVICE_MODEL_VERSION_ID`, `REQUEST_ID`)) +ENGINE = InnoDB; + +-- ----------------------------------------------------- +-- Table `mso_requests`.`activate_operational_env_per_distributionid_status` +-- ----------------------------------------------------- +CREATE TABLE `mso_requests`.`activate_operational_env_per_distributionid_status` ( + `DISTRIBUTION_ID` VARCHAR(45) NOT NULL, + `DISTRIBUTION_ID_STATUS` VARCHAR(45) NULL, + `DISTRIBUTION_ID_ERROR_REASON` VARCHAR(250) NULL, + `CREATE_TIME` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + `MODIFY_TIME` DATETIME NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, + `OPERATIONAL_ENV_ID` VARCHAR(45) NOT NULL, + `SERVICE_MODEL_VERSION_ID` VARCHAR(45) NOT NULL, + `REQUEST_ID` VARCHAR(45) NOT NULL, + PRIMARY KEY (`DISTRIBUTION_ID`), + INDEX `fk_activate_op_env_per_distributionid_status__aoesmds1_idx` (`OPERATIONAL_ENV_ID` ASC, `SERVICE_MODEL_VERSION_ID` ASC, `REQUEST_ID` ASC), + CONSTRAINT `fk_activate_op_env_per_distributionid_status__aoesmds1` + FOREIGN KEY (`OPERATIONAL_ENV_ID` , `SERVICE_MODEL_VERSION_ID` , `REQUEST_ID`) + REFERENCES `mso_requests`.`activate_operational_env_service_model_distribution_status` (`OPERATIONAL_ENV_ID` , `SERVICE_MODEL_VERSION_ID` , `REQUEST_ID`) + ON DELETE CASCADE + ON UPDATE CASCADE) +ENGINE = InnoDB; + +-- ----------------------------------------------------- +-- Table `mso_requests`.`watchdog_distributionid_status` +-- ----------------------------------------------------- +CREATE TABLE `mso_requests`.`watchdog_distributionid_status` ( + `DISTRIBUTION_ID` VARCHAR(45) NOT NULL, + `DISTRIBUTION_ID_STATUS` VARCHAR(45) NULL, + `CREATE_TIME` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + `MODIFY_TIME` DATETIME NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`DISTRIBUTION_ID`)) +ENGINE = InnoDB; + +-- ----------------------------------------------------- +-- Table `mso_requests`.`watchdog_per_component_distribution_status` +-- ----------------------------------------------------- +CREATE TABLE `mso_requests`.`watchdog_per_component_distribution_status` ( + `DISTRIBUTION_ID` VARCHAR(45) NOT NULL, + `COMPONENT_NAME` VARCHAR(45) NOT NULL, + `COMPONENT_DISTRIBUTION_STATUS` VARCHAR(45) NULL, + `CREATE_TIME` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + `MODIFY_TIME` DATETIME NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`DISTRIBUTION_ID`, `COMPONENT_NAME`), + CONSTRAINT `fk_watchdog_component_distribution_status_watchdog_distributi1` + FOREIGN KEY (`DISTRIBUTION_ID`) + REFERENCES `mso_requests`.`watchdog_distributionid_status` (`DISTRIBUTION_ID`) + ON DELETE CASCADE + ON UPDATE CASCADE) +ENGINE = InnoDB; + +-- ----------------------------------------------------- +-- Table `mso_requests`.`watchdog_service_mod_ver_id_lookup` +-- ----------------------------------------------------- +CREATE TABLE `mso_requests`.`watchdog_service_mod_ver_id_lookup` ( + `DISTRIBUTION_ID` VARCHAR(45) NOT NULL, + `SERVICE_MODEL_VERSION_ID` VARCHAR(45) NOT NULL, + `CREATE_TIME` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`DISTRIBUTION_ID`)) +ENGINE = InnoDB; + +-- +SET SQL_MODE=@OLD_SQL_MODE; +SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS; +SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS; +-- \ No newline at end of file diff --git a/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB_upgrade_1710.44.1_to_1710.45.1.sql b/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB_upgrade_1710.44.1_to_1710.45.1.sql new file mode 100644 index 0000000000..b76dd1b5da --- /dev/null +++ b/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB_upgrade_1710.44.1_to_1710.45.1.sql @@ -0,0 +1,20 @@ +SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0; +SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0; +SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='TRADITIONAL,ALLOW_INVALID_DATES'; + +ALTER TABLE `mso_catalog`.`service` + ADD COLUMN `ENVIRONMENT_CONTEXT` VARCHAR(200) NULL DEFAULT NULL AFTER `SERVICE_ROLE`, + ADD COLUMN `WORKLOAD_CONTEXT` VARCHAR(200) NULL DEFAULT NULL AFTER `ENVIRONMENT_CONTEXT`; + +ALTER TABLE `mso_catalog`.`vnf_resource_customization` + ADD COLUMN `MULTI_STAGE_DESIGN` VARCHAR(20) NULL DEFAULT NULL AFTER `NF_NAMING_CODE`; + +INSERT INTO mso_catalog.VNF_RECIPE ( + VNF_TYPE, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT +) VALUES ( + 'POLO_DEFAULT', 'replaceInstance', '1', 'POLO_DEFAULT recreate', '/mso/async/services/RecreateInfraVce' , 180 +); + +SET SQL_MODE=@OLD_SQL_MODE; +SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS; +SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS; diff --git a/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB_upgrade_1710.45.1_to_1710.46.1.sql b/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB_upgrade_1710.45.1_to_1710.46.1.sql new file mode 100644 index 0000000000..35cfdbf307 --- /dev/null +++ b/packages/root-pack-extras/config-resources/mysql/db-sql-scripts/upgrade/MariaDB_upgrade_1710.45.1_to_1710.46.1.sql @@ -0,0 +1,20 @@ +SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0; +SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0; +SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='TRADITIONAL,ALLOW_INVALID_DATES'; + +ALTER SCHEMA `mso_requests` DEFAULT CHARACTER SET latin1 DEFAULT COLLATE latin1_swedish_ci ; + +ALTER TABLE `mso_requests`.`active_requests` +CHANGE COLUMN `CLIENT_REQUEST_ID` `CLIENT_REQUEST_ID` VARCHAR(45) NULL DEFAULT NULL AFTER `REQUEST_ID`; + +ALTER TABLE `mso_requests`.`infra_active_requests` +CHANGE COLUMN `CLIENT_REQUEST_ID` `CLIENT_REQUEST_ID` VARCHAR(45) NULL DEFAULT NULL AFTER `REQUEST_ID`, +CHANGE COLUMN `ACTION` `ACTION` VARCHAR(45) NULL DEFAULT NULL , +CHANGE COLUMN `LAST_MODIFIED_BY` `LAST_MODIFIED_BY` VARCHAR(100) NULL DEFAULT NULL , +ADD COLUMN `CONFIGURATION_ID` VARCHAR(45) NULL DEFAULT NULL AFTER `REQUESTOR_ID`, +ADD COLUMN `CONFIGURATION_NAME` VARCHAR(200) NULL DEFAULT NULL AFTER `CONFIGURATION_ID`; + + +SET SQL_MODE=@OLD_SQL_MODE; +SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS; +SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS; -- cgit