diff options
Diffstat (limited to 'packages/base/src/files')
7 files changed, 57 insertions, 15 deletions
diff --git a/packages/base/src/files/etc/ssl/policy-keystore b/packages/base/src/files/etc/ssl/policy-keystore Binary files differindex 3809f7d69..389df5fe5 100644 --- a/packages/base/src/files/etc/ssl/policy-keystore +++ b/packages/base/src/files/etc/ssl/policy-keystore diff --git a/packages/base/src/files/install/mysql/data/161000_upgrade_script.sql b/packages/base/src/files/install/mysql/data/161000_upgrade_script.sql index dbab6ac30..b3589b053 100755 --- a/packages/base/src/files/install/mysql/data/161000_upgrade_script.sql +++ b/packages/base/src/files/install/mysql/data/161000_upgrade_script.sql @@ -6320,7 +6320,7 @@ INSERT INTO FunctionArguments (id, is_bag, function_id, arg_index, datatype_id) INSERT INTO FunctionArguments (id, is_bag, function_id, arg_index, datatype_id) VALUES (452,0,254,2,28); INSERT INTO FunctionArguments (id, is_bag, function_id, arg_index, datatype_id) VALUES (453,0,92,3,16); -INSERT INTO PIPType VALUES (500,'SQL'), (501,'LDAP'), (502,'CSV'), (503,'Hyper-CSV'), (504,'Custom'); +INSERT INTO PipType VALUES (500,'SQL'), (501,'LDAP'), (502,'CSV'), (503,'Hyper-CSV'), (504,'Custom'); INSERT INTO GlobalRoleSettings (role, lockdown) values ('super-admin', '0'); 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 8271f27ce..58f92a6cd 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,9 +18,9 @@ use onap_sdk; ALTER TABLE fwtagpicker drop networkRole; -alter table microservicemodels drop column enumValues, drop column annotation; -drop table if exists FWTag; -drop table if exists FWTagPicker; +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; +drop table if exists microserviceattribute; 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 f8ed77182..c2343b720 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 @@ -20,14 +20,14 @@ use onap_sdk; 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 IntegrityAuditEntity modify jdbcUrl varchar(200) not null; -alter table `onap_sdk`.`microservicemodels` -add column `enumValues` longtext null default null after `version`, +alter table `onap_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( +drop table if exists FwTag; +CREATE TABLE FwTag( Id int NOT NULL AUTO_INCREMENT, tagName VARCHAR(45) NOT NULL, description VARCHAR(1024), @@ -39,8 +39,8 @@ MODIFIED_BY VARCHAR(45) NOT NULL, PRIMARY KEY(ID) ); -drop table if exists FWTagPicker; -CREATE TABLE FWTagPicker( +drop table if exists FwTagPicker; +CREATE TABLE FwTagPicker( ID INT NOT NULL AUTO_INCREMENT, tagPickerName VARCHAR(45) NOT NULL, DESCRIPTION VARCHAR(1024), @@ -79,7 +79,7 @@ controller longtext not null, primary key(id) ); -drop table if exists microserviceattribute; +drop table if exists microserviceattribute; CREATE TABLE microserviceattribute( ID INT NOT NULL AUTO_INCREMENT, name VARCHAR(255) NOT NULL, diff --git a/packages/base/src/files/install/mysql/data/191000_upgrade_script.sql b/packages/base/src/files/install/mysql/data/191000_upgrade_script.sql new file mode 100644 index 000000000..6fefe6bf0 --- /dev/null +++ b/packages/base/src/files/install/mysql/data/191000_upgrade_script.sql @@ -0,0 +1,42 @@ +-- ============LICENSE_START======================================================= +-- ONAP Policy Engine +-- ================================================================================ +-- Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. +-- ================================================================================ +-- 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. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- ============LICENSE_END========================================================= +use onap_sdk; + +SET FOREIGN_KEY_CHECKS=0; + +-- Changes for epsdk 2.5.0 version +update fn_menu set action = 'welcome' where action = 'welcome.htm'; + +-- Changes for epsdk 2.6.0 version upgrade +INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('report/wizard/add_formfield_tab_data/*','menu_reports'); +INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('report/wizard/save_formfield_tab_data/*','menu_reports'); +INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('report/wizard/retrieve_form_tab_wise_data/*/delete','menu_reports'); +INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('report/wizard/list_child_report_col/*','menu_reports'); +INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('report/wizard/list_child_report_ff/*','menu_reports'); +INSERT INTO fn_restricted_url VALUES('serviceModels','serviceModels '); +INSERT INTO fn_restricted_url VALUES('serviceModels','menu_admin'); +INSERT INTO fn_restricted_url VALUES('report/wizard/list_columns','menu_reports'); +INSERT INTO fn_restricted_url VALUES('report/wizard/list_formfields','menu_reports'); +INSERT INTO fn_restricted_url VALUES('report/wizard/retrieve_data/*','menu_reports'); +INSERT INTO fn_restricted_url VALUES('report/wizard/retrieve_col_tab_wise_data/*','menu_reports'); +INSERT INTO fn_restricted_url VALUES('welcome','menu_reports'); +INSERT INTO fn_restricted_url VALUES('report/security/addReportUser','menu_reports'); +INSERT INTO fn_restricted_url VALUES('report/security/addReportRole','menu_reports'); +INSERT INTO fn_restricted_url VALUES('report/security/*','menu_reports'); +INSERT INTO fn_restricted_url VALUES('report/wizard/get_report_log/*','menu_reports'); + diff --git a/packages/base/src/files/install/servers/brmsgw/config.properties b/packages/base/src/files/install/servers/brmsgw/config.properties index 950b1df9e..d54f56d77 100644 --- a/packages/base/src/files/install/servers/brmsgw/config.properties +++ b/packages/base/src/files/install/servers/brmsgw/config.properties @@ -84,7 +84,7 @@ test_via_jmx=${{test_via_jmx}} ping_interval=30000 -brms.dependency.version=1.5.2-SNAPSHOT +brms.dependency.version=1.6.3-SNAPSHOT CLIENT_FILE=client.properties diff --git a/packages/base/src/files/install/servers/onap/WEB-INF/classes/portal.properties b/packages/base/src/files/install/servers/onap/WEB-INF/classes/portal.properties index 6473cc963..7b534358c 100644 --- a/packages/base/src/files/install/servers/onap/WEB-INF/classes/portal.properties +++ b/packages/base/src/files/install/servers/onap/WEB-INF/classes/portal.properties @@ -68,7 +68,7 @@ ueb_app_consumer_group_name = {UUID} decryption_key = AGLDdG4D04BKm2IxIWEr8o== # Use this tag if the app is centralized -role_access_centralized = remote +#role_access_centralized = remote # Connection and Read timeout values ext_req_connection_timeout = 15000 |