From a1ffe0ce52a4efa1ed56474417aa525d60518a5b Mon Sep 17 00:00:00 2001 From: Konrad Bańka Date: Fri, 6 Mar 2020 09:24:23 +0100 Subject: Simplify CBA by removing unnecessary variables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change scope: - demo_artifacts_version - default on vnf level, removed vf-module level - install_script_version - removed - *image_name - removed - public_net_id - removed - key_name - removed - pub_key - removed - *flavor_name - removed - sec_group - removed - nfc-naming-code - removed - cloud_env - removed - nexus_artifact_repo - removed - *cidr - removed, where applicable - *ip - removed, where applicable - dcae* - moved to vnf level - aic-cloud-region - removed on vf-module level - vnf_name - removed on base-template level - vf-module-type - removed - vnfc-model-version - removed - vnfc-model-invariant-uuid - removed - vfccustomizationuuid - removed - vf-module-id - removed from template result - service-instance-id - removed from template result - vnf_name - removed and vf-module level - vf-module-model-customization-uuid - removed from template result - vf-module-model-version - removed from template result - vf-module-model-invariant-uuid - removed from template result - vnf-model-customization-uuid - removed at vf-module-level and few other minor tweaks including updating dataDict and enrichment Issue-ID: INT-1260 Signed-off-by: Konrad Bańka Change-Id: Ica6073d0270da9d5ff0f0e544a9b329f66d9b5bb --- .../templates/cba/Definitions/vFW_CNF_CDS.json | 42 +++++++++------------- 1 file changed, 16 insertions(+), 26 deletions(-) (limited to 'heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json') 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 5f7fa0e2..4a0ec295 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.25", + "template_version" : "1.0.44", "template_tags" : "Samuli Silvius, vFW_CNF_CDS", "template_type" : "DEFAULT" }, @@ -34,16 +34,16 @@ "url" : "http://multicloud-k8s:9015" }, "profile-upload-properties" : { - "assignment-params": { + "assignment-params" : { "get_attribute" : [ "resource-assignment", "assignment-params" ] }, - "profile-modification-decision-data": { + "profile-modification-decision-data" : { "get_input" : "vpg-management-port" }, - "profile-artifacts": { + "profile-artifacts" : { "get_attribute" : [ "profile-modification", "assignment-params" ] }, - "api-access": "*multicloud-k8s-api" + "api-access" : "*multicloud-k8s-api" }, "config-deploy-properties" : { "resolution-key" : { @@ -64,35 +64,25 @@ "resource-assignment" : { "description" : "Resource Assign Workflow", "target" : "resource-assignment", - "activities": [ - { - "call_operation": "ResourceResolutionComponent.process" - } - ], - "on_success": [ - "profile-modification" - ] + "activities" : [ { + "call_operation" : "ResourceResolutionComponent.process" + } ], + "on_success" : [ "profile-modification" ] }, "profile-modification" : { "description" : "Profile Modification Resources", "target" : "profile-modification", - "activities": [ - { - "call_operation": "ResourceResolutionComponent.process" - } - ], - "on_success": [ - "profile-upload" - ] + "activities" : [ { + "call_operation" : "ResourceResolutionComponent.process" + } ], + "on_success" : [ "profile-upload" ] }, "profile-upload" : { "description" : "Upload K8s Profile", "target" : "profile-upload", - "activities": [ - { - "call_operation": "ComponentScriptExecutor.process" - } - ] + "activities" : [ { + "call_operation" : "ComponentScriptExecutor.process" + } ] } }, "inputs" : { -- cgit 1.2.3-korg