Fix S3P failures in policy-pap

Issue-ID: POLICY-5346
Change-Id: Ia4426cc89d56f4eadd2b947db5eb31bed23df158
Signed-off-by: waynedunican <wayne.dunican@est.tech>

diff --git a/.github/workflows/gerrit-pap-performance-test.yaml b/.github/workflows/gerrit-pap-performance-test.yaml
index 2713cc8..17dff52 100644 (file)
--- a/.github/workflows/gerrit-pap-performance-test.yaml
+++ b/.github/workflows/gerrit-pap-performance-test.yaml
@@ -87,5 +87,5 @@ jobs:
       - name: Archive JMeter logs
         uses: actions/upload-artifact@v4
         with:
-          name: policy-pap-s3p-results
+          name: policy-pap-jmeter-logs
           path: ${{ github.workspace }}/testsuites/automate-s3p-test/jmeter.log

diff --git a/.github/workflows/gerrit-pap-stability-test.yaml b/.github/workflows/gerrit-pap-stability-test.yaml
index 397a0bc..ec9451b 100644 (file)
--- a/.github/workflows/gerrit-pap-stability-test.yaml
+++ b/.github/workflows/gerrit-pap-stability-test.yaml
@@ -87,5 +87,5 @@ jobs:
       - name: Archive JMeter logs
         uses: actions/upload-artifact@v4
         with:
-          name: policy-pap-s3p-results
+          name: policy-pap-jmeter-logs
           path: ${{ github.workspace }}/testsuites/automate-s3p-test/jmeter.log

diff --git a/testsuites/performance/src/main/resources/testplans/performance.jmx b/testsuites/performance/src/main/resources/testplans/performance.jmx
index 1585520..95d9616 100644 (file)
--- a/testsuites/performance/src/main/resources/testplans/performance.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-2021,2023-2024 Nordix Foundation.
+  Modifications Copyright (C) 2020-2021,2023-2025 OpenInfra Foundation Europe. All rights reserved.
   Modifications Copyright (C) 2020,2022 Bell Canada. All rights reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -434,7 +434,7 @@ if (prev.getResponseCode() == '200') {
     res = jsonSlurper.parseText(prev.getResponseDataAsString());
 
     assert res instanceof Map;
-    assert res.groups.size >= 2;
+    assert res.groups.size >= 3;
     assert res.groups[0].pdpGroupState== 'ACTIVE';
     assert res.groups[1].pdpGroupState== 'ACTIVE';
 }
@@ -626,7 +626,7 @@ if (prev.getResponseCode() == '200') {
     res = jsonSlurper.parseText(prev.getResponseDataAsString());
 
     assert res instanceof Map;
-    assert res.groups.size >= 2;
+    assert res.groups.size >= 3;
 
     for(int groupSize=0;groupSize<res.groups.size;groupSize++){
 

diff --git a/testsuites/stability/src/main/resources/testplans/stability.jmx b/testsuites/stability/src/main/resources/testplans/stability.jmx
index b79ca54..15ffdde 100644 (file)
--- 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) 2020-2021,2024 Nordix Foundation.
+  Modifications Copyright (C) 2020-2021,2024-2025 OpenInfra Foundation Europe. All rights reserved.
   Modifications Copyright (C) 2020,2022 Bell Canada. All rights reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -10197,7 +10197,7 @@ if (prev.getResponseCode() == '200') {
     res = jsonSlurper.parseText(prev.getResponseDataAsString());
 
     assert res instanceof Map;
-    assert res.groups.size == 2;
+    assert res.groups.size == 3;
     assert res.groups[0].pdpGroupState== 'ACTIVE';
     assert res.groups[1].pdpGroupState== 'ACTIVE';
 }
@@ -10389,7 +10389,7 @@ if (prev.getResponseCode() == '200') {
     res = jsonSlurper.parseText(prev.getResponseDataAsString());
 
     assert res instanceof Map;
-    assert res.groups.size == 2;
+    assert res.groups.size == 3;
     assert res.groups[0].pdpGroupState== 'ACTIVE';
     assert res.groups[1].pdpGroupState== 'ACTIVE';
 }
@@ -10596,7 +10596,7 @@ if (prev.getResponseCode() == '200') {
     res = jsonSlurper.parseText(prev.getResponseDataAsString());
 
     assert res instanceof Map;
-    assert res.groups.size == 2;
+    assert res.groups.size == 3;
 
     for(int groupSize=0;groupSize<res.groups.size;groupSize++){
 
@@ -10805,7 +10805,7 @@ if (prev.getResponseCode() == '200') {
     res = jsonSlurper.parseText(prev.getResponseDataAsString());
 
     assert res instanceof Map;
-    assert res.groups.size == 2;
+    assert res.groups.size == 3;
 
     for(int groupSize=0;groupSize<res.groups.size;groupSize++){
 
@@ -11119,7 +11119,7 @@ if (prev.getResponseCode() == '200') {
     res = jsonSlurper.parseText(prev.getResponseDataAsString());
 
     assert res instanceof Map;
-    assert res.groups.size == 2;
+    assert res.groups.size == 3;
 
     for(int groupSize=0;groupSize<res.groups.size;groupSize++){