From d5b4901c6a1ae136138c1300d377447e26bac4ef Mon Sep 17 00:00:00 2001 From: eleonorali Date: Sun, 11 Feb 2018 12:15:48 +0200 Subject: SRIOV - add annotations SRIOV - add annotations to input TOSCA parameter converted from HEAT file (2) Change-Id: Id0b0156730ae64093df42d09e2873de047c13ac9 Issue-ID: SDC-996 Signed-off-by: eleonorali --- .../out/MainServiceTemplate.yaml | 425 +++++++ .../out/MainServiceTemplate.yaml | 64 ++ .../out/MainServiceTemplate.yaml | 152 +++ .../out/MainServiceTemplate.yaml | 56 + .../out/MainServiceTemplate.yaml | 64 ++ .../out/MainServiceTemplate.yaml | 274 ++++- .../out/MainServiceTemplate.yaml | 146 ++- .../out/MainServiceTemplate.yaml | 274 ++++- .../out/MainServiceTemplate.yaml | 274 ++++- .../out/MainServiceTemplate.yaml | 490 +++++++- .../out/MainServiceTemplate.yaml | 130 ++- .../out/MainServiceTemplate.yaml | 130 ++- .../out/MainServiceTemplate.yaml | 130 ++- .../out/MainServiceTemplate.yaml | 162 ++- .../out/MainServiceTemplate.yaml | 138 ++- .../out/MainServiceTemplate.yaml | 32 + .../out/MainServiceTemplate.yaml | 64 ++ .../out/MainServiceTemplate.yaml | 64 ++ .../out/MainServiceTemplate.yaml | 186 ++- .../out/MainServiceTemplate.yaml | 8 + .../out/MainServiceTemplate.yaml | 10 +- .../out/MainServiceTemplate.yaml | 8 + .../nestedNoCompute/out/MainServiceTemplate.yaml | 8 + .../out/MainServiceTemplate.yaml | 8 + .../out/MainServiceTemplate.yaml | 16 + .../out/MainServiceTemplate.yaml | 40 + .../out/MainServiceTemplate.yaml | 16 + .../out/MainServiceTemplate.yaml | 58 +- .../duplicateReqs/out/MainServiceTemplate.yaml | 964 ++++++++++++++++ .../out/MainServiceTemplate.yaml | 1212 +++++++++++++++++++- .../nestedMultiLevels/out/MainServiceTemplate.yaml | 16 + .../out/MainServiceTemplate.yaml | 162 +++ .../out/MainServiceTemplate.yaml | 146 ++- .../out/MainServiceTemplate.yaml | 146 ++- .../out/MainServiceTemplate.yaml | 120 ++ .../out/MainServiceTemplate.yaml | 120 ++ .../out/MainServiceTemplate.yaml | 120 ++ .../out/MainServiceTemplate.yaml | 144 +++ .../out/MainServiceTemplate.yaml | 58 +- .../out/MainServiceTemplate.yaml | 58 +- .../out/MainServiceTemplate.yaml | 56 + .../out/MainServiceTemplate.yaml | 32 + .../out/MainServiceTemplate.yaml | 32 + .../out/MainServiceTemplate.yaml | 40 + .../out/MainServiceTemplate.yaml | 32 + .../out/MainServiceTemplate.yaml | 40 + .../out/MainServiceTemplate.yaml | 56 + .../out/MainServiceTemplate.yaml | 32 + .../out/MainServiceTemplate.yaml | 32 + .../out/MainServiceTemplate.yaml | 56 + .../out/MainServiceTemplate.yaml | 56 + .../out/MainServiceTemplate.yaml | 408 +++++++ .../out/MainServiceTemplate.yaml | 56 + .../out/MainServiceTemplate.yaml | 56 + .../out/MainServiceTemplate.yaml | 72 ++ .../out/MainServiceTemplate.yaml | 56 + .../out/MainServiceTemplate.yaml | 80 ++ .../out/MainServiceTemplate.yaml | 408 +++++++ .../out/MainServiceTemplate.yaml | 408 +++++++ .../out/MainServiceTemplate.yaml | 408 +++++++ .../out/MainServiceTemplate.yaml | 408 +++++++ .../out/MainServiceTemplate.yaml | 408 +++++++ .../out/MainServiceTemplate.yaml | 408 +++++++ .../out/MainServiceTemplate.yaml | 144 +++ .../out/MainServiceTemplate.yaml | 408 +++++++ .../out/MainServiceTemplate.yaml | 408 +++++++ .../out/MainServiceTemplate.yaml | 40 + .../out/MainServiceTemplate.yaml | 408 +++++++ .../out/MainServiceTemplate.yaml | 408 +++++++ .../out/MainServiceTemplate.yaml | 184 +++ .../out/MainServiceTemplate.yaml | 152 +++ .../out/MainServiceTemplate.yaml | 152 +++ .../out/MainServiceTemplate.yaml | 152 +++ .../out/MainServiceTemplate.yaml | 328 ++++++ .../twoSetsOfSingle/out/MainServiceTemplate.yaml | 328 ++++++ 75 files changed, 13427 insertions(+), 18 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml index e26a807c29..ef413aaa1c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml @@ -11,6 +11,14 @@ topology_template: app_volume_size_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF_volume + source_type: HEAT + param_name: app_volume_size_0 type: float description: Size of Service Data 1 Volume for app VMs default: 130 @@ -21,16 +29,40 @@ topology_template: plt_data_floating_v6_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: plt_data_floating_v6_ip type: string description: Floating IPv6 for plt VMs on the DATA network iox_data_floating_v6_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: iox_data_floating_v6_ip type: string description: Floating IPv6 for iox VMs on the DATA network plt_data_v6_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: plt_data_v6_ips type: list description: Fixed IPv6 assignments for plt VMs on the DATA network entry_schema: @@ -38,6 +70,14 @@ topology_template: iox_data_v6_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: iox_data_v6_ips type: list description: Fixed IPv6 assignments for iox VMs on the DATA network entry_schema: @@ -45,11 +85,27 @@ topology_template: plt_volume_shared_id_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: plt_volume_shared_id_0 type: string description: ServiceData2 volume for plt VMs plt_oam_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: plt_oam_ips type: list description: Fixed IPv4 assignments for plt VMs on the OAM network entry_schema: @@ -58,23 +114,55 @@ topology_template: label: OpenStack CA Certificate hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: openstack_cacert type: string description: CA Certificate to use for OpenStack client calls. default: '' siteinfo_url: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: siteinfo_url type: string description: siteinfo url plt_pair_uuid: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: plt_pair_uuid type: string description: UUID for plt VM pair default: 573f433e25ba8 app_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: app_names type: list description: VM names for app VMs entry_schema: @@ -82,6 +170,14 @@ topology_template: iox_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: iox_names type: list description: VM names for iox VMs entry_schema: @@ -89,6 +185,14 @@ topology_template: plt_servicedata2_volume_size_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF_volume + source_type: HEAT + param_name: plt_servicedata2_volume_size_0 type: float description: Size of Service Data 2 Volume for plt VMs default: 150 @@ -99,11 +203,27 @@ topology_template: app_volume_id_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: app_volume_id_0 type: string description: ServiceData1 volume for first app VM plt_servicedata1_volume_size_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF_volume + source_type: HEAT + param_name: plt_servicedata1_volume_size_0 type: float description: Size of Service Data 1 Volume for plt VMs default: 70 @@ -114,61 +234,149 @@ topology_template: internal_subnet_cidr: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: internal_subnet_cidr type: string description: IP subnet for internal network default: 169.30.12.0/24 app_volume_id_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: app_volume_id_1 type: string description: ServiceData1 volume for second app VM domain: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: domain type: string description: What is this domain? app_volume_id_2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: app_volume_id_2 type: string description: ServiceData1 volume for third app VM plt_image_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: plt_image_name type: string description: Pilot image default: USP_IECF-PILOT_30.3.3-mcas4.4.6.qcow2 app_image_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: app_image_name type: string description: App image default: USP_IECF-APP_30.3.3-mcas4.4.6.qcow2 plt_oam_floating_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: plt_oam_floating_ip type: string description: Floating IPv4 for plt VMs on the OAM network plt_flavor_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: plt_flavor_name type: string description: Pilot flavor default: nd.c2r4d50 vf_module_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: vf_module_id type: string description: Unique ID for this VF Module instance iox_flavor_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: iox_flavor_name type: string description: IO flavor default: nd.c2r4d50 app_security_groups: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: app_security_groups type: list description: App security group entry_schema: @@ -176,23 +384,56 @@ topology_template: vnf_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF_volume + - base_vIECCF + source_type: HEAT + param_name: vnf_name type: string description: Unique name for this VF instance config_server_cacert: label: configure server CA Certificate hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: config_server_cacert type: string description: CA Certificate for download from siteinfo url and config url. default: '' vf_module_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: vf_module_name type: string description: Unique name for this VF Module instance oam_security_groups: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: oam_security_groups type: list description: OAM security group entry_schema: @@ -200,6 +441,14 @@ topology_template: iox_oam_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: iox_oam_ips type: list description: Fixed IPv4 assignments for iox VMs on the OAM network entry_schema: @@ -207,38 +456,94 @@ topology_template: vnf_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: vnf_id type: string description: Unique ID for this VF instance iox_image_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: iox_image_name type: string description: IO image default: USP_IECF-IO_30.3.3-mcas4.4.6.qcow2 availability_zone_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: availability_zone_0 type: string description: First availability zone ID or Name ignore_siteinfo_audit: label: Siteinfo Audit Ignore Flag hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: ignore_siteinfo_audit type: string description: Set to true if siteinfo audit failure should not prevent system installation availability_zone_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: availability_zone_1 type: string description: Second availability zone ID or Name data_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: data_net_id type: string description: DATA network plt_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: plt_names type: list description: VM names for plt VMs entry_schema: @@ -246,6 +551,14 @@ topology_template: plt_security_groups: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: plt_security_groups type: list description: Pilot security group entry_schema: @@ -253,6 +566,14 @@ topology_template: app_data_v6_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: app_data_v6_ips type: list description: Fixed IPv6 assignments for app VMs on the DATA network entry_schema: @@ -260,6 +581,14 @@ topology_template: iox_security_groups: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: iox_security_groups type: list description: IO security group entry_schema: @@ -267,17 +596,41 @@ topology_template: ieccf_debug: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: ieccf_debug type: string description: IECCF debug flag default: false name_server_2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: name_server_2 type: string description: IP address of name server 2 app_oam_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: app_oam_ips type: list description: Fixed IPv4 assignments for app VMs on the OAM network entry_schema: @@ -285,48 +638,120 @@ topology_template: app_flavor_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: app_flavor_name type: string description: App flavor default: nd.c2r4d50 name_server_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: name_server_1 type: string description: IP address of name server 1 oam_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: oam_net_id type: string description: OAM network iox_oam_floating_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: iox_oam_floating_ip type: string description: Floating IPv4 for iox VMs on the OAM network ieccf_config_url: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: ieccf_config_url type: string description: IECCF configuration package URL iox_pair_uuid: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: iox_pair_uuid type: string description: UUID for iox VM pair default: 573f433e284b4 plt_volume_id_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: plt_volume_id_0 type: string description: ServiceData1 volume for first plt VM plt_volume_id_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: plt_volume_id_1 type: string description: ServiceData1 volume for second plt VM data_security_groups: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vIECCF + source_type: HEAT + param_name: data_security_groups type: list description: DATA security group entry_schema: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml index dc1e032e44..616ac37069 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_1 type: string description: csb internal cidr default: mog_dummy_1 @@ -26,6 +42,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -33,12 +57,28 @@ topology_template: label: packet internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: packet_internal_network_name type: string description: name of the network pd_image_name: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -46,6 +86,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: @@ -58,12 +106,28 @@ topology_template: label: oam network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_name type: string description: name of the oam network diff_image_name: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: diff_image_name type: string description: PD image name node_templates: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml index b9db6577bb..28836651f6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: internet network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_ips type: list description: ip of the OAM network default: @@ -33,6 +49,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_1 type: string description: csb internal cidr default: mog_dummy_1 @@ -40,6 +64,14 @@ topology_template: label: CM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_server_names type: list description: name of the CM instance default: @@ -50,6 +82,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -57,12 +97,28 @@ topology_template: label: OAM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_flavor_name type: string description: flavor name of OAM instance pd_image_name: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -70,6 +126,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: @@ -82,6 +146,14 @@ topology_template: label: SM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_server_names type: list description: name of the SM instance default: @@ -93,6 +165,14 @@ topology_template: label: CM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_flavor_name type: string description: flavor name of CM instance default: m3.xlarge @@ -100,6 +180,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_image_name type: string description: SM image name default: MOG_BASE_8.0 @@ -107,6 +195,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_image_name type: string description: CM image name default: MOG_BASE_8.0 @@ -114,6 +210,14 @@ topology_template: label: SM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_flavor_name type: string description: flavor name of SM instance default: m2.xlarge4 @@ -121,6 +225,14 @@ topology_template: label: PS server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_server_names type: list description: name of the PS instance default: @@ -134,6 +246,14 @@ topology_template: label: PS image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_image_name type: string description: PS image name default: MOG_BASE_8.0 @@ -141,12 +261,28 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_image_name type: string description: OAM image name oam_server_names: label: OAM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_server_names type: list description: name of the OAM instance entry_schema: @@ -155,6 +291,14 @@ topology_template: label: PS flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_flavor_name type: string description: flavor name of PS instance default: m3.xlarge @@ -162,6 +306,14 @@ topology_template: label: oam network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_name type: string description: name of the oam network default: oam_protected_net_0 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/MainServiceTemplate.yaml index 095a6c1a5e..3ae6fa0b26 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_1 type: string description: csb internal cidr default: mog_dummy_1 @@ -26,6 +42,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -33,12 +57,28 @@ topology_template: label: packet internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: packet_internal_network_name type: string description: name of the network pd_image_name: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -46,6 +86,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: @@ -58,6 +106,14 @@ topology_template: label: oam network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_name type: string description: name of the oam network node_templates: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/MainServiceTemplate.yaml index a40a3fdc30..172582fd24 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_1 type: string description: csb internal cidr default: mog_dummy_1 @@ -26,6 +42,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -33,12 +57,28 @@ topology_template: label: packet internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: packet_internal_network_name type: string description: name of the network pd_image_name: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -46,6 +86,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: @@ -58,12 +106,28 @@ topology_template: label: oam network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_name type: string description: name of the oam network diff_image_name: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: diff_image_name type: string description: PD image name node_templates: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNestedToNested/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNestedToNested/out/MainServiceTemplate.yaml index 765f1002d6..97fcee7365 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNestedToNested/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNestedToNested/out/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: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: vf_module_id type: string description: Unique ID for this VNF Module instance avpn_subnet_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: avpn_subnet_id type: list description: comma delimited list of the UUIDs of the operator created IPv4 AVPN subnets entry_schema: @@ -23,6 +39,14 @@ topology_template: sbg_internal_allocation_pool_start_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_internal_allocation_pool_start_ip type: string description: The start IP of the Internal network's allocation pool. Don't deviate from default! constraints: @@ -30,6 +54,14 @@ topology_template: internal_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: internal_net_id type: string description: the UUID of the operator-created Internal network constraints: @@ -37,11 +69,27 @@ topology_template: sbg_sc_flavor_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_sc_flavor_name type: string description: Flavor to use for SC VM. Minimum 4 non-HT vCPU and 16GB RAM required sbg_management_cidr: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_management_cidr type: string description: Network address (CIDR notation) for SBG Management Network, IPv4 constraints: @@ -49,6 +97,14 @@ topology_template: sbg_comte_floating_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_comte_floating_ip type: string description: Moveable IP (VIP) for COM on the Internal network, IPv4. Don't deviate from default! constraints: @@ -56,6 +112,14 @@ topology_template: sbg_avpn_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_avpn_ips type: list description: | comma delimited list of IPv4 IPs to be used on AVPN networks. n*2 IP address expected where n is the number of PL VM pairs. The first two addresses are assigned to the first PL VM pair, second two IPs to the second PL VM pair, and so on. Note: this is true regardless of the number of AVPN networks and sbg_AVPN_count. @@ -64,6 +128,14 @@ topology_template: management_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: management_net_id type: string description: the UUID of the operator-created Management network constraints: @@ -71,6 +143,14 @@ topology_template: sbg_sc_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_sc_names type: list description: comma delimited list of VM names assigned to System Controller VMs entry_schema: @@ -78,6 +158,14 @@ topology_template: sbg_management_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_management_ips type: list description: comma delimited list of IPv4 addresses of SBG VMs on the Management network. entry_schema: @@ -85,6 +173,14 @@ topology_template: sbg_nfs_floating_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_nfs_floating_ip type: string description: Moveable IP (VIP) for NFS server on the Internal network, IPv4. Don't deviate from default! constraints: @@ -92,11 +188,27 @@ topology_template: vnf_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: vnf_id type: string description: Unique ID for this VF instance avpn_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: avpn_net_id type: list description: comma delimited list of the UUIDs of the operator-created AVPN networks entry_schema: @@ -104,11 +216,27 @@ topology_template: availability_zone_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: availability_zone_0 type: string description: First availability zone ID or Name. sbg_internal_mac_addresses: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_internal_mac_addresses type: list description: comma delimited list of MAC addresses for the VMs on the Internal network entry_schema: @@ -116,6 +244,14 @@ topology_template: sbg_management_floating_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_management_floating_ip type: string description: Moveable Management IP (VIP), IPv4 constraints: @@ -123,6 +259,14 @@ topology_template: management_subnet_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: management_subnet_id type: string description: the UUID of the operator-created Management subnet, IPv4 constraints: @@ -130,6 +274,14 @@ topology_template: sbg_AVPN_vlan_tag_list: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_AVPN_vlan_tag_list type: list description: comma delimited list of internal VLAN TAG(s) used by AVPN networks entry_schema: @@ -137,6 +289,14 @@ topology_template: sbg_pl_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_pl_names type: list description: comma delimited list of VM names assigned to Payload VMs entry_schema: @@ -144,6 +304,14 @@ topology_template: sbg_management_gateway_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_management_gateway_ip_0 type: string description: IPv4 IP address of the default gateway on Management network constraints: @@ -151,6 +319,14 @@ topology_template: sbg_AVPN_count: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_AVPN_count type: float description: The number of AVPN networks constraints: @@ -160,6 +336,14 @@ topology_template: ntp_servers: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: ntp_servers type: list description: comma delimited list of NTP servers required by System Controller VMs. Exactly 2 IPv4 values are required entry_schema: @@ -167,6 +351,14 @@ topology_template: sbg_management_mac_addresses: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_management_mac_addresses type: list description: comma delimited list of MAC addresses for the VMs on the Management network entry_schema: @@ -174,6 +366,14 @@ topology_template: core_subnet_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: core_subnet_id type: string description: the UUID of the operator-created Core subnet, IPv4 constraints: @@ -181,6 +381,14 @@ topology_template: sbg_internal_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_internal_ips type: list description: comma delimited list of IPv4 addresses of SBG VMs on the Internal network. Don't deviate from the default values. entry_schema: @@ -188,6 +396,14 @@ topology_template: sbg_boot_floating_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_boot_floating_ip type: string description: Moveable IP (VIP) for TFTP server on the Internal network, IPv4. Don't deviate from default! constraints: @@ -195,6 +411,14 @@ topology_template: sbg_sc_volume_id_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_sc_volume_id_0 type: string description: the UUID of the pre-created Cinder volume attached to SC-1 as root volume constraints: @@ -202,11 +426,27 @@ topology_template: sbg_pl_flavor_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_pl_flavor_name type: string description: Flavor to use for PL VM. Minimum 8 non-HT vCPU and 64GB RAM required sbg_internal_allocation_pool_end_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_internal_allocation_pool_end_ip type: string description: The end IP of the Internal network's allocation pool. Don't deviate from default! constraints: @@ -214,6 +454,14 @@ topology_template: sbg_sc_volume_id_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_sc_volume_id_1 type: string description: the UUID of the pre-created Cinder volume attached to SC-1 as tools volume constraints: @@ -221,6 +469,14 @@ topology_template: sbg_internal_cidr: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_internal_cidr type: string description: Network address (CIDR notation) for SBG intra-VM communication, IPv4. Don't deviate from default! constraints: @@ -228,6 +484,14 @@ topology_template: dummy_subnet_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: dummy_subnet_id type: string description: the UUID of the operator-created dummy subnet, IPv4 constraints: @@ -235,6 +499,14 @@ topology_template: trunk_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: trunk_net_id type: string description: the UUID of the operator-created Traffic network constraints: @@ -360,4 +632,4 @@ topology_template: members: - sbg_pl_trunk_subport_avpn_group_1 - sbg_pl_trunk_subport_avpn_group_0 - - abstract_sbg_sc \ No newline at end of file + - abstract_sbg_sc diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNovaToNestedPort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNovaToNestedPort/out/MainServiceTemplate.yaml index 628bf3df22..0741732d8b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNovaToNestedPort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNovaToNestedPort/out/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: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: vf_module_id type: string description: Unique ID for this VNF Module instance avpn_subnet_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: avpn_subnet_id type: list description: comma delimited list of the UUIDs of the operator created IPv4 AVPN subnets entry_schema: @@ -23,6 +39,14 @@ topology_template: internal_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: internal_net_id type: string description: the UUID of the operator-created Internal network constraints: @@ -30,6 +54,14 @@ topology_template: sbg_AVPN_vlan_tag_list: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_AVPN_vlan_tag_list type: list description: comma delimited list of internal VLAN TAG(s) used by AVPN networks entry_schema: @@ -37,6 +69,14 @@ topology_template: sbg_AVPN_count: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_AVPN_count type: float description: The number of AVPN networks constraints: @@ -46,11 +86,27 @@ topology_template: sbg_sc_flavor_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_sc_flavor_name type: string description: Flavor to use for SC VM. Minimum 4 non-HT vCPU and 16GB RAM required sbg_comte_floating_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_comte_floating_ip type: string description: Moveable IP (VIP) for COM on the Internal network, IPv4. Don't deviate from default! constraints: @@ -58,6 +114,14 @@ topology_template: sbg_internal_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_internal_ips type: list description: comma delimited list of IPv4 addresses of SBG VMs on the Internal network. Don't deviate from the default values. entry_schema: @@ -65,6 +129,14 @@ topology_template: sbg_avpn_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_avpn_ips type: list description: | comma delimited list of IPv4 IPs to be used on AVPN networks. n*2 IP address expected where n is the number of PL VM pairs. The first two addresses are assigned to the first PL VM pair, second two IPs to the second PL VM pair, and so on. Note: this is true regardless of the number of AVPN networks and sbg_AVPN_count. @@ -73,6 +145,14 @@ topology_template: sbg_sc_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_sc_names type: list description: comma delimited list of VM names assigned to System Controller VMs entry_schema: @@ -80,6 +160,14 @@ topology_template: sbg_nfs_floating_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_nfs_floating_ip type: string description: Moveable IP (VIP) for NFS server on the Internal network, IPv4. Don't deviate from default! constraints: @@ -87,6 +175,14 @@ topology_template: sbg_boot_floating_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_boot_floating_ip type: string description: Moveable IP (VIP) for TFTP server on the Internal network, IPv4. Don't deviate from default! constraints: @@ -94,6 +190,14 @@ topology_template: sbg_sc_volume_id_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_sc_volume_id_0 type: string description: the UUID of the pre-created Cinder volume attached to SC-1 as root volume constraints: @@ -101,11 +205,27 @@ topology_template: vnf_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: vnf_id type: string description: Unique ID for this VF instance avpn_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: avpn_net_id type: list description: comma delimited list of the UUIDs of the operator-created AVPN networks entry_schema: @@ -113,6 +233,14 @@ topology_template: sbg_sc_volume_id_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_sc_volume_id_1 type: string description: the UUID of the pre-created Cinder volume attached to SC-1 as tools volume constraints: @@ -120,11 +248,27 @@ topology_template: availability_zone_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: availability_zone_0 type: string description: First availability zone ID or Name. sbg_internal_mac_addresses: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_internal_mac_addresses type: list description: comma delimited list of MAC addresses for the VMs on the Internal network entry_schema: @@ -224,4 +368,4 @@ topology_template: SC1, SC2, PL3 and PL4. This is the main template, to be used to create an initial stack, with 1 mated pair members: - sbg_pl_trunk_subport_avpn_group_0 - - abstract_sbg_sc \ No newline at end of file + - abstract_sbg_sc diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromPortToNested/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromPortToNested/out/MainServiceTemplate.yaml index bbae08d120..82cb2a4fa6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromPortToNested/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromPortToNested/out/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: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: vf_module_id type: string description: Unique ID for this VNF Module instance avpn_subnet_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: avpn_subnet_id type: list description: comma delimited list of the UUIDs of the operator created IPv4 AVPN subnets entry_schema: @@ -23,6 +39,14 @@ topology_template: sbg_internal_allocation_pool_start_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_internal_allocation_pool_start_ip type: string description: The start IP of the Internal network's allocation pool. Don't deviate from default! constraints: @@ -30,6 +54,14 @@ topology_template: internal_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: internal_net_id type: string description: the UUID of the operator-created Internal network constraints: @@ -37,11 +69,27 @@ topology_template: sbg_sc_flavor_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_sc_flavor_name type: string description: Flavor to use for SC VM. Minimum 4 non-HT vCPU and 16GB RAM required sbg_management_cidr: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_management_cidr type: string description: Network address (CIDR notation) for SBG Management Network, IPv4 constraints: @@ -49,6 +97,14 @@ topology_template: sbg_comte_floating_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_comte_floating_ip type: string description: Moveable IP (VIP) for COM on the Internal network, IPv4. Don't deviate from default! constraints: @@ -56,6 +112,14 @@ topology_template: sbg_avpn_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_avpn_ips type: list description: | comma delimited list of IPv4 IPs to be used on AVPN networks. n*2 IP address expected where n is the number of PL VM pairs. The first two addresses are assigned to the first PL VM pair, second two IPs to the second PL VM pair, and so on. Note: this is true regardless of the number of AVPN networks and sbg_AVPN_count. @@ -64,6 +128,14 @@ topology_template: management_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: management_net_id type: string description: the UUID of the operator-created Management network constraints: @@ -71,6 +143,14 @@ topology_template: sbg_sc_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_sc_names type: list description: comma delimited list of VM names assigned to System Controller VMs entry_schema: @@ -78,6 +158,14 @@ topology_template: sbg_management_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_management_ips type: list description: comma delimited list of IPv4 addresses of SBG VMs on the Management network. entry_schema: @@ -85,6 +173,14 @@ topology_template: sbg_nfs_floating_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_nfs_floating_ip type: string description: Moveable IP (VIP) for NFS server on the Internal network, IPv4. Don't deviate from default! constraints: @@ -92,11 +188,27 @@ topology_template: vnf_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: vnf_id type: string description: Unique ID for this VF instance avpn_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: avpn_net_id type: list description: comma delimited list of the UUIDs of the operator-created AVPN networks entry_schema: @@ -104,11 +216,27 @@ topology_template: availability_zone_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: availability_zone_0 type: string description: First availability zone ID or Name. sbg_internal_mac_addresses: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_internal_mac_addresses type: list description: comma delimited list of MAC addresses for the VMs on the Internal network entry_schema: @@ -116,6 +244,14 @@ topology_template: sbg_management_floating_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_management_floating_ip type: string description: Moveable Management IP (VIP), IPv4 constraints: @@ -123,6 +259,14 @@ topology_template: management_subnet_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: management_subnet_id type: string description: the UUID of the operator-created Management subnet, IPv4 constraints: @@ -130,6 +274,14 @@ topology_template: sbg_AVPN_vlan_tag_list: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_AVPN_vlan_tag_list type: list description: comma delimited list of internal VLAN TAG(s) used by AVPN networks entry_schema: @@ -137,6 +289,14 @@ topology_template: sbg_pl_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_pl_names type: list description: comma delimited list of VM names assigned to Payload VMs entry_schema: @@ -144,6 +304,14 @@ topology_template: sbg_management_gateway_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_management_gateway_ip_0 type: string description: IPv4 IP address of the default gateway on Management network constraints: @@ -151,6 +319,14 @@ topology_template: sbg_AVPN_count: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_AVPN_count type: float description: The number of AVPN networks constraints: @@ -160,6 +336,14 @@ topology_template: ntp_servers: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: ntp_servers type: list description: comma delimited list of NTP servers required by System Controller VMs. Exactly 2 IPv4 values are required entry_schema: @@ -167,6 +351,14 @@ topology_template: sbg_management_mac_addresses: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_management_mac_addresses type: list description: comma delimited list of MAC addresses for the VMs on the Management network entry_schema: @@ -174,6 +366,14 @@ topology_template: core_subnet_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: core_subnet_id type: string description: the UUID of the operator-created Core subnet, IPv4 constraints: @@ -181,6 +381,14 @@ topology_template: sbg_internal_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_internal_ips type: list description: comma delimited list of IPv4 addresses of SBG VMs on the Internal network. Don't deviate from the default values. entry_schema: @@ -188,6 +396,14 @@ topology_template: sbg_boot_floating_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_boot_floating_ip type: string description: Moveable IP (VIP) for TFTP server on the Internal network, IPv4. Don't deviate from default! constraints: @@ -195,6 +411,14 @@ topology_template: sbg_sc_volume_id_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_sc_volume_id_0 type: string description: the UUID of the pre-created Cinder volume attached to SC-1 as root volume constraints: @@ -202,11 +426,27 @@ topology_template: sbg_pl_flavor_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_pl_flavor_name type: string description: Flavor to use for PL VM. Minimum 8 non-HT vCPU and 64GB RAM required sbg_internal_allocation_pool_end_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_internal_allocation_pool_end_ip type: string description: The end IP of the Internal network's allocation pool. Don't deviate from default! constraints: @@ -214,6 +454,14 @@ topology_template: sbg_sc_volume_id_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_sc_volume_id_1 type: string description: the UUID of the pre-created Cinder volume attached to SC-1 as tools volume constraints: @@ -221,6 +469,14 @@ topology_template: sbg_internal_cidr: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_internal_cidr type: string description: Network address (CIDR notation) for SBG intra-VM communication, IPv4. Don't deviate from default! constraints: @@ -228,6 +484,14 @@ topology_template: dummy_subnet_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: dummy_subnet_id type: string description: the UUID of the operator-created dummy subnet, IPv4 constraints: @@ -235,6 +499,14 @@ topology_template: trunk_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: trunk_net_id type: string description: the UUID of the operator-created Traffic network constraints: @@ -360,4 +632,4 @@ topology_template: SC1, SC2, PL3 and PL4. This is the main template, to be used to create an initial stack, with 1 mated pair members: - sbg_pl_trunk_subport_avpn_group_0 - - abstract_sbg_sc \ No newline at end of file + - abstract_sbg_sc diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/out/MainServiceTemplate.yaml index 7ba8fcc315..d070beaf9e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/out/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: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: vf_module_id type: string description: Unique ID for this VNF Module instance avpn_subnet_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: avpn_subnet_id type: list description: comma delimited list of the UUIDs of the operator created IPv4 AVPN subnets entry_schema: @@ -23,6 +39,14 @@ topology_template: sbg_internal_allocation_pool_start_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_internal_allocation_pool_start_ip type: string description: The start IP of the Internal network's allocation pool. Don't deviate from default! constraints: @@ -30,6 +54,14 @@ topology_template: internal_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: internal_net_id type: string description: the UUID of the operator-created Internal network constraints: @@ -37,11 +69,27 @@ topology_template: sbg_sc_flavor_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_sc_flavor_name type: string description: Flavor to use for SC VM. Minimum 4 non-HT vCPU and 16GB RAM required sbg_management_cidr: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_management_cidr type: string description: Network address (CIDR notation) for SBG Management Network, IPv4 constraints: @@ -49,6 +97,14 @@ topology_template: sbg_comte_floating_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_comte_floating_ip type: string description: Moveable IP (VIP) for COM on the Internal network, IPv4. Don't deviate from default! constraints: @@ -56,6 +112,14 @@ topology_template: sbg_avpn_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_avpn_ips type: list description: | comma delimited list of IPv4 IPs to be used on AVPN networks. n*2 IP address expected where n is the number of PL VM pairs. The first two addresses are assigned to the first PL VM pair, second two IPs to the second PL VM pair, and so on. Note: this is true regardless of the number of AVPN networks and sbg_AVPN_count. @@ -64,6 +128,14 @@ topology_template: management_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: management_net_id type: string description: the UUID of the operator-created Management network constraints: @@ -71,6 +143,14 @@ topology_template: sbg_sc_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_sc_names type: list description: comma delimited list of VM names assigned to System Controller VMs entry_schema: @@ -78,6 +158,14 @@ topology_template: sbg_management_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_management_ips type: list description: comma delimited list of IPv4 addresses of SBG VMs on the Management network. entry_schema: @@ -85,6 +173,14 @@ topology_template: sbg_nfs_floating_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_nfs_floating_ip type: string description: Moveable IP (VIP) for NFS server on the Internal network, IPv4. Don't deviate from default! constraints: @@ -92,11 +188,27 @@ topology_template: vnf_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: vnf_id type: string description: Unique ID for this VF instance avpn_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: avpn_net_id type: list description: comma delimited list of the UUIDs of the operator-created AVPN networks entry_schema: @@ -104,11 +216,27 @@ topology_template: availability_zone_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: availability_zone_0 type: string description: First availability zone ID or Name. sbg_internal_mac_addresses: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_internal_mac_addresses type: list description: comma delimited list of MAC addresses for the VMs on the Internal network entry_schema: @@ -116,6 +244,14 @@ topology_template: sbg_management_floating_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_management_floating_ip type: string description: Moveable Management IP (VIP), IPv4 constraints: @@ -123,6 +259,14 @@ topology_template: management_subnet_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: management_subnet_id type: string description: the UUID of the operator-created Management subnet, IPv4 constraints: @@ -130,6 +274,14 @@ topology_template: sbg_AVPN_vlan_tag_list: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_AVPN_vlan_tag_list type: list description: comma delimited list of internal VLAN TAG(s) used by AVPN networks entry_schema: @@ -137,6 +289,14 @@ topology_template: sbg_pl_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_pl_names type: list description: comma delimited list of VM names assigned to Payload VMs entry_schema: @@ -144,6 +304,14 @@ topology_template: sbg_management_gateway_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_management_gateway_ip_0 type: string description: IPv4 IP address of the default gateway on Management network constraints: @@ -151,6 +319,14 @@ topology_template: sbg_AVPN_count: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_AVPN_count type: float description: The number of AVPN networks constraints: @@ -160,6 +336,14 @@ topology_template: ntp_servers: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: ntp_servers type: list description: comma delimited list of NTP servers required by System Controller VMs. Exactly 2 IPv4 values are required entry_schema: @@ -167,6 +351,14 @@ topology_template: sbg_management_mac_addresses: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_management_mac_addresses type: list description: comma delimited list of MAC addresses for the VMs on the Management network entry_schema: @@ -174,6 +366,14 @@ topology_template: core_subnet_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: core_subnet_id type: string description: the UUID of the operator-created Core subnet, IPv4 constraints: @@ -181,6 +381,14 @@ topology_template: sbg_internal_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_internal_ips type: list description: comma delimited list of IPv4 addresses of SBG VMs on the Internal network. Don't deviate from the default values. entry_schema: @@ -188,6 +396,14 @@ topology_template: sbg_boot_floating_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_boot_floating_ip type: string description: Moveable IP (VIP) for TFTP server on the Internal network, IPv4. Don't deviate from default! constraints: @@ -195,6 +411,14 @@ topology_template: sbg_sc_volume_id_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_sc_volume_id_0 type: string description: the UUID of the pre-created Cinder volume attached to SC-1 as root volume constraints: @@ -202,11 +426,27 @@ topology_template: sbg_pl_flavor_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_pl_flavor_name type: string description: Flavor to use for PL VM. Minimum 8 non-HT vCPU and 64GB RAM required sbg_internal_allocation_pool_end_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_internal_allocation_pool_end_ip type: string description: The end IP of the Internal network's allocation pool. Don't deviate from default! constraints: @@ -214,6 +454,14 @@ topology_template: sbg_sc_volume_id_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_sc_volume_id_1 type: string description: the UUID of the pre-created Cinder volume attached to SC-1 as tools volume constraints: @@ -221,6 +469,14 @@ topology_template: sbg_internal_cidr: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_internal_cidr type: string description: Network address (CIDR notation) for SBG intra-VM communication, IPv4. Don't deviate from default! constraints: @@ -228,6 +484,14 @@ topology_template: dummy_subnet_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: dummy_subnet_id type: string description: the UUID of the operator-created dummy subnet, IPv4 constraints: @@ -235,6 +499,14 @@ topology_template: trunk_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: trunk_net_id type: string description: the UUID of the operator-created Traffic network constraints: @@ -399,4 +671,4 @@ topology_template: members: - sbg_pl_trunk_subport_avpn_group_0 - nested_sbg - - abstract_sbg_sc \ No newline at end of file + - abstract_sbg_sc diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dynamicPortsWithDependsOn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dynamicPortsWithDependsOn/out/MainServiceTemplate.yaml index 40c00bbd33..1802188f23 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dynamicPortsWithDependsOn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dynamicPortsWithDependsOn/out/MainServiceTemplate.yaml @@ -11,6 +11,14 @@ topology_template: avpn_subnet_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: avpn_subnet_id type: list description: comma delimited list of the UUIDs of the operator created IPv4 AVPN subnets entry_schema: @@ -18,6 +26,14 @@ topology_template: sbg_internal_allocation_pool_start_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_internal_allocation_pool_start_ip type: string description: The start IP of the Internal network's allocation pool. Don't deviate from default! constraints: @@ -25,6 +41,14 @@ topology_template: sbg_core_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_core_ips type: list description: comma delimited list of IPv4 IPs to be used on Core network entry_schema: @@ -32,6 +56,14 @@ topology_template: access_subnet_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: access_subnet_id type: string description: the UUID of the operator-created Access subnet, IPv4 constraints: @@ -39,6 +71,14 @@ topology_template: sbg_management_cidr: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_management_cidr type: string description: Network address (CIDR notation) for SBG Management Network, IPv4 constraints: @@ -46,6 +86,14 @@ topology_template: sbg_core_vlan_tag: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_core_vlan_tag type: float description: The internal VLAN TAG for Core network constraints: @@ -55,6 +103,14 @@ topology_template: management_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: management_net_id type: string description: the UUID of the operator-created Management network constraints: @@ -62,6 +118,14 @@ topology_template: sbg_management_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_management_ips type: list description: comma delimited list of IPv4 addresses of SBG VMs on the Management network. entry_schema: @@ -69,6 +133,14 @@ topology_template: sbg_nfs_floating_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_nfs_floating_ip type: string description: Moveable IP (VIP) for NFS server on the Internal network, IPv4. Don't deviate from default! constraints: @@ -76,6 +148,14 @@ topology_template: sbg_charging_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_charging_ips type: list description: comma delimited list of IPv4 IPs to be used on Charging network entry_schema: @@ -83,6 +163,14 @@ topology_template: sbg_internal_mac_addresses: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_internal_mac_addresses type: list description: comma delimited list of MAC addresses for the VMs on the Internal network entry_schema: @@ -90,6 +178,14 @@ topology_template: core_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: core_net_id type: string description: the UUID of the operator-created Core network constraints: @@ -97,6 +193,14 @@ topology_template: sbg_access_vlan_tag: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_access_vlan_tag type: float description: The internal VLAN TAG for Access network constraints: @@ -106,6 +210,14 @@ topology_template: management_subnet_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: management_subnet_id type: string description: the UUID of the operator-created Management subnet, IPv4 constraints: @@ -113,6 +225,14 @@ topology_template: access_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: access_net_id type: string description: the UUID of the operator-created Access network constraints: @@ -120,6 +240,14 @@ topology_template: sbg_dummy_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_dummy_ips type: list description: comma delimited list of IPv4 IPs to be used on Dummy network entry_schema: @@ -127,6 +255,14 @@ topology_template: sgi_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sgi_net_id type: string description: the UUID of the operator-created SGI network constraints: @@ -134,6 +270,14 @@ topology_template: sbg_sgi_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_sgi_ips type: list description: comma delimited list of IPv4 IPs to be used on SGI network entry_schema: @@ -141,6 +285,14 @@ topology_template: sbg_internal_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_internal_ips type: list description: comma delimited list of IPv4 addresses of SBG VMs on the Internal network. Don't deviate from the default values. entry_schema: @@ -148,6 +300,14 @@ topology_template: core_v6_subnet_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: core_v6_subnet_id type: string description: the UUID of the operator-created Core subnet, IPv6 constraints: @@ -155,6 +315,14 @@ topology_template: sbg_internal_allocation_pool_end_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_internal_allocation_pool_end_ip type: string description: The end IP of the Internal network's allocation pool. Don't deviate from default! constraints: @@ -162,6 +330,14 @@ topology_template: UCOM_subnet_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: UCOM_subnet_id type: string description: the UUID of the operator-created UC One Mobile subnet, IPv4 constraints: @@ -169,6 +345,14 @@ topology_template: sbg_internal_cidr: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_internal_cidr type: string description: Network address (CIDR notation) for SBG intra-VM communication, IPv4. Don't deviate from default! constraints: @@ -176,6 +360,14 @@ topology_template: sgi_subnet_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sgi_subnet_id type: string description: the UUID of the operator-created SGI subnet, IPv4 constraints: @@ -183,6 +375,14 @@ topology_template: trunk_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: trunk_net_id type: string description: the UUID of the operator-created Traffic network constraints: @@ -190,11 +390,27 @@ topology_template: vf_module_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: vf_module_id type: string description: Unique ID for this VNF Module instance internal_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: internal_net_id type: string description: the UUID of the operator-created Internal network constraints: @@ -202,6 +418,14 @@ topology_template: sbg_SGI_vlan_tag: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_SGI_vlan_tag type: float description: The internal VLAN TAG for SGI network constraints: @@ -211,11 +435,27 @@ topology_template: sbg_sc_flavor_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_sc_flavor_name type: string description: Flavor to use for SC VM. Minimum 4 non-HT vCPU and 16GB RAM required sbg_comte_floating_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_comte_floating_ip type: string description: Moveable IP (VIP) for COM on the Internal network, IPv4. Don't deviate from default! constraints: @@ -223,6 +463,14 @@ topology_template: charging_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: charging_net_id type: string description: the UUID of the operator-created Charging network constraints: @@ -230,6 +478,14 @@ topology_template: sbg_UCOM_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_UCOM_ips type: list description: comma delimited list of IPv4 IPs to be used on UC One Mobile network entry_schema: @@ -237,6 +493,14 @@ topology_template: sbg_avpn_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_avpn_ips type: list description: | comma delimited list of IPv4 IPs to be used on AVPN networks. n*2 IP address expected where n is the number of PL VM pairs. The first two addresses are assigned to the first PL VM pair, second two IPs to the second PL VM pair, and so on. Note: this is true regardless of the number of AVPN networks and sbg_AVPN_count. @@ -245,6 +509,14 @@ topology_template: sbg_sc_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_sc_names type: list description: comma delimited list of VM names assigned to System Controller VMs entry_schema: @@ -252,11 +524,27 @@ topology_template: vnf_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: vnf_id type: string description: Unique ID for this VF instance avpn_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: avpn_net_id type: list description: comma delimited list of the UUIDs of the operator-created AVPN networks entry_schema: @@ -264,21 +552,53 @@ topology_template: sbg_pl_image_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_pl_image_name type: string description: the name of the Glance PXE boot image for PL VMs availability_zone_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: availability_zone_0 type: string description: First availability zone ID or Name. availability_zone_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: availability_zone_1 type: string description: Second availability zone ID or Name. UCOM_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: UCOM_net_id type: string description: the UUID of the operator-created UC One Mobile network constraints: @@ -286,6 +606,14 @@ topology_template: sbg_UCOM_vlan_tag: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_UCOM_vlan_tag type: float description: The internal VLAN TAG for UC One Mobile network constraints: @@ -295,6 +623,14 @@ topology_template: sbg_management_floating_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_management_floating_ip type: string description: Moveable Management IP (VIP), IPv4 constraints: @@ -302,6 +638,14 @@ topology_template: dummy_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: dummy_net_id type: string description: the UUID of the operator-created Dummy network constraints: @@ -309,6 +653,14 @@ topology_template: sbg_core_v6_IPs: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_core_v6_IPs type: list description: comma delimited list of IPv6 IPs to be used on Core network entry_schema: @@ -316,6 +668,14 @@ topology_template: sbg_AVPN_vlan_tag_list: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_AVPN_vlan_tag_list type: list description: comma delimited list of internal VLAN TAG(s) used by AVPN networks entry_schema: @@ -323,6 +683,14 @@ topology_template: sbg_pl_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_pl_names type: list description: comma delimited list of VM names assigned to Payload VMs entry_schema: @@ -330,6 +698,14 @@ topology_template: sbg_management_gateway_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_management_gateway_ip_0 type: string description: IPv4 IP address of the default gateway on Management network constraints: @@ -337,6 +713,14 @@ topology_template: sbg_AVPN_count: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_AVPN_count type: float description: The number of AVPN networks constraints: @@ -346,6 +730,14 @@ topology_template: sbg_charging_vlan_tag: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_charging_vlan_tag type: float description: The internal VLAN TAG for Charging network constraints: @@ -355,11 +747,27 @@ topology_template: sbg_timezone: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_timezone type: string description: Timezone. ntp_servers: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: ntp_servers type: list description: comma delimited list of NTP servers required by System Controller VMs. Exactly 2 IPv4 values are required entry_schema: @@ -367,6 +775,14 @@ topology_template: sbg_management_mac_addresses: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_management_mac_addresses type: list description: comma delimited list of MAC addresses for the VMs on the Management network entry_schema: @@ -374,6 +790,14 @@ topology_template: core_subnet_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: core_subnet_id type: string description: the UUID of the operator-created Core subnet, IPv4 constraints: @@ -381,6 +805,14 @@ topology_template: sbg_access_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_access_ips type: list description: comma delimited list of IPv4 IPs to be used on Access network entry_schema: @@ -388,6 +820,14 @@ topology_template: sbg_sc_volume_id_3: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_sc_volume_id_3 type: string description: the UUID of the pre-created Cinder volume attached to SC-2 as tools volume constraints: @@ -395,6 +835,14 @@ topology_template: sbg_boot_floating_ip: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_boot_floating_ip type: string description: Moveable IP (VIP) for TFTP server on the Internal network, IPv4. Don't deviate from default! constraints: @@ -402,6 +850,14 @@ topology_template: sbg_sc_volume_id_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_sc_volume_id_0 type: string description: the UUID of the pre-created Cinder volume attached to SC-1 as root volume constraints: @@ -409,11 +865,27 @@ topology_template: sbg_pl_flavor_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_pl_flavor_name type: string description: Flavor to use for PL VM. Minimum 8 non-HT vCPU and 64GB RAM required sbg_sc_volume_id_2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_sc_volume_id_2 type: string description: the UUID of the pre-created Cinder volume attached to SC-2 as root volume constraints: @@ -421,6 +893,14 @@ topology_template: sbg_sc_volume_id_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: sbg_sc_volume_id_1 type: string description: the UUID of the pre-created Cinder volume attached to SC-1 as tools volume constraints: @@ -428,6 +908,14 @@ topology_template: dummy_subnet_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - DPA3_New_VNF_TSBGv_base + source_type: HEAT + param_name: dummy_subnet_id type: string description: the UUID of the operator-created dummy subnet, IPv4 constraints: @@ -599,4 +1087,4 @@ topology_template: - sbg_pl_trunk_subport_avpn_group_0 - sbg_pl_trunk_1_port_0 - sbg_pl_internal_0_port_0 - - abstract_sbg_sc \ No newline at end of file + - abstract_sbg_sc diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml index 2921549e6b..beda5a1750 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml @@ -12,44 +12,116 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance availabilityzone_name: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name ppds_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ppds_net_name type: string a_single_1a_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: a_single_1a_names type: string pcm_server_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pcm_server_names type: string pcm_image_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pcm_image_name type: string pd_image_name: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name security_group_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: security_group_name type: string pd_server_names: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance entry_schema: @@ -57,30 +129,86 @@ topology_template: 1c2_catalog_instance_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: 1c2_catalog_instance_names type: string pcm_flavor_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pcm_flavor_name type: string b_single_1b_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: b_single_1b_names type: string 1c1_scalling_instance_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: 1c1_scalling_instance_names type: string myIPs: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: myIPs type: string net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: net_name type: string oam_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_name type: string node_templates: abstract_b_single_1b: @@ -1032,4 +1160,4 @@ topology_template: name: def affinity: host targets: - - BE_Affinity_group \ No newline at end of file + - BE_Affinity_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml index 14cf9ceae0..2b1e9618f8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml @@ -12,44 +12,116 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance availabilityzone_name: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name ppds_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ppds_net_name type: string a_single_1a_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: a_single_1a_names type: string pcm_server_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pcm_server_names type: string pcm_image_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pcm_image_name type: string pd_image_name: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name security_group_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: security_group_name type: string pd_server_names: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance entry_schema: @@ -57,30 +129,86 @@ topology_template: 1c2_catalog_instance_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: 1c2_catalog_instance_names type: string pcm_flavor_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pcm_flavor_name type: string b_single_1b_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: b_single_1b_names type: string 1c1_scalling_instance_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: 1c1_scalling_instance_names type: string myIPs: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: myIPs type: string net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: net_name type: string oam_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_name type: string node_templates: nestedNoNestedSingleComputePattern: @@ -873,4 +1001,4 @@ topology_template: name: def affinity: host targets: - - BE_Affinity_group \ No newline at end of file + - BE_Affinity_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml index e4577fe60e..05ad6b129c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml @@ -12,44 +12,116 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance availabilityzone_name: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name ppds_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ppds_net_name type: string a_single_1a_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: a_single_1a_names type: string pcm_server_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pcm_server_names type: string pcm_image_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pcm_image_name type: string pd_image_name: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name security_group_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: security_group_name type: string pd_server_names: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance entry_schema: @@ -57,30 +129,86 @@ topology_template: 1c2_catalog_instance_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: 1c2_catalog_instance_names type: string pcm_flavor_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pcm_flavor_name type: string b_single_1b_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: b_single_1b_names type: string 1c1_scalling_instance_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: 1c1_scalling_instance_names type: string myIPs: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: myIPs type: string net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: net_name type: string oam_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_name type: string node_templates: abstract_b_single_1b: @@ -844,4 +972,4 @@ topology_template: name: def affinity: host targets: - - BE_Affinity_group \ No newline at end of file + - BE_Affinity_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml index 4c55b814b8..f8806cfb44 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml @@ -12,52 +12,140 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance availabilityzone_name: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name ppds_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ppds_net_name type: string a_single_1a_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: a_single_1a_names type: string a_single_2a_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: a_single_2a_names type: string 2c2_catalog_instance_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: 2c2_catalog_instance_names type: string pcm_server_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pcm_server_names type: string pcm_image_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pcm_image_name type: string pd_image_name: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name security_group_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: security_group_name type: string pd_server_names: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance entry_schema: @@ -65,38 +153,110 @@ topology_template: 1c2_catalog_instance_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: 1c2_catalog_instance_names type: string pcm_flavor_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pcm_flavor_name type: string b_single_1b_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: b_single_1b_names type: string 1c12_scalling_instance_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: 1c12_scalling_instance_names type: string b_single_2b_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: b_single_2b_names type: string myIPs: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: myIPs type: string net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: net_name type: string 1c11_scalling_instance_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: 1c11_scalling_instance_names type: string oam_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_name type: string node_templates: abstract_b_single_1b: @@ -1950,4 +2110,4 @@ topology_template: name: def affinity: host targets: - - BE_Affinity_group \ No newline at end of file + - BE_Affinity_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml index 43aeb451a9..209135c25a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml @@ -11,16 +11,40 @@ topology_template: ps_server_main_1b_image: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: ps_server_main_1b_image type: string description: Ps Image server 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: security_group_name cmaui_1c1_main_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: cmaui_1c1_main_names type: list description: CMAUI1, CMAUI2 server names entry_schema: @@ -28,30 +52,78 @@ topology_template: contrail_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: contrail_net_name type: string description: network name of contrail v2 network ps_server_main_1b_flavor: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: ps_server_main_1b_flavor type: string description: Flavor for PS server ps_server_main_1b_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: ps_server_main_1b_ips type: string jsa_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_net_name type: string description: network name of jsa network jsa_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_name type: string description: network name of jsa log network pd_server_main_1b_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: pd_server_main_1b_names type: list description: PD server names entry_schema: @@ -59,21 +131,53 @@ topology_template: cmaui_1c1_main_flavor: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: cmaui_1c1_main_flavor type: string description: Flavor for CMAUI server pd_server_main_1b_flavor: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: pd_server_main_1b_flavor type: string description: Flavor for PD server cmaui_1c1_main_image: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: cmaui_1c1_main_image type: string description: Image for CMAUI server ps_server_main_1b_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: ps_server_main_1b_names type: list description: Ps server names entry_schema: @@ -82,20 +186,52 @@ topology_template: 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: 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: string pd_server_main_1b_image: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: pd_server_main_1b_image type: string description: PD Image server pd_server_main_1b_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: pd_server_main_1b_ips type: string node_templates: abstract_pd_server_main_1b_1: @@ -294,4 +430,4 @@ topology_template: - test_nested_pattern_4_main_0 - abstract_pd_server_main_1b_1 - abstract_ps_server_main_1b_1 - - abstract_cmaui_1c1_main_1 \ No newline at end of file + - abstract_cmaui_1c1_main_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/MainServiceTemplate.yaml index 6926f33ace..9ff8c4ea56 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/MainServiceTemplate.yaml @@ -11,21 +11,53 @@ topology_template: 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: security_group_name contrail_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: contrail_net_name type: string description: network name of contrail v2 network jsa_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_net_name type: string description: network name of jsa network jsa_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_name type: string description: network name of jsa log network node_templates: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/MainServiceTemplate.yaml index e53177de56..8fdf0c1e04 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/MainServiceTemplate.yaml @@ -12,34 +12,82 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance p1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: p1 type: string description: UID of OAM network availabilityzone_name: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name 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: network name of jsa log network pd_image_name: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: pd_image_name type: string description: PD image name pd_server_names: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance entry_schema: @@ -47,11 +95,27 @@ topology_template: 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: net name jsa_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_name type: string description: network name of jsa log network node_templates: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/MainServiceTemplate.yaml index 2c7daf72af..9914f9b938 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/MainServiceTemplate.yaml @@ -12,34 +12,82 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance p1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: p1 type: string description: UID of OAM network availabilityzone_name: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name 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: network name of jsa log network pd_image_name: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: pd_image_name type: string description: PD image name pd_server_names: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance entry_schema: @@ -47,11 +95,27 @@ topology_template: 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: net name jsa_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_name type: string description: network name of jsa log network node_templates: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml index 16ea9d76c1..16e7d2c267 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml @@ -11,21 +11,53 @@ topology_template: p1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: p1 type: string description: UID of osm network p2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: p2 type: string description: UID of osm network rd_server_1b_flavor: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: rd_server_1b_flavor type: string description: Flavor for PD server BE_1c1_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: BE_1c1_names type: list description: BE1, BE2 server names entry_schema: @@ -33,14 +65,38 @@ topology_template: ps_server_1b_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: ps_server_1b_ips type: string packet_internal_network_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: packet_internal_network_name type: string security_group_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: security_group_name type: list description: BE1, BE2 server names entry_schema: @@ -48,6 +104,14 @@ topology_template: osm_server_1c2_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: osm_server_1c2_names type: list description: BE1, BE2 server names entry_schema: @@ -55,15 +119,39 @@ topology_template: osm_server_1c2_flavor: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: osm_server_1c2_flavor type: string description: Flavor for BE server rd_server_1b_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: rd_server_1b_ips type: string ps_server_1b_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: ps_server_1b_names type: list description: Ps server names entry_schema: @@ -71,6 +159,14 @@ topology_template: rd_server_1b_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: rd_server_1b_names type: list description: PD server names entry_schema: @@ -78,54 +174,142 @@ topology_template: jsa_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_name type: string description: network name of jsa log network osm_server_1c2_image: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: osm_server_1c2_image type: string description: Image for BE server BE_osm_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: BE_osm_ips type: string packet_external_network_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: packet_external_network_name type: string BE_1c1_image: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: BE_1c1_image type: string description: Image for BE server availability_zone_0: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: availability_zone_0 type: string description: availabilityzone name rd_server_1b_image: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: rd_server_1b_image type: string description: PD Image server ps_server_1b_flavor: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: ps_server_1b_flavor type: string description: Flavor for PS server ps_server_1b_image: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: ps_server_1b_image type: string description: Ps Image server net: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: net type: string BE_1c1_flavor: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: BE_1c1_flavor type: string description: Flavor for BE server node_templates: @@ -512,4 +696,4 @@ topology_template: value: get_attribute: - abstract_osm_server_1c2_1 - - osm_server_1c2_accessIPv4 \ No newline at end of file + - osm_server_1c2_accessIPv4 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/MainServiceTemplate.yaml index 8db4155247..e7e53e33ad 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/MainServiceTemplate.yaml @@ -11,6 +11,14 @@ topology_template: jsa_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_name type: string description: network name of jsa log network node_templates: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/MainServiceTemplate.yaml index 1926fafee1..edb739aa61 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/MainServiceTemplate.yaml @@ -11,6 +11,14 @@ topology_template: jsa_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_name type: string description: network name of jsa log network node_templates: @@ -98,4 +106,4 @@ topology_template: - dependsOn_network - test_nested_pattern_4 - test_nested_no_compute - - test_nested_all_patterns \ No newline at end of file + - test_nested_all_patterns diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/MainServiceTemplate.yaml index f2c32347e0..c5e45d63ac 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/MainServiceTemplate.yaml @@ -11,6 +11,14 @@ topology_template: jsa_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_name type: string description: network name of jsa log network node_templates: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/MainServiceTemplate.yaml index ddf4044b17..71b749c66b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/MainServiceTemplate.yaml @@ -11,6 +11,14 @@ topology_template: jsa_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_name type: string description: network name of jsa log network node_templates: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/MainServiceTemplate.yaml index aabe7d7229..1cd4986a35 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/MainServiceTemplate.yaml @@ -11,6 +11,14 @@ topology_template: jsa_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_name type: string description: network name of jsa log network node_templates: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/MainServiceTemplate.yaml index 6ab38e9cdd..991c837d3c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/MainServiceTemplate.yaml @@ -11,11 +11,27 @@ topology_template: 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: network name of jsa log network jsa_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_name type: string description: network name of jsa log network node_templates: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/MainServiceTemplate.yaml index 2548fb9b30..fbbfe767d7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/MainServiceTemplate.yaml @@ -11,26 +11,66 @@ topology_template: same_file_param_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: same_file_param_1 type: string description: network name of jsa log network same_file_param_2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: same_file_param_2 type: string description: network name of jsa log network same_file_param_3: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: same_file_param_3 type: string description: network name of jsa log network diff_file_param_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: diff_file_param_1 type: string description: network name of jsa log network jsa_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_name type: string description: network name of jsa log network node_templates: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/MainServiceTemplate.yaml index f5b820a913..0c7dc7ba78 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/MainServiceTemplate.yaml @@ -11,11 +11,27 @@ topology_template: 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: security_group_name jsa_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_name type: string description: network name of jsa log network node_templates: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml index d2af2b96c2..7c8b9dcb3b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ 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 + source_type: HEAT + param_name: pcm_flavor_name type: string description: flavor name of PCRF CM instance default: cps @@ -19,6 +27,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 @@ -26,12 +42,28 @@ 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 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 + source_type: HEAT + param_name: pcm_server_names type: list description: name of the PCRF CM instance default: @@ -42,16 +74,40 @@ 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 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 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 node_templates: server_pcm_002: @@ -193,4 +249,4 @@ topology_template: - server_pcm_002 - server_pcm_001 - compute_port_0 - - abstract_compute \ No newline at end of file + - abstract_compute diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml index df0d79f0a8..1b4baf5024 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml @@ -11,34 +11,82 @@ topology_template: cif_internal_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cif_internal_ip_0 type: string description: Internal IP of CIF01 instance default: 192.168.210.1 vcscf_release: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: vcscf_release type: string description: IMS release default: '17.0' cif_name_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cif_name_1 type: string description: CIF02 instance name cif_name_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cif_name_0 type: string description: CIF01 instance name cif_internal_ip_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cif_internal_ip_1 type: string description: Internal IP of CIF02 instance default: 192.168.210.2 tdcore_zone_0_count: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: tdcore_zone_0_count type: float description: | Number of TD Core VMs to be deployed zone 0. This parameter is used to scale the TD Core instances. @@ -50,17 +98,41 @@ topology_template: lbd_internal_dpdk_vip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: lbd_internal_dpdk_vip_0 type: string description: Internal DPDK CIP IP of LBD default: 192.168.211.181 lbd_ims_core_v6_vip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: lbd_ims_core_v6_vip_0 type: string description: IMS CORE CIPA v6 IP of LBD cscf_zone_1_count: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cscf_zone_1_count type: float description: | Number of CSCF to be deployed on zone 1. This parameter is used to scale the cscf instances. @@ -72,39 +144,95 @@ topology_template: oam_internal_vip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: oam_internal_vip_0 type: string description: Internal CIPA IP of OAM unit default: 192.168.210.3 cscf_image_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cscf_image_name type: string description: CSCF server VM image name default: IMS_17_0_OPENSTACK_CSCF_1701400.000 cif_internal_vip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cif_internal_vip_0 type: string description: Internal CIPA IP of CIF default: 192.168.210.150 cif_ims_core_v6_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cif_ims_core_v6_ip_0 type: string description: IMS CORE v6 IP of CIF01 instance cif_ims_core_v6_ip_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cif_ims_core_v6_ip_1 type: string description: IMS CORE v6 IP of CIF02 instance oam_volume_id_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: oam_volume_id_1 type: string description: size of the cinder volume used for oam oam_volume_size_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf_volume + source_type: HEAT + param_name: oam_volume_size_0 type: float description: Size of Volume for oam VMs default: 300 @@ -115,16 +243,40 @@ topology_template: oam_volume_id_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: oam_volume_id_0 type: string description: size of the cinder volume used for oam vcscf_oam_netmask: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: vcscf_oam_netmask type: string description: Netmask for OAM LAN tdcore_zone_1_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: tdcore_zone_1_names type: list description: List of instance names for TDCORE instances on zone 1 entry_schema: @@ -132,44 +284,108 @@ topology_template: cif_flavor_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cif_flavor_name type: string description: CSCF CIF VM flavor default: ND.c4r16d38 vcscf_dns_address: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: vcscf_dns_address type: string description: DNS server IP vcscf_internal_network_cidr: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: vcscf_internal_network_cidr type: string description: CIDR for for Internal LAN default: 192.168.210.0/24 cdi_ims_core_v6_ip_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cdi_ims_core_v6_ip_1 type: string description: IMS CORE LAN v6 IP of CDI02 instance cdi_ims_core_v6_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cdi_ims_core_v6_ip_0 type: string description: IMS CORE LAN v6 IP of CDI01 instance cdi_flavor_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cdi_flavor_name type: string description: CDI VM flavor default: ND.c4r8d38 vcscf_default_gateway: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: vcscf_default_gateway type: string description: Default gateway for OAM LAN tdcore_zone_0_uuids: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: tdcore_zone_0_uuids type: list description: List of UUIDs generated by cmrepo for TDCORE instances on zone 0 entry_schema: @@ -177,21 +393,53 @@ topology_template: oam_name_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: oam_name_1 type: string description: OAM02 instance name oam_name_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: oam_name_0 type: string description: OAM01 instance name oam_name_2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: oam_name_2 type: string description: OAM03 instance name cscf_zone_1_uuids: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cscf_zone_1_uuids type: list description: List of UUIDs generated by cmrepo for CSCF instances on zone 1 entry_schema: @@ -199,16 +447,40 @@ topology_template: vf_module_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: vf_module_id type: string description: Unique ID for this VF Module instance oam_oam_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: oam_oam_ip_0 type: string description: OAM IP of OAM01 instance cscf_internal_zone_1_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cscf_internal_zone_1_ips type: list description: List of Internal Lan IPs for CSCF instances on zone 1 default: @@ -235,32 +507,81 @@ topology_template: cif_ims_li_v6_vip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cif_ims_li_v6_vip_0 type: string description: IMS LI CIPA v6 IP of CIF oam_oam_ip_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: oam_oam_ip_1 type: string description: OAM IP of OAM02 instance oam_oam_ip_2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: oam_oam_ip_2 type: string description: OAM IP of OAM03 instance vnf_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf_volume + - base_cscf + source_type: HEAT + param_name: vnf_name type: string description: Unique name for this VF instance lbd_flavor_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: lbd_flavor_name type: string description: CSCF LBD VM flavor default: ND.c4r16d38 cscf_zone_0_uuids: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cscf_zone_0_uuids type: list description: List of UUIDs generated by cmrepo for CSCF instances on zone 0 entry_schema: @@ -268,17 +589,41 @@ topology_template: vf_module_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: vf_module_name type: string description: Unique name for this VF Module instance cdi_internal_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cdi_internal_ip_0 type: string description: Internal IP of CDI01 instance default: 192.168.210.139 cscf_zone_0_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cscf_zone_0_names type: list description: List of instance names for CSCF instances on zone 0 entry_schema: @@ -286,75 +631,189 @@ topology_template: oam_oam_vip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: oam_oam_vip_0 type: string description: OAM CIPA IP of OAM unit vcscf_swrepo_address: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: vcscf_swrepo_address type: string description: SWRepo IP or FQDN cdi_internal_ip_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cdi_internal_ip_1 type: string description: Internal IP of CDI02 instance default: 192.168.210.140 cdi_name_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cdi_name_1 type: string description: CDI02 instance name availability_zone_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf_volume + - base_cscf + source_type: HEAT + param_name: availability_zone_0 type: string description: Storage availability zone for volume of first vm availability_zone_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf_volume + - base_cscf + source_type: HEAT + param_name: availability_zone_1 type: string description: Storage availability zone for volume of second vm tdcore_image_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: tdcore_image_name type: string description: TDCORE VM image name default: IMS_17_0_OPENSTACK_CSCF_1701400.000 tdcore_flavor_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: tdcore_flavor_name type: string description: TDCORE VM flavor default: ND.c4r16d38 cscf_flavor_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cscf_flavor_name type: string description: CSCF server VM flavor default: ND.c8r16d38 vcscf_cmrepo_address: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: vcscf_cmrepo_address type: string description: CMRepo IP or FQDN cdi_name_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cdi_name_0 type: string description: CDI01 instance name lbd_ims_core_v6_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: lbd_ims_core_v6_ip_0 type: string description: IMS CORE v6 IP of LBD01 instance lbd_ims_core_v6_ip_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: lbd_ims_core_v6_ip_1 type: string description: IMS CORE v6 IP of LBD02 instance tdcore_internal_zone_1_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: tdcore_internal_zone_1_ips type: list description: List of Internal Lan IPs for TDCORE instances on zone 1 default: @@ -367,17 +826,41 @@ topology_template: oam_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: oam_net_id type: string description: Name/UUID of OAM network cdi_internal_v6_vip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cdi_internal_v6_vip_0 type: string description: Internal v6 CIPA IP of CDI default: 2a00:9a00:a000:1190:0:1:1:2b8d tdcore_dpdk_zone_1_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: tdcore_dpdk_zone_1_ips type: list description: List of DPDK Lan IPs for TDCORE instances on zone 1 default: @@ -390,18 +873,42 @@ topology_template: oam_internal_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: oam_internal_ip_0 type: string description: Internal IP of OAM01 instance default: 192.168.210.136 oam_internal_ip_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: oam_internal_ip_1 type: string description: Internal IP of OAM01 instance default: 192.168.210.137 cscf_zone_0_count: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cscf_zone_0_count type: float description: | Number of CSCF to be deployed on zone 0. This parameter is used to scale the cscf instances. @@ -413,12 +920,28 @@ topology_template: oam_internal_ip_2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: oam_internal_ip_2 type: string description: Internal IP of OAM01 instance default: 192.168.210.138 cscf_zone_1_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cscf_zone_1_names type: list description: List of instance names for CSCF instances on zone 1 entry_schema: @@ -426,6 +949,14 @@ topology_template: tdcore_zone_0_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: tdcore_zone_0_names type: list description: List of instance names for TDCORE instances on zone 0 entry_schema: @@ -433,55 +964,135 @@ topology_template: lbd_uuid_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: lbd_uuid_0 type: string description: UUID generated by cmrepo for LBD01 lbd_uuid_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: lbd_uuid_1 type: string description: UUID generated by cmrepo for LBD02 cdi_internal_v6_ip_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cdi_internal_v6_ip_1 type: string description: Internal v6 IP of CDI02 instance default: 2a00:9a00:a000:1190:0:1:1:2b8c cdi_internal_v6_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cdi_internal_v6_ip_0 type: string description: Internal v6 IP of CDI01 instance default: 2a00:9a00:a000:1190:0:1:1:2b8b cdi_uuid_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cdi_uuid_1 type: string description: UUID generated by cmrepo for CDI02 ims_core_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: ims_core_net_id type: string description: Name/UUID of Core network cdi_uuid_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cdi_uuid_0 type: string description: UUID generated by cmrepo for CDI01 vcscf_internal_network_v6_cidr: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: vcscf_internal_network_v6_cidr type: string description: CIDR for for Internal LAN v6 default: 2a00:9a00:a000:1190:0:1:1:2b00/120 oam_image_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: oam_image_name type: string description: OAM VM image name default: IMS_17_0_OPENSTACK_OAM_1701400.000 tdcore_zone_1_uuids: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: tdcore_zone_1_uuids type: list description: List of UUIDs generated by cmrepo for TDCORE instances on zone 1 entry_schema: @@ -489,6 +1100,14 @@ topology_template: vcscf_internal_network_mtu: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: vcscf_internal_network_mtu type: float description: MTU for internal network interface (eth0) default: 1500 @@ -499,12 +1118,28 @@ topology_template: vcscf_internal_dpdk_network_cidr: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: vcscf_internal_dpdk_network_cidr type: string description: CIDR for for Internal LAN DPDK default: 192.168.211.0/24 tdcore_zone_1_count: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: tdcore_zone_1_count type: float description: | Number of TD Core VMs to be deployed zone 1. This parameter is used to scale the TD Core instances. @@ -516,6 +1151,14 @@ topology_template: cif_volume_size_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf_volume + source_type: HEAT + param_name: cif_volume_size_0 type: float description: Size of Volume for cif VMs default: 300 @@ -526,71 +1169,175 @@ topology_template: oam_flavor_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: oam_flavor_name type: string description: OAM VM flavor default: ND.c4r32d30 ims_li_v6_net_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: ims_li_v6_net_id type: string description: Name/UUID of V6 LI network lbd_internal_dpdk_ip_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: lbd_internal_dpdk_ip_1 type: string description: Internal DPDK IP of LBD02 instance default: 192.168.211.2 cif_ims_core_v6_vip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cif_ims_core_v6_vip_0 type: string description: IMS CORE v6 CIPA IP of CIF lbd_internal_dpdk_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: lbd_internal_dpdk_ip_0 type: string description: Internal DPDK IP of LBD01 instance default: 192.168.211.1 cdi_image_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cdi_image_name type: string description: CDI VM image name default: IMS_17_0_OPENSTACK_CSCF_1701400.000 oam_uuid_2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: oam_uuid_2 type: string description: UUID generated by cmrepo for OAM03 oam_uuid_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: oam_uuid_1 type: string description: UUID generated by cmrepo for OAM02 oam_uuid_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: oam_uuid_0 type: string description: UUID generated by cmrepo for OAM01 cif_oam_vip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cif_oam_vip_0 type: string description: OAM CIPA IP of CIF cif_internal_v6_ip_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cif_internal_v6_ip_1 type: string description: Internal IP v6 of CIF02 instance default: 2a00:9a00:a000:1190:0:1:1:2b05 vnf_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: vnf_id type: string description: Unique ID for this VF instance cscf_internal_zone_0_v6_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cscf_internal_zone_0_v6_ips type: list description: List of Internal Lan v6 IPs for CSCF instances on zone 0 default: @@ -618,6 +1365,14 @@ topology_template: cscf_internal_zone_1_v6_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cscf_internal_zone_1_v6_ips type: list description: List of Internal Lan v6 IPs for CSCF instances on zone 1 default: @@ -644,55 +1399,135 @@ topology_template: cif_internal_v6_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cif_internal_v6_ip_0 type: string description: Internal IP v6 of CIF01 instance default: 2a00:9a00:a000:1190:0:1:1:2b04 lbd_internal_ip_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: lbd_internal_ip_1 type: string description: Internal IP of LBD02 instance default: 192.168.210.5 cif_oam_vip_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cif_oam_vip_1 type: string description: OAM (LI-X1) v4 CIPA of CIF lbd_internal_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: lbd_internal_ip_0 type: string description: Internal IP of LBD01 instance default: 192.168.210.4 cif_volume_id_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cif_volume_id_0 type: string description: size of the cinder volume used for cif cif_ims_li_v6_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cif_ims_li_v6_ip_0 type: string description: IMS LI v6 IP of CIF01 instance cif_volume_id_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cif_volume_id_1 type: string description: size of the cinder volume used for cif cif_ims_li_v6_ip_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cif_ims_li_v6_ip_1 type: string description: IMS LI v6 IP of CIF02 instance lbd_image_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: lbd_image_name type: string description: CSCF LBD VM image name default: IMS_17_0_OPENSTACK_CSCF_1701400.000 tdcore_dpdk_zone_0_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: tdcore_dpdk_zone_0_ips type: list description: List of DPDK Lan IPs for TDCORE instances on zone 0 default: @@ -705,33 +1540,82 @@ topology_template: cif_uuid_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cif_uuid_0 type: string description: UUID generated by cmrepo for CIF01 cif_uuid_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cif_uuid_1 type: string description: UUID generated by cmrepo for CIF02 cif_oam_ip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cif_oam_ip_0 type: string description: OAM IP of CIF01 instance cif_image_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cif_image_name type: string description: CSCF CIF VM image name default: IMS_17_0_OPENSTACK_CSCF_1701400.000 vcscf_internal_netmask: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: vcscf_internal_netmask type: string description: Netmask for Internal LAN default: 255.255.255.0 vcscf_name_delimeter: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf_volume + - base_cscf + source_type: HEAT + param_name: vcscf_name_delimeter type: string description: 'delimeter used in concatenating different words while naming (ex: "-","_",".",...)' @@ -745,36 +1629,92 @@ topology_template: cif_oam_ip_3: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cif_oam_ip_3 type: string description: OAM (LI-X1) v4 IP of CIF02 instance cif_oam_ip_2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cif_oam_ip_2 type: string description: OAM (LI-X1) v4 IP of CIF01 instance cif_oam_ip_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cif_oam_ip_1 type: string description: OAM IP of CIF02 instance cdi_ims_core_v6_vip_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cdi_ims_core_v6_vip_0 type: string description: IMS CORE LAN CIPA v6 IP of CDI vcscf_dn: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: vcscf_dn type: string description: DN name vcscf_du: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: vcscf_du type: string description: DU name cscf_internal_zone_0_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: cscf_internal_zone_0_ips type: list description: List of Internal Lan IPs for CSCF instances on zone 0 default: @@ -802,6 +1742,14 @@ topology_template: tdcore_internal_zone_0_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: tdcore_internal_zone_0_ips type: list description: List of Internal Lan IPs for TDCORE instances on zone 0 default: @@ -814,11 +1762,27 @@ topology_template: lbd_name_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: lbd_name_1 type: string description: LBD02 instance name lbd_name_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_cscf + source_type: HEAT + param_name: lbd_name_0 type: string description: LBD01 instance name node_templates: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml index c36094adeb..4c0ebb89b7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: Flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_7_vson_app + source_type: HEAT + param_name: vson_app_flavor_name type: string description: The ID or name of the flavor to boot onto. default: vson-app-flavor @@ -19,12 +27,28 @@ topology_template: label: vSON DBG Volume ID 0 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_5_vson_dbg + source_type: HEAT + param_name: vson_dbg_volume_id_0 type: string description: Volume ID of the vSON DBG server. vson_dbs_server_group_id: label: vSON DBS server group policy hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_6_vson_dbs + source_type: HEAT + param_name: vson_dbs_server_group_id type: string description: "Tells what policy should be applied to the ServerGroup. Affinity\ \ policy will force instances to share the same hypervisor. Anti-affinity\ @@ -34,6 +58,14 @@ topology_template: label: vSON MON volume name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_vson_mon_volume + source_type: HEAT + param_name: vson_mon_volume_name_0 type: string description: Volume name. default: vson_mon_volume_0 @@ -41,12 +73,28 @@ topology_template: label: vSON DBS volume name 0 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_6_vson_dbs_volume + source_type: HEAT + param_name: vson_dbs_volume_name_0 type: string description: First volume name. vson_dbs_volume_size_1: label: vSON DBS volume ID 1 size hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_6_vson_dbs_volume + source_type: HEAT + param_name: vson_dbs_volume_size_1 type: float description: Size of the second Cinder volume. Measured in gigabytes. default: 500 @@ -54,12 +102,28 @@ topology_template: label: vSON Mediator Volume ID 0 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_vson_mdr + source_type: HEAT + param_name: vson_mdr_volume_id_0 type: string description: Volume ID of the vSON Mediator server. vson_mgt_volume_name_0: label: vSON MGT volume name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_0_vson_mgt_volume + source_type: HEAT + param_name: vson_mgt_volume_name_0 type: string description: Volume name. default: vson_mgt_volume_0 @@ -67,12 +131,28 @@ topology_template: label: vSON DBS volume name 1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_6_vson_dbs_volume + source_type: HEAT + param_name: vson_dbs_volume_name_1 type: string description: Second volume name. vson_dbs_volume_size_0: label: vSON DBS volume ID 0 size hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_6_vson_dbs_volume + source_type: HEAT + param_name: vson_dbs_volume_size_0 type: float description: Size of the first Cinder volume. Measured in gigabytes. default: 500 @@ -80,12 +160,28 @@ topology_template: label: Flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_vson_mon + source_type: HEAT + param_name: vson_mon_flavor_name type: string description: The ID or name of the flavor to boot onto. vson_mon_volume_size_0: label: vSON MON cinder volume size hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_vson_mon_volume + source_type: HEAT + param_name: vson_mon_volume_size_0 type: float description: Size of the Cinder volume. Measured in gigabytes. default: 100 @@ -93,6 +189,14 @@ topology_template: label: vSON MON VM image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_vson_mon_volume + source_type: HEAT + param_name: vson_mon_image_name type: string description: Image name the volume will be created from. default: VSON-BASE-1.0 @@ -100,12 +204,38 @@ topology_template: label: OAM net subnet prefix length hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_0_vson_mgt + - module_1_vson_mon + - module_4_vson_dbc + - module_7_vson_app + - module_3_vson_cll + - module_2_vson_mdr + - module_9_vson_clm + - module_5_vson_dbg + - module_6_vson_dbs + - module_8_vson_dcl + - base_vson + source_type: HEAT + param_name: oam_net_subnet_prefix_length type: string description: OAM network subnet prefix length. swift_storage_url: label: swift storage URL hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vson + source_type: HEAT + param_name: swift_storage_url type: string description: | Swift storage URL. Example: http://172.16.209.246:8080/v1/AUTH_a4d426b5ef2e41408a8e6e6b9a8d3029 http://172.16.209.246:8080 - protocol, IP and port, v1 - API version AUTH_a4d426b5ef2e41408a8e6e6b9a8d3029 - account ID @@ -113,18 +243,52 @@ topology_template: label: vSON base VM image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_8_vson_dcl + source_type: HEAT + param_name: vson_dcl_image_name type: string description: VM Image name the vSON DC leader instance will be created from. vson_app_oam_net_v6_ip_0: label: vSON APP OAM network IPv6 address hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_7_vson_app + source_type: HEAT + param_name: vson_app_oam_net_v6_ip_0 type: string description: Fixed IPv6 assignment for the vSON APP instance on the OAM network. dns_servers: label: DNS servers hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_0_vson_mgt + - module_1_vson_mon + - module_4_vson_dbc + - module_7_vson_app + - module_3_vson_cll + - module_2_vson_mdr + - module_9_vson_clm + - module_5_vson_dbg + - module_6_vson_dbs + - module_8_vson_dcl + - base_vson + source_type: HEAT + param_name: dns_servers type: list description: List of DNS servers. entry_schema: @@ -133,6 +297,14 @@ topology_template: label: vSON APP cinder volume size hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_7_vson_app_volume + source_type: HEAT + param_name: vson_app_volume_size_0 type: float description: | Size of the Cinder volume. Measured in gigabytes. @@ -141,6 +313,23 @@ topology_template: label: OAM network security group ID hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_0_vson_mgt + - module_1_vson_mon + - module_4_vson_dbc + - module_7_vson_app + - module_3_vson_cll + - module_2_vson_mdr + - module_9_vson_clm + - module_5_vson_dbg + - module_6_vson_dbs + - module_8_vson_dcl + source_type: HEAT + param_name: oam_net_security_group_id type: string description: | The ID of Security group applied on the port bound to the vSON OAM network. @@ -148,6 +337,14 @@ topology_template: label: Flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_0_vson_mgt + source_type: HEAT + param_name: vson_mgt_flavor_name type: string description: The ID or name of the flavor to boot onto. default: vson-mgt-flavor @@ -155,6 +352,14 @@ topology_template: label: vSON MGT cinder volume size hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_0_vson_mgt_volume + source_type: HEAT + param_name: vson_mgt_volume_size_0 type: float description: Size of the Cinder volume. Measured in gigabytes. default: 100 @@ -162,24 +367,56 @@ topology_template: label: vSON DBS Volume ID 0 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_6_vson_dbs + source_type: HEAT + param_name: vson_dbs_volume_id_0 type: string description: Volume ID of the first vSON DBS server. vson_dbc_volume_id_0: label: vSON DBC Volume ID 0 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_4_vson_dbc + source_type: HEAT + param_name: vson_dbc_volume_id_0 type: string description: Volume ID of the vSON DBC server. vson_dbs_volume_id_1: label: vSON DBS Volume ID 1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_6_vson_dbs + source_type: HEAT + param_name: vson_dbs_volume_id_1 type: string description: Volume ID of the second vSON DBS server. vson_dbc_image_name: label: vSON base VM image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_4_vson_dbc + source_type: HEAT + param_name: vson_dbc_image_name type: string description: VM Image name the vSON DBC instance will be created from. default: VSON-BASE-1.0 @@ -187,6 +424,14 @@ topology_template: label: vSON Management VM image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_0_vson_mgt_volume + source_type: HEAT + param_name: vson_mgt_image_name type: string description: Image name the volume will be created from. default: VSON-BASE-1.0 @@ -194,12 +439,28 @@ topology_template: label: Default IPv6 gateway hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_7_vson_app + source_type: HEAT + param_name: default_gateway_v6 type: string description: Default IPv6 gateway. vson_mgt_server_group_id: label: vSON Management server group policy hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_0_vson_mgt + source_type: HEAT + param_name: vson_mgt_server_group_id type: string description: "Tells what policy should be applied to the ServerGroup. Affinity\ \ policy will force instances to share the same hypervisor. Anti-affinity\ @@ -209,12 +470,29 @@ topology_template: label: vSON Cluster Manager instance name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_9_vson_clm + - base_vson + source_type: HEAT + param_name: vson_clm_name_0 type: string description: Unique name to be issued to the vSON Cluster Manager instance. vson_dbc_server_group_policy: label: vSON Database server group policy hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vson + source_type: HEAT + param_name: vson_dbc_server_group_policy type: string description: | Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. The group intended for vSON Database instances. @@ -223,6 +501,14 @@ topology_template: label: vSON Cluster Management server group policy hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vson + source_type: HEAT + param_name: vson_clm_server_group_policy type: string description: | Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. The group intended for vSON Cluster Management instances. @@ -231,6 +517,14 @@ topology_template: label: vSON MON server group policy hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vson + source_type: HEAT + param_name: vson_mon_server_group_policy type: string description: | Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. The group intended for vSON MON instances. @@ -239,6 +533,14 @@ topology_template: label: vSON DBS server group policy hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_5_vson_dbg + source_type: HEAT + param_name: vson_dbg_server_group_id type: string description: "Tells what policy should be applied to the ServerGroup. Affinity\ \ policy will force instances to share the same hypervisor. Anti-affinity\ @@ -248,6 +550,14 @@ topology_template: label: vSON Cluster/DC leader server group policy hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vson + source_type: HEAT + param_name: vson_leader_server_group_policy type: string description: | Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. The group intended for vSON Cluster/DC leader instances. @@ -256,18 +566,42 @@ topology_template: label: vSON DC leader OAM network IP address 0 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_8_vson_dcl + source_type: HEAT + param_name: vson_dcl_oam_net_ip_0 type: string description: Fixed IP assignment for the first vSON DC leader instance on the OAM network. vson_cll_flavor_name: label: Flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_3_vson_cll + source_type: HEAT + param_name: vson_cll_flavor_name type: string description: The ID or name of the flavor to boot onto. vson_app_server_group_policy: label: vSON Application server group policy hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vson + source_type: HEAT + param_name: vson_app_server_group_policy type: string description: | Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. The group intended for vSON Application instances. @@ -276,18 +610,42 @@ topology_template: label: vSON DC leader OAM network IP address 1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_8_vson_dcl + source_type: HEAT + param_name: vson_dcl_oam_net_ip_1 type: string description: Fixed IP assignment for the second vSON DC leader instance on the OAM network. vson_dcl_oam_net_ip_2: label: vSON DC leader OAM network IP address 2 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_8_vson_dcl + source_type: HEAT + param_name: vson_dcl_oam_net_ip_2 type: string description: Fixed IP assignment for the third vSON DC leader instance on the OAM network. vson_dbg_volume_size_0: label: vSON DBG cinder volume size hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_5_vson_dbg_volume + source_type: HEAT + param_name: vson_dbg_volume_size_0 type: float description: | Size of the Cinder volume. Measured in gigabytes. @@ -296,30 +654,71 @@ topology_template: label: vSON Cluster leader OAM network IP address 0 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_3_vson_cll + source_type: HEAT + param_name: vson_cll_oam_net_ip_0 type: string description: Fixed IP assignment for the first vSON Cluster leader instance on the OAM network. vson_app_oam_net_ip_0: label: vSON APP OAM network IPv4 address hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_7_vson_app + source_type: HEAT + param_name: vson_app_oam_net_ip_0 type: string description: Fixed IPv4 assignment for the vSON APP instance on the OAM network. vson_cll_oam_net_ip_2: label: vSON Cluster leader OAM network IP address 2 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_3_vson_cll + source_type: HEAT + param_name: vson_cll_oam_net_ip_2 type: string description: Fixed IP assignment for the third vSON Cluster leader instance on the OAM network. vson_cll_oam_net_ip_1: label: vSON Cluster leader OAM network IP address 1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_3_vson_cll + source_type: HEAT + param_name: vson_cll_oam_net_ip_1 type: string description: Fixed IP assignment for the second vSON Cluster leader instance on the OAM network. vson_clm_oam_net_ip_0: label: vSON CLM OAM network IP address hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_9_vson_clm + - base_vson + source_type: HEAT + param_name: vson_clm_oam_net_ip_0 type: string description: Fixed IP assignment for the vSON CLM instance on the OAM network. default: 172.20.50.3 @@ -327,30 +726,108 @@ topology_template: label: VF module ID hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_0_vson_mgt + - module_1_vson_mon + - module_4_vson_dbc + - module_7_vson_app + - module_3_vson_cll + - module_2_vson_mdr + - module_9_vson_clm + - module_5_vson_dbg + - module_6_vson_dbs + - module_8_vson_dcl + - base_vson + source_type: HEAT + param_name: vf_module_id type: string description: Unique ID for this VF Module instance. vson_dbc_oam_net_ip_0: label: vSON DBC OAM network IP address hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_4_vson_dbc + source_type: HEAT + param_name: vson_dbc_oam_net_ip_0 type: string description: Fixed IP assignment for the vSON DBC instance on the OAM network. vson_dbg_oam_net_ip_0: label: vSON DBG OAM network IP address hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_5_vson_dbg + source_type: HEAT + param_name: vson_dbg_oam_net_ip_0 type: string description: Fixed IP assignment for the vSON DBG instance on the OAM network. vnf_name: label: VF name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_0_vson_mgt_volume + - module_0_vson_mgt + - module_1_vson_mon_volume + - module_1_vson_mon + - module_4_vson_dbc_volume + - module_4_vson_dbc + - module_7_vson_app_volume + - module_7_vson_app + - module_3_vson_cll_volume + - module_3_vson_cll + - module_2_vson_mdr_volume + - module_2_vson_mdr + - module_9_vson_clm + - module_5_vson_dbg_volume + - module_5_vson_dbg + - module_6_vson_dbs_volume + - module_6_vson_dbs + - module_8_vson_dcl_volume + - module_8_vson_dcl + - base_vson + source_type: HEAT + param_name: vnf_name type: string description: Unique name for this VF instance. number_of_servers: label: Number of Servers hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_0_vson_mgt + - module_1_vson_mon + - module_4_vson_dbc + - module_7_vson_app + - module_3_vson_cll + - module_2_vson_mdr + - module_9_vson_clm + - module_5_vson_dbg + - module_6_vson_dbs + - module_8_vson_dcl + source_type: HEAT + param_name: number_of_servers type: float description: Number of vSON Management servers. constraints: @@ -361,6 +838,14 @@ topology_template: label: vSON Management instance name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_0_vson_mgt + source_type: HEAT + param_name: vson_mgt_name_0 type: string description: Unique name to be issued to the vSON Management instance. default: vson-03.cisco.com @@ -368,6 +853,33 @@ topology_template: label: VF module name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_0_vson_mgt_volume + - module_0_vson_mgt + - module_1_vson_mon_volume + - module_1_vson_mon + - module_4_vson_dbc_volume + - module_4_vson_dbc + - module_7_vson_app_volume + - module_7_vson_app + - module_3_vson_cll_volume + - module_3_vson_cll + - module_2_vson_mdr_volume + - module_2_vson_mdr + - module_9_vson_clm + - module_5_vson_dbg_volume + - module_5_vson_dbg + - module_6_vson_dbs_volume + - module_6_vson_dbs + - module_8_vson_dcl_volume + - module_8_vson_dcl + - base_vson + source_type: HEAT + param_name: vf_module_name type: string description: Unique name for this VF module instance. default: module_0_vson_mgt_volume @@ -375,6 +887,15 @@ topology_template: label: Flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_9_vson_clm + - base_vson + source_type: HEAT + param_name: vson_clm_flavor_name type: string description: The ID or name of the flavor to boot onto. default: vson-clm-flavor @@ -382,6 +903,14 @@ topology_template: label: Flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_vson_mdr + source_type: HEAT + param_name: vson_mdr_flavor_name type: string description: The ID or name of the flavor to boot onto. default: vson-mdr-flavor @@ -389,24 +918,80 @@ topology_template: label: vSON MON Volume ID 0 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_vson_mon + source_type: HEAT + param_name: vson_mon_volume_id_0 type: string description: Volume ID of the vSON MON server. availability_zone_0: label: Availability zone 0 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_0_vson_mgt_volume + - module_0_vson_mgt + - module_1_vson_mon_volume + - module_1_vson_mon + - module_4_vson_dbc_volume + - module_4_vson_dbc + - module_7_vson_app_volume + - module_7_vson_app + - module_3_vson_cll_volume + - module_3_vson_cll + - module_2_vson_mdr_volume + - module_2_vson_mdr + - module_9_vson_clm + - module_5_vson_dbg_volume + - module_5_vson_dbg + - module_6_vson_dbs_volume + - module_6_vson_dbs + - module_8_vson_dcl_volume + - module_8_vson_dcl + - base_vson + source_type: HEAT + param_name: availability_zone_0 type: string description: Availability zone. availability_zone_1: label: Availability zone 1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_3_vson_cll_volume + - module_3_vson_cll + - module_6_vson_dbs_volume + - module_6_vson_dbs + - module_8_vson_dcl_volume + - module_8_vson_dcl + source_type: HEAT + param_name: availability_zone_1 type: string description: Second availability zone. vson_dbc_flavor_name: label: Flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_4_vson_dbc + source_type: HEAT + param_name: vson_dbc_flavor_name type: string description: The ID or name of the flavor to boot onto. default: vson-dbc-flavor @@ -414,48 +999,112 @@ topology_template: label: vSON DBC volume name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_4_vson_dbc_volume + source_type: HEAT + param_name: vson_dbc_volume_name_0 type: string description: Volume name. vson_mdr_image_name: label: vSON Mediator VM image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_vson_mdr_volume + source_type: HEAT + param_name: vson_mdr_image_name type: string description: Image name the volume will be created from. vson_cll_name_0: label: First vSON Cluster leader name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_3_vson_cll + source_type: HEAT + param_name: vson_cll_name_0 type: string description: Unique name to be issued to the first vSON Cluster leader. vson_cll_image_name: label: vSON base VM image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_3_vson_cll + source_type: HEAT + param_name: vson_cll_image_name type: string description: VM Image name the vSON Cluster leader instance will be created from. vson_cll_name_2: label: Third vSON Cluster leader name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_3_vson_cll + source_type: HEAT + param_name: vson_cll_name_2 type: string description: Unique name to be issued to the third vSON Cluster leader. vson_dbg_name_0: label: vSON DBG name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_5_vson_dbg + source_type: HEAT + param_name: vson_dbg_name_0 type: string description: Unique name to be issued to the vSON DBG server. vson_cll_name_1: label: Second vSON Cluster leader name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_3_vson_cll + source_type: HEAT + param_name: vson_cll_name_1 type: string description: Unique name to be issued to the second vSON Cluster leader. vson_dbs_server_group_policy: label: vSON Database server group policy hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vson + source_type: HEAT + param_name: vson_dbs_server_group_policy type: string description: | Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. The group intended for vSON DB Shard instances. @@ -464,6 +1113,18 @@ topology_template: label: vSON join cluster auth token hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_4_vson_dbc + - module_7_vson_app + - module_5_vson_dbg + - module_6_vson_dbs + - module_8_vson_dcl + source_type: HEAT + param_name: vson_join_cluster_auth_token type: string description: "Authentication Token generated for the user permitted to add \ \ a new vSON Datacenter. \n" @@ -471,42 +1132,117 @@ topology_template: label: First vSON DC leader name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_8_vson_dcl + source_type: HEAT + param_name: vson_dcl_name_0 type: string description: Unique name to be issued to the first vSON DC leader. vson_dcl_name_1: label: Second vSON DC leader name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_8_vson_dcl + source_type: HEAT + param_name: vson_dcl_name_1 type: string description: Unique name to be issued to the second vSON DC leader. vson_clm_0_oam_net_ip_0: label: vSON Cluster Manager 0 OAM net IP hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_0_vson_mgt + - module_1_vson_mon + - module_4_vson_dbc + - module_7_vson_app + - module_3_vson_cll + - module_2_vson_mdr + - module_9_vson_clm + - module_5_vson_dbg + - module_6_vson_dbs + - module_8_vson_dcl + source_type: HEAT + param_name: vson_clm_0_oam_net_ip_0 type: string description: IP of the first vSON Cluster Management server. vson_dcl_name_2: label: Third vSON DC leader name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_8_vson_dcl + source_type: HEAT + param_name: vson_dcl_name_2 type: string description: Unique name to be issued to the third vSON DC leader. oam_net_id: label: OAM network ID hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_0_vson_mgt + - module_1_vson_mon + - module_4_vson_dbc + - module_7_vson_app + - module_3_vson_cll + - module_2_vson_mdr + - module_9_vson_clm + - module_5_vson_dbg + - module_6_vson_dbs + - module_8_vson_dcl + - base_vson + source_type: HEAT + param_name: oam_net_id type: string description: The ID of the OAM network. vson_mon_oam_net_ip_0: label: vSON MON OAM network IP address hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_vson_mon + source_type: HEAT + param_name: vson_mon_oam_net_ip_0 type: string description: Fixed IP assignment for the vSON MON instance on the OAM network. vson_dbg_flavor_name: label: Flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_5_vson_dbg + source_type: HEAT + param_name: vson_dbg_flavor_name type: string description: The ID or name of the flavor to boot onto. default: vson-dbg-flavor @@ -514,6 +1250,15 @@ topology_template: label: vSON Cluster Manager VM image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_9_vson_clm + - base_vson + source_type: HEAT + param_name: vson_clm_image_name type: string description: Image name the volume will be created from. default: VSON-BASE-1.0 @@ -521,18 +1266,42 @@ topology_template: label: vSON DBC name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_4_vson_dbc + source_type: HEAT + param_name: vson_dbc_name_0 type: string description: Unique name to be issued to the vSON DBC server. vson_dbs_oam_net_ip_1: label: vSON DBS OAM network IP address 1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_6_vson_dbs + source_type: HEAT + param_name: vson_dbs_oam_net_ip_1 type: string description: Fixed IP assignment for the second vSON DBS instance on the OAM network. vson_dbg_image_name: label: vSON base VM image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_5_vson_dbg + source_type: HEAT + param_name: vson_dbg_image_name type: string description: VM Image name the vSON DBG instance will be created from. default: VSON-BASE-1.0 @@ -540,18 +1309,42 @@ topology_template: label: vSON MGT OAM network IP address hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_0_vson_mgt + source_type: HEAT + param_name: vson_mgt_oam_net_ip_0 type: string description: Fixed IP assignment for the vSON MGT instance on the OAM network. vson_dbs_oam_net_ip_0: label: vSON DBS OAM network IP address 0 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_6_vson_dbs + source_type: HEAT + param_name: vson_dbs_oam_net_ip_0 type: string description: Fixed IP assignment for the first vSON DBS instance on the OAM network. vson_cluster_name: label: vSON Cluster name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vson + source_type: HEAT + param_name: vson_cluster_name type: string description: Name of the vSON Cluster. constraints: @@ -561,6 +1354,14 @@ topology_template: label: Cinder volume ID 1 size hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_8_vson_dcl_volume + source_type: HEAT + param_name: vson_dcl_volume_size_1 type: float description: | Size of the second Cinder volume. Measured in gigabytes. @@ -569,6 +1370,14 @@ topology_template: label: Cinder volume ID 0 size hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_8_vson_dcl_volume + source_type: HEAT + param_name: vson_dcl_volume_size_0 type: float description: | Size of the first Cinder volume. Measured in gigabytes. @@ -577,6 +1386,14 @@ topology_template: label: Cinder volume ID 2 size hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_8_vson_dcl_volume + source_type: HEAT + param_name: vson_dcl_volume_size_2 type: float description: | Size of the third Cinder volume. Measured in gigabytes. @@ -585,18 +1402,42 @@ topology_template: label: First vSON DBS name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_6_vson_dbs + source_type: HEAT + param_name: vson_dbs_name_0 type: string description: Unique name to be issued to the first vSON DBS server. vson_dbs_name_1: label: Second vSON DBS name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_6_vson_dbs + source_type: HEAT + param_name: vson_dbs_name_1 type: string description: Unique name to be issued to the second vSON DBS server. vson_mdr_server_group_id: label: vSON Mediator server group policy hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_vson_mdr + source_type: HEAT + param_name: vson_mdr_server_group_id type: string description: "Tells what policy should be applied to the ServerGroup. Affinity\ \ policy will force instances to share the same hypervisor. Anti-affinity\ @@ -606,6 +1447,14 @@ topology_template: label: vSON DBS server group policy hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_4_vson_dbc + source_type: HEAT + param_name: vson_dbc_server_group_id type: string description: "Tells what policy should be applied to the ServerGroup. Affinity\ \ policy will force instances to share the same hypervisor. Anti-affinity\ @@ -615,6 +1464,14 @@ topology_template: label: Flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_6_vson_dbs + source_type: HEAT + param_name: vson_dbs_flavor_name type: string description: The ID or name of the flavor to boot onto. default: vson-dbs-flavor @@ -622,6 +1479,14 @@ topology_template: label: vSON Mediator server group policy hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vson + source_type: HEAT + param_name: vson_mdr_server_group_policy type: string description: | Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. The group intended for vSON Mediator instances. @@ -630,6 +1495,14 @@ topology_template: label: vSON DBC cinder volume size hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_4_vson_dbc_volume + source_type: HEAT + param_name: vson_dbc_volume_size_0 type: float description: Size of the Cinder volume. Measured in gigabytes. default: 50 @@ -637,6 +1510,14 @@ topology_template: label: vSON APP instance name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_7_vson_app + source_type: HEAT + param_name: vson_app_name_0 type: string description: Unique name to be issued to the vSON APP instance. default: vson-13.cisco.com @@ -644,6 +1525,24 @@ topology_template: label: Swift account auth token hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_0_vson_mgt + - module_1_vson_mon + - module_4_vson_dbc + - module_7_vson_app + - module_3_vson_cll + - module_2_vson_mdr + - module_9_vson_clm + - module_5_vson_dbg + - module_6_vson_dbs + - module_8_vson_dcl + - base_vson + source_type: HEAT + param_name: swift_account_auth_token type: string description: | Swift account auth token. Example: 041a5187bb4641f9b89583e2539776b0 @@ -651,12 +1550,29 @@ topology_template: label: vSON MDR OAM network IP address hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_vson_mdr + source_type: HEAT + param_name: vson_mdr_oam_net_ip_0 type: string description: Fixed IP assignment for the vSON MDR instance on the OAM network. vson_leader_server_group_id: label: vSON Cluster leader server group policy hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_3_vson_cll + - module_8_vson_dcl + source_type: HEAT + param_name: vson_leader_server_group_id type: string description: | Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. The group intended for vSON Cluster leaders. @@ -664,6 +1580,14 @@ topology_template: label: vSON Cluster Manager server group policy hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_9_vson_clm + source_type: HEAT + param_name: vson_clm_server_group_id type: string description: "Tells what policy should be applied to the ServerGroup. Affinity\ \ policy will force instances to share the same hypervisor. Anti-affinity\ @@ -673,6 +1597,14 @@ topology_template: label: vSON APP server group policy hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_7_vson_app + source_type: HEAT + param_name: vson_app_server_group_id type: string description: | Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. The group intended for vSON APP instances. @@ -680,6 +1612,14 @@ topology_template: label: vSON master CLM IP hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vson + source_type: HEAT + param_name: vson_master_clm_ip type: string description: "Master CLM IP. If the vSON Cluster belongs to a single OpenStack\ \ tenant, the value SHOULD BE EMPTY. In case the vSON Cluster is distributed\ @@ -691,12 +1631,28 @@ topology_template: label: vSON DC Leader Volume ID 2 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_8_vson_dcl + source_type: HEAT + param_name: vson_dcl_volume_id_2 type: string description: Volume ID of the third vSON DC leader. vson_mgt_server_group_policy: label: vSON Management server group policy hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vson + source_type: HEAT + param_name: vson_mgt_server_group_policy type: string description: | Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. The group intended for vSON Management instances. @@ -705,18 +1661,42 @@ topology_template: label: vSON DC Leader Volume ID 1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_8_vson_dcl + source_type: HEAT + param_name: vson_dcl_volume_id_1 type: string description: Volume ID of the second vSON DC leader. vson_dcl_volume_id_0: label: vSON DC Leader Volume ID 0 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_8_vson_dcl + source_type: HEAT + param_name: vson_dcl_volume_id_0 type: string description: Volume ID of the first vSON DC leader. vson_dbs_image_name: label: vSON base VM image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_6_vson_dbs + source_type: HEAT + param_name: vson_dbs_image_name type: string description: VM Image name the vSON DBS instance will be created from. default: VSON-BASE-1.0 @@ -724,6 +1704,14 @@ topology_template: label: vSON MON server group policy hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_vson_mon + source_type: HEAT + param_name: vson_mon_server_group_id type: string description: "Tells what policy should be applied to the ServerGroup. Affinity\ \ policy will force instances to share the same hypervisor. Anti-affinity\ @@ -733,6 +1721,14 @@ topology_template: label: vSON MDR cinder volume size hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_vson_mdr_volume + source_type: HEAT + param_name: vson_mdr_volume_size_0 type: float description: Size of the Cinder volume. Measured in gigabytes. default: 50 @@ -740,18 +1736,52 @@ topology_template: label: Default gateway hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_0_vson_mgt + - module_1_vson_mon + - module_4_vson_dbc + - module_7_vson_app + - module_3_vson_cll + - module_2_vson_mdr + - module_9_vson_clm + - module_5_vson_dbg + - module_6_vson_dbs + - module_8_vson_dcl + - base_vson + source_type: HEAT + param_name: default_gateway type: string description: Default gateway. vson_mgt_volume_id_0: label: vSON Management Volume ID 0 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_0_vson_mgt + source_type: HEAT + param_name: vson_mgt_volume_id_0 type: string description: Volume ID of the vSON Management server. vson_dbg_server_group_policy: label: vSON Database server group policy hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vson + source_type: HEAT + param_name: vson_dbg_server_group_policy type: string description: | Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. The group intended for vSON DB Global instances. @@ -760,6 +1790,14 @@ topology_template: label: vSON MGT volume name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_vson_mdr_volume + source_type: HEAT + param_name: vson_mdr_volume_name_0 type: string description: Volume name. default: vson_mdr_volume_0 @@ -767,12 +1805,28 @@ topology_template: label: vSON DBG volume name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_5_vson_dbg_volume + source_type: HEAT + param_name: vson_dbg_volume_name_0 type: string description: Volume name. vson_app_image_name: label: vSON base VM image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_7_vson_app + source_type: HEAT + param_name: vson_app_image_name type: string description: VM Image name the vSON APP instance will be created from. default: VSON-BASE-1.0 @@ -780,24 +1834,74 @@ topology_template: label: vSON APP Volume ID 0 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_7_vson_app + source_type: HEAT + param_name: vson_app_volume_id_0 type: string description: Volume ID of the vSON APP server. vnf_id: label: VF ID hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_0_vson_mgt + - module_1_vson_mon + - module_4_vson_dbc + - module_7_vson_app + - module_3_vson_cll + - module_2_vson_mdr + - module_9_vson_clm + - module_5_vson_dbg + - module_6_vson_dbs + - module_8_vson_dcl + - base_vson + source_type: HEAT + param_name: vnf_id type: string description: Unique ID for this VF instance. vson_dc_unit: label: vSON Datacenter name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_0_vson_mgt + - module_1_vson_mon + - module_4_vson_dbc + - module_7_vson_app + - module_3_vson_cll + - module_2_vson_mdr + - module_5_vson_dbg + - module_6_vson_dbs + - module_8_vson_dcl + source_type: HEAT + param_name: vson_dc_unit type: string description: vSON Datacenter name. swift_son_container_name: label: SON Swift hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - base_vson + source_type: HEAT + param_name: swift_son_container_name type: string description: Swift container storing vSON artifacts. default: vson @@ -805,18 +1909,52 @@ topology_template: label: OAM net IPv6 subnet prefix length hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_7_vson_app + source_type: HEAT + param_name: oam_net_subnet_v6_prefix_length type: string description: OAM network IPv6 subnet prefix length. vson_cll_volume_id_0: label: vSON Cluster Leader Volume ID 0 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_3_vson_cll + source_type: HEAT + param_name: vson_cll_volume_id_0 type: string description: Volume ID of the first vSON Cluster leader. ntp_servers: label: NTP servers hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_0_vson_mgt + - module_1_vson_mon + - module_4_vson_dbc + - module_7_vson_app + - module_3_vson_cll + - module_2_vson_mdr + - module_9_vson_clm + - module_5_vson_dbg + - module_6_vson_dbs + - module_8_vson_dcl + - base_vson + source_type: HEAT + param_name: ntp_servers type: list description: List of NTP servers. entry_schema: @@ -825,18 +1963,42 @@ topology_template: label: vSON Cluster Leader Volume ID 1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_3_vson_cll + source_type: HEAT + param_name: vson_cll_volume_id_1 type: string description: Volume ID of the second vSON Cluster leader. vson_cll_volume_id_2: label: vSON Cluster Leader Volume ID 2 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_3_vson_cll + source_type: HEAT + param_name: vson_cll_volume_id_2 type: string description: Volume ID of the third vSON Cluster leader. vson_cll_volume_size_2: label: Cinder volume ID 2 size hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_3_vson_cll_volume + source_type: HEAT + param_name: vson_cll_volume_size_2 type: float description: | Size of the third Cinder volume. Measured in gigabytes. @@ -844,6 +2006,14 @@ topology_template: label: Cinder volume ID 1 size hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_3_vson_cll_volume + source_type: HEAT + param_name: vson_cll_volume_size_1 type: float description: | Size of the second Cinder volume. Measured in gigabytes. @@ -851,6 +2021,14 @@ topology_template: label: Cinder volume ID 0 size hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_3_vson_cll_volume + source_type: HEAT + param_name: vson_cll_volume_size_0 type: float description: | Size of the first Cinder volume. Measured in gigabytes. @@ -858,24 +2036,56 @@ topology_template: label: Flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_8_vson_dcl + source_type: HEAT + param_name: vson_dcl_flavor_name type: string description: The ID or name of the flavor to boot onto. vson_app_volume_name_0: label: vSON APP volume name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_7_vson_app_volume + source_type: HEAT + param_name: vson_app_volume_name_0 type: string description: Volume name. vson_mon_name_0: label: vSON MON instance name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_1_vson_mon + source_type: HEAT + param_name: vson_mon_name_0 type: string description: Unique name to be issued to the vSON MON instance. vson_mdr_name_0: label: vSON Mediator instance name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - module_2_vson_mdr + source_type: HEAT + param_name: vson_mdr_name_0 type: string description: Unique name to be issued to the vSON Mediator instance. node_templates: @@ -2243,4 +3453,4 @@ topology_template: value: vson_dbs_volume_1 vson_mon_server_group_id: description: ID of the Server Group intended for vSON MON instances. - value: UNSUPPORTED_RESOURCE_vson_mon_server_group \ No newline at end of file + value: UNSUPPORTED_RESOURCE_vson_mon_server_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/MainServiceTemplate.yaml index 7b42e35fa2..27b553bcf2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/MainServiceTemplate.yaml @@ -11,11 +11,27 @@ topology_template: 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: network name of jsa log network jsa_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_name type: string description: network name of jsa log network node_templates: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/MainServiceTemplate.yaml index 52911df941..788f1f05c3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/MainServiceTemplate.yaml @@ -12,6 +12,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: @@ -22,6 +30,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 @@ -29,6 +45,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 @@ -36,6 +60,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: @@ -46,6 +78,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 @@ -53,6 +93,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: @@ -63,6 +111,14 @@ 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 + source_type: HEAT + param_name: oam_flavor_name type: string description: flavor name of PCRF CM instance default: cps @@ -70,6 +126,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 @@ -77,6 +141,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: @@ -86,34 +158,83 @@ 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 oam_image_name: 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: oam_image_name type: string description: PCRF CM image name default: rhel2 shared_security_group_id2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: shared_security_group_id2 type: string description: network name of jsa log network oam_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 + source_type: HEAT + param_name: oam_server_names type: list description: name of the PCRF CM instance default: @@ -124,6 +245,14 @@ topology_template: 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 @@ -131,6 +260,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 @@ -138,18 +275,43 @@ 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 shared_security_group_id1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + - hot-nimbus-pcm_v0.4 + source_type: HEAT + param_name: shared_security_group_id1 type: string description: network name of jsa log network 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 + 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/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml index 13c01e09ef..dfd135166c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml @@ -12,6 +12,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: @@ -22,6 +30,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 @@ -29,6 +45,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 @@ -36,6 +60,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: @@ -46,6 +78,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 @@ -53,6 +93,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: @@ -63,6 +111,14 @@ 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 + source_type: HEAT + param_name: oam_flavor_name type: string description: flavor name of PCRF CM instance default: cps @@ -70,6 +126,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 @@ -77,6 +141,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: @@ -86,22 +158,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 oam_image_name: 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: oam_image_name type: string description: PCRF CM image name default: rhel2 @@ -109,6 +213,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: oam_server_names type: list description: name of the PCRF CM instance default: @@ -119,6 +231,14 @@ topology_template: 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 @@ -126,6 +246,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 @@ -133,6 +261,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 @@ -140,6 +276,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 @@ -395,4 +539,4 @@ topology_template: - server_pcm_001 - packet_mirror_network - compute_port_0 - - abstract_compute \ No newline at end of file + - abstract_compute diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml index e33c8f7742..0525feb0aa 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml @@ -12,6 +12,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: @@ -22,6 +30,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 @@ -29,6 +45,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 @@ -36,6 +60,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: @@ -46,6 +78,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 @@ -53,6 +93,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: @@ -63,6 +111,14 @@ 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 + source_type: HEAT + param_name: oam_flavor_name type: string description: flavor name of PCRF CM instance default: cps @@ -70,6 +126,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 @@ -77,6 +141,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: @@ -86,22 +158,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 oam_image_name: 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: oam_image_name type: string description: PCRF CM image name default: rhel2 @@ -109,6 +213,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: oam_server_names type: list description: name of the PCRF CM instance default: @@ -119,6 +231,14 @@ topology_template: 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 @@ -126,6 +246,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 @@ -133,6 +261,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 @@ -140,6 +276,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 @@ -408,4 +552,4 @@ topology_template: value: get_attribute: - server_pcm_002 - - server_pcm_id \ No newline at end of file + - server_pcm_id diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml index 03d67034c8..f26ec33021 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml @@ -12,6 +12,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: @@ -22,6 +30,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 @@ -29,6 +45,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 @@ -36,6 +60,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: @@ -46,6 +78,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 @@ -53,6 +93,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: @@ -63,6 +111,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 @@ -70,6 +126,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: @@ -79,11 +143,27 @@ 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 @@ -91,6 +171,14 @@ topology_template: 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 @@ -98,6 +186,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 @@ -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: oam_net_mask type: string description: CPS network mask default: 255.255.255.0 @@ -112,12 +216,28 @@ 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 port_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: port_net_name type: string node_templates: server_pcm_001: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/MainServiceTemplate.yaml index 7c38cdadd7..91253aebb6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/MainServiceTemplate.yaml @@ -12,6 +12,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: @@ -22,6 +30,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 @@ -29,6 +45,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 @@ -36,6 +60,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: @@ -46,6 +78,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 @@ -53,6 +93,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: @@ -63,6 +111,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 @@ -70,6 +126,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: @@ -79,22 +143,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 @@ -102,6 +198,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 @@ -109,6 +213,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 @@ -116,6 +228,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/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/MainServiceTemplate.yaml index d76973cb78..f8113a6083 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/MainServiceTemplate.yaml @@ -12,6 +12,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: @@ -22,6 +30,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 @@ -29,6 +45,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 @@ -36,6 +60,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: @@ -46,6 +78,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 @@ -53,6 +93,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: @@ -63,6 +111,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 @@ -70,6 +126,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: @@ -79,22 +143,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 @@ -102,6 +198,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 @@ -109,6 +213,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 @@ -116,6 +228,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/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/MainServiceTemplate.yaml index 4f83013978..d6c80b323c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ 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 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PCRF CM instance default: cps @@ -19,6 +27,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: @@ -29,6 +45,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 @@ -36,6 +60,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 @@ -43,6 +75,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: @@ -53,6 +93,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 @@ -60,6 +108,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: @@ -70,6 +126,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: pd_image_name type: string description: PCRF CM image name default: rhel2 @@ -77,6 +141,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 @@ -84,6 +156,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: pd_server_names type: list description: name of the PCRF CM instance default: @@ -94,6 +174,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: @@ -103,22 +191,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 @@ -126,6 +246,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 @@ -133,6 +261,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 @@ -140,6 +276,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/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/MainServiceTemplate.yaml index 5d4a7a4a82..a42d0d5975 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ 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 + source_type: HEAT + param_name: pcm_flavor_name type: string description: flavor name of PCRF CM instance default: cps @@ -19,6 +27,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 @@ -26,12 +42,28 @@ 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 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 + source_type: HEAT + param_name: pcm_server_names type: list description: name of the PCRF CM instance default: @@ -42,16 +74,40 @@ 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 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 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 node_templates: server_pcm_002: @@ -189,4 +245,4 @@ topology_template: - server_pcm_002 - server_pcm_001 - server_pcm_003 - - compute_port_0 \ No newline at end of file + - compute_port_0 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml index 8335140e6c..007c922276 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ 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 + source_type: HEAT + param_name: pcm_flavor_name type: string description: flavor name of PCRF CM instance default: cps @@ -19,6 +27,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 @@ -26,12 +42,28 @@ 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 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 + source_type: HEAT + param_name: pcm_server_names type: list description: name of the PCRF CM instance default: @@ -42,16 +74,40 @@ 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 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 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 node_templates: server_pcm_002: @@ -189,4 +245,4 @@ topology_template: - server_pcm_002 - server_pcm_001 - server_pcm_003 - - compute_port_0 \ No newline at end of file + - compute_port_0 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/MainServiceTemplate.yaml index 8a54d2838b..29a25e780c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ 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 + source_type: HEAT + param_name: pcm_flavor_name type: string description: flavor name of PCRF CM instance default: cps @@ -19,6 +27,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 @@ -26,12 +42,28 @@ 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 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 + source_type: HEAT + param_name: pcm_server_names type: list description: name of the PCRF CM instance default: @@ -42,16 +74,40 @@ 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 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 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 node_templates: server_pcm_002: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml index 9bcbf7f265..69830feadc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -26,6 +42,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -33,6 +57,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml index 53569c04ff..00c6eeb558 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -26,6 +42,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -33,6 +57,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml index cfa575c19f..ec6a628f96 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: dummy net name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_1 type: string description: dummy net name default: Network-1 @@ -26,6 +42,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -33,6 +57,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -40,6 +72,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml index b35fcd2d30..806765b626 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -26,6 +42,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -33,6 +57,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml index 32b9d608b7..dd5df2e5cb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -26,6 +42,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -33,12 +57,28 @@ topology_template: label: packet mirror network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: packet_mirror_network_name type: string description: name of the oam network pd_server_names: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml index 62c9c11383..d8ed63f516 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -26,12 +42,28 @@ topology_template: label: volume size hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd01_cinder_volume_size type: string description: volume size pd_image_name: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -39,12 +71,28 @@ topology_template: label: packet mirror network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: packet_mirror_network_name type: string description: name of the network pd_server_names: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: @@ -56,6 +104,14 @@ topology_template: label: volume type hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd01_volume_type type: string description: volume type node_templates: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml index 9bb3ae9ec4..4c33369168 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -26,6 +42,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -33,6 +57,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml index 8e24e4618b..1ec1a4b153 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -26,6 +42,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -33,6 +57,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml index 2c5b6f86b9..dff6ff6335 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_server_names type: list description: name of the PD instance default: @@ -32,6 +48,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -39,6 +63,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -46,6 +78,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -53,6 +93,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: @@ -64,6 +112,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_flavor_name type: string description: flavor name of PD instance default: m3.xlarge diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml index dfb0641787..d8244c25d5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_server_names type: list description: name of the PD instance default: @@ -32,6 +48,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -39,6 +63,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -46,6 +78,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -53,6 +93,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: @@ -64,6 +112,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_flavor_name type: string description: flavor name of PD instance default: m3.xlarge diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml index 43820275b4..a6d5ed65ce 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -26,6 +42,14 @@ topology_template: label: repl network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: repl_net_ips type: list description: ips of repl network default: @@ -37,6 +61,14 @@ topology_template: label: silver lining network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_name type: string description: id of the sl network default: exn_protected_net_0 @@ -44,6 +76,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -51,6 +91,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: @@ -62,6 +110,14 @@ topology_template: label: SM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_server_names type: list description: name of the SM instance default: @@ -72,12 +128,28 @@ topology_template: dummy_net_netmask_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + 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: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_netmask_0 type: string description: CSB internal network subnet mask default: 255.255.255.0 @@ -85,6 +157,14 @@ topology_template: label: mog ran net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_floating_ip type: string description: mog ran net virtual ip default: 107.239.36.5 @@ -92,6 +172,14 @@ topology_template: label: RAN network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_ips type: list description: RAN network ip default: @@ -103,6 +191,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_end_0 type: string description: csb internal end default: 169.254.1.254 @@ -110,6 +206,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_image_name type: string description: OAM image name default: MOG_BASE_8.0 @@ -117,6 +221,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_end_1 type: string description: csb internal end default: 169.254.2.254 @@ -124,6 +236,14 @@ topology_template: label: oam network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_name type: string description: name of the oam network default: oam_protected_net_0 @@ -131,6 +251,14 @@ topology_template: label: internet network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_ips type: list description: ip of the OAM network default: @@ -145,6 +273,14 @@ topology_template: label: RAN network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_name type: string description: RAN network name default: gn_direct_net_0 @@ -152,12 +288,28 @@ topology_template: label: mog-cm-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + 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: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_netmask type: string description: CSB internal network subnet mask default: 255.255.255.0 @@ -165,6 +317,14 @@ topology_template: label: OAM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_flavor_name type: string description: flavor name of OAM instance default: m3.xlarge @@ -172,6 +332,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_start_0 type: string description: csb internal start default: 169.254.1.4 @@ -179,6 +347,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_start_1 type: string description: csb internal start default: 169.254.2.4 @@ -186,6 +362,14 @@ topology_template: label: CM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_flavor_name type: string description: flavor name of CM instance default: m3.xlarge @@ -193,6 +377,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_image_name type: string description: SM image name default: MOG_BASE_8.0 @@ -200,6 +392,14 @@ topology_template: label: PS server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_server_names type: list description: name of the PS instance default: @@ -212,6 +412,14 @@ topology_template: csb_net_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_ips type: list description: mog_csb_net IP addresses default: @@ -232,6 +440,14 @@ topology_template: label: PS flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_flavor_name type: string description: flavor name of PS instance default: m3.xlarge @@ -239,6 +455,14 @@ topology_template: label: Rx network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_ips type: list description: Rx network ips default: @@ -250,6 +474,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_1 type: string description: csb internal network name default: mog_dummy_1 @@ -257,6 +489,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_cidr_1 type: string description: csb internal cidr default: 169.254.2.0/24 @@ -264,6 +504,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_0 type: string description: csb internal network name default: mog_dummy_0 @@ -271,6 +519,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_cidr_0 type: string description: csb internal cidr default: 169.254.1.0/24 @@ -278,6 +534,14 @@ topology_template: label: mog-oam-vol-2 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam-vol-2 type: string description: OAM volume 2 default: 6d169cb6-6ddc-41dc-920c-2839898a2924 @@ -285,6 +549,14 @@ topology_template: label: mog sl net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_floating_ip type: string description: mog sl net virtual ip default: 107.239.45.6 @@ -292,6 +564,14 @@ topology_template: label: mog-sm-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: session-manager-vol-1 type: string description: Session Manager volume 1 default: 49201898-333d-4c88-b58d-cf573b091633 @@ -299,6 +579,14 @@ topology_template: label: mog rx net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_floating_ip type: string description: mog rx net virtual ip default: 107.239.34.5 @@ -306,6 +594,14 @@ topology_template: label: mog-sm-vol-2 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: session-manager-vol-2 type: string description: Session Manager volume 2 default: 4c35b5f1-ce99-4220-a6e2-cda6e2d713a0 @@ -313,6 +609,14 @@ topology_template: label: mog-oam-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam-vol-1 type: string description: OAM volume 1 default: 0a7fcd9e-2624-401d-ac21-b0191f85ec77 @@ -320,6 +624,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_start type: string description: csb internal start default: 172.26.0.1 @@ -327,6 +639,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_image_name type: string description: CM image name default: MOG_BASE_8.0 @@ -334,6 +654,14 @@ topology_template: label: SM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_flavor_name type: string description: flavor name of SM instance default: m2.xlarge4 @@ -341,6 +669,14 @@ topology_template: label: PS image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_image_name type: string description: PS image name default: MOG_BASE_8.0 @@ -348,6 +684,14 @@ topology_template: label: OAM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_server_names type: list description: name of the OAM instance default: @@ -359,6 +703,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_cidr type: string description: csb internal cidr default: 172.26.0.0/24 @@ -366,6 +718,14 @@ topology_template: label: CM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_server_names type: list description: name of the CM instance default: @@ -376,6 +736,14 @@ topology_template: label: silver lining network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_ips type: list description: ips of the sl network default: @@ -387,6 +755,14 @@ topology_template: label: Rx network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_name type: string description: Rx network name default: cor_direct_net_1 @@ -394,6 +770,14 @@ topology_template: label: Replication network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: repl_net_name type: string description: name of the replication network default: cor_direct_net_0 @@ -401,6 +785,14 @@ topology_template: label: security group name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: security_group_name type: string description: the name of security group default: mog_security_group @@ -408,6 +800,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_end type: string description: csb internal end default: 172.26.0.254 @@ -415,6 +815,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_name type: string description: csb internal network name default: int_mog_csb_net diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml index c325682f1b..ce7a4c9e1d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml @@ -11,41 +11,97 @@ topology_template: port_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: port_name type: string description: port name default: port_name vnf_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: vnf_id type: string description: Unique ID for this VNF instance default: This_is_ths_SCP_id smp_name_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: smp_name_1 type: string description: name of VM default: vSMP2 flavor_smp_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: flavor_smp_name type: string description: SCP SMP Flavor default: m3.xlarge image_smp_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: image_smp_name type: string description: SCP SMP image default: asc_base_image_smp availability_zone_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availability_zone_0 type: string default: zone_1 lab_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: lab_name type: string description: Lab name default: Lab-1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml index 077dfc9a04..424fcd66ab 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -26,6 +42,14 @@ topology_template: label: OAM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_flavor_name type: string description: flavor name of OAM instance default: m3.xlarge @@ -33,6 +57,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -40,6 +72,14 @@ topology_template: label: packet mirror network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: packet_mirror_network_name type: string description: name of the oam network default: packet-net-1 @@ -47,6 +87,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: @@ -58,6 +106,14 @@ topology_template: label: oam network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_name type: string description: name of the oam network default: oam_protected_net_0 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml index 482b76338e..0ad20baa65 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -26,6 +42,14 @@ topology_template: label: volume size hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd01_cinder_volume_size type: string description: volume size default: 1024 @@ -33,6 +57,14 @@ topology_template: label: OAM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_flavor_name type: string description: flavor name of OAM instance default: m3.xlarge @@ -40,6 +72,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -47,6 +87,14 @@ topology_template: label: packet mirror network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: packet_mirror_network_name type: string description: name of the network default: packet-net-1 @@ -54,6 +102,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: @@ -65,6 +121,14 @@ topology_template: label: volume type hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd01_volume_type type: string description: volume type default: volume_type_1 @@ -72,6 +136,14 @@ topology_template: label: oam network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_name type: string description: name of the oam network default: oam_protected_net_0 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml index 055edbcb85..3529fedc3a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -26,6 +42,14 @@ topology_template: label: OAM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_flavor_name type: string description: flavor name of OAM instance default: m3.xlarge @@ -33,6 +57,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -40,6 +72,14 @@ topology_template: label: packet mirror network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: packet_mirror_network_name type: string description: name of the oam network default: packet-net-1 @@ -47,6 +87,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: @@ -58,6 +106,14 @@ topology_template: label: oam network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_name type: string description: name of the oam network default: oam_protected_net_0 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml index 5931d1278c..3f3e490da9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -26,12 +42,28 @@ topology_template: label: packet internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: packet_internal_network_name type: string description: name of the network pd01_cinder_volume_size: label: volume size hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd01_cinder_volume_size type: string description: volume size default: 1024 @@ -39,6 +71,14 @@ topology_template: label: OAM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_flavor_name type: string description: flavor name of OAM instance default: m3.xlarge @@ -46,6 +86,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -53,6 +101,14 @@ topology_template: label: packet mirror network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: packet_mirror_network_name type: string description: name of the network default: packet-net-1 @@ -60,6 +116,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: @@ -71,6 +135,14 @@ topology_template: label: volume type hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd01_volume_type type: string description: volume type default: volume_type_1 @@ -78,6 +150,14 @@ topology_template: label: oam network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_name type: string description: name of the oam network default: oam_protected_net_0 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml index a6938c23d8..e7fa960d3b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -26,6 +42,14 @@ topology_template: label: repl network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: repl_net_ips type: list description: ips of repl network default: @@ -37,6 +61,14 @@ topology_template: label: silver lining network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_name type: string description: id of the sl network default: exn_protected_net_0 @@ -44,6 +76,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -51,6 +91,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: @@ -62,6 +110,14 @@ topology_template: label: SM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_server_names type: list description: name of the SM instance default: @@ -72,12 +128,28 @@ topology_template: dummy_net_netmask_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + 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: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_netmask_0 type: string description: CSB internal network subnet mask default: 255.255.255.0 @@ -85,6 +157,14 @@ topology_template: label: mog ran net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_floating_ip type: string description: mog ran net virtual ip default: 107.239.36.5 @@ -92,6 +172,14 @@ topology_template: label: RAN network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_ips type: list description: RAN network ip default: @@ -103,6 +191,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_end_0 type: string description: csb internal end default: 169.254.1.254 @@ -110,6 +206,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_image_name type: string description: OAM image name default: MOG_BASE_8.0 @@ -117,6 +221,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_end_1 type: string description: csb internal end default: 169.254.2.254 @@ -124,6 +236,14 @@ topology_template: label: oam network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_name type: string description: name of the oam network default: oam_protected_net_0 @@ -131,6 +251,14 @@ topology_template: label: internet network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_ips type: list description: ip of the OAM network default: @@ -145,6 +273,14 @@ topology_template: label: RAN network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_name type: string description: RAN network name default: gn_direct_net_0 @@ -152,12 +288,28 @@ topology_template: label: mog-cm-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + 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: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_netmask type: string description: CSB internal network subnet mask default: 255.255.255.0 @@ -165,6 +317,14 @@ topology_template: label: OAM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_flavor_name type: string description: flavor name of OAM instance default: m3.xlarge @@ -172,6 +332,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_start_0 type: string description: csb internal start default: 169.254.1.4 @@ -179,6 +347,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_start_1 type: string description: csb internal start default: 169.254.2.4 @@ -186,6 +362,14 @@ topology_template: label: CM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_flavor_name type: string description: flavor name of CM instance default: m3.xlarge @@ -193,6 +377,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_image_name type: string description: SM image name default: MOG_BASE_8.0 @@ -200,6 +392,14 @@ topology_template: label: PS server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_server_names type: list description: name of the PS instance default: @@ -212,6 +412,14 @@ topology_template: csb_net_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_ips type: list description: mog_csb_net IP addresses default: @@ -232,6 +440,14 @@ topology_template: label: PS flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_flavor_name type: string description: flavor name of PS instance default: m3.xlarge @@ -239,6 +455,14 @@ topology_template: label: Rx network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_ips type: list description: Rx network ips default: @@ -250,6 +474,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_1 type: string description: csb internal network name default: mog_dummy_1 @@ -257,6 +489,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_cidr_1 type: string description: csb internal cidr default: 169.254.2.0/24 @@ -264,6 +504,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_0 type: string description: csb internal network name default: mog_dummy_0 @@ -271,6 +519,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_cidr_0 type: string description: csb internal cidr default: 169.254.1.0/24 @@ -278,6 +534,14 @@ topology_template: label: mog-oam-vol-2 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam-vol-2 type: string description: OAM volume 2 default: 6d169cb6-6ddc-41dc-920c-2839898a2924 @@ -285,6 +549,14 @@ topology_template: label: mog sl net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_floating_ip type: string description: mog sl net virtual ip default: 107.239.45.6 @@ -292,6 +564,14 @@ topology_template: label: mog-sm-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: session-manager-vol-1 type: string description: Session Manager volume 1 default: 49201898-333d-4c88-b58d-cf573b091633 @@ -299,6 +579,14 @@ topology_template: label: mog rx net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_floating_ip type: string description: mog rx net virtual ip default: 107.239.34.5 @@ -306,6 +594,14 @@ topology_template: label: mog-sm-vol-2 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: session-manager-vol-2 type: string description: Session Manager volume 2 default: 4c35b5f1-ce99-4220-a6e2-cda6e2d713a0 @@ -313,6 +609,14 @@ topology_template: label: mog-oam-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam-vol-1 type: string description: OAM volume 1 default: 0a7fcd9e-2624-401d-ac21-b0191f85ec77 @@ -320,6 +624,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_start type: string description: csb internal start default: 172.26.0.1 @@ -327,6 +639,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_image_name type: string description: CM image name default: MOG_BASE_8.0 @@ -334,6 +654,14 @@ topology_template: label: SM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_flavor_name type: string description: flavor name of SM instance default: m2.xlarge4 @@ -341,6 +669,14 @@ topology_template: label: PS image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_image_name type: string description: PS image name default: MOG_BASE_8.0 @@ -348,6 +684,14 @@ topology_template: label: OAM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_server_names type: list description: name of the OAM instance default: @@ -359,6 +703,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_cidr type: string description: csb internal cidr default: 172.26.0.0/24 @@ -366,6 +718,14 @@ topology_template: label: CM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_server_names type: list description: name of the CM instance default: @@ -376,6 +736,14 @@ topology_template: label: silver lining network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_ips type: list description: ips of the sl network default: @@ -387,6 +755,14 @@ topology_template: label: Rx network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_name type: string description: Rx network name default: cor_direct_net_1 @@ -394,6 +770,14 @@ topology_template: label: Replication network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: repl_net_name type: string description: name of the replication network default: cor_direct_net_0 @@ -401,6 +785,14 @@ topology_template: label: security group name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: security_group_name type: string description: the name of security group default: mog_security_group @@ -408,6 +800,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_end type: string description: csb internal end default: 172.26.0.254 @@ -415,6 +815,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_name type: string description: csb internal network name default: int_mog_csb_net diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml index 4715d0e7a8..cdc3fd47ee 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -26,6 +42,14 @@ topology_template: label: repl network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: repl_net_ips type: list description: ips of repl network default: @@ -37,6 +61,14 @@ topology_template: label: silver lining network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_name type: string description: id of the sl network default: exn_protected_net_0 @@ -44,6 +76,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -51,6 +91,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: @@ -62,6 +110,14 @@ topology_template: label: SM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_server_names type: list description: name of the SM instance default: @@ -72,12 +128,28 @@ topology_template: dummy_net_netmask_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + 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: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_netmask_0 type: string description: CSB internal network subnet mask default: 255.255.255.0 @@ -85,6 +157,14 @@ topology_template: label: mog ran net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_floating_ip type: string description: mog ran net virtual ip default: 107.239.36.5 @@ -92,6 +172,14 @@ topology_template: label: RAN network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_ips type: list description: RAN network ip default: @@ -103,6 +191,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_end_0 type: string description: csb internal end default: 169.254.1.254 @@ -110,6 +206,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_image_name type: string description: OAM image name default: MOG_BASE_8.0 @@ -117,6 +221,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_end_1 type: string description: csb internal end default: 169.254.2.254 @@ -124,6 +236,14 @@ topology_template: label: oam network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_name type: string description: name of the oam network default: oam_protected_net_0 @@ -131,6 +251,14 @@ topology_template: label: internet network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_ips type: list description: ip of the OAM network default: @@ -145,6 +273,14 @@ topology_template: label: RAN network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_name type: string description: RAN network name default: gn_direct_net_0 @@ -152,12 +288,28 @@ topology_template: label: mog-cm-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + 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: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_netmask type: string description: CSB internal network subnet mask default: 255.255.255.0 @@ -165,6 +317,14 @@ topology_template: label: OAM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_flavor_name type: string description: flavor name of OAM instance default: m3.xlarge @@ -172,6 +332,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_start_0 type: string description: csb internal start default: 169.254.1.4 @@ -179,6 +347,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_start_1 type: string description: csb internal start default: 169.254.2.4 @@ -186,6 +362,14 @@ topology_template: label: CM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_flavor_name type: string description: flavor name of CM instance default: m3.xlarge @@ -193,6 +377,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_image_name type: string description: SM image name default: MOG_BASE_8.0 @@ -200,6 +392,14 @@ topology_template: label: PS server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_server_names type: list description: name of the PS instance default: @@ -212,6 +412,14 @@ topology_template: csb_net_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_ips type: list description: mog_csb_net IP addresses default: @@ -232,6 +440,14 @@ topology_template: label: PS flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_flavor_name type: string description: flavor name of PS instance default: m3.xlarge @@ -239,6 +455,14 @@ topology_template: label: Rx network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_ips type: list description: Rx network ips default: @@ -250,6 +474,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_1 type: string description: csb internal network name default: mog_dummy_1 @@ -257,6 +489,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_cidr_1 type: string description: csb internal cidr default: 169.254.2.0/24 @@ -264,6 +504,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_0 type: string description: csb internal network name default: mog_dummy_0 @@ -271,6 +519,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_cidr_0 type: string description: csb internal cidr default: 169.254.1.0/24 @@ -278,6 +534,14 @@ topology_template: label: mog-oam-vol-2 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam-vol-2 type: string description: OAM volume 2 default: 6d169cb6-6ddc-41dc-920c-2839898a2924 @@ -285,6 +549,14 @@ topology_template: label: mog sl net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_floating_ip type: string description: mog sl net virtual ip default: 107.239.45.6 @@ -292,6 +564,14 @@ topology_template: label: mog-sm-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: session-manager-vol-1 type: string description: Session Manager volume 1 default: 49201898-333d-4c88-b58d-cf573b091633 @@ -299,6 +579,14 @@ topology_template: label: mog rx net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_floating_ip type: string description: mog rx net virtual ip default: 107.239.34.5 @@ -306,6 +594,14 @@ topology_template: label: mog-sm-vol-2 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: session-manager-vol-2 type: string description: Session Manager volume 2 default: 4c35b5f1-ce99-4220-a6e2-cda6e2d713a0 @@ -313,6 +609,14 @@ topology_template: label: mog-oam-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam-vol-1 type: string description: OAM volume 1 default: 0a7fcd9e-2624-401d-ac21-b0191f85ec77 @@ -320,6 +624,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_start type: string description: csb internal start default: 172.26.0.1 @@ -327,6 +639,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_image_name type: string description: CM image name default: MOG_BASE_8.0 @@ -334,6 +654,14 @@ topology_template: label: SM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_flavor_name type: string description: flavor name of SM instance default: m2.xlarge4 @@ -341,6 +669,14 @@ topology_template: label: PS image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_image_name type: string description: PS image name default: MOG_BASE_8.0 @@ -348,6 +684,14 @@ topology_template: label: OAM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_server_names type: list description: name of the OAM instance default: @@ -359,6 +703,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_cidr type: string description: csb internal cidr default: 172.26.0.0/24 @@ -366,6 +718,14 @@ topology_template: label: CM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_server_names type: list description: name of the CM instance default: @@ -376,6 +736,14 @@ topology_template: label: silver lining network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_ips type: list description: ips of the sl network default: @@ -387,6 +755,14 @@ topology_template: label: Rx network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_name type: string description: Rx network name default: cor_direct_net_1 @@ -394,6 +770,14 @@ topology_template: label: Replication network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: repl_net_name type: string description: name of the replication network default: cor_direct_net_0 @@ -401,6 +785,14 @@ topology_template: label: security group name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: security_group_name type: string description: the name of security group default: mog_security_group @@ -408,6 +800,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_end type: string description: csb internal end default: 172.26.0.254 @@ -415,6 +815,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_name type: string description: csb internal network name default: int_mog_csb_net diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/MainServiceTemplate.yaml index 229c8d96bd..bb44eba9d8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -26,6 +42,14 @@ topology_template: label: repl network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: repl_net_ips type: list description: ips of repl network default: @@ -37,6 +61,14 @@ topology_template: label: silver lining network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_name type: string description: id of the sl network default: exn_protected_net_0 @@ -44,6 +76,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -51,6 +91,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: @@ -62,6 +110,14 @@ topology_template: label: SM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_server_names type: list description: name of the SM instance default: @@ -72,12 +128,28 @@ topology_template: dummy_net_netmask_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + 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: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_netmask_0 type: string description: CSB internal network subnet mask default: 255.255.255.0 @@ -85,6 +157,14 @@ topology_template: label: mog ran net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_floating_ip type: string description: mog ran net virtual ip default: 107.239.36.5 @@ -92,6 +172,14 @@ topology_template: label: RAN network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_ips type: list description: RAN network ip default: @@ -103,6 +191,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_end_0 type: string description: csb internal end default: 169.254.1.254 @@ -110,6 +206,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_image_name type: string description: OAM image name default: MOG_BASE_8.0 @@ -117,6 +221,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_end_1 type: string description: csb internal end default: 169.254.2.254 @@ -124,6 +236,14 @@ topology_template: label: oam network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_name type: string description: name of the oam network default: oam_protected_net_0 @@ -131,6 +251,14 @@ topology_template: label: internet network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_ips type: list description: ip of the OAM network default: @@ -145,6 +273,14 @@ topology_template: label: RAN network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_name type: string description: RAN network name default: gn_direct_net_0 @@ -152,12 +288,28 @@ topology_template: label: mog-cm-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + 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: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_netmask type: string description: CSB internal network subnet mask default: 255.255.255.0 @@ -165,6 +317,14 @@ topology_template: label: OAM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_flavor_name type: string description: flavor name of OAM instance default: m3.xlarge @@ -172,6 +332,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_start_0 type: string description: csb internal start default: 169.254.1.4 @@ -179,6 +347,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_start_1 type: string description: csb internal start default: 169.254.2.4 @@ -186,6 +362,14 @@ topology_template: label: CM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_flavor_name type: string description: flavor name of CM instance default: m3.xlarge @@ -193,6 +377,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_image_name type: string description: SM image name default: MOG_BASE_8.0 @@ -200,6 +392,14 @@ topology_template: label: PS server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_server_names type: list description: name of the PS instance default: @@ -212,6 +412,14 @@ topology_template: csb_net_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_ips type: list description: mog_csb_net IP addresses default: @@ -232,6 +440,14 @@ topology_template: label: PS flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_flavor_name type: string description: flavor name of PS instance default: m3.xlarge @@ -239,6 +455,14 @@ topology_template: label: Rx network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_ips type: list description: Rx network ips default: @@ -250,6 +474,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_1 type: string description: csb internal network name default: mog_dummy_1 @@ -257,6 +489,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_cidr_1 type: string description: csb internal cidr default: 169.254.2.0/24 @@ -264,6 +504,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_0 type: string description: csb internal network name default: mog_dummy_0 @@ -271,6 +519,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_cidr_0 type: string description: csb internal cidr default: 169.254.1.0/24 @@ -278,6 +534,14 @@ topology_template: label: mog-oam-vol-2 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam-vol-2 type: string description: OAM volume 2 default: 6d169cb6-6ddc-41dc-920c-2839898a2924 @@ -285,6 +549,14 @@ topology_template: label: mog sl net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_floating_ip type: string description: mog sl net virtual ip default: 107.239.45.6 @@ -292,6 +564,14 @@ topology_template: label: mog-sm-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: session-manager-vol-1 type: string description: Session Manager volume 1 default: 49201898-333d-4c88-b58d-cf573b091633 @@ -299,6 +579,14 @@ topology_template: label: mog rx net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_floating_ip type: string description: mog rx net virtual ip default: 107.239.34.5 @@ -306,6 +594,14 @@ topology_template: label: mog-sm-vol-2 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: session-manager-vol-2 type: string description: Session Manager volume 2 default: 4c35b5f1-ce99-4220-a6e2-cda6e2d713a0 @@ -313,6 +609,14 @@ topology_template: label: mog-oam-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam-vol-1 type: string description: OAM volume 1 default: 0a7fcd9e-2624-401d-ac21-b0191f85ec77 @@ -320,6 +624,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_start type: string description: csb internal start default: 172.26.0.1 @@ -327,6 +639,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_image_name type: string description: CM image name default: MOG_BASE_8.0 @@ -334,6 +654,14 @@ topology_template: label: SM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_flavor_name type: string description: flavor name of SM instance default: m2.xlarge4 @@ -341,6 +669,14 @@ topology_template: label: PS image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_image_name type: string description: PS image name default: MOG_BASE_8.0 @@ -348,6 +684,14 @@ topology_template: label: OAM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_server_names type: list description: name of the OAM instance default: @@ -359,6 +703,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_cidr type: string description: csb internal cidr default: 172.26.0.0/24 @@ -366,6 +718,14 @@ topology_template: label: CM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_server_names type: list description: name of the CM instance default: @@ -376,6 +736,14 @@ topology_template: label: silver lining network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_ips type: list description: ips of the sl network default: @@ -387,6 +755,14 @@ topology_template: label: Rx network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_name type: string description: Rx network name default: cor_direct_net_1 @@ -394,6 +770,14 @@ topology_template: label: Replication network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: repl_net_name type: string description: name of the replication network default: cor_direct_net_0 @@ -401,6 +785,14 @@ topology_template: label: security group name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: security_group_name type: string description: the name of security group default: mog_security_group @@ -408,6 +800,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_end type: string description: csb internal end default: 172.26.0.254 @@ -415,6 +815,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_name type: string description: csb internal network name default: int_mog_csb_net diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml index 5c32464d0e..4f4840d9ba 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -26,6 +42,14 @@ topology_template: label: repl network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: repl_net_ips type: list description: ips of repl network default: @@ -37,6 +61,14 @@ topology_template: label: silver lining network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_name type: string description: id of the sl network default: exn_protected_net_0 @@ -44,6 +76,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -51,6 +91,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: @@ -62,6 +110,14 @@ topology_template: label: SM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_server_names type: list description: name of the SM instance default: @@ -72,12 +128,28 @@ topology_template: dummy_net_netmask_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + 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: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_netmask_0 type: string description: CSB internal network subnet mask default: 255.255.255.0 @@ -85,6 +157,14 @@ topology_template: label: mog ran net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_floating_ip type: string description: mog ran net virtual ip default: 107.239.36.5 @@ -92,6 +172,14 @@ topology_template: label: RAN network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_ips type: list description: RAN network ip default: @@ -103,6 +191,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_end_0 type: string description: csb internal end default: 169.254.1.254 @@ -110,6 +206,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_image_name type: string description: OAM image name default: MOG_BASE_8.0 @@ -117,6 +221,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_end_1 type: string description: csb internal end default: 169.254.2.254 @@ -124,6 +236,14 @@ topology_template: label: oam network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_name type: string description: name of the oam network default: oam_protected_net_0 @@ -131,6 +251,14 @@ topology_template: label: internet network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_ips type: list description: ip of the OAM network default: @@ -145,6 +273,14 @@ topology_template: label: RAN network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_name type: string description: RAN network name default: gn_direct_net_0 @@ -152,12 +288,28 @@ topology_template: label: mog-cm-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + 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: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_netmask type: string description: CSB internal network subnet mask default: 255.255.255.0 @@ -165,6 +317,14 @@ topology_template: label: OAM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_flavor_name type: string description: flavor name of OAM instance default: m3.xlarge @@ -172,6 +332,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_start_0 type: string description: csb internal start default: 169.254.1.4 @@ -179,6 +347,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_start_1 type: string description: csb internal start default: 169.254.2.4 @@ -186,6 +362,14 @@ topology_template: label: CM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_flavor_name type: string description: flavor name of CM instance default: m3.xlarge @@ -193,6 +377,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_image_name type: string description: SM image name default: MOG_BASE_8.0 @@ -200,6 +392,14 @@ topology_template: label: PS server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_server_names type: list description: name of the PS instance default: @@ -212,6 +412,14 @@ topology_template: csb_net_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_ips type: list description: mog_csb_net IP addresses default: @@ -232,6 +440,14 @@ topology_template: label: PS flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_flavor_name type: string description: flavor name of PS instance default: m3.xlarge @@ -239,6 +455,14 @@ topology_template: label: Rx network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_ips type: list description: Rx network ips default: @@ -250,6 +474,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_1 type: string description: csb internal network name default: mog_dummy_1 @@ -257,6 +489,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_cidr_1 type: string description: csb internal cidr default: 169.254.2.0/24 @@ -264,6 +504,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_0 type: string description: csb internal network name default: mog_dummy_0 @@ -271,6 +519,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_cidr_0 type: string description: csb internal cidr default: 169.254.1.0/24 @@ -278,6 +534,14 @@ topology_template: label: mog-oam-vol-2 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam-vol-2 type: string description: OAM volume 2 default: 6d169cb6-6ddc-41dc-920c-2839898a2924 @@ -285,6 +549,14 @@ topology_template: label: mog sl net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_floating_ip type: string description: mog sl net virtual ip default: 107.239.45.6 @@ -292,6 +564,14 @@ topology_template: label: mog-sm-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: session-manager-vol-1 type: string description: Session Manager volume 1 default: 49201898-333d-4c88-b58d-cf573b091633 @@ -299,6 +579,14 @@ topology_template: label: mog rx net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_floating_ip type: string description: mog rx net virtual ip default: 107.239.34.5 @@ -306,6 +594,14 @@ topology_template: label: mog-sm-vol-2 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: session-manager-vol-2 type: string description: Session Manager volume 2 default: 4c35b5f1-ce99-4220-a6e2-cda6e2d713a0 @@ -313,6 +609,14 @@ topology_template: label: mog-oam-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam-vol-1 type: string description: OAM volume 1 default: 0a7fcd9e-2624-401d-ac21-b0191f85ec77 @@ -320,6 +624,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_start type: string description: csb internal start default: 172.26.0.1 @@ -327,6 +639,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_image_name type: string description: CM image name default: MOG_BASE_8.0 @@ -334,6 +654,14 @@ topology_template: label: SM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_flavor_name type: string description: flavor name of SM instance default: m2.xlarge4 @@ -341,6 +669,14 @@ topology_template: label: PS image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_image_name type: string description: PS image name default: MOG_BASE_8.0 @@ -348,6 +684,14 @@ topology_template: label: OAM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_server_names type: list description: name of the OAM instance default: @@ -359,6 +703,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_cidr type: string description: csb internal cidr default: 172.26.0.0/24 @@ -366,6 +718,14 @@ topology_template: label: CM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_server_names type: list description: name of the CM instance default: @@ -376,6 +736,14 @@ topology_template: label: silver lining network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_ips type: list description: ips of the sl network default: @@ -387,6 +755,14 @@ topology_template: label: Rx network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_name type: string description: Rx network name default: cor_direct_net_1 @@ -394,6 +770,14 @@ topology_template: label: Replication network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: repl_net_name type: string description: name of the replication network default: cor_direct_net_0 @@ -401,6 +785,14 @@ topology_template: label: security group name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: security_group_name type: string description: the name of security group default: mog_security_group @@ -408,6 +800,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_end type: string description: csb internal end default: 172.26.0.254 @@ -415,6 +815,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_name type: string description: csb internal network name default: int_mog_csb_net diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml index 1037ae47b7..e85c75edf4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -26,6 +42,14 @@ topology_template: label: repl network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: repl_net_ips type: list description: ips of repl network default: @@ -37,6 +61,14 @@ topology_template: label: silver lining network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_name type: string description: id of the sl network default: exn_protected_net_0 @@ -44,6 +76,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -51,6 +91,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: @@ -62,6 +110,14 @@ topology_template: label: SM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_server_names type: list description: name of the SM instance default: @@ -72,12 +128,28 @@ topology_template: dummy_net_netmask_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + 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: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_netmask_0 type: string description: CSB internal network subnet mask default: 255.255.255.0 @@ -85,6 +157,14 @@ topology_template: label: mog ran net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_floating_ip type: string description: mog ran net virtual ip default: 107.239.36.5 @@ -92,6 +172,14 @@ topology_template: label: RAN network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_ips type: list description: RAN network ip default: @@ -103,6 +191,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_end_0 type: string description: csb internal end default: 169.254.1.254 @@ -110,6 +206,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_image_name type: string description: OAM image name default: MOG_BASE_8.0 @@ -117,6 +221,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_end_1 type: string description: csb internal end default: 169.254.2.254 @@ -124,6 +236,14 @@ topology_template: label: oam network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_name type: string description: name of the oam network default: oam_protected_net_0 @@ -131,6 +251,14 @@ topology_template: label: internet network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_ips type: list description: ip of the OAM network default: @@ -145,6 +273,14 @@ topology_template: label: RAN network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_name type: string description: RAN network name default: gn_direct_net_0 @@ -152,12 +288,28 @@ topology_template: label: mog-cm-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + 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: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_netmask type: string description: CSB internal network subnet mask default: 255.255.255.0 @@ -165,6 +317,14 @@ topology_template: label: OAM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_flavor_name type: string description: flavor name of OAM instance default: m3.xlarge @@ -172,6 +332,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_start_0 type: string description: csb internal start default: 169.254.1.4 @@ -179,6 +347,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_start_1 type: string description: csb internal start default: 169.254.2.4 @@ -186,6 +362,14 @@ topology_template: label: CM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_flavor_name type: string description: flavor name of CM instance default: m3.xlarge @@ -193,6 +377,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_image_name type: string description: SM image name default: MOG_BASE_8.0 @@ -200,6 +392,14 @@ topology_template: label: PS server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_server_names type: list description: name of the PS instance default: @@ -212,6 +412,14 @@ topology_template: csb_net_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_ips type: list description: mog_csb_net IP addresses default: @@ -232,6 +440,14 @@ topology_template: label: PS flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_flavor_name type: string description: flavor name of PS instance default: m3.xlarge @@ -239,6 +455,14 @@ topology_template: label: Rx network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_ips type: list description: Rx network ips default: @@ -250,6 +474,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_1 type: string description: csb internal network name default: mog_dummy_1 @@ -257,6 +489,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_cidr_1 type: string description: csb internal cidr default: 169.254.2.0/24 @@ -264,6 +504,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_0 type: string description: csb internal network name default: mog_dummy_0 @@ -271,6 +519,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_cidr_0 type: string description: csb internal cidr default: 169.254.1.0/24 @@ -278,6 +534,14 @@ topology_template: label: mog-oam-vol-2 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam-vol-2 type: string description: OAM volume 2 default: 6d169cb6-6ddc-41dc-920c-2839898a2924 @@ -285,6 +549,14 @@ topology_template: label: mog sl net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_floating_ip type: string description: mog sl net virtual ip default: 107.239.45.6 @@ -292,6 +564,14 @@ topology_template: label: mog-sm-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: session-manager-vol-1 type: string description: Session Manager volume 1 default: 49201898-333d-4c88-b58d-cf573b091633 @@ -299,6 +579,14 @@ topology_template: label: mog rx net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_floating_ip type: string description: mog rx net virtual ip default: 107.239.34.5 @@ -306,6 +594,14 @@ topology_template: label: mog-sm-vol-2 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: session-manager-vol-2 type: string description: Session Manager volume 2 default: 4c35b5f1-ce99-4220-a6e2-cda6e2d713a0 @@ -313,6 +609,14 @@ topology_template: label: mog-oam-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam-vol-1 type: string description: OAM volume 1 default: 0a7fcd9e-2624-401d-ac21-b0191f85ec77 @@ -320,6 +624,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_start type: string description: csb internal start default: 172.26.0.1 @@ -327,6 +639,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_image_name type: string description: CM image name default: MOG_BASE_8.0 @@ -334,6 +654,14 @@ topology_template: label: SM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_flavor_name type: string description: flavor name of SM instance default: m2.xlarge4 @@ -341,6 +669,14 @@ topology_template: label: PS image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_image_name type: string description: PS image name default: MOG_BASE_8.0 @@ -348,6 +684,14 @@ topology_template: label: OAM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_server_names type: list description: name of the OAM instance default: @@ -359,6 +703,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_cidr type: string description: csb internal cidr default: 172.26.0.0/24 @@ -366,6 +718,14 @@ topology_template: label: CM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_server_names type: list description: name of the CM instance default: @@ -376,6 +736,14 @@ topology_template: label: silver lining network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_ips type: list description: ips of the sl network default: @@ -387,6 +755,14 @@ topology_template: label: Rx network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_name type: string description: Rx network name default: cor_direct_net_1 @@ -394,6 +770,14 @@ topology_template: label: Replication network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: repl_net_name type: string description: name of the replication network default: cor_direct_net_0 @@ -401,6 +785,14 @@ topology_template: label: security group name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: security_group_name type: string description: the name of security group default: mog_security_group @@ -408,6 +800,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_end type: string description: csb internal end default: 172.26.0.254 @@ -415,6 +815,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_name type: string description: csb internal network name default: int_mog_csb_net diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml index 20504bcba2..4054d32d29 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -26,6 +42,14 @@ topology_template: label: repl network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: repl_net_ips type: list description: ips of repl network default: @@ -37,6 +61,14 @@ topology_template: label: silver lining network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_name type: string description: id of the sl network default: exn_protected_net_0 @@ -44,6 +76,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -51,6 +91,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: @@ -62,6 +110,14 @@ topology_template: label: SM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_server_names type: list description: name of the SM instance default: @@ -72,12 +128,28 @@ topology_template: dummy_net_netmask_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + 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: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_netmask_0 type: string description: CSB internal network subnet mask default: 255.255.255.0 @@ -85,6 +157,14 @@ topology_template: label: mog ran net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_floating_ip type: string description: mog ran net virtual ip default: 107.239.36.5 @@ -92,6 +172,14 @@ topology_template: label: RAN network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_ips type: list description: RAN network ip default: @@ -103,6 +191,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_end_0 type: string description: csb internal end default: 169.254.1.254 @@ -110,6 +206,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_image_name type: string description: OAM image name default: MOG_BASE_8.0 @@ -117,6 +221,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_end_1 type: string description: csb internal end default: 169.254.2.254 @@ -124,6 +236,14 @@ topology_template: label: oam network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_name type: string description: name of the oam network default: oam_protected_net_0 @@ -131,6 +251,14 @@ topology_template: label: internet network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_ips type: list description: ip of the OAM network default: @@ -145,6 +273,14 @@ topology_template: label: RAN network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_name type: string description: RAN network name default: gn_direct_net_0 @@ -152,12 +288,28 @@ topology_template: label: mog-cm-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + 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: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_netmask type: string description: CSB internal network subnet mask default: 255.255.255.0 @@ -165,6 +317,14 @@ topology_template: label: OAM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_flavor_name type: string description: flavor name of OAM instance default: m3.xlarge @@ -172,6 +332,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_start_0 type: string description: csb internal start default: 169.254.1.4 @@ -179,6 +347,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_start_1 type: string description: csb internal start default: 169.254.2.4 @@ -186,6 +362,14 @@ topology_template: label: CM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_flavor_name type: string description: flavor name of CM instance default: m3.xlarge @@ -193,6 +377,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_image_name type: string description: SM image name default: MOG_BASE_8.0 @@ -200,6 +392,14 @@ topology_template: label: PS server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_server_names type: list description: name of the PS instance default: @@ -212,6 +412,14 @@ topology_template: csb_net_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_ips type: list description: mog_csb_net IP addresses default: @@ -232,6 +440,14 @@ topology_template: label: PS flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_flavor_name type: string description: flavor name of PS instance default: m3.xlarge @@ -239,6 +455,14 @@ topology_template: label: Rx network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_ips type: list description: Rx network ips default: @@ -250,6 +474,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_1 type: string description: csb internal network name default: mog_dummy_1 @@ -257,6 +489,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_cidr_1 type: string description: csb internal cidr default: 169.254.2.0/24 @@ -264,6 +504,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_0 type: string description: csb internal network name default: mog_dummy_0 @@ -271,6 +519,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_cidr_0 type: string description: csb internal cidr default: 169.254.1.0/24 @@ -278,6 +534,14 @@ topology_template: label: mog-oam-vol-2 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam-vol-2 type: string description: OAM volume 2 default: 6d169cb6-6ddc-41dc-920c-2839898a2924 @@ -285,6 +549,14 @@ topology_template: label: mog sl net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_floating_ip type: string description: mog sl net virtual ip default: 107.239.45.6 @@ -292,6 +564,14 @@ topology_template: label: mog-sm-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: session-manager-vol-1 type: string description: Session Manager volume 1 default: 49201898-333d-4c88-b58d-cf573b091633 @@ -299,6 +579,14 @@ topology_template: label: mog rx net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_floating_ip type: string description: mog rx net virtual ip default: 107.239.34.5 @@ -306,6 +594,14 @@ topology_template: label: mog-sm-vol-2 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: session-manager-vol-2 type: string description: Session Manager volume 2 default: 4c35b5f1-ce99-4220-a6e2-cda6e2d713a0 @@ -313,6 +609,14 @@ topology_template: label: mog-oam-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam-vol-1 type: string description: OAM volume 1 default: 0a7fcd9e-2624-401d-ac21-b0191f85ec77 @@ -320,6 +624,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_start type: string description: csb internal start default: 172.26.0.1 @@ -327,6 +639,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_image_name type: string description: CM image name default: MOG_BASE_8.0 @@ -334,6 +654,14 @@ topology_template: label: SM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_flavor_name type: string description: flavor name of SM instance default: m2.xlarge4 @@ -341,6 +669,14 @@ topology_template: label: PS image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_image_name type: string description: PS image name default: MOG_BASE_8.0 @@ -348,6 +684,14 @@ topology_template: label: OAM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_server_names type: list description: name of the OAM instance default: @@ -359,6 +703,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_cidr type: string description: csb internal cidr default: 172.26.0.0/24 @@ -366,6 +718,14 @@ topology_template: label: CM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_server_names type: list description: name of the CM instance default: @@ -376,6 +736,14 @@ topology_template: label: silver lining network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_ips type: list description: ips of the sl network default: @@ -387,6 +755,14 @@ topology_template: label: Rx network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_name type: string description: Rx network name default: cor_direct_net_1 @@ -394,6 +770,14 @@ topology_template: label: Replication network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: repl_net_name type: string description: name of the replication network default: cor_direct_net_0 @@ -401,6 +785,14 @@ topology_template: label: security group name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: security_group_name type: string description: the name of security group default: mog_security_group @@ -408,6 +800,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_end type: string description: csb internal end default: 172.26.0.254 @@ -415,6 +815,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_name type: string description: csb internal network name default: int_mog_csb_net diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml index 5d546b60d4..4712348457 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_1 type: string description: csb internal cidr default: mog_dummy_1 @@ -26,38 +42,94 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova template_PortTuple_LB1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: template_PortTuple_LB1 type: string description: dummy lb_st_interface_type_oam: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: lb_st_interface_type_oam type: string description: dummy oam_sec_group_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_sec_group_name type: string description: dummy virtual_ip_address: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: virtual_ip_address type: string description: dummy nems_traffic_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: nems_traffic_name type: string description: dummy pd_image_name: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -65,6 +137,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: @@ -76,41 +156,105 @@ topology_template: label: pd_security_group_name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_security_group_name type: string description: pd_security_group_name jsa_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: jsa_net_name type: string description: dummy pd_port_fixed_ips_address: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_port_fixed_ips_address type: string description: dummy parent_interface: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: parent_interface type: string description: dummy virtual_ipv6_address: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: virtual_ipv6_address type: string description: dummy mac_address: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: mac_address type: string description: dummy pd_port_fixed_ips_subnet: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_port_fixed_ips_subnet type: string description: dummy lb_st_interface_vlan_tag_oam: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: lb_st_interface_vlan_tag_oam type: string description: dummy node_templates: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml index 697a93c4d2..e9d7a14899 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -26,6 +42,14 @@ topology_template: label: repl network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: repl_net_ips type: list description: ips of repl network default: @@ -37,6 +61,14 @@ topology_template: label: silver lining network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_name type: string description: id of the sl network default: exn_protected_net_0 @@ -44,6 +76,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -51,6 +91,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: @@ -62,6 +110,14 @@ topology_template: label: SM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_server_names type: list description: name of the SM instance default: @@ -72,12 +128,28 @@ topology_template: dummy_net_netmask_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + 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: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_netmask_0 type: string description: CSB internal network subnet mask default: 255.255.255.0 @@ -85,6 +157,14 @@ topology_template: label: mog ran net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_floating_ip type: string description: mog ran net virtual ip default: 107.239.36.5 @@ -92,6 +172,14 @@ topology_template: label: RAN network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_ips type: list description: RAN network ip default: @@ -103,6 +191,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_end_0 type: string description: csb internal end default: 169.254.1.254 @@ -110,6 +206,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_image_name type: string description: OAM image name default: MOG_BASE_8.0 @@ -117,6 +221,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_end_1 type: string description: csb internal end default: 169.254.2.254 @@ -124,6 +236,14 @@ topology_template: label: oam network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_name type: string description: name of the oam network default: oam_protected_net_0 @@ -131,6 +251,14 @@ topology_template: label: internet network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_ips type: list description: ip of the OAM network default: @@ -145,6 +273,14 @@ topology_template: label: RAN network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_name type: string description: RAN network name default: gn_direct_net_0 @@ -152,12 +288,28 @@ topology_template: label: mog-cm-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + 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: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_netmask type: string description: CSB internal network subnet mask default: 255.255.255.0 @@ -165,6 +317,14 @@ topology_template: label: OAM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_flavor_name type: string description: flavor name of OAM instance default: m3.xlarge @@ -172,6 +332,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_start_0 type: string description: csb internal start default: 169.254.1.4 @@ -179,6 +347,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_start_1 type: string description: csb internal start default: 169.254.2.4 @@ -186,6 +362,14 @@ topology_template: label: CM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_flavor_name type: string description: flavor name of CM instance default: m3.xlarge @@ -193,6 +377,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_image_name type: string description: SM image name default: MOG_BASE_8.0 @@ -200,6 +392,14 @@ topology_template: label: PS server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_server_names type: list description: name of the PS instance default: @@ -212,6 +412,14 @@ topology_template: csb_net_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_ips type: list description: mog_csb_net IP addresses default: @@ -232,6 +440,14 @@ topology_template: label: PS flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_flavor_name type: string description: flavor name of PS instance default: m3.xlarge @@ -239,6 +455,14 @@ topology_template: label: Rx network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_ips type: list description: Rx network ips default: @@ -250,6 +474,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_1 type: string description: csb internal network name default: mog_dummy_1 @@ -257,6 +489,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_cidr_1 type: string description: csb internal cidr default: 169.254.2.0/24 @@ -264,6 +504,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_0 type: string description: csb internal network name default: mog_dummy_0 @@ -271,6 +519,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_cidr_0 type: string description: csb internal cidr default: 169.254.1.0/24 @@ -278,6 +534,14 @@ topology_template: label: mog-oam-vol-2 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam-vol-2 type: string description: OAM volume 2 default: 6d169cb6-6ddc-41dc-920c-2839898a2924 @@ -285,6 +549,14 @@ topology_template: label: mog sl net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_floating_ip type: string description: mog sl net virtual ip default: 107.239.45.6 @@ -292,6 +564,14 @@ topology_template: label: mog-sm-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: session-manager-vol-1 type: string description: Session Manager volume 1 default: 49201898-333d-4c88-b58d-cf573b091633 @@ -299,6 +579,14 @@ topology_template: label: mog rx net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_floating_ip type: string description: mog rx net virtual ip default: 107.239.34.5 @@ -306,6 +594,14 @@ topology_template: label: mog-sm-vol-2 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: session-manager-vol-2 type: string description: Session Manager volume 2 default: 4c35b5f1-ce99-4220-a6e2-cda6e2d713a0 @@ -313,6 +609,14 @@ topology_template: label: mog-oam-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam-vol-1 type: string description: OAM volume 1 default: 0a7fcd9e-2624-401d-ac21-b0191f85ec77 @@ -320,6 +624,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_start type: string description: csb internal start default: 172.26.0.1 @@ -327,6 +639,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_image_name type: string description: CM image name default: MOG_BASE_8.0 @@ -334,6 +654,14 @@ topology_template: label: SM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_flavor_name type: string description: flavor name of SM instance default: m2.xlarge4 @@ -341,6 +669,14 @@ topology_template: label: PS image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_image_name type: string description: PS image name default: MOG_BASE_8.0 @@ -348,6 +684,14 @@ topology_template: label: OAM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_server_names type: list description: name of the OAM instance default: @@ -359,6 +703,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_cidr type: string description: csb internal cidr default: 172.26.0.0/24 @@ -366,6 +718,14 @@ topology_template: label: CM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_server_names type: list description: name of the CM instance default: @@ -376,6 +736,14 @@ topology_template: label: silver lining network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_ips type: list description: ips of the sl network default: @@ -387,6 +755,14 @@ topology_template: label: Rx network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_name type: string description: Rx network name default: cor_direct_net_1 @@ -394,6 +770,14 @@ topology_template: label: Replication network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: repl_net_name type: string description: name of the replication network default: cor_direct_net_0 @@ -401,6 +785,14 @@ topology_template: label: security group name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: security_group_name type: string description: the name of security group default: mog_security_group @@ -408,6 +800,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_end type: string description: csb internal end default: 172.26.0.254 @@ -415,6 +815,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_name type: string description: csb internal network name default: int_mog_csb_net diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml index a33dea1421..0feb8ef859 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -26,6 +42,14 @@ topology_template: label: repl network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: repl_net_ips type: list description: ips of repl network default: @@ -37,6 +61,14 @@ topology_template: label: silver lining network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_name type: string description: id of the sl network default: exn_protected_net_0 @@ -44,6 +76,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -51,6 +91,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: @@ -62,6 +110,14 @@ topology_template: label: SM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_server_names type: list description: name of the SM instance default: @@ -72,12 +128,28 @@ topology_template: dummy_net_netmask_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + 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: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_netmask_0 type: string description: CSB internal network subnet mask default: 255.255.255.0 @@ -85,6 +157,14 @@ topology_template: label: mog ran net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_floating_ip type: string description: mog ran net virtual ip default: 107.239.36.5 @@ -92,6 +172,14 @@ topology_template: label: RAN network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_ips type: list description: RAN network ip default: @@ -103,6 +191,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_end_0 type: string description: csb internal end default: 169.254.1.254 @@ -110,6 +206,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_image_name type: string description: OAM image name default: MOG_BASE_8.0 @@ -117,6 +221,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_end_1 type: string description: csb internal end default: 169.254.2.254 @@ -124,6 +236,14 @@ topology_template: label: oam network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_name type: string description: name of the oam network default: oam_protected_net_0 @@ -131,6 +251,14 @@ topology_template: label: internet network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_ips type: list description: ip of the OAM network default: @@ -145,6 +273,14 @@ topology_template: label: RAN network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_name type: string description: RAN network name default: gn_direct_net_0 @@ -152,12 +288,28 @@ topology_template: label: mog-cm-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + 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: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_netmask type: string description: CSB internal network subnet mask default: 255.255.255.0 @@ -165,6 +317,14 @@ topology_template: label: OAM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_flavor_name type: string description: flavor name of OAM instance default: m3.xlarge @@ -172,6 +332,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_start_0 type: string description: csb internal start default: 169.254.1.4 @@ -179,6 +347,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_start_1 type: string description: csb internal start default: 169.254.2.4 @@ -186,6 +362,14 @@ topology_template: label: CM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_flavor_name type: string description: flavor name of CM instance default: m3.xlarge @@ -193,6 +377,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_image_name type: string description: SM image name default: MOG_BASE_8.0 @@ -200,6 +392,14 @@ topology_template: label: PS server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_server_names type: list description: name of the PS instance default: @@ -212,6 +412,14 @@ topology_template: csb_net_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_ips type: list description: mog_csb_net IP addresses default: @@ -232,6 +440,14 @@ topology_template: label: PS flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_flavor_name type: string description: flavor name of PS instance default: m3.xlarge @@ -239,6 +455,14 @@ topology_template: label: Rx network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_ips type: list description: Rx network ips default: @@ -250,6 +474,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_1 type: string description: csb internal network name default: mog_dummy_1 @@ -257,6 +489,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_cidr_1 type: string description: csb internal cidr default: 169.254.2.0/24 @@ -264,6 +504,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_0 type: string description: csb internal network name default: mog_dummy_0 @@ -271,6 +519,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_cidr_0 type: string description: csb internal cidr default: 169.254.1.0/24 @@ -278,6 +534,14 @@ topology_template: label: mog-oam-vol-2 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam-vol-2 type: string description: OAM volume 2 default: 6d169cb6-6ddc-41dc-920c-2839898a2924 @@ -285,6 +549,14 @@ topology_template: label: mog sl net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_floating_ip type: string description: mog sl net virtual ip default: 107.239.45.6 @@ -292,6 +564,14 @@ topology_template: label: mog-sm-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: session-manager-vol-1 type: string description: Session Manager volume 1 default: 49201898-333d-4c88-b58d-cf573b091633 @@ -299,6 +579,14 @@ topology_template: label: mog rx net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_floating_ip type: string description: mog rx net virtual ip default: 107.239.34.5 @@ -306,6 +594,14 @@ topology_template: label: mog-sm-vol-2 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: session-manager-vol-2 type: string description: Session Manager volume 2 default: 4c35b5f1-ce99-4220-a6e2-cda6e2d713a0 @@ -313,6 +609,14 @@ topology_template: label: mog-oam-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam-vol-1 type: string description: OAM volume 1 default: 0a7fcd9e-2624-401d-ac21-b0191f85ec77 @@ -320,6 +624,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_start type: string description: csb internal start default: 172.26.0.1 @@ -327,6 +639,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_image_name type: string description: CM image name default: MOG_BASE_8.0 @@ -334,6 +654,14 @@ topology_template: label: SM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_flavor_name type: string description: flavor name of SM instance default: m2.xlarge4 @@ -341,6 +669,14 @@ topology_template: label: PS image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_image_name type: string description: PS image name default: MOG_BASE_8.0 @@ -348,6 +684,14 @@ topology_template: label: OAM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_server_names type: list description: name of the OAM instance default: @@ -359,6 +703,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_cidr type: string description: csb internal cidr default: 172.26.0.0/24 @@ -366,6 +718,14 @@ topology_template: label: CM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_server_names type: list description: name of the CM instance default: @@ -376,6 +736,14 @@ topology_template: label: silver lining network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_ips type: list description: ips of the sl network default: @@ -387,6 +755,14 @@ topology_template: label: Rx network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_name type: string description: Rx network name default: cor_direct_net_1 @@ -394,6 +770,14 @@ topology_template: label: Replication network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: repl_net_name type: string description: name of the replication network default: cor_direct_net_0 @@ -401,6 +785,14 @@ topology_template: label: security group name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: security_group_name type: string description: the name of security group default: mog_security_group @@ -408,6 +800,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_end type: string description: csb internal end default: 172.26.0.254 @@ -415,6 +815,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_name type: string description: csb internal network name default: int_mog_csb_net diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml index 07ce00a6e0..83a2eaf23a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_1 type: string description: csb internal cidr default: packet-net-1 @@ -19,6 +27,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -26,6 +42,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -33,6 +57,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: @@ -44,6 +76,14 @@ topology_template: label: oam network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_name type: string description: name of the oam network default: oam_protected_net_0 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml index 8b195d042a..41f9b91758 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -26,6 +42,14 @@ topology_template: label: repl network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: repl_net_ips type: list description: ips of repl network default: @@ -37,6 +61,14 @@ topology_template: label: silver lining network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_name type: string description: id of the sl network default: exn_protected_net_0 @@ -44,6 +76,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -51,6 +91,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: @@ -62,6 +110,14 @@ topology_template: label: SM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_server_names type: list description: name of the SM instance default: @@ -72,12 +128,28 @@ topology_template: dummy_net_netmask_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + 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: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_netmask_0 type: string description: CSB internal network subnet mask default: 255.255.255.0 @@ -85,6 +157,14 @@ topology_template: label: mog ran net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_floating_ip type: string description: mog ran net virtual ip default: 107.239.36.5 @@ -92,6 +172,14 @@ topology_template: label: RAN network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_ips type: list description: RAN network ip default: @@ -103,6 +191,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_end_0 type: string description: csb internal end default: 169.254.1.254 @@ -110,6 +206,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_image_name type: string description: OAM image name default: MOG_BASE_8.0 @@ -117,6 +221,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_end_1 type: string description: csb internal end default: 169.254.2.254 @@ -124,6 +236,14 @@ topology_template: label: oam network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_name type: string description: name of the oam network default: oam_protected_net_0 @@ -131,6 +251,14 @@ topology_template: label: internet network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_ips type: list description: ip of the OAM network default: @@ -145,6 +273,14 @@ topology_template: label: RAN network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_name type: string description: RAN network name default: gn_direct_net_0 @@ -152,12 +288,28 @@ topology_template: label: mog-cm-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + 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: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_netmask type: string description: CSB internal network subnet mask default: 255.255.255.0 @@ -165,6 +317,14 @@ topology_template: label: OAM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_flavor_name type: string description: flavor name of OAM instance default: m3.xlarge @@ -172,6 +332,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_start_0 type: string description: csb internal start default: 169.254.1.4 @@ -179,6 +347,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_start_1 type: string description: csb internal start default: 169.254.2.4 @@ -186,6 +362,14 @@ topology_template: label: CM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_flavor_name type: string description: flavor name of CM instance default: m3.xlarge @@ -193,6 +377,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_image_name type: string description: SM image name default: MOG_BASE_8.0 @@ -200,6 +392,14 @@ topology_template: label: PS server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_server_names type: list description: name of the PS instance default: @@ -212,6 +412,14 @@ topology_template: csb_net_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_ips type: list description: mog_csb_net IP addresses default: @@ -232,6 +440,14 @@ topology_template: label: PS flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_flavor_name type: string description: flavor name of PS instance default: m3.xlarge @@ -239,6 +455,14 @@ topology_template: label: Rx network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_ips type: list description: Rx network ips default: @@ -250,6 +474,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_1 type: string description: csb internal network name default: mog_dummy_1 @@ -257,6 +489,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_cidr_1 type: string description: csb internal cidr default: 169.254.2.0/24 @@ -264,6 +504,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_0 type: string description: csb internal network name default: mog_dummy_0 @@ -271,6 +519,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_cidr_0 type: string description: csb internal cidr default: 169.254.1.0/24 @@ -278,6 +534,14 @@ topology_template: label: mog-oam-vol-2 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam-vol-2 type: string description: OAM volume 2 default: 6d169cb6-6ddc-41dc-920c-2839898a2924 @@ -285,6 +549,14 @@ topology_template: label: mog sl net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_floating_ip type: string description: mog sl net virtual ip default: 107.239.45.6 @@ -292,6 +564,14 @@ topology_template: label: mog-sm-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: session-manager-vol-1 type: string description: Session Manager volume 1 default: 49201898-333d-4c88-b58d-cf573b091633 @@ -299,6 +579,14 @@ topology_template: label: mog rx net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_floating_ip type: string description: mog rx net virtual ip default: 107.239.34.5 @@ -306,6 +594,14 @@ topology_template: label: mog-sm-vol-2 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: session-manager-vol-2 type: string description: Session Manager volume 2 default: 4c35b5f1-ce99-4220-a6e2-cda6e2d713a0 @@ -313,6 +609,14 @@ topology_template: label: mog-oam-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam-vol-1 type: string description: OAM volume 1 default: 0a7fcd9e-2624-401d-ac21-b0191f85ec77 @@ -320,6 +624,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_start type: string description: csb internal start default: 172.26.0.1 @@ -327,6 +639,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_image_name type: string description: CM image name default: MOG_BASE_8.0 @@ -334,6 +654,14 @@ topology_template: label: SM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_flavor_name type: string description: flavor name of SM instance default: m2.xlarge4 @@ -341,6 +669,14 @@ topology_template: label: PS image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_image_name type: string description: PS image name default: MOG_BASE_8.0 @@ -348,6 +684,14 @@ topology_template: label: OAM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_server_names type: list description: name of the OAM instance default: @@ -359,6 +703,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_cidr type: string description: csb internal cidr default: 172.26.0.0/24 @@ -366,6 +718,14 @@ topology_template: label: CM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_server_names type: list description: name of the CM instance default: @@ -376,6 +736,14 @@ topology_template: label: silver lining network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_ips type: list description: ips of the sl network default: @@ -387,6 +755,14 @@ topology_template: label: Rx network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_name type: string description: Rx network name default: cor_direct_net_1 @@ -394,6 +770,14 @@ topology_template: label: Replication network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: repl_net_name type: string description: name of the replication network default: cor_direct_net_0 @@ -401,6 +785,14 @@ topology_template: label: security group name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: security_group_name type: string description: the name of security group default: mog_security_group @@ -408,6 +800,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_end type: string description: csb internal end default: 172.26.0.254 @@ -415,6 +815,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_name type: string description: csb internal network name default: int_mog_csb_net diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml index 4295d6f211..d35d65a2d4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -26,6 +42,14 @@ topology_template: label: repl network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: repl_net_ips type: list description: ips of repl network default: @@ -37,6 +61,14 @@ topology_template: label: silver lining network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_name type: string description: id of the sl network default: exn_protected_net_0 @@ -44,6 +76,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -51,6 +91,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: @@ -62,6 +110,14 @@ topology_template: label: SM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_server_names type: list description: name of the SM instance default: @@ -72,12 +128,28 @@ topology_template: dummy_net_netmask_1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + 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: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_netmask_0 type: string description: CSB internal network subnet mask default: 255.255.255.0 @@ -85,6 +157,14 @@ topology_template: label: mog ran net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_floating_ip type: string description: mog ran net virtual ip default: 107.239.36.5 @@ -92,6 +172,14 @@ topology_template: label: RAN network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_ips type: list description: RAN network ip default: @@ -103,6 +191,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_end_0 type: string description: csb internal end default: 169.254.1.254 @@ -110,6 +206,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_image_name type: string description: OAM image name default: MOG_BASE_8.0 @@ -117,6 +221,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_end_1 type: string description: csb internal end default: 169.254.2.254 @@ -124,6 +236,14 @@ topology_template: label: oam network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_name type: string description: name of the oam network default: oam_protected_net_0 @@ -131,6 +251,14 @@ topology_template: label: internet network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_ips type: list description: ip of the OAM network default: @@ -145,6 +273,14 @@ topology_template: label: RAN network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_name type: string description: RAN network name default: gn_direct_net_0 @@ -152,12 +288,28 @@ topology_template: label: mog-cm-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + 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: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_netmask type: string description: CSB internal network subnet mask default: 255.255.255.0 @@ -165,6 +317,14 @@ topology_template: label: OAM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_flavor_name type: string description: flavor name of OAM instance default: m3.xlarge @@ -172,6 +332,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_start_0 type: string description: csb internal start default: 169.254.1.4 @@ -179,6 +347,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_start_1 type: string description: csb internal start default: 169.254.2.4 @@ -186,6 +362,14 @@ topology_template: label: CM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_flavor_name type: string description: flavor name of CM instance default: m3.xlarge @@ -193,6 +377,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_image_name type: string description: SM image name default: MOG_BASE_8.0 @@ -200,6 +392,14 @@ topology_template: label: PS server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_server_names type: list description: name of the PS instance default: @@ -212,6 +412,14 @@ topology_template: csb_net_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_ips type: list description: mog_csb_net IP addresses default: @@ -232,6 +440,14 @@ topology_template: label: PS flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_flavor_name type: string description: flavor name of PS instance default: m3.xlarge @@ -239,6 +455,14 @@ topology_template: label: Rx network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_ips type: list description: Rx network ips default: @@ -250,6 +474,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_1 type: string description: csb internal network name default: mog_dummy_1 @@ -257,6 +489,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_cidr_1 type: string description: csb internal cidr default: 169.254.2.0/24 @@ -264,6 +504,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_0 type: string description: csb internal network name default: mog_dummy_0 @@ -271,6 +519,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_cidr_0 type: string description: csb internal cidr default: 169.254.1.0/24 @@ -278,6 +534,14 @@ topology_template: label: mog-oam-vol-2 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam-vol-2 type: string description: OAM volume 2 default: 6d169cb6-6ddc-41dc-920c-2839898a2924 @@ -285,6 +549,14 @@ topology_template: label: mog sl net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_floating_ip type: string description: mog sl net virtual ip default: 107.239.45.6 @@ -292,6 +564,14 @@ topology_template: label: mog-sm-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: session-manager-vol-1 type: string description: Session Manager volume 1 default: 49201898-333d-4c88-b58d-cf573b091633 @@ -299,6 +579,14 @@ topology_template: label: mog rx net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_floating_ip type: string description: mog rx net virtual ip default: 107.239.34.5 @@ -306,6 +594,14 @@ topology_template: label: mog-sm-vol-2 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: session-manager-vol-2 type: string description: Session Manager volume 2 default: 4c35b5f1-ce99-4220-a6e2-cda6e2d713a0 @@ -313,6 +609,14 @@ topology_template: label: mog-oam-vol-1 hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam-vol-1 type: string description: OAM volume 1 default: 0a7fcd9e-2624-401d-ac21-b0191f85ec77 @@ -320,6 +624,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_start type: string description: csb internal start default: 172.26.0.1 @@ -327,6 +639,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_image_name type: string description: CM image name default: MOG_BASE_8.0 @@ -334,6 +654,14 @@ topology_template: label: SM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_flavor_name type: string description: flavor name of SM instance default: m2.xlarge4 @@ -341,6 +669,14 @@ topology_template: label: PS image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_image_name type: string description: PS image name default: MOG_BASE_8.0 @@ -348,6 +684,14 @@ topology_template: label: OAM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_server_names type: list description: name of the OAM instance default: @@ -359,6 +703,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_cidr type: string description: csb internal cidr default: 172.26.0.0/24 @@ -366,6 +718,14 @@ topology_template: label: CM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_server_names type: list description: name of the CM instance default: @@ -376,6 +736,14 @@ topology_template: label: silver lining network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_ips type: list description: ips of the sl network default: @@ -387,6 +755,14 @@ topology_template: label: Rx network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_name type: string description: Rx network name default: cor_direct_net_1 @@ -394,6 +770,14 @@ topology_template: label: Replication network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: repl_net_name type: string description: name of the replication network default: cor_direct_net_0 @@ -401,6 +785,14 @@ topology_template: label: security group name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: security_group_name type: string description: the name of security group default: mog_security_group @@ -408,6 +800,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_end type: string description: csb internal end default: 172.26.0.254 @@ -415,6 +815,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_name type: string description: csb internal network name default: int_mog_csb_net diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml index 82259a7a1a..8002f73309 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: internet network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_ips type: list description: ip of the OAM network default: @@ -33,6 +49,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_1 type: string description: csb internal cidr default: mog_dummy_1 @@ -40,6 +64,14 @@ topology_template: label: CM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_server_names type: list description: name of the CM instance default: @@ -50,18 +82,42 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova VMME_pd_boot_volume: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: VMME_pd_boot_volume type: string default: 49201898-333d-4c88-b58d-cf573b091633 oam_flavor_name: label: OAM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_flavor_name type: string description: flavor name of OAM instance default: m3.xlarge @@ -69,6 +125,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -76,6 +140,14 @@ topology_template: label: packet mirror network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: packet_mirror_network_name type: string description: name of the network default: mog_packet_1 @@ -83,6 +155,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: @@ -94,6 +174,14 @@ topology_template: label: SM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_server_names type: list description: name of the SM instance default: @@ -104,17 +192,41 @@ topology_template: VMME_ps_boot_volume: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: VMME_ps_boot_volume type: string default: 43ccf5ba-2d50-427b-a38f-e8c7d8670eee VMME_oam_boot_volume: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: VMME_oam_boot_volume type: string default: 4c35b5f1-ce99-4220-a6e2-cda6e2d713a0 cm_flavor_name: label: CM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_flavor_name type: string description: flavor name of CM instance default: m3.xlarge @@ -122,6 +234,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_image_name type: string description: SM image name default: MOG_BASE_8.0 @@ -129,6 +249,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_image_name type: string description: CM image name default: MOG_BASE_8.0 @@ -136,6 +264,14 @@ topology_template: label: SM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_flavor_name type: string description: flavor name of SM instance default: m2.xlarge4 @@ -143,6 +279,14 @@ topology_template: label: PS server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_server_names type: list description: name of the PS instance default: @@ -156,6 +300,14 @@ topology_template: label: PS image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_image_name type: string description: PS image name default: MOG_BASE_8.0 @@ -163,6 +315,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_image_name type: string description: OAM image name default: MOG_BASE_8.0 @@ -170,6 +330,14 @@ topology_template: label: OAM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_server_names type: list description: name of the OAM instance default: @@ -181,6 +349,14 @@ topology_template: label: PS flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_flavor_name type: string description: flavor name of PS instance default: m3.xlarge @@ -188,6 +364,14 @@ topology_template: label: oam network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_name type: string description: name of the oam network default: oam_protected_net_0 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml index 927e672add..0bb61d1682 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: internet network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_ips type: list description: ip of the OAM network default: @@ -33,6 +49,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_1 type: string description: csb internal cidr default: mog_dummy_1 @@ -40,6 +64,14 @@ topology_template: label: CM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_server_names type: list description: name of the CM instance default: @@ -50,6 +82,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -57,6 +97,14 @@ topology_template: label: OAM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_flavor_name type: string description: flavor name of OAM instance default: m3.xlarge @@ -64,6 +112,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -71,6 +127,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: @@ -82,6 +146,14 @@ topology_template: label: SM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_server_names type: list description: name of the SM instance default: @@ -93,6 +165,14 @@ topology_template: label: CM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_flavor_name type: string description: flavor name of CM instance default: m3.xlarge @@ -100,6 +180,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_image_name type: string description: SM image name default: MOG_BASE_8.0 @@ -107,6 +195,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_image_name type: string description: CM image name default: MOG_BASE_8.0 @@ -114,6 +210,14 @@ topology_template: label: SM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_flavor_name type: string description: flavor name of SM instance default: m2.xlarge4 @@ -121,6 +225,14 @@ topology_template: label: PS server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_server_names type: list description: name of the PS instance default: @@ -134,6 +246,14 @@ topology_template: label: PS image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_image_name type: string description: PS image name default: MOG_BASE_8.0 @@ -141,6 +261,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_image_name type: string description: OAM image name default: MOG_BASE_8.0 @@ -148,6 +276,14 @@ topology_template: label: OAM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_server_names type: list description: name of the OAM instance default: @@ -159,6 +295,14 @@ topology_template: label: PS flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_flavor_name type: string description: flavor name of PS instance default: m3.xlarge @@ -166,6 +310,14 @@ topology_template: label: oam network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_name type: string description: name of the oam network default: oam_protected_net_0 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml index 217da7b6a9..7863e55a5b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: internet network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_ips type: list description: ip of the OAM network default: @@ -33,6 +49,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_1 type: string description: csb internal cidr default: mog_dummy_1 @@ -40,6 +64,14 @@ topology_template: label: CM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_server_names type: list description: name of the CM instance default: @@ -50,6 +82,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -57,6 +97,14 @@ topology_template: label: OAM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_flavor_name type: string description: flavor name of OAM instance default: m3.xlarge @@ -64,6 +112,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -71,6 +127,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: @@ -82,6 +146,14 @@ topology_template: label: SM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_server_names type: list description: name of the SM instance default: @@ -93,6 +165,14 @@ topology_template: label: CM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_flavor_name type: string description: flavor name of CM instance default: m3.xlarge @@ -100,6 +180,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_image_name type: string description: SM image name default: MOG_BASE_8.0 @@ -107,6 +195,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_image_name type: string description: CM image name default: MOG_BASE_8.0 @@ -114,6 +210,14 @@ topology_template: label: SM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_flavor_name type: string description: flavor name of SM instance default: m2.xlarge4 @@ -121,6 +225,14 @@ topology_template: label: PS server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_server_names type: list description: name of the PS instance default: @@ -134,6 +246,14 @@ topology_template: label: PS image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_image_name type: string description: PS image name default: MOG_BASE_8.0 @@ -141,6 +261,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_image_name type: string description: OAM image name default: MOG_BASE_8.0 @@ -148,6 +276,14 @@ topology_template: label: OAM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_server_names type: list description: name of the OAM instance default: @@ -159,6 +295,14 @@ topology_template: label: PS flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_flavor_name type: string description: flavor name of PS instance default: m3.xlarge @@ -166,6 +310,14 @@ topology_template: label: oam network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_name type: string description: name of the oam network default: oam_protected_net_0 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml index f379c67f1f..344d34ea74 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: internet network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_ips type: list description: ip of the OAM network default: @@ -33,6 +49,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_1 type: string description: csb internal cidr default: mog_dummy_1 @@ -40,6 +64,14 @@ topology_template: label: CM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_server_names type: list description: name of the CM instance default: @@ -50,6 +82,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -57,6 +97,14 @@ topology_template: label: OAM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_flavor_name type: string description: flavor name of OAM instance default: m3.xlarge @@ -64,6 +112,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -71,6 +127,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: @@ -82,6 +146,14 @@ topology_template: label: SM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_server_names type: list description: name of the SM instance default: @@ -93,6 +165,14 @@ topology_template: label: CM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_flavor_name type: string description: flavor name of CM instance default: m3.xlarge @@ -100,6 +180,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_image_name type: string description: SM image name default: MOG_BASE_8.0 @@ -107,6 +195,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_image_name type: string description: CM image name default: MOG_BASE_8.0 @@ -114,6 +210,14 @@ topology_template: label: SM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_flavor_name type: string description: flavor name of SM instance default: m2.xlarge4 @@ -121,6 +225,14 @@ topology_template: label: PS server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_server_names type: list description: name of the PS instance default: @@ -134,6 +246,14 @@ topology_template: label: PS image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_image_name type: string description: PS image name default: MOG_BASE_8.0 @@ -141,6 +261,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_image_name type: string description: OAM image name default: MOG_BASE_8.0 @@ -148,6 +276,14 @@ topology_template: label: OAM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_server_names type: list description: name of the OAM instance default: @@ -159,6 +295,14 @@ topology_template: label: PS flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_flavor_name type: string description: flavor name of PS instance default: m3.xlarge @@ -166,6 +310,14 @@ topology_template: label: oam network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_name type: string description: name of the oam network default: oam_protected_net_0 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml index 69ccca59d7..4d445e467c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_1 type: string description: csb internal network name default: mog_dummy_1 @@ -26,6 +42,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_0 type: string description: csb internal network name default: mog_dummy_0 @@ -33,6 +57,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_cidr_0 type: string description: csb internal cidr default: 169.254.1.0/24 @@ -40,6 +72,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -47,6 +87,14 @@ topology_template: label: mog sl net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_floating_ip type: string description: mog sl net virtual ip default: 107.239.45.6 @@ -54,6 +102,14 @@ topology_template: label: repl network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: repl_net_ips type: list description: ips of repl network default: @@ -65,6 +121,14 @@ topology_template: label: silver lining network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_name type: string description: id of the sl network default: exn_protected_net_0 @@ -72,6 +136,14 @@ topology_template: label: mog rx net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_floating_ip type: string description: mog rx net virtual ip default: 107.239.34.5 @@ -79,6 +151,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -86,6 +166,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: @@ -97,6 +185,14 @@ topology_template: label: SM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_server_names type: list description: name of the SM instance default: @@ -108,12 +204,28 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_start type: string description: csb internal start default: 172.26.0.1 dummy_net_netmask_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_netmask_0 type: string description: CSB internal network subnet mask default: 255.255.255.0 @@ -121,6 +233,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_image_name type: string description: CM image name default: MOG_BASE_8.0 @@ -128,6 +248,14 @@ topology_template: label: mog ran net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_floating_ip type: string description: mog ran net virtual ip default: 107.239.36.5 @@ -135,6 +263,14 @@ topology_template: label: SM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_flavor_name type: string description: flavor name of SM instance default: m2.xlarge4 @@ -142,6 +278,14 @@ topology_template: label: RAN network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_ips type: list description: RAN network ip default: @@ -153,6 +297,14 @@ topology_template: label: PS image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_image_name type: string description: PS image name default: MOG_BASE_8.0 @@ -160,6 +312,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_end_0 type: string description: csb internal end default: 169.254.1.254 @@ -167,6 +327,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_image_name type: string description: OAM image name default: MOG_BASE_8.0 @@ -174,6 +342,14 @@ topology_template: label: OAM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_server_names type: list description: name of the OAM instance default: @@ -185,6 +361,14 @@ topology_template: label: oam network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_name type: string description: name of the oam network default: oam_protected_net_0 @@ -192,6 +376,14 @@ topology_template: label: internet network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_ips type: list description: ip of the OAM network default: @@ -206,6 +398,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_cidr type: string description: csb internal cidr default: 172.26.0.0/24 @@ -213,6 +413,14 @@ topology_template: label: RAN network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_name type: string description: RAN network name default: gn_direct_net_0 @@ -220,6 +428,14 @@ topology_template: label: CM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_server_names type: list description: name of the CM instance default: @@ -230,6 +446,14 @@ topology_template: label: silver lining network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_ips type: list description: ips of the sl network default: @@ -241,12 +465,28 @@ topology_template: label: Rx network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_name type: string description: Rx network name default: cor_direct_net_1 csb_net_netmask: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_netmask type: string description: CSB internal network subnet mask default: 255.255.255.0 @@ -254,6 +494,14 @@ topology_template: label: OAM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_flavor_name type: string description: flavor name of OAM instance default: m3.xlarge @@ -261,6 +509,14 @@ topology_template: label: Replication network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: repl_net_name type: string description: name of the replication network default: cor_direct_net_0 @@ -268,6 +524,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_end type: string description: csb internal end default: 172.26.0.254 @@ -275,6 +539,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_start_0 type: string description: csb internal start default: 169.254.1.4 @@ -282,6 +554,14 @@ topology_template: label: CM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_flavor_name type: string description: flavor name of CM instance default: m3.xlarge @@ -289,6 +569,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_image_name type: string description: SM image name default: MOG_BASE_8.0 @@ -296,6 +584,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_name type: string description: csb internal network name default: int_mog_csb_net @@ -303,6 +599,14 @@ topology_template: label: PS server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_server_names type: list description: name of the PS instance default: @@ -315,6 +619,14 @@ topology_template: csb_net_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_ips type: list description: mog_csb_net IP addresses default: @@ -335,6 +647,14 @@ topology_template: label: PS flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_flavor_name type: string description: flavor name of PS instance default: m3.xlarge @@ -342,6 +662,14 @@ topology_template: label: Rx network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_ips type: list description: Rx network ips default: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml index d3a239a575..3fe02b86e4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml @@ -12,6 +12,14 @@ topology_template: label: PD flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name type: string description: flavor name of PD instance default: m3.xlarge @@ -19,6 +27,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_1 type: string description: csb internal network name default: mog_dummy_1 @@ -26,6 +42,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_0 type: string description: csb internal network name default: mog_dummy_0 @@ -33,6 +57,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_cidr_0 type: string description: csb internal cidr default: 169.254.1.0/24 @@ -40,6 +72,14 @@ topology_template: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name type: string description: availabilityzone name default: nova @@ -47,6 +87,14 @@ topology_template: label: mog sl net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_floating_ip type: string description: mog sl net virtual ip default: 107.239.45.6 @@ -54,6 +102,14 @@ topology_template: label: repl network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: repl_net_ips type: list description: ips of repl network default: @@ -65,6 +121,14 @@ topology_template: label: silver lining network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_name type: string description: id of the sl network default: exn_protected_net_0 @@ -72,6 +136,14 @@ topology_template: label: mog rx net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_floating_ip type: string description: mog rx net virtual ip default: 107.239.34.5 @@ -79,6 +151,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name type: string description: PD image name default: MOG_BASE_8.0 @@ -86,6 +166,14 @@ topology_template: label: PD server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names type: list description: name of the PD instance default: @@ -97,6 +185,14 @@ topology_template: label: SM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_server_names type: list description: name of the SM instance default: @@ -108,12 +204,28 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_start type: string description: csb internal start default: 172.26.0.1 dummy_net_netmask_0: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_netmask_0 type: string description: CSB internal network subnet mask default: 255.255.255.0 @@ -121,6 +233,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_image_name type: string description: CM image name default: MOG_BASE_8.0 @@ -128,6 +248,14 @@ topology_template: label: mog ran net virtual ip hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_floating_ip type: string description: mog ran net virtual ip default: 107.239.36.5 @@ -135,6 +263,14 @@ topology_template: label: SM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_flavor_name type: string description: flavor name of SM instance default: m2.xlarge4 @@ -142,6 +278,14 @@ topology_template: label: RAN network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_ips type: list description: RAN network ip default: @@ -153,6 +297,14 @@ topology_template: label: PS image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_image_name type: string description: PS image name default: MOG_BASE_8.0 @@ -160,6 +312,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_end_0 type: string description: csb internal end default: 169.254.1.254 @@ -167,6 +327,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_image_name type: string description: OAM image name default: MOG_BASE_8.0 @@ -174,6 +342,14 @@ topology_template: label: OAM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_server_names type: list description: name of the OAM instance default: @@ -185,6 +361,14 @@ topology_template: label: oam network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_name type: string description: name of the oam network default: oam_protected_net_0 @@ -192,6 +376,14 @@ topology_template: label: internet network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_ips type: list description: ip of the OAM network default: @@ -206,6 +398,14 @@ topology_template: label: csb ineternal cidr hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_cidr type: string description: csb internal cidr default: 172.26.0.0/24 @@ -213,6 +413,14 @@ topology_template: label: RAN network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ran_net_name type: string description: RAN network name default: gn_direct_net_0 @@ -220,6 +428,14 @@ topology_template: label: CM server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_server_names type: list description: name of the CM instance default: @@ -230,6 +446,14 @@ topology_template: label: silver lining network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sl_net_ips type: list description: ips of the sl network default: @@ -241,12 +465,28 @@ topology_template: label: Rx network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_name type: string description: Rx network name default: cor_direct_net_1 csb_net_netmask: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_netmask type: string description: CSB internal network subnet mask default: 255.255.255.0 @@ -254,6 +494,14 @@ topology_template: label: OAM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_flavor_name type: string description: flavor name of OAM instance default: m3.xlarge @@ -261,6 +509,14 @@ topology_template: label: Replication network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: repl_net_name type: string description: name of the replication network default: cor_direct_net_0 @@ -268,6 +524,14 @@ topology_template: label: csb internal end hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_end type: string description: csb internal end default: 172.26.0.254 @@ -275,6 +539,14 @@ topology_template: label: csb internal start hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_start_0 type: string description: csb internal start default: 169.254.1.4 @@ -282,6 +554,14 @@ topology_template: label: CM flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: cm_flavor_name type: string description: flavor name of CM instance default: m3.xlarge @@ -289,6 +569,14 @@ topology_template: label: image name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: sm_image_name type: string description: SM image name default: MOG_BASE_8.0 @@ -296,6 +584,14 @@ topology_template: label: csb internal network name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_name type: string description: csb internal network name default: int_mog_csb_net @@ -303,6 +599,14 @@ topology_template: label: PS server names hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_server_names type: list description: name of the PS instance default: @@ -315,6 +619,14 @@ topology_template: csb_net_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: csb_net_ips type: list description: mog_csb_net IP addresses default: @@ -335,6 +647,14 @@ topology_template: label: PS flavor name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_flavor_name type: string description: flavor name of PS instance default: m3.xlarge @@ -342,6 +662,14 @@ topology_template: label: Rx network ips hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: rx_net_ips type: list description: Rx network ips default: -- cgit 1.2.3-korg