Fix metrics validation in API jmx files

Issue-ID: POLICY-4845
Signed-off-by: rameshiyer27 <ramesh.murugan.iyer@est.tech>
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 170d3a5..5d927ff 100644 (file)
--- 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;
 }</stringProp>
           </JSR223Assertion>
@@ -6714,32 +6713,26 @@ if (prev.getResponseCode() == &apos;200&apos;) {
     assert res.contains(&quot;spring_data_repository_invocations_seconds_sum&quot;)
     assert res.contains(&quot;spring_data_repository_invocations_seconds_max&quot;)
     assert res.contains(&quot;jvm_threads_live_threads&quot;)
-    assert res.contains(&quot;http_server_requests_seconds_count{exception=\&quot;None\&quot;,method=\&quot;POST\&quot;,outcome=\&quot;SUCCESS\&quot;,status=\&quot;200\&quot;,uri=\&quot;/policy/api/v1/policytypes\&quot;,}&quot;)
-    assert res.contains(&quot;http_server_requests_seconds_count{exception=\&quot;None\&quot;,method=\&quot;GET\&quot;,outcome=\&quot;SUCCESS\&quot;,status=\&quot;200\&quot;,uri=\&quot;/metrics\&quot;,}&quot;)
-    assert res.contains(&quot;http_server_requests_seconds_count{exception=\&quot;None\&quot;,method=\&quot;DELETE\&quot;,outcome=\&quot;SUCCESS\&quot;,status=\&quot;200\&quot;,uri=\&quot;/policy/api/v1/nodetemplates/{name}/versions/{version}\&quot;,}&quot;)
-    assert res.contains(&quot;http_server_requests_seconds_count{exception=\&quot;None\&quot;,method=\&quot;GET\&quot;,outcome=\&quot;SUCCESS\&quot;,status=\&quot;200\&quot;,uri=\&quot;/policy/api/v1/healthcheck\&quot;,}&quot;)
-    assert res.contains(&quot;http_server_requests_seconds_count{exception=\&quot;None\&quot;,method=\&quot;GET\&quot;,outcome=\&quot;SUCCESS\&quot;,status=\&quot;200\&quot;,uri=\&quot;/policy/api/v1/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies/{policyId}/versions/{policyVersion}\&quot;,}&quot;)
-    assert res.contains(&quot;http_server_requests_seconds_count{exception=\&quot;None\&quot;,method=\&quot;GET\&quot;,outcome=\&quot;SUCCESS\&quot;,status=\&quot;200\&quot;,uri=\&quot;/policy/api/v1/nodetemplates/{name}/versions/{version}\&quot;,}&quot;)
-    assert res.contains(&quot;http_server_requests_seconds_count{exception=\&quot;None\&quot;,method=\&quot;DELETE\&quot;,outcome=\&quot;SUCCESS\&quot;,status=\&quot;200\&quot;,uri=\&quot;/policy/api/v1/policytypes/{policyTypeId}/versions/{versionId}\&quot;,}&quot;)
-    assert res.contains(&quot;http_server_requests_seconds_count{exception=\&quot;None\&quot;,method=\&quot;GET\&quot;,outcome=\&quot;SUCCESS\&quot;,status=\&quot;200\&quot;,uri=\&quot;/policy/api/v1/statistics\&quot;,}&quot;)
-    assert res.contains(&quot;http_server_requests_seconds_count{exception=\&quot;None\&quot;,method=\&quot;DELETE\&quot;,outcome=\&quot;SUCCESS\&quot;,status=\&quot;200\&quot;,uri=\&quot;/policy/api/v1/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies/{policyId}/versions/{policyVersion}\&quot;,}&quot;)
-    assert res.contains(&quot;http_server_requests_seconds_count{exception=\&quot;None\&quot;,method=\&quot;GET\&quot;,outcome=\&quot;SUCCESS\&quot;,status=\&quot;200\&quot;,uri=\&quot;/policy/api/v1/policytypes/{policyTypeId}\&quot;,}&quot;)
-    assert res.contains(&quot;http_server_requests_seconds_count{exception=\&quot;None\&quot;,method=\&quot;GET\&quot;,outcome=\&quot;SUCCESS\&quot;,status=\&quot;200\&quot;,uri=\&quot;/policy/api/v1/policytypes/{policyTypeId}/versions/{versionId}\&quot;,}&quot;)
-    assert res.contains(&quot;http_server_requests_seconds_count{exception=\&quot;None\&quot;,method=\&quot;POST\&quot;,outcome=\&quot;SUCCESS\&quot;,status=\&quot;200\&quot;,uri=\&quot;/policy/api/v1/nodetemplates\&quot;,}&quot;)
-    assert res.contains(&quot;http_server_requests_seconds_count{exception=\&quot;None\&quot;,method=\&quot;POST\&quot;,outcome=\&quot;SUCCESS\&quot;,status=\&quot;200\&quot;,uri=\&quot;/policy/api/v1/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies\&quot;,}&quot;)
-    assert res.contains(&quot;http_server_requests_seconds_count{exception=\&quot;None\&quot;,method=\&quot;POST\&quot;,outcome=\&quot;SUCCESS\&quot;,status=\&quot;200\&quot;,uri=\&quot;/policy/api/v1/policies\&quot;,}&quot;)
-    assert res.contains(&quot;http_server_requests_seconds_count{exception=\&quot;None\&quot;,method=\&quot;GET\&quot;,outcome=\&quot;SUCCESS\&quot;,status=\&quot;200\&quot;,uri=\&quot;/policy/api/v1/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies\&quot;,}&quot;)
-    assert res.contains(&quot;http_server_requests_seconds_count{exception=\&quot;None\&quot;,method=\&quot;GET\&quot;,outcome=\&quot;SUCCESS\&quot;,status=\&quot;200\&quot;,uri=\&quot;/policy/api/v1/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies/{policyId}/versions/latest\&quot;,}&quot;)
-    assert res.contains(&quot;http_server_requests_seconds_count{exception=\&quot;None\&quot;,method=\&quot;DELETE\&quot;,outcome=\&quot;SUCCESS\&quot;,status=\&quot;200\&quot;,uri=\&quot;/policy/api/v1/policies/{policyId}/versions/{policyVersion}\&quot;,}&quot;)
+    assert res.contains(&quot;http_server_requests_seconds_count{error=\&quot;none\&quot;,exception=\&quot;none\&quot;,method=\&quot;POST\&quot;,outcome=\&quot;SUCCESS\&quot;,status=\&quot;200\&quot;,uri=\&quot;/policytypes\&quot;,}&quot;)
+    assert res.contains(&quot;http_server_requests_seconds_count{error=\&quot;none\&quot;,exception=\&quot;none\&quot;,method=\&quot;DELETE\&quot;,outcome=\&quot;SUCCESS\&quot;,status=\&quot;200\&quot;,uri=\&quot;/nodetemplates/{name}/versions/{version}\&quot;,}&quot;)
+    assert res.contains(&quot;http_server_requests_seconds_count{error=\&quot;none\&quot;,exception=\&quot;none\&quot;,method=\&quot;GET\&quot;,outcome=\&quot;SUCCESS\&quot;,status=\&quot;200\&quot;,uri=\&quot;/healthcheck\&quot;,}&quot;)
+    assert res.contains(&quot;http_server_requests_seconds_count{error=\&quot;none\&quot;,exception=\&quot;none\&quot;,method=\&quot;GET\&quot;,outcome=\&quot;SUCCESS\&quot;,status=\&quot;200\&quot;,uri=\&quot;/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies/{policyId}/versions/{policyVersion}\&quot;,}&quot;)
+    assert res.contains(&quot;http_server_requests_seconds_count{error=\&quot;none\&quot;,exception=\&quot;none\&quot;,method=\&quot;GET\&quot;,outcome=\&quot;SUCCESS\&quot;,status=\&quot;200\&quot;,uri=\&quot;/nodetemplates/{name}/versions/{version}\&quot;,}&quot;)
+    assert res.contains(&quot;http_server_requests_seconds_count{error=\&quot;none\&quot;,exception=\&quot;none\&quot;,method=\&quot;DELETE\&quot;,outcome=\&quot;SUCCESS\&quot;,status=\&quot;200\&quot;,uri=\&quot;/policytypes/{policyTypeId}/versions/{versionId}\&quot;,}&quot;)
+    assert res.contains(&quot;http_server_requests_seconds_count{error=\&quot;none\&quot;,exception=\&quot;none\&quot;,method=\&quot;DELETE\&quot;,outcome=\&quot;SUCCESS\&quot;,status=\&quot;200\&quot;,uri=\&quot;/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies/{policyId}/versions/{policyVersion}\&quot;,}&quot;)
+    assert res.contains(&quot;http_server_requests_seconds_count{error=\&quot;none\&quot;,exception=\&quot;none\&quot;,method=\&quot;GET\&quot;,outcome=\&quot;SUCCESS\&quot;,status=\&quot;200\&quot;,uri=\&quot;/policytypes/{policyTypeId}\&quot;,}&quot;)
+    assert res.contains(&quot;http_server_requests_seconds_count{error=\&quot;none\&quot;,exception=\&quot;none\&quot;,method=\&quot;GET\&quot;,outcome=\&quot;SUCCESS\&quot;,status=\&quot;200\&quot;,uri=\&quot;/policytypes/{policyTypeId}/versions/{versionId}\&quot;,}&quot;)
+    assert res.contains(&quot;http_server_requests_seconds_count{error=\&quot;none\&quot;,exception=\&quot;none\&quot;,method=\&quot;POST\&quot;,outcome=\&quot;SUCCESS\&quot;,status=\&quot;200\&quot;,uri=\&quot;/nodetemplates\&quot;,}&quot;)
+    assert res.contains(&quot;http_server_requests_seconds_count{error=\&quot;none\&quot;,exception=\&quot;none\&quot;,method=\&quot;POST\&quot;,outcome=\&quot;SUCCESS\&quot;,status=\&quot;200\&quot;,uri=\&quot;/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies\&quot;,}&quot;)
+    assert res.contains(&quot;http_server_requests_seconds_count{error=\&quot;none\&quot;,exception=\&quot;none\&quot;,method=\&quot;POST\&quot;,outcome=\&quot;SUCCESS\&quot;,status=\&quot;200\&quot;,uri=\&quot;/policies\&quot;,}&quot;)
+    assert res.contains(&quot;http_server_requests_seconds_count{error=\&quot;none\&quot;,exception=\&quot;none\&quot;,method=\&quot;GET\&quot;,outcome=\&quot;SUCCESS\&quot;,status=\&quot;200\&quot;,uri=\&quot;/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies\&quot;,}&quot;)
+    assert res.contains(&quot;http_server_requests_seconds_count{error=\&quot;none\&quot;,exception=\&quot;none\&quot;,method=\&quot;GET\&quot;,outcome=\&quot;SUCCESS\&quot;,status=\&quot;200\&quot;,uri=\&quot;/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies/{policyId}/versions/latest\&quot;,}&quot;)
+    assert res.contains(&quot;http_server_requests_seconds_count{error=\&quot;none\&quot;,exception=\&quot;none\&quot;,method=\&quot;DELETE\&quot;,outcome=\&quot;SUCCESS\&quot;,status=\&quot;200\&quot;,uri=\&quot;/policies/{policyId}/versions/{policyVersion}\&quot;,}&quot;)
 }</stringProp>
           </JSR223Assertion>
           <hashTree/>
           <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
             <collectionProp name="HeaderManager.headers">
