From af538c4b388037d9c5750ea06623b0e3f8a19866 Mon Sep 17 00:00:00 2001 From: Rob Daugherty Date: Wed, 23 May 2018 10:55:49 -0400 Subject: [PATCH] NETWORK_RECIPE for CM flows Increased ACTION field in all recipe tables to 40 chars. Added VNF_RECIPE entries for VnfInPlaceUpdate and VnfConfigUpdate. Change-Id: Ifb1da0b31525b10c9620fd98ffe9cfd3d6a84182 Issue-ID: SO-639 Signed-off-by: Rob Daugherty --- .../bulkload-files/default/create_mso_db-default.sql | 2 ++ .../db-sql-scripts/main-schemas/MySQL-Catalog-schema.sql | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/volumes/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/bulkload-files/default/create_mso_db-default.sql b/volumes/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/bulkload-files/default/create_mso_db-default.sql index c5d9b2e..4a91981 100644 --- a/volumes/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/bulkload-files/default/create_mso_db-default.sql +++ b/volumes/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/bulkload-files/default/create_mso_db-default.sql @@ -149,5 +149,7 @@ INSERT INTO `vnf_recipe` (`id`, `VF_MODULE_ID`, `ACTION`, `SERVICE_TYPE`, `VERSI INSERT INTO `vnf_recipe` (`id`, `VF_MODULE_ID`, `ACTION`, `SERVICE_TYPE`, `VERSION_STR`, `VNF_TYPE`, `DESCRIPTION`, `ORCHESTRATION_URI`, `VNF_PARAM_XSD`, `RECIPE_TIMEOUT`, `CREATION_TIMESTAMP`) VALUES (10,NULL,'deleteInstance',NULL,'1','RESOURCE_NS_DEFAULT','NS default recipe to delete network service if no custom BPMN flow is found','/mso/async/services/DeleteVFCNetworkService',NULL,180,'2017-10-05 18:52:03'); INSERT INTO `vnf_recipe` (`id`, `VF_MODULE_ID`, `ACTION`, `SERVICE_TYPE`, `VERSION_STR`, `VNF_TYPE`, `DESCRIPTION`, `ORCHESTRATION_URI`, `VNF_PARAM_XSD`, `RECIPE_TIMEOUT`, `CREATION_TIMESTAMP`) VALUES (11,NULL,'createInstance',NULL,'1','NS_DEFAULT','default custom E2E recipe to create NS if no custom BPMN flow is found','/mso/async/services/CreateVFCNSResource',NULL,180,'2018-04-18 18:52:03'); INSERT INTO `vnf_recipe` (`id`, `VF_MODULE_ID`, `ACTION`, `SERVICE_TYPE`, `VERSION_STR`, `VNF_TYPE`, `DESCRIPTION`, `ORCHESTRATION_URI`, `VNF_PARAM_XSD`, `RECIPE_TIMEOUT`, `CREATION_TIMESTAMP`) VALUES (12,NULL,'deleteInstance',NULL,'1','NS_DEFAULT','default custom E2E recipe to delete NS if no custom BPMN flow is found','/mso/async/services/DeleteVFCNSResource',NULL,180,'2018-04-18 18:52:03'); +INSERT INTO `vnf_recipe` (`id`, `VF_MODULE_ID`, `ACTION`, `SERVICE_TYPE`, `VERSION_STR`, `VNF_TYPE`, `DESCRIPTION`, `ORCHESTRATION_URI`, `VNF_PARAM_XSD`, `RECIPE_TIMEOUT`, `CREATION_TIMESTAMP`) VALUES (13,NULL,'inPlaceSoftwareUpdate',NULL,'1','VID_DEFAULT','VID_DEFAULT recipe to update VNF software if no custom BPMN flow is found','/mso/async/services/VnfInPlaceUpdate',NULL,180,'2018-05-23 11:00:00'); +INSERT INTO `vnf_recipe` (`id`, `VF_MODULE_ID`, `ACTION`, `SERVICE_TYPE`, `VERSION_STR`, `VNF_TYPE`, `DESCRIPTION`, `ORCHESTRATION_URI`, `VNF_PARAM_XSD`, `RECIPE_TIMEOUT`, `CREATION_TIMESTAMP`) VALUES (14,NULL,'applyUpdatedConfig',NULL,'1','VID_DEFAULT','VID_DEFAULT recipe to apply updated VNF config if no custom BPMN flow is found','/mso/async/services/VnfConfigUpdate',NULL,180,'2018-05-23 11:00:00'); SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS; diff --git a/volumes/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/main-schemas/MySQL-Catalog-schema.sql b/volumes/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/main-schemas/MySQL-Catalog-schema.sql index 09a0dcb..c39da7f 100644 --- a/volumes/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/main-schemas/MySQL-Catalog-schema.sql +++ b/volumes/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/main-schemas/MySQL-Catalog-schema.sql @@ -179,7 +179,7 @@ create table MODEL_RECIPE ( id integer not null auto_increment, MODEL_ID integer not null, - ACTION varchar(20) not null, + ACTION varchar(40) not null, SCHEMA_VERSION varchar(20), DESCRIPTION varchar(1200), ORCHESTRATION_URI varchar(256) not null, @@ -192,7 +192,7 @@ create table NETWORK_RECIPE ( id integer not null auto_increment, MODEL_NAME varchar(20) not null, - ACTION varchar(20) not null, + ACTION varchar(40) not null, VERSION_STR varchar(20) not null, SERVICE_TYPE varchar(45), DESCRIPTION varchar(1200), @@ -352,7 +352,7 @@ VNF_TYPE varchar(200), VF_MODULE_MODEL_UUID varchar(100), VNF_COMPONENT_TYPE varchar(45) not null, - ACTION varchar(20) not null, + ACTION varchar(40) not null, SERVICE_TYPE varchar(45), VERSION varchar(20), DESCRIPTION varchar(1200), @@ -366,7 +366,7 @@ create table VNF_RECIPE ( id integer not null auto_increment, VF_MODULE_ID varchar(100), - ACTION varchar(20) not null, + ACTION varchar(40) not null, VERSION_STR varchar(20) not null, VNF_TYPE varchar(200), SERVICE_TYPE varchar(45) default null, -- 2.16.6