From a084c4de015521f842a3fef0d7f1f7c340237bc3 Mon Sep 17 00:00:00 2001 From: rb7147 Date: Thu, 15 Jun 2017 09:42:41 -0400 Subject: [Policy-8 ,Policy-23] Updated Matchid for policies Commit includes Resolved Sonar blokcers Included the 1707 database scripts. Change-Id: I2ffdfce57e6dee0892b272b23283bf246204599a Signed-off-by: rb7147 --- .../install/mysql/data/170701_downgrade_script.sql | 8 ++- .../install/mysql/data/170701_upgrade_script.sql | 67 ++++++++++++++++++++++ ....Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml | 14 ++--- ....Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml | 14 ++--- .../bin/pdps/default/com.Config_MS_vFirewall.1.xml | 20 +++---- .../pdps/default/com.Config_MS_vLoadBalancer.1.xml | 20 +++---- 6 files changed, 108 insertions(+), 35 deletions(-) (limited to 'packages/base/src/files') diff --git a/packages/base/src/files/install/mysql/data/170701_downgrade_script.sql b/packages/base/src/files/install/mysql/data/170701_downgrade_script.sql index 657abadcc..d81fa1535 100644 --- a/packages/base/src/files/install/mysql/data/170701_downgrade_script.sql +++ b/packages/base/src/files/install/mysql/data/170701_downgrade_script.sql @@ -18,4 +18,10 @@ * ============LICENSE_END========================================================= */ use ecomp_sdk; -ALTER TABLE fwtagpicker drop networkRole; \ No newline at end of file +ALTER TABLE fwtagpicker drop networkRole; +alter table microservicemodels drop column enumValues, drop column annotation; +drop table if exists FWTag; +drop table if exists FWTagPicker; +drop table if exists brmsdependency; +drop table if exists brmscontroller; +drop table if exists microserviceattribute; \ No newline at end of file diff --git a/packages/base/src/files/install/mysql/data/170701_upgrade_script.sql b/packages/base/src/files/install/mysql/data/170701_upgrade_script.sql index 7d990b42f..45b4361fe 100644 --- a/packages/base/src/files/install/mysql/data/170701_upgrade_script.sql +++ b/packages/base/src/files/install/mysql/data/170701_upgrade_script.sql @@ -21,3 +21,70 @@ use ecomp_sdk; ALTER TABLE fwtagpicker add networkRole varchar(64); INSERT INTO policyeditorscopes (`id`, `scopename`, `created_date`, `created_by`, `modified_date`, `modified_by`) VALUES ('1', 'com', '2017-06-01 11:45:36', 'demo', '2017-06-01 11:45:36', 'demo'); + +alter table IntegrityAuditEntity modify jdbcUrl varchar(200) not null; + +alter table `ecomp_sdk`.`microservicemodels` +add column `enumValues` longtext null default null after `version`, +add column `annotation` longtext null after `enumValues`; + +drop table if exists FWTag; +CREATE TABLE FWTag( +Id int NOT NULL AUTO_INCREMENT, +tagName VARCHAR(45) NOT NULL, +description VARCHAR(1024), +tagValues VARCHAR(1024) NOT NULL, +CREATED_DATE TIMESTAMP NOT NULL default current_timestamp, +CREATED_BY VARCHAR(45) NOT NULL, +MODIFIED_DATE TIMESTAMP NOT NULL, +MODIFIED_BY VARCHAR(45) NOT NULL, +PRIMARY KEY(ID) +); + +drop table if exists FWTagPicker; +CREATE TABLE FWTagPicker( +ID INT NOT NULL AUTO_INCREMENT, +tagPickerName VARCHAR(45) NOT NULL, +DESCRIPTION VARCHAR(1024), +tags VARCHAR(1024) NOT NULL, +CREATED_DATE TIMESTAMP NOT NULL default current_timestamp, +CREATED_BY VARCHAR(45) NOT NULL, +MODIFIED_DATE TIMESTAMP NOT NULL, +MODIFIED_BY VARCHAR(45) NOT NULL, +PRIMARY KEY(ID) +); + +drop table if exists brmsdependency; +CREATE TABLE brmsdependency ( +id int not null auto_increment, +dependency_name varchar(1024) not null, +description varchar(1024), +created_by varchar(45) not null, +created_date timestamp not null default current_timestamp, +modified_by varchar(45), +modified_date timestamp, +dependency longtext not null, +primary key(id) +); + +drop table if exists brmscontroller; +CREATE TABLE brmscontroller ( +id int not null auto_increment, +controller_name varchar(1024) not null, +description varchar(1024), +created_by varchar(45) not null, +created_date timestamp not null default current_timestamp, +modified_by varchar(45), +modified_date timestamp, +controller longtext not null, +primary key(id) +); + +drop table if exists microserviceattribute; +CREATE TABLE microserviceattribute( +ID INT NOT NULL AUTO_INCREMENT, +name VARCHAR(255) NOT NULL, +value VARCHAR(1024), +modelName VARCHAR(1024) NOT NULL, +PRIMARY KEY(ID) +); \ No newline at end of file diff --git a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml index 141ac47ff..33c0c4a8d 100644 --- a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml +++ b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml @@ -4,33 +4,33 @@ - + com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml - + DROOLS - + BRMS_PARAM_RULE - + SampleRiskType - + 1 - + False - + NA diff --git a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml index 28975e794..290146240 100644 --- a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml +++ b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml @@ -4,33 +4,33 @@ - + com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml - + DROOLS - + BRMS_PARAM_RULE - + SampleRiskType - + 1 - + False - + NA diff --git a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vFirewall.1.xml b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vFirewall.1.xml index 19d8c176d..a18b59f41 100644 --- a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vFirewall.1.xml +++ b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vFirewall.1.xml @@ -4,45 +4,45 @@ - + com.Config_MS_vFirewall.1.xml - + DCAE - + SampleConfigName - + TcaMetrics-v1.0.0.5 - + /services/cdap-tca-hi-lo/instances/demo/configuration/metricsPerFunctionalRole/vFirewall - + SampleServiceLocation - + SampleRiskType - + 1 - + False - + NA diff --git a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vLoadBalancer.1.xml b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vLoadBalancer.1.xml index 740cd05e5..03ae3e806 100644 --- a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vLoadBalancer.1.xml +++ b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vLoadBalancer.1.xml @@ -4,45 +4,45 @@ - + com.Config_MS_vLoadBalancer.1.xml - + DCAE - + SampleConfigName - + TcaMetrics-v1.0.0.5 - + /services/cdap-tca-hi-lo/instances/demo/configuration/metricsPerFunctionalRole/vLoadBalancer - + SampleServiceLocation - + SampleRiskType - + 1 - + False - + NA -- cgit 1.2.3-korg