summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrameshiyer27 <ramesh.murugan.iyer@est.tech>2023-11-16 11:48:11 +0000
committerrameshiyer27 <ramesh.murugan.iyer@est.tech>2023-11-16 11:55:47 +0000
commit42aa3913332e6e26cdbb327770c837e20ba7adb8 (patch)
tree42726de11775c091894612df2648adf379a26c3e
parent38cdc5826c03ac5b7f151cc26c6bf086edc2a699 (diff)
Fix PAP metrics validation in jmx files
Issue-ID: POLICY-4846 Signed-off-by: rameshiyer27 <ramesh.murugan.iyer@est.tech> Change-Id: I79e17927f9e50f28ba8159d63ad6317eaaa2deaf
-rw-r--r--testsuites/performance/src/main/resources/testplans/performance.jmx15
-rw-r--r--testsuites/stability/src/main/resources/testplans/stability.jmx20
2 files changed, 18 insertions, 17 deletions
diff --git a/testsuites/performance/src/main/resources/testplans/performance.jmx b/testsuites/performance/src/main/resources/testplans/performance.jmx
index c88397c7..f2370551 100644
--- 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() == &apos;200&apos;) {
<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 a7c17b01..d4f95d7f 100644
--- 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() == &apos;200&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 newSimpleUndeployAPICount = &apos;0&apos;;
- if (res.contains(&apos;http_server_requests_seconds_count{exception=&quot;None&quot;,method=&quot;DELETE&quot;,outcome=&quot;SUCCESS&quot;,status=&quot;202&quot;,uri=&quot;/policy/pap/v1/pdps/policies/{name}&quot;,} &apos;)) {
- newSimpleUndeployAPICount = (res =~ /http_server_requests_seconds_count\{exception=&quot;None&quot;,method=&quot;DELETE&quot;,outcome=&quot;SUCCESS&quot;,status=&quot;202&quot;,uri=&quot;\/policy\/pap\/v1\/pdps\/policies\/\{name\}&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;DELETE&quot;,outcome=&quot;SUCCESS&quot;,status=&quot;202&quot;,uri=&quot;/pdps/policies/{name}&quot;,} &apos;)) {
+ newSimpleUndeployAPICount = (res =~ /http_server_requests_seconds_count\{error=&quot;none&quot;,exception=&quot;none&quot;,method=&quot;DELETE&quot;,outcome=&quot;SUCCESS&quot;,status=&quot;202&quot;,uri=&quot;\/pdps\/policies\/\{name\}&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]
}
log.info(&quot;newDeploySuccessCount: &quot;+ newDeploySuccessCount);
log.info(&quot;newUndeploySuccessCount: &quot;+ newUndeploySuccessCount);
log.info(&quot;newBatchDeploymentAPICount: &quot;+ newBatchDeploymentAPICount);
log.info(&quot;newSimpleDeployAPICount: &quot;+ newSimpleDeployAPICount);
log.info(&quot;newSimpleUndeployAPICount: &quot;+ newSimpleUndeployAPICount);
-
+
assert Long.valueOf(vars.get(&quot;deployFailureCount&quot;)) == Long.valueOf(newDeployFailureCount);
assert Long.valueOf(vars.get(&quot;undeployFailureCount&quot;)) == 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() == &apos;200&apos;) {
assert (Long.valueOf(vars.get(&quot;batchDeploymentAPICount&quot;))+2) &lt;= Long.valueOf(newBatchDeploymentAPICount);
assert (Long.valueOf(vars.get(&quot;deploySuccessCount&quot;))+2) &lt;= Long.valueOf(newDeploySuccessCount);
assert (Long.valueOf(vars.get(&quot;undeploySuccessCount&quot;))+2) &lt;= 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>