diff options
author | Konrad Bańka <k.banka@samsung.com> | 2020-03-06 09:24:23 +0100 |
---|---|---|
committer | Konrad Bańka <k.banka@samsung.com> | 2020-03-13 14:07:49 +0100 |
commit | a1ffe0ce52a4efa1ed56474417aa525d60518a5b (patch) | |
tree | 6e9cc4feb917a93d8a228d154a6cdf38068b91b0 /heat/vFW_CNF_CDS/templates/cba/Definitions/data_types.json | |
parent | 523796ad09130868e8e31e942cd4d9712eb75934 (diff) |
Simplify CBA by removing unnecessary variables
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 <k.banka@samsung.com>
Change-Id: Ica6073d0270da9d5ff0f0e544a9b329f66d9b5bb
Diffstat (limited to 'heat/vFW_CNF_CDS/templates/cba/Definitions/data_types.json')
-rw-r--r-- | heat/vFW_CNF_CDS/templates/cba/Definitions/data_types.json | 536 |
1 files changed, 39 insertions, 497 deletions
diff --git a/heat/vFW_CNF_CDS/templates/cba/Definitions/data_types.json b/heat/vFW_CNF_CDS/templates/cba/Definitions/data_types.json index 988d059c..4ce487b8 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Definitions/data_types.json +++ b/heat/vFW_CNF_CDS/templates/cba/Definitions/data_types.json @@ -61,570 +61,112 @@ "description" : "Dynamic DataType definition for workflow(resource-assignment).", "version" : "1.0.0", "properties" : { - "vf-module-name" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "default" : "${vf-module-name}", - "entry_schema" : { - "type" : "" - } - }, - "private1-prefix-id" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } - }, - "vnf-id" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } - }, - "vsn_flavor_name" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } - }, - "vfw_int_private2_ip_0" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } - }, - "public_net_id" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } - }, - "int_private1_gw_ip" : { - "description" : "Private unprotected network gateway ip", - "type" : "string", - "default" : "${int_private1_gw_ip}" - }, - "sec_group" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } - }, - "nfc-naming-code" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } - }, - "vnfc-model-invariant-uuid" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } - }, - "vfw_name_0" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "default" : "${vfw_name_0}", - "entry_schema" : { - "type" : "" - } - }, - "nexus_artifact_repo" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } - }, - "onap_private_net_cidr" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } - }, - "vpg_onap_private_ip_0" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "default" : "${vpg_onap_private_ip_0}", - "entry_schema" : { - "type" : "" - } - }, - "image_name" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } - }, - "flavor_name" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } - }, - "dcae_collector_ip" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "default" : "10.0.4.1", - "entry_schema" : { - "type" : "" - } - }, - "vf-module-model-invariant-uuid" : { - "type" : "string" - }, - "vpg_name_0" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "default" : "${vpg_name_0}", - "entry_schema" : { - "type" : "" - } - }, - "vf-naming-policy" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } - }, - "int_private2_net_cidr" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } - }, - "vfccustomizationuuid" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } + "vpg-management-port" : { + "description" : "SSH external port of ssh. When 0 ssh service will not be exposed", + "type" : "string", + "default" : "0" }, - "vf-module-model-version" : { + "k8s-rb-profile-namespace" : { + "description" : "K8s namespace to create helm chart for specified profile", "type" : "string" }, "k8s-rb-profile-name" : { "description" : "Profile name used in multicloud/k8s plugin to identify Helm chart(s) where this mapping is providing override values.", "type" : "string" }, - "vsn_name_0" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "default" : "${vsn_name_0}", - "entry_schema" : { - "type" : "" - } - }, - "onap_private_net_id" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } - }, - "demo_artifacts_version" : { + "private1-prefix-id" : { "description" : "", "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } + "type" : "string" }, - "vnf-model-customization-uuid" : { + "private2-prefix-id" : { "description" : "", "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } + "type" : "string" }, - "vfw_int_private1_ip_0" : { + "vnf-id" : { "description" : "", "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "default" : "${vfw_int_private1_ip_0}", - "entry_schema" : { - "type" : "" - } + "type" : "string" }, - "key_name" : { + "service-instance-id" : { "description" : "", "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } + "type" : "string" }, - "install_script_version" : { + "vnf_name" : { "description" : "", "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } + "type" : "string" }, - "vfw_image_name" : { + "demo_artifacts_version" : { "description" : "", "required" : false, "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } + "default" : "1.5.0" }, - "vfw_onap_private_ip_0" : { + "aic-cloud-region" : { "description" : "", "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "default" : "${vfw_onap_private_ip_0}", - "entry_schema" : { - "type" : "" - } - }, - "int_private2_net_id" : { - "description" : "Private protected network identification", "type" : "string" }, - "k8s-rb-profile-namespace" : { - "description" : "K8s namespace to create helm chart for specified profile", - "type" : "string", - "default" : "default" - }, - "vpg-management-port" : { - "description" : "SSH external port of ssh. When 0 ssh service will not be exposed", - "type" : "string", - "default": "0" - }, - "vnf_name" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } - }, - "aic-cloud-region" : { + "vf-module-model-customization-uuid" : { "description" : "", "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } + "type" : "string" }, - "vsn_int_private2_ip_0" : { + "onap_private_net_cidr" : { "description" : "", "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } + "type" : "string" }, - "vf-module-model-customization-uuid" : { + "management-prefix-id" : { "description" : "", "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } - }, - "int_private2_gw_ip" : { - "description" : "Private protected network gateway ip", "type" : "string" }, - "vsn_image_name" : { + "dcae_collector_ip" : { "description" : "", "required" : false, "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } + "default" : "10.0.4.1" }, - "vpg_flavor_name" : { + "int_private1_net_cidr" : { "description" : "", "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } + "type" : "string" }, "vf-module-id" : { "description" : "", "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } - }, - "onap_private_gw_ip" : { - "description" : "Private onap management network gateway ip", - "type" : "string", - "default" : "${onap_private_gw_ip}" + "type" : "string" }, "dcae_collector_port" : { "description" : "", "required" : false, "type" : "string", - "status" : "", - "constraints" : [ { } ], - "default" : "30235", - "entry_schema" : { - "type" : "" - } + "default" : "30235" }, "vf-module-label" : { "description" : "", "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } - }, - "vfw_int_private2_floating_ip" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } - }, - "vpg_image_name" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } - }, - "private2-prefix-id" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } - }, - "vnfc-model-version" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } - }, - "service-instance-id" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } - }, - "vsn_onap_private_ip_0" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "default" : "${vsn_onap_private_ip_0}", - "entry_schema" : { - "type" : "" - } - }, - "vfw_flavor_name" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } - }, - "vf-module-type" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } - }, - "pub_key" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } - }, - "management-prefix-id" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } + "type" : "string" }, - "int_private1_net_cidr" : { - "description" : "", - "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "entry_schema" : { - "type" : "" - } + "vf-module-model-invariant-uuid" : { + "type" : "string" }, - "vpg_int_private1_ip_0" : { + "vf-naming-policy" : { "description" : "", "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "default" : "${vpg_int_private1_ip_0}", - "entry_schema" : { - "type" : "" - } + "type" : "string" }, - "cloud_env" : { + "int_private2_net_cidr" : { "description" : "", "required" : false, - "type" : "string", - "status" : "", - "constraints" : [ { } ], - "default" : "openstack", - "entry_schema" : { - "type" : "" - } + "type" : "string" }, - "int_private1_net_id" : { - "description" : "Private unprotected network identification", - "type" : "string", - "default" : "${int_private1_net_id}" + "vf-module-model-version" : { + "type" : "string" } }, "derived_from" : "tosca.datatypes.Dynamic" |