From d8a4c8d51ce1f1523d4191c4ee02ae7531cf2393 Mon Sep 17 00:00:00 2001 From: eikrwaq Date: Wed, 2 May 2018 16:28:29 +0100 Subject: 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 --- .../basex-controlloop/src/files/bin/create-cl-amsterdam | 2 +- .../main/resources/amsterdam/droolsPdpStabilityTestPlan.jmx | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) 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 ad5585035..5beb6e134 100644 --- 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 61f2e59b6..b32a78d08 100644 --- a/testsuites/stability/src/main/resources/amsterdam/droolsPdpStabilityTestPlan.jmx +++ b/testsuites/stability/src/main/resources/amsterdam/droolsPdpStabilityTestPlan.jmx @@ -315,18 +315,18 @@ log.debug("[vCPE] requestID " + uuid); - + ${wait} - + true false { - "closedLoopControlName": "ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e", + "closedLoopControlName": "${vCPEControlLoop}", "closedLoopAlarmStart": 1463679805324, "closedLoopAlarmEnd": 1463699805324, "closedLoopEventClient": "DCAE_INSTANCE_ID.dcae-tca", @@ -361,7 +361,7 @@ log.debug("[vCPE] requestID " + uuid); - + 200 @@ -1876,4 +1876,4 @@ if (failure || cache.isEmpty()) { - + \ No newline at end of file -- cgit 1.2.3-korg