Fix PAP metrics validation in jmx files

Issue-ID: POLICY-4846
Signed-off-by: rameshiyer27 <ramesh.murugan.iyer@est.tech>
Change-Id: I79e17927f9e50f28ba8159d63ad6317eaaa2deaf

diff --git a/testsuites/performance/src/main/resources/testplans/performance.jmx b/testsuites/performance/src/main/resources/testplans/performance.jmx
index c88397c..f237055 100644 (file)
--- a/testsuites/performance/src/main/resources/testplans/performance.jmx
+++ b/testsuites/performance/src/main/resources/testplans/performance.jmx
@@ -1035,21 +1035,22 @@ if (prev.getResponseCode() == '200') {
             <stringProp name="script">
 if (prev.getResponseCode() == &apos;200&apos;) {
     def res = prev.getResponseDataAsString();
-    assert res.contains(&apos;http_server_requests_seconds_count{exception=&quot;None&quot;,method=&quot;GET&quot;,outcome=&quot;SUCCESS&quot;,status=&quot;200&quot;,uri=&quot;/policy/pap/v1/healthcheck&quot;,}&apos;);
+    assert res.contains(&apos;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;,}&apos;);
 
+    
     def newSimpleDeployAPICount =  &apos;0&apos;;
-    if (res.contains(&apos;http_server_requests_seconds_count{exception=&quot;None&quot;,method=&quot;POST&quot;,outcome=&quot;SUCCESS&quot;,status=&quot;202&quot;,uri=&quot;/policy/pap/v1/pdps/policies&quot;,} &apos;)) {
-       newSimpleDeployAPICount = (res =~ /http_server_requests_seconds_count\{exception=&quot;None&quot;,method=&quot;POST&quot;,outcome=&quot;SUCCESS&quot;,status=&quot;202&quot;,uri=&quot;\/policy\/pap\/v1\/pdps\/policies&quot;,\} ([0-9]+)?([.]*[0-9]*)?/)[0][1]
+    if (res.contains(&apos;http_server_requests_seconds_count{error=&quot;none&quot;,exception=&quot;none&quot;,method=&quot;POST&quot;,outcome=&quot;SUCCESS&quot;,status=&quot;202&quot;,uri=&quot;/pdps/policies&quot;,} &apos;)) {
+       newSimpleDeployAPICount = (res =~ /http_server_requests_seconds_count\{error=&quot;none&quot;,exception=&quot;none&quot;,method=&quot;POST&quot;,outcome=&quot;SUCCESS&quot;,status=&quot;202&quot;,uri=&quot;\/pdps\/policies&quot;,\} ([0-9]+)?([.]*[0-9]*)?/)[0][1]
     }
 
     def newBatchDeploymentAPICount =  &apos;0&apos;;
-    if (res.contains(&apos;http_server_requests_seconds_count{exception=&quot;None&quot;,method=&quot;POST&quot;,outcome=&quot;SUCCESS&quot;,status=&quot;202&quot;,uri=&quot;/policy/pap/v1/pdps/deployments/batch&quot;,} &apos;)) {
-       newBatchDeploymentAPICount = (res =~ /http_server_requests_seconds_count\{exception=&quot;None&quot;,method=&quot;POST&quot;,outcome=&quot;SUCCESS&quot;,status=&quot;202&quot;,uri=&quot;\/policy\/pap\/v1\/pdps\/deployments\/batch&quot;,\} ([0-9]+)?([.]*[0-9]*)?/)[0][1]
+    if (res.contains(&apos;http_server_requests_seconds_count{error=&quot;none&quot;,exception=&quot;none&quot;,method=&quot;POST&quot;,outcome=&quot;SUCCESS&quot;,status=&quot;202&quot;,uri=&quot;/pdps/deployments/batch&quot;,} &apos;)) {
+       newBatchDeploymentAPICount = (res =~ /http_server_requests_seconds_count\{error=&quot;none&quot;,exception=&quot;none&quot;,method=&quot;POST&quot;,outcome=&quot;SUCCESS&quot;,status=&quot;202&quot;,uri=&quot;\/pdps\/deployments\/batch&quot;,\} ([0-9]+)?([.]*[0-9]*)?/)[0][1]
     }
 
     assert Long.valueOf(vars.get(&quot;simpleDeployAPICount&quot;)) &lt; Long.valueOf(newSimpleDeployAPICount);
     assert Long.valueOf(vars.get(&quot;batchDeploymentAPICount&quot;)) &lt; Long.valueOf(newBatchDeploymentAPICount);
-    
+
 }</stringProp>
           </JSR223Assertion>
           <hashTree/>
@@ -1247,7 +1248,7 @@ if (prev.getResponseCode() == &apos;200&apos;) {
             <connectTime>true</connectTime>
           </value>
         </objProp>
-        <stringProp name="filename">/home/asreekumar/s3p/resultTable.log</stringProp>
+        <stringProp name="filename">/home/ramesh/s3pTestResults.jtl</stringProp>
       </ResultCollector>
       <hashTree/>
     </hashTree>

diff --git a/testsuites/stability/src/main/resources/testplans/stability.jmx b/testsuites/stability/src/main/resources/testplans/stability.jmx
index a7c17b0..d4f95d7 100644 (file)
--- a/testsuites/stability/src/main/resources/testplans/stability.jmx
+++ b/testsuites/stability/src/main/resources/testplans/stability.jmx
@@ -11301,23 +11301,23 @@ if (prev.getResponseCode() == '200') {
     }
 
     def newSimpleDeployAPICount =  '0';
-    if (res.contains('http_server_requests_seconds_count{exception="None",method="POST",outcome="SUCCESS",status="202",uri="/policy/pap/v1/pdps/policies",} ')) {
-       newSimpleDeployAPICount = (res =~ /http_server_requests_seconds_count\{exception="None",method="POST",outcome="SUCCESS",status="202",uri="\/policy\/pap\/v1\/pdps\/policies",\} ([0-9]+)?([.]*[0-9]*)?/)[0][1]
+    if (res.contains('http_server_requests_seconds_count{error="none",exception="none",method="POST",outcome="SUCCESS",status="202",uri="/pdps/policies",} ')) {
+       newSimpleDeployAPICount = (res =~ /http_server_requests_seconds_count\{error="none",exception="none",method="POST",outcome="SUCCESS",status="202",uri="\/pdps\/policies",\} ([0-9]+)?([.]*[0-9]*)?/)[0][1]
     }
     def newSimpleUndeployAPICount =  '0';
-    if (res.contains('http_server_requests_seconds_count{exception="None",method="DELETE",outcome="SUCCESS",status="202",uri="/policy/pap/v1/pdps/policies/{name}",} ')) {
-       newSimpleUndeployAPICount = (res =~ /http_server_requests_seconds_count\{exception="None",method="DELETE",outcome="SUCCESS",status="202",uri="\/policy\/pap\/v1\/pdps\/policies\/\{name\}",\} ([0-9]+)?([.]*[0-9]*)?/)[0][1]
+    if (res.contains('http_server_requests_seconds_count{error="none",exception="none",method="DELETE",outcome="SUCCESS",status="202",uri="/pdps/policies/{name}",} ')) {
+       newSimpleUndeployAPICount = (res =~ /http_server_requests_seconds_count\{error="none",exception="none",method="DELETE",outcome="SUCCESS",status="202",uri="\/pdps\/policies\/\{name\}",\} ([0-9]+)?([.]*[0-9]*)?/)[0][1]
     }
     def newBatchDeploymentAPICount =  '0';
-    if (res.contains('http_server_requests_seconds_count{exception="None",method="POST",outcome="SUCCESS",status="202",uri="/policy/pap/v1/pdps/deployments/batch",} ')) {
-       newBatchDeploymentAPICount = (res =~ /http_server_requests_seconds_count\{exception="None",method="POST",outcome="SUCCESS",status="202",uri="\/policy\/pap\/v1\/pdps\/deployments\/batch",\} ([0-9]+)?([.]*[0-9]*)?/)[0][1]
+    if (res.contains('http_server_requests_seconds_count{error="none",exception="none",method="POST",outcome="SUCCESS",status="202",uri="/pdps/deployments/batch",} ')) {
+       newBatchDeploymentAPICount = (res =~ /http_server_requests_seconds_count\{error="none",exception="none",method="POST",outcome="SUCCESS",status="202",uri="\/pdps\/deployments\/batch",\} ([0-9]+)?([.]*[0-9]*)?/)[0][1]
     }
     log.info("newDeploySuccessCount: "+ newDeploySuccessCount);
     log.info("newUndeploySuccessCount: "+ newUndeploySuccessCount);
     log.info("newBatchDeploymentAPICount: "+ newBatchDeploymentAPICount);
     log.info("newSimpleDeployAPICount: "+ newSimpleDeployAPICount);
     log.info("newSimpleUndeployAPICount: "+ newSimpleUndeployAPICount);
-    
+
     assert Long.valueOf(vars.get("deployFailureCount")) == Long.valueOf(newDeployFailureCount);
     assert Long.valueOf(vars.get("undeployFailureCount")) == Long.valueOf(newUndeployFailureCount);
     // One policy is deployed/undeployed using batch API and the other one using simple APIs
@@ -11326,7 +11326,7 @@ if (prev.getResponseCode() == '200') {
     assert (Long.valueOf(vars.get("batchDeploymentAPICount"))+2) <= Long.valueOf(newBatchDeploymentAPICount);
     assert (Long.valueOf(vars.get("deploySuccessCount"))+2) <= Long.valueOf(newDeploySuccessCount);
     assert (Long.valueOf(vars.get("undeploySuccessCount"))+2) <= Long.valueOf(newUndeploySuccessCount);
-    
+
 }</stringProp>
           </JSR223Assertion>
           <hashTree/>
@@ -11563,7 +11563,7 @@ if (prev.getResponseCode() == &apos;200&apos;) {
             <connectTime>true</connectTime>
           </value>
         </objProp>
-        <stringProp name="filename">/home/asreekumar/s3p/resultSummary.jtl</stringProp>
+        <stringProp name="filename">/home/ramesh/s3pTestResults.jtl</stringProp>
       </ResultCollector>
       <hashTree/>
       <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="true">
@@ -11637,7 +11637,7 @@ if (prev.getResponseCode() == &apos;200&apos;) {
             <connectTime>true</connectTime>
           </value>
         </objProp>
-        <stringProp name="filename">/home/asreekumar/s3p/resultTable.log</stringProp>
+        <stringProp name="filename">/home/ramesh/s3pTestResults.jtl</stringProp>
       </ResultCollector>
       <hashTree/>
     </hashTree>