Merge "Blueprint update for DL-Feeder/DL-Admin/SNMPTrap"
diff --git a/Changelog.md b/Changelog.md
index c7bb287..77f12a4 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,16 +6,19 @@
## [3.0.3] - 2021-02-18
### Changed
-- [DCAEGEN2-2509](https://jira.onap.org/browse/DCAEGEN2-2509) - Avoid removal of data when insufficient PM data samples are present
-- [DCAEGEN2-2540](https://jira.onap.org/browse/DCAEGEN2-2540) - Slice-analysis-ms and Policy integration issue fixes
+ - [DCAEGEN2-2509](https://jira.onap.org/browse/DCAEGEN2-2509) - Avoid removal of data when insufficient PM data samples are present
+ - [DCAEGEN2-2540](https://jira.onap.org/browse/DCAEGEN2-2540) - Slice-analysis-ms and Policy integration issue fixes
+ - [DCAEGEN2-2496](https://jira.onap.org/browse/DCAEGEN2-2496) - SNMPTrap collector blueprint updated to use ContainerizedServiceComponent and latest k8s plugin
+ - [DCAEGEN2-2496](https://jira.onap.org/browse/DCAEGEN2-2496) - DL feeder and DL-Admin blueprint updated to use ContainerizedServiceComponent and latest k8s plugin
## [3.0.2] - 2021-02-15
### Changed
-- [DCAEGEN2-2628](https://jira.onap.org/browse/DCAEGEN2-2628) - Fix docker image build problem
-- [DCAEGEN2-2528](https://jira.onap.org/browse/DCAEGEN2-2528) - Add HTTPS as new protocol to collect files from xNFs
+ - [DCAEGEN2-2628](https://jira.onap.org/browse/DCAEGEN2-2628) - Fix docker image build problem
+ - [DCAEGEN2-2528](https://jira.onap.org/browse/DCAEGEN2-2528) - Add HTTPS as new protocol to collect files from xNFs
## [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-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)
+ - [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)
+ - [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-datalake-admin-ui.yaml b/blueprints/k8s-datalake-admin-ui.yaml
index 7c663ca..ebc639a 100644
--- a/blueprints/k8s-datalake-admin-ui.yaml
+++ b/blueprints/k8s-datalake-admin-ui.yaml
@@ -1,6 +1,7 @@
# ============LICENSE_START====================================================
# =============================================================================
-# Copyright (C) 2020 QCT
+# Copyright (C) 2020 QCT. All rights reserved.
+# Copyright (C) 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.
@@ -20,8 +21,8 @@
tosca_definitions_version: cloudify_dsl_1_3
imports:
- https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- - plugin:k8splugin?version=2.0.0
- - plugin:dcaepolicyplugin?version=2.4.0
+ - plugin:k8splugin?version=>=3.4.3,<4.0.0
+
inputs:
image_name:
description: datalake feeder image URL.
@@ -35,9 +36,19 @@
type: string
description: external port
default: "30479"
+ service_component_type:
+ type: string
+ default: "dcae-dl-admin"
+ service_id:
+ type: string
+ default: "dcae-dl-admin"
+ service_component_name_override:
+ type: string
+ default: "dcae-dl-admin"
+
node_templates:
datalake:
- type: dcae.nodes.ContainerizedPlatformComponent
+ type: dcae.nodes.ContainerizedServiceComponent
interfaces:
cloudify.interfaces.lifecycle:
start:
@@ -56,6 +67,7 @@
endpoint: /
image:
get_input: image_name
- dns_name: "dl-admin-ui"
- name: datalake-admin-ui
+ service_component_type: { get_input: service_component_type }
+ service_id: { get_input: service_id }
+ service_component_name_override: { get_input: service_component_name_override }
diff --git a/blueprints/k8s-datalake-feeder.yaml b/blueprints/k8s-datalake-feeder.yaml
index b88892e..3d890e6 100644
--- a/blueprints/k8s-datalake-feeder.yaml
+++ b/blueprints/k8s-datalake-feeder.yaml
@@ -1,6 +1,7 @@
# ============LICENSE_START====================================================
# =============================================================================
-# Copyright (C) 2020 QCT
+# Copyright (C) 2020 QCT. All rights reserved.
+# Copyright (C) 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.
@@ -20,8 +21,8 @@
tosca_definitions_version: cloudify_dsl_1_3
imports:
- https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
- - plugin:k8splugin?version=2.0.0
- - plugin:dcaepolicyplugin?version=2.4.0
+ - plugin:k8splugin?version=>=3.4.3,<4.0.0
+
inputs:
mariadb_address:
type: string
@@ -38,7 +39,7 @@
db_password:
description: MariaDB password
type: string
- default: "secretpassword"
+ default: "vlz8CJL1"
image_name:
description: datalake feeder image URL.
type: string
@@ -63,9 +64,19 @@
type: string
description: external port
default: "30408"
+ service_component_type:
+ type: string
+ default: "dcae-dl-feeder"
+ service_id:
+ type: string
+ default: "dcae-dl-feeder"
+ service_component_name_override:
+ type: string
+ default: "dcae-dl-feeder"
+
node_templates:
datalake:
- type: dcae.nodes.ContainerizedPlatformComponent
+ type: dcae.nodes.ContainerizedServiceComponent
interfaces:
cloudify.interfaces.lifecycle:
start:
@@ -102,7 +113,7 @@
timeout: 10s
type: http
endpoint: /datalake/v1/topics
- dns_name: "dl-feeder"
- name: datalake-feeder
- container_port: { get_input: container_port }
- host_port: { get_input: host_port }
+ service_component_type: { get_input: service_component_type }
+ service_id: { get_input: service_id }
+ service_component_name_override: { get_input: service_component_name_override }
+
diff --git a/blueprints/k8s-snmptrap.yaml b/blueprints/k8s-snmptrap.yaml
index 122821c..ceb5e42 100644
--- a/blueprints/k8s-snmptrap.yaml
+++ b/blueprints/k8s-snmptrap.yaml
@@ -2,7 +2,7 @@
#
# ============LICENSE_START====================================================
# =============================================================================
-# Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2018-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.
@@ -21,7 +21,7 @@
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:
tag_version:
type: string
@@ -81,6 +81,16 @@
type: integer
description: number of instances
default: 1
+ service_component_type:
+ type: string
+ default: "dcae-snmptrap-collector"
+ service_id:
+ type: string
+ default: "dcae-snmptrap-collector"
+ service_component_name_override:
+ type: string
+ default: "dcae-snmptrap-collector"
+
node_templates:
snmptrap:
@@ -115,6 +125,8 @@
image:
get_input: tag_version
replicas: {get_input: replicas}
- name: 'dcae-snmptrap-collector'
- dns_name: 'dcae-snmptrap-collector'
- type: dcae.nodes.ContainerizedPlatformComponent
+ 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
+