diff options
| author |   eleonorali <eleonoral@amdocs.com> | 2018-02-11 12:15:48 +0200 |
|---|---|---|
| committer | eleonorali <eleonoral@amdocs.com> | 2018-02-11 12:16:01 +0200 |
| commit | d5b4901c6a1ae136138c1300d377447e26bac4ef (patch) | |
| tree | e25360262affbacfdf1bcaeb1e8976e6d8ebae58 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested | |
| parent | eae2ba3f5ccfb20a899262562bd91129b6d53423 (diff) | |
SRIOV - add annotations
SRIOV - add annotations to input TOSCA parameter converted from HEAT file (2)
Change-Id: Id0b0156730ae64093df42d09e2873de047c13ac9
Issue-ID: SDC-996
Signed-off-by: eleonorali <eleonoral@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested')
14 files changed, 2070 insertions, 12 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/MainServiceTemplate.yaml index d61871c767..b9bc90184c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/MainServiceTemplate.yaml @@ -12,6 +12,15 @@ topology_template: label: OAM network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: oam_net_ips type: list description: OAM network ips entry_schema: @@ -20,18 +29,45 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name oam_net_gw: label: CPS network gateway hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: oam_net_gw type: string description: CPS network gateway pcm_server_names: label: PCRF CM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: pcm_server_names type: list description: name of the PCRF CM instance entry_schema: @@ -40,12 +76,30 @@ topology_template: label: PCRF CM image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: pcm_image_name type: string description: PCRF CM image name cps_net_ips: label: CPS network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: cps_net_ips type: list description: CPS network ips entry_schema: @@ -54,12 +108,30 @@ topology_template: label: security group name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: security_group_name type: string description: the name of security group pcm_volumes: label: CPS Cluman Cinder Volume hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: pcm_volumes type: list description: CPS Cluman Cinder Volume entry_schema: @@ -68,30 +140,75 @@ topology_template: label: PCRF CM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: pcm_flavor_name type: string description: flavor name of PCRF CM instance cps_net_name: label: CPS network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: cps_net_name type: string description: CPS network name cps_net_mask: label: CPS network mask hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: cps_net_mask type: string description: CPS network mask oam_net_mask: label: CPS network mask hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: oam_net_mask type: string description: CPS network mask oam_net_name: label: OAM network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: oam_net_name type: string description: OAM network name node_templates: @@ -213,4 +330,4 @@ topology_template: description: heat template that creates PCRF Cluman stack members: - server_pcm_004 - - server_pcm_003
\ No newline at end of file + - server_pcm_003 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/MainServiceTemplate.yaml index 8295fecd44..5545c178b9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/MainServiceTemplate.yaml @@ -11,11 +11,27 @@ topology_template: vf_module_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: vf_module_id type: string description: Unique ID for this VF_MODULE instance vf_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: vf_name type: string description: The VF Name; defaults to VMVM for the virtual MVM VNF. constraints: @@ -25,11 +41,27 @@ topology_template: cloud_zone_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: cloud_zone_id type: string description: The cloud zone for this VF instance vf_instance_num: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: vf_instance_num type: string description: The number for this VF instance constraints: @@ -39,11 +71,27 @@ topology_template: virtual_mgmt_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: virtual_mgmt_ip_0 type: string description: Virtual management network ip address mvs_mgmt_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: mvs_mgmt_ip_0 type: list description: List of Management network IP addresses for IPv4 entry_schema: @@ -51,6 +99,14 @@ topology_template: flavor: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: flavor type: string description: Server flavor constraints: [ @@ -58,6 +114,14 @@ topology_template: key_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: key_name type: string description: SSH key name constraints: [ @@ -65,11 +129,27 @@ topology_template: vnf_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: vnf_id type: string description: Unique ID for this VF instance availability_zone_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: availability_zone_0 type: list description: List of Availability Zone IDs or Names entry_schema: @@ -77,6 +157,14 @@ topology_template: mgmt_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: mgmt_net_id type: string description: Neutron UUID for the Management network constraints: [ @@ -84,6 +172,14 @@ topology_template: vm_instance_num: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: vm_instance_num type: list description: VM instance number list must be a list of three-digit numeric value entry_schema: @@ -91,11 +187,27 @@ topology_template: bootimage: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: bootimage type: string description: Master bootimage volume id sec_groups: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: sec_groups type: list description: Security groups entry_schema: @@ -103,6 +215,14 @@ topology_template: vf_component: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: vf_component type: string description: The component that this VF instance is running constraints: @@ -112,6 +232,14 @@ topology_template: num_instances: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: num_instances type: float description: number of instance of the VF_module node_templates: @@ -213,4 +341,4 @@ topology_template: Metaswitch MVS (Metaview Server) members: - mvs_modules - - mvs_modules_same_nested_heat_file_no_count
\ No newline at end of file + - mvs_modules_same_nested_heat_file_no_count diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/MainServiceTemplate.yaml index ffbd020e31..3c41ae022e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/MainServiceTemplate.yaml @@ -12,21 +12,55 @@ topology_template: label: security group name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + - base + source_type: HEAT + param_name: security_group_name type: string description: the name of security group shared_security_group_id2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: shared_security_group_id2 type: string description: network name of jsa log network jsa_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + - base + source_type: HEAT + param_name: jsa_net_name type: string description: network name of jsa log network shared_security_group_id1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: shared_security_group_id1 type: string description: network name of jsa log network node_templates: @@ -241,4 +275,4 @@ topology_template: Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - packet_mirror_network - - test_nested
\ No newline at end of file + - test_nested diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/MainServiceTemplate.yaml index 66880be377..aec14250c0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/MainServiceTemplate.yaml @@ -12,21 +12,55 @@ topology_template: label: security group name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + - base + source_type: HEAT + param_name: security_group_name type: string description: the name of security group shared_security_group_id2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: shared_security_group_id2 type: string description: network name of jsa log network jsa_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + - base + source_type: HEAT + param_name: jsa_net_name type: string description: network name of jsa log network shared_security_group_id1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: shared_security_group_id1 type: string description: network name of jsa log network node_templates: @@ -238,4 +272,4 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - test_nested
\ No newline at end of file + - test_nested diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumelocal/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumelocal/expectedoutputfiles/MainServiceTemplate.yaml index 2fbec0c498..5d0e7411e4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumelocal/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumelocal/expectedoutputfiles/MainServiceTemplate.yaml @@ -11,6 +11,14 @@ topology_template: not_null: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: not_null type: string node_templates: server_pcm_001: @@ -38,4 +46,4 @@ topology_template: description: heat template that creates PCRF Cluman stack members: - server_pcm_001 - - nove_001_vol
\ No newline at end of file + - nove_001_vol diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumeseperatefile/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumeseperatefile/expectedoutputfiles/MainServiceTemplate.yaml index b6d5633203..f18f8feeca 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumeseperatefile/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumeseperatefile/expectedoutputfiles/MainServiceTemplate.yaml @@ -11,11 +11,28 @@ topology_template: not_null: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4 + - volume + source_type: HEAT + param_name: not_null type: string nove_001_vol: label: volume hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: nove_001_vol type: string description: volume name node_templates: @@ -45,4 +62,4 @@ topology_template: properties: heat_file: ../Artifacts/volume.yaml members: - - nove_001_vol
\ No newline at end of file + - nove_001_vol diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/MainServiceTemplate.yaml index 1993eeaf1a..c96d74e7d8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/MainServiceTemplate.yaml @@ -11,6 +11,14 @@ topology_template: ssc_a_name_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: ssc_a_name_0 type: string description: Name of VM A of SSC constraints: @@ -18,6 +26,15 @@ topology_template: mgmt_net_plen: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_a + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: mgmt_net_plen type: float description: Management network prefix length constraints: @@ -27,6 +44,14 @@ topology_template: ssc_b_name_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_b + source_type: HEAT + param_name: ssc_b_name_0 type: string description: Name of VM B of SSC constraints: @@ -34,16 +59,43 @@ topology_template: ssc_b_untrusted_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_b + source_type: HEAT + param_name: ssc_b_untrusted_ip_0 type: string description: Fixed IPv4 address on Untrusted/access network for SSC B. ssc_b_untrusted_parent_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_b + source_type: HEAT + param_name: ssc_b_untrusted_parent_ip_0 type: string description: Fixed IPv4 address on Untrusted/access parent network for SSC B. perimeta_untrusted_vlan_ids: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_b + - module_1_perimeta_ssc_b + - module_2_perimeta_rtp_msc_a + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: perimeta_untrusted_vlan_ids type: list description: List of VLAN IDs to use on the untrusted/access network entry_schema: @@ -51,16 +103,41 @@ topology_template: ssc_json_radius_servername: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: ssc_json_radius_servername type: string description: IP Address or hostname of RADIUS server ssc_mgmt_vip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_b + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: ssc_mgmt_vip_0 type: string description: Management virtual IP address to use for SSC. rtp_msc_json_use_radius_authentication: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_a + source_type: HEAT + param_name: rtp_msc_json_use_radius_authentication type: string description: Json prefix, used to indicate if user account authentication is done externally through Radius constraints: @@ -70,16 +147,45 @@ topology_template: ssc_trusted_vip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_b + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: ssc_trusted_vip_0 type: string description: Virtual IPv4 address on Trusted/core network for SSC. ssc_untrusted_vip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_b + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: ssc_untrusted_vip_0 type: string description: Virtual IPv4 address on Untrusted/access network for SSC. perimeta_untrusted_num_vlans: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_b + - module_1_perimeta_ssc_b + - module_2_perimeta_rtp_msc_a + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: perimeta_untrusted_num_vlans type: float description: number of VLANs to connect to the untrusted/access interface constraints: @@ -89,6 +195,15 @@ topology_template: rtp_msc_mgmt_vips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_b + - module_2_perimeta_rtp_msc_a + source_type: HEAT + param_name: rtp_msc_mgmt_vips type: list description: List of management virtual IP addresses to use for RTP MSC. entry_schema: @@ -96,6 +211,14 @@ topology_template: ssc_a_json_prefix: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: ssc_a_json_prefix type: string description: Json prefix, used to create the correct json file depending on the operation being performed default: ' ' @@ -106,6 +229,14 @@ topology_template: rtp_msc_a_untrusted_parent_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_a + source_type: HEAT + param_name: rtp_msc_a_untrusted_parent_ips type: list description: List of fixed IPv4 addresses on Untrusted/access parent network for RTP MSC A. entry_schema: @@ -113,16 +244,41 @@ topology_template: ssc_b_trusted_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_b + source_type: HEAT + param_name: ssc_b_trusted_ip_0 type: string description: Fixed IPv4 address on Trusted/core network for SSC B. shared_perimeta_ssc_server_group: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_b + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: shared_perimeta_ssc_server_group type: string description: Server group to use for these VMs ssc_json_radius_timeout: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: ssc_json_radius_timeout type: float description: Timeout for connect requests to RADIUS server constraints: @@ -132,6 +288,15 @@ topology_template: rtp_msc_untrusted_vips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_b + - module_2_perimeta_rtp_msc_a + source_type: HEAT + param_name: rtp_msc_untrusted_vips type: list description: List of virtual IPv4 addresses on Untrusted/access network for RTP MSC. entry_schema: @@ -139,11 +304,27 @@ topology_template: rtp_msc_json_radius_servername: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_a + source_type: HEAT + param_name: rtp_msc_json_radius_servername type: string description: IP Address or hostname of RADIUS server rtp_msc_vnfcnames: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_a + source_type: HEAT + param_name: rtp_msc_vnfcnames type: list description: List of vnfc names of the RTP MSC. This is the name associated with the perimeta pair and corresponds to the VIP entry_schema: @@ -151,6 +332,15 @@ topology_template: ssc_image_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_b + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: ssc_image_name type: string description: Glance image to use for launching SSC Perimeta instances. default: ISBC_SBC_v4.0.40_SU12.qcow2 @@ -159,6 +349,14 @@ topology_template: perimeta_max_rtp_msc_count: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_perimeta_deployment_create + source_type: HEAT + param_name: perimeta_max_rtp_msc_count type: float description: Max number of RTP MSCs in a site. default: 8 @@ -169,6 +367,17 @@ topology_template: trusted_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_b + - module_1_perimeta_ssc_b + - module_2_perimeta_rtp_msc_a + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: trusted_net_id type: string description: Network ID of Trusted/core network. constraints: [ @@ -176,6 +385,15 @@ topology_template: ntp_server_ip_addrs: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_a + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: ntp_server_ip_addrs type: string description: NTP server IPv4 addresses, separated by commas. These must be accessible from the management network constraints: @@ -183,6 +401,14 @@ topology_template: rtp_msc_json_radius_default: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_a + source_type: HEAT + param_name: rtp_msc_json_radius_default type: string description: Default authentication level for RADIUS users constraints: @@ -195,6 +421,14 @@ topology_template: rtp_msc_a_vnfcnames: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_a + source_type: HEAT + param_name: rtp_msc_a_vnfcnames type: list description: List of vnfc names of the A of RTP MSC entry_schema: @@ -202,11 +436,27 @@ topology_template: ssc_b_untrusted_v6_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_b + source_type: HEAT + param_name: ssc_b_untrusted_v6_ip_0 type: string description: Fixed IPv6 address on Untrusted/access network for SSC B. rtp_msc_b_index: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_b + source_type: HEAT + param_name: rtp_msc_b_index type: float description: Index of RTP MSC to instantiate / heal. constraints: @@ -216,6 +466,15 @@ topology_template: rtp_msc_untrusted_v6_vips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_b + - module_2_perimeta_rtp_msc_a + source_type: HEAT + param_name: rtp_msc_untrusted_v6_vips type: list description: List of virtual IPv6 addresses on Untrusted/access network for RTP MSC. entry_schema: @@ -223,16 +482,41 @@ topology_template: shared_ssc_unused_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_b + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: shared_ssc_unused_net_id type: string description: Unused network ID ssc_b_rf_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_b + source_type: HEAT + param_name: ssc_b_rf_ip_0 type: string description: RF fixed IP address to use for SSC B. rtp_msc_b_untrusted_parent_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_b + source_type: HEAT + param_name: rtp_msc_b_untrusted_parent_ips type: list description: List of fixed IPv4 addresses on Untrusted/access parent network for RTP MSC B. entry_schema: @@ -240,6 +524,15 @@ topology_template: ssc_flavor_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_b + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: ssc_flavor_name type: string description: Flavor to use for creating SSC VM instance default: gv.c8r16d160 @@ -248,6 +541,17 @@ topology_template: mgmt_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_b + - module_1_perimeta_ssc_b + - module_2_perimeta_rtp_msc_a + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: mgmt_net_id type: string description: Management network ID constraints: [ @@ -255,11 +559,27 @@ topology_template: ssc_json_radius_secret: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: ssc_json_radius_secret type: string description: Shared secret to use for the RADIUS Server rtp_msc_a_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_a + source_type: HEAT + param_name: rtp_msc_a_names type: list description: List of names of VM A of RTP MSC entry_schema: @@ -267,6 +587,17 @@ topology_template: shared_int_ha_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_b + - module_1_perimeta_ssc_b + - module_2_perimeta_rtp_msc_a + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: shared_int_ha_net_id type: string description: HA network id constraints: [ @@ -274,6 +605,14 @@ topology_template: ssc_vnfcname_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: ssc_vnfcname_0 type: string description: Name of vnfc of SSC. This is the name associated with the perimeta pair and corresponds to the VIP constraints: @@ -281,6 +620,15 @@ topology_template: rtp_msc_trusted_vips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_b + - module_2_perimeta_rtp_msc_a + source_type: HEAT + param_name: rtp_msc_trusted_vips type: list description: List of virtual IPv4 addresses on Trusted/core network for RTP MSC. entry_schema: @@ -288,6 +636,14 @@ topology_template: rtp_msc_json_radius_port: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_a + source_type: HEAT + param_name: rtp_msc_json_radius_port type: float description: Port to use to connect to RADIUS server constraints: @@ -297,11 +653,30 @@ topology_template: vf_module_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_b + - module_1_perimeta_ssc_b + - module_2_perimeta_rtp_msc_a + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: vf_module_id type: string description: Unique ID for this VF Module instance ssc_json_radius_port: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: ssc_json_radius_port type: float description: Port to use to connect to RADIUS server constraints: @@ -311,6 +686,14 @@ topology_template: rtp_msc_b_untrusted_v6_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_b + source_type: HEAT + param_name: rtp_msc_b_untrusted_v6_ips type: list description: List of fixed IPv6 addresses on Untrusted/access network for RTP MSC B. entry_schema: @@ -318,6 +701,15 @@ topology_template: rtp_msc_b_mgmt_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_b + - module_2_perimeta_rtp_msc_a + source_type: HEAT + param_name: rtp_msc_b_mgmt_ips type: list description: List of management fixed IP addresses to use for RTP MSC B. entry_schema: @@ -325,21 +717,60 @@ topology_template: ssc_a_int_ha_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_b + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: ssc_a_int_ha_ip_0 type: string description: HA fixed IP address to use for SSC A. ssc_b_mgmt_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_b + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: ssc_b_mgmt_ip_0 type: string description: Management fixed IP address to use for SSC B. vnf_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_b + - module_1_perimeta_ssc_b + - module_2_perimeta_rtp_msc_a + - module_1_perimeta_ssc_a + - base_perimeta_deployment_create + source_type: HEAT + param_name: vnf_name type: string description: Unique name for this VNF instance rtp_msc_flavor_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_b + - module_2_perimeta_rtp_msc_a + source_type: HEAT + param_name: rtp_msc_flavor_name type: string description: Flavor to use for creating RTP MSC VM instance default: gv.c8r16d160 @@ -348,12 +779,28 @@ topology_template: perimeta_int_ha_net_prefix_v4: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_perimeta_deployment_create + source_type: HEAT + param_name: perimeta_int_ha_net_prefix_v4 type: string description: IPv4 subnet prefix for internal HA network default: 172.26.1.4 rtp_msc_b_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_b + source_type: HEAT + param_name: rtp_msc_b_names type: list description: List of names of VM B of RTP MSC entry_schema: @@ -361,6 +808,14 @@ topology_template: rtp_msc_b_untrusted_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_b + source_type: HEAT + param_name: rtp_msc_b_untrusted_ips type: list description: List of fixed IPv4 addresses on Untrusted/access network for RTP MSC B. entry_schema: @@ -368,12 +823,28 @@ topology_template: perimeta_ssh_key: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_perimeta_deployment_create + source_type: HEAT + param_name: perimeta_ssh_key type: string description: SSH public key default: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDXvSadEWp+nsz3gEAAAAAAAAAAbggQ3t06mqFIauHfUYMiKZ3EUX3jDFf/uGQoNsIZU6SNE/gl3tY4fFvO8Yzj8OY/vstHHvEadbY5aXNE6kd39ik20uRNbeZLT+pRllBwVKBSVnFqG3kBDvNWmBIenlPZzu3Ay0LYT/aDq6fZaz8Mqy8hzhpAAAAAAAAAAEmS/ESYY4UMs/aF2fVGmCLqudSjLpSsyD8lXag2dmeiT7cTdwRkgtDNTULXCPVucolVZwZF9BxXPNK++B+fL/ZY4MrXHXgZYGEElrMCFYkQFb3jQv3XQtxZ6gVByrzgGc9eiU7tkCgY2cVfb22iIs9n Generated-by-Nova rtp_msc_a_index: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_a + source_type: HEAT + param_name: rtp_msc_a_index type: float description: Index of RTP MSC to instantiate / heal. constraints: @@ -383,6 +854,14 @@ topology_template: rtp_msc_json_v41: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_a + source_type: HEAT + param_name: rtp_msc_json_v41 type: string description: Json prefix, used to ensure that the json tags will be recognised by the server loading them default: ' ' @@ -393,6 +872,15 @@ topology_template: shared_perimeta_rtp_msc_server_groups: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_b + - module_2_perimeta_rtp_msc_a + source_type: HEAT + param_name: shared_perimeta_rtp_msc_server_groups type: list description: Server group to use for these VMs entry_schema: @@ -400,6 +888,14 @@ topology_template: rtp_msc_a_json_prefix: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_a + source_type: HEAT + param_name: rtp_msc_a_json_prefix type: string description: Json prefix, used to create the correct json file depending on the operation being performed default: ' ' @@ -410,11 +906,28 @@ topology_template: ssc_b_int_ha_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_b + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: ssc_b_int_ha_ip_0 type: string description: HA fixed IP address to use for SSC B. rtp_msc_b_vnfcnames: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_a + source_type: HEAT + param_name: rtp_msc_b_vnfcnames type: list description: List of vnfc names of VM B of RTP MSC entry_schema: @@ -422,26 +935,71 @@ topology_template: ssc_a_trusted_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: ssc_a_trusted_ip_0 type: string description: Fixed IPv4 address on Trusted/core network for SSC A. vnf_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_b + - module_1_perimeta_ssc_b + - module_2_perimeta_rtp_msc_a + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: vnf_id type: string description: ID of VNF availability_zone_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_a + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: availability_zone_0 type: string description: Availability zone for A instances. availability_zone_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_b + - module_1_perimeta_ssc_b + source_type: HEAT + param_name: availability_zone_1 type: string description: Availability zone for B instances. perimeta_int_ha_net_prefix_len_v4: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_perimeta_deployment_create + source_type: HEAT + param_name: perimeta_int_ha_net_prefix_len_v4 type: float description: Prefix length of subnet associated with internal HA network default: 26 @@ -452,11 +1010,28 @@ topology_template: ssc_a_untrusted_v6_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: ssc_a_untrusted_v6_ip_0 type: string description: Fixed IPv6 address on Untrusted/access network for SSC A. rtp_msc_untrusted_parent_vips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_b + - module_2_perimeta_rtp_msc_a + source_type: HEAT + param_name: rtp_msc_untrusted_parent_vips type: list description: List of virtual IPv4 addresses on Untrusted/access parent network for RTP MSC. entry_schema: @@ -464,6 +1039,17 @@ topology_template: shared_int_ha_net_prefix_len_v4: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_b + - module_1_perimeta_ssc_b + - module_2_perimeta_rtp_msc_a + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: shared_int_ha_net_prefix_len_v4 type: float description: Prefix length of subnet associated with internal HA network constraints: @@ -473,11 +1059,29 @@ topology_template: ssc_rf_vip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_b + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: ssc_rf_vip_0 type: string description: RF virtual IP address to use for SSC. rtp_msc_a_int_ha_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_b + - module_2_perimeta_rtp_msc_a + source_type: HEAT + param_name: rtp_msc_a_int_ha_ips type: list description: List of HA fixed IP addresses to use for RTP MSC A. entry_schema: @@ -485,16 +1089,46 @@ topology_template: shared_perimeta_keypair: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_b + - module_1_perimeta_ssc_b + - module_2_perimeta_rtp_msc_a + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: shared_perimeta_keypair type: string description: Keypair to use for accessing this Perimeta instance shared_int_untrusted_parent_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_b + - module_1_perimeta_ssc_b + - module_2_perimeta_rtp_msc_a + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: shared_int_untrusted_parent_net_id type: string description: untrusted parent network id ssc_a_vnfcname_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: ssc_a_vnfcname_0 type: string description: vnfc name of VM A of SSC constraints: @@ -502,11 +1136,27 @@ topology_template: rtp_msc_json_radius_secret: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_a + source_type: HEAT + param_name: rtp_msc_json_radius_secret type: string description: Shared secret to use for the RADIUS Server rtp_msc_b_trusted_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_b + source_type: HEAT + param_name: rtp_msc_b_trusted_ips type: list description: List of fixed IPv4 addresses on Trusted/core network for RTP MSC B. entry_schema: @@ -514,6 +1164,14 @@ topology_template: rtp_msc_a_trusted_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_a + source_type: HEAT + param_name: rtp_msc_a_trusted_ips type: list description: List of fixed IPv4 addresses on Trusted/core network for RTP MSC A. entry_schema: @@ -521,6 +1179,15 @@ topology_template: rtp_msc_image_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_b + - module_2_perimeta_rtp_msc_a + source_type: HEAT + param_name: rtp_msc_image_name type: string description: Glance image to use for launching RTP MSC Perimeta instances. default: ISBC_SBC_v4.0.40_SU12.qcow2 @@ -529,16 +1196,42 @@ topology_template: ssc_a_mgmt_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: ssc_a_mgmt_ip_0 type: string description: Management fixed IP address to use for SSC A. ssc_untrusted_parent_vip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_b + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: ssc_untrusted_parent_vip_0 type: string description: Virtual IPv4 address on Untrusted/access parent network for SSC. rtp_msc_b_int_ha_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_b + - module_2_perimeta_rtp_msc_a + source_type: HEAT + param_name: rtp_msc_b_int_ha_ips type: list description: List of HA fixed IP addresses to use for RTP MSC B. entry_schema: @@ -546,11 +1239,28 @@ topology_template: ssc_untrusted_v6_vip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_b + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: ssc_untrusted_v6_vip_0 type: string description: Virtual IPv6 address on Untrusted/access network for SSC. rtp_msc_a_mgmt_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_a + source_type: HEAT + param_name: rtp_msc_a_mgmt_ips type: list description: List of management fixed IP addresses to use for RTP MSC A. entry_schema: @@ -558,6 +1268,14 @@ topology_template: rtp_msc_a_untrusted_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_a + source_type: HEAT + param_name: rtp_msc_a_untrusted_ips type: list description: List of fixed IPv4 addresses on Untrusted/access network for RTP MSC A. entry_schema: @@ -565,11 +1283,27 @@ topology_template: ssc_a_rf_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: ssc_a_rf_ip_0 type: string description: RF fixed IP address to use for SSC A. ssc_json_use_radius_authentication: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: ssc_json_use_radius_authentication type: string description: Json prefix, used to indicate if user account authentication is done externally through Radius constraints: @@ -579,11 +1313,30 @@ topology_template: ssc_a_untrusted_parent_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: ssc_a_untrusted_parent_ip_0 type: string description: Fixed IPv4 address on Untrusted/access parent network for SSC A. perimeta_untrusted_vlan_networks: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_b + - module_1_perimeta_ssc_b + - module_2_perimeta_rtp_msc_a + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: perimeta_untrusted_vlan_networks type: list description: List of Contrail VLAN networks to use on the untrusted/access network. The order and number of these must match the VLAN ID list. entry_schema: @@ -591,11 +1344,27 @@ topology_template: ssc_a_untrusted_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: ssc_a_untrusted_ip_0 type: string description: Fixed IPv4 address on Untrusted/access network for SSC A. rtp_msc_a_untrusted_v6_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_a + source_type: HEAT + param_name: rtp_msc_a_untrusted_v6_ips type: list description: List of fixed IPv6 addresses on Untrusted/access network for RTP MSC A. entry_schema: @@ -603,11 +1372,28 @@ topology_template: mgmt_net_default_gateway: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_a + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: mgmt_net_default_gateway type: string description: Default gateway for management network rtp_msc_json_radius_timeout: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_a + source_type: HEAT + param_name: rtp_msc_json_radius_timeout type: float description: Timeout for connect requests to RADIUS server constraints: @@ -617,6 +1403,14 @@ topology_template: ssc_b_vnfcname_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: ssc_b_vnfcname_0 type: string description: vnfc name of VM B of SSC constraints: @@ -624,6 +1418,14 @@ topology_template: ssc_json_v41: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: ssc_json_v41 type: string description: Json prefix, used to ensure that the json tags will be recognised by the server loading them default: ' ' @@ -634,6 +1436,14 @@ topology_template: ssc_json_radius_default: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: ssc_json_radius_default type: string description: Default authentication level for RADIUS users constraints: @@ -646,6 +1456,17 @@ topology_template: shared_perimeta_sec_groups: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_perimeta_rtp_msc_b + - module_1_perimeta_ssc_b + - module_2_perimeta_rtp_msc_a + - module_1_perimeta_ssc_a + source_type: HEAT + param_name: shared_perimeta_sec_groups type: list description: List of security groups to add on all interfaces. entry_schema: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/MainServiceTemplate.yaml index d61871c767..b9bc90184c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/MainServiceTemplate.yaml @@ -12,6 +12,15 @@ topology_template: label: OAM network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: oam_net_ips type: list description: OAM network ips entry_schema: @@ -20,18 +29,45 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name oam_net_gw: label: CPS network gateway hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: oam_net_gw type: string description: CPS network gateway pcm_server_names: label: PCRF CM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: pcm_server_names type: list description: name of the PCRF CM instance entry_schema: @@ -40,12 +76,30 @@ topology_template: label: PCRF CM image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: pcm_image_name type: string description: PCRF CM image name cps_net_ips: label: CPS network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: cps_net_ips type: list description: CPS network ips entry_schema: @@ -54,12 +108,30 @@ topology_template: label: security group name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: security_group_name type: string description: the name of security group pcm_volumes: label: CPS Cluman Cinder Volume hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: pcm_volumes type: list description: CPS Cluman Cinder Volume entry_schema: @@ -68,30 +140,75 @@ topology_template: label: PCRF CM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: pcm_flavor_name type: string description: flavor name of PCRF CM instance cps_net_name: label: CPS network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: cps_net_name type: string description: CPS network name cps_net_mask: label: CPS network mask hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: cps_net_mask type: string description: CPS network mask oam_net_mask: label: CPS network mask hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: oam_net_mask type: string description: CPS network mask oam_net_name: label: OAM network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: oam_net_name type: string description: OAM network name node_templates: @@ -213,4 +330,4 @@ topology_template: description: heat template that creates PCRF Cluman stack members: - server_pcm_004 - - server_pcm_003
\ No newline at end of file + - server_pcm_003 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/MainServiceTemplate.yaml index d24a02ca03..3320cc525c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/MainServiceTemplate.yaml @@ -14,11 +14,27 @@ topology_template: vf_module_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: vf_module_id type: string description: Unique ID for this VF_MODULE instance vf_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: vf_name type: string description: The VF Name; defaults to VMVM for the virtual MVM VNF. constraints: @@ -28,15 +44,39 @@ topology_template: type_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: type_name type: string cloud_zone_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: cloud_zone_id type: string description: The cloud zone for this VF instance vf_instance_num: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: vf_instance_num type: string description: The number for this VF instance constraints: @@ -46,11 +86,27 @@ topology_template: virtual_mgmt_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: virtual_mgmt_ip_0 type: string description: Virtual management network ip address mvs_mgmt_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: mvs_mgmt_ip_0 type: list description: List of Management network IP addresses for IPv4 entry_schema: @@ -58,10 +114,26 @@ topology_template: compute_image_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: compute_image_name type: string flavor: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: flavor type: string description: Server flavor constraints: [ @@ -69,6 +141,14 @@ topology_template: key_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: key_name type: string description: SSH key name constraints: [ @@ -76,11 +156,27 @@ topology_template: vnf_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: vnf_id type: string description: Unique ID for this VF instance availability_zone_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: availability_zone_0 type: list description: List of Availability Zone IDs or Names entry_schema: @@ -88,6 +184,14 @@ topology_template: mgmt_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: mgmt_net_id type: string description: Neutron UUID for the Management network constraints: [ @@ -95,6 +199,14 @@ topology_template: vm_instance_num: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: vm_instance_num type: list description: VM instance number list must be a list of three-digit numeric value entry_schema: @@ -102,11 +214,27 @@ topology_template: bootimage: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: bootimage type: string description: Master bootimage volume id sec_groups: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: sec_groups type: list description: Security groups entry_schema: @@ -114,6 +242,14 @@ topology_template: vf_component: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: vf_component type: string description: The component that this VF instance is running constraints: @@ -123,6 +259,14 @@ topology_template: num_instances: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: num_instances type: float description: number of instance of the VF_module node_templates: @@ -542,4 +686,4 @@ topology_template: - mvs_modules_custIndexVar2 - mvs_modules_custIndexVar1 - mvs_modules_defaultIndexVar - - server_compute_get_attr_test
\ No newline at end of file + - server_compute_get_attr_test diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/MainServiceTemplate.yaml index 45de38a378..bf58cb5529 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/MainServiceTemplate.yaml @@ -11,11 +11,27 @@ topology_template: vf_module_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - dns_az_01 + source_type: HEAT + param_name: vf_module_id type: string description: Unique ID for this VF module instance dns_int_bearer_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - dns_az_01 + source_type: HEAT + param_name: dns_int_bearer_ips type: list description: DNS Bearer IP list entry_schema: @@ -23,16 +39,41 @@ topology_template: vnf_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - dns_az_01 + - base_dns + source_type: HEAT + param_name: vnf_name type: string description: Unique name for this VF instance oam_protected_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - dns_az_01 + source_type: HEAT + param_name: oam_protected_net_name type: string description: OAM network where instaces will connect dns_oam_protected_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - dns_az_01 + source_type: HEAT + param_name: dns_oam_protected_ips type: list description: DNS OAM IP list entry_schema: @@ -40,48 +81,120 @@ topology_template: dns_key: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - dns_az_01 + source_type: HEAT + param_name: dns_key type: string description: creator's ssh public key int_bearer_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - dns_az_01 + source_type: HEAT + param_name: int_bearer_net_name type: string description: Bearer network where instaces will connect route_eth0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - dns_az_01 + source_type: HEAT + param_name: route_eth0 type: string description: OAM network routes vnf_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - dns_az_01 + source_type: HEAT + param_name: vnf_id type: string description: Unique ID for this VF instance availability_zone_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - dns_az_01 + source_type: HEAT + param_name: availability_zone_0 type: string description: availability zone ID or Name DNS_shared_sec_grp_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - dns_az_01 + source_type: HEAT + param_name: DNS_shared_sec_grp_id type: string description: security group UUID node_count: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - dns_az_01 + source_type: HEAT + param_name: node_count type: float description: the number of DNS nested instances default: 4 dns_image_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - dns_az_01 + source_type: HEAT + param_name: dns_image_name type: string description: operative system image default: NIMBUS_DNS_3.0.2.qcow2 dns_int_bearer_ipv6_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - dns_az_01 + source_type: HEAT + param_name: dns_int_bearer_ipv6_ips type: list description: fixed IP assignment for VM's on the Bearer network entry_schema: @@ -89,6 +202,14 @@ topology_template: dns_server_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - dns_az_01 + source_type: HEAT + param_name: dns_server_names type: list description: DNS VM server name list entry_schema: @@ -96,6 +217,14 @@ topology_template: dns_flavor_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - dns_az_01 + source_type: HEAT + param_name: dns_flavor_name type: string description: resources to by appplied on instances default: nv.c4r4d80 @@ -219,4 +348,4 @@ topology_template: heat_file: ../Artifacts/dns_az_01.yaml description: DNS master template members: - - dns_server_group_az
\ No newline at end of file + - dns_server_group_az diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/MainServiceTemplate.yaml index 6e7b3990c6..1fe827d91c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/MainServiceTemplate.yaml @@ -14,11 +14,27 @@ topology_template: vf_module_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: vf_module_id type: string description: Unique ID for this VF_MODULE instance vf_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: vf_name type: string description: The VF Name; defaults to VMVM for the virtual MVM VNF. constraints: @@ -28,15 +44,39 @@ topology_template: type_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: type_name type: string cloud_zone_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: cloud_zone_id type: string description: The cloud zone for this VF instance vf_instance_num: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: vf_instance_num type: string description: The number for this VF instance constraints: @@ -46,11 +86,27 @@ topology_template: virtual_mgmt_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: virtual_mgmt_ip_0 type: string description: Virtual management network ip address mvs_mgmt_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: mvs_mgmt_ip_0 type: list description: List of Management network IP addresses for IPv4 entry_schema: @@ -58,10 +114,26 @@ topology_template: compute_image_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: compute_image_name type: string flavor: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: flavor type: string description: Server flavor constraints: [ @@ -69,6 +141,14 @@ topology_template: key_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: key_name type: string description: SSH key name constraints: [ @@ -76,11 +156,27 @@ topology_template: vnf_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: vnf_id type: string description: Unique ID for this VF instance availability_zone_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: availability_zone_0 type: list description: List of Availability Zone IDs or Names entry_schema: @@ -88,6 +184,14 @@ topology_template: mgmt_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: mgmt_net_id type: string description: Neutron UUID for the Management network constraints: [ @@ -95,6 +199,14 @@ topology_template: vm_instance_num: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: vm_instance_num type: list description: VM instance number list must be a list of three-digit numeric value entry_schema: @@ -102,11 +214,27 @@ topology_template: bootimage: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: bootimage type: string description: Master bootimage volume id sec_groups: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: sec_groups type: list description: Security groups entry_schema: @@ -114,6 +242,14 @@ topology_template: vf_component: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: vf_component type: string description: The component that this VF instance is running constraints: @@ -123,6 +259,14 @@ topology_template: num_instances: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: num_instances type: float description: number of instance of the VF_module node_templates: @@ -196,4 +340,4 @@ topology_template: Metaswitch MVS (Metaview Server) members: - mvs_modules - - server_compute_get_attr_test
\ No newline at end of file + - server_compute_get_attr_test diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/MainServiceTemplate.yaml index ee856f8b00..94da460a6e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/MainServiceTemplate.yaml @@ -11,11 +11,27 @@ topology_template: vf_module_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: vf_module_id type: string description: Unique ID for this VF_MODULE instance vf_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: vf_name type: string description: The VF Name; defaults to VMVM for the virtual MVM VNF. constraints: @@ -25,11 +41,27 @@ topology_template: cloud_zone_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: cloud_zone_id type: string description: The cloud zone for this VF instance vf_instance_num: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: vf_instance_num type: string description: The number for this VF instance constraints: @@ -39,11 +71,27 @@ topology_template: virtual_mgmt_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: virtual_mgmt_ip_0 type: string description: Virtual management network ip address mvs_mgmt_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: mvs_mgmt_ip_0 type: list description: List of Management network IP addresses for IPv4 entry_schema: @@ -51,6 +99,14 @@ topology_template: flavor: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: flavor type: string description: Server flavor constraints: [ @@ -58,6 +114,14 @@ topology_template: key_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: key_name type: string description: SSH key name constraints: [ @@ -65,11 +129,27 @@ topology_template: vnf_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: vnf_id type: string description: Unique ID for this VF instance availability_zone_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: availability_zone_0 type: list description: List of Availability Zone IDs or Names entry_schema: @@ -77,6 +157,14 @@ topology_template: mgmt_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: mgmt_net_id type: string description: Neutron UUID for the Management network constraints: [ @@ -84,6 +172,14 @@ topology_template: vm_instance_num: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: vm_instance_num type: list description: VM instance number list must be a list of three-digit numeric value entry_schema: @@ -91,11 +187,27 @@ topology_template: bootimage: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: bootimage type: string description: Master bootimage volume id sec_groups: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: sec_groups type: list description: Security groups entry_schema: @@ -103,6 +215,14 @@ topology_template: vf_component: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: vf_component type: string description: The component that this VF instance is running constraints: @@ -112,6 +232,14 @@ topology_template: num_instances: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - mvs.vfmodule.heat + source_type: HEAT + param_name: num_instances type: float description: number of instance of the VF_module node_templates: @@ -168,4 +296,4 @@ topology_template: description: | Metaswitch MVS (Metaview Server) members: - - mvs_modules
\ No newline at end of file + - mvs_modules diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/MainServiceTemplate.yaml index 90dcdb5d5f..7d86e3774a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/MainServiceTemplate.yaml @@ -12,6 +12,15 @@ topology_template: label: OAM network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: oam_net_ips type: list description: OAM network ips entry_schema: @@ -20,18 +29,45 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name oam_net_gw: label: CPS network gateway hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: oam_net_gw type: string description: CPS network gateway pcm_server_names: label: PCRF CM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: pcm_server_names type: list description: name of the PCRF CM instance entry_schema: @@ -40,12 +76,30 @@ topology_template: label: PCRF CM image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: pcm_image_name type: string description: PCRF CM image name cps_net_ips: label: CPS network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: cps_net_ips type: list description: CPS network ips entry_schema: @@ -54,12 +108,30 @@ topology_template: label: security group name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: security_group_name type: string description: the name of security group pcm_volumes: label: CPS Cluman Cinder Volume hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: pcm_volumes type: list description: CPS Cluman Cinder Volume entry_schema: @@ -68,30 +140,75 @@ topology_template: label: PCRF CM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: pcm_flavor_name type: string description: flavor name of PCRF CM instance cps_net_name: label: CPS network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: cps_net_name type: string description: CPS network name cps_net_mask: label: CPS network mask hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: cps_net_mask type: string description: CPS network mask oam_net_mask: label: CPS network mask hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: oam_net_mask type: string description: CPS network mask oam_net_name: label: OAM network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4_2 + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: oam_net_name type: string description: OAM network name node_templates: @@ -219,4 +336,4 @@ topology_template: value: get_attribute: - server_pcm_002 - - oam_net_ip
\ No newline at end of file + - oam_net_ip diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/MainServiceTemplate.yaml index aba8c1aa81..973d8c0409 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/MainServiceTemplate.yaml @@ -15,6 +15,14 @@ topology_template: label: OAM network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: oam_net_ips type: list description: OAM network ips default: @@ -25,6 +33,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -32,6 +48,14 @@ topology_template: label: CPS network gateway hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: oam_net_gw type: string description: CPS network gateway default: 107.239.64.1 @@ -39,6 +63,14 @@ topology_template: label: PCRF CM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: pcm_server_names type: list description: name of the PCRF CM instance default: @@ -49,6 +81,14 @@ topology_template: label: PCRF CM image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: pcm_image_name type: string description: PCRF CM image name default: rhel2 @@ -56,6 +96,14 @@ topology_template: label: CPS network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: cps_net_ips type: list description: CPS network ips default: @@ -66,6 +114,14 @@ topology_template: label: security group name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: security_group_name type: string description: the name of security group default: nimbus_security_group @@ -73,6 +129,14 @@ topology_template: label: CPS Cluman Cinder Volume hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: pcm_volumes type: list description: CPS Cluman Cinder Volume default: @@ -82,22 +146,54 @@ topology_template: compute_image_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: compute_image_name type: string pcm_flavor_name: label: PCRF CM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: pcm_flavor_name type: string description: flavor name of PCRF CM instance default: cps net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: net_name type: string cps_net_name: label: CPS network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: cps_net_name type: string description: CPS network name default: int_pcrf_net_0 @@ -105,6 +201,14 @@ topology_template: label: CPS network mask hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: cps_net_mask type: string description: CPS network mask default: 255.255.255.0 @@ -112,6 +216,14 @@ topology_template: label: CPS network mask hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: oam_net_mask type: string description: CPS network mask default: 255.255.255.0 @@ -119,6 +231,14 @@ topology_template: label: OAM network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: oam_net_name type: string description: OAM network name default: oam_protected_net_0 |