diff options
20 files changed, 35 insertions, 7 deletions
diff --git a/compose/config/clamp/A1pmsParticipantParameters.yaml b/compose/config/clamp/A1pmsParticipantParameters.yaml index a3035eb6..1b81a678 100755 --- a/compose/config/clamp/A1pmsParticipantParameters.yaml +++ b/compose/config/clamp/A1pmsParticipantParameters.yaml @@ -36,6 +36,8 @@ participant: - ${topicServer:kafka:9092} topicCommInfrastructure: kafka fetchTimeout: 15000 + additionalProps: + group.id: policy-clamp-ac-a1pms-ppnt - topic: ${participant.intermediaryParameters.topics.syncTopic} servers: diff --git a/compose/config/clamp/AcRuntimeParameters.yaml b/compose/config/clamp/AcRuntimeParameters.yaml index 8a5fb3fd..abb5c485 100644 --- a/compose/config/clamp/AcRuntimeParameters.yaml +++ b/compose/config/clamp/AcRuntimeParameters.yaml @@ -54,6 +54,8 @@ runtime: topicCommInfrastructure: kafka fetchTimeout: 15000 useHttps: false + additionalProps: + group.id: policy-clamp-runtime-acm topicSinks: - topic: ${runtime.topics.operationTopic} diff --git a/compose/config/clamp/HttpParticipantParameters.yaml b/compose/config/clamp/HttpParticipantParameters.yaml index 59644e5c..6761f617 100644 --- a/compose/config/clamp/HttpParticipantParameters.yaml +++ b/compose/config/clamp/HttpParticipantParameters.yaml @@ -26,6 +26,8 @@ participant: topicCommInfrastructure: kafka fetchTimeout: 15000 useHttps: false + additionalProps: + group.id: policy-clamp-ac-http-ppnt - topic: ${participant.intermediaryParameters.topics.syncTopic} servers: - ${topicServer:kafka:9092} diff --git a/compose/config/clamp/KserveParticipantParameters.yaml b/compose/config/clamp/KserveParticipantParameters.yaml index 26266dc2..1865d0e8 100755 --- a/compose/config/clamp/KserveParticipantParameters.yaml +++ b/compose/config/clamp/KserveParticipantParameters.yaml @@ -32,6 +32,8 @@ participant: - ${topicServer:kafka:9092}
topicCommInfrastructure: kafka
fetchTimeout: 15000
+ additionalProps:
+ group.id: policy-clamp-ac-kserve-ppnt
- topic: ${participant.intermediaryParameters.topics.syncTopic}
servers:
diff --git a/compose/config/clamp/KubernetesParticipantParameters.yaml b/compose/config/clamp/KubernetesParticipantParameters.yaml index 1597220f..c85c7e54 100644 --- a/compose/config/clamp/KubernetesParticipantParameters.yaml +++ b/compose/config/clamp/KubernetesParticipantParameters.yaml @@ -30,6 +30,8 @@ participant: topicCommInfrastructure: kafka fetchTimeout: 15000 useHttps: false + additionalProps: + group.id: policy-clamp-ac-k8s-ppnt - topic: ${participant.intermediaryParameters.topics.syncTopic} servers: diff --git a/compose/config/clamp/PolicyParticipantParameters.yaml b/compose/config/clamp/PolicyParticipantParameters.yaml index 16b258f9..e5108742 100644 --- a/compose/config/clamp/PolicyParticipantParameters.yaml +++ b/compose/config/clamp/PolicyParticipantParameters.yaml @@ -43,6 +43,8 @@ participant: topicCommInfrastructure: kafka fetchTimeout: 15000 useHttps: false + additionalProps: + group.id: policy-clamp-ac-pf-ppnt - topic: ${participant.intermediaryParameters.topics.syncTopic} servers: diff --git a/compose/config/clamp/SimulatorParticipantParameters.yaml b/compose/config/clamp/SimulatorParticipantParameters.yaml index 41c30e32..ae0b0f9a 100644 --- a/compose/config/clamp/SimulatorParticipantParameters.yaml +++ b/compose/config/clamp/SimulatorParticipantParameters.yaml @@ -28,6 +28,8 @@ participant: topicCommInfrastructure: kafka fetchTimeout: 15000 useHttps: false + additionalProps: + group.id: policy-clamp-ac-sim-ppnt - topic: ${participant.intermediaryParameters.topics.syncTopic} servers: - ${topicServer:kafka:9092} diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml index 06a24497..85631e49 100644 --- a/compose/docker-compose.yml +++ b/compose/docker-compose.yml @@ -444,4 +444,4 @@ services: - /tmp/distribution:/tmp/distribution environment: ROBOT_FILE: ${ROBOT_FILES} - CLAMP_K8S_TEST: false + TEST_ENV: ${TEST_ENV} diff --git a/csit/resources/Dockerfile b/csit/resources/Dockerfile index 786293d3..b0f41b6a 100644 --- a/csit/resources/Dockerfile +++ b/csit/resources/Dockerfile @@ -1,7 +1,7 @@ FROM nexus3.onap.org:10001/library/python:3.10-slim-bullseye ARG CSIT_SCRIPT=${CSIT_SCRIPT} ARG ROBOT_FILE=${ROBOT_FILE} -ENV ROBOT_WORKSPACE=/opt/robotworkspace ROBOT_FILE=$ROBOT_FILE CLAMP_K8S_TEST=$CLAMP_K8S_TEST +ENV ROBOT_WORKSPACE=/opt/robotworkspace ROBOT_FILE=$ROBOT_FILE TEST_ENV=$TEST_ENV RUN python3 -m pip -qq install --upgrade pip && \ python3 -m pip -qq install --upgrade --extra-index-url="https://nexus3.onap.org/repository/PyPi.staging/simple" 'robotframework-onap==0.6.0.*' --pre && \ python3 -m pip -qq install --upgrade confluent-kafka && \ diff --git a/csit/resources/scripts/run-test.sh b/csit/resources/scripts/run-test.sh index 9b01d352..fb7d30bb 100755 --- a/csit/resources/scripts/run-test.sh +++ b/csit/resources/scripts/run-test.sh @@ -23,7 +23,6 @@ echo "Invoking the robot tests from: ${ROBOT_FILE}" DEFAULT_PORT=6969 DATA=/opt/robotworkspace/models/models-examples/src/main/resources/policies NODETEMPLATES=/opt/robotworkspace/models/models-examples/src/main/resources/nodetemplates -CLAMP_K8S_TEST=${K8S_TEST} POLICY_API_IP=policy-api:${DEFAULT_PORT} @@ -64,7 +63,7 @@ ROBOT_VARIABLES="-v DATA:${DATA} -v DROOLS_IP_2:${DROOLS_IP_2} -v TEMP_FOLDER:${DIST_TEMP_FOLDER} -v DISTRIBUTION_IP:${DISTRIBUTION_IP} --v CLAMP_K8S_TEST:${CLAMP_K8S_TEST}" +-v TEST_ENV:${TEST_ENV}" export ROBOT_VARIABLES diff --git a/csit/resources/tests/policy-clamp-test.robot b/csit/resources/tests/policy-clamp-test.robot index eff970a6..ca7cf7d1 100644 --- a/csit/resources/tests/policy-clamp-test.robot +++ b/csit/resources/tests/policy-clamp-test.robot @@ -120,8 +120,7 @@ InstantiateAutomationComposition [Documentation] Instantiate automation composition. ${auth}= Create List runtimeUser zb!XztG34 Log Creating session http://${POLICY_RUNTIME_ACM_IP} - ${K8sEnabled}= Convert To Boolean ${CLAMP_K8S_TEST} - Run Keyword If '${K8sEnabled}'=='True' set Suite variable ${instantiationfile} AcK8s.json + Run Keyword If '${TEST_ENV}'=='k8s' set Suite variable ${instantiationfile} AcK8s.json ... ELSE set Suite variable ${instantiationfile} AcDocker.json ${postjson}= Get file ${CURDIR}/data/${instantiationfile} diff --git a/csit/run-project-csit.sh b/csit/run-project-csit.sh index a7f7e865..678bfe2a 100755 --- a/csit/run-project-csit.sh +++ b/csit/run-project-csit.sh @@ -42,10 +42,10 @@ function docker_stats(){ function setup_clamp() { export ROBOT_FILES="policy-clamp-test.robot" + export TEST_ENV="docker" source "${WORKSPACE}"/compose/start-compose.sh policy-clamp-runtime-acm sleep 30 bash "${SCRIPTS}"/wait_for_rest.sh localhost "${ACM_PORT}" - export CLAMP_K8S_TEST=false } function setup_api() { diff --git a/helm/policy/components/policy-clamp-ac-a1pms-ppnt/resources/config/A1pmsParticipantParameters.yaml b/helm/policy/components/policy-clamp-ac-a1pms-ppnt/resources/config/A1pmsParticipantParameters.yaml index 1bcb3875..f2589482 100755 --- a/helm/policy/components/policy-clamp-ac-a1pms-ppnt/resources/config/A1pmsParticipantParameters.yaml +++ b/helm/policy/components/policy-clamp-ac-a1pms-ppnt/resources/config/A1pmsParticipantParameters.yaml @@ -53,6 +53,8 @@ participant: - "{{ .Values.global.kafkaServer }}:9092" topicCommInfrastructure: kafka fetchTimeout: 15000 + additionalProps: + group.id: policy-clamp-ac-a1pms-ppnt - topic: ${participant.intermediaryParameters.topics.syncTopic} servers: - "{{ .Values.global.kafkaServer }}:9092" diff --git a/helm/policy/components/policy-clamp-ac-http-ppnt/resources/config/HttpParticipantParameters.yaml b/helm/policy/components/policy-clamp-ac-http-ppnt/resources/config/HttpParticipantParameters.yaml index d500fffa..9bb0d0e2 100644 --- a/helm/policy/components/policy-clamp-ac-http-ppnt/resources/config/HttpParticipantParameters.yaml +++ b/helm/policy/components/policy-clamp-ac-http-ppnt/resources/config/HttpParticipantParameters.yaml @@ -46,6 +46,8 @@ participant: topicCommInfrastructure: kafka fetchTimeout: 15000 useHttps: false + additionalProps: + group.id: policy-clamp-ac-http-ppnt - topic: ${participant.intermediaryParameters.topics.syncTopic} servers: - "{{ .Values.global.kafkaServer }}:9092" diff --git a/helm/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml b/helm/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml index 1fe27377..bd526540 100644 --- a/helm/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml +++ b/helm/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml @@ -49,6 +49,8 @@ participant: topicCommInfrastructure: kafka fetchTimeout: 15000 useHttps: false + additionalProps: + group.id: policy-clamp-ac-k8s-ppnt - topic: ${participant.intermediaryParameters.topics.syncTopic} servers: diff --git a/helm/policy/components/policy-clamp-ac-kserve-ppnt/resources/config/KserveParticipantParameters.yaml b/helm/policy/components/policy-clamp-ac-kserve-ppnt/resources/config/KserveParticipantParameters.yaml index 50bb10ac..6e854c9a 100755 --- a/helm/policy/components/policy-clamp-ac-kserve-ppnt/resources/config/KserveParticipantParameters.yaml +++ b/helm/policy/components/policy-clamp-ac-kserve-ppnt/resources/config/KserveParticipantParameters.yaml @@ -52,6 +52,8 @@ participant: - "{{ .Values.global.kafkaServer }}:9092" topicCommInfrastructure: kafka fetchTimeout: 15000 + additionalProps: + group.id: policy-clamp-ac-kserve-ppnt - topic: ${participant.intermediaryParameters.topics.syncTopic} servers: - "{{ .Values.global.kafkaServer }}:9092" diff --git a/helm/policy/components/policy-clamp-ac-pf-ppnt/resources/config/PolicyParticipantParameters.yaml b/helm/policy/components/policy-clamp-ac-pf-ppnt/resources/config/PolicyParticipantParameters.yaml index 10f7df80..f7308e61 100644 --- a/helm/policy/components/policy-clamp-ac-pf-ppnt/resources/config/PolicyParticipantParameters.yaml +++ b/helm/policy/components/policy-clamp-ac-pf-ppnt/resources/config/PolicyParticipantParameters.yaml @@ -65,6 +65,8 @@ participant: topicCommInfrastructure: kafka fetchTimeout: 15000 useHttps: false + additionalProps: + group.id: policy-clamp-ac-pf-ppnt - topic: ${participant.intermediaryParameters.topics.syncTopic} servers: diff --git a/helm/policy/components/policy-clamp-ac-sim-ppnt/resources/config/SimulatorParticipantParameters.yaml b/helm/policy/components/policy-clamp-ac-sim-ppnt/resources/config/SimulatorParticipantParameters.yaml index d13dccee..7f178207 100644 --- a/helm/policy/components/policy-clamp-ac-sim-ppnt/resources/config/SimulatorParticipantParameters.yaml +++ b/helm/policy/components/policy-clamp-ac-sim-ppnt/resources/config/SimulatorParticipantParameters.yaml @@ -47,6 +47,8 @@ participant: topicCommInfrastructure: kafka fetchTimeout: 15000 useHttps: false + additionalProps: + group.id: policy-clamp-ac-sim-ppnt - topic: ${participant.intermediaryParameters.topics.syncTopic} servers: - "{{ .Values.global.kafkaServer }}:9092" diff --git a/helm/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml b/helm/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml index 84f1bc17..c33cf6ba 100755 --- a/helm/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml +++ b/helm/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml @@ -77,6 +77,8 @@ runtime: topicCommInfrastructure: kafka useHttps: false fetchTimeout: 15000 + additionalProps: + group.id: policy-clamp-runtime-acm topicSinks: - topic: ${runtime.topics.operationTopic} diff --git a/helm/robot/templates/test-job.yaml b/helm/robot/templates/test-job.yaml index f9df6f65..a540f456 100644 --- a/helm/robot/templates/test-job.yaml +++ b/helm/robot/templates/test-job.yaml @@ -50,6 +50,8 @@ spec: env: - name: ROBOT_FILE value: {{ .Values.robot }} + - name: TEST_ENV + value: "k8s" command: [ "./run-test.sh" ] volumeMounts: - name: robot-csit-pv |