diff options
Diffstat (limited to 'packages')
4 files changed, 79 insertions, 1 deletions
diff --git a/packages/base/src/files/install/mysql/data/180601_downgrade_script.sql b/packages/base/src/files/install/mysql/data/180601_downgrade_script.sql new file mode 100644 index 000000000..593f3ac59 --- /dev/null +++ b/packages/base/src/files/install/mysql/data/180601_downgrade_script.sql @@ -0,0 +1,24 @@ +/*- +* ============LICENSE_START======================================================= +* ONAP Policy Engine +* ================================================================================ +* Copyright (C) 2018 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; +drop table if exists optimizationmodels; +drop table if exists microserviceheaderdefaults; + +ALTER TABLE `onap_sdk`.`microservicemodels` DROP `dataOrderInfo`;
\ No newline at end of file diff --git a/packages/base/src/files/install/mysql/data/180601_upgrade_script.sql b/packages/base/src/files/install/mysql/data/180601_upgrade_script.sql new file mode 100644 index 000000000..070feeefc --- /dev/null +++ b/packages/base/src/files/install/mysql/data/180601_upgrade_script.sql @@ -0,0 +1,53 @@ +/*- +* ============LICENSE_START======================================================= +* ONAP Policy Engine +* ================================================================================ +* Copyright (C) 2018 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; + +drop table if exists `onap_sdk`.`optimizationmodels`; +create table `onap_sdk`.`optimizationmodels` ( +`id` int(11) not null auto_increment, +`modelname` varchar(767) not null, +`description` varchar(1024) default null, +`dependency` varchar(1024) default null, +`imported_by` varchar(45) not null, +`attributes` longtext, +`ref_attributes` longtext, +`sub_attributes` longtext, +`version` varchar(45) default null, +`annotation` longtext, +`enumValues` longtext, +`dataOrder` varchar(2000) DEFAULT NULL, +primary key (`id`), +unique key `optimizationmodels_uniq` (`modelname`,`version`) +); + +drop table if exists `onap_sdk`.`MicroServiceHeaderDefaults`; +CREATE TABLE `onap_sdk`.`MicroServiceHeaderDefaults` ( + `ID` int(11) NOT NULL AUTO_INCREMENT, + `onapName` varchar(255) DEFAULT NULL, + `guard` varchar(255) DEFAULT NULL, + `priority` varchar(3) DEFAULT NULL, + `riskType` varchar(255) DEFAULT NULL, + `riskLevel` varchar(3) DEFAULT NULL, + `modelName` varchar(1024) NOT NULL, + PRIMARY KEY (`ID`) +); + +ALTER TABLE `onap_sdk`.`microservicemodels` +ADD COLUMN `dataOrderInfo` VARCHAR(2000) NULL DEFAULT 'Null' AFTER `enumValues`; diff --git a/packages/base/src/files/install/servers/console/bin/xacml.admin.properties b/packages/base/src/files/install/servers/console/bin/xacml.admin.properties index e0f760b77..a890a2938 100644 --- a/packages/base/src/files/install/servers/console/bin/xacml.admin.properties +++ b/packages/base/src/files/install/servers/console/bin/xacml.admin.properties @@ -159,6 +159,7 @@ xacml.rest.closedLoopFault=OpenSource.version.1 xacml.rest.closedLoopPM=OpenSource.version.1 xacml.rest.microServices=OpenSource.version.1 xacml.rest.firewallPolicy=OpenSource.version.1 +xacml.rest.optimization=OpenSource.version.1 #***Properties for IntegrityMonitor integration defined in XACMLRestProperties.java*** #The name of the Admin. Must be unique across the system diff --git a/packages/docker/src/main/docker/Dockerfile b/packages/docker/src/main/docker/Dockerfile index c6536c815..c0ab881d3 100644 --- a/packages/docker/src/main/docker/Dockerfile +++ b/packages/docker/src/main/docker/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:14.04 ARG HTTP_PROXY=${HTTP_PROXY} ARG HTTPS_PROXY=${HTTPS_PROXY} -ARG POLICY_LOGS=/var/log/ONAP/policy +ARG POLICY_LOGS=/var/log/onap ENV http_proxy $HTTP_PROXY ENV https_proxy $HTTPS_PROXY |