From 218b32432a5d96cbbf09bcbc7ba0ff2ecd5be4bf Mon Sep 17 00:00:00 2001 From: waynedunican Date: Tue, 25 Feb 2025 08:12:19 +0000 Subject: Update CSIT metric tests Removal of comma after pdpa metrics in Apex tests Removal of decisions_created metric test in Xacml - not needed Issue-ID: POLICY-5190 Change-Id: Icbc4cb0f75a48b207e49d7104cb77427b1c4e121 Signed-off-by: waynedunican --- csit/resources/tests/apex-pdp-test.robot | 18 +++++++++--------- csit/resources/tests/xacml-pdp-slas.robot | 7 ------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/csit/resources/tests/apex-pdp-test.robot b/csit/resources/tests/apex-pdp-test.robot index cf4c713d..0de2b908 100644 --- a/csit/resources/tests/apex-pdp-test.robot +++ b/csit/resources/tests/apex-pdp-test.robot @@ -58,20 +58,20 @@ Metrics [Documentation] Verify policy-apex-pdp is exporting prometheus metrics ${auth}= PolicyAdminAuth ${resp}= PerformGetRequest ${APEX_IP} /metrics 200 null ${auth} - Should Contain ${resp.text} pdpa_policy_deployments_total{operation="deploy",status="TOTAL",} 3.0 - Should Contain ${resp.text} pdpa_policy_deployments_total{operation="deploy",status="SUCCESS",} 3.0 - Should Contain ${resp.text} pdpa_policy_executions_total{status="SUCCESS",} 3.0 - Should Contain ${resp.text} pdpa_policy_executions_total{status="TOTAL",} 3.0 - Should Match ${resp.text} *pdpa_engine_event_executions{engine_instance_id="NSOApexEngine-*:0.0.1",}* - Should Match ${resp.text} *pdpa_engine_event_executions{engine_instance_id="MyApexEngine-*:0.0.1",}* - Should Match ${resp.text} *pdpa_engine_state{engine_instance_id=*,} 2.0* + Should Contain ${resp.text} pdpa_policy_deployments_total{operation="deploy",status="TOTAL"} 3.0 + Should Contain ${resp.text} pdpa_policy_deployments_total{operation="deploy",status="SUCCESS"} 3.0 + Should Contain ${resp.text} pdpa_policy_executions_total{status="SUCCESS"} 3.0 + Should Contain ${resp.text} pdpa_policy_executions_total{status="TOTAL"} 3.0 + Should Match ${resp.text} *pdpa_engine_event_executions{engine_instance_id="NSOApexEngine-*:0.0.1"}* + Should Match ${resp.text} *pdpa_engine_event_executions{engine_instance_id="MyApexEngine-*:0.0.1"}* + Should Match ${resp.text} *pdpa_engine_state{engine_instance_id=*} 2.0* Should Contain ${resp.text} pdpa_engine_event_executions Should Contain ${resp.text} pdpa_engine_average_execution_time_seconds Should Contain ${resp.text} pdpa_engine_last_execution_time_bucket Should Contain ${resp.text} pdpa_engine_last_execution_time_count Should Contain ${resp.text} pdpa_engine_last_execution_time_sum - Should Match ${resp.text} *pdpa_engine_last_start_timestamp_epoch{engine_instance_id="NSOApexEngine-*:0.0.1",}*E12* - Should Match ${resp.text} *pdpa_engine_last_start_timestamp_epoch{engine_instance_id="MyApexEngine-*:0.0.1",}*E12* + Should Match ${resp.text} *pdpa_engine_last_start_timestamp_epoch{engine_instance_id="NSOApexEngine-*:0.0.1"}*E12* + Should Match ${resp.text} *pdpa_engine_last_start_timestamp_epoch{engine_instance_id="MyApexEngine-*:0.0.1"}*E12* Should Contain ${resp.text} jvm_threads_current *** Keywords *** diff --git a/csit/resources/tests/xacml-pdp-slas.robot b/csit/resources/tests/xacml-pdp-slas.robot index e3d2d910..98a44a80 100644 --- a/csit/resources/tests/xacml-pdp-slas.robot +++ b/csit/resources/tests/xacml-pdp-slas.robot @@ -7,13 +7,6 @@ WaitForPrometheusServer [Documentation] Sleep time to wait for Prometheus server to gather all metrics Sleep 1 minute -ValidatePolicyDecisionsGauge - [Documentation] Validate policy execution gauge using prometheus metrics - ValidatePrometheusMetric pdpx_policy_decisions_created{application="optimization",status="permit", instance="policy-xacml-pdp:6969", job="xacml-pdp-metrics"} 1.8E9 - ValidatePrometheusMetric pdpx_policy_decisions_created{application="guard",status="not_applicable", instance="policy-xacml-pdp:6969", job="xacml-pdp-metrics"} 1.8E9 - ValidatePrometheusMetric pdpx_policy_decisions_created{application="monitoring",status="permit", instance="policy-xacml-pdp:6969", job="xacml-pdp-metrics"} 1.8E9 - ValidatePrometheusMetric pdpx_policy_decisions_created{application="naming",status="permit", instance="policy-xacml-pdp:6969", job="xacml-pdp-metrics"} 1.8E9 - ValidatePolicyDecisionsTotalCounter [Documentation] Validate policy decision counters using prometheus metrics ValidatePrometheusMetric pdpx_policy_decisions_total{application="optimization",status="permit", instance="policy-xacml-pdp:6969", job="xacml-pdp-metrics"} 1 -- cgit