SRIOV - add annotations

SRIOV - add annotations to input TOSCA parameter converted from HEAT file (2) Change-Id: Id0b0156730ae64093df42d09e2873de047c13ac9 Issue-ID: SDC-996 Signed-off-by: eleonorali <eleonoral@amdocs.com>
author: eleonorali <eleonoral@amdocs.com> 2018-02-11 12:15:48 +0200
committer: eleonorali <eleonoral@amdocs.com> 2018-02-11 12:16:01 +0200
commit: d5b4901c6a1ae136138c1300d377447e26bac4ef (patch)
tree: e25360262affbacfdf1bcaeb1e8976e6d8ebae58 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution
parent: eae2ba3f5ccfb20a899262562bd91129b6d53423 (diff)
24 files changed, 6288 insertions, 0 deletions
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:
author	eleonorali <eleonoral@amdocs.com>	2018-02-11 12:15:48 +0200
committer	eleonorali <eleonoral@amdocs.com>	2018-02-11 12:16:01 +0200
commit	d5b4901c6a1ae136138c1300d377447e26bac4ef (patch)
tree	e25360262affbacfdf1bcaeb1e8976e6d8ebae58 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution
parent	eae2ba3f5ccfb20a899262562bd91129b6d53423 (diff)