From 1ac39d72b2a02ac56d8bbf0b65ee7c51eb3996bb Mon Sep 17 00:00:00 2001 From: waynedunican Date: Tue, 27 Jun 2023 09:12:00 +0100 Subject: Add participant simulator to docker-compose.yml Issue-ID: POLICY-4738 Change-Id: I76a01fed165b7d39c00be7a56f9627818e14df33 Signed-off-by: waynedunican (cherry picked from commit b3d195d3d3a1db6cacb2a2e10e7d9331fa374b7f) --- .../clamp/SimulatorParticipantParameters.yaml | 48 ++++++++++++++++++++++ compose/docker-compose.yml | 19 +++++++++ compose/export-ports.sh | 1 + 3 files changed, 68 insertions(+) create mode 100644 compose/config/clamp/SimulatorParticipantParameters.yaml diff --git a/compose/config/clamp/SimulatorParticipantParameters.yaml b/compose/config/clamp/SimulatorParticipantParameters.yaml new file mode 100644 index 00000000..3959eb78 --- /dev/null +++ b/compose/config/clamp/SimulatorParticipantParameters.yaml @@ -0,0 +1,48 @@ +spring: + security: + user: + name: participantUser + password: zb!XztG34 + autoconfigure: + exclude: + - org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration + - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration + - org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration + - org.springframework.boot.autoconfigure.data.web.SpringDataWebAutoConfiguration + +security: + enable-csrf: false +participant: + intermediaryParameters: + reportingTimeIntervalMs: 120000 + description: Participant Description + participantId: ${participantId:101c62b3-8918-41b9-a747-d21eb79c6c90} + clampAutomationCompositionTopics: + topicSources: + - topic: POLICY-ACRUNTIME-PARTICIPANT + servers: + - ${topicServer:message-router} + topicCommInfrastructure: dmaap + fetchTimeout: 15000 + useHttps: ${useHttps:true} + topicSinks: + - topic: POLICY-ACRUNTIME-PARTICIPANT + servers: + - ${topicServer:message-router} + topicCommInfrastructure: dmaap + useHttps: ${useHttps:true} + participantSupportedElementTypes: + - + typeName: ${supportedElementTypeName:org.onap.policy.clamp.acm.SimAutomationCompositionElement} + typeVersion: ${supportedElementTypeVersion:1.0.0} + +management: + endpoints: + web: + base-path: / + exposure: + include: health, metrics, prometheus +server: + port: 8087 + servlet: + context-path: /onap/policy/clamp/acm/simparticipant diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml index dfb6b641..f2b04cc3 100644 --- a/compose/docker-compose.yml +++ b/compose/docker-compose.yml @@ -245,6 +245,7 @@ services: - policy-clamp-ac-http-ppnt - policy-clamp-ac-k8s-ppnt - policy-clamp-ac-pf-ppnt + - policy-clamp-ac-sim-ppnt - apex-pdp hostname: policy-clamp-runtime-acm ports: @@ -261,6 +262,7 @@ services: 'policy-clamp-ac-http-ppnt', '6969', 'policy-clamp-ac-k8s-ppnt', '6969', 'policy-clamp-ac-pf-ppnt', '6969', + 'policy-clamp-ac-sim-ppnt', '6969', 'apex-pdp', '6969' ] @@ -351,6 +353,23 @@ services: '-c', './kserve-participant.sh', 'message-router', '3904' ] + policy-clamp-ac-sim-ppnt: + image: ${CONTAINER_LOCATION}onap/policy-clamp-ac-sim-ppnt:${POLICY_CLAMP_VERSION} + container_name: policy-clamp-ac-sim-ppnt + depends_on: + - simulator + hostname: policy-clamp-ac-sim-ppnt + ports: + - ${SIM_PARTICIPANT_PORT}:6969 + volumes: + - ./config/clamp/SimulatorParticipantParameters.yaml:/opt/app/policy/clamp/etc/SimulatorParticipantParameters.yaml:ro + - ./config/clamp/logback.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', + 'message-router', '3904' + ] prometheus: image: ${CONTAINER_LOCATION}prom/prometheus:latest container_name: prometheus diff --git a/compose/export-ports.sh b/compose/export-ports.sh index d859b1a0..5d64e1f9 100755 --- a/compose/export-ports.sh +++ b/compose/export-ports.sh @@ -41,6 +41,7 @@ export DROOLS_TELEMETRY_PORT=30216 export DIST_PORT=30006 export ACM_PORT=30007 export POLICY_PARTICIPANT_PORT=30008 +export SIM_PARTICIPANT_PORT=30011 export DROOLS_APPS_PORT=30009 export DROOLS_APPS_TELEMETRY_PORT=30219 export DMAAP_PORT=30904 -- cgit 1.2.3-korg