From e92ff832cf993db876f22b2d27562fedf59f5043 Mon Sep 17 00:00:00 2001 From: Tarun Tej Velaga Date: Mon, 24 Jul 2017 17:13:43 +0000 Subject: [Policy-52, Policy-92, Policy-93] Policy Enhancements and bugfixes Change-Id: I5675cf4527e17963b3142cf7184c0df31a766197 Signed-off-by: Tarun Tej Velaga --- .../v2.0.0-guard/policy_guard_1707_appc.yaml | 30 +++++++++++----------- .../policy_guard_OpenECOMP_demo_vDNS.yaml | 12 ++++++--- 2 files changed, 23 insertions(+), 19 deletions(-) (limited to 'ECOMP-ControlloopPolicy/src/test/resources') diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/policy_guard_1707_appc.yaml b/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/policy_guard_1707_appc.yaml index 797a7a81f..6442cd5df 100644 --- a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/policy_guard_1707_appc.yaml +++ b/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/policy_guard_1707_appc.yaml @@ -6,19 +6,19 @@ guards: name: APPC 5 Restart description: We only allow 5 restarts over 15 minute window during the day time hours (i.e. avoid midnight to 5am) - actor: APPC - recipe: Restart + match_parameters: + controlLoopName: CL_NAME_ABC_123 + actor: APPC + recipe: Restart + targets: + - s1 + s2 + s3 limit_constraints: - - num: 5 - # - # https://www.w3.org/TR/xmlschema-2/#duration - # - duration: PT15M - # - # XACML function time-in-range - # - # Assumption is that the "current time" is the 1st argument - # - time_in_range: - arg2: PT5H - arg3: PT24H \ No newline at end of file + - freq_limit_per_target: 5 + time_window: + value: 15 + units: minute + active_time_range: + start: 00:00:00-05:00 + end: 23:59:59-05:00 \ No newline at end of file diff --git a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/policy_guard_OpenECOMP_demo_vDNS.yaml b/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/policy_guard_OpenECOMP_demo_vDNS.yaml index 414e814d3..f2390fae0 100644 --- a/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/policy_guard_OpenECOMP_demo_vDNS.yaml +++ b/ECOMP-ControlloopPolicy/src/test/resources/v2.0.0-guard/policy_guard_OpenECOMP_demo_vDNS.yaml @@ -5,11 +5,15 @@ guards: - id: unique_guard_ONAP_vDNS_1 name: MSO Spinup description: We only spin up 1 instance over a 10 minute window - actor: MSO - recipe: VF Module Create + match_parameters: + actor: MSO + recipe: VF Module Create limit_constraints: - - num: 1 + - freq_limit_per_target: 1 # # https://www.w3.org/TR/xmlschema-2/#duration # - duration: PT10M + time_window: + value: 10 + units: hour + \ No newline at end of file -- cgit 1.2.3-korg