From: rameshiyer27 Date: Thu, 23 Nov 2023 11:56:30 +0000 (+0000) Subject: Fix metrics validation in API jmx files X-Git-Tag: 3.1.0~3 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fapi.git;a=commitdiff_plain;h=55dce11197ad74b84c07764072015444949be2ed Fix metrics validation in API jmx files Issue-ID: POLICY-4845 Signed-off-by: rameshiyer27 Change-Id: I6933f2e88ab09cd5fedb1772b139c2e895b33f00 --- diff --git a/testsuites/performance/src/main/resources/testplans/policy_api_performance.jmx b/testsuites/performance/src/main/resources/testplans/policy_api_performance.jmx index 170d3a56..5d927ffc 100644 --- a/testsuites/performance/src/main/resources/testplans/policy_api_performance.jmx +++ b/testsuites/performance/src/main/resources/testplans/policy_api_performance.jmx @@ -158,7 +158,6 @@ if (prev.getResponseCode() == '200') { assert res instanceof Map; assert res.policy_types instanceof Map; assert res.policy_types.size() == 37; - assert res.node_types instanceof Map; assert res.data_types instanceof Map; } @@ -6714,32 +6713,26 @@ if (prev.getResponseCode() == '200') { assert res.contains("spring_data_repository_invocations_seconds_sum") assert res.contains("spring_data_repository_invocations_seconds_max") assert res.contains("jvm_threads_live_threads") - assert res.contains("http_server_requests_seconds_count{exception=\"None\",method=\"POST\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policy/api/v1/policytypes\",}") - assert res.contains("http_server_requests_seconds_count{exception=\"None\",method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"/metrics\",}") - assert res.contains("http_server_requests_seconds_count{exception=\"None\",method=\"DELETE\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policy/api/v1/nodetemplates/{name}/versions/{version}\",}") - assert res.contains("http_server_requests_seconds_count{exception=\"None\",method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policy/api/v1/healthcheck\",}") - assert res.contains("http_server_requests_seconds_count{exception=\"None\",method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policy/api/v1/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies/{policyId}/versions/{policyVersion}\",}") - assert res.contains("http_server_requests_seconds_count{exception=\"None\",method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policy/api/v1/nodetemplates/{name}/versions/{version}\",}") - assert res.contains("http_server_requests_seconds_count{exception=\"None\",method=\"DELETE\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policy/api/v1/policytypes/{policyTypeId}/versions/{versionId}\",}") - assert res.contains("http_server_requests_seconds_count{exception=\"None\",method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policy/api/v1/statistics\",}") - assert res.contains("http_server_requests_seconds_count{exception=\"None\",method=\"DELETE\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policy/api/v1/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies/{policyId}/versions/{policyVersion}\",}") - assert res.contains("http_server_requests_seconds_count{exception=\"None\",method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policy/api/v1/policytypes/{policyTypeId}\",}") - assert res.contains("http_server_requests_seconds_count{exception=\"None\",method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policy/api/v1/policytypes/{policyTypeId}/versions/{versionId}\",}") - assert res.contains("http_server_requests_seconds_count{exception=\"None\",method=\"POST\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policy/api/v1/nodetemplates\",}") - assert res.contains("http_server_requests_seconds_count{exception=\"None\",method=\"POST\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policy/api/v1/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies\",}") - assert res.contains("http_server_requests_seconds_count{exception=\"None\",method=\"POST\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policy/api/v1/policies\",}") - assert res.contains("http_server_requests_seconds_count{exception=\"None\",method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policy/api/v1/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies\",}") - assert res.contains("http_server_requests_seconds_count{exception=\"None\",method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policy/api/v1/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies/{policyId}/versions/latest\",}") - assert res.contains("http_server_requests_seconds_count{exception=\"None\",method=\"DELETE\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policy/api/v1/policies/{policyId}/versions/{policyVersion}\",}") + assert res.contains("http_server_requests_seconds_count{error=\"none\",exception=\"none\",method=\"POST\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policytypes\",}") + assert res.contains("http_server_requests_seconds_count{error=\"none\",exception=\"none\",method=\"DELETE\",outcome=\"SUCCESS\",status=\"200\",uri=\"/nodetemplates/{name}/versions/{version}\",}") + assert res.contains("http_server_requests_seconds_count{error=\"none\",exception=\"none\",method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"/healthcheck\",}") + assert res.contains("http_server_requests_seconds_count{error=\"none\",exception=\"none\",method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies/{policyId}/versions/{policyVersion}\",}") + assert res.contains("http_server_requests_seconds_count{error=\"none\",exception=\"none\",method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"/nodetemplates/{name}/versions/{version}\",}") + assert res.contains("http_server_requests_seconds_count{error=\"none\",exception=\"none\",method=\"DELETE\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policytypes/{policyTypeId}/versions/{versionId}\",}") + assert res.contains("http_server_requests_seconds_count{error=\"none\",exception=\"none\",method=\"DELETE\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies/{policyId}/versions/{policyVersion}\",}") + assert res.contains("http_server_requests_seconds_count{error=\"none\",exception=\"none\",method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policytypes/{policyTypeId}\",}") + assert res.contains("http_server_requests_seconds_count{error=\"none\",exception=\"none\",method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policytypes/{policyTypeId}/versions/{versionId}\",}") + assert res.contains("http_server_requests_seconds_count{error=\"none\",exception=\"none\",method=\"POST\",outcome=\"SUCCESS\",status=\"200\",uri=\"/nodetemplates\",}") + assert res.contains("http_server_requests_seconds_count{error=\"none\",exception=\"none\",method=\"POST\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies\",}") + assert res.contains("http_server_requests_seconds_count{error=\"none\",exception=\"none\",method=\"POST\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policies\",}") + assert res.contains("http_server_requests_seconds_count{error=\"none\",exception=\"none\",method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies\",}") + assert res.contains("http_server_requests_seconds_count{error=\"none\",exception=\"none\",method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies/{policyId}/versions/latest\",}") + assert res.contains("http_server_requests_seconds_count{error=\"none\",exception=\"none\",method=\"DELETE\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policies/{policyId}/versions/{policyVersion}\",}") } - - - - Accept text/plain @@ -6896,7 +6889,7 @@ if (prev.getResponseCode() == '200') { true - /Users/prakhapa/Downloads/performanceTestResultsPolicyApi.jtl + /home/ramesh/s3pTestResults.jtl @@ -6933,7 +6926,7 @@ if (prev.getResponseCode() == '200') { true - /Users/prakhapa/Downloads/performanceTestResultsPolicyApi.jtl + /home/ramesh/s3pTestResults.jtl diff --git a/testsuites/stability/src/main/resources/testplans/policy_api_stability.jmx b/testsuites/stability/src/main/resources/testplans/policy_api_stability.jmx index cb8b2133..a1514d8d 100644 --- a/testsuites/stability/src/main/resources/testplans/policy_api_stability.jmx +++ b/testsuites/stability/src/main/resources/testplans/policy_api_stability.jmx @@ -6713,24 +6713,23 @@ if (prev.getResponseCode() == '200') { assert res.contains("spring_data_repository_invocations_seconds_sum") assert res.contains("spring_data_repository_invocations_seconds_max") assert res.contains("jvm_threads_live_threads") - assert res.contains("http_server_requests_seconds_count{exception=\"None\",method=\"POST\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policy/api/v1/policytypes\",}") - assert res.contains("http_server_requests_seconds_count{exception=\"None\",method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policy/api/v1/metrics\",}") - assert res.contains("http_server_requests_seconds_count{exception=\"None\",method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policy/api/v1/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies/{policyId}\",}") - assert res.contains("http_server_requests_seconds_count{exception=\"None\",method=\"DELETE\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policy/api/v1/nodetemplates/{name}/versions/{version}\",}") - assert res.contains("http_server_requests_seconds_count{exception=\"None\",method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policy/api/v1/healthcheck\",}") - assert res.contains("http_server_requests_seconds_count{exception=\"None\",method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policy/api/v1/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies/{policyId}/versions/{policyVersion}\",}") - assert res.contains("http_server_requests_seconds_count{exception=\"None\",method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policy/api/v1/nodetemplates/{name}/versions/{version}\",}") - assert res.contains("http_server_requests_seconds_count{exception=\"None\",method=\"DELETE\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policy/api/v1/policytypes/{policyTypeId}/versions/{versionId}\",}") - assert res.contains("http_server_requests_seconds_count{exception=\"None\",method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policy/api/v1/statistics\",}") - assert res.contains("http_server_requests_seconds_count{exception=\"None\",method=\"DELETE\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policy/api/v1/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies/{policyId}/versions/{policyVersion}\",}") - assert res.contains("http_server_requests_seconds_count{exception=\"None\",method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policy/api/v1/policytypes/{policyTypeId}\",}") - assert res.contains("http_server_requests_seconds_count{exception=\"None\",method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policy/api/v1/policytypes/{policyTypeId}/versions/{versionId}\",}") - assert res.contains("http_server_requests_seconds_count{exception=\"None\",method=\"POST\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policy/api/v1/nodetemplates\",}") - assert res.contains("http_server_requests_seconds_count{exception=\"None\",method=\"POST\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policy/api/v1/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies\",}") - assert res.contains("http_server_requests_seconds_count{exception=\"None\",method=\"POST\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policy/api/v1/policies\",}") - assert res.contains("http_server_requests_seconds_count{exception=\"None\",method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policy/api/v1/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies\",}") - assert res.contains("http_server_requests_seconds_count{exception=\"None\",method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policy/api/v1/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies/{policyId}/versions/latest\",}") - assert res.contains("http_server_requests_seconds_count{exception=\"None\",method=\"DELETE\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policy/api/v1/policies/{policyId}/versions/{policyVersion}\",}") + assert res.contains("http_server_requests_seconds_count{error=\"none\",exception=\"none\",method=\"POST\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policytypes\",}") + + assert res.contains("http_server_requests_seconds_count{error=\"none\",exception=\"none\",method=\"DELETE\",outcome=\"SUCCESS\",status=\"200\",uri=\"/nodetemplates/{name}/versions/{version}\",}") + assert res.contains("http_server_requests_seconds_count{error=\"none\",exception=\"none\",method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"/healthcheck\",}") + assert res.contains("http_server_requests_seconds_count{error=\"none\",exception=\"none\",method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies/{policyId}/versions/{policyVersion}\",}") + assert res.contains("http_server_requests_seconds_count{error=\"none\",exception=\"none\",method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"/nodetemplates/{name}/versions/{version}\",}") + assert res.contains("http_server_requests_seconds_count{error=\"none\",exception=\"none\",method=\"DELETE\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policytypes/{policyTypeId}/versions/{versionId}\",}") + + assert res.contains("http_server_requests_seconds_count{error=\"none\",exception=\"none\",method=\"DELETE\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies/{policyId}/versions/{policyVersion}\",}") + assert res.contains("http_server_requests_seconds_count{error=\"none\",exception=\"none\",method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policytypes/{policyTypeId}\",}") + assert res.contains("http_server_requests_seconds_count{error=\"none\",exception=\"none\",method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policytypes/{policyTypeId}/versions/{versionId}\",}") + assert res.contains("http_server_requests_seconds_count{error=\"none\",exception=\"none\",method=\"POST\",outcome=\"SUCCESS\",status=\"200\",uri=\"/nodetemplates\",}") + assert res.contains("http_server_requests_seconds_count{error=\"none\",exception=\"none\",method=\"POST\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies\",}") + assert res.contains("http_server_requests_seconds_count{error=\"none\",exception=\"none\",method=\"POST\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policies\",}") + assert res.contains("http_server_requests_seconds_count{error=\"none\",exception=\"none\",method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies\",}") + assert res.contains("http_server_requests_seconds_count{error=\"none\",exception=\"none\",method=\"GET\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies/{policyId}/versions/latest\",}") + assert res.contains("http_server_requests_seconds_count{error=\"none\",exception=\"none\",method=\"DELETE\",outcome=\"SUCCESS\",status=\"200\",uri=\"/policies/{policyId}/versions/{policyVersion}\",}") } @@ -6892,7 +6891,7 @@ if (prev.getResponseCode() == '200') { true - /home/ramesh/s3pTestResults.jtl + C:\Users\Ramesh\s3pTestResults.jtl @@ -6929,7 +6928,7 @@ if (prev.getResponseCode() == '200') { true - /home/ramesh/s3pTestResults.jtl + C:\Users\Ramesh\s3pTestResults.jtl