From f5ba0b3b0e2d1453cb2afccdf5c297e476b06eb1 Mon Sep 17 00:00:00 2001 From: waynedunican Date: Tue, 30 Mar 2021 09:11:06 +0100 Subject: [PATCH] PAP S3P jmx file changes Issue-ID: POLICY-3110 Change-Id: I679dc16fedccda496e2030e8a0cc2e74b8787d9d Signed-off-by: waynedunican --- .../testplans/{perf.jmx => performance.jmx} | 134 ++++++++++++++++++--- .../src/main/resources/testplans/stability.jmx | 131 ++++++++++++++++++-- 2 files changed, 236 insertions(+), 29 deletions(-) rename testsuites/performance/src/main/resources/testplans/{perf.jmx => performance.jmx} (99%) diff --git a/testsuites/performance/src/main/resources/testplans/perf.jmx b/testsuites/performance/src/main/resources/testplans/performance.jmx similarity index 99% rename from testsuites/performance/src/main/resources/testplans/perf.jmx rename to testsuites/performance/src/main/resources/testplans/performance.jmx index 093b5aed..5dbeae09 100644 --- a/testsuites/performance/src/main/resources/testplans/perf.jmx +++ b/testsuites/performance/src/main/resources/testplans/performance.jmx @@ -4,7 +4,7 @@ ONAP Policy PAP ================================================================================ Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. - Modifications Copyright (C) 2020 Nordix Foundation. + Modifications Copyright (C) 2020-2021 Nordix Foundation. Modifications Copyright (C) 2020 Bell Canada. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); @@ -31,27 +31,27 @@ PAP_HOST - ${__P(PAP_HOST,10.2.0.29)} + ${__P(PAP_HOST,10.2.0.149)} = PAP_PORT - ${__P(PAP_PORT,30679)} + ${__P(PAP_PORT,31427)} = API_HOST - ${__P(API_HOST,10.2.0.29)} + ${__P(API_HOST,10.2.0.149)} = API_PORT - ${__P(API_PORT,30859)} + ${__P(API_PORT,30443)} = HOME_PATH - ${__P(HOME,/home/adityap)} + ${__P(HOME,/home/wayned)} = @@ -15303,6 +15303,48 @@ if (prev.getResponseCode() == '200') { + + + 800 + + + + + 202 + + + Assertion.response_code + false + 1 + + + + + + Deploy defaultDomain policy + ${threadCounter}%5==1 + false + + + + + + + ${PAP_HOST} + ${PAP_PORT} + https + + /policy/pap/v1/policies/status/defaultGroup/operational.apex.stabilityTestDefaultDomain/1.0.0 + GET + true + false + true + false + + + + Check status defaultGroup + @@ -15469,6 +15511,68 @@ if (prev.getResponseCode() == '200') { + + + + 202 + + + Assertion.response_code + false + 1 + + + + + + + + ${PAP_HOST} + ${PAP_PORT} + https + + /policy/pap/v1/policies/status/sampleGroup + GET + true + false + true + false + + + + Check status sampleGroup + + + + + 200 + + + Assertion.response_code + false + 1 + + + + + + + + ${PAP_HOST} + ${PAP_PORT} + https + + /policy/pap/v1/policies/status + GET + true + false + true + false + + + + Check status PdpGroups + @@ -15481,10 +15585,6 @@ if (prev.getResponseCode() == '200') { - - 500 - - @@ -15580,10 +15680,6 @@ if (prev.getResponseCode() == '200') { - - 500 - - true @@ -15630,7 +15726,7 @@ if (prev.getResponseCode() == '200') { - 200 + 202 Assertion.response_code @@ -15665,7 +15761,7 @@ if (prev.getResponseCode() == '200') { - 200 + 202 Assertion.response_code @@ -15737,6 +15833,10 @@ if (prev.getResponseCode() == '200') { + + 1000 + + @@ -15907,7 +16007,7 @@ if (prev.getResponseCode() == '200') { true - ${LOGS_PATH}summary.log + C:\pap_s3p_res\stability_results\testperfresult.jtl diff --git a/testsuites/stability/src/main/resources/testplans/stability.jmx b/testsuites/stability/src/main/resources/testplans/stability.jmx index 760f4cd8..3bd690ad 100644 --- a/testsuites/stability/src/main/resources/testplans/stability.jmx +++ b/testsuites/stability/src/main/resources/testplans/stability.jmx @@ -4,7 +4,7 @@ ONAP Policy PAP ================================================================================ Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. - Modifications Copyright (C) 2019 - 2020 Nordix Foundation. + Modifications Copyright (C) 2020-2021 Nordix Foundation. Modifications Copyright (C) 2020 Bell Canada. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); @@ -31,22 +31,22 @@ PAP_HOST - 10.2.0.29 + 10.2.0.149 = PAP_PORT - 30679 + 31427 = API_HOST - 10.2.0.29 + 10.2.0.149 = API_PORT - 30859 + 30443 = @@ -15175,7 +15175,7 @@ if (prev.getResponseCode() == '200') { - + @@ -15204,6 +15204,10 @@ if (prev.getResponseCode() == '200') { 1 + + 6000 + + @@ -15286,6 +15290,41 @@ if (prev.getResponseCode() == '200') { + + + + 202 + + + Assertion.response_code + false + 1 + + + + 6000 + + + + + + + + ${PAP_HOST} + ${PAP_PORT} + https + + /policy/pap/v1/policies/status/defaultGroup/operational.apex.stabilityTestDefaultDomain/1.0.0 + GET + true + false + true + false + + + + Query policies status for defaultGroup + @@ -15410,7 +15449,7 @@ if (prev.getResponseCode() == '200') { def pdpSubGrp=res.groups[groupSize].pdpSubgroups[subGrpSize]; for(int supportedPolicyTypesSize=0;supportedPolicyTypesSize<pdpSubGrp.supportedPolicyTypes.size;supportedPolicyTypesSize++){ if(pdpSubGrp.supportedPolicyTypes[supportedPolicyTypesSize].name =='onap.policies.controlloop.operational.common.Apex'){ - assert pdpSubGrp.pdpInstances.size > 0; + assert pdpSubGrp.pdpInstances.size >= 0; if (res.groups[groupSize].name == 'defaultGroup') { assert pdpSubGrp.policies[0].name == 'operational.apex.stabilityTestDefaultDomain'; } @@ -15473,6 +15512,68 @@ if (prev.getResponseCode() == '200') { + + + + 202 + + + Assertion.response_code + false + 1 + + + + + + + + ${PAP_HOST} + ${PAP_PORT} + https + + /policy/pap/v1/policies/status/sampleGroup + GET + true + false + true + false + + + + Query policies status + + + + + 200 + + + Assertion.response_code + false + 1 + + + + + + + + ${PAP_HOST} + ${PAP_PORT} + https + + /policy/pap/v1/policies/status + GET + true + false + true + false + + + + Query policies status + @@ -15593,7 +15694,9 @@ if (prev.getResponseCode() == '200') { def jsonSlurper = new JsonSlurper(); res = jsonSlurper.parseText(prev.getResponseDataAsString()); assert res instanceof Map; - assert res.healthy==true; + assert res.pdps.xacml!=null; + assert res.pdps.drools!=null; + assert res.pdps.apex!=null; } @@ -15693,7 +15796,7 @@ if (prev.getResponseCode() == '200') { - 200 + 202 Assertion.response_code @@ -15723,7 +15826,7 @@ if (prev.getResponseCode() == '200') { - 200 + 202 Assertion.response_code @@ -15822,6 +15925,10 @@ if (prev.getResponseCode() == '200') { 1 + + 6000 + + @@ -16014,7 +16121,7 @@ if (prev.getResponseCode() == '200') { true - /home/ubuntu/pap_stability/summary.log + C:\pap_s3p_res\stability_results\testresult3003.jtl @@ -16051,7 +16158,7 @@ if (prev.getResponseCode() == '200') { true - /home/ubuntu/pap_stability/resultTree.log + C:\Users\WayneDunican\Desktop\S3P_PAP\testresults.jtl -- 2.16.6