From 522c69de81b355646789a340f061313e3598f5b9 Mon Sep 17 00:00:00 2001 From: Lukasz Rajewski Date: Thu, 5 Nov 2020 22:55:13 +0100 Subject: vFW CNF CDS scripts update for native Helm support vFW CNF CDS scripts update for native Helm support Change-Id: I34a1cc8dfb18e512edb6e2786984b683c34815e6 Issue-ID: INT-1658 Signed-off-by: Lukasz Rajewski --- heat/vFW_CNF_CDS/README.txt | 15 +++-- heat/vFW_CNF_CDS/templates/Makefile | 31 ++++++--- heat/vFW_CNF_CDS/templates/base/MANIFEST.json | 70 -------------------- heat/vFW_CNF_CDS/templates/base/base_template.env | 5 -- heat/vFW_CNF_CDS/templates/base/base_template.yaml | 77 ---------------------- heat/vFW_CNF_CDS/templates/base/vfw.env | 4 -- heat/vFW_CNF_CDS/templates/base/vfw.yaml | 66 ------------------- heat/vFW_CNF_CDS/templates/base/vpkg.env | 4 -- heat/vFW_CNF_CDS/templates/base/vpkg.yaml | 65 ------------------ heat/vFW_CNF_CDS/templates/base/vsn.env | 4 -- heat/vFW_CNF_CDS/templates/base/vsn.yaml | 66 ------------------- .../vFW_CNF_CDS/templates/base_dummy/MANIFEST.json | 70 ++++++++++++++++++++ .../templates/base_dummy/base_template.env | 5 ++ .../templates/base_dummy/base_template.yaml | 77 ++++++++++++++++++++++ heat/vFW_CNF_CDS/templates/base_dummy/vfw.env | 4 ++ heat/vFW_CNF_CDS/templates/base_dummy/vfw.yaml | 66 +++++++++++++++++++ heat/vFW_CNF_CDS/templates/base_dummy/vpkg.env | 4 ++ heat/vFW_CNF_CDS/templates/base_dummy/vpkg.yaml | 65 ++++++++++++++++++ heat/vFW_CNF_CDS/templates/base_dummy/vsn.env | 4 ++ heat/vFW_CNF_CDS/templates/base_dummy/vsn.yaml | 66 +++++++++++++++++++ .../templates/base_native/MANIFEST.json | 30 +++++++++ .../templates/cba/Definitions/vFW_CNF_CDS.json | 16 ++--- heat/vFW_CNF_CDS/templates/helm/Makefile | 4 +- 23 files changed, 434 insertions(+), 384 deletions(-) delete mode 100644 heat/vFW_CNF_CDS/templates/base/MANIFEST.json delete mode 100644 heat/vFW_CNF_CDS/templates/base/base_template.env delete mode 100644 heat/vFW_CNF_CDS/templates/base/base_template.yaml delete mode 100644 heat/vFW_CNF_CDS/templates/base/vfw.env delete mode 100644 heat/vFW_CNF_CDS/templates/base/vfw.yaml delete mode 100644 heat/vFW_CNF_CDS/templates/base/vpkg.env delete mode 100644 heat/vFW_CNF_CDS/templates/base/vpkg.yaml delete mode 100644 heat/vFW_CNF_CDS/templates/base/vsn.env delete mode 100644 heat/vFW_CNF_CDS/templates/base/vsn.yaml create mode 100644 heat/vFW_CNF_CDS/templates/base_dummy/MANIFEST.json create mode 100644 heat/vFW_CNF_CDS/templates/base_dummy/base_template.env create mode 100644 heat/vFW_CNF_CDS/templates/base_dummy/base_template.yaml create mode 100644 heat/vFW_CNF_CDS/templates/base_dummy/vfw.env create mode 100644 heat/vFW_CNF_CDS/templates/base_dummy/vfw.yaml create mode 100644 heat/vFW_CNF_CDS/templates/base_dummy/vpkg.env create mode 100644 heat/vFW_CNF_CDS/templates/base_dummy/vpkg.yaml create mode 100644 heat/vFW_CNF_CDS/templates/base_dummy/vsn.env create mode 100644 heat/vFW_CNF_CDS/templates/base_dummy/vsn.yaml create mode 100644 heat/vFW_CNF_CDS/templates/base_native/MANIFEST.json diff --git a/heat/vFW_CNF_CDS/README.txt b/heat/vFW_CNF_CDS/README.txt index 46a49e01..651d9598 100644 --- a/heat/vFW_CNF_CDS/README.txt +++ b/heat/vFW_CNF_CDS/README.txt @@ -1,7 +1,12 @@ Demo directory structure: -/templates/ #Base directory containing vFW resources - |- /base #Directory containing base payload of CSAR package, doesn't need further proceeding - |- /helm #Directory containing helm charts that need to be packaged and attached to csar package - \- /cba #Directory containing CBA content to be included to csar package -/examples/ #Directory with context-specific overrides over general resources +/templates/ #Base directory containing vFW resources + |- /base_dummy #Directory containing base payload of VSP package in OpenStack VSP format, doesn't need further proceeding + |- /base_native #Directory containing base payload of VSP package in Helm VSP, doesn't need further proceeding + |- /helm #Directory containing helm charts that need to be packaged and attached to VSP package + \- /cba #Directory containing CBA content to be included to csar package. It is prepared for +/examples/ #Directory with context-specific overrides over general resources + +Note: Scripts generate two VSP packages, one in Frankfurt format with helm associated with dummy heat templates and second +with native Helm VSP format where helm packages are standalone. CBA folder contains CBA Definition for native VSP format but +make is coverting the definition into Frankfurt format for Frankfurt VSP. Frankfurt VSP is still supported in Guilin. diff --git a/heat/vFW_CNF_CDS/templates/Makefile b/heat/vFW_CNF_CDS/templates/Makefile index 38a4b389..7ca4ac04 100644 --- a/heat/vFW_CNF_CDS/templates/Makefile +++ b/heat/vFW_CNF_CDS/templates/Makefile @@ -1,5 +1,6 @@ .PHONY: all clean helm base cba clean_all -ONBOARDING_PACKAGE_NAME ?= vfw_k8s_demo +DUMMY_ONBOARDING_PACKAGE_NAME ?= vfw_k8s_demo +NATIVE_ONBOARDING_PACKAGE_NAME ?= native_vfw_k8s_demo CBA_NAME ?= CBA clean_all: @@ -8,23 +9,35 @@ clean_all: #Can't use .csar extension or SDC will panic all: package/ helm base cba - cd package/ && zip -r $(ONBOARDING_PACKAGE_NAME).zip . - mv package/$(ONBOARDING_PACKAGE_NAME).zip . + cd package_dummy/ && zip -r $(DUMMY_ONBOARDING_PACKAGE_NAME).zip . + cd package_native/ && zip -r $(NATIVE_ONBOARDING_PACKAGE_NAME).zip . + mv package_dummy/$(DUMMY_ONBOARDING_PACKAGE_NAME).zip . + mv package_native/$(NATIVE_ONBOARDING_PACKAGE_NAME).zip . helm: package/ make -C helm - mv helm/*.tgz package/ + mv helm/helm_*.tgz package_native/ + mv helm/*.tgz package_dummy/ base: package/ - cp base/* package/ + cp base_dummy/* package_dummy/ + cp base_native/* package_native/ cba: package/ + cp -r cba cba_dummy + sed -i 's/"helm_/"/g' cba_dummy/Definitions/vFW_CNF_CDS.json + cd cba_dummy/ && zip -r $(CBA_NAME).zip . -x pom.xml .idea/\* target/\* cd cba/ && zip -r $(CBA_NAME).zip . -x pom.xml .idea/\* target/\* - mv cba/$(CBA_NAME).zip package/ + mv cba/$(CBA_NAME).zip package_native/ + mv cba_dummy/$(CBA_NAME).zip package_dummy/ package/: - mkdir package/ + mkdir package_dummy/ + mkdir package_native/ clean: - rm -rf package/ - rm -f $(ONBOARDING_PACKAGE_NAME).zip + rm -rf package_dummy/ + rm -rf package_native/ + rm -rf cba_dummy + rm -f $(DUMMY_ONBOARDING_PACKAGE_NAME).zip + rm -f $(NATIVE_ONBOARDING_PACKAGE_NAME).zip diff --git a/heat/vFW_CNF_CDS/templates/base/MANIFEST.json b/heat/vFW_CNF_CDS/templates/base/MANIFEST.json deleted file mode 100644 index 08f65e75..00000000 --- a/heat/vFW_CNF_CDS/templates/base/MANIFEST.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "name": "virtualFirewall", - "description": "", - "data": [ - { - "file": "CBA.zip", - "type": "CONTROLLER_BLUEPRINT_ARCHIVE" - }, - { - "file": "base_template.yaml", - "type": "HEAT", - "isBase": "true", - "data": [ - { - "file": "base_template.env", - "type": "HEAT_ENV" - } - ] - }, - { - "file": "base_template_cloudtech_k8s_charts.tgz", - "type": "CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT" - }, - { - "file": "vfw.yaml", - "type": "HEAT", - "isBase": "false", - "data": [ - { - "file": "vfw.env", - "type": "HEAT_ENV" - } - ] - }, - { - "file": "vfw_cloudtech_k8s_charts.tgz", - "type": "CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT" - }, - { - "file": "vpkg.yaml", - "type": "HEAT", - "isBase": "false", - "data": [ - { - "file": "vpkg.env", - "type": "HEAT_ENV" - } - ] - }, - { - "file": "vpkg_cloudtech_k8s_charts.tgz", - "type": "CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT" - }, - { - "file": "vsn.yaml", - "type": "HEAT", - "isBase": "false", - "data": [ - { - "file": "vsn.env", - "type": "HEAT_ENV" - } - ] - }, - { - "file": "vsn_cloudtech_k8s_charts.tgz", - "type": "CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT" - } - ] -} diff --git a/heat/vFW_CNF_CDS/templates/base/base_template.env b/heat/vFW_CNF_CDS/templates/base/base_template.env deleted file mode 100644 index c904a66e..00000000 --- a/heat/vFW_CNF_CDS/templates/base/base_template.env +++ /dev/null @@ -1,5 +0,0 @@ -parameters: - vnf_name: vFW_CDS_CNF - vnf_id: vFirewall_demo_app - vf_module_id: vFirewallNet - vnf_software_version: 1.0.0 \ No newline at end of file diff --git a/heat/vFW_CNF_CDS/templates/base/base_template.yaml b/heat/vFW_CNF_CDS/templates/base/base_template.yaml deleted file mode 100644 index 8d796e95..00000000 --- a/heat/vFW_CNF_CDS/templates/base/base_template.yaml +++ /dev/null @@ -1,77 +0,0 @@ -########################################################################## -# -#==================LICENSE_START========================================== -# -# -# Copyright © 2020 Samsung Electronics -# Copyright (c) 2018 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. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -#==================LICENSE_END============================================ -# -# ECOMP is a trademark and service mark of AT&T Intellectual Property. -# -########################################################################## - -heat_template_version: 2013-05-23 - -description: Dummy base heat template for vFW usecase - -############## -# # -# PARAMETERS # -# # -############## - -parameters: - vnf_name: - type: string - description: VNF_NAME - vnf_id: - type: string - label: VNF ID - description: The VNF ID is provided by ONAP - vf_module_id: - type: string - label: VF Module ID - description: The VF Module ID is provided by ONAP - vnf_software_version: - type: string - label: VNF software version - description: VNF software version - default: 1.0.0 - -############# -# # -# RESOURCES # -# # -############# - -resources: - dummy: - type: OS::Heat::None - properties: - vnf_name: - get_param: vnf_name - vnf_id: - get_param: vnf_id - vf_module_id: - get_param: vf_module_id - - #SDC won't allow too dummy resource as it has to find 'topology_template' TOSCA equivalent in heat templates - dummy_base: - type: OS::Nova::Server - properties: - name: test - image: test - flavor: test diff --git a/heat/vFW_CNF_CDS/templates/base/vfw.env b/heat/vFW_CNF_CDS/templates/base/vfw.env deleted file mode 100644 index a43e40f0..00000000 --- a/heat/vFW_CNF_CDS/templates/base/vfw.env +++ /dev/null @@ -1,4 +0,0 @@ -parameters: - vnf_id: vFirewall_demo_app - vnf_name: vFW_CDS_CNF - vf_module_id: vFirewallCL diff --git a/heat/vFW_CNF_CDS/templates/base/vfw.yaml b/heat/vFW_CNF_CDS/templates/base/vfw.yaml deleted file mode 100644 index a1a434e2..00000000 --- a/heat/vFW_CNF_CDS/templates/base/vfw.yaml +++ /dev/null @@ -1,66 +0,0 @@ -########################################################################## -# -#==================LICENSE_START========================================== -# -# -# Copyright © 2020 Samsung Electronics -# Copyright (c) 2018 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. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -#==================LICENSE_END============================================ -# -# ECOMP is a trademark and service mark of AT&T Intellectual Property. -# -########################################################################## - -heat_template_version: 2013-05-23 - -description: Dummy heat template for vFirewall - -############## -# # -# PARAMETERS # -# # -############## - -parameters: - vnf_id: - type: string - label: VNF ID - description: The VNF ID is provided by ONAP - vnf_name: - type: string - label: VNF ID - description: The VNF ID is provided by ONAP - vf_module_id: - type: string - label: VF Module ID - description: The VF Module ID is provided by ONAP - - -############# -# # -# RESOURCES # -# # -############# - -resources: - dummy: - type: OS::Heat::None - properties: - vnf_id: - get_param: vnf_id - vnf_name: - get_param: vnf_name - vf_module_id: - get_param: vf_module_id diff --git a/heat/vFW_CNF_CDS/templates/base/vpkg.env b/heat/vFW_CNF_CDS/templates/base/vpkg.env deleted file mode 100644 index 13d9e858..00000000 --- a/heat/vFW_CNF_CDS/templates/base/vpkg.env +++ /dev/null @@ -1,4 +0,0 @@ -parameters: - vnf_name: vFW_CDS_CNF - vnf_id: vPacketGen_demo_app - vf_module_id: vTrafficPNG diff --git a/heat/vFW_CNF_CDS/templates/base/vpkg.yaml b/heat/vFW_CNF_CDS/templates/base/vpkg.yaml deleted file mode 100644 index 1fdabc82..00000000 --- a/heat/vFW_CNF_CDS/templates/base/vpkg.yaml +++ /dev/null @@ -1,65 +0,0 @@ -########################################################################## -# -#==================LICENSE_START========================================== -# -# -# Copyright © 2020 Samsung Electronics -# Copyright (c) 2018 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. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -#==================LICENSE_END============================================ -# -# ECOMP is a trademark and service mark of AT&T Intellectual Property. -# -########################################################################## - -heat_template_version: 2013-05-23 - -description: Dummy heat template for vPacketgen - -############## -# # -# PARAMETERS # -# # -############## - -parameters: - vnf_name: - type: string - label: VNF NAME - description: The VNF NAME is provided by ONAP - vnf_id: - type: string - label: VNF ID - description: The VNF ID is provided by ONAP - vf_module_id: - type: string - label: VF Module ID - description: The VF Module ID is provided by ONAP - -############# -# # -# RESOURCES # -# # -############# - -resources: - dummy: - type: OS::Heat::None - properties: - vnf_name: - get_param: vnf_name - vnf_id: - get_param: vnf_id - vf_module_id: - get_param: vf_module_id diff --git a/heat/vFW_CNF_CDS/templates/base/vsn.env b/heat/vFW_CNF_CDS/templates/base/vsn.env deleted file mode 100644 index 34e79ebc..00000000 --- a/heat/vFW_CNF_CDS/templates/base/vsn.env +++ /dev/null @@ -1,4 +0,0 @@ -parameters: - vnf_id: vSink_demo_app - vf_module_id: vFirewallCL - vnf_name: vFW_CDS_CNF diff --git a/heat/vFW_CNF_CDS/templates/base/vsn.yaml b/heat/vFW_CNF_CDS/templates/base/vsn.yaml deleted file mode 100644 index 0667e5c4..00000000 --- a/heat/vFW_CNF_CDS/templates/base/vsn.yaml +++ /dev/null @@ -1,66 +0,0 @@ -########################################################################## -# -#==================LICENSE_START========================================== -# -# -# Copyright © 2020 Samsung Electronics -# Copyright (c) 2018 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. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -#==================LICENSE_END============================================ -# -# ECOMP is a trademark and service mark of AT&T Intellectual Property. -# -########################################################################## - -heat_template_version: 2013-05-23 - -description: Dummy heat template for vSink - -############## -# # -# PARAMETERS # -# # -############## - -parameters: - vnf_id: - type: string - label: VNF ID - description: The VNF ID is provided by ONAP - vnf_name: - type: string - label: VNF NAME - description: The VNF NAME is provided by ONAP - vf_module_id: - type: string - label: VF Module ID - description: The VF Module ID is provided by ONAP - -############# -# # -# RESOURCES # -# # -############# - -resources: - - dummy: - type: OS::Heat::None - properties: - vnf_id: - get_param: vnf_id - vnf_name: - get_param: vnf_name - vf_module_id: - get_param: vf_module_id diff --git a/heat/vFW_CNF_CDS/templates/base_dummy/MANIFEST.json b/heat/vFW_CNF_CDS/templates/base_dummy/MANIFEST.json new file mode 100644 index 00000000..08f65e75 --- /dev/null +++ b/heat/vFW_CNF_CDS/templates/base_dummy/MANIFEST.json @@ -0,0 +1,70 @@ +{ + "name": "virtualFirewall", + "description": "", + "data": [ + { + "file": "CBA.zip", + "type": "CONTROLLER_BLUEPRINT_ARCHIVE" + }, + { + "file": "base_template.yaml", + "type": "HEAT", + "isBase": "true", + "data": [ + { + "file": "base_template.env", + "type": "HEAT_ENV" + } + ] + }, + { + "file": "base_template_cloudtech_k8s_charts.tgz", + "type": "CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT" + }, + { + "file": "vfw.yaml", + "type": "HEAT", + "isBase": "false", + "data": [ + { + "file": "vfw.env", + "type": "HEAT_ENV" + } + ] + }, + { + "file": "vfw_cloudtech_k8s_charts.tgz", + "type": "CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT" + }, + { + "file": "vpkg.yaml", + "type": "HEAT", + "isBase": "false", + "data": [ + { + "file": "vpkg.env", + "type": "HEAT_ENV" + } + ] + }, + { + "file": "vpkg_cloudtech_k8s_charts.tgz", + "type": "CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT" + }, + { + "file": "vsn.yaml", + "type": "HEAT", + "isBase": "false", + "data": [ + { + "file": "vsn.env", + "type": "HEAT_ENV" + } + ] + }, + { + "file": "vsn_cloudtech_k8s_charts.tgz", + "type": "CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT" + } + ] +} diff --git a/heat/vFW_CNF_CDS/templates/base_dummy/base_template.env b/heat/vFW_CNF_CDS/templates/base_dummy/base_template.env new file mode 100644 index 00000000..c904a66e --- /dev/null +++ b/heat/vFW_CNF_CDS/templates/base_dummy/base_template.env @@ -0,0 +1,5 @@ +parameters: + vnf_name: vFW_CDS_CNF + vnf_id: vFirewall_demo_app + vf_module_id: vFirewallNet + vnf_software_version: 1.0.0 \ No newline at end of file diff --git a/heat/vFW_CNF_CDS/templates/base_dummy/base_template.yaml b/heat/vFW_CNF_CDS/templates/base_dummy/base_template.yaml new file mode 100644 index 00000000..8d796e95 --- /dev/null +++ b/heat/vFW_CNF_CDS/templates/base_dummy/base_template.yaml @@ -0,0 +1,77 @@ +########################################################################## +# +#==================LICENSE_START========================================== +# +# +# Copyright © 2020 Samsung Electronics +# Copyright (c) 2018 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. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +#==================LICENSE_END============================================ +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# +########################################################################## + +heat_template_version: 2013-05-23 + +description: Dummy base heat template for vFW usecase + +############## +# # +# PARAMETERS # +# # +############## + +parameters: + vnf_name: + type: string + description: VNF_NAME + vnf_id: + type: string + label: VNF ID + description: The VNF ID is provided by ONAP + vf_module_id: + type: string + label: VF Module ID + description: The VF Module ID is provided by ONAP + vnf_software_version: + type: string + label: VNF software version + description: VNF software version + default: 1.0.0 + +############# +# # +# RESOURCES # +# # +############# + +resources: + dummy: + type: OS::Heat::None + properties: + vnf_name: + get_param: vnf_name + vnf_id: + get_param: vnf_id + vf_module_id: + get_param: vf_module_id + + #SDC won't allow too dummy resource as it has to find 'topology_template' TOSCA equivalent in heat templates + dummy_base: + type: OS::Nova::Server + properties: + name: test + image: test + flavor: test diff --git a/heat/vFW_CNF_CDS/templates/base_dummy/vfw.env b/heat/vFW_CNF_CDS/templates/base_dummy/vfw.env new file mode 100644 index 00000000..a43e40f0 --- /dev/null +++ b/heat/vFW_CNF_CDS/templates/base_dummy/vfw.env @@ -0,0 +1,4 @@ +parameters: + vnf_id: vFirewall_demo_app + vnf_name: vFW_CDS_CNF + vf_module_id: vFirewallCL diff --git a/heat/vFW_CNF_CDS/templates/base_dummy/vfw.yaml b/heat/vFW_CNF_CDS/templates/base_dummy/vfw.yaml new file mode 100644 index 00000000..a1a434e2 --- /dev/null +++ b/heat/vFW_CNF_CDS/templates/base_dummy/vfw.yaml @@ -0,0 +1,66 @@ +########################################################################## +# +#==================LICENSE_START========================================== +# +# +# Copyright © 2020 Samsung Electronics +# Copyright (c) 2018 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. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +#==================LICENSE_END============================================ +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# +########################################################################## + +heat_template_version: 2013-05-23 + +description: Dummy heat template for vFirewall + +############## +# # +# PARAMETERS # +# # +############## + +parameters: + vnf_id: + type: string + label: VNF ID + description: The VNF ID is provided by ONAP + vnf_name: + type: string + label: VNF ID + description: The VNF ID is provided by ONAP + vf_module_id: + type: string + label: VF Module ID + description: The VF Module ID is provided by ONAP + + +############# +# # +# RESOURCES # +# # +############# + +resources: + dummy: + type: OS::Heat::None + properties: + vnf_id: + get_param: vnf_id + vnf_name: + get_param: vnf_name + vf_module_id: + get_param: vf_module_id diff --git a/heat/vFW_CNF_CDS/templates/base_dummy/vpkg.env b/heat/vFW_CNF_CDS/templates/base_dummy/vpkg.env new file mode 100644 index 00000000..13d9e858 --- /dev/null +++ b/heat/vFW_CNF_CDS/templates/base_dummy/vpkg.env @@ -0,0 +1,4 @@ +parameters: + vnf_name: vFW_CDS_CNF + vnf_id: vPacketGen_demo_app + vf_module_id: vTrafficPNG diff --git a/heat/vFW_CNF_CDS/templates/base_dummy/vpkg.yaml b/heat/vFW_CNF_CDS/templates/base_dummy/vpkg.yaml new file mode 100644 index 00000000..1fdabc82 --- /dev/null +++ b/heat/vFW_CNF_CDS/templates/base_dummy/vpkg.yaml @@ -0,0 +1,65 @@ +########################################################################## +# +#==================LICENSE_START========================================== +# +# +# Copyright © 2020 Samsung Electronics +# Copyright (c) 2018 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. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +#==================LICENSE_END============================================ +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# +########################################################################## + +heat_template_version: 2013-05-23 + +description: Dummy heat template for vPacketgen + +############## +# # +# PARAMETERS # +# # +############## + +parameters: + vnf_name: + type: string + label: VNF NAME + description: The VNF NAME is provided by ONAP + vnf_id: + type: string + label: VNF ID + description: The VNF ID is provided by ONAP + vf_module_id: + type: string + label: VF Module ID + description: The VF Module ID is provided by ONAP + +############# +# # +# RESOURCES # +# # +############# + +resources: + dummy: + type: OS::Heat::None + properties: + vnf_name: + get_param: vnf_name + vnf_id: + get_param: vnf_id + vf_module_id: + get_param: vf_module_id diff --git a/heat/vFW_CNF_CDS/templates/base_dummy/vsn.env b/heat/vFW_CNF_CDS/templates/base_dummy/vsn.env new file mode 100644 index 00000000..34e79ebc --- /dev/null +++ b/heat/vFW_CNF_CDS/templates/base_dummy/vsn.env @@ -0,0 +1,4 @@ +parameters: + vnf_id: vSink_demo_app + vf_module_id: vFirewallCL + vnf_name: vFW_CDS_CNF diff --git a/heat/vFW_CNF_CDS/templates/base_dummy/vsn.yaml b/heat/vFW_CNF_CDS/templates/base_dummy/vsn.yaml new file mode 100644 index 00000000..0667e5c4 --- /dev/null +++ b/heat/vFW_CNF_CDS/templates/base_dummy/vsn.yaml @@ -0,0 +1,66 @@ +########################################################################## +# +#==================LICENSE_START========================================== +# +# +# Copyright © 2020 Samsung Electronics +# Copyright (c) 2018 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. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +#==================LICENSE_END============================================ +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# +########################################################################## + +heat_template_version: 2013-05-23 + +description: Dummy heat template for vSink + +############## +# # +# PARAMETERS # +# # +############## + +parameters: + vnf_id: + type: string + label: VNF ID + description: The VNF ID is provided by ONAP + vnf_name: + type: string + label: VNF NAME + description: The VNF NAME is provided by ONAP + vf_module_id: + type: string + label: VF Module ID + description: The VF Module ID is provided by ONAP + +############# +# # +# RESOURCES # +# # +############# + +resources: + + dummy: + type: OS::Heat::None + properties: + vnf_id: + get_param: vnf_id + vnf_name: + get_param: vnf_name + vf_module_id: + get_param: vf_module_id diff --git a/heat/vFW_CNF_CDS/templates/base_native/MANIFEST.json b/heat/vFW_CNF_CDS/templates/base_native/MANIFEST.json new file mode 100644 index 00000000..3830c9f1 --- /dev/null +++ b/heat/vFW_CNF_CDS/templates/base_native/MANIFEST.json @@ -0,0 +1,30 @@ +{ + "name": "virtualFirewall", + "description": "", + "data": [ + { + "file": "CBA.zip", + "type": "CONTROLLER_BLUEPRINT_ARCHIVE" + }, + { + "file": "helm_base_template.tgz", + "type": "HELM", + "isBase": "true" + }, + { + "file": "helm_vfw.tgz", + "type": "HELM", + "isBase": "false" + }, + { + "file": "helm_vpkg.tgz", + "type": "HELM", + "isBase": "false" + }, + { + "file": "helm_vsn.tgz", + "type": "HELM", + "isBase": "false" + } + ] +} 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 3fa4e87e..60846f6c 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 @@ -142,27 +142,27 @@ } }, "artifacts": { - "base_template-template": { + "helm_base_template-template": { "type": "artifact-template-velocity", "file": "Templates/base_template-template.vtl" }, - "base_template-mapping": { + "helm_base_template-mapping": { "type": "artifact-mapping-resource", "file": "Templates/base_template-mapping.json" }, - "vpkg-template": { + "helm_vpkg-template": { "type": "artifact-template-velocity", "file": "Templates/vpkg-template.vtl" }, - "vpkg-mapping": { + "helm_vpkg-mapping": { "type": "artifact-mapping-resource", "file": "Templates/vpkg-mapping.json" }, - "vfw-template": { + "helm_vfw-template": { "type": "artifact-template-velocity", "file": "Templates/vfw-template.vtl" }, - "vfw-mapping": { + "helm_vfw-mapping": { "type": "artifact-mapping-resource", "file": "Templates/vfw-mapping.json" }, @@ -174,11 +174,11 @@ "type": "artifact-mapping-resource", "file": "Templates/vnf-mapping.json" }, - "vsn-template": { + "helm_vsn-template": { "type": "artifact-template-velocity", "file": "Templates/vsn-template.vtl" }, - "vsn-mapping": { + "helm_vsn-mapping": { "type": "artifact-mapping-resource", "file": "Templates/vsn-mapping.json" } diff --git a/heat/vFW_CNF_CDS/templates/helm/Makefile b/heat/vFW_CNF_CDS/templates/helm/Makefile index feb92082..fa0aad62 100644 --- a/heat/vFW_CNF_CDS/templates/helm/Makefile +++ b/heat/vFW_CNF_CDS/templates/helm/Makefile @@ -6,11 +6,13 @@ build: $(vf-modules:=-build) clean: $(vf-modules:=-clean) $(vf-modules:=-package): %-package: %-build - mv $(@:package=)*.tgz $(@:-package=)_cloudtech_k8s_charts.tgz + mv $(@:package=)*.tgz helm_$(@:-package=).tgz + cp helm_$(@:-package=).tgz $(@:-package=)_cloudtech_k8s_charts.tgz $(vf-modules:=-build): %-build: %-clean helm package $(@:-build=) $(vf-modules:=-clean): rm -f $(@:-clean=)-*.tgz + rm -f helm_$(@:-clean=).tgz rm -f $(@:-clean=)_cloudtech_k8s_charts.tgz -- cgit 1.2.3-korg