From 6a2e9828e5d25604738ce9bfa5da98f75f740e3d Mon Sep 17 00:00:00 2001
From: "adheli.tavares" <adheli.tavares@est.tech>
Date: Tue, 30 Mar 2021 11:06:03 +0100
Subject: Distribution S3P test

Updating scripts and files related to S3P tests.

Issue-ID: POLICY-3113
Change-Id: I6c6d50a2f0e6b47deac5e505fb841eebbbbea437
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>
(cherry picked from commit d6c3b88b98960353daa7fbd61fc4e44656ffff63)
---
 .../src/main/resources/testplans/performance.jmx   |  26 ++++++++++-----------
 .../resources/testplans/testCsars/test_csar_1.csar | Bin 93619 -> 95329 bytes
 .../testplans/testCsars/test_csar_10.csar          | Bin 93618 -> 95330 bytes
 .../resources/testplans/testCsars/test_csar_2.csar | Bin 93622 -> 95329 bytes
 .../resources/testplans/testCsars/test_csar_3.csar | Bin 93622 -> 95329 bytes
 .../resources/testplans/testCsars/test_csar_4.csar | Bin 93622 -> 95329 bytes
 .../resources/testplans/testCsars/test_csar_5.csar | Bin 93622 -> 95329 bytes
 .../resources/testplans/testCsars/test_csar_6.csar | Bin 93622 -> 95329 bytes
 .../resources/testplans/testCsars/test_csar_7.csar | Bin 93622 -> 95329 bytes
 .../resources/testplans/testCsars/test_csar_8.csar | Bin 93622 -> 95329 bytes
 .../resources/testplans/testCsars/test_csar_9.csar | Bin 93622 -> 95329 bytes
 11 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'testsuites/performance/src/main/resources')

diff --git a/testsuites/performance/src/main/resources/testplans/performance.jmx b/testsuites/performance/src/main/resources/testplans/performance.jmx
index 6fd00bfb..d92fe041 100644
--- a/testsuites/performance/src/main/resources/testplans/performance.jmx
+++ b/testsuites/performance/src/main/resources/testplans/performance.jmx
@@ -10,7 +10,7 @@
         <collectionProp name="Arguments.arguments">
           <elementProp name="PAP_HOST" elementType="Argument">
             <stringProp name="Argument.name">PAP_HOST</stringProp>
-            <stringProp name="Argument.value">${__P(host,10.2.0.27)}</stringProp>
+            <stringProp name="Argument.value">${__P(host,10.2.0.110)}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
           <elementProp name="PAP_PORT" elementType="Argument">
@@ -20,7 +20,7 @@
           </elementProp>
           <elementProp name="API_HOST" elementType="Argument">
             <stringProp name="Argument.name">API_HOST</stringProp>
-            <stringProp name="Argument.value">${__P(host,10.2.0.27)}</stringProp>
+            <stringProp name="Argument.value">${__P(host,10.2.0.110)}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
           <elementProp name="API_PORT" elementType="Argument">
@@ -35,12 +35,12 @@
           </elementProp>
           <elementProp name="DISTRIBUTION_PORT" elementType="Argument">
             <stringProp name="Argument.name">DISTRIBUTION_PORT</stringProp>
-            <stringProp name="Argument.value">7001</stringProp>
+            <stringProp name="Argument.value">7002</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
           <elementProp name="DURATION" elementType="Argument">
             <stringProp name="Argument.name">DURATION</stringProp>
-            <stringProp name="Argument.value">${__P(duration, 259200)}</stringProp>
+            <stringProp name="Argument.value">${__P(duration, 14400)}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
           <elementProp name="SCRIPT_DIR" elementType="Argument">
@@ -50,7 +50,7 @@
           </elementProp>
           <elementProp name="WATCHED_FOLDER" elementType="Argument">
             <stringProp name="Argument.name">WATCHED_FOLDER</stringProp>
-            <stringProp name="Argument.value">${__P(watchedfolder, /tmp/policydistribution/distributionmounts)}</stringProp>
+            <stringProp name="Argument.value">${__P(watchedfolder, /tmp/policydistribution/distributionmount)}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
@@ -87,21 +87,21 @@
         <AuthManager guiclass="AuthPanel" testclass="AuthManager" testname="HTTP Authorization Manager" enabled="true">
           <collectionProp name="AuthManager.auth_list">
             <elementProp name="" elementType="Authorization">
-              <stringProp name="Authorization.url">https://${PAP_HOST}:7000/policy/pap/v1</stringProp>
+              <stringProp name="Authorization.url">https://${PAP_HOST}:${PAP_PORT}/policy/pap/v1</stringProp>
               <stringProp name="Authorization.username">healthcheck</stringProp>
               <stringProp name="Authorization.password">zb!XztG34</stringProp>
               <stringProp name="Authorization.domain"></stringProp>
               <stringProp name="Authorization.realm"></stringProp>
             </elementProp>
             <elementProp name="" elementType="Authorization">
-              <stringProp name="Authorization.url">https://${API_HOST}:6969/policy/api/v1</stringProp>
+              <stringProp name="Authorization.url">https://${API_HOST}:${API_PORT}/policy/api/v1</stringProp>
               <stringProp name="Authorization.username">healthcheck</stringProp>
               <stringProp name="Authorization.password">zb!XztG34</stringProp>
               <stringProp name="Authorization.domain"></stringProp>
               <stringProp name="Authorization.realm"></stringProp>
             </elementProp>
             <elementProp name="" elementType="Authorization">
