From 86f72566056c45b0fb16ef96edfd8f2345e0e74f Mon Sep 17 00:00:00 2001
From: ktimoney <kevin.timoney@est.tech>
Date: Fri, 22 Oct 2021 10:14:35 +0100
Subject: Updated endpoints in xacml-pdp jmx files

Issue-ID: POLICY-3780
Change-Id: I296f9e6e2e8e127e73e3ad118ddc0f7520434fac
Signed-off-by: ktimoney <kevin.timoney@est.tech>
---
 .../performance/src/main/resources/testplans/perf.jmx  | 18 +++++++++---------
 .../src/main/resources/testplans/stability.jmx         |  8 ++++----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/testsuites/performance/src/main/resources/testplans/perf.jmx b/testsuites/performance/src/main/resources/testplans/perf.jmx
index 9c3a294a..b02dc145 100644
--- a/testsuites/performance/src/main/resources/testplans/perf.jmx
+++ b/testsuites/performance/src/main/resources/testplans/perf.jmx
@@ -94,7 +94,7 @@
         &quot;policies&quot;: [&#xd;
             {&#xd;
                 &quot;onap.restart.tca&quot;: {&#xd;
-                    &quot;type&quot;: &quot;onap.policies.monitoring.cdap.tca.hi.lo.app&quot;,&#xd;
+                    &quot;type&quot;: &quot;onap.policies.monitoring.tcagen2&quot;,&#xd;
                     &quot;type_version&quot;: &quot;1.0.0&quot;,&#xd;
                     &quot;version&quot;: &quot;1.0.0&quot;,&#xd;
                     &quot;metadata&quot;: {&#xd;
@@ -149,7 +149,7 @@
           <stringProp name="HTTPSampler.response_timeout"></stringProp>
           <stringProp name="HTTPSampler.protocol">https</stringProp>
           <stringProp name="HTTPSampler.contentEncoding"></stringProp>
-          <stringProp name="HTTPSampler.path">policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/policies</stringProp>
+          <stringProp name="HTTPSampler.path">policy/api/v1/policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/policies</stringProp>
           <stringProp name="HTTPSampler.method">POST</stringProp>
           <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
           <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -976,7 +976,7 @@
           <hashTree/>
           <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
             <collectionProp name="Asserion.test_strings">
-              <stringProp name="49586">200</stringProp>
+              <stringProp name="49586">202</stringProp>
             </collectionProp>
             <stringProp name="Assertion.custom_message"></stringProp>
             <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
@@ -1028,7 +1028,7 @@
           <hashTree/>
           <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
             <collectionProp name="Asserion.test_strings">
-              <stringProp name="49586">200</stringProp>
+              <stringProp name="49586">202</stringProp>
             </collectionProp>
             <stringProp name="Assertion.custom_message"></stringProp>
             <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
@@ -1080,7 +1080,7 @@
           <hashTree/>
           <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
             <collectionProp name="Asserion.test_strings">
-              <stringProp name="49586">200</stringProp>
+              <stringProp name="49586">202</stringProp>
             </collectionProp>
             <stringProp name="Assertion.custom_message"></stringProp>
             <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
@@ -1132,7 +1132,7 @@
           <hashTree/>
           <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
             <collectionProp name="Asserion.test_strings">
-              <stringProp name="49586">200</stringProp>
+              <stringProp name="49586">202</stringProp>
             </collectionProp>
             <stringProp name="Assertion.custom_message"></stringProp>
             <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
@@ -1447,7 +1447,7 @@ if (prev.getResponseCode() == &apos;200&apos;) {
   &quot;action&quot;: &quot;configure&quot;,&#xd;
   &quot;resource&quot;: {&#xd;
       &quot;policy-id&quot;: &quot;onap.restart.tca&quot;,&#xd;
-      &quot;policy-type&quot;: &quot;onap.policies.monitoring.cdap.tca.hi.lo.app&quot;&#xd;
+      &quot;policy-type&quot;: &quot;onap.policies.monitoring.tcagen2&quot;&#xd;
   }&#xd;
 }</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
@@ -1516,7 +1516,7 @@ if (prev.getResponseCode() == &apos;200&apos;) {
   &quot;action&quot;: &quot;configure&quot;,&#xd;
   &quot;resource&quot;: {&#xd;
       &quot;policy-id&quot;: &quot;onap.restart.tca&quot;,&#xd;
-      &quot;policy-type&quot;: &quot;onap.policies.monitoring.cdap.tca.hi.lo.app&quot;&#xd;
+      &quot;policy-type&quot;: &quot;onap.policies.monitoring.tcagen2&quot;&#xd;
   }&#xd;
 }</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
@@ -2131,7 +2131,7 @@ if (prev.getResponseCode() == &apos;200&apos;) {
           <stringProp name="HTTPSampler.response_timeout"></stringProp>
           <stringProp name="HTTPSampler.protocol">https</stringProp>
           <stringProp name="HTTPSampler.contentEncoding"></stringProp>
-          <stringProp name="HTTPSampler.path">policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/policies/onap.restart.tca/versions/1.0.0</stringProp>
+          <stringProp name="HTTPSampler.path">policy/api/v1/policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/policies/onap.restart.tca/versions/1.0.0</stringProp>
           <stringProp name="HTTPSampler.method">DELETE</stringProp>
           <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
           <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
diff --git a/testsuites/stability/src/main/resources/testplans/stability.jmx b/testsuites/stability/src/main/resources/testplans/stability.jmx
index d59ebaf4..069f3ec7 100644
--- a/testsuites/stability/src/main/resources/testplans/stability.jmx
+++ b/testsuites/stability/src/main/resources/testplans/stability.jmx
@@ -35,7 +35,7 @@
           </elementProp>
           <elementProp name="API_PORT" elementType="Argument">
             <stringProp name="Argument.name">API_PORT</stringProp>
-            <stringProp name="Argument.value">31949</stringProp>
+            <stringProp name="Argument.value">${__P(api_port, 6969)}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
           <elementProp name="PAP_PORT" elementType="Argument">
@@ -1437,7 +1437,7 @@ if (prev.getResponseCode() == &apos;200&apos;) {
   &quot;action&quot;: &quot;configure&quot;,&#xd;
   &quot;resource&quot;: {&#xd;
       &quot;policy-id&quot;: &quot;onap.restart.tca&quot;,&#xd;
-      &quot;policy-type&quot;: &quot;onap.policies.monitoring.cdap.tca.hi.lo.app&quot;&#xd;
+      &quot;policy-type&quot;: &quot;onap.policies.monitoring.tcagen2&quot;&#xd;
   }&#xd;
 }</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
@@ -1505,7 +1505,7 @@ if (prev.getResponseCode() == &apos;200&apos;) {
   &quot;action&quot;: &quot;configure&quot;,&#xd;
   &quot;resource&quot;: {&#xd;
       &quot;policy-id&quot;: &quot;onap.restart.tca&quot;,&#xd;
-      &quot;policy-type&quot;: &quot;onap.policies.monitoring.cdap.tca.hi.lo.app&quot;&#xd;
+      &quot;policy-type&quot;: &quot;onap.policies.monitoring.tcagen2&quot;&#xd;
   }&#xd;
 }</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
@@ -2108,7 +2108,7 @@ if (prev.getResponseCode() == &apos;200&apos;) {
           <stringProp name="HTTPSampler.port">${API_PORT}</stringProp>
           <stringProp name="HTTPSampler.protocol">https</stringProp>
           <stringProp name="HTTPSampler.contentEncoding"></stringProp>
-          <stringProp name="HTTPSampler.path">policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/policies/onap.restart.tca/versions/1.0.0</stringProp>
+          <stringProp name="HTTPSampler.path">policy/api/v1/policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/policies/onap.restart.tca/versions/1.0.0</stringProp>
           <stringProp name="HTTPSampler.method">DELETE</stringProp>
           <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
           <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-- 
cgit 1.2.3-korg