Merge "Add Participant Simulator chart"
diff --git a/csit/resources/tests/policy-clamp-test.robot b/csit/resources/tests/policy-clamp-test.robot
index 123249a..95af26a 100644
--- a/csit/resources/tests/policy-clamp-test.robot
+++ b/csit/resources/tests/policy-clamp-test.robot
@@ -7,7 +7,7 @@
Library yaml
*** Test Cases ***
-Healthcheck
+HealthcheckAcm
[Documentation] Healthcheck on Clamp Acm
${auth}= Create List runtimeUser zb!XztG34
Log Creating session http://${POLICY_RUNTIME_ACM_IP}
@@ -17,6 +17,23 @@
Log Received response from ACM healthcheck {resp.text}
Should Be Equal As Strings ${resp.status_code} 200
+HealthcheckApi
+ [Documentation] Healthcheck on policy-api
+ Wait Until Keyword Succeeds 5 min 10 sec VerifyHealthcheckApi
+
+HealthcheckPap
+ [Documentation] Healthcheck on policy-pap
+ Wait Until Keyword Succeeds 5 min 10 sec VerifyHealthcheckPap
+
+RegisterParticipants
+ [Documentation] Register Participants.
+ ${auth}= Create List runtimeUser zb!XztG34
+ Log Creating session http://${POLICY_RUNTIME_ACM_IP}
+ ${session}= Create Session policy http://${POLICY_RUNTIME_ACM_IP} auth=${auth}
+ ${resp}= PUT On Session policy /onap/policy/clamp/acm/v2/participants
+ Log Received response from runtime acm ${resp.text}
+ Should Be Equal As Strings ${resp.status_code} 202
+
CommissionAutomationComposition
[Documentation] Commission automation composition.
${auth}= Create List runtimeUser zb!XztG34
@@ -30,15 +47,6 @@
set Suite variable ${compositionId} ${respyaml["compositionId"]}
Should Be Equal As Strings ${resp.status_code} 201
-RegisterParticipants
- [Documentation] Register Participants.
- ${auth}= Create List runtimeUser zb!XztG34
- Log Creating session http://${POLICY_RUNTIME_ACM_IP}
- ${session}= Create Session policy http://${POLICY_RUNTIME_ACM_IP} auth=${auth}
- ${resp}= PUT On Session policy /onap/policy/clamp/acm/v2/participants
- Log Received response from runtime acm ${resp.text}
- Should Be Equal As Strings ${resp.status_code} 202
-
PrimeACDefinitions
[Documentation] Prime automation composition definition
${auth}= Create List runtimeUser zb!XztG34
@@ -99,7 +107,7 @@
[Documentation] Verify the new policy types created
${auth}= Create List policyadmin zb!XztG34
Sleep 10s
- Log Creating session http://${POLICY_API_IP}}:6969
+ Log Creating session http://${POLICY_API_IP}:6969
${session}= Create Session policy http://${POLICY_API_IP} auth=${auth}
${headers}= Create Dictionary Accept=application/json Content-Type=application/json
${resp}= GET On Session policy /policy/api/v1/policytypes headers=${headers}
@@ -159,6 +167,26 @@
*** Keywords ***
+VerifyHealthcheckApi
+ [Documentation] Verify Healthcheck on policy-api
+ ${auth}= Create List policyadmin zb!XztG34
+ Log Creating session http://${POLICY_API_IP}
+ ${session}= Create Session policy http://${POLICY_API_IP} auth=${auth}
+ ${headers}= Create Dictionary Accept=application/json Content-Type=application/json
+ ${resp}= GET On Session policy /policy/api/v1/health headers=${headers}
+ Log Received response from policy-api healthcheck ${resp.text}
+ Should Be Equal As Strings ${resp.status_code} 200
+
+VerifyHealthcheckPap
+ [Documentation] Verify Healthcheck on policy-pap
+ ${auth}= Create List policyadmin zb!XztG34
+ Log Creating session http://${POLICY_PAP_IP}
+ ${session}= Create Session policy http://${POLICY_PAP_IP} auth=${auth}
+ ${headers}= Create Dictionary Accept=application/json Content-Type=application/json
+ ${resp}= GET On Session policy /policy/pap/v1/health headers=${headers}
+ Log Received response from policy-pap healthcheck ${resp.text}
+ Should Be Equal As Strings ${resp.status_code} 200
+
VerifyPriming
[Arguments] ${primestate}
[Documentation] Verify the AC definitions are primed to the participants
diff --git a/csit/run-k8s-csit.sh b/csit/run-k8s-csit.sh
index 04f0a83..478d048 100755
--- a/csit/run-k8s-csit.sh
+++ b/csit/run-k8s-csit.sh
@@ -175,7 +175,7 @@
robotpod=$(sudo microk8s kubectl get po | grep policy-csit)
podName=$(echo "$robotpod" | awk '{print $1}')
echo "The robot tests will begin once the policy components {${READINESS_CONTAINERS[*]}} are up and running..."
- sudo microk8s kubectl wait --for=jsonpath='{.status.phase}'=Running --timeout=10m pod/"$podName"
+ sudo microk8s kubectl wait --for=jsonpath='{.status.phase}'=Running --timeout=18m pod/"$podName"
echo "Policy deployment status:"
sudo microk8s kubectl get po
sudo microk8s kubectl get all -A