diff options
| -rw-r--r-- | Changelog.md | 4 | ||||
| -rw-r--r-- | blueprints/k8s-restconf.yaml | 22 | ||||
| -rw-r--r-- | blueprints/k8s-ves-mapper.yaml | 23 |
3 files changed, 34 insertions, 15 deletions
diff --git a/Changelog.md b/Changelog.md index 652154e..cf61ecf 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,4 +6,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## [3.0.1] - 11/02/2021 ### Changed -- [DCAEGEN2-2537](https://jira.onap.org/browse/DCAEGEN2-2537) - Upgrade prh.prh-app-server to 1.5.5 + - [DCAEGEN2-2537](https://jira.onap.org/browse/DCAEGEN2-2537) - Upgrade prh.prh-app-server to 1.5.5 + - [DCAEGEN2-2493](https://jira.onap.org/browse/DCAEGEN2-2493) - RCC blueprint updated to use latest k8s plugin & 1.2.3 version (vulnerability fixes) + - [DCAEGEN2-2496](https://jira.onap.org/browse/DCAEGEN2-2496) - VES-Mapper blueprint updated to 1.2.0 version (vulnerability fixes) diff --git a/blueprints/k8s-restconf.yaml b/blueprints/k8s-restconf.yaml index f9d1911..13d5feb 100644 --- a/blueprints/k8s-restconf.yaml +++ b/blueprints/k8s-restconf.yaml @@ -1,6 +1,6 @@ # ============LICENSE_START==================================================== # ============================================================================= -# Copyright (c) 2017-2020 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2017-2021 AT&T Intellectual Property. All rights reserved. # Copyright (c) 2019 Huawei. All rights reserved. # ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); @@ -23,7 +23,7 @@ description: > imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - - plugin:k8splugin?version=2.0.0 + - plugin:k8splugin?version=>=3.4.3,<4.0.0 inputs: dmaap_host: type: string @@ -33,7 +33,7 @@ inputs: default: "3904" tag_version: type: string - default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.restconfcollector:1.2.2" + default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.restconfcollector:1.2.3" consul_host: type: string default: "consul-server.onap.svc.cluster.local" @@ -53,12 +53,20 @@ inputs: notification_publish_url: type: string default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.DCAE_RCC_OUTPUT" + service_component_type: + type: string + default: "dcae-restconf-collector" + service_id: + type: string + default: "dcae-restconf-collector" + service_component_name_override: + type: string + default: "dcae-restconf-collector" node_templates: rcc_k8s: - type: dcae.nodes.ContainerizedPlatformComponent + type: dcae.nodes.ContainerizedServiceComponent properties: - name: 'dcaegen2-collectors-rcc' docker_config: healthcheck: endpoint: /healthcheck @@ -94,6 +102,9 @@ node_templates: 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","userData": "remote_id=AC9.0234.0337;svlan=100;cvlan=10;"}]}]' + service_component_type: { get_input: service_component_type } + service_id: { get_input: service_id } + service_component_name_override: { get_input: service_component_name_override } interfaces: cloudify.interfaces.lifecycle: start: @@ -113,4 +124,3 @@ node_templates: ports: - concat: ["8080:", { get_input: external_port }] - diff --git a/blueprints/k8s-ves-mapper.yaml b/blueprints/k8s-ves-mapper.yaml index 7d90763..8fe25b8 100644 --- a/blueprints/k8s-ves-mapper.yaml +++ b/blueprints/k8s-ves-mapper.yaml @@ -2,7 +2,7 @@ # ============LICENSE_START==================================================== # ============================================================================= # Copyright (c) 2019 TechMahindra. All rights reserved. -# Copyright (c) 2020 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2020-2021 AT&T Intellectual Property. All rights reserved. # ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ # limitations under the License. # ============LICENSE_END====================================================== -description: "This blueprint deploys the UniversalVESAdapter" +description: "UniversalVESAdapter blueprint" imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - plugin:k8splugin?version=>=3.4.3,<4.0.0 @@ -30,10 +30,7 @@ inputs: default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.ONAP-COLLECTOR-SNMPTRAP" type: string tag_version: - default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.mapper.vesadapter.universalvesadaptor:1.1.0" - type: string - universal_mapper_name: - default: "dcaegen2-svc-mapper" + default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.mapper.vesadapter.universalvesadaptor:1.2.0" type: string ves_fault_publish_url: default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.SEC_FAULT_OUTPUT" @@ -47,6 +44,15 @@ inputs: ves_pnfRegistration_publish_url: default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.VES_PNFREG_OUTPUT" type: string + service_component_type: + type: string + default: "dcae-svc-vesmapper" + service_id: + type: string + default: "dcae-svc-vesmapper" + service_component_name_override: + type: string + default: "dcae-svc-vesmapper" node_templates: universalvesadapter: interfaces: @@ -101,8 +107,9 @@ node_templates: docker_config: {} image: get_input: tag_version - service_component_type: - get_input: universal_mapper_name + service_component_type: { get_input: service_component_type } + service_id: { get_input: service_id } + service_component_name_override: { get_input: service_component_name_override } type: dcae.nodes.ContainerizedServiceComponent tosca_definitions_version: cloudify_dsl_1_3 |