diff options
author | 2019-06-17 10:16:43 +0000 | |
---|---|---|
committer | 2019-06-17 10:16:43 +0000 | |
commit | a11989f24ae38eeb02d5184a672bcd21ebda7135 (patch) | |
tree | f5ff9e637153649ac29d033bf26b19a1dc7df455 /scripts/policy/policy-apex-pdp | |
parent | 6878e52a525a8bf744220d736c8660826ae85a02 (diff) |
Removing unnecessary mounts in APEX CSIT
In the end to end csit test cases of APEX, currently we are mounting the
config files for APEX and PAP. This is not necessary.
Change-Id: I10f9ed509e4bb537cc91f145dde34aeb8c0d9b99
Issue-ID: POLICY-1863
Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
Diffstat (limited to 'scripts/policy/policy-apex-pdp')
-rw-r--r-- | scripts/policy/policy-apex-pdp/config/apex-pdp/OnapPfConfig.json | 17 | ||||
-rw-r--r-- | scripts/policy/policy-apex-pdp/config/apex-pdp/topic.properties | 23 | ||||
-rw-r--r-- | scripts/policy/policy-apex-pdp/config/pap/defaultConfig.json | 31 | ||||
-rw-r--r-- | scripts/policy/policy-apex-pdp/config/pap/logback.xml | 102 | ||||
-rw-r--r-- | scripts/policy/policy-apex-pdp/config/pap/s3pConfig.json | 11 | ||||
-rw-r--r-- | scripts/policy/policy-apex-pdp/config/pap/ssl/policy-keystore | bin | 4407 -> 0 bytes | |||
-rw-r--r-- | scripts/policy/policy-apex-pdp/config/pap/ssl/policy-truststore | bin | 124176 -> 0 bytes | |||
-rw-r--r-- | scripts/policy/policy-apex-pdp/config/pap/topic.properties | 23 | ||||
-rw-r--r-- | scripts/policy/policy-apex-pdp/docker-compose-apex.yml | 20 |
9 files changed, 9 insertions, 218 deletions
diff --git a/scripts/policy/policy-apex-pdp/config/apex-pdp/OnapPfConfig.json b/scripts/policy/policy-apex-pdp/config/apex-pdp/OnapPfConfig.json deleted file mode 100644 index 6944c9bd..00000000 --- a/scripts/policy/policy-apex-pdp/config/apex-pdp/OnapPfConfig.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name":"OnapPfParameterGroup", - "restServerParameters": { - "host": "0.0.0.0", - "port": 6969, - "userName": "healthcheck", - "password": "zb!XztG34", - "https": true, - "aaf": false - }, - "pdpStatusParameters":{ - "timeIntervalMs": 10000, - "pdpType":"apex", - "description":"Pdp Heartbeat", - "supportedPolicyTypes":[{"name":"onap.policies.controlloop.operational.Apex","version":"1.0.0"}] - } -} diff --git a/scripts/policy/policy-apex-pdp/config/apex-pdp/topic.properties b/scripts/policy/policy-apex-pdp/config/apex-pdp/topic.properties deleted file mode 100644 index b7df11a8..00000000 --- a/scripts/policy/policy-apex-pdp/config/apex-pdp/topic.properties +++ /dev/null @@ -1,23 +0,0 @@ -# ============LICENSE_START======================================================= -# 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. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= - -dmaap.source.topics=POLICY-PDP-PAP -dmaap.sink.topics=POLICY-PDP-PAP - -dmaap.source.topics.POLICY-PDP-PAP.servers= dmaap:3904 -dmaap.sink.topics.POLICY-PDP-PAP.servers= dmaap:3904 diff --git a/scripts/policy/policy-apex-pdp/config/pap/defaultConfig.json b/scripts/policy/policy-apex-pdp/config/pap/defaultConfig.json deleted file mode 100644 index 519060dd..00000000 --- a/scripts/policy/policy-apex-pdp/config/pap/defaultConfig.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "name": "PapGroup", - "restServerParameters": { - "host": "0.0.0.0", - "port": 6969, - "userName": "healthcheck", - "password": "zb!XztG34", - "https": true, - "aaf": false - }, - "pdpParameters": { - "heartBeatMs": 120000, - "updateParameters": { - "maxRetryCount": 1, - "maxWaitMs": 30000 - }, - "stateChangeParameters": { - "maxRetryCount": 1, - "maxWaitMs": 30000 - } - }, - "databaseProviderParameters": { - "name": "PolicyProviderParameterGroup", - "implementation": "org.onap.policy.models.provider.impl.DatabasePolicyModelsProviderImpl", - "databaseDriver": "org.mariadb.jdbc.Driver", - "databaseUrl": "jdbc:mariadb://mariadb:3306/policyadmin", - "databaseUser": "policy_user", - "databasePassword": "cG9saWN5X3VzZXI=", - "persistenceUnit": "PolicyMariaDb" - } -} diff --git a/scripts/policy/policy-apex-pdp/config/pap/logback.xml b/scripts/policy/policy-apex-pdp/config/pap/logback.xml deleted file mode 100644 index a34956c5..00000000 --- a/scripts/policy/policy-apex-pdp/config/pap/logback.xml +++ /dev/null @@ -1,102 +0,0 @@ -<!-- - ============LICENSE_START======================================================= - Copyright (C) 2019 Nordix Foundation. - Modifications Copyright (C) 2019 AT&T Intellectual Property. - ================================================================================ - 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. - SPDX-License-Identifier: Apache-2.0 - ============LICENSE_END========================================================= ---> - -<configuration scan="true" scanPeriod="30 seconds" debug="false"> - - <property name="logDir" value="${POLICY_LOGS}" /> - - <property name="errorLog" value="error" /> - <property name="debugLog" value="debug" /> - <property name="networkLog" value="network" /> - - <property name="debugPattern" - value="[%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n" /> - <property name="errorPattern" value="${debugPattern}" /> - <property name="networkPattern" value="[%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%t]%m%n" /> - - <appender name="ErrorOut" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${logDir}/${errorLog}.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> - <fileNamePattern>${logDir}/${errorLog}.%d{yyyy-MM-dd}.%i.log.zip - </fileNamePattern> - <maxFileSize>50MB</maxFileSize> - <maxHistory>30</maxHistory> - <totalSizeCap>10GB</totalSizeCap> - </rollingPolicy> - <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> - <level>WARN</level> - </filter> - <encoder> - <pattern>${errorPattern}</pattern> - </encoder> - </appender> - - <appender name="AsyncErrorOut" class="ch.qos.logback.classic.AsyncAppender"> - <appender-ref ref="ErrorOut" /> - </appender> - - <appender name="DebugOut" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${logDir}/${debugLog}.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> - <fileNamePattern>${logDir}/${debugLog}.%d{yyyy-MM-dd}.%i.log.zip - </fileNamePattern> - <maxFileSize>50MB</maxFileSize> - <maxHistory>30</maxHistory> - <totalSizeCap>10GB</totalSizeCap> - </rollingPolicy> - <encoder> - <pattern>${debugPattern}</pattern> - </encoder> - </appender> - - <appender name="AsyncDebugOut" class="ch.qos.logback.classic.AsyncAppender"> - <appender-ref ref="DebugOut" /> - </appender> - - <appender name="NetworkOut" class="ch.qos.logback.core.rolling.RollingFileAppender"> - <file>${logDir}/${networkLog}.log</file> - <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> - <fileNamePattern>${logDir}/${networkLog}.%d{yyyy-MM-dd}.%i.log.zip - </fileNamePattern> - <maxFileSize>50MB</maxFileSize> - <maxHistory>30</maxHistory> - <totalSizeCap>10GB</totalSizeCap> - </rollingPolicy> - <encoder> - <pattern>${networkPattern}</pattern> - </encoder> - </appender> - - <appender name="AsyncNetworkOut" class="ch.qos.logback.classic.AsyncAppender"> - <appender-ref ref="NetworkOut" /> - </appender> - - <logger name="network" level="INFO" additivity="false"> - <appender-ref ref="AsyncNetworkOut" /> - </logger> - - <logger name="org.eclipse.jetty.server.RequestLog" level="info" additivity="false"> - <appender-ref ref="AsyncNetworkOut" /> - </logger> - - <root level="INFO"> - <appender-ref ref="AsyncDebugOut" /> - <appender-ref ref="AsyncErrorOut" /> - </root> - -</configuration> diff --git a/scripts/policy/policy-apex-pdp/config/pap/s3pConfig.json b/scripts/policy/policy-apex-pdp/config/pap/s3pConfig.json deleted file mode 100644 index 3085f45d..00000000 --- a/scripts/policy/policy-apex-pdp/config/pap/s3pConfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "PapGroup", - "restServerParameters": { - "host": "0.0.0.0", - "port": 6969, - "userName": "healthcheck", - "password": "zb!XztG34", - "https": true, - "aaf": false - } -} diff --git a/scripts/policy/policy-apex-pdp/config/pap/ssl/policy-keystore b/scripts/policy/policy-apex-pdp/config/pap/ssl/policy-keystore Binary files differdeleted file mode 100644 index bf876b8a..00000000 --- a/scripts/policy/policy-apex-pdp/config/pap/ssl/policy-keystore +++ /dev/null diff --git a/scripts/policy/policy-apex-pdp/config/pap/ssl/policy-truststore b/scripts/policy/policy-apex-pdp/config/pap/ssl/policy-truststore Binary files differdeleted file mode 100644 index b7d52ad1..00000000 --- a/scripts/policy/policy-apex-pdp/config/pap/ssl/policy-truststore +++ /dev/null diff --git a/scripts/policy/policy-apex-pdp/config/pap/topic.properties b/scripts/policy/policy-apex-pdp/config/pap/topic.properties deleted file mode 100644 index b7df11a8..00000000 --- a/scripts/policy/policy-apex-pdp/config/pap/topic.properties +++ /dev/null @@ -1,23 +0,0 @@ -# ============LICENSE_START======================================================= -# 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. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= - -dmaap.source.topics=POLICY-PDP-PAP -dmaap.sink.topics=POLICY-PDP-PAP - -dmaap.source.topics.POLICY-PDP-PAP.servers= dmaap:3904 -dmaap.sink.topics.POLICY-PDP-PAP.servers= dmaap:3904 diff --git a/scripts/policy/policy-apex-pdp/docker-compose-apex.yml b/scripts/policy/policy-apex-pdp/docker-compose-apex.yml index e836a589..c6578dda 100644 --- a/scripts/policy/policy-apex-pdp/docker-compose-apex.yml +++ b/scripts/policy/policy-apex-pdp/docker-compose-apex.yml @@ -27,7 +27,7 @@ services: - ./config/db:/docker-entrypoint-initdb.d ports: - "3306:3306" - dmaap: + message-router: image: dmaap/simulator container_name: dmaap-simulator hostname: dmaap-simulator @@ -38,10 +38,9 @@ services: container_name: policy-pap depends_on: - mariadb - - dmaap + - message-router hostname: policy-pap - volumes: - - ./config/pap/:/opt/app/policy/pap/etc/ + api: image: nexus3.onap.org:10001/onap/policy-api container_name: policy-api @@ -53,12 +52,11 @@ services: container_name: policy-apex-pdp depends_on: - mariadb - - dmaap + - message-router - 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', '-p', '/opt/app/policy/apex-pdp/etc/onappf/config/topic.properties'] - volumes: - - ./config/apex-pdp/:/opt/app/policy/apex-pdp/etc/onappf/config/ + ports: - "6969:6969" - "23324:23324" @@ -69,11 +67,11 @@ services: container_name: policy-wait depends_on: - mariadb - - dmaap + - message-router hostname: policy-wait command: mariadb:3306 - dmaap:3904 + message-router:3904 start_all: image: dadarek/wait-for-dependencies environment: @@ -81,14 +79,14 @@ services: container_name: policy-wait-all depends_on: - mariadb - - dmaap + - message-router - api - pap - apex hostname: policy-wait-all command: mariadb:3306 - dmaap:3904 + message-router:3904 api:6969 pap:6969 apex:6969 |