From 514ea504fa114524513fc4a83a6d83b2f6754903 Mon Sep 17 00:00:00 2001 From: RehanRaza Date: Tue, 14 Dec 2021 15:18:29 +0100 Subject: [PATCH] Update docker-compose of onap-policy in smo This commit reflects the changes that have been done recently in ONAP's Policy Framework. Moreover, new components have been added in the docker-compose for being able to run the control-loop versions of different usecases in OSC. Change-Id: Ibacfad76da131c1279c935788ea788b42c38e9f7 Issue-ID: OAM-240 Signed-off-by: RehanRaza --- .../smo/onap-policy/config/api/defaultConfig.json | 53 ++++++++++ .../onap-policy/config/db/bootstrap-database.sh | 28 +++++ .../smo/onap-policy/config/db/create-db.sql | 13 +++ .../integration/smo/onap-policy/config/db/db.conf | 16 --- .../integration/smo/onap-policy/config/db/db.sh | 22 ---- .../onap-policy/config/drools-apps/env/base.conf | 4 +- .../smo/onap-policy/config/drools/env/base.conf | 4 +- solution/integration/smo/onap-policy/config/ks.jks | Bin 0 -> 2647 bytes .../smo/onap-policy/config/pap/defaultConfig.json | 8 +- .../integration/smo/onap-policy/docker-compose.yml | 117 +++++++++++++++++++-- 10 files changed, 213 insertions(+), 52 deletions(-) create mode 100644 solution/integration/smo/onap-policy/config/api/defaultConfig.json create mode 100755 solution/integration/smo/onap-policy/config/db/bootstrap-database.sh create mode 100644 solution/integration/smo/onap-policy/config/db/create-db.sql delete mode 100644 solution/integration/smo/onap-policy/config/db/db.conf delete mode 100755 solution/integration/smo/onap-policy/config/db/db.sh create mode 100644 solution/integration/smo/onap-policy/config/ks.jks diff --git a/solution/integration/smo/onap-policy/config/api/defaultConfig.json b/solution/integration/smo/onap-policy/config/api/defaultConfig.json new file mode 100644 index 0000000..b78b753 --- /dev/null +++ b/solution/integration/smo/onap-policy/config/api/defaultConfig.json @@ -0,0 +1,53 @@ +{ + "name": "ApiGroup", + "restServerParameters": { + "host": "0.0.0.0", + "port": 6969, + "userName": "healthcheck", + "password": "zb!XztG34", + "https": false, + "aaf": false + }, + "databaseProviderParameters": { + "name": "PolicyProviderParameterGroup", + "implementation": "org.onap.policy.models.provider.impl.DatabasePolicyModelsProviderImpl", + "databaseDriver": "org.mariadb.jdbc.Driver", + "databaseUrl": "jdbc:mariadb://mariadb:3306/policyadmin", + "databaseUser": "root", + "databasePassword": "strong_pitchou", + "persistenceUnit": "PolicyMariaDb" + }, + "preloadPolicyTypes": [ + "policytypes/onap.policies.monitoring.tcagen2.yaml", + "policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml", + "policytypes/onap.policies.monitoring.dcae-restconfcollector.yaml", + "policytypes/onap.policies.Optimization.yaml", + "policytypes/onap.policies.optimization.Resource.yaml", + "policytypes/onap.policies.optimization.Service.yaml", + "policytypes/onap.policies.optimization.resource.AffinityPolicy.yaml", + "policytypes/onap.policies.optimization.resource.DistancePolicy.yaml", + "policytypes/onap.policies.optimization.resource.HpaPolicy.yaml", + "policytypes/onap.policies.optimization.resource.OptimizationPolicy.yaml", + "policytypes/onap.policies.optimization.resource.PciPolicy.yaml", + "policytypes/onap.policies.optimization.service.QueryPolicy.yaml", + "policytypes/onap.policies.optimization.service.SubscriberPolicy.yaml", + "policytypes/onap.policies.optimization.resource.Vim_fit.yaml", + "policytypes/onap.policies.optimization.resource.VnfPolicy.yaml", + "policytypes/onap.policies.controlloop.guard.Common.yaml", + "policytypes/onap.policies.controlloop.guard.common.Blacklist.yaml", + "policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter.yaml", + "policytypes/onap.policies.controlloop.guard.common.MinMax.yaml", + "policytypes/onap.policies.controlloop.guard.common.Filter.yaml", + "policytypes/onap.policies.controlloop.guard.coordination.FirstBlocksSecond.yaml", + "policytypes/onap.policies.Naming.yaml", + "policytypes/onap.policies.Match.yaml", + "policytypes/onap.policies.native.Drools.yaml", + "policytypes/onap.policies.native.Xacml.yaml", + "policytypes/onap.policies.native.Apex.yaml", + "policytypes/onap.policies.controlloop.operational.Common.yaml", + "policytypes/onap.policies.controlloop.operational.common.Drools.yaml" + ], + "preloadPolicies" : [ + "policies/sdnc.policy.naming.input.tosca.yaml" + ] +} diff --git a/solution/integration/smo/onap-policy/config/db/bootstrap-database.sh b/solution/integration/smo/onap-policy/config/db/bootstrap-database.sh new file mode 100755 index 0000000..6a6310d --- /dev/null +++ b/solution/integration/smo/onap-policy/config/db/bootstrap-database.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +### +# ============LICENSE_START======================================================= +# ONAP CLAMP +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Modifications Copyright (C) 2021 Nordix Foundation. 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============================================ +# =================================================================== +# +### + +mysql -uroot -p$MYSQL_ROOT_PASSWORD -f < /docker-entrypoint-initdb.d/create-db.sql +mysql -uroot -p$MYSQL_ROOT_PASSWORD --execute "CREATE USER 'policy_user'@'%' IDENTIFIED BY 'policy_user';" +mysql -uroot -p$MYSQL_ROOT_PASSWORD --execute "GRANT ALL PRIVILEGES ON controlloop.* TO 'policy_user'@'%';" \ No newline at end of file diff --git a/solution/integration/smo/onap-policy/config/db/create-db.sql b/solution/integration/smo/onap-policy/config/db/create-db.sql new file mode 100644 index 0000000..bc64431 --- /dev/null +++ b/solution/integration/smo/onap-policy/config/db/create-db.sql @@ -0,0 +1,13 @@ +# +# Create CLDS database objects (tables, etc.) +# +# +CREATE DATABASE IF NOT EXISTS `cldsdb4`; +CREATE DATABASE IF NOT EXISTS `policyadmin`; +CREATE DATABASE IF NOT EXISTS `controlloop`; +USE `cldsdb4`; +DROP USER 'clds'; +CREATE USER 'clds'; +GRANT ALL on cldsdb4.* to 'clds' identified by 'sidnnd83K' with GRANT OPTION; +FLUSH PRIVILEGES; + diff --git a/solution/integration/smo/onap-policy/config/db/db.conf b/solution/integration/smo/onap-policy/config/db/db.conf deleted file mode 100644 index 22b37f8..0000000 --- a/solution/integration/smo/onap-policy/config/db/db.conf +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 2019,2021 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. -MYSQL_ROOT_PASSWORD=secret -MYSQL_USER=policy_user -MYSQL_PASSWORD=policy_user diff --git a/solution/integration/smo/onap-policy/config/db/db.sh b/solution/integration/smo/onap-policy/config/db/db.sh deleted file mode 100755 index a5c8129..0000000 --- a/solution/integration/smo/onap-policy/config/db/db.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -xv -# Copyright 2019,2021 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. - -for db in support onap_sdk log migration operationshistory10 pooling policyadmin operationshistory -do - mysql -uroot -p"${MYSQL_ROOT_PASSWORD}" --execute "CREATE DATABASE IF NOT EXISTS ${db};" - mysql -uroot -p"${MYSQL_ROOT_PASSWORD}" --execute "GRANT ALL PRIVILEGES ON \`${db}\`.* TO '${MYSQL_USER}'@'%' ;" -done - -mysql -uroot -p"${MYSQL_ROOT_PASSWORD}" --execute "FLUSH PRIVILEGES;" diff --git a/solution/integration/smo/onap-policy/config/drools-apps/env/base.conf b/solution/integration/smo/onap-policy/config/drools-apps/env/base.conf index a56dbaa..b8ca10e 100644 --- a/solution/integration/smo/onap-policy/config/drools-apps/env/base.conf +++ b/solution/integration/smo/onap-policy/config/drools-apps/env/base.conf @@ -46,8 +46,8 @@ REPOSITORY_OFFLINE=true # Relational (SQL) DB access SQL_HOST=mariadb -SQL_USER=policy_user -SQL_PASSWORD=policy_user +SQL_USER=root +SQL_PASSWORD=strong_pitchou # AAF diff --git a/solution/integration/smo/onap-policy/config/drools/env/base.conf b/solution/integration/smo/onap-policy/config/drools/env/base.conf index 8189419..fa1f8f1 100644 --- a/solution/integration/smo/onap-policy/config/drools/env/base.conf +++ b/solution/integration/smo/onap-policy/config/drools/env/base.conf @@ -46,8 +46,8 @@ REPOSITORY_OFFLINE=false # Relational (SQL) DB access SQL_HOST=mariadb -SQL_USER=policy_user -SQL_PASSWORD=policy_user +SQL_USER=root +SQL_PASSWORD=strong_pitchou # AAF diff --git a/solution/integration/smo/onap-policy/config/ks.jks b/solution/integration/smo/onap-policy/config/ks.jks new file mode 100644 index 0000000000000000000000000000000000000000..001c7e1a9aad185507bb401e71096a794e11ee44 GIT binary patch literal 2647 zcmY+Ec{mgb7sdx;G)DG)8zk9{oy6FQA&jwB*0Kx}%9gT>y<{1Z?Af!0B9lG)URf`Z zFv8en?0oL`eBZrKf1Kx>^S7zIe_BWbVf}e_LM0 zCbBa%?J{{x?MdzLfXFET?Iu7huxDAsdfd-cB6OQROQ0sQ)QEO_^v=#pRpt93vLB8w zXZNabI>@2JrMq#PJWSLgpXNTxexQao|7Ok7ZRC`b(>Fo7%;L%mp6Ibrv$YfmJTU1O z+g#eutaa0B@!CyjnLR(?l(BwtwfS9-bEdx3?QssT{9b6`ik#S6Qn%v9ect;VMy#T! zABB>5 zq>?*>V^5sV8=eH;S_l}|rX{soQ?$2>H=q$aka{p0HglFxDnG6CD`PVM%=31-h)ZoX=x!Y$^j7T^39G<^Dw zlgTwKB^bX?&N@HGqpqgM8ON=w|A2@Ui6&ply2}-BG`n--C(IrMe&6X(s?!FBH(fds zt@X`AnX$WL@H%fA69*=_j&?1V@qUR<;yxbCb($B!ZVEsn5Hl&}5`iKaCM9{U{@s?Y zgIHI7`~HPajV=RaoKwzUu0xg~OuK771gY;`V=39xIRM${pn`lyhFTu`jY#enN~uXp z2IY*x%%)3R%!#v&wh#_rx!u`whVNGeE1-v_#c`E{>BgCB=#<& za81>@1~T}pQ#MG}Q5ez!Ic#*TJ&7EbjA0L87MCC7Q{e zsQslJbg7Ey76Nrb96mCZUkL+B=dc&<{?r>ym95Wl9aB4htwwbqB-Jl|doms+9V=R< z{El^lZNC&me|XSbO2~Hi&xowz)nywQ`NjmA)si0>(G;mjHcoQGC7xCs)0)xQ1tCXW zVlxIZ6-w~$-D6XaKN0Arp)bO1>19%BH|izxF#xTY(7Tu`PiGTtZZtFIbqSDL9rC&o zZ3cu;2Q3Z+rHJ%RTXUVM&^#rX&GW}|r|DLNp2z4-)fKxth;8)quJr^T?>(~QRXhBN zpy|f)6AN*;-s8iuq4M4(2zBu0^(<~_32d&ti^vcACjP=HwPE7k9^O!+__z5}2xReh z22gbVM`ca_sTbOUcmGk=^uertvjh9S#o)K94+MC=kWWXD=jnthNKm+M=Eh$${PM`7dJEp>J>e^);z)8diw9tG3eCeZq+#Ap7XZSqdUbLLyV9 z@DXJncTgm2n&ALyxF99S=OiH9>ujnlTWr-b$kPKL^uZdp#H2;q?@C?2MxWM@T4YNoy0~yWTJn!*I zE66CyC@Ux{%fS>BFW~C@&k+^qg14v($&{Q7aM29@b;$l8Fz9arZwvJg8#zvIvo%u4 zsdS8lmPE5W|1W_dXrH(qZDkC#^`X^G4&HTk*p?aKojc-k-qA0Lzjkg#%5}-v3D>Q_YfU`6x8%d%P)3ikG9SX zAp`6w!Y8-Cn~aX1y++j3c)kbzOh~)2YCLsydC5$~)jn1}n1MFnB*BgF7tWaaacQpd>s(%I=N=%$7ElF>M91OhtHizg_?8hlxMl!WcG|GVSu`ZEgufEYisv}u7@S^!W!R-n) zAz^629%0H*|KNfURU}5tW6fR4h)*p@tDHl!$$81@Q{chsnA*n`2D%fR=Zm;SqHv%z zw2-Wg1aSK@zrCAvq<2QxXVLtza$-xeaW4@JDawB{GwqvWkjT}{@AfM0B;2F9>XtfD zbC|ohq*(SQ#6K9C79@LF@@?ou@RH&9n|qEd&{)AzUsS7c*odM=-CG_;8gBR<)s%<% zK1h?OZWn56(sytLqIG?yAD5I0KPq8Md^G&2>cF-tBF<{HM_byT%&1s`z+dUtCBTZH zSb&!lAz8ef#f(2;N%lq2yCC#nk8UOiV-oeMzAsb_oGueS?2EcyWKu@u%yH26Q$Dp_ zkyqP zs>eHI)uNc0cQnD|{!DK#DgAy~c$}%aAXm{OHWxyuY{Hh`BFYiiw&XW1>Epvrf3x