Changing abatement param to true for vCPE

- Changing abatement parameter to true for vCPE in create-cl-amsterdam script
- Enabling abatement test case jMeter Test plan

Change-Id: I01487666a807941dfec729c68bc31d3cedf29967
Issue-ID: POLICY-525
Signed-off-by: eikrwaq <waqas.ikram@ericsson.com>

diff --git a/controlloop/packages/basex-controlloop/src/files/bin/create-cl-amsterdam b/controlloop/packages/basex-controlloop/src/files/bin/create-cl-amsterdam
index ad55850..5beb6e1 100644 (file)
--- a/controlloop/packages/basex-controlloop/src/files/bin/create-cl-amsterdam
+++ b/controlloop/packages/basex-controlloop/src/files/bin/create-cl-amsterdam
@@ -37,7 +37,7 @@ CONTROL_LOOP_NAME="ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e"
 POLICY_SCOPE="amsterdam"
 POLICY_NAME="vcpe"
 POLICY_VERSION="v0.0.1"
-CONTROL_LOOP_YAML="controlLoop%3A%0A++version%3A+2.0.0%0A++controlLoopName%3A+ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e%0A++trigger_policy%3A+unique-policy-id-1-restart%0A++timeout%3A+3600%0A+%0Apolicies%3A%0A+%0A++-+id%3A+unique-policy-id-1-restart%0A++++name%3A+Restart+the+VM%0A++++description%3A%0A++++actor%3A+APPC%0A++++recipe%3A+Restart%0A++++target%3A%0A++++++type%3A+VM%0A++++retry%3A+3%0A++++timeout%3A+1200%0A++++success%3A+final_success%0A++++failure%3A+final_failure%0A++++failure_timeout%3A+final_failure_timeout%0A++++failure_retries%3A+final_failure_retries%0A++++failure_exception%3A+final_failure_exception%0A++++failure_guard%3A"
+CONTROL_LOOP_YAML="controlLoop%3A%0D%0A++version%3A+2.0.0%0D%0A++controlLoopName%3A+ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e%0D%0A++trigger_policy%3A+unique-policy-id-1-restart%0D%0A++timeout%3A+3600%0D%0A++abatement%3A+true%0D%0A+%0D%0Apolicies%3A%0D%0A++-+id%3A+unique-policy-id-1-restart%0D%0A++++name%3A+Restart+the+VM%0D%0A++++description%3A%0D%0A++++actor%3A+APPC%0D%0A++++recipe%3A+Restart%0D%0A++++target%3A%0D%0A++++++type%3A+VM%0D%0A++++retry%3A+3%0D%0A++++timeout%3A+1200%0D%0A++++success%3A+final_success%0D%0A++++failure%3A+final_failure%0D%0A++++failure_timeout%3A+final_failure_timeout%0D%0A++++failure_retries%3A+final_failure_retries%0D%0A++++failure_exception%3A+final_failure_exception%0D%0A++++failure_guard%3A+final_failure_guard"
 DMAAP_SERVERS="vm1.mr.simpledemo.openecomp.org"
 DCAE_TOPIC="unauthenticated.DCAE_CL_OUTPUT"
 DCAE_SERVERS="vm1.mr.simpledemo.openecomp.org"

diff --git a/testsuites/stability/src/main/resources/amsterdam/droolsPdpStabilityTestPlan.jmx b/testsuites/stability/src/main/resources/amsterdam/droolsPdpStabilityTestPlan.jmx
index 61f2e59..b32a78d 100644 (file)
--- a/testsuites/stability/src/main/resources/amsterdam/droolsPdpStabilityTestPlan.jmx
+++ b/testsuites/stability/src/main/resources/amsterdam/droolsPdpStabilityTestPlan.jmx
@@ -315,18 +315,18 @@ log.debug(&quot;[vCPE] requestID &quot; + uuid);</stringProp>
                     </ResponseAssertion>
                     <hashTree/>
                   </hashTree>
-                  <ConstantTimer guiclass="ConstantTimerGui" testclass="ConstantTimer" testname="WAIT" enabled="false">
+                  <ConstantTimer guiclass="ConstantTimerGui" testclass="ConstantTimer" testname="WAIT" enabled="true">
                     <stringProp name="ConstantTimer.delay">${wait}</stringProp>
                   </ConstantTimer>
                   <hashTree/>
-                  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="vCPE ABADETEMENT REQUEST" enabled="false">
+                  <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="vCPE Abatement Request" enabled="true">
                     <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
                     <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
                       <collectionProp name="Arguments.arguments">
                         <elementProp name="" elementType="HTTPArgument">
                           <boolProp name="HTTPArgument.always_encode">false</boolProp>
                           <stringProp name="Argument.value">{&#xd;
-  &quot;closedLoopControlName&quot;: &quot;ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e&quot;,&#xd;
+  &quot;closedLoopControlName&quot;: &quot;${vCPEControlLoop}&quot;,&#xd;
   &quot;closedLoopAlarmStart&quot;: 1463679805324,&#xd;
   &quot;closedLoopAlarmEnd&quot;: 1463699805324,&#xd;
   &quot;closedLoopEventClient&quot;: &quot;DCAE_INSTANCE_ID.dcae-tca&quot;,&#xd;
@@ -361,7 +361,7 @@ log.debug(&quot;[vCPE] requestID &quot; + uuid);</stringProp>
                     <stringProp name="HTTPSampler.response_timeout"></stringProp>
                   </HTTPSamplerProxy>
                   <hashTree>
-                    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert APPC Response Code" enabled="true">
+                    <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="vCPE Abatement Assert Response Code" enabled="true">
                       <collectionProp name="Asserion.test_strings">
                         <stringProp name="49586">200</stringProp>
                       </collectionProp>
@@ -1876,4 +1876,4 @@ if (failure || cache.isEmpty()) {
       <hashTree/>
     </hashTree>
   </hashTree>
-</jmeterTestPlan>
+</jmeterTestPlan>
\ No newline at end of file