diff options
author | 2019-05-08 18:48:21 +0530 | |
---|---|---|
committer | 2019-05-08 18:48:21 +0530 | |
commit | fb8ad4d9fb5f08ec500fe972398c984247f96517 (patch) | |
tree | bf550c42cbefcf26b53a11d4fb0baa9e6bc7a218 /dpo | |
parent | a7df4e77c0439e0cce667982691f87a1205e0b87 (diff) |
Issue-ID: DCAEGEN2-1472 BBS bugfix(User Data as config)
Change-Id: I8a99637db7c41d6eafb58dfe960b6e29aacb71ff
Signed-off-by: s00370346 <swarup.nayak1@huawei.com>
Diffstat (limited to 'dpo')
-rw-r--r-- | dpo/blueprints/k8s-rcc-inputs.yaml | 2 | ||||
-rwxr-xr-x | dpo/blueprints/k8s-rcc-policy.yaml-template | 6 | ||||
-rw-r--r-- | dpo/spec/rcc_spec.json | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/dpo/blueprints/k8s-rcc-inputs.yaml b/dpo/blueprints/k8s-rcc-inputs.yaml index 8f61f05..d95a7ea 100644 --- a/dpo/blueprints/k8s-rcc-inputs.yaml +++ b/dpo/blueprints/k8s-rcc-inputs.yaml @@ -16,7 +16,7 @@ # limitations under the License. # ============LICENSE_END========================================================= -tag_version: nexus.onap.org:10001/org.onap.dcaegen2.collectors.restconfcollector:1.1.0 +tag_version: nexus.onap.org:10001/org.onap.dcaegen2.collectors.restconfcollector:1.2.0 external_port: 30416 diff --git a/dpo/blueprints/k8s-rcc-policy.yaml-template b/dpo/blueprints/k8s-rcc-policy.yaml-template index b597d4f..1420989 100755 --- a/dpo/blueprints/k8s-rcc-policy.yaml-template +++ b/dpo/blueprints/k8s-rcc-policy.yaml-template @@ -24,7 +24,7 @@ description: > imports: - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml - - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.5/k8splugin_types.yaml + - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.13/k8splugin_types.yaml inputs: dmaap_host: type: string @@ -34,7 +34,7 @@ inputs: default: "3904" tag_version: type: string - default: "nexus3.onap.org:10001/org.onap.dcaegen2.collectors.restconfcollector:1.0.1" + default: "nexus3.onap.org:10001/org.onap.dcaegen2.collectors.restconfcollector:1.2.0" consul_host: type: string default: consul-server.onap.svc.cluster.local @@ -94,7 +94,7 @@ node_templates: topic_url: get_input: notification_publish_url type: message_router - rcc_policy: '[{"controller_name":"AccessM&C","controller_restapiUrl":"172.30.0.55:26335","controller_restapiUser":"access","controller_restapiPassword":"Huawei@123","controller_accessTokenUrl":"/rest/plat/smapp/v1/oauth/token","controller_accessTokenFile":"./etc/access-token.json","controller_accessTokenMethod":"put","controller_subsMethod":"post","controller_subscriptionUrl":"/restconf/v1/operations/huawei-nce-notification-action:establish-subscription","controller_disableSsl":"true","event_details":[{"event_name":"ONT_registration","event_description":"ONTregistartionevent","event_sseventUrlEmbed":"true","event_sseventsField":"output.url","event_sseventsUrl":"null","event_subscriptionTemplate":"./etc/ont_registartion_subscription_template.json","event_unSubscriptionTemplate":"./etc/ont_registartion_unsubscription_template.json","event_ruleId":"12345678", "modifyData": "true", "modifyMethod": "modifyOntEvent"}]}]' + rcc_policy: '[{"controller_name":"AccessM&C","controller_restapiUrl":"172.30.0.55:26335","controller_restapiUser":"access","controller_restapiPassword":"Huawei@123","controller_accessTokenUrl":"/rest/plat/smapp/v1/oauth/token","controller_accessTokenFile":"./etc/access-token.json","controller_accessTokenMethod":"put","controller_subsMethod":"post","controller_subscriptionUrl":"/restconf/v1/operations/huawei-nce-notification-action:establish-subscription","controller_disableSsl":"true","event_details":[{"event_name":"ONT_registration","event_description":"ONTregistartionevent","event_sseventUrlEmbed":"true","event_sseventsField":"output.url","event_sseventsUrl":"null","event_subscriptionTemplate":"./etc/ont_registartion_subscription_template.json","event_unSubscriptionTemplate":"./etc/ont_registartion_unsubscription_template.json","event_ruleId":"12345678", "modifyData": "true", "modifyMethod": "modifyOntEvent", "userData": "remote_id=AC9.0234.0337;svlan=100;cvlan=10;"}]}]' interfaces: cloudify.interfaces.lifecycle: start: diff --git a/dpo/spec/rcc_spec.json b/dpo/spec/rcc_spec.json index dbcca67..6281d62 100644 --- a/dpo/spec/rcc_spec.json +++ b/dpo/spec/rcc_spec.json @@ -134,7 +134,7 @@ { "name": "rcc_policy", "description": "RCC Policy JSON", - "value":"[{\"controller_name\":\"AccessM&C\",\"controller_restapiUrl\":\"192.167.1.3:8080\",\"controller_restapiUser\":\"access\",\"controller_restapiPassword\":\"Huawei@123\",\"controller_accessTokenUrl\":\"/rest/plat/smapp/v1/oauth/token\",\"controller_accessTokenFile\":\"./etc/access-token.json\",\"controller_accessTokenMethod\":\"put\",\"controller_subsMethod\":\"post\",\"controller_subscriptionUrl\":\"/restconf/v1/operations/huawei-nce-notification-action:establish-subscription\",\"controller_disableSsl\":\"true\",\"event_details\":[{\"event_name\":\"ONT_registration\",\"event_description\":\"ONTregistartionevent\",\"event_sseventUrlEmbed\":\"true\",\"event_sseventsField\":\"output.url\",\"event_sseventsUrl\":\"null\",\"event_subscriptionTemplate\":\"./etc/ont_registartion_subscription_template.json\",\"event_unSubscriptionTemplate\":\"./etc/ont_registartion_unsubscription_template.json\",\"event_ruleId\":\"12345678\", \"modifyData\": \"true\", \"modifyMethod\": \"modifyOntEvent\"}]}]", + "value":"[{\"controller_name\":\"AccessM&C\",\"controller_restapiUrl\":\"192.167.1.3:8080\",\"controller_restapiUser\":\"access\",\"controller_restapiPassword\":\"Huawei@123\",\"controller_accessTokenUrl\":\"/rest/plat/smapp/v1/oauth/token\",\"controller_accessTokenFile\":\"./etc/access-token.json\",\"controller_accessTokenMethod\":\"put\",\"controller_subsMethod\":\"post\",\"controller_subscriptionUrl\":\"/restconf/v1/operations/huawei-nce-notification-action:establish-subscription\",\"controller_disableSsl\":\"true\",\"event_details\":[{\"event_name\":\"ONT_registration\",\"event_description\":\"ONTregistartionevent\",\"event_sseventUrlEmbed\":\"true\",\"event_sseventsField\":\"output.url\",\"event_sseventsUrl\":\"null\",\"event_subscriptionTemplate\":\"./etc/ont_registartion_subscription_template.json\",\"event_unSubscriptionTemplate\":\"./etc/ont_registartion_unsubscription_template.json\",\"event_ruleId\":\"12345678\", \"modifyData\": \"true\", \"modifyMethod\": \"modifyOntEvent\", \"userData\": \"remote_id=AC9.0234.0337;svlan=100;cvlan=10;\"}]}]", "sourced_at_deployment": false, "policy_editable": true, "designer_editable": false |