From: rameshiyer27 Date: Mon, 11 Aug 2025 16:23:07 +0000 (+0100) Subject: Add new sim participant in docker csit X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=6441dbae4a2f9f05a9bc1dd3ebb301bca495aef4;p=policy%2Fdocker.git Add new sim participant in docker csit - Remove http and k8s ppnts from clamp deployment Issue-ID: POLICY-5439 Signed-off-by: rameshiyer27 Change-Id: I7f4628ab5bff445f7afc526915cdf00eb25f60ae --- diff --git a/compose/compose.acm.scale.yml b/compose/compose.acm.scale.yml index dc39fa52..8e725951 100644 --- a/compose/compose.acm.scale.yml +++ b/compose/compose.acm.scale.yml @@ -18,71 +18,9 @@ # include: - - compose.common.yml - - compose.postgres.yml + - compose.yaml services: - api: - image: ${CONTAINER_LOCATION}onap/policy-api:${POLICY_API_VERSION} - container_name: policy-api - hostname: policy-api - depends_on: - - policy-db-migrator - ports: - - ${API_PORT}:6969 - 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', - 'policy-db-migrator', '6824' - ] - - pap: - image: ${CONTAINER_LOCATION}onap/policy-pap:${POLICY_PAP_VERSION} - container_name: policy-pap - hostname: policy-pap - depends_on: - - api - - kafka - ports: - - ${PAP_PORT}:6969 - volumes: - - ./config/pap/papParameters.yaml:/opt/app/policy/pap/etc/papParameters.yaml:ro - - ./config/clamp/groups.json:/opt/app/policy/pap/etc/mounted/groups.json:ro - - ./config/pap/logback.xml:/opt/app/policy/pap/etc/logback.xml:ro - - ./wait_for_port.sh:/opt/app/policy/pap/bin/wait_for_port.sh:ro - entrypoint: ./wait_for_port.sh - command: [ - '-c', './policy-pap.sh', - 'api', '6969', - 'kafka', '9092' - ] - - apex-pdp: - image: ${CONTAINER_LOCATION}onap/policy-apex-pdp:${POLICY_APEX_PDP_VERSION} - container_name: policy-apex-pdp - hostname: policy-apex-pdp - depends_on: - - simulator - - kafka - - pap - ports: - - ${APEX_PORT}:6969 - - ${APEX_EVENTS_PORT}:23324 - volumes: - - ./config/apex-pdp/OnapPfConfig.json:/opt/app/policy/apex-pdp/etc/onappf/config/OnapPfConfig.json:ro - - ./config/apex-pdp/logback.xml:/opt/app/policy/apex-pdp/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', '/opt/app/policy/apex-pdp/bin/apexOnapPf.sh -c /opt/app/policy/apex-pdp/etc/onappf/config/OnapPfConfig.json', - 'kafka', '9092', - 'pap', '6969' - ] - policy-clamp-runtime-acm-replica: image: ${CONTAINER_LOCATION}onap/policy-clamp-runtime-acm:${POLICY_CLAMP_VERSION} hostname: policy-clamp-runtime-acm @@ -91,10 +29,9 @@ services: - apex-pdp - kafka - jaeger - - policy-clamp-ac-http-ppnt-replica - - policy-clamp-ac-k8s-ppnt-replica - policy-clamp-ac-pf-ppnt-replica - - policy-clamp-ac-sim-ppnt + - policy-clamp-ac-sim-ppnt-1 + - policy-clamp-ac-sim-ppnt-2 expose: - 6969 deploy: @@ -128,10 +65,9 @@ services: '-c', 'java -jar /app/app.jar', 'apex-pdp', '6969', 'kafka', '9092', - 'policy-clamp-ac-http-ppnt', '6969', - 'policy-clamp-ac-k8s-ppnt', '6969', - 'policy-clamp-ac-pf-ppnt', '6969', - 'policy-clamp-ac-sim-ppnt', '6969' + 'policy-clamp-ac-pf-ppnt-replica', '6969', + 'policy-clamp-ac-sim-ppnt-1', '6969', + 'policy-clamp-ac-sim-ppnt-2', '6969', ] policy-clamp-ac-http-ppnt-replica: image: ${CONTAINER_LOCATION}onap/policy-clamp-ac-http-ppnt:${POLICY_CLAMP_PPNT_VERSION} diff --git a/compose/compose.common.yml b/compose/compose.common.yml index 484f86ad..23ee9224 100644 --- a/compose/compose.common.yml +++ b/compose/compose.common.yml @@ -41,15 +41,15 @@ services: ports: - ${SIMULATOR_PORT}:6666 - policy-clamp-ac-sim-ppnt: + policy-clamp-ac-sim-ppnt-1: image: ${CONTAINER_LOCATION}onap/policy-clamp-ac-sim-ppnt:${POLICY_CLAMP_PPNT_VERSION} - container_name: policy-clamp-ac-sim-ppnt - hostname: policy-clamp-ac-sim-ppnt + container_name: policy-clamp-ac-sim-ppnt-1 + hostname: policy-clamp-ac-sim-ppnt-1 depends_on: - kafka - jaeger environment: - OTEL_SERVICE_NAME: sim-ppnt + OTEL_SERVICE_NAME: sim-ppnt-1 OTEL_EXPORTER_OTLP_PROTOCOL: http/protobuf OTEL_EXPORTER_OTLP_TRACES_PROTOCOL: http/protobuf OTEL_EXPORTER_OTLP_ENDPOINT: http://jaeger:4318 @@ -59,7 +59,7 @@ services: -Dotel.java.global-autoconfigure.enabled=true spring.config.location: /opt/app/policy/clamp/etc/SimulatorParticipantParameters.yaml ports: - - ${SIM_PARTICIPANT_PORT}:6969 + - ${SIM_PARTICIPANT1_PORT}:6969 volumes: - ./config/clamp/SimulatorParticipantParameters.yaml:/opt/app/policy/clamp/etc/SimulatorParticipantParameters.yaml:ro - ./config/clamp/logback-ppnt.xml:/opt/app/policy/clamp/etc/logback.xml:ro @@ -70,6 +70,35 @@ services: 'kafka', '9092' ] + policy-clamp-ac-sim-ppnt-2: + image: ${CONTAINER_LOCATION}onap/policy-clamp-ac-sim-ppnt:${POLICY_CLAMP_PPNT_VERSION} + container_name: policy-clamp-ac-sim-ppnt-2 + hostname: policy-clamp-ac-sim-ppnt-2 + depends_on: + - kafka + - jaeger + environment: + OTEL_SERVICE_NAME: sim-ppnt-2 + OTEL_EXPORTER_OTLP_PROTOCOL: http/protobuf + 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_PARTICIPANT2_PORT}:6969 + volumes: + - ./config/clamp/SimulatorParticipant2Parameters.yaml:/opt/app/policy/clamp/etc/SimulatorParticipantParameters.yaml:ro + - ./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', 'java -jar /app/app.jar', + 'kafka', '9092' + ] + # metrics services: prometheus: image: nexus3.onap.org:10001/prom/prometheus:latest diff --git a/compose/compose.yaml b/compose/compose.yaml index 4d51e273..0e6227ef 100644 --- a/compose/compose.yaml +++ b/compose/compose.yaml @@ -218,10 +218,9 @@ services: - apex-pdp - kafka - jaeger - - policy-clamp-ac-http-ppnt - - policy-clamp-ac-k8s-ppnt - policy-clamp-ac-pf-ppnt - - policy-clamp-ac-sim-ppnt + - policy-clamp-ac-sim-ppnt-1 + - policy-clamp-ac-sim-ppnt-2 ports: - ${ACM_PORT}:6969 environment: @@ -253,9 +252,9 @@ services: '-c', 'java -jar /app/app.jar', 'apex-pdp', '6969', 'kafka', '9092', - 'policy-clamp-ac-http-ppnt', '6969', - 'policy-clamp-ac-k8s-ppnt', '6969', - 'policy-clamp-ac-pf-ppnt', '6969' + 'policy-clamp-ac-pf-ppnt', '6969', + 'policy-clamp-ac-sim-ppnt-1', '6969', + 'policy-clamp-ac-sim-ppnt-2', '6969' ] policy-clamp-ac-http-ppnt: diff --git a/compose/config/clamp/SimulatorParticipant2Parameters.yaml b/compose/config/clamp/SimulatorParticipant2Parameters.yaml new file mode 100644 index 00000000..d2860273 --- /dev/null +++ b/compose/config/clamp/SimulatorParticipant2Parameters.yaml @@ -0,0 +1,106 @@ +spring: + application: + name: sim-ppnt-2 + 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-d21eb79c6c91} + topics: + operationTopic: policy-acruntime-participant + syncTopic: acm-ppnt-sync + clampAutomationCompositionTopics: + topicSources: + - topic: ${participant.intermediaryParameters.topics.operationTopic} + servers: + - ${topicServer:kafka:9092} + topicCommInfrastructure: kafka + fetchTimeout: 15000 + useHttps: false + allowTracing: true + additionalProps: + group.id: policy-clamp-ac-sim-ppnt-2 + - topic: ${participant.intermediaryParameters.topics.syncTopic} + servers: + - ${topicServer:kafka:9092} + topicCommInfrastructure: kafka + fetchTimeout: 15000 + useHttps: false + allowTracing: true + topicSinks: + - topic: ${participant.intermediaryParameters.topics.operationTopic} + servers: + - ${topicServer:kafka:9092} + topicCommInfrastructure: kafka + useHttps: false + allowTracing: true + participantSupportedElementTypes: + - + typeName: ${supportedElementTypeName:org.onap.policy.clamp.acm.SimAutomationCompositionElement2} + typeVersion: ${supportedElementTypeVersion:1.0.0} + +management: + tracing: + propagation: + produce: B3 + sampling: + probability: 1.0 + endpoints: + web: + base-path: / + exposure: + include: health, metrics, prometheus +server: + port: 6969 + ssl: + enabled: false + servlet: + context-path: /onap/policy/simparticipant + +tracing: + enabled: true + exporter: + endpoint: http://jaeger:4318/v1/traces + protocol: http + sampler: + jaeger-remote: + endpoint: http://jaeger:14250 + +# legacy config +--- + +spring: + config: + activate: + on-profile: legacy +participant: + intermediaryParameters: + reportingTimeIntervalMs: 120000 + participantId: ${participantId:101c62b3-8918-41b9-a747-d21eb79c6c91} + clampAutomationCompositionTopics: + topicSources: + - topic: policy-acruntime-participant + servers: + - ${topicServer:kafka:9092} + topicCommInfrastructure: kafka + fetchTimeout: 15000 + useHttps: false + topicSinks: + - topic: policy-acruntime-participant + servers: + - ${topicServer:kafka:9092} + topicCommInfrastructure: kafka + useHttps: false diff --git a/compose/config/clamp/SimulatorParticipantParameters.yaml b/compose/config/clamp/SimulatorParticipantParameters.yaml index 996404f4..c0d05ed3 100644 --- a/compose/config/clamp/SimulatorParticipantParameters.yaml +++ b/compose/config/clamp/SimulatorParticipantParameters.yaml @@ -1,6 +1,6 @@ spring: application: - name: sim-ppnt + name: sim-ppnt-1 security: user: name: participantUser @@ -32,7 +32,7 @@ participant: useHttps: false allowTracing: true additionalProps: - group.id: policy-clamp-ac-sim-ppnt + group.id: policy-clamp-ac-sim-ppnt-1 - topic: ${participant.intermediaryParameters.topics.syncTopic} servers: - ${topicServer:kafka:9092} diff --git a/compose/export-ports.sh b/compose/export-ports.sh index 35cd89c9..20b43ae4 100755 --- a/compose/export-ports.sh +++ b/compose/export-ports.sh @@ -1,6 +1,6 @@ #!/bin/bash # ============LICENSE_START======================================================= -# Copyright 2023-2024 Nordix Foundation. +# Copyright 2023-2025 OpenInfra Foundation Europe. All rights reserved. # Modifications Copyright 2024 Deutsche Telekom # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); @@ -30,7 +30,8 @@ export DROOLS_TELEMETRY_PORT=30216 export DIST_PORT=30006 export ACM_PORT=30007 export POLICY_PARTICIPANT_PORT=30008 -export SIM_PARTICIPANT_PORT=30011 +export SIM_PARTICIPANT1_PORT=30011 +export SIM_PARTICIPANT2_PORT=30013 export DROOLS_APPS_PORT=30009 export DROOLS_APPS_TELEMETRY_PORT=30219 export SIMULATOR_PORT=30904 diff --git a/csit/resources/scripts/run-test.sh b/csit/resources/scripts/run-test.sh index bc4dcc62..e12e2526 100755 --- a/csit/resources/scripts/run-test.sh +++ b/csit/resources/scripts/run-test.sh @@ -1,7 +1,7 @@ #!/bin/bash # # ============LICENSE_START==================================================== -# Copyright (C) 2023-2024 Nordix Foundation. +# Copyright (C) 2023-2025 OpenInfra Foundation Europe. All rights reserved. # Modifications Copyright 2024 Deutsche Telekom # ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); @@ -42,7 +42,8 @@ DROOLS_IP_2=policy-drools-apps:9696 DISTRIBUTION_IP=policy-distribution:${DEFAULT_PORT} POLICY_RUNTIME_ACM_IP=policy-clamp-runtime-acm:${DEFAULT_PORT} -POLICY_PARTICIPANT_SIM_IP=policy-clamp-ac-sim-ppnt:${DEFAULT_PORT} +HTTP_PARTICIPANT_SIM1_IP=policy-clamp-ac-sim-ppnt-1:${DEFAULT_PORT} +HTTP_PARTICIPANT_SIM2_IP=policy-clamp-ac-sim-ppnt-2:${DEFAULT_PORT} JAEGER_IP=jaeger:16686 KAFKA_IP=kafka:9092 @@ -54,7 +55,8 @@ ROBOT_VARIABLES="-v DATA:${DATA} -v NODETEMPLATES:${NODETEMPLATES} -v POLICY_API_IP:${POLICY_API_IP} -v POLICY_RUNTIME_ACM_IP:${POLICY_RUNTIME_ACM_IP} --v POLICY_PARTICIPANT_SIM_IP:$POLICY_PARTICIPANT_SIM_IP +-v HTTP_PARTICIPANT_SIM1_IP:$HTTP_PARTICIPANT_SIM1_IP +-v HTTP_PARTICIPANT_SIM2_IP:$HTTP_PARTICIPANT_SIM2_IP -v POLICY_PAP_IP:${POLICY_PAP_IP} -v APEX_IP:${APEX_IP} -v APEX_EVENTS_IP:${APEX_EVENTS_IP} diff --git a/csit/resources/tests/data/ac-definition-migration-from.yaml b/csit/resources/tests/data/ac-definition-migration-from.yaml index 99ce31ff..f866bd48 100644 --- a/csit/resources/tests/data/ac-definition-migration-from.yaml +++ b/csit/resources/tests/data/ac-definition-migration-from.yaml @@ -106,7 +106,7 @@ node_types: required: true entry_schema: type: map - description: The connfiguration entities the Automation Composition Element is managing and their associated REST requests + description: The configuration entities the Automation Composition Element is managing and their associated REST requests topology_template: diff --git a/csit/resources/tests/policy-clamp-test.robot b/csit/resources/tests/policy-clamp-test.robot index 8940bcd8..14261b4c 100644 --- a/csit/resources/tests/policy-clamp-test.robot +++ b/csit/resources/tests/policy-clamp-test.robot @@ -18,7 +18,7 @@ HealthcheckAcm HealthcheckParticipantSim [Documentation] Healthcheck on Participant Simulator ${auth}= ParticipantAuth - ${resp}= MakeGetRequest participant ${POLICY_PARTICIPANT_SIM_IP} /onap/policy/simparticipant/health ${auth} + ${resp}= MakeGetRequest participant ${HTTP_PARTICIPANT_SIM1_IP} /onap/policy/simparticipant/health ${auth} Should Be Equal As Strings ${resp.status_code} 200 HealthcheckApi @@ -299,27 +299,27 @@ CheckTraces [Documentation] Verify that traces are being recorded in jaeger Log Verifying Jaeger traces ${acmResp}= VerifyTracingWorks ${JAEGER_IP} acm-r - ${httpResp}= VerifyTracingWorks ${JAEGER_IP} http-ppnt + ${httpSim1Resp}= VerifyTracingWorks ${JAEGER_IP} sim-ppnt-1 ${policyResp}= VerifyTracingWorks ${JAEGER_IP} policy-ppnt - ${k8sResp}= VerifyTracingWorks ${JAEGER_IP} k8s-ppnt + ${httpSim2Resp}= VerifyTracingWorks ${JAEGER_IP} sim-ppnt-2 Should Not Be Empty ${acmResp.json()["data"][0]["spans"][0]["spanID"]} Log Received spanID is ${acmResp.json()["data"][0]["spans"][0]["spanID"]} - Should Not Be Empty ${httpResp.json()["data"][0]["spans"][0]["spanID"]} + Should Not Be Empty ${httpSim1Resp.json()["data"][0]["spans"][0]["spanID"]} Should Not Be Empty ${policyResp.json()["data"][0]["spans"][0]["spanID"]} - Should Not Be Empty ${k8sResp.json()["data"][0]["spans"][0]["spanID"]} + Should Not Be Empty ${httpSim2Resp.json()["data"][0]["spans"][0]["spanID"]} CheckKafkaPresentInTraces [Documentation] Verify that kafka traces are being recorded in jaeger Log Verifying Kafka Jaeger traces ${acmResp}= VerifyKafkaInTraces ${JAEGER_IP} acm-r - ${httpResp}= VerifyKafkaInTraces ${JAEGER_IP} http-ppnt + ${httpSim1Resp}= VerifyKafkaInTraces ${JAEGER_IP} sim-ppnt-1 ${policyResp}= VerifyKafkaInTraces ${JAEGER_IP} policy-ppnt - ${k8sResp}= VerifyKafkaInTraces ${JAEGER_IP} k8s-ppnt + ${httpSim2Resp}= VerifyKafkaInTraces ${JAEGER_IP} sim-ppnt-2 Should Not Be Empty ${acmResp.json()["data"][0]["spans"][0]["spanID"]} Log Received spanID is ${acmResp.json()["data"][0]["spans"][0]["spanID"]} - Should Not Be Empty ${httpResp.json()["data"][0]["spans"][0]["spanID"]} + Should Not Be Empty ${httpSim1Resp.json()["data"][0]["spans"][0]["spanID"]} Should Not Be Empty ${policyResp.json()["data"][0]["spans"][0]["spanID"]} - Should Not Be Empty ${k8sResp.json()["data"][0]["spans"][0]["spanID"]} + Should Not Be Empty ${httpSim2Resp.json()["data"][0]["spans"][0]["spanID"]} CheckHttpPresentInAcmTraces [Documentation] Verify that http traces are being recorded in jaeger @@ -365,13 +365,13 @@ SendOutPropertiesToRuntime ${postjson}= Get file ${CURDIR}/data/OutProperties.json ${updatedpostjson}= Replace String ${postjson} INSTACEIDPLACEHOLDER ${instanceMigrationId} ${updatedpostjson}= Replace String ${updatedpostjson} TEXTPLACEHOLDER DumpTest - ${resp}= MakeJsonPutRequest participant ${POLICY_PARTICIPANT_SIM_IP} /onap/policy/simparticipant/v2/datas ${updatedpostjson} ${auth} + ${resp}= MakeJsonPutRequest participant ${HTTP_PARTICIPANT_SIM1_IP} /onap/policy/simparticipant/v2/datas ${updatedpostjson} ${auth} Should Be Equal As Strings ${resp.status_code} 200 - ${resp}= MakeJsonPutRequest participant ${POLICY_PARTICIPANT_SIM_IP} /onap/policy/simparticipant/v2/datas ${updatedpostjson} ${auth} + ${resp}= MakeJsonPutRequest participant ${HTTP_PARTICIPANT_SIM1_IP} /onap/policy/simparticipant/v2/datas ${updatedpostjson} ${auth} Should Be Equal As Strings ${resp.status_code} 200 ${updatedpostjson}= Replace String ${postjson} INSTACEIDPLACEHOLDER ${instanceMigrationId} ${updatedpostjson}= Replace String ${updatedpostjson} TEXTPLACEHOLDER MyTextToSend - ${resp}= MakeJsonPutRequest participant ${POLICY_PARTICIPANT_SIM_IP} /onap/policy/simparticipant/v2/datas ${updatedpostjson} ${auth} + ${resp}= MakeJsonPutRequest participant ${HTTP_PARTICIPANT_SIM1_IP} /onap/policy/simparticipant/v2/datas ${updatedpostjson} ${auth} Should Be Equal As Strings ${resp.status_code} 200 Wait Until Keyword Succeeds 2 min 5 sec VerifyPropertiesUpdated ${compositionFromId} ${instanceMigrationId} MyTextToSend @@ -681,9 +681,9 @@ VerifyRollbackElementsRuntime VerifyMigratedElementsSim [Arguments] ${theInstanceId} - [Documentation] Query on Participant Simulator + [Documentation] Query on Participant Simulator 1 ${auth}= ParticipantAuth - ${resp}= MakeGetRequest participant ${POLICY_PARTICIPANT_SIM_IP} /onap/policy/simparticipant/v2/instances/${theInstanceId} ${auth} + ${resp}= MakeGetRequest participant ${HTTP_PARTICIPANT_SIM1_IP} /onap/policy/simparticipant/v2/instances/${theInstanceId} ${auth} Should Be Equal As Strings ${resp.status_code} 200 ${respstring} Convert To String ${resp.json()} Should Match Regexp ${respstring} Sim_NewAutomationCompositionElement @@ -693,7 +693,7 @@ VerifyRollbackElementsSim [Arguments] ${theInstanceId} [Documentation] Query on Participant Simulator ${auth}= ParticipantAuth - ${resp}= MakeGetRequest participant ${POLICY_PARTICIPANT_SIM_IP} /onap/policy/simparticipant/v2/instances/${theInstanceId} ${auth} + ${resp}= MakeGetRequest participant ${HTTP_PARTICIPANT_SIM1_IP} /onap/policy/simparticipant/v2/instances/${theInstanceId} ${auth} Should Be Equal As Strings ${resp.status_code} 200 ${respstring} Convert To String ${resp.json()} Should Not Match Regexp ${respstring} Sim_NewAutomationCompositionElement @@ -703,7 +703,7 @@ VerifyCompositionParticipantSim [Arguments] ${textToFind} [Documentation] Query composition on Participant Simulator ${auth}= ParticipantAuth - ${resp}= MakeGetRequest participant ${POLICY_PARTICIPANT_SIM_IP} /onap/policy/simparticipant/v2/compositiondatas ${auth} + ${resp}= MakeGetRequest participant ${HTTP_PARTICIPANT_SIM1_IP} /onap/policy/simparticipant/v2/compositiondatas ${auth} Should Be Equal As Strings ${resp.status_code} 200 ${respstring} Convert To String ${resp.json()} Should Match Regexp ${respstring} ${textToFind} @@ -712,7 +712,7 @@ VerifyParticipantSim [Arguments] ${theInstanceId} ${textToFind} [Documentation] Query on Participant Simulator ${auth}= ParticipantAuth - ${resp}= MakeGetRequest participant ${POLICY_PARTICIPANT_SIM_IP} /onap/policy/simparticipant/v2/instances/${theInstanceId} ${auth} + ${resp}= MakeGetRequest participant ${HTTP_PARTICIPANT_SIM1_IP} /onap/policy/simparticipant/v2/instances/${theInstanceId} ${auth} Should Be Equal As Strings ${resp.status_code} 200 ${respstring} Convert To String ${resp.json()} Should Match Regexp ${respstring} ${textToFind} @@ -729,28 +729,28 @@ SetParticipantSimFail [Documentation] Set Participant Simulator Fail. ${auth}= ParticipantAuth ${postjson}= Get file ${CURDIR}/data/SettingSimPropertiesFail.json - ${resp}= MakeJsonPutRequest participant ${POLICY_PARTICIPANT_SIM_IP} /onap/policy/simparticipant/v2/parameters ${postjson} ${auth} + ${resp}= MakeJsonPutRequest participant ${HTTP_PARTICIPANT_SIM1_IP} /onap/policy/simparticipant/v2/parameters ${postjson} ${auth} Should Be Equal As Strings ${resp.status_code} 200 SetParticipantSimSuccess [Documentation] Set Participant Simulator Success. ${auth}= ParticipantAuth ${postjson}= Get file ${CURDIR}/data/SettingSimPropertiesSuccess.json - ${resp}= MakeJsonPutRequest participant ${POLICY_PARTICIPANT_SIM_IP} /onap/policy/simparticipant/v2/parameters ${postjson} ${auth} + ${resp}= MakeJsonPutRequest participant ${HTTP_PARTICIPANT_SIM1_IP} /onap/policy/simparticipant/v2/parameters ${postjson} ${auth} Should Be Equal As Strings ${resp.status_code} 200 SetParticipantSimTimeout [Documentation] Set Participant Simulator Timeout. ${auth}= ParticipantAuth ${postjson}= Get file ${CURDIR}/data/SettingSimPropertiesTimeout.json - ${resp}= MakeJsonPutRequest participant ${POLICY_PARTICIPANT_SIM_IP} /onap/policy/simparticipant/v2/parameters ${postjson} ${auth} + ${resp}= MakeJsonPutRequest participant ${HTTP_PARTICIPANT_SIM1_IP} /onap/policy/simparticipant/v2/parameters ${postjson} ${auth} Should Be Equal As Strings ${resp.status_code} 200 SetParticipantSimDelay [Documentation] Set Participant Simulator Delay. ${auth}= ParticipantAuth ${postjson}= Get file ${CURDIR}/data/SettingSimPropertiesDelay.json - ${resp}= MakeJsonPutRequest participant ${POLICY_PARTICIPANT_SIM_IP} /onap/policy/simparticipant/v2/parameters ${postjson} ${auth} + ${resp}= MakeJsonPutRequest participant ${HTTP_PARTICIPANT_SIM1_IP} /onap/policy/simparticipant/v2/parameters ${postjson} ${auth} Should Be Equal As Strings ${resp.status_code} 200