summaryrefslogtreecommitdiffstats
path: root/controlloop/common
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2018-11-02 21:11:51 +0000
committerGerrit Code Review <gerrit@onap.org>2018-11-02 21:11:51 +0000
commit470b4061be484787787b83644fde8429c1688318 (patch)
tree71b19cac9d19546a381bffb35d93ae804f4c304d /controlloop/common
parent5e614a912ebe40e0afb578675e34bf069dd40a3f (diff)
parentca0b45aa78f76a80b4636db1bce68e9adcacec32 (diff)
Merge "Re-added requestParams to vDNS policy"
Diffstat (limited to 'controlloop/common')
-rw-r--r--controlloop/common/policy-yaml/README-v2.0.0.md10
-rw-r--r--controlloop/common/policy-yaml/src/test/resources/v2.0.0/policy_ONAP_demo_vDNS.yaml1
2 files changed, 6 insertions, 5 deletions
diff --git a/controlloop/common/policy-yaml/README-v2.0.0.md b/controlloop/common/policy-yaml/README-v2.0.0.md
index e08b7334a..4d79fce98 100644
--- a/controlloop/common/policy-yaml/README-v2.0.0.md
+++ b/controlloop/common/policy-yaml/README-v2.0.0.md
@@ -322,12 +322,9 @@ policies:
controlLoop:
version: 2.0.0
controlLoopName: ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3
- services:
- - serviceName: d4738992-6497-4dca-9db9
- serviceInvariantUUID: dc112d6e-7e73-4777-9c6f-1a7fb5fd1b6f
- serviceUUID: 2eea06c6-e1d3-4c3a-b9c4-478c506eeedf
trigger_policy: unique-policy-id-1-scale-up
timeout: 1200
+ abatement: false
policies:
- id: unique-policy-id-1-scale-up
@@ -336,7 +333,10 @@ policies:
actor: SO
recipe: VF Module Create
target:
- resourceID: 59a2ee3fB58045feB5a1.nodes.heat.vdns
+ type: VNF
+ payload:
+ requestParameters: '{"usePreload":true,"userParams":[]}'
+ configurationParameters: '[{"ip-addr":"$.vf-module-topology.vf-module-parameters.param[9]","oam-ip-addr":"$.vf-module-topology.vf-module-parameters.param[16]","enabled":"$.vf-module-topology.vf-module-parameters.param[23]"}]'
retry: 0
timeout: 1200
success: final_success
diff --git a/controlloop/common/policy-yaml/src/test/resources/v2.0.0/policy_ONAP_demo_vDNS.yaml b/controlloop/common/policy-yaml/src/test/resources/v2.0.0/policy_ONAP_demo_vDNS.yaml
index 50de04d45..dc8d5e7b6 100644
--- a/controlloop/common/policy-yaml/src/test/resources/v2.0.0/policy_ONAP_demo_vDNS.yaml
+++ b/controlloop/common/policy-yaml/src/test/resources/v2.0.0/policy_ONAP_demo_vDNS.yaml
@@ -51,6 +51,7 @@ policies:
target:
type: VNF
payload:
+ requestParameters: '{"usePreload":true,"userParams":[]}'
configurationParameters: '[{"ip-addr":"$.vf-module-topology.vf-module-parameters.param[9]","oam-ip-addr":"$.vf-module-topology.vf-module-parameters.param[16]","enabled":"$.vf-module-topology.vf-module-parameters.param[23]"}]'
retry: 0
timeout: 1200