aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/policy/policy-distribution
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2020-09-17 17:03:34 -0400
committera.sreekumar <ajith.sreekumar@bell.ca>2020-10-07 14:04:45 +0100
commit00532428c0b83065a8ae87eaa2de579c3918d984 (patch)
tree3f64002563d9338b3f8221ed6a09d532a0be9a1f /scripts/policy/policy-distribution
parente8725131014daf39725e37d518c5b9766d86ee46 (diff)
Make stand-alone Policy environment
This is a first cut at making it possible to easily run Policy components within a stand-alone environment. Made the following changes: - enhanced wait_for_port.sh to accept a list of hosts/ports - enhanced wait_for_port.sh to accept an optional command to execute when the wait completes - consolidated all of the yml files into a single file - removed "extra" services from the yml so that a component and its dependents can be brought up in a single invocation - modified the component setup.sh With these changes, a developer can clone the csit repo, run detmVers.sh to set the docker image version env variables, and then bring up a component (and its dependents) using: docker-compose -f scripts/policy/docker-compose-all.yml up --detach <component> Note: this does not preload or deploy any policies; that must be done manually via curl. Modified to use new simulator docker image. Also fixed drools-apps CSIT broken due to disabling frankfurt controller. Also removed operational.Apex policy. The csar file used in policy-distribution test is also updated to reflect this change. Issue-ID: POLICY-2742 Change-Id: I412dbd5db9219ad2cdece9693f0b4b9fe7b2eb69 Signed-off-by: Jim Hahn <jrh3@att.com> Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>
Diffstat (limited to 'scripts/policy/policy-distribution')
-rw-r--r--scripts/policy/policy-distribution/config/db/db.conf16
-rw-r--r--scripts/policy/policy-distribution/config/db/db.sh22
-rw-r--r--scripts/policy/policy-distribution/config/distribution/csar/sample_csar_with_apex_policy.csarbin96875 -> 96868 bytes
-rw-r--r--scripts/policy/policy-distribution/config/distribution/defaultConfig.json72
-rw-r--r--scripts/policy/policy-distribution/config/distribution/temp/sample_csar_with_apex_policy.csarbin94632 -> 0 bytes
-rw-r--r--scripts/policy/policy-distribution/docker-compose-distribution.yml109
6 files changed, 0 insertions, 219 deletions
diff --git a/scripts/policy/policy-distribution/config/db/db.conf b/scripts/policy/policy-distribution/config/db/db.conf
deleted file mode 100644
index 4768bfc4..00000000
--- a/scripts/policy/policy-distribution/config/db/db.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright (C) 2019 Nordix Foundation.
-#
-# 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/scripts/policy/policy-distribution/config/db/db.sh b/scripts/policy/policy-distribution/config/db/db.sh
deleted file mode 100644
index 660f2c5a..00000000
--- a/scripts/policy/policy-distribution/config/db/db.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash -xv
-# Copyright (C) 2019 Nordix Foundation.
-#
-# 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 policyadmin
-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/scripts/policy/policy-distribution/config/distribution/csar/sample_csar_with_apex_policy.csar b/scripts/policy/policy-distribution/config/distribution/csar/sample_csar_with_apex_policy.csar
index c2f90eaf..4d293e42 100644
--- a/scripts/policy/policy-distribution/config/distribution/csar/sample_csar_with_apex_policy.csar
+++ b/scripts/policy/policy-distribution/config/distribution/csar/sample_csar_with_apex_policy.csar
Binary files differ
diff --git a/scripts/policy/policy-distribution/config/distribution/defaultConfig.json b/scripts/policy/policy-distribution/config/distribution/defaultConfig.json
deleted file mode 100644
index facee9bc..00000000
--- a/scripts/policy/policy-distribution/config/distribution/defaultConfig.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
- "name":"SDCDistributionGroup",
- "restServerParameters":{
- "host":"0.0.0.0",
- "port":6969,
- "userName":"healthcheck",
- "password":"zb!XztG34",
- "https": true
- },
- "receptionHandlerParameters":{
- "FileReceptionHandler":{
- "receptionHandlerType":"File",
- "receptionHandlerClassName":"org.onap.policy.distribution.reception.handling.file.FileSystemReceptionHandler",
- "receptionHandlerConfigurationName":"fileConfiguration",
- "pluginHandlerParameters":{
- "policyDecoders":{
- "ApexDecoder":{
- "decoderType":"ApexDecoder",
- "decoderClassName":"org.onap.policy.distribution.reception.decoding.policy.file.PolicyDecoderFileInCsarToPolicy",
- "decoderConfigurationName": "apexDecoderConfiguration"
- }
- },
- "policyForwarders":{
- "LifeCycleApiForwarder":{
- "forwarderType":"LifeCycleAPI",
- "forwarderClassName":"org.onap.policy.distribution.forwarding.lifecycle.api.LifecycleApiPolicyForwarder",
- "forwarderConfigurationName": "lifecycleApiConfiguration"
- }
- }
- }
- }
- },
- "receptionHandlerConfigurationParameters":{
- "fileConfiguration":{
- "parameterClassName":"org.onap.policy.distribution.reception.handling.file.FileSystemReceptionHandlerConfigurationParameterGroup",
- "parameters":{
- "watchPath": "/opt/app/policy/distribution/etc/temp/",
- "maxThread": 1
- }
- }
- },
- "policyDecoderConfigurationParameters":{
- "apexDecoderConfiguration":{
- "parameterClassName":"org.onap.policy.distribution.reception.decoding.policy.file.PolicyDecoderFileInCsarToPolicyParameterGroup",
- "parameters":{
- "policyFileName": "apex_policy.json",
- "policyTypeFileName": "apex_policy_type.json"
- }
- }
- },
- "policyForwarderConfigurationParameters":{
- "lifecycleApiConfiguration":{
- "parameterClassName":"org.onap.policy.distribution.forwarding.lifecycle.api.LifecycleApiForwarderParameters",
- "parameters":{
- "apiParameters": {
- "hostName": "policy-api",
- "port": 6969,
- "userName": "healthcheck",
- "password": "zb!XztG34"
- },
- "papParameters": {
- "hostName": "policy-pap",
- "port": 6969,
- "userName": "healthcheck",
- "password": "zb!XztG34"
- },
- "isHttps": true,
- "deployPolicies": true
- }
- }
- }
-}
diff --git a/scripts/policy/policy-distribution/config/distribution/temp/sample_csar_with_apex_policy.csar b/scripts/policy/policy-distribution/config/distribution/temp/sample_csar_with_apex_policy.csar
deleted file mode 100644
index 675e8897..00000000
--- a/scripts/policy/policy-distribution/config/distribution/temp/sample_csar_with_apex_policy.csar
+++ /dev/null
Binary files differ
diff --git a/scripts/policy/policy-distribution/docker-compose-distribution.yml b/scripts/policy/policy-distribution/docker-compose-distribution.yml
deleted file mode 100644
index f2398908..00000000
--- a/scripts/policy/policy-distribution/docker-compose-distribution.yml
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright (C) 2019 Nordix Foundation.
-#
-# 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.
-version: '2'
-networks:
- default:
- driver: bridge
-services:
- mariadb:
- image: mariadb:${POLICY_MARIADB_VER}
- container_name: mariadb
- hostname: mariadb
- command: ['--lower-case-table-names=1', '--wait_timeout=28800']
- env_file: config/db/db.conf
- volumes:
- - ./config/db:/docker-entrypoint-initdb.d
- ports:
- - "3306:3306"
- message-router:
- image: dmaap/simulator
- container_name: dmaap-simulator
- hostname: dmaap-simulator
- ports:
- - "3904:3904"
- policy-pap:
- image: nexus3.onap.org:10001/onap/policy-pap:${POLICY_PAP_VERSION}
- container_name: policy-pap
- depends_on:
- - mariadb
- - message-router
- hostname: policy-pap
-
-
- policy-api:
- image: nexus3.onap.org:10001/onap/policy-api:${POLICY_API_VERSION}
- container_name: policy-api
- depends_on:
- - mariadb
- hostname: policy-api
-
-
- distribution:
- image: nexus3.onap.org:10001/onap/policy-distribution:${POLICY_DISTRIBUTION_VERSION}
- container_name: policy-distribution
- hostname: policy-distribution
- volumes:
- - ./config/distribution/defaultConfig.json:/opt/app/policy/distribution/etc/defaultConfig.json
- - ./config/distribution/temp/:/opt/app/policy/distribution/etc/temp/
- depends_on:
- - mariadb
- - message-router
- - policy-pap
- - policy-api
- - apex
-
- apex:
- image: nexus3.onap.org:10001/onap/policy-apex-pdp:${POLICY_APEX_PDP_VERSION}
- container_name: policy-apex-pdp
- depends_on:
- - mariadb
- - message-router
- - policy-pap
- hostname: policy-apex-pdp
- command: ['/opt/app/policy/apex-pdp/bin/apexOnapPf.sh', '-c', '/opt/app/policy/apex-pdp/etc/onappf/config/OnapPfConfig.json']
- ports:
- - "6969:6969"
- - "23324:23324"
- start_dependencies:
- image: dadarek/wait-for-dependencies
- environment:
- TIMEOUT_LENGTH: 60
- container_name: policy-wait
- depends_on:
- - mariadb
- - message-router
- hostname: policy-wait
- command:
- mariadb:3306
- message-router:3904
- start_all:
- image: dadarek/wait-for-dependencies
- environment:
- TIMEOUT_LENGTH: 60
- container_name: policy-wait-all
- depends_on:
- - mariadb
- - message-router
- - policy-api
- - policy-pap
- - apex
- - distribution
- hostname: policy-wait-all
- command:
- mariadb:3306
- message-router:3904
- policy-api:6969
- policy-pap:6969
- apex:6969
- distribution:6969