From 1389192a547b108a5492460e6e1bad672935f3bc Mon Sep 17 00:00:00 2001 From: Konrad Bańka Date: Mon, 25 May 2020 12:03:38 +0200 Subject: [vFW_CNF_CDS] Update package with latest CDS/Policy changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rename csar directory with proper name. Update CBA to refer to default naming policy. Remove policy creating script/docs as it's no longer relevant. Issue-ID: INT-1457 Signed-off-by: Konrad Bańka Change-Id: I7d3b888ce073a88e6dfd41883a8853fbf7cb0539 --- heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json | 4 ++-- heat/vFW_CNF_CDS/templates/cba/TOSCA-Metadata/TOSCA.meta | 2 +- heat/vFW_CNF_CDS/templates/cba/Templates/base_template-template.vtl | 4 ++++ .../templates/cba/Templates/k8s-profiles/ssh-service-template.vtl | 2 +- heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl | 4 ++++ heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json | 2 +- heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl | 4 ++++ heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl | 4 ++++ 8 files changed, 21 insertions(+), 5 deletions(-) (limited to 'heat/vFW_CNF_CDS/templates/cba') diff --git a/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json b/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json index 914405b3..01e14b55 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json +++ b/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json @@ -5,7 +5,7 @@ "author-email": "abdelmuhaimen.seaudi@orange.com", "user-groups": "ADMIN, OPERATION", "template_name": "vFW_CNF_CDS", - "template_version": "1.0.44", + "template_version": "1.0.45", "template_tags": "Samuli Silvius, vFW_CNF_CDS", "template_type": "DEFAULT" }, @@ -66,7 +66,7 @@ "type": "maria-db", "url": "jdbc:mysql://mariadb-galera:3306/sdnctl", "username": "root", - "password": "secretpassword" + "password": "TepsMavaFota9+" } }, "topology_template": { diff --git a/heat/vFW_CNF_CDS/templates/cba/TOSCA-Metadata/TOSCA.meta b/heat/vFW_CNF_CDS/templates/cba/TOSCA-Metadata/TOSCA.meta index 8405b709..80d82af3 100644 --- a/heat/vFW_CNF_CDS/templates/cba/TOSCA-Metadata/TOSCA.meta +++ b/heat/vFW_CNF_CDS/templates/cba/TOSCA-Metadata/TOSCA.meta @@ -3,6 +3,6 @@ CSAR-Version: 1.0 Created-By: Samuli Silvius Entry-Definitions: Definitions/vFW_CNF_CDS.json Template-Name: vFW_CNF_CDS -Template-Version: 1.0.44 +Template-Version: 1.0.45 Template-Type: DEFAULT Template-Tags: Samuli Silvius, vFW_CNF_CDS diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-template.vtl b/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-template.vtl index 888b8421..401a0bd7 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-template.vtl +++ b/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-template.vtl @@ -66,6 +66,10 @@ "param-name": "VNF_NAME", "param-value": "${vnf_name}" }, + { + "param-name": "VF_MODULE_TYPE", + "param-value": "vfmt" + }, { "param-name": "VF_MODULE_LABEL", "param-value": "${vf-module-label}" diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/k8s-profiles/ssh-service-template.vtl b/heat/vFW_CNF_CDS/templates/cba/Templates/k8s-profiles/ssh-service-template.vtl index 98cc9e71..3dc2eb5f 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Templates/k8s-profiles/ssh-service-template.vtl +++ b/heat/vFW_CNF_CDS/templates/cba/Templates/k8s-profiles/ssh-service-template.vtl @@ -1,7 +1,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ .Values.vpg_name_0 }}-ssh-access + name: {{ .Values.vpg_name_0 }}-ssh labels: vnf-name: {{ .Values.vnf_name }} vf-module-name: {{ .Values.vpg_name_0 }} diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl b/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl index 754ff731..d65b6f92 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl +++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl @@ -11,6 +11,10 @@ } ], "payload": [ + { + "param-name": "VF_MODULE_TYPE", + "param-value": "vfmt" + }, { "param-name": "resource-name", "param-value": "vf_module_name" diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json b/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json index 70a95cb8..bee80d14 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json +++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json @@ -99,7 +99,7 @@ "description": "", "required": false, "type": "string", - "default": "SDNC_Policy.Config_MS_ONAP_CNF_NAMING_TIMESTAMP" + "default": "SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP" }, "input-param": false, "dictionary-name": "vf-naming-policy", diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl b/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl index 6f0461bb..18511d54 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl +++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl @@ -42,6 +42,10 @@ } ], "payload": [ + { + "param-name": "VF_MODULE_TYPE", + "param-value": "vfmt" + }, { "param-name": "resource-name", "param-value": "vf_module_name" diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl b/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl index 394bf16c..3e2d8c1c 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl +++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl @@ -11,6 +11,10 @@ } ], "payload": [ + { + "param-name": "VF_MODULE_TYPE", + "param-value": "vfmt" + }, { "param-name": "resource-name", "param-value": "vf_module_name" -- cgit 1.2.3-korg