-              <elementProp name="" elementType="Header">
-                <stringProp name="Header.name"></stringProp>
-                <stringProp name="Header.value"></stringProp>
-              </elementProp>
               <elementProp name="" elementType="Header">
                 <stringProp name="Header.name">Accept</stringProp>
                 <stringProp name="Header.value">text/plain</stringProp>
@@ -6896,7 +6889,7 @@ if (prev.getResponseCode() == &apos;200&apos;) {
             <connectTime>true</connectTime>
           </value>
         </objProp>
-        <stringProp name="filename">/Users/prakhapa/Downloads/performanceTestResultsPolicyApi.jtl</stringProp>
+        <stringProp name="filename">/home/ramesh/s3pTestResults.jtl</stringProp>
       </ResultCollector>
       <hashTree/>
       <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="true">
@@ -6933,7 +6926,7 @@ if (prev.getResponseCode() == &apos;200&apos;) {
             <connectTime>true</connectTime>
           </value>
         </objProp>
-        <stringProp name="filename">/Users/prakhapa/Downloads/performanceTestResultsPolicyApi.jtl</stringProp>
+        <stringProp name="filename">/home/ramesh/s3pTestResults.jtl</stringProp>
       </ResultCollector>
       <hashTree/>
       <ResultCollector guiclass="TableVisualizer" testclass="ResultCollector" testname="View Results in Table" enabled="true">

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 cb8b213..a1514d8 100644 (file)
--- 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}\",}")
 }</stringProp>
           </JSR223Assertion>
           <hashTree/>
@@ -6892,7 +6891,7 @@ if (prev.getResponseCode() == &apos;200&apos;) {
             <connectTime>true</connectTime>
           </value>
         </objProp>
-        <stringProp name="filename">/home/ramesh/s3pTestResults.jtl</stringProp>
+        <stringProp name="filename">C:\Users\Ramesh\s3pTestResults.jtl</stringProp>
       </ResultCollector>
       <hashTree/>
       <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="true">
@@ -6929,7 +6928,7 @@ if (prev.getResponseCode() == &apos;200&apos;) {
             <connectTime>true</connectTime>
           </value>
         </objProp>
-        <stringProp name="filename">/home/ramesh/s3pTestResults.jtl</stringProp>
+        <stringProp name="filename">C:\Users\Ramesh\s3pTestResults.jtl</stringProp>
       </ResultCollector>
       <hashTree/>
       <ResultCollector guiclass="TableVisualizer" testclass="ResultCollector" testname="View Results in Table" enabled="true">