diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat')
48 files changed, 8128 insertions, 174 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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/expectedoutputfiles/MainServiceTemplate.yaml new file mode 100644 index 0000000000..ac73bf2b00 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/expectedoutputfiles/MainServiceTemplate.yaml @@ -0,0 +1,1112 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +node_types: + org.openecomp.resource.vfc.nodes.heat.pd_server: + derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server +topology_template: + inputs: + pd_flavor_name: + label: PD flavor name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: pd_flavor_name + type: string + description: flavor name of PD instance + default: m3.xlarge + availabilityzone_name: + label: availabilityzone name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: availabilityzone_name + type: string + description: availabilityzone name + default: nova + repl_net_ips: + label: repl network ips + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: repl_net_ips + type: list + description: ips of repl network + default: + - 107.239.33.57 + - 107.239.33.58 + entry_schema: + type: string + sl_net_name: + label: silver lining network name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: sl_net_name + type: string + description: id of the sl network + default: exn_protected_net_0 + pd_image_name: + label: image name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: pd_image_name + type: string + description: PD image name + default: MOG_BASE_8.0 + pd_server_names: + label: PD server names + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: pd_server_names + type: list + description: name of the PD instance + default: + - ZRDM1MOGX01MPD001 + - ZRDM1MOGX01MPD002 + entry_schema: + type: string + sm_server_names: + label: SM server names + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat1 + source_type: HEAT + param_name: sm_server_names + type: list + description: name of the SM instance + default: + - ZRDM1MOGX01MSM001 + - ZRDM1MOGX01MSM002 + entry_schema: + type: string + dummy_net_netmask_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat2 + source_type: HEAT + param_name: dummy_net_netmask_1 + type: string + description: CSB internal network subnet mask + default: 255.255.255.0 + dummy_net_netmask_0: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: dummy_net_netmask_0 + type: string + description: CSB internal network subnet mask + default: 255.255.255.0 + ran_net_floating_ip: + label: mog ran net virtual ip + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: ran_net_floating_ip + type: string + description: mog ran net virtual ip + default: 107.239.36.5 + ran_net_ips: + label: RAN network ips + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: ran_net_ips + type: list + description: RAN network ip + default: + - 107.239.36.3 + - 107.239.36.4 + entry_schema: + type: string + dummy_net_end_0: + label: csb internal end + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: dummy_net_end_0 + type: string + description: csb internal end + default: 169.254.1.254 + oam_image_name: + label: image name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: oam_image_name + type: string + description: OAM image name + default: MOG_BASE_8.0 + dummy_net_end_1: + label: csb internal end + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: dummy_net_end_1 + type: string + description: csb internal end + default: 169.254.2.254 + oam_net_name: + label: oam network name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: oam_net_name + type: string + description: name of the oam network + default: oam_protected_net_0 + oam_net_ips: + label: internet network ips + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: oam_net_ips + type: list + description: ip of the OAM network + default: + - 107.250.172.213 + - 107.250.172.214 + - 107.250.172.215 + - 107.250.172.216 + - 107.250.172.217 + entry_schema: + type: string + ran_net_name: + label: RAN network name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: ran_net_name + type: string + description: RAN network name + default: gn_direct_net_0 + cluster-manager-vol-1: + label: mog-cm-vol-1 + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: cluster-manager-vol-1 + type: string + description: Cluster Manager volume 1 + default: 43ccf5ba-2d50-427b-a38f-e8c7d8670eee + csb_net_netmask: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: csb_net_netmask + type: string + description: CSB internal network subnet mask + default: 255.255.255.0 + oam_flavor_name: + label: OAM flavor name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: oam_flavor_name + type: string + description: flavor name of OAM instance + default: m3.xlarge + dummy_net_start_0: + label: csb internal start + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: dummy_net_start_0 + type: string + description: csb internal start + default: 169.254.1.4 + dummy_net_start_1: + label: csb internal start + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat2 + source_type: HEAT + param_name: dummy_net_start_1 + type: string + description: csb internal start + default: 169.254.2.4 + cm_flavor_name: + label: CM flavor name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: cm_flavor_name + type: string + description: flavor name of CM instance + default: m3.xlarge + sm_image_name: + label: image name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: sm_image_name + type: string + description: SM image name + default: MOG_BASE_8.0 + ps_server_names: + label: PS server names + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: ps_server_names + type: list + description: name of the PS instance + default: + - ZRDM1MOGX01MPS001 + - ZRDM1MOGX01MPS002 + - ZRDM1MOGX01MPS003 + - ZRDM1MOGX01MPS004 + entry_schema: + type: string + csb_net_ips: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat2 + source_type: HEAT + param_name: csb_net_ips + type: list + description: mog_csb_net IP addresses + default: + - 172.26.0.10 + - 172.26.0.11 + - 172.26.0.12 + - 172.26.0.13 + - 172.26.0.14 + - 172.26.0.15 + - 172.26.0.16 + - 172.26.0.17 + - 172.26.0.18 + - 172.26.0.19 + - 172.26.0.20 + entry_schema: + type: string + ps_flavor_name: + label: PS flavor name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat1 + - heat2 + source_type: HEAT + param_name: ps_flavor_name + type: string + description: flavor name of PS instance + default: m3.xlarge + rx_net_ips: + label: Rx network ips + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: rx_net_ips + type: list + description: Rx network ips + default: + - 107.239.34.3 + - 107.239.34.4 + entry_schema: + type: string + dummy_net_name_1: + label: csb internal network name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: dummy_net_name_1 + type: string + description: csb internal network name + default: mog_dummy_1 + dummy_net_cidr_1: + label: csb ineternal cidr + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + source_type: HEAT + param_name: dummy_net_cidr_1 + type: string + description: csb internal cidr + default: 169.254.2.0/24 + dummy_net_name_0: + label: csb internal network name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: dummy_net_name_0 + type: string + description: csb internal network name + default: mog_dummy_0 + dummy_net_cidr_0: + label: csb ineternal cidr + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + source_type: HEAT + param_name: dummy_net_cidr_0 + type: string + description: csb internal cidr + default: 169.254.1.0/24 + oam-vol-2: + label: mog-oam-vol-2 + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: oam-vol-2 + type: string + description: OAM volume 2 + default: 6d169cb6-6ddc-41dc-920c-2839898a2924 + sl_net_floating_ip: + label: mog sl net virtual ip + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: sl_net_floating_ip + type: string + description: mog sl net virtual ip + default: 107.239.45.6 + session-manager-vol-1: + label: mog-sm-vol-1 + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: session-manager-vol-1 + type: string + description: Session Manager volume 1 + default: 49201898-333d-4c88-b58d-cf573b091633 + rx_net_floating_ip: + label: mog rx net virtual ip + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: rx_net_floating_ip + type: string + description: mog rx net virtual ip + default: 107.239.34.5 + session-manager-vol-2: + label: mog-sm-vol-2 + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: session-manager-vol-2 + type: string + description: Session Manager volume 2 + default: 4c35b5f1-ce99-4220-a6e2-cda6e2d713a0 + oam-vol-1: + label: mog-oam-vol-1 + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: oam-vol-1 + type: string + description: OAM volume 1 + default: 0a7fcd9e-2624-401d-ac21-b0191f85ec77 + csb_net_start: + label: csb internal start + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: csb_net_start + type: string + description: csb internal start + default: 172.26.0.1 + cm_image_name: + label: image name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: cm_image_name + type: string + description: CM image name + default: MOG_BASE_8.0 + sm_flavor_name: + label: SM flavor name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: sm_flavor_name + type: string + description: flavor name of SM instance + default: m2.xlarge4 + ps_image_name: + label: PS image name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: ps_image_name + type: string + description: PS image name + default: MOG_BASE_8.0 + oam_server_names: + label: OAM server names + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: oam_server_names + type: list + description: name of the OAM instance + default: + - ZRDM1MOGX01OAM001 + - ZRDM1MOGX01OAM002 + entry_schema: + type: string + csb_net_cidr: + label: csb ineternal cidr + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: csb_net_cidr + type: string + description: csb internal cidr + default: 172.26.0.0/24 + cm_server_names: + label: CM server names + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: cm_server_names + type: list + description: name of the CM instance + default: + - ZRDM1MOGX01MCM001 + entry_schema: + type: string + sl_net_ips: + label: silver lining network ips + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: sl_net_ips + type: list + description: ips of the sl network + default: + - 107.239.45.4 + - 107.239.45.5 + entry_schema: + type: string + rx_net_name: + label: Rx network name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: rx_net_name + type: string + description: Rx network name + default: cor_direct_net_1 + repl_net_name: + label: Replication network name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: repl_net_name + type: string + description: name of the replication network + default: cor_direct_net_0 + security_group_name: + label: security group name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: security_group_name + type: string + description: the name of security group + default: mog_security_group + csb_net_end: + label: csb internal end + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: csb_net_end + type: string + description: csb internal end + default: 172.26.0.254 + csb_net_name: + label: csb internal network name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - heat3 + - heat1 + - heat2 + source_type: HEAT + param_name: csb_net_name + type: string + description: csb internal network name + default: int_mog_csb_net + node_templates: + pd01_port_0: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam + network: + get_input: oam_net_name + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: server_pd_01 + relationship: tosca.relationships.network.BindsTo + pd03_port_0: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam + network: + get_input: oam_net_name + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: server_pd_02 + relationship: tosca.relationships.network.BindsTo + pd02_port_0: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam + network: + get_input: oam_net_name + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: server_pd_01 + relationship: tosca.relationships.network.BindsTo + server_pd_02: + type: org.openecomp.resource.vfc.nodes.heat.pd_server + properties: + flavor: + get_input: pd_flavor_name + availability_zone: + get_input: availabilityzone_name + image: + get_input: pd_image_name + user_data_format: RAW + name: + get_input: + - pd_server_names + - 0 + pd04_port_0: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam + network: + get_input: oam_net_name + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: server_pd_02 + relationship: tosca.relationships.network.BindsTo + server_pd_01: + type: org.openecomp.resource.vfc.nodes.heat.pd_server + properties: + flavor: + get_input: pd_flavor_name + availability_zone: + get_input: availabilityzone_name + image: + get_input: pd_image_name + user_data_format: RAW + name: + get_input: + - pd_server_names + - 0 + server_pd_03: + type: org.openecomp.resource.vfc.nodes.heat.pd_server + properties: + flavor: + get_input: pd_flavor_name + availability_zone: + get_input: availabilityzone_name + image: + get_input: pd_image_name + user_data_format: RAW + name: + get_input: + - pd_server_names + - 0 + pd01_port_5: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam + network: + get_input: oam_net_name + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: server_pd_03 + relationship: tosca.relationships.network.BindsTo + pd02_port_6: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam + network: + get_input: oam_net_name + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: server_pd_03 + relationship: tosca.relationships.network.BindsTo + groups: + heat3_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/heat3.yml + description: heat template that creates MOG stack + members: + - server_pd_03 + - pd01_port_5 + - pd02_port_6 + heat1_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/heat1.yml + description: heat template that creates MOG stack + members: + - pd01_port_0 + - pd02_port_0 + - server_pd_01 + heat2_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/heat2.yml + description: heat template that creates MOG stack + members: + - pd03_port_0 + - server_pd_02 + - pd04_port_0
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/MANIFEST.json new file mode 100644 index 0000000000..1e34f17ee1 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/MANIFEST.json @@ -0,0 +1,38 @@ +{ + "name": "heat", + "description": "HOT template to create hot mog server", + "version": "2013-05-23", + "data": [ + { + "file": "heat1.yml", + "type": "HEAT", + "data": [ + { + "file": "heat1.env", + "type": "HEAT_ENV" + } + ] + }, + { + "file": "heat2.yml", + "type": "HEAT", + "isBase": "true", + "data": [ + { + "file": "heat2.env", + "type": "HEAT_ENV" + } + ] + }, + { + "file": "heat3.yml", + "type": "HEAT", + "data": [ + { + "file": "heat3.env", + "type": "HEAT_ENV" + } + ] + } + ] +} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat1.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat1.env new file mode 100644 index 0000000000..137187c9fe --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat1.env @@ -0,0 +1,51 @@ +parameters: + pd_server_names: ZRDM1MOGX01MPD001,ZRDM1MOGX01MPD002 + pd_image_name: MOG_BASE_8.0 + pd_flavor_name: m3.xlarge + oam_server_names: ZRDM1MOGX01OAM001,ZRDM1MOGX01OAM002 + oam_image_name: MOG_BASE_8.0 + oam_flavor_name: m3.xlarge + sm_server_names: ZRDM1MOGX01MSM001,ZRDM1MOGX01MSM002 + sm_image_name: MOG_BASE_8.0 + sm_flavor_name: m2.xlarge4 + ps_server_names: ZRDM1MOGX01MPS001,ZRDM1MOGX01MPS002,ZRDM1MOGX01MPS003,ZRDM1MOGX01MPS004 + ps_image_name: MOG_BASE_8.0 + ps_flavor_name: m3.xlarge + cm_server_names: ZRDM1MOGX01MCM001 + cm_image_name: MOG_BASE_8.0 + cm_flavor_name: m3.xlarge + availabilityzone_name: nova + oam_net_name: oam_protected_net_0 + oam_net_ips: 107.250.172.213,107.250.172.214,107.250.172.215,107.250.172.216,107.250.172.217 + #internet_net_name: dmz_protected_net_0 + #internet_net_ips: 107.239.53.4,107.239.53.5 + # internet_net_floating_ip: 107.239.53.6 + sl_net_name: exn_protected_net_0 + sl_net_ips: 107.239.45.4,107.239.45.5 + sl_net_floating_ip: 107.239.45.6 + repl_net_name: cor_direct_net_0 + repl_net_ips: 107.239.33.57,107.239.33.58 + rx_net_name: cor_direct_net_1 + rx_net_ips: 107.239.34.3,107.239.34.4 + rx_net_floating_ip: 107.239.34.5 + ran_net_name: gn_direct_net_0 + ran_net_ips: 107.239.36.3,107.239.36.4 + ran_net_floating_ip: 107.239.36.5 + dummy_net_name_0: mog_dummy_0 + dummy_net_start_0: 169.254.1.4 + dummy_net_end_0: 169.254.1.254 + dummy_net_netmask_0: 255.255.255.0 + dummy_net_name_1: mog_dummy_1 + dummy_net_end_1: 169.254.2.254 + dummy_net_cidr_1: 169.254.2.0/24 + csb_net_name: int_mog_csb_net + csb_net_start: 172.26.0.1 + csb_net_end: 172.26.0.254 + csb_net_cidr: 172.26.0.0/24 + csb_net_netmask: 255.255.255.0 + security_group_name: mog_security_group + cluster-manager-vol-1: 43ccf5ba-2d50-427b-a38f-e8c7d8670eee + session-manager-vol-1: 49201898-333d-4c88-b58d-cf573b091633 + session-manager-vol-2: 4c35b5f1-ce99-4220-a6e2-cda6e2d713a0 + oam-vol-1: 0a7fcd9e-2624-401d-ac21-b0191f85ec77 + oam-vol-2: 6d169cb6-6ddc-41dc-920c-2839898a2924
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat1.yml new file mode 100644 index 0000000000..21a58546bb --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat1.yml @@ -0,0 +1,216 @@ +heat_template_version: 2013-05-23 + +description: heat template that creates MOG stack + +parameters: + pd_server_names: + type: comma_delimited_list + label: PD server names + description: name of the PD instance + pd_image_name: + type: string + label: image name + description: PD image name + pd_flavor_name: + type: string + label: PD flavor name + description: flavor name of PD instance + oam_server_names: + type: comma_delimited_list + label: OAM server names + description: name of the OAM instance + oam_image_name: + type: string + label: image name + description: OAM image name + oam_flavor_name: + type: string + label: OAM flavor name + description: flavor name of OAM instance + sm_server_names: + type: comma_delimited_list + label: SM server names + description: name of the SM instance + sm_image_name: + type: string + label: image name + description: SM image name + sm_flavor_name: + type: string + label: SM flavor name + description: flavor name of SM instance + ps_server_names: + type: comma_delimited_list + label: PS server names + description: name of the PS instance + ps_image_name: + type: string + label: PS image name + description: PS image name + ps_flavor_name: + type: string + label: PS flavor name + description: flavor name of PS instance + cm_server_names: + type: comma_delimited_list + label: CM server names + description: name of the CM instance + cm_image_name: + type: string + label: image name + description: CM image name + cm_flavor_name: + type: string + label: CM flavor name + description: flavor name of CM instance + availabilityzone_name: + type: string + label: availabilityzone name + description: availabilityzone name + oam_net_name: + type: string + label: oam network name + description: name of the oam network + oam_net_ips: + type: comma_delimited_list + label: internet network ips + description: ip of the OAM network + sl_net_name: + type: string + label: silver lining network name + description: id of the sl network + sl_net_ips: + type: comma_delimited_list + label: silver lining network ips + description: ips of the sl network + sl_net_floating_ip: + type: string + label: mog sl net virtual ip + description: mog sl net virtual ip + repl_net_name: + type: string + label: Replication network name + description: name of the replication network + repl_net_ips: + type: comma_delimited_list + label: repl network ips + description: ips of repl network + rx_net_name: + type: string + label: Rx network name + description: Rx network name + rx_net_ips: + type: comma_delimited_list + label: Rx network ips + description: Rx network ips + rx_net_floating_ip: + type: string + label: mog rx net virtual ip + description: mog rx net virtual ip + ran_net_name: + type: string + label: RAN network name + description: RAN network name + ran_net_ips: + type: comma_delimited_list + label: RAN network ips + description: RAN network ip + ran_net_floating_ip: + type: string + label: mog ran net virtual ip + description: mog ran net virtual ip + csb_net_name: + type: string + label: csb internal network name + description: csb internal network name + csb_net_start: + type: string + label: csb internal start + description: csb internal start + csb_net_end: + type: string + label: csb internal end + description: csb internal end + csb_net_cidr: + type: string + label: csb ineternal cidr + description: csb internal cidr + csb_net_netmask: + type: string + description: CSB internal network subnet mask + dummy_net_name_0: + type: string + label: csb internal network name + description: csb internal network name + dummy_net_start_0: + type: string + label: csb internal start + description: csb internal start + dummy_net_cidr_1: + type: string + label: csb ineternal cidr + description: csb internal cidr + dummy_net_end_0: + type: string + label: csb internal end + description: csb internal end + dummy_net_netmask_0: + type: string + description: CSB internal network subnet mask + dummy_net_name_1: + type: string + label: csb internal network name + description: csb internal network name + dummy_net_end_1: + type: string + label: csb internal end + description: csb internal end + + security_group_name: + type: string + label: security group name + description: the name of security group + cluster-manager-vol-1: + type: string + label: mog-cm-vol-1 + description: Cluster Manager volume 1 + session-manager-vol-1: + type: string + label: mog-sm-vol-1 + description: Session Manager volume 1 + session-manager-vol-2: + type: string + label: mog-sm-vol-2 + description: Session Manager volume 2 + oam-vol-1: + type: string + label: mog-oam-vol-1 + description: OAM volume 1 + oam-vol-2: + type: string + label: mog-oam-vol-2 + description: OAM volume 2 + +resources: + server_pd_01: + type: OS::Nova::Server + properties: +# config_drive: "True" + name: {get_param: [pd_server_names, 0]} + image: {get_param: pd_image_name} + flavor: {get_param: pd_flavor_name} + availability_zone: {get_param: availabilityzone_name} + networks: + - port: {get_resource: pd01_port_0} + - port: {get_resource: pd02_port_0} + user_data_format: RAW + + pd01_port_0: + type: OS::Neutron::Port + properties: + network: {get_param: oam_net_name} + pd02_port_0: + type: OS::Neutron::Port + properties: + network: {get_param: oam_net_name} + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat2.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat2.env new file mode 100644 index 0000000000..a4d3c83379 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat2.env @@ -0,0 +1,52 @@ +parameters: + pd_server_names: ZRDM1MOGX01MPD001,ZRDM1MOGX01MPD002 + pd_image_name: MOG_BASE_8.0 + pd_flavor_name: m3.xlarge + oam_server_names: ZRDM1MOGX01OAM001,ZRDM1MOGX01OAM002 + oam_image_name: MOG_BASE_8.0 + oam_flavor_name: m3.xlarge + sm_image_name: MOG_BASE_8.0 + sm_flavor_name: m2.xlarge4 + ps_server_names: ZRDM1MOGX01MPS001,ZRDM1MOGX01MPS002,ZRDM1MOGX01MPS003,ZRDM1MOGX01MPS004 + ps_image_name: MOG_BASE_8.0 + ps_flavor_name: m3.xlarge + cm_server_names: ZRDM1MOGX01MCM001 + cm_image_name: MOG_BASE_8.0 + cm_flavor_name: m3.xlarge + availabilityzone_name: nova + oam_net_name: oam_protected_net_0 + oam_net_ips: 107.250.172.213,107.250.172.214,107.250.172.215,107.250.172.216,107.250.172.217 + #internet_net_name: dmz_protected_net_0 + #internet_net_ips: 107.239.53.4,107.239.53.5 + # internet_net_floating_ip: 107.239.53.6 + sl_net_name: exn_protected_net_0 + sl_net_ips: 107.239.45.4,107.239.45.5 + sl_net_floating_ip: 107.239.45.6 + repl_net_name: cor_direct_net_0 + repl_net_ips: 107.239.33.57,107.239.33.58 + rx_net_name: cor_direct_net_1 + rx_net_ips: 107.239.34.3,107.239.34.4 + rx_net_floating_ip: 107.239.34.5 + ran_net_name: gn_direct_net_0 + ran_net_ips: 107.239.36.3,107.239.36.4 + ran_net_floating_ip: 107.239.36.5 + dummy_net_name_0: mog_dummy_0 + dummy_net_start_0: 169.254.1.4 + dummy_net_end_0: 169.254.1.254 + dummy_net_netmask_0: 255.255.255.0 + dummy_net_name_1: mog_dummy_1 + dummy_net_start_1: 169.254.2.4 + dummy_net_end_1: 169.254.2.254 + dummy_net_netmask_1: 255.255.255.0 + csb_net_name: int_mog_csb_net + csb_net_ips: 172.26.0.10,172.26.0.11,172.26.0.12,172.26.0.13,172.26.0.14,172.26.0.15,172.26.0.16,172.26.0.17,172.26.0.18,172.26.0.19,172.26.0.20 + csb_net_start: 172.26.0.1 + csb_net_end: 172.26.0.254 + csb_net_cidr: 172.26.0.0/24 + csb_net_netmask: 255.255.255.0 + security_group_name: mog_security_group + cluster-manager-vol-1: 43ccf5ba-2d50-427b-a38f-e8c7d8670eee + session-manager-vol-1: 49201898-333d-4c88-b58d-cf573b091633 + session-manager-vol-2: 4c35b5f1-ce99-4220-a6e2-cda6e2d713a0 + oam-vol-1: 0a7fcd9e-2624-401d-ac21-b0191f85ec77 + oam-vol-2: 6d169cb6-6ddc-41dc-920c-2839898a2924
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat2.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat2.yml new file mode 100644 index 0000000000..92354127b2 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat2.yml @@ -0,0 +1,218 @@ +heat_template_version: 2013-05-23 + +description: heat template that creates MOG stack + +parameters: + pd_server_names: + type: comma_delimited_list + label: PD server names + description: name of the PD instance + pd_image_name: + type: string + label: image name + description: PD image name + pd_flavor_name: + type: string + label: PD flavor name + description: flavor name of PD instance + oam_server_names: + type: comma_delimited_list + label: OAM server names + description: name of the OAM instance + oam_image_name: + type: string + label: image name + description: OAM image name + oam_flavor_name: + type: string + label: OAM flavor name + description: flavor name of OAM instance + sm_image_name: + type: string + label: image name + description: SM image name + sm_flavor_name: + type: string + label: SM flavor name + description: flavor name of SM instance + ps_server_names: + type: comma_delimited_list + label: PS server names + description: name of the PS instance + ps_image_name: + type: string + label: PS image name + description: PS image name + ps_flavor_name: + type: string + label: PS flavor name + description: flavor name of PS instance + cm_server_names: + type: comma_delimited_list + label: CM server names + description: name of the CM instance + cm_image_name: + type: string + label: image name + description: CM image name + cm_flavor_name: + type: string + label: CM flavor name + description: flavor name of CM instance + availabilityzone_name: + type: string + label: availabilityzone name + description: availabilityzone name + oam_net_name: + type: string + label: oam network name + description: name of the oam network + oam_net_ips: + type: comma_delimited_list + label: internet network ips + description: ip of the OAM network + sl_net_name: + type: string + label: silver lining network name + description: id of the sl network + sl_net_ips: + type: comma_delimited_list + label: silver lining network ips + description: ips of the sl network + sl_net_floating_ip: + type: string + label: mog sl net virtual ip + description: mog sl net virtual ip + repl_net_name: + type: string + label: Replication network name + description: name of the replication network + repl_net_ips: + type: comma_delimited_list + label: repl network ips + description: ips of repl network + rx_net_name: + type: string + label: Rx network name + description: Rx network name + rx_net_ips: + type: comma_delimited_list + label: Rx network ips + description: Rx network ips + rx_net_floating_ip: + type: string + label: mog rx net virtual ip + description: mog rx net virtual ip + ran_net_name: + type: string + label: RAN network name + description: RAN network name + ran_net_ips: + type: comma_delimited_list + label: RAN network ips + description: RAN network ip + ran_net_floating_ip: + type: string + label: mog ran net virtual ip + description: mog ran net virtual ip + csb_net_name: + type: string + label: csb internal network name + description: csb internal network name + csb_net_start: + type: string + label: csb internal start + description: csb internal start + csb_net_end: + type: string + label: csb internal end + description: csb internal end + csb_net_cidr: + type: string + label: csb ineternal cidr + description: csb internal cidr + csb_net_netmask: + type: string + description: CSB internal network subnet mask + csb_net_ips: + type: comma_delimited_list + description: mog_csb_net IP addresses + dummy_net_name_0: + type: string + label: csb internal network name + description: csb internal network name + dummy_net_start_0: + type: string + label: csb internal start + description: csb internal start + dummy_net_end_0: + type: string + label: csb internal end + description: csb internal end + dummy_net_netmask_0: + type: string + description: CSB internal network subnet mask + dummy_net_name_1: + type: string + label: csb internal network name + description: csb internal network name + dummy_net_start_1: + type: string + label: csb internal start + description: csb internal start + dummy_net_end_1: + type: string + label: csb internal end + description: csb internal end + dummy_net_netmask_1: + type: string + description: CSB internal network subnet mask + + security_group_name: + type: string + label: security group name + description: the name of security group + cluster-manager-vol-1: + type: string + label: mog-cm-vol-1 + description: Cluster Manager volume 1 + session-manager-vol-1: + type: string + label: mog-sm-vol-1 + description: Session Manager volume 1 + session-manager-vol-2: + type: string + label: mog-sm-vol-2 + description: Session Manager volume 2 + oam-vol-1: + type: string + label: mog-oam-vol-1 + description: OAM volume 1 + oam-vol-2: + type: string + label: mog-oam-vol-2 + description: OAM volume 2 + +resources: + server_pd_02: + type: OS::Nova::Server + properties: +# config_drive: "True" + name: {get_param: [pd_server_names, 0]} + image: {get_param: pd_image_name} + flavor: {get_param: pd_flavor_name} + availability_zone: {get_param: availabilityzone_name} + networks: + - port: {get_resource: pd03_port_0} + - port: {get_resource: pd04_port_0} + user_data_format: RAW + + pd03_port_0: + type: OS::Neutron::Port + properties: + network: {get_param: oam_net_name} + pd04_port_0: + type: OS::Neutron::Port + properties: + network: {get_param: oam_net_name} + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat3.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat3.env new file mode 100644 index 0000000000..5508e986fe --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat3.env @@ -0,0 +1,52 @@ +parameters: + pd_server_names: ZRDM1MOGX01MPD001,ZRDM1MOGX01MPD002 + pd_image_name: MOG_BASE_8.0 + pd_flavor_name: m3.xlarge + oam_server_names: ZRDM1MOGX01OAM001,ZRDM1MOGX01OAM002 + oam_image_name: MOG_BASE_8.0 + oam_flavor_name: m3.xlarge + sm_image_name: MOG_BASE_8.0 + sm_flavor_name: m2.xlarge4 + ps_server_names: ZRDM1MOGX01MPS001,ZRDM1MOGX01MPS002,ZRDM1MOGX01MPS003,ZRDM1MOGX01MPS004 + ps_image_name: MOG_BASE_8.0 + cm_server_names: ZRDM1MOGX01MCM001 + cm_image_name: MOG_BASE_8.0 + cm_flavor_name: m3.xlarge + availabilityzone_name: nova + oam_net_name: oam_protected_net_0 + oam_net_ips: 107.250.172.213,107.250.172.214,107.250.172.215,107.250.172.216,107.250.172.217 + #internet_net_name: dmz_protected_net_0 + #internet_net_ips: 107.239.53.4,107.239.53.5 + # internet_net_floating_ip: 107.239.53.6 + sl_net_name: exn_protected_net_0 + sl_net_ips: 107.239.45.4,107.239.45.5 + sl_net_floating_ip: 107.239.45.6 + repl_net_name: cor_direct_net_0 + repl_net_ips: 107.239.33.57,107.239.33.58 + rx_net_name: cor_direct_net_1 + rx_net_ips: 107.239.34.3,107.239.34.4 + rx_net_floating_ip: 107.239.34.5 + ran_net_name: gn_direct_net_0 + ran_net_ips: 107.239.36.3,107.239.36.4 + ran_net_floating_ip: 107.239.36.5 + dummy_net_name_0: mog_dummy_0 + dummy_net_start_0: 169.254.1.4 + dummy_net_end_0: 169.254.1.254 + dummy_net_cidr_0: 169.254.1.0/24 + dummy_net_netmask_0: 255.255.255.0 + dummy_net_name_1: mog_dummy_1 + dummy_net_start_1: 169.254.2.4 + dummy_net_end_1: 169.254.2.254 + dummy_net_cidr_1: 169.254.2.0/24 + csb_net_name: int_mog_csb_net + csb_net_ips: 172.26.0.10,172.26.0.11,172.26.0.12,172.26.0.13,172.26.0.14,172.26.0.15,172.26.0.16,172.26.0.17,172.26.0.18,172.26.0.19,172.26.0.20 + csb_net_start: 172.26.0.1 + csb_net_end: 172.26.0.254 + csb_net_cidr: 172.26.0.0/24 + csb_net_netmask: 255.255.255.0 + security_group_name: mog_security_group + cluster-manager-vol-1: 43ccf5ba-2d50-427b-a38f-e8c7d8670eee + session-manager-vol-1: 49201898-333d-4c88-b58d-cf573b091633 + session-manager-vol-2: 4c35b5f1-ce99-4220-a6e2-cda6e2d713a0 + oam-vol-1: 0a7fcd9e-2624-401d-ac21-b0191f85ec77 + oam-vol-2: 6d169cb6-6ddc-41dc-920c-2839898a2924
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat3.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat3.yml new file mode 100644 index 0000000000..4f5d690b94 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat3.yml @@ -0,0 +1,219 @@ +heat_template_version: 2013-05-23 + +description: heat template that creates MOG stack + +parameters: + pd_server_names: + type: comma_delimited_list + label: PD server names + description: name of the PD instance + pd_image_name: + type: string + label: image name + description: PD image name + pd_flavor_name: + type: string + label: PD flavor name + description: flavor name of PD instance + oam_server_names: + type: comma_delimited_list + label: OAM server names + description: name of the OAM instance + oam_image_name: + type: string + label: image name + description: OAM image name + oam_flavor_name: + type: string + label: OAM flavor name + description: flavor name of OAM instance + sm_image_name: + type: string + label: image name + description: SM image name + sm_flavor_name: + type: string + label: SM flavor name + description: flavor name of SM instance + ps_server_names: + type: comma_delimited_list + label: PS server names + description: name of the PS instance + ps_image_name: + type: string + label: PS image name + description: PS image name + cm_server_names: + type: comma_delimited_list + label: CM server names + description: name of the CM instance + cm_image_name: + type: string + label: image name + description: CM image name + cm_flavor_name: + type: string + label: CM flavor name + description: flavor name of CM instance + availabilityzone_name: + type: string + label: availabilityzone name + description: availabilityzone name + oam_net_name: + type: string + label: oam network name + description: name of the oam network + oam_net_ips: + type: comma_delimited_list + label: internet network ips + description: ip of the OAM network + sl_net_name: + type: string + label: silver lining network name + description: id of the sl network + sl_net_ips: + type: comma_delimited_list + label: silver lining network ips + description: ips of the sl network + sl_net_floating_ip: + type: string + label: mog sl net virtual ip + description: mog sl net virtual ip + repl_net_name: + type: string + label: Replication network name + description: name of the replication network + repl_net_ips: + type: comma_delimited_list + label: repl network ips + description: ips of repl network + rx_net_name: + type: string + label: Rx network name + description: Rx network name + rx_net_ips: + type: comma_delimited_list + label: Rx network ips + description: Rx network ips + rx_net_floating_ip: + type: string + label: mog rx net virtual ip + description: mog rx net virtual ip + ran_net_name: + type: string + label: RAN network name + description: RAN network name + ran_net_ips: + type: comma_delimited_list + label: RAN network ips + description: RAN network ip + ran_net_floating_ip: + type: string + label: mog ran net virtual ip + description: mog ran net virtual ip + csb_net_name: + type: string + label: csb internal network name + description: csb internal network name + csb_net_start: + type: string + label: csb internal start + description: csb internal start + csb_net_end: + type: string + label: csb internal end + description: csb internal end + csb_net_cidr: + type: string + label: csb ineternal cidr + description: csb internal cidr + csb_net_netmask: + type: string + description: CSB internal network subnet mask + csb_net_ips: + type: comma_delimited_list + description: mog_csb_net IP addresses + dummy_net_name_0: + type: string + label: csb internal network name + description: csb internal network name + dummy_net_start_0: + type: string + label: csb internal start + description: csb internal start + dummy_net_end_0: + type: string + label: csb internal end + description: csb internal end + dummy_net_cidr_0: + type: string + label: csb ineternal cidr + description: csb internal cidr + dummy_net_netmask_0: + type: string + description: CSB internal network subnet mask + dummy_net_name_1: + type: string + label: csb internal network name + description: csb internal network name + dummy_net_start_1: + type: string + label: csb internal start + description: csb internal start + dummy_net_end_1: + type: string + label: csb internal end + description: csb internal end + dummy_net_cidr_1: + type: string + label: csb ineternal cidr + description: csb internal cidr + + security_group_name: + type: string + label: security group name + description: the name of security group + cluster-manager-vol-1: + type: string + label: mog-cm-vol-1 + description: Cluster Manager volume 1 + session-manager-vol-1: + type: string + label: mog-sm-vol-1 + description: Session Manager volume 1 + session-manager-vol-2: + type: string + label: mog-sm-vol-2 + description: Session Manager volume 2 + oam-vol-1: + type: string + label: mog-oam-vol-1 + description: OAM volume 1 + oam-vol-2: + type: string + label: mog-oam-vol-2 + description: OAM volume 2 + +resources: + server_pd_03: + type: OS::Nova::Server + properties: +# config_drive: "True" + name: {get_param: [pd_server_names, 0]} + image: {get_param: pd_image_name} + flavor: {get_param: pd_flavor_name} + availability_zone: {get_param: availabilityzone_name} + networks: + - port: {get_resource: pd01_port_5} + - port: {get_resource: pd02_port_6} + user_data_format: RAW + + pd01_port_5: + type: OS::Neutron::Port + properties: + network: {get_param: oam_net_name} + pd02_port_6: + type: OS::Neutron::Port + properties: + network: {get_param: oam_net_name} + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/expectedoutputfiles/MainServiceTemplate.yaml deleted file mode 100644 index fbda1f8157..0000000000 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/expectedoutputfiles/MainServiceTemplate.yaml +++ /dev/null @@ -1,157 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: Main -imports: -- openecomp_heat_index: - file: openecomp-heat/_index.yml -topology_template: - inputs: - param_type_comma_delimited_list: - hidden: false - immutable: false - type: list - description: param comma_delimited_list - List - entry_schema: - type: string - param_type_string_default_value_with_env: - hidden: false - immutable: false - type: string - description: param value should be - HEAT_ENV_default string - default: HEAT_ENV default string - volume_type: - label: FSB Volume - hidden: false - immutable: false - type: string - description: FSB Volume type - FSB1_volume_name: - label: FSB Volume - hidden: false - immutable: false - type: string - description: FSB Volume name - param_constraint_length_allowed_pattern_range_hidden: - label: User Name - hidden: true - immutable: false - type: string - description: User name to be configured for the application - constraints: - - max_length: 8 - - min_length: 6 - - pattern: '[A-Z]+[a-zA-Z0-9]*' - - in_range: - - 0 - - 10 - param_type_boolean_default_value_with_env: - hidden: false - immutable: false - type: boolean - description: param value should be false - default: false - param_type_string: - hidden: false - immutable: false - type: string - description: param String - string - param_type_string_default_value: - hidden: false - immutable: false - type: string - description: param value should be - HEAT_default string - default: HEAT_default string - param_type_number: - hidden: false - immutable: false - type: float - description: param number - float - param_type_boolean: - hidden: false - immutable: false - type: boolean - description: param boolean - boolean - param_type_comma_delimited_list_default_value_with_env: - hidden: false - immutable: false - type: list - description: param value should be [b1,b2,b3,b4] - default: - - b1 - - b2 - - b3 - - b4 - entry_schema: - type: string - param_type_boolean_default_value: - hidden: false - immutable: false - type: boolean - description: param value should be true - default: true - param_type_number_default_value: - hidden: false - immutable: false - type: float - description: param value should be 12345 - default: 12345 - FSB_1_image: - label: FSB Image - hidden: false - immutable: false - type: string - description: FSB Image name - param_type_comma_delimited_list_default_value: - hidden: false - immutable: false - type: list - description: param value should be [a1,a2,a3,a4] - default: - - a1 - - a2 - - a3 - - a4 - entry_schema: - type: string - param_type_number_default_value_with_env: - hidden: false - immutable: false - type: float - description: param value should be 54321 - default: 54321 - param_type_json: - hidden: false - immutable: false - type: json - description: param json - map<String> - param_allowed_values: - label: Instance Type - hidden: false - immutable: false - type: string - description: Instance type for compute instances - constraints: - - valid_values: - - m1.small - - m1.medium - - m1.large - node_templates: - FSB1_volume: - type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume - properties: - image: - get_input: FSB_1_image - volume_type: - get_input: volume_type - size: 3*1024 - name: - get_input: FSB1_volume_name - groups: - parameters_group: - type: org.openecomp.groups.heat.HeatStack - properties: - heat_file: ../Artifacts/parameters.yaml - description: | - Version 2.0 02-09-2016 (Authors: John Doe, user PROD) - members: - - FSB1_volume
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/MainServiceTemplate.yaml new file mode 100644 index 0000000000..632cd40e0c --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/MainServiceTemplate.yaml @@ -0,0 +1,334 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +node_types: + org.openecomp.resource.vfc.nodes.heat.compute: + derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server +topology_template: + inputs: + pcm_flavor_name: + label: PCRF CM flavor name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main-heat2 + - main-heat1 + source_type: HEAT + param_name: pcm_flavor_name + type: string + description: flavor name of PCRF CM instance + default: cps + availabilityzone_name: + label: availabilityzone name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main-heat2 + - main-heat1 + source_type: HEAT + param_name: availabilityzone_name + type: string + description: availabilityzone name + default: nova + oam_net_gw: + label: CPS network gateway + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main-heat2 + - main-heat1 + 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: + - main-heat2 + - main-heat1 + source_type: HEAT + param_name: pcm_server_names + type: list + description: name of the PCRF CM instance + default: + - ZRDM1PCRF01PCM001 + entry_schema: + type: string + pcm_image_name: + label: PCRF CM image name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main-heat2 + - main-heat1 + source_type: HEAT + param_name: pcm_image_name + type: string + description: PCRF CM image name + default: rhel2 + net_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main-heat2 + - main-heat1 + source_type: HEAT + param_name: net_name + type: string + sm_server_names: + label: SM server names + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main-heat1 + source_type: HEAT + param_name: sm_server_names + type: list + description: name of the SM instance + default: + - ZRDM1MOGX01MSM001 + - ZRDM1MOGX01MSM002 + entry_schema: + type: string + compute_image_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main-heat2 + - main-heat1 + source_type: HEAT + param_name: compute_image_name + type: string + dummy_net_netmask_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main-heat2 + source_type: HEAT + param_name: dummy_net_netmask_1 + type: string + description: CSB internal network subnet mask + default: 255.255.255.0 + node_templates: + server_pcm_002: + type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.2 + directives: + - substitutable + properties: + pcm_flavor_name: + get_input: pcm_flavor_name + service_template_filter: + substitute_service_template: nested-pcm_v0.2ServiceTemplate.yaml + availabilityzone_name: + get_input: availabilityzone_name + pcm_image_name: + get_input: pcm_image_name + pcm_server_name: + get_input: + - pcm_server_names + - 0 + server_pcm_001: + type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1 + directives: + - substitutable + properties: + pcm_flavor_name: + get_input: pcm_flavor_name + service_template_filter: + substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml + availabilityzone_name: + get_input: availabilityzone_name + pcm_image_name: + get_input: pcm_image_name + pcm_server_name: + get_input: + - pcm_server_names + - 0 + server_pcm_004: + type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.2 + directives: + - substitutable + properties: + pcm_flavor_name: + get_input: pcm_flavor_name + service_template_filter: + substitute_service_template: nested-pcm_v0.2ServiceTemplate.yaml + availabilityzone_name: + get_input: availabilityzone_name + pcm_image_name: + get_input: pcm_image_name + pcm_server_name: + get_input: + - pcm_server_names + - 0 + server_pcm_003: + type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1 + directives: + - substitutable + properties: + pcm_flavor_name: + get_input: pcm_flavor_name + service_template_filter: + substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml + availabilityzone_name: + get_input: availabilityzone_name + pcm_image_name: + get_input: pcm_image_name + pcm_server_name: + get_input: + - pcm_server_names + - 0 + server_compute: + type: org.openecomp.resource.vfc.nodes.heat.compute + properties: + flavor: + compute_flavor_name: null + image: + get_input: compute_image_name + config_drive: + get_attribute: + - compute_port_0 + - tenant_id + - port_security_enabled + - device_id + - qos_policy + - allowed_address_pairs + - show + - device_owner + - network + - security_groups + - fixed_ips + - mac_address + - admin_state_up + - name + - subnets + - status + user_data_format: + get_attribute: + - server_pcm_001 + - oam_net_gw + name: + compute_name: null + compute_port_0: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + mac_requirements: + mac_count_required: + is_required: false + network: + get_input: net_name + server_compute_2: + type: org.openecomp.resource.vfc.nodes.heat.compute + properties: + flavor: + compute_flavor_name: null + image: + get_input: compute_image_name + config_drive: + get_attribute: + - compute_port_1 + - tenant_id + - port_security_enabled + - device_id + - qos_policy + - allowed_address_pairs + - show + - device_owner + - network + - security_groups + - fixed_ips + - mac_address + - admin_state_up + - name + - subnets + - status + user_data_format: + get_attribute: + - server_pcm_003 + - oam_net_gw + name: + compute_name: null + compute_port_1: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + mac_requirements: + mac_count_required: + is_required: false + network: + get_input: net_name + groups: + main-heat2_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/main-heat2.yaml + description: heat template that creates PCRF Cluman stack + members: + - server_pcm_004 + - server_pcm_003 + - server_compute_2 + - compute_port_1 + main-heat1_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/main-heat1.yaml + description: heat template that creates PCRF Cluman stack + members: + - server_pcm_002 + - server_pcm_001 + - server_compute + - compute_port_0 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml new file mode 100644 index 0000000000..1582a7e4b7 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml @@ -0,0 +1,394 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: nested-pcm_v0.1 +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +node_types: + org.openecomp.resource.vfc.nodes.heat.pcm_server: + derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server +topology_template: + inputs: + availabilityzone_name: + label: availabilityzone name + hidden: false + immutable: false + type: string + description: availabilityzone name + oam_net_gw: + label: CPS network gateway + hidden: false + immutable: false + type: string + description: CPS network gateway + pcm_image_name: + label: image name + hidden: false + immutable: false + type: string + description: PCRF CM image name + security_group_name: + label: security group name + hidden: false + immutable: false + type: string + description: the name of security group + cps_net_ip: + label: CPS network ip + hidden: false + immutable: false + type: string + description: CPS network ip + sm_server_names: + label: SM server names + hidden: false + immutable: false + type: list + description: name of the SM instance + entry_schema: + type: string + pcm_flavor_name: + label: PCRF CM flavor name + hidden: false + immutable: false + type: string + description: flavor name of PCRF CM instance + pcm_vol: + label: CPS Cluman Cinder Volume + hidden: false + immutable: false + type: string + description: CPS Cluman Cinder Volume + pcm_server_name: + label: PCRF CM server name + hidden: false + immutable: false + type: string + description: PCRF CM server name + cps_net_name: + label: CPS network name + hidden: false + immutable: false + type: string + description: CPS network name + cps_net_mask: + label: CPS network mask + hidden: false + immutable: false + type: string + description: CPS network mask + oam_net_ip: + label: OAM network ip + hidden: false + immutable: false + type: string + description: OAM network ip + oam_net_mask: + label: CPS network mask + hidden: false + immutable: false + type: string + description: CPS network mask + oam_net_name: + label: OAM network name + hidden: false + immutable: false + type: string + description: OAM network name + node_templates: + pcm_port_1: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + security_groups: + - get_input: security_group_name + fixed_ips: + - ip_address: + get_input: oam_net_ip + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam + network: + get_input: oam_net_name + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: server_pcm_1 + relationship: tosca.relationships.network.BindsTo + server_pcm_1: + type: org.openecomp.resource.vfc.nodes.heat.pcm_server + properties: + flavor: + get_input: pcm_flavor_name + availability_zone: + get_input: availabilityzone_name + image: + get_input: pcm_image_name + config_drive: true + user_data_format: RAW + name: + get_input: pcm_server_name + pcm_port_0: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + security_groups: + - get_input: security_group_name + fixed_ips: + - ip_address: + get_input: cps_net_ip + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: cps + network: + get_input: cps_net_name + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: server_pcm_1 + relationship: tosca.relationships.network.BindsTo + groups: + nested-pcm_v0.1_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/nested-pcm_v0.1.yaml + description: heat template that creates PCRF Cluman stack + members: + - pcm_port_1 + - server_pcm_1 + - pcm_port_0 + outputs: + server_pcm_id: + description: the pcm nova service id + value: server_pcm_1 + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1 + capabilities: + disk.root.size_server_pcm_1: + - server_pcm_1 + - disk.root.size + network.incoming.packets.rate_pcm_port_0: + - pcm_port_0 + - network.incoming.packets.rate + network.incoming.packets.rate_pcm_port_1: + - pcm_port_1 + - network.incoming.packets.rate + network.outpoing.packets_pcm_port_1: + - pcm_port_1 + - network.outpoing.packets + network.outpoing.packets_pcm_port_0: + - pcm_port_0 + - network.outpoing.packets + disk.iops_server_pcm_1: + - server_pcm_1 + - disk.iops + disk.device.write.bytes.rate_server_pcm_1: + - server_pcm_1 + - disk.device.write.bytes.rate + disk.capacity_server_pcm_1: + - server_pcm_1 + - disk.capacity + disk.write.requests_server_pcm_1: + - server_pcm_1 + - disk.write.requests + disk.read.bytes_server_pcm_1: + - server_pcm_1 + - disk.read.bytes + network.incoming.bytes_pcm_port_0: + - pcm_port_0 + - network.incoming.bytes + disk.usage_server_pcm_1: + - server_pcm_1 + - disk.usage + cpu_util_server_pcm_1: + - server_pcm_1 + - cpu_util + vcpus_server_pcm_1: + - server_pcm_1 + - vcpus + memory.resident_server_pcm_1: + - server_pcm_1 + - memory.resident + network.incoming.bytes_pcm_port_1: + - pcm_port_1 + - network.incoming.bytes + binding_pcm_port_0: + - pcm_port_0 + - binding + binding_pcm_port_1: + - pcm_port_1 + - binding + feature_server_pcm_1: + - server_pcm_1 + - feature + network.outgoing.packets.rate_pcm_port_0: + - pcm_port_0 + - network.outgoing.packets.rate + network.outgoing.packets.rate_pcm_port_1: + - pcm_port_1 + - network.outgoing.packets.rate + disk.allocation_server_pcm_1: + - server_pcm_1 + - disk.allocation + disk.device.write.bytes_server_pcm_1: + - server_pcm_1 + - disk.device.write.bytes + feature_pcm_port_1: + - pcm_port_1 + - feature + memory.usage_server_pcm_1: + - server_pcm_1 + - memory.usage + network.outgoing.bytes_pcm_port_0: + - pcm_port_0 + - network.outgoing.bytes + feature_pcm_port_0: + - pcm_port_0 + - feature + cpu_server_pcm_1: + - server_pcm_1 + - cpu + network.outgoing.bytes_pcm_port_1: + - pcm_port_1 + - network.outgoing.bytes + attachment_pcm_port_0: + - pcm_port_0 + - attachment + attachment_pcm_port_1: + - pcm_port_1 + - attachment + disk.device.read.bytes_server_pcm_1: + - server_pcm_1 + - disk.device.read.bytes + endpoint_server_pcm_1: + - server_pcm_1 + - endpoint + disk.read.bytes.rate_server_pcm_1: + - server_pcm_1 + - disk.read.bytes.rate + disk.device.iops_server_pcm_1: + - server_pcm_1 + - disk.device.iops + cpu.delta_server_pcm_1: + - server_pcm_1 + - cpu.delta + host_server_pcm_1: + - server_pcm_1 + - host + disk.device.capacity_server_pcm_1: + - server_pcm_1 + - disk.device.capacity + forwarder_pcm_port_0: + - pcm_port_0 + - forwarder + forwarder_pcm_port_1: + - pcm_port_1 + - forwarder + disk.read.requests_server_pcm_1: + - server_pcm_1 + - disk.read.requests + disk.device.write.requests.rate_server_pcm_1: + - server_pcm_1 + - disk.device.write.requests.rate + disk.ephemeral.size_server_pcm_1: + - server_pcm_1 + - disk.ephemeral.size + disk.latency_server_pcm_1: + - server_pcm_1 + - disk.latency + scalable_server_pcm_1: + - server_pcm_1 + - scalable + disk.write.requests.rate_server_pcm_1: + - server_pcm_1 + - disk.write.requests.rate + memory_server_pcm_1: + - server_pcm_1 + - memory + disk.device.latency_server_pcm_1: + - server_pcm_1 + - disk.device.latency + disk.device.read.bytes.rate_server_pcm_1: + - server_pcm_1 + - disk.device.read.bytes.rate + network.outgoing.bytes.rate_pcm_port_1: + - pcm_port_1 + - network.outgoing.bytes.rate + network.incoming.packets_pcm_port_0: + - pcm_port_0 + - network.incoming.packets + disk.device.usage_server_pcm_1: + - server_pcm_1 + - disk.device.usage + network.outgoing.bytes.rate_pcm_port_0: + - pcm_port_0 + - network.outgoing.bytes.rate + disk.device.write.requests_server_pcm_1: + - server_pcm_1 + - disk.device.write.requests + network.incoming.packets_pcm_port_1: + - pcm_port_1 + - network.incoming.packets + disk.write.bytes_server_pcm_1: + - server_pcm_1 + - disk.write.bytes + disk.device.read.requests_server_pcm_1: + - server_pcm_1 + - disk.device.read.requests + instance_server_pcm_1: + - server_pcm_1 + - instance + disk.device.read.requests.rate_server_pcm_1: + - server_pcm_1 + - disk.device.read.requests.rate + os_server_pcm_1: + - server_pcm_1 + - os + network.incoming.bytes.rate_pcm_port_0: + - pcm_port_0 + - network.incoming.bytes.rate + binding_server_pcm_1: + - server_pcm_1 + - binding + disk.write.bytes.rate_server_pcm_1: + - server_pcm_1 + - disk.write.bytes.rate + disk.device.allocation_server_pcm_1: + - server_pcm_1 + - disk.device.allocation + network.incoming.bytes.rate_pcm_port_1: + - pcm_port_1 + - network.incoming.bytes.rate + requirements: + link_pcm_port_0: + - pcm_port_0 + - link + link_pcm_port_1: + - pcm_port_1 + - link + dependency_server_pcm_1: + - server_pcm_1 + - dependency + dependency_pcm_port_0: + - pcm_port_0 + - dependency + dependency_pcm_port_1: + - pcm_port_1 + - dependency + local_storage_server_pcm_1: + - server_pcm_1 + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/nested-pcm_v0.2ServiceTemplate.yaml new file mode 100644 index 0000000000..8bdff8f08b --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/nested-pcm_v0.2ServiceTemplate.yaml @@ -0,0 +1,386 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: nested-pcm_v0.2 +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +node_types: + org.openecomp.resource.vfc.nodes.heat.pcm_server: + derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server +topology_template: + inputs: + availabilityzone_name: + label: availabilityzone name + hidden: false + immutable: false + type: string + description: availabilityzone name + oam_net_gw: + label: CPS network gateway + hidden: false + immutable: false + type: string + description: CPS network gateway + pcm_image_name: + label: image name + hidden: false + immutable: false + type: string + description: PCRF CM image name + security_group_name: + label: security group name + hidden: false + immutable: false + type: string + description: the name of security group + cps_net_ip: + label: CPS network ip + hidden: false + immutable: false + type: string + description: CPS network ip + pcm_flavor_name: + label: PCRF CM flavor name + hidden: false + immutable: false + type: string + description: flavor name of PCRF CM instance + pcm_vol: + label: CPS Cluman Cinder Volume + hidden: false + immutable: false + type: string + description: CPS Cluman Cinder Volume + pcm_server_name: + label: PCRF CM server name + hidden: false + immutable: false + type: string + description: PCRF CM server name + cps_net_name: + label: CPS network name + hidden: false + immutable: false + type: string + description: CPS network name + cps_net_mask: + label: CPS network mask + hidden: false + immutable: false + type: string + description: CPS network mask + oam_net_ip: + label: OAM network ip + hidden: false + immutable: false + type: string + description: OAM network ip + oam_net_mask: + label: CPS network mask + hidden: false + immutable: false + type: string + description: CPS network mask + oam_net_name: + label: OAM network name + hidden: false + immutable: false + type: string + description: OAM network name + node_templates: + pcm_port_13: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + security_groups: + - get_input: security_group_name + fixed_ips: + - ip_address: + get_input: oam_net_ip + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam + network: + get_input: oam_net_name + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: server_pcm_2 + relationship: tosca.relationships.network.BindsTo + pcm_port_03: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + security_groups: + - get_input: security_group_name + fixed_ips: + - ip_address: + get_input: cps_net_ip + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: cps + network: + get_input: cps_net_name + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: server_pcm_2 + relationship: tosca.relationships.network.BindsTo + server_pcm_2: + type: org.openecomp.resource.vfc.nodes.heat.pcm_server + properties: + flavor: + get_input: pcm_flavor_name + availability_zone: + get_input: availabilityzone_name + image: + get_input: pcm_image_name + config_drive: true + user_data_format: RAW + name: + get_input: pcm_server_name + groups: + nested-pcm_v0.2_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/nested-pcm_v0.2.yaml + description: heat template that creates PCRF Cluman stack + members: + - pcm_port_13 + - pcm_port_03 + - server_pcm_2 + outputs: + server_pcm_id: + description: the pcm nova service id + value: server_pcm_2 + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.2 + capabilities: + disk.root.size_server_pcm_2: + - server_pcm_2 + - disk.root.size + disk.iops_server_pcm_2: + - server_pcm_2 + - disk.iops + feature_pcm_port_03: + - pcm_port_03 + - feature + network.outgoing.bytes_pcm_port_13: + - pcm_port_13 + - network.outgoing.bytes + disk.device.write.bytes.rate_server_pcm_2: + - server_pcm_2 + - disk.device.write.bytes.rate + disk.usage_server_pcm_2: + - server_pcm_2 + - disk.usage + disk.capacity_server_pcm_2: + - server_pcm_2 + - disk.capacity + disk.write.requests_server_pcm_2: + - server_pcm_2 + - disk.write.requests + network.incoming.bytes.rate_pcm_port_13: + - pcm_port_13 + - network.incoming.bytes.rate + disk.read.bytes_server_pcm_2: + - server_pcm_2 + - disk.read.bytes + network.outgoing.packets.rate_pcm_port_03: + - pcm_port_03 + - network.outgoing.packets.rate + feature_pcm_port_13: + - pcm_port_13 + - feature + network.outgoing.bytes_pcm_port_03: + - pcm_port_03 + - network.outgoing.bytes + cpu_util_server_pcm_2: + - server_pcm_2 + - cpu_util + vcpus_server_pcm_2: + - server_pcm_2 + - vcpus + memory.resident_server_pcm_2: + - server_pcm_2 + - memory.resident + cpu_server_pcm_2: + - server_pcm_2 + - cpu + feature_server_pcm_2: + - server_pcm_2 + - feature + disk.device.write.bytes_server_pcm_2: + - server_pcm_2 + - disk.device.write.bytes + disk.device.iops_server_pcm_2: + - server_pcm_2 + - disk.device.iops + disk.allocation_server_pcm_2: + - server_pcm_2 + - disk.allocation + network.outgoing.bytes.rate_pcm_port_13: + - pcm_port_13 + - network.outgoing.bytes.rate + network.incoming.packets.rate_pcm_port_13: + - pcm_port_13 + - network.incoming.packets.rate + binding_pcm_port_13: + - pcm_port_13 + - binding + memory.usage_server_pcm_2: + - server_pcm_2 + - memory.usage + disk.device.read.bytes_server_pcm_2: + - server_pcm_2 + - disk.device.read.bytes + host_server_pcm_2: + - server_pcm_2 + - host + endpoint_server_pcm_2: + - server_pcm_2 + - endpoint + disk.read.bytes.rate_server_pcm_2: + - server_pcm_2 + - disk.read.bytes.rate + attachment_pcm_port_13: + - pcm_port_13 + - attachment + network.outgoing.packets.rate_pcm_port_13: + - pcm_port_13 + - network.outgoing.packets.rate + forwarder_pcm_port_13: + - pcm_port_13 + - forwarder + disk.device.capacity_server_pcm_2: + - server_pcm_2 + - disk.device.capacity + network.incoming.bytes.rate_pcm_port_03: + - pcm_port_03 + - network.incoming.bytes.rate + cpu.delta_server_pcm_2: + - server_pcm_2 + - cpu.delta + disk.device.write.requests.rate_server_pcm_2: + - server_pcm_2 + - disk.device.write.requests.rate + network.incoming.packets.rate_pcm_port_03: + - pcm_port_03 + - network.incoming.packets.rate + disk.read.requests_server_pcm_2: + - server_pcm_2 + - disk.read.requests + disk.ephemeral.size_server_pcm_2: + - server_pcm_2 + - disk.ephemeral.size + disk.latency_server_pcm_2: + - server_pcm_2 + - disk.latency + network.outpoing.packets_pcm_port_13: + - pcm_port_13 + - network.outpoing.packets + attachment_pcm_port_03: + - pcm_port_03 + - attachment + network.outgoing.bytes.rate_pcm_port_03: + - pcm_port_03 + - network.outgoing.bytes.rate + binding_pcm_port_03: + - pcm_port_03 + - binding + disk.write.requests.rate_server_pcm_2: + - server_pcm_2 + - disk.write.requests.rate + scalable_server_pcm_2: + - server_pcm_2 + - scalable + memory_server_pcm_2: + - server_pcm_2 + - memory + disk.device.read.bytes.rate_server_pcm_2: + - server_pcm_2 + - disk.device.read.bytes.rate + disk.device.latency_server_pcm_2: + - server_pcm_2 + - disk.device.latency + network.incoming.bytes_pcm_port_03: + - pcm_port_03 + - network.incoming.bytes + disk.device.usage_server_pcm_2: + - server_pcm_2 + - disk.device.usage + network.incoming.packets_pcm_port_13: + - pcm_port_13 + - network.incoming.packets + forwarder_pcm_port_03: + - pcm_port_03 + - forwarder + disk.device.write.requests_server_pcm_2: + - server_pcm_2 + - disk.device.write.requests + disk.write.bytes_server_pcm_2: + - server_pcm_2 + - disk.write.bytes + os_server_pcm_2: + - server_pcm_2 + - os + instance_server_pcm_2: + - server_pcm_2 + - instance + disk.device.read.requests_server_pcm_2: + - server_pcm_2 + - disk.device.read.requests + disk.device.read.requests.rate_server_pcm_2: + - server_pcm_2 + - disk.device.read.requests.rate + network.incoming.packets_pcm_port_03: + - pcm_port_03 + - network.incoming.packets + network.incoming.bytes_pcm_port_13: + - pcm_port_13 + - network.incoming.bytes + network.outpoing.packets_pcm_port_03: + - pcm_port_03 + - network.outpoing.packets + disk.write.bytes.rate_server_pcm_2: + - server_pcm_2 + - disk.write.bytes.rate + binding_server_pcm_2: + - server_pcm_2 + - binding + disk.device.allocation_server_pcm_2: + - server_pcm_2 + - disk.device.allocation + requirements: + dependency_pcm_port_13: + - pcm_port_13 + - dependency + dependency_server_pcm_2: + - server_pcm_2 + - dependency + dependency_pcm_port_03: + - pcm_port_03 + - dependency + link_pcm_port_03: + - pcm_port_03 + - link + link_pcm_port_13: + - pcm_port_13 + - link + local_storage_server_pcm_2: + - server_pcm_2 + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/MANIFEST.json new file mode 100644 index 0000000000..86450ec848 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/MANIFEST.json @@ -0,0 +1,37 @@ +{ + "name": "vEP_JSA_Net", + "description": "Version 2.0 02-09-2016 (Authors: John Doe, user PROD)", + "version": "2013-05-23", + "data": [ + { + "file": "main-heat1.yaml", + "type": "HEAT", + "isBase": "true", + "data": [ + { + "file": "main-heat1.env", + "type": "HEAT_ENV" + } + ] + }, + { + "file": "main-heat2.yaml", + "type": "HEAT", + "isBase": "false", + "data": [ + { + "file": "main-heat2.env", + "type": "HEAT_ENV" + } + ] + }, + { + "file": "nested-pcm_v0.1.yaml", + "type": "HEAT" + }, + { + "file": "nested-pcm_v0.2.yaml", + "type": "HEAT" + } + ] +}
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/main-heat1.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/main-heat1.env new file mode 100644 index 0000000000..d0d4d3f8e6 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/main-heat1.env @@ -0,0 +1,6 @@ +parameters: + pcm_server_names: ZRDM1PCRF01PCM001 + pcm_image_name: rhel2 + pcm_flavor_name: cps + availabilityzone_name: nova + sm_server_names: ZRDM1MOGX01MSM001,ZRDM1MOGX01MSM002
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/main-heat1.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/main-heat1.yaml new file mode 100644 index 0000000000..dd58b506d7 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/main-heat1.yaml @@ -0,0 +1,65 @@ +heat_template_version: 2013-05-23 + +description: heat template that creates PCRF Cluman stack + +parameters: + pcm_server_names: + type: comma_delimited_list + label: PCRF CM server names + description: name of the PCRF CM instance + pcm_image_name: + type: string + label: PCRF CM image name + description: PCRF CM image name + pcm_flavor_name: + type: string + label: PCRF CM flavor name + description: flavor name of PCRF CM instance + availabilityzone_name: + type: string + label: availabilityzone name + description: availabilityzone name + oam_net_gw: + type: string + label: CPS network gateway + description: CPS network gateway + compute_image_name: + type: string + net_name: + type: string + sm_server_names: + type: comma_delimited_list + label: SM server names + description: name of the SM instance + +resources: + server_pcm_001: + type: nested-pcm_v0.1.yaml + properties: + pcm_server_name: { get_param: [pcm_server_names, 0] } + pcm_image_name: { get_param: pcm_image_name } + pcm_flavor_name: { get_param: pcm_flavor_name } + availabilityzone_name: { get_param: availabilityzone_name } + + server_pcm_002: + type: nested-pcm_v0.2.yaml + properties: + pcm_server_name: { get_param: [pcm_server_names, 0] } + pcm_image_name: { get_param: pcm_image_name } + pcm_flavor_name: { get_param: pcm_flavor_name } + availabilityzone_name: { get_param: availabilityzone_name } + + server_compute: + type: OS::Nova::Server + properties: + config_drive: {get_attr: [compute_port_0]} + name: { compute_name } + image: { get_param: compute_image_name } + flavor: { compute_flavor_name } + user_data_format: { get_attr: [server_pcm_001 , oam_net_gw] } + user_data: { get_attr: [server_pcm_001]} + + compute_port_0: + type: OS::Neutron::Port + properties: + network: { get_param: net_name }
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/main-heat2.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/main-heat2.env new file mode 100644 index 0000000000..062043d5b2 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/main-heat2.env @@ -0,0 +1,6 @@ +parameters: + pcm_server_names: ZRDM1PCRF01PCM001 + pcm_image_name: rhel2 + pcm_flavor_name: cps + availabilityzone_name: nova + dummy_net_netmask_1: 255.255.255.0
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/main-heat2.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/main-heat2.yaml new file mode 100644 index 0000000000..0f8aa96e48 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/main-heat2.yaml @@ -0,0 +1,64 @@ +heat_template_version: 2013-05-23 + +description: heat template that creates PCRF Cluman stack + +parameters: + pcm_server_names: + type: comma_delimited_list + label: PCRF CM server names + description: name of the PCRF CM instance + pcm_image_name: + type: string + label: PCRF CM image name + description: PCRF CM image name + pcm_flavor_name: + type: string + label: PCRF CM flavor name + description: flavor name of PCRF CM instance + availabilityzone_name: + type: string + label: availabilityzone name + description: availabilityzone name + oam_net_gw: + type: string + label: CPS network gateway + description: CPS network gateway + compute_image_name: + type: string + net_name: + type: string + dummy_net_netmask_1: + type: string + description: CSB internal network subnet mask + +resources: + server_pcm_003: + type: nested-pcm_v0.1.yaml + properties: + pcm_server_name: { get_param: [pcm_server_names, 0] } + pcm_image_name: { get_param: pcm_image_name } + pcm_flavor_name: { get_param: pcm_flavor_name } + availabilityzone_name: { get_param: availabilityzone_name } + + server_pcm_004: + type: nested-pcm_v0.2.yaml + properties: + pcm_server_name: { get_param: [pcm_server_names, 0] } + pcm_image_name: { get_param: pcm_image_name } + pcm_flavor_name: { get_param: pcm_flavor_name } + availabilityzone_name: { get_param: availabilityzone_name } + + server_compute_2: + type: OS::Nova::Server + properties: + config_drive: {get_attr: [compute_port_1]} + name: { compute_name } + image: { get_param: compute_image_name } + flavor: { compute_flavor_name } + user_data_format: { get_attr: [server_pcm_003 , oam_net_gw] } + user_data: { get_attr: [server_pcm_003]} + + compute_port_1: + type: OS::Neutron::Port + properties: + network: { get_param: net_name }
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/nested-pcm_v0.1.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/nested-pcm_v0.1.yaml new file mode 100644 index 0000000000..39107edb95 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/nested-pcm_v0.1.yaml @@ -0,0 +1,98 @@ +heat_template_version: 2013-05-23 + +description: heat template that creates PCRF Cluman stack + +parameters: + pcm_server_name: + type: string + label: PCRF CM server name + description: PCRF CM server name + pcm_image_name: + type: string + label: image name + description: PCRF CM image name + pcm_flavor_name: + type: string + label: PCRF CM flavor name + description: flavor name of PCRF CM instance + availabilityzone_name: + type: string + label: availabilityzone name + description: availabilityzone name + cps_net_name: + type: string + label: CPS network name + description: CPS network name + cps_net_ip: + type: string + label: CPS network ip + description: CPS network ip + cps_net_mask: + type: string + label: CPS network mask + description: CPS network mask + oam_net_name: + type: string + label: OAM network name + description: OAM network name + oam_net_ip: + type: string + label: OAM network ip + description: OAM network ip + oam_net_gw: + type: string + label: CPS network gateway + description: CPS network gateway + oam_net_mask: + type: string + label: CPS network mask + description: CPS network mask + pcm_vol: + type: string + label: CPS Cluman Cinder Volume + description: CPS Cluman Cinder Volume + security_group_name: + type: string + label: security group name + description: the name of security group + sm_server_names: + type: comma_delimited_list + label: SM server names + description: name of the SM instance + +resources: + server_pcm_1: + type: OS::Nova::Server + properties: + config_drive: "True" + name: { get_param: pcm_server_name } + image: { get_param: pcm_image_name } + flavor: { get_param: pcm_flavor_name } + availability_zone: { get_param: availabilityzone_name } + networks: + - port: { get_resource: pcm_port_0} + - port: { get_resource: pcm_port_1} + block_device_mapping: + - device_name: vdb + volume_id: { get_param: pcm_vol} + user_data_format: RAW + + pcm_port_0: + type: OS::Neutron::Port + properties: + network: { get_param: cps_net_name } + fixed_ips: + - ip_address: { get_param: cps_net_ip } + security_groups: [{ get_param: security_group_name }] + + pcm_port_1: + type: OS::Neutron::Port + properties: + network: { get_param: oam_net_name } + fixed_ips: + - ip_address: { get_param: oam_net_ip } + security_groups: [{ get_param: security_group_name }] +outputs: + server_pcm_id: + description: the pcm nova service id + value: { get_resource: server_pcm_1 }
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/nested-pcm_v0.2.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/nested-pcm_v0.2.yaml new file mode 100644 index 0000000000..9974df572a --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/nested-pcm_v0.2.yaml @@ -0,0 +1,94 @@ +heat_template_version: 2013-05-23 + +description: heat template that creates PCRF Cluman stack + +parameters: + pcm_server_name: + type: string + label: PCRF CM server name + description: PCRF CM server name + pcm_image_name: + type: string + label: image name + description: PCRF CM image name + pcm_flavor_name: + type: string + label: PCRF CM flavor name + description: flavor name of PCRF CM instance + availabilityzone_name: + type: string + label: availabilityzone name + description: availabilityzone name + cps_net_name: + type: string + label: CPS network name + description: CPS network name + cps_net_ip: + type: string + label: CPS network ip + description: CPS network ip + cps_net_mask: + type: string + label: CPS network mask + description: CPS network mask + oam_net_name: + type: string + label: OAM network name + description: OAM network name + oam_net_ip: + type: string + label: OAM network ip + description: OAM network ip + oam_net_gw: + type: string + label: CPS network gateway + description: CPS network gateway + oam_net_mask: + type: string + label: CPS network mask + description: CPS network mask + pcm_vol: + type: string + label: CPS Cluman Cinder Volume + description: CPS Cluman Cinder Volume + security_group_name: + type: string + label: security group name + description: the name of security group + +resources: + server_pcm_2: + type: OS::Nova::Server + properties: + config_drive: "True" + name: { get_param: pcm_server_name } + image: { get_param: pcm_image_name } + flavor: { get_param: pcm_flavor_name } + availability_zone: { get_param: availabilityzone_name } + networks: + - port: { get_resource: pcm_port_03} + - port: { get_resource: pcm_port_13} + block_device_mapping: + - device_name: vdb + volume_id: { get_param: pcm_vol} + user_data_format: RAW + + pcm_port_03: + type: OS::Neutron::Port + properties: + network: { get_param: cps_net_name } + fixed_ips: + - ip_address: { get_param: cps_net_ip } + security_groups: [{ get_param: security_group_name }] + + pcm_port_13: + type: OS::Neutron::Port + properties: + network: { get_param: oam_net_name } + fixed_ips: + - ip_address: { get_param: oam_net_ip } + security_groups: [{ get_param: security_group_name }] +outputs: + server_pcm_id: + description: the pcm nova service id + value: { get_resource: server_pcm_2 }
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/expectedoutputfiles/MainServiceTemplate.yaml new file mode 100644 index 0000000000..b44cb69060 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/expectedoutputfiles/MainServiceTemplate.yaml @@ -0,0 +1,246 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + cmaui_names: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: cmaui_names + type: list + description: CMAUI1, CMAUI2 server names + entry_schema: + type: string + cmaui_cinder_volume_size: + label: CMAUI Cinder volume size + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: cmaui_cinder_volume_size + type: float + description: the size of the CMAUI Cinder volume + timezone: + label: timezone + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: timezone + type: string + description: timezone + security_group_name: + label: security group name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: security_group_name + type: string + description: the name of security group + oam_network_netmask: + label: oam network netmask + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: oam_network_netmask + type: string + description: oam network gateway + cmaui_image: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: cmaui_image + type: string + description: Image for CMAUI server + vnf_id: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vnf_id + type: string + description: Unique ID for this VNF instance + default: This_is_ths_MMSC-CMAUI_id + cmaui_flavor: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: cmaui_flavor + type: string + description: Flavor for CMAUI server + oam_network_gateway: + label: oam network gateway + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: oam_network_gateway + type: string + description: oam network gateway + availability_zone_0: + label: availabilityzone name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: availability_zone_0 + type: string + description: availabilityzone name + cmaui_oam_ips: + label: CMAUI oam_net IP addresses + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: cmaui_oam_ips + type: list + description: CMAUI oam_net IP addresses + entry_schema: + type: string + external_dns: + label: dns server + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: external_dns + type: string + description: dns server + oam_net_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: oam_net_name + type: string + description: UID of OAM network + external_ntp: + label: ntp server + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: external_ntp + type: string + description: ntp server + CMAUI_volume_type: + label: CMAUI vm volume type + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: CMAUI_volume_type + type: string + description: the name of the target volume backend + node_templates: + server_cmaui_1: + type: org.openecomp.resource.abstract.nodes.heat.nested + directives: + - substitutable + properties: + cmaui_names: + get_input: + - cmaui_names + - 0 + service_template_filter: + substitute_service_template: nestedServiceTemplate.yaml + cmaui_image: + get_input: cmaui_image + cmaui_flavor: + get_input: cmaui_flavor + availability_zone_0: + get_input: availability_zone_0 + groups: + main_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/main.yml + description: cmaui server template for vMMSC + members: + - server_cmaui_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/expectedoutputfiles/nestedServiceTemplate.yaml new file mode 100644 index 0000000000..ae852574f3 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/expectedoutputfiles/nestedServiceTemplate.yaml @@ -0,0 +1,381 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: nested +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +node_types: + org.openecomp.resource.vfc.nodes.heat.cmaui: + derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server +topology_template: + inputs: + cmaui_names: + hidden: false + immutable: false + type: list + description: CMAUI1, CMAUI2 server names + entry_schema: + type: string + cmaui_cinder_volume_size: + label: CMAUI Cinder volume size + hidden: false + immutable: false + type: float + description: the size of the CMAUI Cinder volume + timezone: + label: timezone + hidden: false + immutable: false + type: string + description: timezone + security_group_name: + label: security group name + hidden: false + immutable: false + type: string + description: the name of security group + cmaui_volume: + label: CMAUI volume size + hidden: false + immutable: false + type: string + description: Volume for CMAUI server + oam_network_netmask: + label: oam network netmask + hidden: false + immutable: false + type: string + description: oam network gateway + cmaui_image: + hidden: false + immutable: false + type: string + description: Image for CMAUI server + vnf_id: + hidden: false + immutable: false + type: string + description: Unique ID for this VNF instance + default: This_is_ths_MMSC-CMAUI_id + cmaui_flavor: + hidden: false + immutable: false + type: string + description: Flavor for CMAUI server + oam_network_gateway: + label: oam network gateway + hidden: false + immutable: false + type: string + description: oam network gateway + out_cmaui_volume: + label: CMAUI vm volume type + hidden: false + immutable: false + type: string + description: the name of the target volume backend + availability_zone_0: + label: availabilityzone name + hidden: false + immutable: false + type: string + description: availabilityzone name + cmaui_oam_ips: + label: CMAUI oam_net IP addresses + hidden: false + immutable: false + type: list + description: CMAUI oam_net IP addresses + entry_schema: + type: string + external_dns: + label: dns server + hidden: false + immutable: false + type: string + description: dns server + oam_net_name: + hidden: false + immutable: false + type: string + description: UID of OAM network + external_ntp: + label: ntp server + hidden: false + immutable: false + type: string + description: ntp server + CMAUI_volume_type: + label: CMAUI vm volume type + hidden: false + immutable: false + type: string + description: the name of the target volume backend + node_templates: + server_cmaui_2: + type: org.openecomp.resource.vfc.nodes.heat.cmaui + properties: + flavor: + get_input: cmaui_flavor + availability_zone: + get_input: availability_zone_0 + image: + get_input: cmaui_image + metadata: + vnf_id: + get_input: vnf_id + user_data_format: RAW + name: + get_input: + - cmaui_names + - 0 + requirements: + - local_storage: + capability: tosca.capabilities.Attachment + node: cmaui_volume + relationship: cmaui_volume_attachment + cmaui_volume: + type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume + properties: + volume_type: + get_input: CMAUI_volume_type + size: '(get_input : cmaui_cinder_volume_size) * 1024' + cmaui_port_0: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + security_groups: + - get_input: security_group_name + fixed_ips: + - ip_address: + get_input: + - cmaui_oam_ips + - 0 + mac_requirements: + mac_count_required: + is_required: false + network_role_tag: oam + network: + get_input: oam_net_name + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: server_cmaui_2 + relationship: tosca.relationships.network.BindsTo + relationship_templates: + cmaui_volume_attachment: + type: org.openecomp.relationships.VolumeAttachesTo + properties: + volume_id: cmaui_volume + instance_uuid: server_cmaui_2 + groups: + a_vol_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/a_vol.yml + description: volume + members: + - cmaui_volume + nested_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/nested.yml + description: cmaui server template for vMMSC + members: + - server_cmaui_2 + - cmaui_port_0 + outputs: + out_cmaui_volume: + value: cmaui_volume + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.nested + capabilities: + disk.write.bytes.rate_server_cmaui_2: + - server_cmaui_2 + - disk.write.bytes.rate + disk.device.write.bytes_server_cmaui_2: + - server_cmaui_2 + - disk.device.write.bytes + disk.device.usage_server_cmaui_2: + - server_cmaui_2 + - disk.device.usage + network.incoming.packets.rate_cmaui_port_0: + - cmaui_port_0 + - network.incoming.packets.rate + disk.write.bytes_server_cmaui_2: + - server_cmaui_2 + - disk.write.bytes + feature_server_cmaui_2: + - server_cmaui_2 + - feature + disk.device.latency_server_cmaui_2: + - server_cmaui_2 + - disk.device.latency + disk.allocation_server_cmaui_2: + - server_cmaui_2 + - disk.allocation + feature_cmaui_port_0: + - cmaui_port_0 + - feature + binding_server_cmaui_2: + - server_cmaui_2 + - binding + disk.root.size_server_cmaui_2: + - server_cmaui_2 + - disk.root.size + disk.device.write.requests.rate_server_cmaui_2: + - server_cmaui_2 + - disk.device.write.requests.rate + vcpus_server_cmaui_2: + - server_cmaui_2 + - vcpus + scalable_server_cmaui_2: + - server_cmaui_2 + - scalable + network.outgoing.packets.rate_cmaui_port_0: + - cmaui_port_0 + - network.outgoing.packets.rate + disk.read.requests_server_cmaui_2: + - server_cmaui_2 + - disk.read.requests + attachment_cmaui_port_0: + - cmaui_port_0 + - attachment + network.outgoing.bytes_cmaui_port_0: + - cmaui_port_0 + - network.outgoing.bytes + disk.write.requests_server_cmaui_2: + - server_cmaui_2 + - disk.write.requests + disk.device.iops_server_cmaui_2: + - server_cmaui_2 + - disk.device.iops + disk.usage_server_cmaui_2: + - server_cmaui_2 + - disk.usage + disk.device.capacity_server_cmaui_2: + - server_cmaui_2 + - disk.device.capacity + disk.device.read.bytes.rate_server_cmaui_2: + - server_cmaui_2 + - disk.device.read.bytes.rate + endpoint_server_cmaui_2: + - server_cmaui_2 + - endpoint + disk.read.bytes_server_cmaui_2: + - server_cmaui_2 + - disk.read.bytes + os_server_cmaui_2: + - server_cmaui_2 + - os + forwarder_cmaui_port_0: + - cmaui_port_0 + - forwarder + disk.device.read.bytes_server_cmaui_2: + - server_cmaui_2 + - disk.device.read.bytes + disk.write.requests.rate_server_cmaui_2: + - server_cmaui_2 + - disk.write.requests.rate + memory_server_cmaui_2: + - server_cmaui_2 + - memory + cpu_server_cmaui_2: + - server_cmaui_2 + - cpu + disk.device.allocation_server_cmaui_2: + - server_cmaui_2 + - disk.device.allocation + host_server_cmaui_2: + - server_cmaui_2 + - host + network.incoming.packets_cmaui_port_0: + - cmaui_port_0 + - network.incoming.packets + disk.ephemeral.size_server_cmaui_2: + - server_cmaui_2 + - disk.ephemeral.size + disk.capacity_server_cmaui_2: + - server_cmaui_2 + - disk.capacity + instance_server_cmaui_2: + - server_cmaui_2 + - instance + binding_cmaui_port_0: + - cmaui_port_0 + - binding + feature_cmaui_volume: + - cmaui_volume + - feature + network.incoming.bytes.rate_cmaui_port_0: + - cmaui_port_0 + - network.incoming.bytes.rate + disk.iops_server_cmaui_2: + - server_cmaui_2 + - disk.iops + disk.device.write.requests_server_cmaui_2: + - server_cmaui_2 + - disk.device.write.requests + disk.device.read.requests_server_cmaui_2: + - server_cmaui_2 + - disk.device.read.requests + network.outpoing.packets_cmaui_port_0: + - cmaui_port_0 + - network.outpoing.packets + disk.read.bytes.rate_server_cmaui_2: + - server_cmaui_2 + - disk.read.bytes.rate + cpu.delta_server_cmaui_2: + - server_cmaui_2 + - cpu.delta + disk.device.read.requests.rate_server_cmaui_2: + - server_cmaui_2 + - disk.device.read.requests.rate + memory.resident_server_cmaui_2: + - server_cmaui_2 + - memory.resident + network.outgoing.bytes.rate_cmaui_port_0: + - cmaui_port_0 + - network.outgoing.bytes.rate + disk.latency_server_cmaui_2: + - server_cmaui_2 + - disk.latency + cpu_util_server_cmaui_2: + - server_cmaui_2 + - cpu_util + attachment_cmaui_volume: + - cmaui_volume + - attachment + network.incoming.bytes_cmaui_port_0: + - cmaui_port_0 + - network.incoming.bytes + disk.device.write.bytes.rate_server_cmaui_2: + - server_cmaui_2 + - disk.device.write.bytes.rate + memory.usage_server_cmaui_2: + - server_cmaui_2 + - memory.usage + requirements: + dependency_cmaui_port_0: + - cmaui_port_0 + - dependency + link_cmaui_port_0: + - cmaui_port_0 + - link + local_storage_server_cmaui_2: + - server_cmaui_2 + - local_storage + dependency_server_cmaui_2: + - server_cmaui_2 + - dependency + dependency_cmaui_volume: + - cmaui_volume + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/inputs/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/inputs/MANIFEST.json new file mode 100644 index 0000000000..c0bfc30a04 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/inputs/MANIFEST.json @@ -0,0 +1,24 @@ +{ + "name": "vMME_Small", + "description": "HOT template to create 2 cinder volume attachment", + "version": "2013-05-23", + "data": [ + { + "file": "nested.yml", + "type": "HEAT", + "isBase": "false", + "data": [ + { + "file": "a_vol.yml", + "type": "HEAT_VOL", + "isBase": "false" + } + ] + }, + { + "file": "main.yml", + "type": "HEAT", + "isBase": "false" + } + ] +} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/inputs/a_vol.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/inputs/a_vol.yml new file mode 100644 index 0000000000..a9f72bcecf --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/inputs/a_vol.yml @@ -0,0 +1,24 @@ +heat_template_version: 2013-05-23 + +description: volume + +parameters: + cmaui_cinder_volume_size: + type: number + label: CMAUI Cinder volume size + description: the size of the CMAUI Cinder volume + CMAUI_volume_type: + type: string + label: CMAUI vm volume type + description: the name of the target volume backend + +resources: + cmaui_volume: + type: OS::Cinder::Volume + properties: + size: {get_param: cmaui_cinder_volume_size} + volume_type: {get_param: CMAUI_volume_type} + +outputs: + out_cmaui_volume: + value: {get_resource: cmaui_volume}
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/inputs/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/inputs/main.yml new file mode 100644 index 0000000000..0894686026 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/inputs/main.yml @@ -0,0 +1,71 @@ +heat_template_version: 2013-05-23 + +description: cmaui server template for vMMSC + +parameters: + vnf_id: + type: string + description: Unique ID for this VNF instance + default: This_is_ths_MMSC-CMAUI_id + cmaui_names: + type: comma_delimited_list + description: CMAUI1, CMAUI2 server names + cmaui_image: + type: string + description: Image for CMAUI server + cmaui_flavor: + type: string + description: Flavor for CMAUI server + cmaui_cinder_volume_size: + type: number + label: CMAUI Cinder volume size + description: the size of the CMAUI Cinder volume + availability_zone_0: + type: string + label: availabilityzone name + description: availabilityzone name + oam_net_name: + type: string + description: UID of OAM network + oam_network_netmask: + type: string + label: oam network netmask + description: oam network gateway + oam_network_gateway: + type: string + label: oam network gateway + description: oam network gateway + external_dns: + type: string + label: dns server + description: dns server + external_ntp: + type: string + label: ntp server + description: ntp server + security_group_name: + type: string + label: security group name + description: the name of security group + timezone: + type: string + label: timezone + description: timezone + cmaui_oam_ips: + type: comma_delimited_list + label: CMAUI oam_net IP addresses + description: CMAUI oam_net IP addresses + CMAUI_volume_type: + type: string + label: CMAUI vm volume type + description: the name of the target volume backend + +resources: + + server_cmaui_1: + type: nested.yml + properties: + cmaui_names: { get_param: [cmaui_names, 0]} + cmaui_image: { get_param: cmaui_image } + availability_zone_0: { get_param: availability_zone_0 } + cmaui_flavor: { get_param: cmaui_flavor }
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/inputs/nested.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/inputs/nested.yml new file mode 100644 index 0000000000..d205cee2be --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/inputs/nested.yml @@ -0,0 +1,116 @@ +heat_template_version: 2013-05-23 + +description: cmaui server template for vMMSC + +parameters: + vnf_id: + type: string + description: Unique ID for this VNF instance + default: This_is_ths_MMSC-CMAUI_id + cmaui_names: + type: comma_delimited_list + description: CMAUI1, CMAUI2 server names + cmaui_image: + type: string + description: Image for CMAUI server + cmaui_flavor: + type: string + description: Flavor for CMAUI server + cmaui_volume: + type: string + label: CMAUI volume size + description: Volume for CMAUI server + cmaui_cinder_volume_size: + type: number + label: CMAUI Cinder volume size + description: the size of the CMAUI Cinder volume + availability_zone_0: + type: string + label: availabilityzone name + description: availabilityzone name + oam_net_name: + type: string + description: UID of OAM network + oam_network_netmask: + type: string + label: oam network netmask + description: oam network gateway + oam_network_gateway: + type: string + label: oam network gateway + description: oam network gateway + external_dns: + type: string + label: dns server + description: dns server + external_ntp: + type: string + label: ntp server + description: ntp server + security_group_name: + type: string + label: security group name + description: the name of security group + timezone: + type: string + label: timezone + description: timezone + cmaui_oam_ips: + type: comma_delimited_list + label: CMAUI oam_net IP addresses + description: CMAUI oam_net IP addresses + CMAUI_volume_type: + type: string + label: CMAUI vm volume type + description: the name of the target volume backend + out_cmaui_volume: + type: string + label: CMAUI vm volume type + description: the name of the target volume backend + +resources: + + cmaui_port_0: + type: OS::Neutron::Port + properties: + network: { get_param: oam_net_name } + fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 0]}}] + security_groups: [{get_param: security_group_name}] + replacement_policy: AUTO + + cmaui_volume_attachment: + type: OS::Cinder::VolumeAttachment + properties: + volume_id: {get_param: out_cmaui_volume} + instance_uuid: {get_resource: server_cmaui_2} + + server_cmaui_2: + type: OS::Nova::Server + properties: + name: { get_param: [cmaui_names, 0]} + image: { get_param: cmaui_image } + availability_zone: { get_param: availability_zone_0 } + flavor: { get_param: cmaui_flavor } + networks: + - port: { get_resource: cmaui_port_0 } + metadata: + vnf_id: { get_param: vnf_id } + user_data: + str_replace: + template: | + cmaui.mgmt.ip=${cmaui.mgmt.ip} + cmaui.mgmt.netmask=${cmaui.mgmt.netmask} + cmaui.mgmt.gateway=${cmaui.mgmt.gateway} + cmaui.external.dns=${cmaui.external.dns} + cmaui.external.ntp=${cmaui.external.ntp} + cmaui.node=${cmaui.node} + cmaui.timezone=${cmaui.timezone} + params: + ${cmaui.mgmt.ip}: {get_param: [cmaui_oam_ips, 0]} + ${cmaui.mgmt.netmask}: {get_param: oam_network_netmask} + ${cmaui.mgmt.gateway}: {get_param: oam_network_gateway} + ${cmaui.external.dns}: {get_param: external_dns} + ${cmaui.external.ntp}: {get_param: external_ntp} + ${cmaui.node}: {get_param: [cmaui_names, 0]} + ${cmaui.timezone}: {get_param: timezone} + user_data_format: RAW
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/single/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/single/expectedoutputfiles/MainServiceTemplate.yaml new file mode 100644 index 0000000000..cbf9ff1951 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/single/expectedoutputfiles/MainServiceTemplate.yaml @@ -0,0 +1,301 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +topology_template: + inputs: + param_type_comma_delimited_list: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - parameters + source_type: HEAT + param_name: param_type_comma_delimited_list + type: list + description: param comma_delimited_list - List + entry_schema: + type: string + param_type_string_default_value_with_env: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - parameters + source_type: HEAT + param_name: param_type_string_default_value_with_env + type: string + description: param value should be - HEAT_ENV_default string + default: HEAT_ENV default string + volume_type: + label: FSB Volume + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - parameters + source_type: HEAT + param_name: volume_type + type: string + description: FSB Volume type + FSB1_volume_name: + label: FSB Volume + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - parameters + source_type: HEAT + param_name: FSB1_volume_name + type: string + description: FSB Volume name + param_constraint_length_allowed_pattern_range_hidden: + label: User Name + hidden: true + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - parameters + source_type: HEAT + param_name: param_constraint_length_allowed_pattern_range_hidden + type: string + description: User name to be configured for the application + constraints: + - max_length: 8 + - min_length: 6 + - pattern: '[A-Z]+[a-zA-Z0-9]*' + - in_range: + - 0 + - 10 + param_type_boolean_default_value_with_env: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - parameters + source_type: HEAT + param_name: param_type_boolean_default_value_with_env + type: boolean + description: param value should be false + default: false + param_type_string: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - parameters + source_type: HEAT + param_name: param_type_string + type: string + description: param String - string + param_type_string_default_value: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - parameters + source_type: HEAT + param_name: param_type_string_default_value + type: string + description: param value should be - HEAT_default string + default: HEAT_default string + param_type_number: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - parameters + source_type: HEAT + param_name: param_type_number + type: float + description: param number - float + param_type_boolean: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - parameters + source_type: HEAT + param_name: param_type_boolean + type: boolean + description: param boolean - boolean + param_type_comma_delimited_list_default_value_with_env: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - parameters + source_type: HEAT + param_name: param_type_comma_delimited_list_default_value_with_env + type: list + description: param value should be [b1,b2,b3,b4] + default: + - b1 + - b2 + - b3 + - b4 + entry_schema: + type: string + param_type_boolean_default_value: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - parameters + source_type: HEAT + param_name: param_type_boolean_default_value + type: boolean + description: param value should be true + default: true + param_type_number_default_value: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - parameters + source_type: HEAT + param_name: param_type_number_default_value + type: float + description: param value should be 12345 + default: 12345 + FSB_1_image: + label: FSB Image + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - parameters + source_type: HEAT + param_name: FSB_1_image + type: string + description: FSB Image name + param_type_comma_delimited_list_default_value: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - parameters + source_type: HEAT + param_name: param_type_comma_delimited_list_default_value + type: list + description: param value should be [a1,a2,a3,a4] + default: + - a1 + - a2 + - a3 + - a4 + entry_schema: + type: string + param_type_number_default_value_with_env: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - parameters + source_type: HEAT + param_name: param_type_number_default_value_with_env + type: float + description: param value should be 54321 + default: 54321 + param_type_json: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - parameters + source_type: HEAT + param_name: param_type_json + type: json + description: param json - map<String> + param_allowed_values: + label: Instance Type + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - parameters + source_type: HEAT + param_name: param_allowed_values + type: string + description: Instance type for compute instances + constraints: + - valid_values: + - m1.small + - m1.medium + - m1.large + node_templates: + FSB1_volume: + type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume + properties: + image: + get_input: FSB_1_image + volume_type: + get_input: volume_type + size: 3*1024 + name: + get_input: FSB1_volume_name + groups: + parameters_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/parameters.yaml + description: | + Version 2.0 02-09-2016 (Authors: John Doe, user PROD) + members: + - FSB1_volume diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/inputs/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/single/inputs/MANIFEST.json index bc0e397432..bc0e397432 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/inputs/MANIFEST.json +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/single/inputs/MANIFEST.json diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/inputs/parameters.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/single/inputs/parameters.env index 21978f2482..21978f2482 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/inputs/parameters.env +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/single/inputs/parameters.env diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/inputs/parameters.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/single/inputs/parameters.yaml index 6f1b69ac59..6f1b69ac59 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/inputs/parameters.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/single/inputs/parameters.yaml diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_Network_Rule/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_Network_Rule/expectedoutputfiles/MainServiceTemplate.yaml index 7197964d8b..48620f5c56 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_Network_Rule/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_Network_Rule/expectedoutputfiles/MainServiceTemplate.yaml @@ -9,86 +9,222 @@ topology_template: start_src_ports: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - network_policy_chain + source_type: HEAT + param_name: start_src_ports type: float description: Start of src port private_net_1_gateway: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - network_policy_chain + source_type: HEAT + param_name: private_net_1_gateway type: string description: Private network gateway address private_net_2_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - network_policy_chain + source_type: HEAT + param_name: private_net_2_name type: string description: Name of private network to be created private_net_2_gateway: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - network_policy_chain + source_type: HEAT + param_name: private_net_2_gateway type: string description: Private network gateway address policy_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - network_policy_chain + source_type: HEAT + param_name: policy_name type: string description: Virtual network id private_net_1_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - network_policy_chain + source_type: HEAT + param_name: private_net_1_name type: string description: Name of private network to be created private_net_2_pool_start: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - network_policy_chain + source_type: HEAT + param_name: private_net_2_pool_start type: string description: Start of private network IP address allocation pool private_net_2_cidr: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - network_policy_chain + source_type: HEAT + param_name: private_net_2_cidr type: string description: Private network address (CIDR notation) private_net_1_pool_end: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - network_policy_chain + source_type: HEAT + param_name: private_net_1_pool_end type: string description: End of private network IP address allocation pool end_src_ports: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - network_policy_chain + source_type: HEAT + param_name: end_src_ports type: float description: End of src port apply_service: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - network_policy_chain + source_type: HEAT + param_name: apply_service type: string description: service to apply start_dst_ports: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - network_policy_chain + source_type: HEAT + param_name: start_dst_ports type: float description: Start of dst port end_dst_ports: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - network_policy_chain + source_type: HEAT + param_name: end_dst_ports type: float description: End of dst port private_net_1_cidr: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - network_policy_chain + source_type: HEAT + param_name: private_net_1_cidr type: string description: Private network address (CIDR notation) private_net_1_pool_start: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - network_policy_chain + source_type: HEAT + param_name: private_net_1_pool_start type: string description: Start of private network IP address allocation pool private_net_2_pool_end: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - network_policy_chain + source_type: HEAT + param_name: private_net_2_pool_end type: string description: End of private network IP address allocation pool direction: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - network_policy_chain + source_type: HEAT + param_name: direction type: string description: Direction of Policy node_templates: @@ -170,4 +306,4 @@ topology_template: members: - private_net_1 - private_policy - - private_net_2
\ No newline at end of file + - private_net_2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_VirtualNetwork/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_VirtualNetwork/expectedoutputfiles/MainServiceTemplate.yaml index d1a2daf0ef..27582261d8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_VirtualNetwork/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_VirtualNetwork/expectedoutputfiles/MainServiceTemplate.yaml @@ -26,573 +26,1397 @@ topology_template: Internal2_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: Internal2_name type: string default: Internal2-subnet vlc2-Internal2-mac: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: vlc2-Internal2-mac type: string description: static mac address assigned to vlc2-Internal2 default: 00:81:37:0E:02:12 epc-sctp-a-net-rt: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: epc-sctp-a-net-rt type: string description: epc-sctp-a route target default: 13979:105717 epc-sctp-b-net-rt: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: epc-sctp-b-net-rt type: string description: epc-sctp-b route target default: 13979:105719 gpb-flavor: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: gpb-flavor type: string description: Flavor to use for servers gpb default: m4.xlarge4 Internal1_cidr: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: Internal1_cidr type: string default: 169.253.0.0/17 epc-sctp-a-pool-start: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: epc-sctp-a-pool-start type: string description: epc-sctp-a-net network ip pool start IP address default: 107.243.37.3 Internal2_subnet_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: Internal2_subnet_name type: string default: vmme_int_int_sub_2 Internal1_subnet_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: Internal1_subnet_name type: string default: vmme_int_int_sub_1 gpb1-Internal1-mac: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: gpb1-Internal1-mac type: string description: static mac address assigned to gpb1-Internal1 default: 00:80:37:0E:01:22 gpb1-Internal1-ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: gpb1-Internal1-ip type: string default: 169.254.0.101 FSB_1_image: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: FSB_1_image type: string description: image name fsb1-Internal2-mac: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: fsb1-Internal2-mac type: string description: static mac address assigned to fsb1-Internal2 default: 00:81:37:0E:0B:12 ncb_zone: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: ncb_zone type: string description: cluster for spawnning ncb instances default: nova Internal2_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: Internal2_net_name type: string default: vmme_int_int_2 epc-sctp-a-pool-end: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: epc-sctp-a-pool-end type: string description: epc-sctp-a-net network ip pool end IP address default: 107.243.37.30 Internal1_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: Internal1_name type: string default: Internal1-subnet gpb2-name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: gpb2-name type: string description: Name of gpb2 default: ZRDM1MMEX33GPB002 fsb2-Internal1-mac: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: fsb2-Internal1-mac type: string description: static mac address assigned to fsb2-Internal1 default: 00:80:37:0E:0D:12 fsb2-name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: fsb2-name type: string description: Name of fsb1 default: ZRDM1MMEX33FSB002 static_prefix_sctp_b_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: static_prefix_sctp_b_1 type: string description: Static Prefix default: 107.239.40.64/30 fsb2-oam-ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: fsb2-oam-ip type: string default: 107.250.172.222 fsb2-flavor: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: fsb2-flavor type: string description: Flavor to use for servers fsb2 default: m4.xlarge4 fsb2-Internal2-mac: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: fsb2-Internal2-mac type: string description: static mac address assigned to fsb2-Internal2 default: 00:81:37:0E:0D:12 ncb2-Internal1-mac: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: ncb2-Internal1-mac type: string description: static mac address assigned to ncb2-Internal1 default: 00:80:37:0E:0F:12 ncb2-name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: ncb2-name type: string description: Name of ncb2 default: ZRDM1MMEX33NCB002 epc-sctp-b-pool-end: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: epc-sctp-b-pool-end type: string description: epc-sctp-b-net network ip pool end IP address default: 107.243.37.62 vlc1-gtp-ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: vlc1-gtp-ip type: string default: 107.243.37.67 epc-sctp-b-pool-start: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: epc-sctp-b-pool-start type: string description: epc-sctp-b-net network ip pool start IP address default: 107.243.37.35 my_instance: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: my_instance type: string description: instance Internal2_shared: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: Internal2_shared type: string default: 'False' Internal1_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: Internal1_net_name type: string default: vmme_int_int_1 vlc2-name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: vlc2-name type: string description: Name of vlc2 default: ZRDM1MMEX33VLC002 Internal2_ipam_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: Internal2_ipam_name type: string default: vmme_ipam_int2 vlc1-sctp-b-ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: vlc1-sctp-b-ip type: string default: 107.243.37.35 Internal1_net_pool_end: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: Internal1_net_pool_end type: string default: 169.253.0.254 Internal1_default_gateway: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: Internal1_default_gateway type: string default: 169.253.0.3 ncb1-Internal1-mac: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: ncb1-Internal1-mac type: string description: static mac address assigned to ncb1-Internal1 default: 00:80:37:0E:09:12 epc-gtp-net-name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: epc-gtp-net-name type: string description: gtp net name default: EPC-GTP vlc1-Internal1-mac: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: vlc1-Internal1-mac type: string description: static mac address assigned to vlc1-Internal1 default: 00:80:37:0E:01:12 gpb2-Internal1-mac: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: gpb2-Internal1-mac type: string description: static mac address assigned to gpb2-Internal1 default: 00:80:37:0E:02:22 epc-gtp-net-cidr: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: epc-gtp-net-cidr type: string description: gtp stubnet default: 107.243.37.64/27 oam_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: oam_net_id type: string description: uuid of oam network default: 47bf4cca-0961-422f-bcd6-d5a4fbb1a351 vlc_zone: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: vlc_zone type: string description: cluster for spawnning vlc instances default: nova vlc2-Internal1-mac: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: vlc2-Internal1-mac type: string description: static mac address assigned to vlc2-Internal1 default: 00:80:37:0E:02:12 epc-sctp-a-net-cidr: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: epc-sctp-a-net-cidr type: string description: epc-sctp-a subnet default: 107.243.37.0/27 Internal1_forwarding_mode: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: Internal1_forwarding_mode type: string default: l2 Internal2_dhcp: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: Internal2_dhcp type: boolean default: false fsb1-oam-ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: fsb1-oam-ip type: string default: 107.250.172.221 FSB_2_image: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: FSB_2_image type: string description: image name vlc1-oam-ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: vlc1-oam-ip type: string default: 107.250.172.227 epc-sctp-a-net-name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: epc-sctp-a-net-name type: string description: epc-sctp-a net name default: EPC-SCTP-A vlc2-oam-ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: vlc2-oam-ip type: string default: 107.250.172.228 Internal2_net_pool_start: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: Internal2_net_pool_start type: string default: 169.255.0.100 FSB1_volume_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: FSB1_volume_name type: string description: volume name vlc1-sctp-a-ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: vlc1-sctp-a-ip type: string default: 107.243.37.3 Internal1_ipam_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: Internal1_ipam_name type: string default: vmme_ipam_int1 Internal1_dhcp: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: Internal1_dhcp type: boolean default: false Internal2_external: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: Internal2_external type: string default: 'False' Internal2_forwarding_mode: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: Internal2_forwarding_mode type: string default: l2 vlc1-name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: vlc1-name type: string description: Name of vlc1 default: ZRDM1MMEX33VLC002 vlc-flavor: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: vlc-flavor type: string description: Flavor to use for servers vlc default: m4.xlarge4 epc-gtp-net-rt: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: epc-gtp-net-rt type: string description: gtp route target default: 13979:105715 gpb_zone: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: gpb_zone type: string description: cluster for spawnning gpb instances default: nova Internal1-net: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: Internal1-net type: string description: net gpb1-Internal2-mac: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: gpb1-Internal2-mac type: string description: static mac address assigned to gpb1-Internal2 default: 00:81:37:0E:01:22 fsb1-Internal1-mac: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: fsb1-Internal1-mac type: string description: static mac address assigned to fsb1-Internal1 default: 00:80:37:0E:0B:12 FSB2_volume_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: FSB2_volume_name type: string description: volume name VMME_FSB2_boot_volume: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: VMME_FSB2_boot_volume type: string default: 089a0d11-4b15-4370-8343-3f90907b1221 fsb_zone: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: fsb_zone type: string description: cluster for spawnning fsb instances default: nova VMME_FSB1_boot_volume: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: VMME_FSB1_boot_volume type: string default: 8248e794-6173-4b49-b9c3-8219b0b56f4e Internal2_default_gateway: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: Internal2_default_gateway type: string default: 169.255.0.3 Internal1_external: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: Internal1_external type: string default: 'False' vlc2-sctp-a-ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: vlc2-sctp-a-ip type: string default: 107.243.37.4 ncb-flavor: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: ncb-flavor type: string description: Flavor to use for servers ncb default: m4.xlarge4 Internal1_shared: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: Internal1_shared type: string default: 'False' fsb1-name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: fsb1-name type: string description: Name of fsb1 default: ZRDM1MMEX33FSB001 static_prefix_gtp_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: static_prefix_gtp_1 type: string description: Static Prefix default: 107.239.40.96/30 epc-sctp-b-net-gateway: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: epc-sctp-b-net-gateway type: string description: epc-sctp-b-net network gateway default: 107.243.37.33 epc-sctp-b-net-cidr: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: epc-sctp-b-net-cidr type: string description: epc-sctp-b subnet default: 107.243.37.32/24 epc-gtp-pool-end: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: epc-gtp-pool-end type: string description: gtp network ip pool end IP address default: 107.243.37.94 epc-sctp-a-net-gateway: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: epc-sctp-a-net-gateway type: string description: epc-sctp-a-net network gateway default: 107.243.37.1 vlc2-gtp-ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: vlc2-gtp-ip type: string default: 107.243.37.68 vlc2-sctp-b-ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: vlc2-sctp-b-ip type: string default: 107.243.37.36 Internal1_net_pool_start: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: Internal1_net_pool_start type: string default: 169.253.0.100 volume_size: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: volume_size type: string description: volume fsb2-image: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: fsb2-image type: string description: Name of image to use for server fsb2 default: MME_FSB2_15B-CP04-r5a01 ncb2-Internal2-mac: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: ncb2-Internal2-mac type: string description: static mac address assigned to ncb2-Internal2 default: 00:81:37:0E:0F:12 ncb1-name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: ncb1-name type: string description: Name of ncb1 default: ZRDM1MMEX33NCB001 fsb1-image: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: fsb1-image type: string description: Name of image to use for server fsb1 default: MME_FSB1_15B-CP04-r5a01 fsb1-flavor: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: fsb1-flavor type: string description: Flavor to use for servers fsb1 default: m4.xlarge4 volume_type: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: volume_type type: string description: volume Internal2_net_pool_end: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: Internal2_net_pool_end type: string default: 169.255.0.254 epc-sctp-b-net-name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: epc-sctp-b-net-name type: string description: epc-sctp-b net name default: EPC-SCTP-B Internal2_cidr: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: Internal2_cidr type: string default: 169.255.0.0/17 epc-gtp-net-gateway: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: epc-gtp-net-gateway type: string description: gtp network gateway default: 107.243.37.65 gpb2-Internal2-mac: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: gpb2-Internal2-mac type: string description: static mac address assigned to gpb2-Internal2 default: 00:81:37:0E:02:22 ncb1-Internal2-mac: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: ncb1-Internal2-mac type: string description: static mac address assigned to ncb1-Internal2 default: 00:81:37:0E:09:12 epc-gtp-pool-start: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: epc-gtp-pool-start type: string description: gtp network ip pool start IP address default: 107.243.37.67 static_prefix_sctp_a_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: static_prefix_sctp_a_1 type: string description: Static Prefix default: 107.239.40.32/30 gpb1-name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: gpb1-name type: string description: Name of gpb1 default: ZRDM1MMEX33GPB001 pxe-image: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: pxe-image type: string description: Name of image to use for server ncb default: MME_PXE-BOOT_cxp9025898_2r5a01.qcow2 vlc1-Internal2-mac: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - vmme_small + source_type: HEAT + param_name: vlc1-Internal2-mac type: string description: static mac address assigned to vlc1-Internal2 default: 00:81:37:0E:01:12 @@ -1519,4 +2343,4 @@ topology_template: - VLC1_GTP - FSB2_OAM - GPB1_Internal2 - - GPB1_Internal1
\ No newline at end of file + - GPB1_Internal1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Neutron_Net/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Neutron_Net/expectedoutputfiles/MainServiceTemplate.yaml index 63d9b08d82..523d9c37d7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Neutron_Net/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Neutron_Net/expectedoutputfiles/MainServiceTemplate.yaml @@ -9,27 +9,67 @@ topology_template: param_number: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: param_number type: float description: param number - float jsa_cidr: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: jsa_cidr type: string description: CIDR of jsa log network default: 107.243.7.128/26 param_string: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: param_string type: string description: param String - string param_json: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: param_json type: json description: param json - map<String> param_comma_delimited_list: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: param_comma_delimited_list type: list description: param comma_delimited_list - List entry_schema: @@ -38,6 +78,14 @@ topology_template: label: User Name hidden: true immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: user_name type: string description: User name to be configured for the application constraints: @@ -50,12 +98,28 @@ topology_template: param_boolean: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: param_boolean type: boolean description: param boolean - boolean instance_type: label: Instance Type hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: instance_type type: string description: Instance type for compute instances constraints: @@ -66,6 +130,14 @@ topology_template: jsa_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: jsa_net_name type: string description: network name of jsa log network default: jsa_log_net_0 @@ -192,4 +264,4 @@ topology_template: - jsa_net_test_get_attribute_3_params - jsa_net_test_get_attribute_4_params - jsa_net_test_get_attribute_5_params - - jsa_net_test_full_attribute
\ No newline at end of file + - jsa_net_test_full_attribute diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Nova_Server/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Nova_Server/expectedoutputfiles/MainServiceTemplate.yaml index c97b870219..bc90c39153 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Nova_Server/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Nova_Server/expectedoutputfiles/MainServiceTemplate.yaml @@ -19,24 +19,56 @@ topology_template: label: Internal2_name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: Internal2_name type: string description: Internal2_name Internal1_shared: label: Internal1_shared hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: Internal1_shared type: string description: Internal1_shared FSB1_volume_name: label: FSB1_volume hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: FSB1_volume_name type: string description: FSB1_volume_1 jsa_cidr: label: jsa_cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: jsa_cidr type: string description: jsa_cidr default: 107.243.7.128/26 @@ -44,158 +76,382 @@ topology_template: label: availabilityzone_name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone_name fsb1-name: label: FSB1_name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: fsb1-name type: string description: FSB1_name pcm_image_name: label: pcm_image_name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: pcm_image_name type: string description: pcm_image_name Internal2_external: label: Internal2_external hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: Internal2_external type: string description: Internal2_external Internal2_forwarding_mode: label: Internal2_forwarding_mode hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: Internal2_forwarding_mode type: string description: Internal2_forwarding_mode pcrf_psm_flavor_name: label: pcrf_psm_flavor_name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: pcrf_psm_flavor_name type: string description: pcrf_psm_flavor_name pcrf_psm_image_name: label: pcrf_psm_image_name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: pcrf_psm_image_name type: string description: pcrf_psm_image_name pcrf_vnf_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: pcrf_vnf_id type: string description: prop FSB_1_image: label: MME_FSB1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: FSB_1_image type: string description: MME_FSB1_15B-CP04-r5a01 snapshot01: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: snapshot01 type: string description: prop volume_size: label: volume size hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: volume_size type: float description: my volume size 320GB snapshot02: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: snapshot02 type: string description: prop fsb1-Internal1-mac: label: FSB1_internal_mac hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: fsb1-Internal1-mac type: string description: FSB1_internal_mac Internal2_shared: label: Internal2_shared hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: Internal2_shared type: string description: Internal2_shared pcm_server_name: label: pcm_server_name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: pcm_server_name type: string description: pcm_server_name cps_net_mask: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: cps_net_mask type: string description: prop Internal1_net_name: label: Internal1_net_name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: Internal1_net_name type: string description: Internal1_net_name oam_net_name: label: oam_net_name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: oam_net_name type: string description: oam_net_name fsb1-flavor: label: FSB1_flavor hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: fsb1-flavor type: string description: FSB1_flavor fsb1-Internal2-mac: label: FSB1_internal_mac hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: fsb1-Internal2-mac type: string description: FSB1_internal_mac pcm_vol_01: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: pcm_vol_01 type: string description: prop volume_type: label: volume type hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: volume_type type: string description: volume type Gold fsb1-zone: label: FSB1_zone hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: fsb1-zone type: string description: FSB1_zone fsb_zone: label: FSB1_zone hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: fsb_zone type: string description: FSB1_zone oam_net_gw: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: oam_net_gw type: string description: prop VMME_FSB1_boot_volume: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: VMME_FSB1_boot_volume type: string network_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: network_name type: string description: prop security_group_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: security_group_name type: list description: CMAUI1, CMAUI2 server names entry_schema: @@ -203,12 +459,28 @@ topology_template: cps_net_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: cps_net_ip type: string description: prop jsa_net_name: label: jsa_net_name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: jsa_net_name type: string description: jsa_net_name default: jsa_log_net_0 @@ -216,72 +488,176 @@ topology_template: label: pcrf_psm_server_name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: pcrf_psm_server_name type: string description: pcrf_psm_server_name pcm_flavor_name: label: pcm_flavor_name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: pcm_flavor_name type: string description: pcm_flavor_name oam_net_id: label: oam_net_id hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: oam_net_id type: string description: oam_net_id pcrf_cps_net_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: pcrf_cps_net_ip type: string description: prop fsb2-Internal1-mac: label: FSB1_internal_mac hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: fsb2-Internal1-mac type: string description: FSB1_internal_mac Internal1_forwarding_mode: label: Internal1_forwarding_mode hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: Internal1_forwarding_mode type: string description: Internal1_forwarding_mode pcrf_cps_net_name: label: pcrf_cps_net_name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: pcrf_cps_net_name type: string description: pcrf_cps_net_name pcm_vol: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: pcm_vol type: string description: prop cps_net_name: label: cps_net_name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: cps_net_name type: string description: cps_net_name oam_net_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: oam_net_ip type: string description: prop oam_net_mask: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: oam_net_mask type: string description: prop fsb1-oam-ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: fsb1-oam-ip type: string description: prop pcrf_security_group_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: pcrf_security_group_name type: list description: CMAUI1, CMAUI2 server names entry_schema: @@ -290,6 +666,14 @@ topology_template: label: Internal1_external hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - ep-jsa_net + source_type: HEAT + param_name: Internal1_external type: string description: Internal1_external node_templates: @@ -633,4 +1017,4 @@ topology_template: - pcrf_server_psm - server_VolumeTest - FSB2 - - FSB1
\ No newline at end of file + - FSB1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/sharedresources/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/sharedresources/expectedoutputfiles/MainServiceTemplate.yaml index b43b9c3240..ab54493a9b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/sharedresources/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/sharedresources/expectedoutputfiles/MainServiceTemplate.yaml @@ -15,24 +15,56 @@ topology_template: label: FSB1_flavor hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - sharedDefinitionOutParam + source_type: HEAT + param_name: fsb1-flavor type: string description: FSB1_flavor fsb_zone: label: FSB1_zone hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - sharedDefinitionOutParam + source_type: HEAT + param_name: fsb_zone type: string description: FSB1_zone fsb1-name: label: FSB1_name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - sharedDefinitionOutParam + source_type: HEAT + param_name: fsb1-name type: string description: FSB1_name FSB_1_image: label: MME_FSB1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - sharedDefinitionOutParam + source_type: HEAT + param_name: FSB_1_image type: string description: MME_FSB1_15B-CP04-r5a01 node_templates: @@ -68,4 +100,4 @@ topology_template: value: static value out_id1: value: - get_input: oam_net_gw
\ No newline at end of file + get_input: oam_net_gw |