From 10bd3b73bdd484bcad801be21588193db47af61b Mon Sep 17 00:00:00 2001 From: "adheli.tavares" Date: Mon, 16 Jun 2025 17:36:31 +0100 Subject: [PATCH] Spring applications to not use bash scripts to start - any configurations are defined in the environment variables in the service definition - the wait_for_port script still used, but call for the application jar instead of another script Issue-ID: POLICY-5384 Change-Id: Iac73c2b0c0684e2c286c9bf364e3ef8f97d85b44 Signed-off-by: adheli.tavares --- compose/compose.acm.scale.yml | 39 +++-- compose/compose.common.yml | 7 +- compose/compose.yaml | 60 ++++++-- compose/config/api/apiParameters.yaml | 1 - compose/config/clamp/ClampBackend.properties | 197 ------------------------- compose/config/clamp/a1pms-participant.sh | 60 -------- compose/config/clamp/acm-runtime.sh | 66 --------- compose/config/clamp/http-participant.sh | 60 -------- compose/config/clamp/kserve-participant.sh | 60 -------- compose/config/clamp/kubernetes-participant.sh | 60 -------- compose/config/clamp/org.onap.clamp.keyfile | 27 ---- compose/config/clamp/policy-participant.sh | 60 -------- compose/config/clamp/sim-participant.sh | 60 -------- compose/stop-compose.sh | 4 +- csit/run-project-csit.sh | 4 + 15 files changed, 87 insertions(+), 678 deletions(-) delete mode 100644 compose/config/clamp/ClampBackend.properties delete mode 100644 compose/config/clamp/a1pms-participant.sh delete mode 100755 compose/config/clamp/acm-runtime.sh delete mode 100755 compose/config/clamp/http-participant.sh delete mode 100644 compose/config/clamp/kserve-participant.sh delete mode 100755 compose/config/clamp/kubernetes-participant.sh delete mode 100644 compose/config/clamp/org.onap.clamp.keyfile delete mode 100755 compose/config/clamp/policy-participant.sh delete mode 100755 compose/config/clamp/sim-participant.sh diff --git a/compose/compose.acm.scale.yml b/compose/compose.acm.scale.yml index b9484ee5..dc39fa52 100644 --- a/compose/compose.acm.scale.yml +++ b/compose/compose.acm.scale.yml @@ -1,6 +1,6 @@ # # ===========LICENSE_START==================================================== -# Copyright (C) 2024-2025 Nordix Foundation. +# Copyright (C) 2024-2025 OpenInfra Foundation Europe. 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. @@ -105,6 +105,16 @@ services: OTEL_EXPORTER_OTLP_PROTOCOL: http/protobuf OTEL_EXPORTER_OTLP_TRACES_PROTOCOL: http/protobuf OTEL_EXPORTER_OTLP_ENDPOINT: http://jaeger:4318 + JAVA_TOOL_OPTIONS: >- + -Dlogging.config="/opt/app/policy/clamp/etc/logback.xml" + -Dcom.sun.management.jmxremote.rmi.port=9090 + -Dcom.sun.management.jmxremote=true + -Dcom.sun.management.jmxremote.port=9090 + -Dcom.sun.management.jmxremote.ssl=false + -Dcom.sun.management.jmxremote.authenticate=false + -Dcom.sun.management.jmxremote.local.only=false + -Dotel.java.global-autoconfigure.enabled=true + SPRING_CONFIG_LOCATION: /opt/app/policy/clamp/etc/AcRuntimeParameters.yaml # Tracing can be configured for grpc or http - default is http #OTEL_EXPORTER_OTLP_PROTOCOL: grpc #OTEL_EXPORTER_OTLP_TRACES_PROTOCOL: grpc @@ -112,11 +122,10 @@ services: volumes: - ./config/clamp/AcRuntimeParameters.yaml:/opt/app/policy/clamp/etc/AcRuntimeParameters.yaml - ./config/clamp/logback.xml:/opt/app/policy/clamp/etc/logback.xml:ro - - ./config/clamp/acm-runtime.sh:/opt/app/policy/clamp/bin/acm-runtime.sh:rw - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro entrypoint: /opt/app/policy/bin/wait_for_port.sh command: [ - '-c', './acm-runtime.sh', + '-c', 'java -jar /app/app.jar', 'apex-pdp', '6969', 'kafka', '9092', 'policy-clamp-ac-http-ppnt', '6969', @@ -140,14 +149,18 @@ services: OTEL_EXPORTER_OTLP_PROTOCOL: http/protobuf OTEL_EXPORTER_OTLP_TRACES_PROTOCOL: http/protobuf OTEL_EXPORTER_OTLP_ENDPOINT: http://jaeger:4318 + JAVA_TOOL_OPTIONS: >- + -Dlogging.config="/opt/app/policy/clamp/etc/logback.xml" + -Dotel.java.global-autoconfigure.enabled=true + SPRING_PROFILES_ACTIVE: ${PPNT_PROFILE:-default} + SPRING_CONFIG_LOCATION: /opt/app/policy/clamp/etc/HttpParticipantParameters.yaml volumes: - ./config/clamp/HttpParticipantParameters.yaml:/opt/app/policy/clamp/etc/HttpParticipantParameters.yaml - - ./config/clamp/http-participant.sh:/opt/app/policy/clamp/bin/http-participant.sh:rw - ./config/clamp/logback-ppnt.xml:/opt/app/policy/clamp/etc/logback.xml:ro - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro entrypoint: /opt/app/policy/bin/wait_for_port.sh command: [ - '-c', './http-participant.sh', + '-c', 'java -jar /app/app.jar', 'kafka', '9092' ] policy-clamp-ac-k8s-ppnt-replica: @@ -161,6 +174,11 @@ services: OTEL_EXPORTER_OTLP_PROTOCOL: http/protobuf OTEL_EXPORTER_OTLP_TRACES_PROTOCOL: http/protobuf OTEL_EXPORTER_OTLP_ENDPOINT: http://jaeger:4318 + JAVA_TOOL_OPTIONS: >- + -Dlogging.config="/opt/app/policy/clamp/etc/logback.xml" + -Dotel.java.global-autoconfigure.enabled=true + SPRING_PROFILES_ACTIVE: ${PPNT_PROFILE:-default} + SPRING_CONFIG_LOCATION: /opt/app/policy/clamp/etc/KubernetesParticipantParameters.yaml expose: - 6969 deploy: @@ -168,12 +186,11 @@ services: replicas: ${REPLICAS:-2} volumes: - ./config/clamp/KubernetesParticipantParameters.yaml:/opt/app/policy/clamp/etc/KubernetesParticipantParameters.yaml - - ./config/clamp/kubernetes-participant.sh:/opt/app/policy/clamp/bin/kubernetes-participant.sh:rw - ./config/clamp/logback-ppnt.xml:/opt/app/policy/clamp/etc/logback.xml:ro - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro entrypoint: /opt/app/policy/bin/wait_for_port.sh command: [ - '-c', './kubernetes-participant.sh', + '-c', 'java -jar /app/app.jar', 'kafka', '9092' ] policy-clamp-ac-pf-ppnt-replica: @@ -192,14 +209,18 @@ services: OTEL_EXPORTER_OTLP_PROTOCOL: http/protobuf OTEL_EXPORTER_OTLP_TRACES_PROTOCOL: http/protobuf OTEL_EXPORTER_OTLP_ENDPOINT: http://jaeger:4318 + JAVA_TOOL_OPTIONS: >- + -Dlogging.config="/opt/app/policy/clamp/etc/logback.xml" + -Dotel.java.global-autoconfigure.enabled=true + SPRING_PROFILES_ACTIVE: ${PPNT_PROFILE:-default} + SPRING_CONFIG_LOCATION: /opt/app/policy/clamp/etc/PolicyParticipantParameters.yaml volumes: - ./config/clamp/PolicyParticipantParameters.yaml:/opt/app/policy/clamp/etc/PolicyParticipantParameters.yaml:ro - - ./config/clamp/policy-participant.sh:/opt/app/policy/clamp/bin/policy-participant.sh:rw - ./config/clamp/logback-ppnt.xml:/opt/app/policy/clamp/etc/logback.xml:ro - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro entrypoint: /opt/app/policy/bin/wait_for_port.sh command: [ - '-c', './policy-participant.sh', + '-c', 'java -jar /app/app.jar', 'kafka', '9092' ] nginx: diff --git a/compose/compose.common.yml b/compose/compose.common.yml index 84add712..484f86ad 100644 --- a/compose/compose.common.yml +++ b/compose/compose.common.yml @@ -54,16 +54,19 @@ services: OTEL_EXPORTER_OTLP_TRACES_PROTOCOL: http/protobuf OTEL_EXPORTER_OTLP_ENDPOINT: http://jaeger:4318 SPRING_PROFILES_ACTIVE: ${PPNT_PROFILE:-default} + JAVA_TOOL_OPTIONS: >- + -Dlogging.config="/opt/app/policy/clamp/etc/logback.xml" + -Dotel.java.global-autoconfigure.enabled=true + spring.config.location: /opt/app/policy/clamp/etc/SimulatorParticipantParameters.yaml ports: - ${SIM_PARTICIPANT_PORT}:6969 volumes: - ./config/clamp/SimulatorParticipantParameters.yaml:/opt/app/policy/clamp/etc/SimulatorParticipantParameters.yaml:ro - - ./config/clamp/sim-participant.sh:/opt/app/policy/clamp/bin/sim-participant.sh:rw - ./config/clamp/logback-ppnt.xml:/opt/app/policy/clamp/etc/logback.xml:ro - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro entrypoint: /opt/app/policy/bin/wait_for_port.sh command: [ - '-c', './sim-participant.sh', + '-c', 'java -jar /app/app.jar', 'kafka', '9092' ] diff --git a/compose/compose.yaml b/compose/compose.yaml index 6612da93..4d51e273 100644 --- a/compose/compose.yaml +++ b/compose/compose.yaml @@ -35,14 +35,17 @@ services: ports: - ${API_PORT}:6969 environment: + JAVA_TOOL_OPTIONS: >- + -Dlogging.config="/opt/app/policy/api/etc/logback.xml" SPRING_PROFILES_ACTIVE: ${API_PROFILE:-default} + SPRING_CONFIG_LOCATION: /opt/app/policy/api/etc/apiParameters.yaml volumes: - ./config/api/apiParameters.yaml:/opt/app/policy/api/etc/apiParameters.yaml:ro - ./config/api/logback.xml:/opt/app/policy/api/etc/logback.xml:ro - ./wait_for_port.sh:/opt/app/policy/api/bin/wait_for_port.sh:ro entrypoint: ./wait_for_port.sh command: [ - '-c', './policy-api.sh', + '-c', 'java -jar /app/api.jar', 'policy-db-migrator', '6824' ] @@ -56,7 +59,10 @@ services: ports: - ${PAP_PORT}:6969 environment: + JAVA_TOOL_OPTIONS: >- + -Dlogging.config="/opt/app/policy/pap/etc/logback.xml" SPRING_PROFILES_ACTIVE: ${PAP_PROFILE:-default} + SPRING_CONFIG_LOCATION: /opt/app/policy/pap/etc/papParameters.yaml volumes: - ./config/pap/papParameters.yaml:/opt/app/policy/pap/etc/papParameters.yaml:ro - ./config/${PROJECT:-api}/groups.json:/opt/app/policy/pap/etc/mounted/groups.json:ro @@ -64,7 +70,7 @@ services: - ./wait_for_port.sh:/opt/app/policy/pap/bin/wait_for_port.sh:ro entrypoint: ./wait_for_port.sh command: [ - '-c', './policy-pap.sh', + '-c', 'java -jar /app/pap.jar --group-config-file=/opt/app/policy/pap/etc/mounted/groups.json', 'api', '6969', 'kafka', '9092' ] @@ -223,19 +229,28 @@ services: OTEL_EXPORTER_OTLP_PROTOCOL: http/protobuf OTEL_EXPORTER_OTLP_TRACES_PROTOCOL: http/protobuf OTEL_EXPORTER_OTLP_ENDPOINT: http://jaeger:4318 + JAVA_TOOL_OPTIONS: >- + -Dlogging.config="/opt/app/policy/clamp/etc/logback.xml" + -Dcom.sun.management.jmxremote.rmi.port=9090 + -Dcom.sun.management.jmxremote=true + -Dcom.sun.management.jmxremote.port=9090 + -Dcom.sun.management.jmxremote.ssl=false + -Dcom.sun.management.jmxremote.authenticate=false + -Dcom.sun.management.jmxremote.local.only=false + -Dotel.java.global-autoconfigure.enabled=true SPRING_PROFILES_ACTIVE: ${CLAMP_PROFILE:-default} + SPRING_CONFIG_LOCATION: /opt/app/policy/clamp/etc/application.yaml # Tracing can be configured for grpc or http - default is http #OTEL_EXPORTER_OTLP_PROTOCOL: grpc #OTEL_EXPORTER_OTLP_TRACES_PROTOCOL: grpc #OTEL_EXPORTER_OTLP_ENDPOINT: http://jaeger:4317 volumes: - - ./config/clamp/AcRuntimeParameters.yaml:/opt/app/policy/clamp/etc/AcRuntimeParameters.yaml + - ./config/clamp/AcRuntimeParameters.yaml:/opt/app/policy/clamp/etc/application.yaml - ./config/clamp/logback.xml:/opt/app/policy/clamp/etc/logback.xml:ro - - ./config/clamp/acm-runtime.sh:/opt/app/policy/clamp/bin/acm-runtime.sh:rw - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro entrypoint: /opt/app/policy/bin/wait_for_port.sh command: [ - '-c', './acm-runtime.sh', + '-c', 'java -jar /app/app.jar', 'apex-pdp', '6969', 'kafka', '9092', 'policy-clamp-ac-http-ppnt', '6969', @@ -257,15 +272,18 @@ services: OTEL_EXPORTER_OTLP_PROTOCOL: http/protobuf OTEL_EXPORTER_OTLP_TRACES_PROTOCOL: http/protobuf OTEL_EXPORTER_OTLP_ENDPOINT: http://jaeger:4318 + JAVA_TOOL_OPTIONS: >- + -Dlogging.config="/opt/app/policy/clamp/etc/logback.xml" + -Dotel.java.global-autoconfigure.enabled=true SPRING_PROFILES_ACTIVE: ${PPNT_PROFILE:-default} + SPRING_CONFIG_LOCATION: /opt/app/policy/clamp/etc/HttpParticipantParameters.yaml volumes: - ./config/clamp/HttpParticipantParameters.yaml:/opt/app/policy/clamp/etc/HttpParticipantParameters.yaml - - ./config/clamp/http-participant.sh:/opt/app/policy/clamp/bin/http-participant.sh:rw - ./config/clamp/logback-ppnt.xml:/opt/app/policy/clamp/etc/logback.xml:ro - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro entrypoint: /opt/app/policy/bin/wait_for_port.sh command: [ - '-c', './http-participant.sh', + '-c', 'java -jar /app/app.jar', 'kafka', '9092' ] @@ -281,17 +299,20 @@ services: OTEL_EXPORTER_OTLP_PROTOCOL: http/protobuf OTEL_EXPORTER_OTLP_TRACES_PROTOCOL: http/protobuf OTEL_EXPORTER_OTLP_ENDPOINT: http://jaeger:4318 + JAVA_TOOL_OPTIONS: >- + -Dlogging.config="/opt/app/policy/clamp/etc/logback.xml" + -Dotel.java.global-autoconfigure.enabled=true SPRING_PROFILES_ACTIVE: ${PPNT_PROFILE:-default} + SPRING_CONFIG_LOCATION: /opt/app/policy/clamp/etc/KubernetesParticipantParameters.yaml ports: - "30295:6969" volumes: - ./config/clamp/KubernetesParticipantParameters.yaml:/opt/app/policy/clamp/etc/KubernetesParticipantParameters.yaml - - ./config/clamp/kubernetes-participant.sh:/opt/app/policy/clamp/bin/kubernetes-participant.sh:rw - ./config/clamp/logback-ppnt.xml:/opt/app/policy/clamp/etc/logback.xml:ro - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro entrypoint: /opt/app/policy/bin/wait_for_port.sh command: [ - '-c', './kubernetes-participant.sh', + '-c', 'java -jar /app/app.jar', 'kafka', '9092' ] @@ -310,15 +331,18 @@ services: OTEL_EXPORTER_OTLP_PROTOCOL: http/protobuf OTEL_EXPORTER_OTLP_TRACES_PROTOCOL: http/protobuf OTEL_EXPORTER_OTLP_ENDPOINT: http://jaeger:4318 + JAVA_TOOL_OPTIONS: >- + -Dlogging.config="/opt/app/policy/clamp/etc/logback.xml" + -Dotel.java.global-autoconfigure.enabled=true SPRING_PROFILES_ACTIVE: ${PPNT_PROFILE:-default} + SPRING_CONFIG_LOCATION: /opt/app/policy/clamp/etc/PolicyParticipantParameters.yaml volumes: - ./config/clamp/PolicyParticipantParameters.yaml:/opt/app/policy/clamp/etc/PolicyParticipantParameters.yaml:ro - - ./config/clamp/policy-participant.sh:/opt/app/policy/clamp/bin/policy-participant.sh:rw - ./config/clamp/logback-ppnt.xml:/opt/app/policy/clamp/etc/logback.xml:ro - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro entrypoint: /opt/app/policy/bin/wait_for_port.sh command: [ - '-c', './policy-participant.sh', + '-c', 'java -jar /app/app.jar', 'kafka', '9092', 'api', '6969' ] @@ -335,16 +359,19 @@ services: OTEL_EXPORTER_OTLP_PROTOCOL: http/protobuf OTEL_EXPORTER_OTLP_TRACES_PROTOCOL: http/protobuf OTEL_EXPORTER_OTLP_ENDPOINT: http://jaeger:4318 + JAVA_TOOL_OPTIONS: >- + -Dlogging.config="/opt/app/policy/clamp/etc/logback.xml" + -Dotel.java.global-autoconfigure.enabled=true + SPRING_CONFIG_LOCATION: /opt/app/policy/clamp/etc/A1pmsParticipantParameters.yaml ports: - "30296:6969" volumes: - ./config/clamp/A1pmsParticipantParameters.yaml:/opt/app/policy/clamp/etc/A1pmsParticipantParameters.yaml:ro - - ./config/clamp/a1pms-participant.sh:/opt/app/policy/clamp/bin/a1pms-participant.sh:rw - ./config/clamp/logback-ppnt.xml:/opt/app/policy/clamp/etc/logback.xml:ro - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro entrypoint: /opt/app/policy/bin/wait_for_port.sh command: [ - '-c', './a1pms-participant.sh', + '-c', 'java -jar /app/app.jar', 'kafka', '9092' ] @@ -360,15 +387,18 @@ services: OTEL_EXPORTER_OTLP_PROTOCOL: http/protobuf OTEL_EXPORTER_OTLP_TRACES_PROTOCOL: http/protobuf OTEL_EXPORTER_OTLP_ENDPOINT: http://jaeger:4318 + JAVA_TOOL_OPTIONS: >- + -Dlogging.config="/opt/app/policy/clamp/etc/logback.xml" + -Dotel.java.global-autoconfigure.enabled=true + SPRING_CONFIG_LOCATION: /opt/app/policy/clamp/etc/KserveParticipantParameters.yaml ports: - "30297:6969" volumes: - ./config/clamp/KserveParticipantParameters.yaml:/opt/app/policy/clamp/etc/KserveParticipantParameters.yaml:ro - - ./config/clamp/kserve-participant.sh:/opt/app/policy/clamp/bin/kserve-participant.sh:rw - ./config/clamp/logback-ppnt.xml:/opt/app/policy/clamp/etc/logback.xml:ro - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro entrypoint: /opt/app/policy/bin/wait_for_port.sh command: [ - '-c', './kserve-participant.sh', + '-c', 'java -jar /app/app.jar', 'kafka', '9092' ] diff --git a/compose/config/api/apiParameters.yaml b/compose/config/api/apiParameters.yaml index 4b0b20f7..19aa7f7c 100644 --- a/compose/config/api/apiParameters.yaml +++ b/compose/config/api/apiParameters.yaml @@ -24,7 +24,6 @@ spring: policy-api: name: ApiGroup - aaf: false database: name: PolicyProviderParameterGroup diff --git a/compose/config/clamp/ClampBackend.properties b/compose/config/clamp/ClampBackend.properties deleted file mode 100644 index b9776d04..00000000 --- a/compose/config/clamp/ClampBackend.properties +++ /dev/null @@ -1,197 +0,0 @@ -### -# ============LICENSE_START======================================================= -# ONAP POLICY-DOCKER -# ================================================================================ -# Copyright (C) 2022 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============================================ -# =================================================================== -# -### - -### Set the port for HTTP or HTTPS protocol (Controlled by Spring framework, only one at a time). -### (See below for the parameter 'server.http.port' if you want to have both enabled) -### To have only HTTP, keep the lines server.ssl.* commented -### To have only HTTPS enabled, uncomment the server.ssl.* lines and specify a right keystore location -### server.port=8080 -### Settings for HTTPS (this automatically enables the HTTPS on the port 'server.port') -#server.ssl.key-store=file:/tmp/mykey.jks -#server.ssl.key-store-password=pass -#server.ssl.key-password=pass - -### In order to be user friendly when HTTPS is enabled, -### you can add another HTTP port that will be automatically redirected to HTTPS -### by enabling this parameter (server.http.port) and set it to another port (80 or 8080, 8090, etc ...) -#server.http-to-https-redirection.port=8090 - -### HTTP Example: -###-------------- -### server.port=8080 - -### HTTPS Example: -### -------------- -### server.port=8443 -#server.ssl.key-store=file:/opt/policy/clamp/policy-keystore -#server.ssl.key-store-password=enc:qWxBtY7w9h5Hl72vQKgI5G1qqyRIuBarQqMkVDHqZmd -#server.ssl.key-password=enc:qWxBtY7w9h5Hl72vQKgI5G1qqyRIuBarQqMkVDHqZmd -#server.ssl.key-store-type=jks -server.port=8445 -## Config part for Server certificates -# Can be a classpath parameter instead of file:/ -#server.ssl.key-store=classpath:/clds/aaf/org.onap.clamp.p12 -#server.ssl.key-store-password=enc:YZs7M6IftyPjHniTa6J7G2416hssb8qI-Av8D1b8pPS -#server.ssl.key-password=enc:YZs7M6IftyPjHniTa6J7G2416hssb8qI-Av8D1b8pPS - -## Config part for Client certificates -#server.ssl.client-auth=want -#server.ssl.trust-store=classpath:/clds/aaf/truststoreONAPall.jks -#server.ssl.trust-store-password=enc:iDnPBBLq_EMidXlMa1FEuBR8TZzYxrCg66vq_XfLHdJ -#server.ssl.trust-store=file:/opt/policy/clamp/policy-truststore -#server.ssl.trust-store-password=enc:qWxBtY7w9h5Hl72vQKgI5G1qqyRIuBarQqMkVDHqZmd - -# The key file used to decode the key store and trust store password -# If not defined, the key store and trust store password will not be decrypted -#clamp.config.keyFile=classpath:/clds/aaf/org.onap.clamp.keyfile -#clamp.config.keyFile=file:/opt/policy/clamp/clamp-be-keyfile - -server.http-to-https-redirection.port=8080 - -server.servlet.context-path=/ -#Modified engine-rest applicationpath -spring.profiles.active=clamp-default,clamp-default-user,clamp-policy-controller,default-dictionary-elements -spring.http.converters.preferred-json-mapper=gson - -#The max number of active threads in this pool -server.tomcat.max-threads=200 -#The minimum number of threads always kept alive -server.tomcat.min-Spare-Threads=25 -#The number of milliseconds before an idle thread shutsdown, unless the number of active threads are less or equal to minSpareThreads -server.tomcat.max-idle-time=60000 - -#Servlet context parameters -server.context_parameters.p-name=value #context parameter with p-name as key and value as value. - -camel.springboot.consumer-template-cache-size=1000 -camel.springboot.producer-template-cache-size=1000 -camel.springboot.jmx-enabled=true -camel.defaultthreadpool.poolsize=10 -camel.defaultthreadpool.maxpoolsize=20 -camel.defaultthreadpool.maxqueuesize=1000 -camel.defaultthreadpool.keepaliveTime=60 -camel.defaultthreadpool.rejectpolicy=CallerRuns -camel.springboot.xml-routes=classpath:/clds/camel/routes/*.xml -camel.springboot.xml-rests=classpath:/clds/camel/rest/*.xml -camel.springboot.backlog-tracing=true -camel.springboot.tracing=true - -#clds datasource connection details -spring.datasource.driverClassName=org.mariadb.jdbc.Driver -spring.datasource.url=jdbc:mariadb:sequential://${MARIADB_HOST}:3306/policyclamp?autoReconnect=true&connectTimeout=10000&socketTimeout=10000&retriesAllDown=3 -spring.datasource.username=policy_user -spring.datasource.password=policy_user -spring.datasource.validationQuery=SELECT 1 -spring.datasource.validationQueryTimeout=20000 -spring.datasource.validationInterval=30000 -spring.datasource.testWhileIdle = true -spring.datasource.minIdle = 0 -spring.datasource.initialSize=0 -# Automatically test whether a connection provided is good or not -spring.datasource.testOnBorrow=true -spring.datasource.ignoreExceptionOnPreLoad=true -# control the sql db initialization (from schema.sql and data.sql) -spring.datasource..initialize=false - -spring.jpa.properties.javax.persistence.schema-generation.database.action=none -s#pring.jpa.properties.javax.persistence.schema-generation.create-source=metadata -#spring.jpa.properties.javax.persistence.schema-generation.scripts.action=create -#spring.jpa.properties.javax.persistence.schema-generation.scripts.create-target=create.sql -# disable Hibernate DDL generation because the schema will be generated from a sql script -spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect -spring.jpa.properties.hibernate.ddl-auto=validate -spring.jpa.properties.hibernate.hbm2ddl.delimiter=; -spring.jpa.properties.hibernate.format_sql=true -spring.jpa.properties.hibernate.use-new-id-generator-mappings=true - -# Whether to enable logging of SQL statements. -#spring.jpa.show-sql=true - -#Async Executor default Parameters -async.core.pool.size=10 -async.max.pool.size=20 -async.queue.capacity=500 - -#For logback file -clamp.config.logback.path=/opt/policy/clamp/config -clamp.config.logback.filename=logback.xml -#The log folder that will be used in logback.xml file -clamp.config.log.path=/var/log/onap/policy/clamp -clamp.config.files.systemProperties=classpath:/system.properties -clamp.config.files.cldsUsers=classpath:/clds/clds-users.json -clamp.config.files.globalProperties=classpath:/clds/templates/globalProperties.json -clamp.config.files.sdcController=classpath:/clds/sdc-controllers-config.json - -clamp.config.httpclient.socketTimeout=60000 -clamp.config.httpclient.connectTimeout=10000 - -# -# Configuration Settings for Policy Engine Components -clamp.config.policy.api.url=http://${POLICY_API_HOST}:6969 -clamp.config.policy.api.userName=policyadmin -clamp.config.policy.api.password=zb!XztG34 -clamp.config.policy.pap.url=http://${POLICY_PAP_HOST}:6969 -clamp.config.policy.pap.userName=policyadmin -clamp.config.policy.pap.password=zb!XztG34 - -# -# Sdc service properties -clamp.config.sdc.csarFolder = /tmp/sdc-controllers - -#DCAE Inventory Url Properties -clamp.config.dcae.inventory.url=http://localhost:8085 -clamp.config.dcae.intentory.retry.interval=10000 -clamp.config.dcae.intentory.retry.limit=5 - -#DCAE Deployment Url Properties -clamp.config.dcae.deployment.url=http://localhost:8085 -clamp.config.dcae.deployment.userName=test -clamp.config.dcae.deployment.password=test - -#Define user permission related parameters, the permission type can be changed but MUST be redefined in clds-users.properties in that case ! -clamp.config.security.permission.type.cl=org.onap.clamp.clds.cl -clamp.config.security.permission.type.cl.manage=org.onap.clamp.clds.cl.manage -clamp.config.security.permission.type.cl.event=org.onap.clamp.clds.cl.event -clamp.config.security.permission.type.filter.vf=org.onap.clamp.clds.filter.vf -clamp.config.security.permission.type.template=org.onap.clamp.clds.template -clamp.config.security.permission.type.tosca=org.onap.clamp.clds.tosca -clamp.config.security.permission.type.policies=org.onap.clamp.clds.policies -#This one indicates the type of instances (dev|prod|perf...), this must be set accordingly in clds-users.properties -clamp.config.security.permission.instance=dev -clamp.config.security.authentication.class=org.onap.aaf.cadi.principal.X509Principal, org.onap.aaf.cadi.principal.CachedBasicPrincipal - -## Tosca converter -clamp.config.tosca.converter.json.schema.templates=classpath:/clds/tosca-converter/templates.json -clamp.config.tosca.converter.default.datatypes=classpath:/clds/tosca-converter/default-tosca-types.yaml -clamp.config.tosca.converter.dictionary.support.enabled=true - -# Configuration settings for CDS -clamp.config.cds.url=http://cds-blueprints-processor-http:8080 -clamp.config.cds.userName=ccsdkapps -clamp.config.cds.password=ccsdkapps - -# Configuration settings for ControlLoop Runtime Rest API -clamp.config.acm.runtime.url=http://${RUNTIME_HOST}:6969 -clamp.config.acm.runtime.userName=runtimeUser -clamp.config.acm.runtime.password=zb!XztG34 diff --git a/compose/config/clamp/a1pms-participant.sh b/compose/config/clamp/a1pms-participant.sh deleted file mode 100644 index 88ff3b88..00000000 --- a/compose/config/clamp/a1pms-participant.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/usr/bin/env sh -# -# ============LICENSE_START======================================================= -# Copyright (C) 2024 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========================================================= -# - -KEYSTORE="${KEYSTORE:-$POLICY_HOME/etc/ssl/policy-keystore}" -TRUSTSTORE="${TRUSTSTORE:-$POLICY_HOME/etc/ssl/policy-truststore}" -KEYSTORE_PASSWD="${KEYSTORE_PASSWD:-Pol1cy_0nap}" -TRUSTSTORE_PASSWD="${TRUSTSTORE_PASSWD:-Pol1cy_0nap}" - -if [ "$#" -eq 1 ]; then - CONFIG_FILE=$1 -fi - -if [ -z "$CONFIG_FILE" ]; then - CONFIG_FILE="${POLICY_HOME}/etc/A1pmsParticipantParameters.yaml" -fi - -echo "Policy clamp A1 Pms participant config file: $CONFIG_FILE" - -if [ -f "${POLICY_HOME}/etc/mounted/policy-truststore" ]; then - echo "overriding policy-truststore" - cp -f "${POLICY_HOME}"/etc/mounted/policy-truststore "${TRUSTSTORE}" -fi - -if [ -f "${POLICY_HOME}/etc/mounted/policy-keystore" ]; then - echo "overriding policy-keystore" - cp -f "${POLICY_HOME}"/etc/mounted/policy-keystore "${KEYSTORE}" -fi - -if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then - echo "overriding logback xml file" - cp -f "${POLICY_HOME}"/etc/mounted/logback.xml "${POLICY_HOME}"/etc/ -fi - -$JAVA_HOME/bin/java \ - -Dlogging.config="${POLICY_HOME}/etc/logback.xml" \ - -Dserver.ssl.keyStore="${KEYSTORE}" \ - -Dserver.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \ - -Djavax.net.ssl.trustStore="${TRUSTSTORE}" \ - -Djavax.net.ssl.trustStorePassword="${TRUSTSTORE_PASSWD}" \ - -Dotel.java.global-autoconfigure.enabled=true \ - -jar /app/app.jar \ - --spring.config.location="${CONFIG_FILE}" diff --git a/compose/config/clamp/acm-runtime.sh b/compose/config/clamp/acm-runtime.sh deleted file mode 100755 index 695c08fc..00000000 --- a/compose/config/clamp/acm-runtime.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/usr/bin/env sh -# -# ============LICENSE_START======================================================= -# Copyright (C) 2024 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========================================================= -# - -KEYSTORE="${KEYSTORE:-$POLICY_HOME/etc/ssl/policy-keystore}" -TRUSTSTORE="${TRUSTSTORE:-$POLICY_HOME/etc/ssl/policy-truststore}" -KEYSTORE_PASSWD="${KEYSTORE_PASSWD:-Pol1cy_0nap}" -TRUSTSTORE_PASSWD="${TRUSTSTORE_PASSWD:-Pol1cy_0nap}" - -if [ "$#" -eq 1 ]; then - CONFIG_FILE=$1 -fi - -if [ -z "$CONFIG_FILE" ]; then - CONFIG_FILE="${POLICY_HOME}/etc/AcRuntimeParameters.yaml" -fi - -echo "Policy clamp runtime acm config file: $CONFIG_FILE" - -if [ -f "${POLICY_HOME}/etc/mounted/policy-truststore" ]; then - echo "overriding policy-truststore" - cp -f "${POLICY_HOME}"/etc/mounted/policy-truststore "${TRUSTSTORE}" -fi - -if [ -f "${POLICY_HOME}/etc/mounted/policy-keystore" ]; then - echo "overriding policy-keystore" - cp -f "${POLICY_HOME}"/etc/mounted/policy-keystore "${KEYSTORE}" -fi - -if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then - echo "overriding logback xml file" - cp -f "${POLICY_HOME}"/etc/mounted/logback.xml "${POLICY_HOME}"/etc/ -fi - -$JAVA_HOME/bin/java \ - -Dlogging.config="${POLICY_HOME}/etc/logback.xml" \ - -Dserver.ssl.keyStore="${KEYSTORE}" \ - -Dserver.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \ - -Djavax.net.ssl.trustStore="${TRUSTSTORE}" \ - -Djavax.net.ssl.trustStorePassword="${TRUSTSTORE_PASSWD}" \ - -Dcom.sun.management.jmxremote.rmi.port=9090 \ - -Dcom.sun.management.jmxremote=true \ - -Dcom.sun.management.jmxremote.port=9090 \ - -Dcom.sun.management.jmxremote.ssl=false \ - -Dcom.sun.management.jmxremote.authenticate=false \ - -Dcom.sun.management.jmxremote.local.only=false \ - -Dotel.java.global-autoconfigure.enabled=true \ - -jar /app/app.jar \ - --spring.config.location="${CONFIG_FILE}" diff --git a/compose/config/clamp/http-participant.sh b/compose/config/clamp/http-participant.sh deleted file mode 100755 index e35fb868..00000000 --- a/compose/config/clamp/http-participant.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/usr/bin/env sh -# -# ============LICENSE_START======================================================= -# Copyright (C) 2024 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========================================================= -# - -KEYSTORE="${KEYSTORE:-$POLICY_HOME/etc/ssl/policy-keystore}" -TRUSTSTORE="${TRUSTSTORE:-$POLICY_HOME/etc/ssl/policy-truststore}" -KEYSTORE_PASSWD="${KEYSTORE_PASSWD:-Pol1cy_0nap}" -TRUSTSTORE_PASSWD="${TRUSTSTORE_PASSWD:-Pol1cy_0nap}" - -if [ "$#" -eq 1 ]; then - CONFIG_FILE=$1 -fi - -if [ -z "$CONFIG_FILE" ]; then - CONFIG_FILE="${POLICY_HOME}/etc/HttpParticipantParameters.yaml" -fi - -echo "Policy clamp HTTP participant config file: $CONFIG_FILE" - -if [ -f "${POLICY_HOME}/etc/mounted/policy-truststore" ]; then - echo "overriding policy-truststore" - cp -f "${POLICY_HOME}"/etc/mounted/policy-truststore "${TRUSTSTORE}" -fi - -if [ -f "${POLICY_HOME}/etc/mounted/policy-keystore" ]; then - echo "overriding policy-keystore" - cp -f "${POLICY_HOME}"/etc/mounted/policy-keystore "${KEYSTORE}" -fi - -if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then - echo "overriding logback xml file" - cp -f "${POLICY_HOME}"/etc/mounted/logback.xml "${POLICY_HOME}"/etc/ -fi - -$JAVA_HOME/bin/java \ - -Dlogging.config="${POLICY_HOME}/etc/logback.xml" \ - -Dserver.ssl.keyStore="${KEYSTORE}" \ - -Dserver.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \ - -Djavax.net.ssl.trustStore="${TRUSTSTORE}" \ - -Djavax.net.ssl.trustStorePassword="${TRUSTSTORE_PASSWD}" \ - -Dotel.java.global-autoconfigure.enabled=true \ - -jar /app/app.jar \ - --spring.config.location="${CONFIG_FILE}" diff --git a/compose/config/clamp/kserve-participant.sh b/compose/config/clamp/kserve-participant.sh deleted file mode 100644 index 7da0b0f6..00000000 --- a/compose/config/clamp/kserve-participant.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/usr/bin/env sh -# -# ============LICENSE_START======================================================= -# Copyright (C) 2024 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========================================================= -# - -KEYSTORE="${KEYSTORE:-$POLICY_HOME/etc/ssl/policy-keystore}" -TRUSTSTORE="${TRUSTSTORE:-$POLICY_HOME/etc/ssl/policy-truststore}" -KEYSTORE_PASSWD="${KEYSTORE_PASSWD:-Pol1cy_0nap}" -TRUSTSTORE_PASSWD="${TRUSTSTORE_PASSWD:-Pol1cy_0nap}" - -if [ "$#" -eq 1 ]; then - CONFIG_FILE=$1 -fi - -if [ -z "$CONFIG_FILE" ]; then - CONFIG_FILE="${POLICY_HOME}/etc/KserveParticipantParameters.yaml" -fi - -echo "Policy clamp Kserve participant config file: $CONFIG_FILE" - -if [ -f "${POLICY_HOME}/etc/mounted/policy-truststore" ]; then - echo "overriding policy-truststore" - cp -f "${POLICY_HOME}"/etc/mounted/policy-truststore "${TRUSTSTORE}" -fi - -if [ -f "${POLICY_HOME}/etc/mounted/policy-keystore" ]; then - echo "overriding policy-keystore" - cp -f "${POLICY_HOME}"/etc/mounted/policy-keystore "${KEYSTORE}" -fi - -if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then - echo "overriding logback xml file" - cp -f "${POLICY_HOME}"/etc/mounted/logback.xml "${POLICY_HOME}"/etc/ -fi - -$JAVA_HOME/bin/java \ - -Dlogging.config="${POLICY_HOME}/etc/logback.xml" \ - -Dserver.ssl.keyStore="${KEYSTORE}" \ - -Dserver.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \ - -Djavax.net.ssl.trustStore="${TRUSTSTORE}" \ - -Djavax.net.ssl.trustStorePassword="${TRUSTSTORE_PASSWD}" \ - -Dotel.java.global-autoconfigure.enabled=true \ - -jar /app/app.jar \ - --spring.config.location="${CONFIG_FILE}" diff --git a/compose/config/clamp/kubernetes-participant.sh b/compose/config/clamp/kubernetes-participant.sh deleted file mode 100755 index ce08684d..00000000 --- a/compose/config/clamp/kubernetes-participant.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/usr/bin/env sh -# -# ============LICENSE_START======================================================= -# Copyright (C) 2024 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========================================================= -# - -KEYSTORE="${KEYSTORE:-$POLICY_HOME/etc/ssl/policy-keystore}" -TRUSTSTORE="${TRUSTSTORE:-$POLICY_HOME/etc/ssl/policy-truststore}" -KEYSTORE_PASSWD="${KEYSTORE_PASSWD:-Pol1cy_0nap}" -TRUSTSTORE_PASSWD="${TRUSTSTORE_PASSWD:-Pol1cy_0nap}" - -if [ "$#" -eq 1 ]; then - CONFIG_FILE=$1 -fi - -if [ -z "$CONFIG_FILE" ]; then - CONFIG_FILE="${POLICY_HOME}/etc/KubernetesParticipantParameters.yaml" -fi - -echo "Policy clamp Kubernetes participant config file: $CONFIG_FILE" - -if [ -f "${POLICY_HOME}/etc/mounted/policy-truststore" ]; then - echo "overriding policy-truststore" - cp -f "${POLICY_HOME}"/etc/mounted/policy-truststore "${TRUSTSTORE}" -fi - -if [ -f "${POLICY_HOME}/etc/mounted/policy-keystore" ]; then - echo "overriding policy-keystore" - cp -f "${POLICY_HOME}"/etc/mounted/policy-keystore "${KEYSTORE}" -fi - -if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then - echo "overriding logback xml file" - cp -f "${POLICY_HOME}"/etc/mounted/logback.xml "${POLICY_HOME}"/etc/ -fi - -$JAVA_HOME/bin/java \ - -Dlogging.config="${POLICY_HOME}/etc/logback.xml" \ - -Dserver.ssl.keyStore="${KEYSTORE}" \ - -Dserver.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \ - -Djavax.net.ssl.trustStore="${TRUSTSTORE}" \ - -Djavax.net.ssl.trustStorePassword="${TRUSTSTORE_PASSWD}" \ - -Dotel.java.global-autoconfigure.enabled=true \ - -jar /app/app.jar \ - --spring.config.location="${CONFIG_FILE}" diff --git a/compose/config/clamp/org.onap.clamp.keyfile b/compose/config/clamp/org.onap.clamp.keyfile deleted file mode 100644 index c2521fc8..00000000 --- a/compose/config/clamp/org.onap.clamp.keyfile +++ /dev/null @@ -1,27 +0,0 @@ -kzJMxgphAoBxJz1_vYjxx-V87fahDQdYUqBIyWhZp8ojXdNpmB-96T9CvgJScJynbLcqw2Cj2CYx -wd97vFOYhlyz5zK3tSyIuydOkVGJsJ1S4PviTtjhiJvNourJNDHgtas1Y1y2fQ5_8aVxj-s4W72N -MNYhkeTinaQx_d_5hkBPABJlgCxKLnmxHo2jAJktnZYa5t5h48m7KiUx_RVEkQVtEvux-7vgXaC4 -ymTXj6zI9XoMTVxM0OAl4y7kBiUoOUaxS4tVKV34RJYNNqBjiUTQa_ag-KeUacRABk1ozfwzpvE5 -Sjz8WCy0L-LtCQnapkhKLt04ndCZtw8LDJ-Zz0ZgR2PVIPpTgs9VnVuOi5jf4LzTrtUatvOWkKB9 -drXKzp6cNXnZ0jkD3vV1BzqzhynKnZR2o_ilZv5CTTdpGUt906N_DwZuX6LfcV_7yvjX42bTfeIR -ycPtodFPXlqqn9VUyh5nOauJlnOHAQmSDzjMEgjy17nQX3Ad7s4BfvujzUl-d0MqB_HCKbaW32UT -xcY-0JfI1Y-2IdYfIkUdhVmxop6sSg0jAobWzgCRoRQkP3a2iIlKdfMyskshoWKIDVtlr-3fkDEb -x_b_o1rRoUfzUzxEdphaUAq80Sc0i77ZLT3KF9vJOhyU_pBnApYFxVk7Hkk3VRxJKS7jyL4H7k1x -2m5-2G8fB9XbYZT82xmAquNx4oBdpwj3_ncGF9YRF94K6NZgqemT5iWhpXMoelSU1blASgT3qlTm -B6YgbD5owExNHwRVd8KeRsYrOnBWUiktsIhXFhNZmDUNWMFGQ2KxEcOt1tJwsQDehJFgY_l1JQ0d -643wJ7rTJkGkYX309cydRQUX4Z0ckSQS9LhMd9stxF5XOHlvHdbW0pXNS7SaLbzKCVldUgncvI6z -KWkwrWbftrZK2RT1UZKNngQDMGOk9OhbHAs7YzhFNFARZoRNobIv5tZVDomy-YgJb9-mD1UTkRBL -WXOyoryDlgKrgFsgHclGDI1UFO5N-JfebPKxbP505f4924hxF2r8bspvVW8ZtHQo_SJmhauOX8n_ -eN_LK43LB9k53WAHZ_utvs0s6wGf7I73oj_N7DIFaHTDSm_MhDsFDLVG_wUzCpZ5FP2uL3nnqMkF -Ob-l1fywfmfOmrz1BY6g4sRPPeWXuclYTnRnDRu5VQyc7_aBEVkyt3zw0JEex0vJNFUJl3pYjS55 -GplAB6p7VbS9ceZEtc5Z3qFIVHEzKWZxT190E23t_LlMuEoQ1zaqdHynNaMs61-q_A2aHRiTqlRm -7FahVB3RX4AVLl23mu4u3A9ZDXc40nzjs9mwOVsuKlPvQ2rteDUG1njr2R1_V_MyQuoJjdfbIkPG -4eF0QzlSMdbkeprdQxSfV5YT-yPpkBxSsCMMM43sKm4Hy7_CUdvp4Iayrp3vtK3oYMuCGi6qTadz -KzxfTf8meKan3eMZW4RLByyniH5nQnX_KGfBly05AmFyVH_j0fyOg-48kDhtEKeqmDnP4C01jOID -Ip_AKaB6e0GwsHzVTLZOklHwu_qzsaTzchBOG_dJJju7bxY7qv78Pa92wZIP311gSCVbc-gxxbsR -qI555twmYEoasFm4xz10OYDOkvM1E1Rtxu3ymRLZpe6AoyFBVzEW7Dncdw7O98dKcgrp8ZlQ_8Wg -5zZH0Cic7xnIZ0bNZyQXw56CSUiXVWuwVY3e0djXP3F-FO5gP8VTxbpW4C0t6McXAOlvSEfFKxN7 -u6OBeOKwjrtHaJk2ghF8MUcpDXanhbAgHez9larGlscCkgvoRLNaRH9GIdSVgY3HtNhJRaJIq01S -OGeBjC5J4o-nTrqRFkwyDAYcPL373eYX1dBFFVHR-4q50H9m_zMxZHXETafxzV4DT3Qi8Sxh3uaS -ZX7mRaNaOE0uC1n87_IZ9WhrwIQaZng2lnd9yZ-4rx8fB8WA8KQzifzvHAcMb_HV10JWGaz5A2Rm -EXDsfexQC6CqYg5rdzzlNWDPNlHy5ubyz7fRXZ99uIwBY9aJcvCXCiEXJkC6utj3NcXQrJmk \ No newline at end of file diff --git a/compose/config/clamp/policy-participant.sh b/compose/config/clamp/policy-participant.sh deleted file mode 100755 index f36c2b37..00000000 --- a/compose/config/clamp/policy-participant.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/usr/bin/env sh -# -# ============LICENSE_START======================================================= -# Copyright (C) 2024 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========================================================= -# - -KEYSTORE="${KEYSTORE:-$POLICY_HOME/etc/ssl/policy-keystore}" -TRUSTSTORE="${TRUSTSTORE:-$POLICY_HOME/etc/ssl/policy-truststore}" -KEYSTORE_PASSWD="${KEYSTORE_PASSWD:-Pol1cy_0nap}" -TRUSTSTORE_PASSWD="${TRUSTSTORE_PASSWD:-Pol1cy_0nap}" - -if [ "$#" -eq 1 ]; then - CONFIG_FILE=$1 -fi - -if [ -z "$CONFIG_FILE" ]; then - CONFIG_FILE="${POLICY_HOME}/etc/PolicyParticipantParameters.yaml" -fi - -echo "Policy clamp policy participant config file: $CONFIG_FILE" - -if [ -f "${POLICY_HOME}/etc/mounted/policy-truststore" ]; then - echo "overriding policy-truststore" - cp -f "${POLICY_HOME}"/etc/mounted/policy-truststore "${TRUSTSTORE}" -fi - -if [ -f "${POLICY_HOME}/etc/mounted/policy-keystore" ]; then - echo "overriding policy-keystore" - cp -f "${POLICY_HOME}"/etc/mounted/policy-keystore "${KEYSTORE}" -fi - -if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then - echo "overriding logback xml file" - cp -f "${POLICY_HOME}"/etc/mounted/logback.xml "${POLICY_HOME}"/etc/ -fi - -$JAVA_HOME/bin/java \ - -Dlogging.config="${POLICY_HOME}/etc/logback.xml" \ - -Dserver.ssl.keyStore="${KEYSTORE}" \ - -Dserver.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \ - -Djavax.net.ssl.trustStore="${TRUSTSTORE}" \ - -Djavax.net.ssl.trustStorePassword="${TRUSTSTORE_PASSWD}" \ - -Dotel.java.global-autoconfigure.enabled=true \ - -jar /app/app.jar \ - --spring.config.location="${CONFIG_FILE}" diff --git a/compose/config/clamp/sim-participant.sh b/compose/config/clamp/sim-participant.sh deleted file mode 100755 index 556f4ef8..00000000 --- a/compose/config/clamp/sim-participant.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/usr/bin/env sh -# -# ============LICENSE_START======================================================= -# Copyright (C) 2024 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========================================================= -# - -KEYSTORE="${KEYSTORE:-$POLICY_HOME/etc/ssl/policy-keystore}" -TRUSTSTORE="${TRUSTSTORE:-$POLICY_HOME/etc/ssl/policy-truststore}" -KEYSTORE_PASSWD="${KEYSTORE_PASSWD:-Pol1cy_0nap}" -TRUSTSTORE_PASSWD="${TRUSTSTORE_PASSWD:-Pol1cy_0nap}" - -if [ "$#" -eq 1 ]; then - CONFIG_FILE=$1 -fi - -if [ -z "$CONFIG_FILE" ]; then - CONFIG_FILE="${POLICY_HOME}/etc/SimulatorParticipantParameters.yaml" -fi - -echo "Policy clamp Simulator participant config file: $CONFIG_FILE" - -if [ -f "${POLICY_HOME}/etc/mounted/policy-truststore" ]; then - echo "overriding policy-truststore" - cp -f "${POLICY_HOME}"/etc/mounted/policy-truststore "${TRUSTSTORE}" -fi - -if [ -f "${POLICY_HOME}/etc/mounted/policy-keystore" ]; then - echo "overriding policy-keystore" - cp -f "${POLICY_HOME}"/etc/mounted/policy-keystore "${KEYSTORE}" -fi - -if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then - echo "overriding logback xml file" - cp -f "${POLICY_HOME}"/etc/mounted/logback.xml "${POLICY_HOME}"/etc/ -fi - -$JAVA_HOME/bin/java \ - -Dlogging.config="${POLICY_HOME}/etc/logback.xml" \ - -Dserver.ssl.keyStore="${KEYSTORE}" \ - -Dserver.ssl.keyStorePassword="${KEYSTORE_PASSWD}" \ - -Djavax.net.ssl.trustStore="${TRUSTSTORE}" \ - -Djavax.net.ssl.trustStorePassword="${TRUSTSTORE_PASSWD}" \ - -Dotel.java.global-autoconfigure.enabled=true \ - -jar /app/app.jar \ - --spring.config.location="${CONFIG_FILE}" diff --git a/compose/stop-compose.sh b/compose/stop-compose.sh index ede5ef6d..81c39816 100755 --- a/compose/stop-compose.sh +++ b/compose/stop-compose.sh @@ -68,7 +68,9 @@ for item in "${item_list[@]}" do if [ -n "$item" ]; then docker compose logs $item >> $item.log - cat $item.log + if [ "${DONT_PRINT_LOGS}" == "false" ]; then + cat $item.log + fi fi done diff --git a/csit/run-project-csit.sh b/csit/run-project-csit.sh index da01ea12..4f48c49b 100755 --- a/csit/run-project-csit.sh +++ b/csit/run-project-csit.sh @@ -318,6 +318,10 @@ do export TEARDOWN=true shift ;; + --no-logs) + export DONT_PRINT_LOGS=true + shift + ;; *) export PROJECT="${1}" shift -- 2.16.6