-              <stringProp name="Authorization.url">http://127.0.0.1:6969/</stringProp>
+              <stringProp name="Authorization.url">http://${DISTRIBUTION_HOST}:${DISTRIBUTION_PORT}/</stringProp>
               <stringProp name="Authorization.username">healthcheck</stringProp>
               <stringProp name="Authorization.password">zb!XztG34</stringProp>
               <stringProp name="Authorization.domain"></stringProp>
@@ -116,7 +116,7 @@
           <SystemSampler guiclass="SystemSamplerGui" testclass="SystemSampler" testname="Remove CSAR" enabled="true">
             <boolProp name="SystemSampler.checkReturnCode">false</boolProp>
             <stringProp name="SystemSampler.expectedReturnCode">0</stringProp>
-            <stringProp name="SystemSampler.command">${SCRIPT_DIR}removecsars.sh</stringProp>
+            <stringProp name="SystemSampler.command">${SCRIPT_DIR}/removecsars.sh</stringProp>
             <elementProp name="SystemSampler.arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
               <collectionProp name="Arguments.arguments">
                 <elementProp name="" elementType="Argument">
@@ -360,7 +360,7 @@
           <SystemSampler guiclass="SystemSamplerGui" testclass="SystemSampler" testname="Undeploy/Delete Policies" enabled="true">
             <boolProp name="SystemSampler.checkReturnCode">false</boolProp>
             <stringProp name="SystemSampler.expectedReturnCode">0</stringProp>
-            <stringProp name="SystemSampler.command">${SCRIPT_DIR}clearuppolicies.sh</stringProp>
+            <stringProp name="SystemSampler.command">${SCRIPT_DIR}/clearuppolicies.sh</stringProp>
             <elementProp name="SystemSampler.arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
               <collectionProp name="Arguments.arguments">
                 <elementProp name="" elementType="Argument">
@@ -537,21 +537,21 @@
         <AuthManager guiclass="AuthPanel" testclass="AuthManager" testname="HTTP Authorization Manager" enabled="true">
           <collectionProp name="AuthManager.auth_list">
             <elementProp name="" elementType="Authorization">
-              <stringProp name="Authorization.url">https://${PAP_HOST}:7000/policy/pap/v1</stringProp>
+              <stringProp name="Authorization.url">https://${PAP_HOST}:${PAP_PORT}/policy/pap/v1</stringProp>
               <stringProp name="Authorization.username">healthcheck</stringProp>
               <stringProp name="Authorization.password">zb!XztG34</stringProp>
               <stringProp name="Authorization.domain"></stringProp>
               <stringProp name="Authorization.realm"></stringProp>
             </elementProp>
             <elementProp name="" elementType="Authorization">
-              <stringProp name="Authorization.url">https://${API_HOST}:6969/policy/api/v1</stringProp>
+              <stringProp name="Authorization.url">https://${API_HOST}:${API_PORT}/policy/api/v1</stringProp>
               <stringProp name="Authorization.username">healthcheck</stringProp>
               <stringProp name="Authorization.password">zb!XztG34</stringProp>
               <stringProp name="Authorization.domain"></stringProp>
               <stringProp name="Authorization.realm"></stringProp>
             </elementProp>
             <elementProp name="" elementType="Authorization">
-              <stringProp name="Authorization.url">http://127.0.0.1:6969/</stringProp>
+              <stringProp name="Authorization.url">http://${DISTRIBUTION_HOST}:${DISTRIBUTION_PORT}/</stringProp>
               <stringProp name="Authorization.username">healthcheck</stringProp>
               <stringProp name="Authorization.password">zb!XztG34</stringProp>
               <stringProp name="Authorization.domain"></stringProp>
diff --git a/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_1.csar b/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_1.csar
index 8fbe9e3b..af2f1b7e 100644
Binary files a/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_1.csar and b/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_1.csar differ
diff --git a/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_10.csar b/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_10.csar
index 49d7cbeb..a7efde6a 100644
Binary files a/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_10.csar and b/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_10.csar differ
diff --git a/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_2.csar b/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_2.csar
index d9e49a95..2d753a9f 100644
Binary files a/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_2.csar and b/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_2.csar differ
diff --git a/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_3.csar b/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_3.csar
index 16260a69..7f79af6c 100644
Binary files a/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_3.csar and b/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_3.csar differ
diff --git a/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_4.csar b/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_4.csar
index 228c710d..cf60e614 100644
Binary files a/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_4.csar and b/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_4.csar differ
diff --git a/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_5.csar b/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_5.csar
index 3e9f73cf..a0cde2f6 100644
Binary files a/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_5.csar and b/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_5.csar differ
diff --git a/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_6.csar b/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_6.csar
index 17b9f117..a3a734fb 100644
Binary files a/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_6.csar and b/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_6.csar differ
diff --git a/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_7.csar b/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_7.csar
index 8cbd3583..57cd9536 100644
Binary files a/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_7.csar and b/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_7.csar differ
diff --git a/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_8.csar b/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_8.csar
index d1047b72..0912002f 100644
Binary files a/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_8.csar and b/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_8.csar differ
diff --git a/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_9.csar b/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_9.csar
index 9b777de9..98cd56aa 100644
Binary files a/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_9.csar and b/testsuites/performance/src/main/resources/testplans/testCsars/test_csar_9.csar differ
-- 
cgit 1.2.3-korg