From 9737ae116859da4548dcd1bf3ba73d339f326c52 Mon Sep 17 00:00:00 2001 From: Manamohan Date: Mon, 17 Feb 2020 16:13:45 +0530 Subject: Based on Controller Actor calling CDS or APPC(Current Flow) -Added BBNameSelectionReference table having bbName along with action,scope,actor -Updated CatalogDbClient to use BBNameSelectionReference Table -Updated ControllerExecution bmpn to select flow as per Controller Actor -Corrected Format Error Issue-ID: SO-2316 Signed-off-by: Pooja03 Change-Id: I21fad846249f773308e34abcac134d3ee0694027 Signed-off-by: Manamohan --- mso-catalog-db/src/test/resources/data.sql | 6 ++++++ mso-catalog-db/src/test/resources/schema.sql | 12 ++++++++++++ 2 files changed, 18 insertions(+) (limited to 'mso-catalog-db/src/test') diff --git a/mso-catalog-db/src/test/resources/data.sql b/mso-catalog-db/src/test/resources/data.sql index e5963c183f..0852aa026d 100644 --- a/mso-catalog-db/src/test/resources/data.sql +++ b/mso-catalog-db/src/test/resources/data.sql @@ -957,3 +957,9 @@ VALUES (select ID from user_parameters where NAME='existing_software_version')), ((select ID from activity_spec where NAME='VNFUpgradeSoftwareActivity' and VERSION=1.0), (select ID from user_parameters where NAME='new_software_version')); + +INSERT INTO bbname_selection_reference (CONTROLLER_ACTOR,SCOPE,ACTION,BB_NAME) +VALUES +('APPC', 'vfModule', 'healthCheck','GenericVnfHealthCheckBB'), +('APPC', 'vfModule', 'configScaleOut','ConfigurationScaleOutBB'), +('APPC', 'vnf', 'healthCheck','GenericVnfHealthCheckBB'); \ No newline at end of file diff --git a/mso-catalog-db/src/test/resources/schema.sql b/mso-catalog-db/src/test/resources/schema.sql index 9037e431d4..6573def570 100644 --- a/mso-catalog-db/src/test/resources/schema.sql +++ b/mso-catalog-db/src/test/resources/schema.sql @@ -1387,6 +1387,18 @@ CREATE TABLE IF NOT EXISTS `activity_spec_to_user_parameters` ( ENGINE = InnoDB DEFAULT CHARACTER SET = latin1; +-- +-- Table structure for table `bbname_selection_reference` +-- +DROP TABLE IF EXISTS `bbname_selection_reference`; +CREATE TABLE IF NOT EXISTS `bbname_selection_reference` ( + `ID` INT(11) NOT NULL AUTO_INCREMENT, + `CONTROLLER_ACTOR` varchar(200) NOT NULL , + `SCOPE` varchar(200) NOT NULL, + `ACTION` varchar(200) NOT NULL, + `BB_NAME` varchar(200) NOT NULL, + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; -- cgit 1.2.3-korg