diff options
Diffstat (limited to 'csit/clamp')
| -rwxr-xr-x | csit/clamp/plans/setup.sh | 32 | ||||
| -rw-r--r-- | csit/clamp/tests/policy-clamp-test.robot | 32 |
2 files changed, 39 insertions, 25 deletions
diff --git a/csit/clamp/plans/setup.sh b/csit/clamp/plans/setup.sh index 02770a86..b750b023 100755 --- a/csit/clamp/plans/setup.sh +++ b/csit/clamp/plans/setup.sh @@ -33,6 +33,7 @@ sleep 10 unset http_proxy https_proxy POLICY_RUNTIME_ACM_IP=$(get-instance-ip.sh policy-clamp-runtime-acm) +POLICY_RUNTIME_ACM_PORT=30258 MARIADB_IP=$(get-instance-ip.sh mariadb) DMAAP_IP=$(get-instance-ip.sh simulator) @@ -41,22 +42,30 @@ echo DMAAP_IP IS "${DMAAP_IP}" echo POLICY RUNTIME ACM IP IS "${POLICY_RUNTIME_ACM_IP}" # wait for the app to start up -"${SCRIPTS}"/wait_for_port.sh "${POLICY_RUNTIME_ACM_IP}" 6969 +"${SCRIPTS}"/wait_for_rest.sh localhost "${POLICY_RUNTIME_ACM_PORT}" -# Bringup ACM participant containers -docker-compose -f "${SCRIPTS}"/docker-compose-all.yml up -d policy-clamp-ac-k8s-ppnt -docker-compose -f "${SCRIPTS}"/docker-compose-all.yml up -d policy-clamp-ac-http-ppnt -docker-compose -f "${SCRIPTS}"/docker-compose-all.yml up -d policy-clamp-ac-pf-ppnt -docker-compose -f "${SCRIPTS}"/docker-compose-all.yml up -d policy-clamp-ac-a1pms-ppnt +# TODO: This disables the participant during ACM refactoring, will be reenabled when ACM +# TODO: tests are re-enabled -sleep 10 +# Bring up ACM participant containers +#docker-compose -f "${SCRIPTS}"/docker-compose-all.yml up -d policy-clamp-ac-k8s-ppnt +#docker-compose -f "${SCRIPTS}"/docker-compose-all.yml up -d policy-clamp-ac-http-ppnt +#docker-compose -f "${SCRIPTS}"/docker-compose-all.yml up -d policy-clamp-ac-pf-ppnt +#docker-compose -f "${SCRIPTS}"/docker-compose-all.yml up -d policy-clamp-ac-a1pms-ppnt + +#sleep 10 unset http_proxy https_proxy POLICY_PARTICIPANT_IP=$(get-instance-ip.sh policy-clamp-ac-pf-ppnt) +POLICY_PARTICIPANT_PORT=30218 POLICY_API_IP=$(get-instance-ip.sh policy-api) +POLICY_API_PORT=30440 K8S_PARTICIPANT_IP=$(get-instance-ip.sh policy-clamp-ac-k8s-ppnt) +K8S_PARTICIPANT_PORT=30295 HTTP_PARTICIPANT_IP=$(get-instance-ip.sh policy-clamp-ac-http-ppnt) +HTTP_PARTICIPANT_PORT=30290 A1PMS_PARTICIPANT_IP=$(get-instance-ip.sh policy-clamp-ac-a1pms-ppnt) +A1PMS_PARTICIPANT_PORT=30296 echo POLICY PARTICIPANT IP IS "${POLICY_PARTICIPANT_IP}" echo API IP IS "${POLICY_API_IP}" @@ -65,13 +74,18 @@ echo HTTP PARTICIPANT IP IS "${HTTP_PARTICIPANT_IP}" echo A1PMS PARTICIPANT IP IS "${A1PMS_PARTICIPANT_IP}" # wait for the app to start up -"${SCRIPTS}"/wait_for_port.sh "${POLICY_PARTICIPANT_IP}" 6969 +#"${SCRIPTS}"/wait_for_rest.sh localhost "${POLICY_PARTICIPANT_PORT}" ROBOT_VARIABLES="" ROBOT_VARIABLES="${ROBOT_VARIABLES} -v POLICY_RUNTIME_ACM_IP:${POLICY_RUNTIME_ACM_IP}" +ROBOT_VARIABLES="${ROBOT_VARIABLES} -v POLICY_RUNTIME_ACM_PORT:${POLICY_RUNTIME_ACM_PORT}" ROBOT_VARIABLES="${ROBOT_VARIABLES} -v POLICY_PARTICIPANT_IP:${POLICY_PARTICIPANT_IP}" +ROBOT_VARIABLES="${ROBOT_VARIABLES} -v POLICY_PARTICIPANT_PORT:${POLICY_PARTICIPANT_PORT}" ROBOT_VARIABLES="${ROBOT_VARIABLES} -v K8S_PARTICIPANT_IP:${K8S_PARTICIPANT_IP}" +ROBOT_VARIABLES="${ROBOT_VARIABLES} -v K8S_PARTICIPANT_PORT:${K8S_PARTICIPANT_PORT}" ROBOT_VARIABLES="${ROBOT_VARIABLES} -v HTTP_PARTICIPANT_IP:${HTTP_PARTICIPANT_IP}" +ROBOT_VARIABLES="${ROBOT_VARIABLES} -v HTTP_PARTICIPANT_PORT:${HTTP_PARTICIPANT_PORT}" ROBOT_VARIABLES="${ROBOT_VARIABLES} -v A1PMS_PARTICIPANT_IP:${A1PMS_PARTICIPANT_IP}" +ROBOT_VARIABLES="${ROBOT_VARIABLES} -v A1PMS_PARTICIPANT_PORT:${A1PMS_PARTICIPANT_PORT}" ROBOT_VARIABLES="${ROBOT_VARIABLES} -v POLICY_API_IP:${POLICY_API_IP}" - +ROBOT_VARIABLES="${ROBOT_VARIABLES} -v POLICY_API_PORT:${POLICY_API_PORT}" diff --git a/csit/clamp/tests/policy-clamp-test.robot b/csit/clamp/tests/policy-clamp-test.robot index 9fefbc0a..2c31b9a3 100644 --- a/csit/clamp/tests/policy-clamp-test.robot +++ b/csit/clamp/tests/policy-clamp-test.robot @@ -10,8 +10,8 @@ Library yaml Healthcheck [Documentation] Healthcheck on Clamp Acm ${auth}= Create List runtimeUser zb!XztG34 - Log Creating session http://${POLICY_RUNTIME_ACM_IP}:6969 - ${session}= Create Session ACM http://${POLICY_RUNTIME_ACM_IP}:6969 auth=${auth} + Log Creating session http://localhost:${POLICY_RUNTIME_ACM_PORT} + ${session}= Create Session ACM http://localhost:${POLICY_RUNTIME_ACM_PORT} auth=${auth} ${headers}= Create Dictionary Accept=application/json Content-Type=application/json ${resp}= GET On Session ACM /onap/policy/clamp/acm/health headers=${headers} Log Received response from ACM healthcheck {resp.text} @@ -20,9 +20,9 @@ Healthcheck #CommissionAutomationCompositionV1 # [Documentation] Commission automation composition. # ${auth}= Create List runtimeUser zb!XztG34 -# Log Creating session http://${POLICY_RUNTIME_ACM_IP}:6969 +# Log Creating session http://localhost:${POLICY_RUNTIME_ACM_PORT} # ${postyaml}= Get file ${CURDIR}/data/functional-pmsh-usecase.yaml -# ${session}= Create Session policy http://${POLICY_RUNTIME_ACM_IP}:6969 auth=${auth} +# ${session}= Create Session policy http://localhost:${POLICY_RUNTIME_ACM_PORT} auth=${auth} # ${headers}= Create Dictionary Accept=application/yaml Content-Type=application/yaml # ${resp}= POST On Session policy /onap/policy/clamp/acm/v2/compositions data=${postyaml} headers=${headers} # Log Received response from runtime acm ${resp.text} @@ -33,10 +33,10 @@ Healthcheck #InstantiateAutomationCompositionV1 # [Documentation] Instantiate automation composition. # ${auth}= Create List runtimeUser zb!XztG34 -# Log Creating session http://${POLICY_RUNTIME_ACM_IP}:6969 +# Log Creating session http://localhost:${POLICY_RUNTIME_ACM_PORT} # ${postjson}= Get file ${CURDIR}/data/AutomationComposition.json # ${updatedpostjson}= Replace String ${postjson} COMPOSITIONIDPLACEHOLDER ${compositionId} -# ${session}= Create Session policy http://${POLICY_RUNTIME_ACM_IP}:6969 auth=${auth} +# ${session}= Create Session policy http://localhost:${POLICY_RUNTIME_ACM_PORT} auth=${auth} # ${headers}= Create Dictionary Accept=application/json Content-Type=application/json # ${resp}= POST On Session policy /onap/policy/clamp/acm/v2/compositions/${compositionId}/instances data=${updatedpostjson} headers=${headers} # Log Received response from runtime acm ${resp.text} @@ -47,9 +47,9 @@ Healthcheck #PassivateAutomationComposition # [Documentation] Passivate automation composition. # ${auth}= Create List runtimeUser zb!XztG34 -# Log Creating session http://${POLICY_RUNTIME_ACM_IP}:6969 +# Log Creating session http://localhost:${POLICY_RUNTIME_ACM_PORT} # ${postjson}= Get file ${CURDIR}/data/PassiveCommand.json -# ${session}= Create Session policy http://${POLICY_RUNTIME_ACM_IP}:6969 auth=${auth} +# ${session}= Create Session policy http://localhost:${POLICY_RUNTIME_ACM_PORT} auth=${auth} # ${headers}= Create Dictionary Accept=application/json Content-Type=application/json # ${resp}= PUT On Session policy /onap/policy/clamp/acm/v2/compositions/${compositionId}/instances/${instanceId} data=${postjson} headers=${headers} # Log Received response from runtime acm ${resp.text} @@ -58,8 +58,8 @@ Healthcheck #QueryPolicies # [Documentation] Runs Policy Participant Query New Policies # ${auth}= Create List policyadmin zb!XztG34 -# Log Creating session http://${POLICY_API_IP}:6969 -# ${session}= Create Session policy http://${POLICY_API_IP}:6969 auth=${auth} +# Log Creating session http://localhost:${POLICY_API_PORT} +# ${session}= Create Session policy http://localhost:${POLICY_API_PORT} auth=${auth} # ${headers}= Create Dictionary Accept=application/json Content-Type=application/json # ${resp}= GET On Session policy /policy/api/v1/policies headers=${headers} # Log Received response from policy-api {resp.text} @@ -68,8 +68,8 @@ Healthcheck #QueryPolicyTypes # [Documentation] Runs Policy Participant Query New Policy Types # ${auth}= Create List policyadmin zb!XztG34 -# Log Creating session http://${POLICY_API_IP}:6969 -# ${session}= Create Session policy http://${POLICY_API_IP}:6969 auth=${auth} +# Log Creating session http://localhost:${POLICY_API_PORT}}:6969 +# ${session}= Create Session policy http://localhost:${POLICY_API_PORT} auth=${auth} # ${headers}= Create Dictionary Accept=application/json Content-Type=application/json # ${resp}= GET On Session policy /policy/api/v1/policytypes headers=${headers} # Log Received response from policy-api ${resp.text} @@ -78,9 +78,9 @@ Healthcheck #StateChangeRunningAutomationComposition # [Documentation] AutomationComposition State Change to RUNNING. # ${auth}= Create List runtimeUser zb!XztG34 -# Log Creating session http://${POLICY_RUNTIME_ACM_IP}:6969 +# Log Creating session http://localhost:${POLICY_RUNTIME_ACM_PORT} # ${postjson}= Get file ${CURDIR}/data/RunningCommand.json -# ${session}= Create Session policy http://${POLICY_RUNTIME_ACM_IP}:6969 auth=${auth} +# ${session}= Create Session policy http://localhost:${POLICY_RUNTIME_ACM_PORT} auth=${auth} # ${headers}= Create Dictionary Accept=application/json Content-Type=application/json # ${resp}= PUT On Session policy /onap/policy/clamp/acm/v2/compositions/${compositionId}/instances/${instanceId} data=${postjson} headers=${headers} expected_status=400 # Log Received response from runtime acm ${resp.text} @@ -88,8 +88,8 @@ Healthcheck #QueryInstantiatedACs # [Documentation] Get Instantiated AutomationCompositions # ${auth}= Create List runtimeUser zb!XztG34 -# Log Creating session http://${POLICY_RUNTIME_ACM_IP}:6969 -# ${session}= Create Session policy http://${POLICY_RUNTIME_ACM_IP}:6969 auth=${auth} +# Log Creating session http://localhost:${POLICY_RUNTIME_ACM_PORT} +# ${session}= Create Session policy http://localhost:${POLICY_RUNTIME_ACM_PORT} auth=${auth} # ${headers}= Create Dictionary Accept=application/json Content-Type=application/json # ${resp}= GET On Session policy /onap/policy/clamp/acm/v2/compositions/${compositionId}/instances/${instanceId} headers=${headers} # Log Received response from runtime acm ${resp.text} |