diff options
25 files changed, 62 insertions, 13 deletions
@@ -51,6 +51,11 @@ committers: company: 'Bell Canada' id: 'a.sreekumar' timezone: 'Europe/Ireland' + - name: 'Ramesh Murugan Iyer' + email: 'ramesh.murugan.iyer@est.tech' + company: 'Ericsson' + id: 'rameshiyer27' + timezone: 'Europe/Ireland' tsc: approval: 'https://lists.onap.org/pipermail/onap-tsc' changes: @@ -75,3 +80,6 @@ tsc: name: 'Jim Hahn' # Retired link: https://lists.onap.org/g/onap-tsc/message/8056 + - type: 'Addition' + name: 'Ramesh Murugan Iyer' + link: https://lists.onap.org/g/onap-tsc/message/8689 diff --git a/csit/apex-pdp/plans/setup.sh b/csit/apex-pdp/plans/setup.sh index 1320b520..1320b520 100644..100755 --- a/csit/apex-pdp/plans/setup.sh +++ b/csit/apex-pdp/plans/setup.sh diff --git a/csit/apex-pdp/plans/teardown.sh b/csit/apex-pdp/plans/teardown.sh index e2e62ab3..e2e62ab3 100644..100755 --- a/csit/apex-pdp/plans/teardown.sh +++ b/csit/apex-pdp/plans/teardown.sh diff --git a/csit/api/plans/setup.sh b/csit/api/plans/setup.sh index 8a20d93d..8a20d93d 100644..100755 --- a/csit/api/plans/setup.sh +++ b/csit/api/plans/setup.sh diff --git a/csit/clamp/plans/setup.sh b/csit/clamp/plans/setup.sh index c7bbabe0..c7bbabe0 100644..100755 --- a/csit/clamp/plans/setup.sh +++ b/csit/clamp/plans/setup.sh diff --git a/csit/clamp/plans/teardown.sh b/csit/clamp/plans/teardown.sh index e0fc58ed..e0fc58ed 100644..100755 --- a/csit/clamp/plans/teardown.sh +++ b/csit/clamp/plans/teardown.sh diff --git a/csit/compose-grafana.yml b/csit/compose-grafana.yml index e487a705..3d925eb7 100644 --- a/csit/compose-grafana.yml +++ b/csit/compose-grafana.yml @@ -224,6 +224,23 @@ services: 'pap', '6969', 'apex-pdp', '6969' ] + policy-clamp-runtime-acm: + image: nexus3.onap.org:10001/onap/policy-clamp-runtime-acm:${POLICY_CLAMP_VERSION} + container_name: policy-clamp-runtime-acm + depends_on: + - mariadb + - simulator + hostname: policy-clamp-runtime-acm + expose: + - 6969 + volumes: + - ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro + - ./config/clamp/AcRuntimeParameters.yaml:/opt/app/policy/clamp/etc/AcRuntimeParameters.yaml:ro + entrypoint: /opt/app/policy/bin/wait_for_port.sh + command: [ + '-c', './acm-runtime.sh', + 'message-router', '3904' + ] prometheus: image: prom/prometheus:v2.32.1 container_name: prometheus diff --git a/csit/config/clamp/AcRuntimeParameters.yaml b/csit/config/clamp/AcRuntimeParameters.yaml index 40031828..d70627f1 100644 --- a/csit/config/clamp/AcRuntimeParameters.yaml +++ b/csit/config/clamp/AcRuntimeParameters.yaml @@ -32,8 +32,8 @@ security: server: port: 6969 - servlet: - context-path: /onap/policy/clamp/acm + ssl: + enabled: {{HTTPS_ENABLED}} error: path: /error @@ -52,17 +52,18 @@ runtime: - ${topicServer:message-router} topicCommInfrastructure: dmaap fetchTimeout: 15000 - useHttps: true + useHttps: {{HTTPS_ENABLED}} topicSinks: - topic: POLICY-ACRUNTIME-PARTICIPANT servers: - ${topicServer:message-router} topicCommInfrastructure: dmaap - useHttps: true + useHttps: {{HTTPS_ENABLED}} management: endpoints: web: + base-path: / exposure: include: health, metrics, prometheus diff --git a/csit/config/clamp/HttpParticipantParameters.yaml b/csit/config/clamp/HttpParticipantParameters.yaml index 529b095a..62b9dc46 100644 --- a/csit/config/clamp/HttpParticipantParameters.yaml +++ b/csit/config/clamp/HttpParticipantParameters.yaml @@ -22,13 +22,13 @@ participant: - ${topicServer:message-router} topicCommInfrastructure: dmaap fetchTimeout: 15000 - useHttps: true + useHttps: {{HTTPS_ENABLED}} topicSinks: - topic: POLICY-ACRUNTIME-PARTICIPANT servers: - ${topicServer:message-router} topicCommInfrastructure: dmaap - useHttps: true + useHttps: {{HTTPS_ENABLED}} management: endpoints: web: @@ -36,5 +36,7 @@ management: include: health, metrics, prometheus server: port: 8084 + ssl: + enabled: {{HTTPS_ENABLED}} servlet: context-path: /onap/policy/clamp/acm/httpparticipant diff --git a/csit/config/clamp/KubernetesParticipantParameters.yaml b/csit/config/clamp/KubernetesParticipantParameters.yaml index c6acf405..49c568cb 100644 --- a/csit/config/clamp/KubernetesParticipantParameters.yaml +++ b/csit/config/clamp/KubernetesParticipantParameters.yaml @@ -26,14 +26,14 @@ participant: - ${topicServer:message-router} topicCommInfrastructure: dmaap fetchTimeout: 15000 - useHttps: true + useHttps: {{HTTPS_ENABLED}} topicSinks: - topic: POLICY-ACRUNTIME-PARTICIPANT servers: - ${topicServer:message-router} topicCommInfrastructure: dmaap - useHttps: true + useHttps: {{HTTPS_ENABLED}} management: endpoints: @@ -42,6 +42,8 @@ management: include: health, metrics, prometheus server: port: 8083 + ssl: + enabled: {{HTTPS_ENABLED}} servlet: context-path: /onap/policy/clamp/acm/k8sparticipant diff --git a/csit/config/clamp/PolicyParticipantParameters.yaml b/csit/config/clamp/PolicyParticipantParameters.yaml index 1cb4e6dc..73d40d4b 100644 --- a/csit/config/clamp/PolicyParticipantParameters.yaml +++ b/csit/config/clamp/PolicyParticipantParameters.yaml @@ -13,7 +13,7 @@ participant: port: 6969 userName: policyadmin password: zb!XztG34 - useHttps: true + useHttps: {{HTTPS_ENABLED}} allowSelfSignedCerts: true policyPapParameters: clientName: pap @@ -21,7 +21,7 @@ participant: port: 6969 userName: policyadmin password: zb!XztG34 - useHttps: true + useHttps: {{HTTPS_ENABLED}} allowSelfSignedCerts: true intermediaryParameters: reportingTimeIntervalMs: 120000 @@ -40,14 +40,14 @@ participant: - ${topicServer:message-router} topicCommInfrastructure: dmaap fetchTimeout: 15000 - useHttps: true + useHttps: {{HTTPS_ENABLED}} topicSinks: - topic: POLICY-ACRUNTIME-PARTICIPANT servers: - ${topicServer:message-router} topicCommInfrastructure: dmaap - useHttps: true + useHttps: {{HTTPS_ENABLED}} management: endpoints: web: @@ -55,5 +55,7 @@ management: include: health, metrics, prometheus server: port: 8085 + ssl: + enabled: {{HTTPS_ENABLED}} servlet: context-path: /onap/policy/clamp/acm/policyparticipant diff --git a/csit/config/db-pg/db-pg.sh b/csit/config/db-pg/db-pg.sh index 14816f08..14816f08 100644..100755 --- a/csit/config/db-pg/db-pg.sh +++ b/csit/config/db-pg/db-pg.sh diff --git a/csit/db-migrator/plans/setup.sh b/csit/db-migrator/plans/setup.sh index 31d93111..31d93111 100644..100755 --- a/csit/db-migrator/plans/setup.sh +++ b/csit/db-migrator/plans/setup.sh diff --git a/csit/db-migrator/plans/teardown.sh b/csit/db-migrator/plans/teardown.sh index 30a0f48d..30a0f48d 100644..100755 --- a/csit/db-migrator/plans/teardown.sh +++ b/csit/db-migrator/plans/teardown.sh diff --git a/csit/distribution/plans/setup.sh b/csit/distribution/plans/setup.sh index b7495007..b7495007 100644..100755 --- a/csit/distribution/plans/setup.sh +++ b/csit/distribution/plans/setup.sh diff --git a/csit/distribution/plans/teardown.sh b/csit/distribution/plans/teardown.sh index e451ba66..e451ba66 100644..100755 --- a/csit/distribution/plans/teardown.sh +++ b/csit/distribution/plans/teardown.sh diff --git a/csit/get-branch.sh b/csit/get-branch.sh index 3ce51315..3ce51315 100644..100755 --- a/csit/get-branch.sh +++ b/csit/get-branch.sh diff --git a/csit/get-models-examples.sh b/csit/get-models-examples.sh index fe75c90d..fe75c90d 100644..100755 --- a/csit/get-models-examples.sh +++ b/csit/get-models-examples.sh diff --git a/csit/get-versions.sh b/csit/get-versions.sh index 6e50d088..87c43b50 100644..100755 --- a/csit/get-versions.sh +++ b/csit/get-versions.sh @@ -1,3 +1,5 @@ +#! /bin/bash + # ============LICENSE_START==================================================== # Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. # Modification Copyright 2021-2022 Nordix Foundation. @@ -18,7 +20,13 @@ # SPDX-License-Identifier: Apache-2.0 # ============LICENSE_END====================================================== -source "${SCRIPTS}"/get-branch.sh + +if [[ -z "$GERRIT_BRANCH" ]] +then + source "${SCRIPTS}"/get-branch.sh +else + echo GERRIT_BRANCH="${GERRIT_BRANCH}" +fi export POLICY_MARIADB_VER=10.5.8 echo POLICY_MARIADB_VER=${POLICY_MARIADB_VER} diff --git a/csit/include-raw-integration-install-robotframework.sh b/csit/include-raw-integration-install-robotframework.sh index 1fb107b6..1fb107b6 100644..100755 --- a/csit/include-raw-integration-install-robotframework.sh +++ b/csit/include-raw-integration-install-robotframework.sh diff --git a/csit/metrics/prometheus.yml b/csit/metrics/prometheus.yml index 1b292cd7..934f7543 100644 --- a/csit/metrics/prometheus.yml +++ b/csit/metrics/prometheus.yml @@ -84,3 +84,12 @@ scrape_configs: basic_auth: username: "healthcheck" password: "zb!XztG34" + + - job_name: "acm-metrics" + metrics_path: "/prometheus" + static_configs: + - targets: + - "policy-clamp-runtime-acm:6969" + basic_auth: + username: "runtimeUser" + password: "zb!XztG34" diff --git a/csit/pap/plans/setup.sh b/csit/pap/plans/setup.sh index 1d145fe9..1d145fe9 100644..100755 --- a/csit/pap/plans/setup.sh +++ b/csit/pap/plans/setup.sh diff --git a/csit/pap/plans/teardown.sh b/csit/pap/plans/teardown.sh index 10c5f789..10c5f789 100644..100755 --- a/csit/pap/plans/teardown.sh +++ b/csit/pap/plans/teardown.sh diff --git a/csit/xacml-pdp/plans/setup.sh b/csit/xacml-pdp/plans/setup.sh index c99a0318..c99a0318 100644..100755 --- a/csit/xacml-pdp/plans/setup.sh +++ b/csit/xacml-pdp/plans/setup.sh diff --git a/csit/xacml-pdp/plans/teardown.sh b/csit/xacml-pdp/plans/teardown.sh index 1b5fd207..1b5fd207 100644..100755 --- a/csit/xacml-pdp/plans/teardown.sh +++ b/csit/xacml-pdp/plans/teardown.sh |