diff options
Diffstat (limited to 'controlloop/templates/archetype-cl-beijing/src/main/resources')
17 files changed, 83 insertions, 28 deletions
diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/META-INF/maven/archetype-metadata.xml b/controlloop/templates/archetype-cl-beijing/src/main/resources/META-INF/maven/archetype-metadata.xml index 85ede2a6f..2acec10dd 100644 --- a/controlloop/templates/archetype-cl-beijing/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/controlloop/templates/archetype-cl-beijing/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -25,20 +25,47 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <requiredProperties> - <requiredProperty key="closedLoopControlName"> + <requiredProperty key="vcpeClosedLoopControlName"> <defaultValue>ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e</defaultValue> </requiredProperty> - <requiredProperty key="controlLoopYaml"> - <defaultValue>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</defaultValue> + <requiredProperty key="vcpePolicyName"> + <defaultValue>vcpe</defaultValue> </requiredProperty> - <requiredProperty key="policyName"> - <defaultValue>DCAE.Config_tca-hi-lo</defaultValue> + <requiredProperty key="vcpeControlLoopYaml"> + <defaultValue>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</defaultValue> + </requiredProperty> + <requiredProperty key="vfwClosedLoopControlName"> + <defaultValue>ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a</defaultValue> + </requiredProperty> + <requiredProperty key="vfwPolicyName"> + <defaultValue>vfw</defaultValue> + </requiredProperty> + <requiredProperty key="vfwControlLoopYaml"> + <defaultValue>controlLoop%3A%0D%0A++version%3A+2.0.0%0D%0A++controlLoopName%3A+ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a%0D%0A++trigger_policy%3A+unique-policy-id-1-modifyConfig%0D%0A++timeout%3A+1200%0D%0A++abatement%3A+false%0D%0A+%0D%0Apolicies%3A%0D%0A++-+id%3A+unique-policy-id-1-modifyConfig%0D%0A++++name%3A+modify+packet+gen+config%0D%0A++++description%3A%0D%0A++++actor%3A+APPC%0D%0A++++recipe%3A+ModifyConfig%0D%0A++++target%3A%0D%0A++++++%23+TBD+-+Cannot+be+known+until+instantiation+is+done%0D%0A++++++resourceID%3A+Eace933104d443b496b8.nodes.heat.vpg%0D%0A++++++type%3A+VNF%0D%0A++++retry%3A+0%0D%0A++++timeout%3A+300%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</defaultValue> + </requiredProperty> + <requiredProperty key="vdnsClosedLoopControlName"> + <defaultValue>ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3</defaultValue> + </requiredProperty> + <requiredProperty key="vdnsPolicyName"> + <defaultValue>vdns</defaultValue> + </requiredProperty> + <requiredProperty key="vdnsControlLoopYaml"> + <defaultValue>controlLoop%3A%0D%0A++version%3A+2.0.0%0D%0A++controlLoopName%3A+ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3%0D%0A++trigger_policy%3A+unique-policy-id-1-scale-up%0D%0A++timeout%3A+1200%0D%0A++abatement%3A+false%0D%0Apolicies%3A%0D%0A++-+id%3A+unique-policy-id-1-scale-up%0D%0A++++name%3A+Create+a+new+VF+Module%0D%0A++++description%3A%0D%0A++++actor%3A+SO%0D%0A++++recipe%3A+VF+Module+Create%0D%0A++++target%3A%0D%0A++++++type%3A+VNF%0D%0A++++retry%3A+0%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</defaultValue> + </requiredProperty> + <requiredProperty key="volteClosedLoopControlName"> + <defaultValue>ControlLoop-VOLTE-2179b738-fd36-4843-a71a-a8c24c70c55b</defaultValue> + </requiredProperty> + <requiredProperty key="voltePolicyName"> + <defaultValue>volte</defaultValue> + </requiredProperty> + <requiredProperty key="volteControlLoopYaml"> + <defaultValue>controlLoop%3A%0D%0A++version%3A+2.0.0%0D%0A++controlLoopName%3A+ControlLoop-VOLTE-2179b738-fd36-4843-a71a-a8c24c70c55b%0D%0A++trigger_policy%3A+unique-policy-id-1-restart%0D%0A++timeout%3A+3600%0D%0A++abatement%3A+false%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+VFC%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</defaultValue> </requiredProperty> <requiredProperty key="policyScope"> <defaultValue>DCAE</defaultValue> </requiredProperty> <requiredProperty key="policyVersion"> - <defaultValue>1.1.1</defaultValue> + <defaultValue>1.2.0</defaultValue> </requiredProperty> <requiredProperty key="dmaapServers"> <defaultValue>vm1.mr.simpledemo.openecomp.org</defaultValue> @@ -46,6 +73,9 @@ <requiredProperty key="brmsgwTopic"> <defaultValue>BRMSGW-POLICY</defaultValue> </requiredProperty> + <requiredProperty key="brmsgwServers"> + <defaultValue>vm1.mr.simpledemo.openecomp.org</defaultValue> + </requiredProperty> <requiredProperty key="dcaeTopic"> <defaultValue>unauthenticated.DCAE_CL_OUTPUT</defaultValue> </requiredProperty> @@ -53,7 +83,7 @@ <defaultValue>vm1.mr.simpledemo.openecomp.org</defaultValue> </requiredProperty> <requiredProperty key="dependenciesVersion"> - <defaultValue>1.1.1</defaultValue> + <defaultValue>1.2.0</defaultValue> </requiredProperty> </requiredProperties> diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/VoLTE.yaml b/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/VoLTE.yaml index 5e3a18ed4..e70eb664a 100644 --- a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/VoLTE.yaml +++ b/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/VoLTE.yaml @@ -1,6 +1,6 @@ controlLoop: version: 2.0.0 - controlLoopName: ${closedLoopControlName} + controlLoopName: ${volteClosedLoopControlName} trigger_policy: unique-policy-id-1-restart timeout: 3600 abatement: false diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties b/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties index 345086bc6..39688c306 100644 --- a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties +++ b/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties @@ -22,7 +22,7 @@ controller.name=${artifactId} ueb.source.topics=${brmsgwTopic},${dcaeTopic},APPC-CL,APPC-LCM-WRITE -ueb.source.topics.${brmsgwTopic}.servers=${dcaeServers} +ueb.source.topics.${brmsgwTopic}.servers=${brmsgwServers} ueb.source.topics.${brmsgwTopic}.apiKey= ueb.source.topics.${brmsgwTopic}.apiSecret= ueb.source.topics.${brmsgwTopic}.events=org.onap.policy.controlloop.params.ControlLoopParams diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.rest.json b/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.rest.json index 48d48de82..408b1254e 100644 --- a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.rest.json +++ b/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.rest.json @@ -1,7 +1,11 @@ { "controller.name": "${artifactId}", - "ueb.source.topics": "${dcaeTopic},APPC-CL,APPC-LCM-WRITE", + "ueb.source.topics": "${brmsgwTopic},${dcaeTopic},APPC-CL,APPC-LCM-WRITE", + + "ueb.source.topics.${brmsgwTopic}.servers": "${brmsgwServers}", + "ueb.source.topics.${brmsgwTopic}.events": "org.onap.policy.controlloop.params.ControlLoopParams", + "ueb.source.topics.${brmsgwTopic}.events.org.onap.policy.controlloop.params.ControlLoopParams.filter": "closedLoopControlName=.*,controlLoopYaml=.*", "ueb.source.topics.${dcaeTopic}.servers": "${dcaeServers}", "ueb.source.topics.${dcaeTopic}.events": "org.onap.policy.controlloop.VirtualControlLoopEvent", diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/brmsgw.params.json b/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/brmsgw.params.json deleted file mode 100644 index 9e19361ef..000000000 --- a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/brmsgw.params.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "closedLoopControlName": "${closedLoopControlName}", - "controlLoopYaml": "${controlLoopYaml}", - "policyName": "${policyName}", - "policyScope": "${policyScope}", - "policyVersion": "${policyVersion}" -}
\ No newline at end of file diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.abatement.json b/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.abatement.json index 729451191..3d6dc4ae1 100644 --- a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.abatement.json +++ b/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.abatement.json @@ -1,5 +1,5 @@ { - "closedLoopControlName": "${closedLoopControlName}", + "closedLoopControlName": "${vcpeClosedLoopControlName}", "closedLoopAlarmStart": 1463679805324, "closedLoopAlarmEnd": 1463699805324, "closedLoopEventClient": "DCAE_INSTANCE_ID.dcae-tca", @@ -8,7 +8,7 @@ "target_type": "VNF", "target": "generic-vnf.vnf-id", "AAI": { - "vserver.is-closed-loop-disabled": "false", + "generic-vnf.is-closed-loop-disabled": "false", "generic-vnf.vnf-id": "vCPE_Infrastructure_vGMUX_demo_app" }, "from": "DCAE", diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.onset.json b/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.onset.json index feb15c153..98403b034 100644 --- a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.onset.json +++ b/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.onset.json @@ -1,5 +1,5 @@ { - "closedLoopControlName": "${closedLoopControlName}", + "closedLoopControlName": "${vcpeClosedLoopControlName}", "closedLoopAlarmStart": 1463679805324, "closedLoopEventClient": "DCAE_INSTANCE_ID.dcae-tca", "closedLoopEventStatus": "ONSET", @@ -7,7 +7,7 @@ "target_type": "VNF", "target": "generic-vnf.vnf-id", "AAI": { - "vserver.is-closed-loop-disabled": "false", + "generic-vnf.is-closed-loop-disabled": "false", "generic-vnf.vnf-id": "vCPE_Infrastructure_vGMUX_demo_app" }, "from": "DCAE", diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/dcae.vdns.onset.json b/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/dcae.vdns.onset.json index 4868c586e..80730e9e3 100644 --- a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/dcae.vdns.onset.json +++ b/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/dcae.vdns.onset.json @@ -1,5 +1,5 @@ { - "closedLoopControlName": "${closedLoopControlName}", + "closedLoopControlName": "${vdnsClosedLoopControlName}", "closedLoopAlarmStart": 1484677482204798, "closedLoopEventClient": "DCAE_INSTANCE_ID.dcae-tca", "closedLoopEventStatus": "ONSET", diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/dcae.vfw.onset.json b/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/dcae.vfw.onset.json index 140e9c295..0aa0effa6 100644 --- a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/dcae.vfw.onset.json +++ b/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/dcae.vfw.onset.json @@ -1,5 +1,5 @@ { - "closedLoopControlName": "${closedLoopControlName}", + "closedLoopControlName": "${vfwClosedLoopControlName}", "closedLoopAlarmStart": 1463679805324, "closedLoopEventClient": "microservice.stringmatcher", "closedLoopEventStatus": "ONSET", @@ -7,7 +7,7 @@ "target_type": "VNF", "target": "generic-vnf.vnf-id", "AAI": { - "vserver.is-closed-loop-disabled": "false", + "generic-vnf.is-closed-loop-disabled": "false", "generic-vnf.vnf-id": "fw0002vm002fw002" }, "from": "DCAE", diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/dcae.volte.onset.json b/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/dcae.volte.onset.json index 151912968..2cf28fb3f 100644 --- a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/dcae.volte.onset.json +++ b/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/dcae.volte.onset.json @@ -1,5 +1,5 @@ { - "closedLoopControlName": "${closedLoopControlName}", + "closedLoopControlName": "${volteClosedLoopControlName}", "closedLoopAlarmStart": 1484677482204798, "closedLoopEventClient": "DCAE.HolmesInstance", "closedLoopEventStatus": "ONSET", diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vCPE.yaml b/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vCPE.yaml index abe02c6a9..e04cee8d5 100644 --- a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vCPE.yaml +++ b/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vCPE.yaml @@ -1,6 +1,6 @@ controlLoop: version: 2.0.0 - controlLoopName: ${closedLoopControlName} + controlLoopName: ${vcpeClosedLoopControlName} trigger_policy: unique-policy-id-1-restart timeout: 3600 abatement: true diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vDNS.yaml b/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vDNS.yaml index 274ed3392..6dc295e66 100644 --- a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vDNS.yaml +++ b/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vDNS.yaml @@ -1,6 +1,6 @@ controlLoop: version: 2.0.0 - controlLoopName: ${closedLoopControlName} + controlLoopName: ${vdnsClosedLoopControlName} trigger_policy: unique-policy-id-1-scale-up timeout: 3600 abatement: false diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vFW.yaml b/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vFW.yaml index 37f5fa8e4..64cf90865 100644 --- a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vFW.yaml +++ b/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vFW.yaml @@ -1,6 +1,6 @@ controlLoop: version: 2.0.0 - controlLoopName: ${closedLoopControlName} + controlLoopName: ${vfwClosedLoopControlName} trigger_policy: unique-policy-id-1-modifyConfig timeout: 3600 abatement: false diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vcpe.brmsgw.params.json b/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vcpe.brmsgw.params.json new file mode 100644 index 000000000..6b0ebd227 --- /dev/null +++ b/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vcpe.brmsgw.params.json @@ -0,0 +1,7 @@ +{ + "closedLoopControlName": "${vcpeClosedLoopControlName}", + "controlLoopYaml": "${vcpeControlLoopYaml}", + "policyName": "${vcpePolicyName}", + "policyScope": "${policyScope}", + "policyVersion": "${policyVersion}" +}
\ No newline at end of file diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vdns.brmsgw.params.json b/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vdns.brmsgw.params.json new file mode 100644 index 000000000..744723c87 --- /dev/null +++ b/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vdns.brmsgw.params.json @@ -0,0 +1,7 @@ +{ + "closedLoopControlName": "${vdnsClosedLoopControlName}", + "controlLoopYaml": "${vdnsControlLoopYaml}", + "policyName": "${vdnsPolicyName}", + "policyScope": "${policyScope}", + "policyVersion": "${policyVersion}" +}
\ No newline at end of file diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vfw.brmsgw.params.json b/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vfw.brmsgw.params.json new file mode 100644 index 000000000..353c19c59 --- /dev/null +++ b/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/vfw.brmsgw.params.json @@ -0,0 +1,7 @@ +{ + "closedLoopControlName": "${vfwClosedLoopControlName}", + "controlLoopYaml": "${vfwControlLoopYaml}", + "policyName": "${vfwPolicyName}", + "policyScope": "${policyScope}", + "policyVersion": "${policyVersion}" +}
\ No newline at end of file diff --git a/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/volte.brmsgw.params.json b/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/volte.brmsgw.params.json new file mode 100644 index 000000000..c20b25adc --- /dev/null +++ b/controlloop/templates/archetype-cl-beijing/src/main/resources/archetype-resources/src/main/config/volte.brmsgw.params.json @@ -0,0 +1,7 @@ +{ + "closedLoopControlName": "${volteClosedLoopControlName}", + "controlLoopYaml": "${volteControlLoopYaml}", + "policyName": "${voltePolicyName}", + "policyScope": "${policyScope}", + "policyVersion": "${policyVersion}" +}
\ No newline at end of file |