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>

7 files changed, 951 insertions, 7 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/multiplecompute/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/multiplecompute/expectedoutputfiles/MainServiceTemplate.yaml
index 6ac9fbc822..05c19de84c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/multiplecompute/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/multiplecompute/expectedoutputfiles/MainServiceTemplate.yaml
@@ -14,106 +14,274 @@ topology_template:
     tenant_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: tenant_name
       type: string
       description: Name of tenant to be used
     oam_private_net_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: oam_private_net_name
       type: string
       description: A string specifying a symbolic name for the network
     packet_internal_network_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_internal_network_name
       type: string
       description: A string specifying a symbolic name for the network
     packet_mirror_network_subnet_alloc_start:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_mirror_network_subnet_alloc_start
       type: string
       description: Start address for the allocation pool
     packet_mirror_network_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_mirror_network_name
       type: string
       description: A string specifying a symbolic name for the network
     base_image_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: base_image_name
       type: string
       description: The base ID or name of the image to boot with
     cdr_network:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: cdr_network
       type: string
       description: A string specifying a symbolic name for the network
     packet_internal_network_subnet_alloc_start:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_internal_network_subnet_alloc_start
       type: string
       description: Start address for the allocation pool
     packet_internal_network_subnet_alloc_end:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_internal_network_subnet_alloc_end
       type: string
       description: End address for the allocation pool
     domain_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: domain_name
       type: string
       description: The servers domain
     packet_mirror_network_subnet_alloc_end:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_mirror_network_subnet_alloc_end
       type: string
       description: End address for the allocation pool
     packet_internal_network_subnet_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_internal_network_subnet_name
       type: string
       description: The name of the subnet
     packet_mirror_network_subnet_cidr:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_mirror_network_subnet_cidr
       type: string
       description: The Classless Inter-Domain Routing
     availability_zone_0:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: availability_zone_0
       type: string
       description: Name of the availability zone for server placement
     packet_internal_network_subnet_cidr:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_internal_network_subnet_cidr
       type: string
       description: The Classless Inter-Domain Routing
     region_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: region_name
       type: string
       description: Name of region to be used
     availability_zone_1:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: availability_zone_1
       type: string
       description: Name of the availability zone for server placement
     manager_name_0:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: manager_name_0
       type: string
       description: VM Name for Manager VM 0
     manager_oam_direct_ip_0:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: manager_oam_direct_ip_0
       type: string
       description: The public ip address of the manager
     packet_mirror_network_subnet_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_mirror_network_subnet_name
       type: string
       description: The name of the subnet
     rpmrepository_ip_0:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: rpmrepository_ip_0
       type: string
       description: The public ip address of the repository
   node_templates:
@@ -216,4 +384,4 @@ topology_template:
       - packet_mirror_network
       - packet_internal_network
       - cdr_network_port
-      - oam_private_net_network_port
\ No newline at end of file
+      - oam_private_net_network_port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/noDependency/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/noDependency/expectedoutputfiles/MainServiceTemplate.yaml
index bbefd39756..1410f714de 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/noDependency/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/noDependency/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,106 +12,274 @@ topology_template:
     tenant_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: tenant_name
       type: string
       description: Name of tenant to be used
     oam_private_net_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: oam_private_net_name
       type: string
       description: A string specifying a symbolic name for the network
     packet_internal_network_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_internal_network_name
       type: string
       description: A string specifying a symbolic name for the network
     packet_mirror_network_subnet_alloc_start:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_mirror_network_subnet_alloc_start
       type: string
       description: Start address for the allocation pool
     packet_mirror_network_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_mirror_network_name
       type: string
       description: A string specifying a symbolic name for the network
     base_image_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: base_image_name
       type: string
       description: The base ID or name of the image to boot with
     cdr_network:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: cdr_network
       type: string
       description: A string specifying a symbolic name for the network
     packet_internal_network_subnet_alloc_start:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_internal_network_subnet_alloc_start
       type: string
       description: Start address for the allocation pool
     packet_internal_network_subnet_alloc_end:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_internal_network_subnet_alloc_end
       type: string
       description: End address for the allocation pool
     domain_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: domain_name
       type: string
       description: The servers domain
     packet_mirror_network_subnet_alloc_end:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_mirror_network_subnet_alloc_end
       type: string
       description: End address for the allocation pool
     packet_internal_network_subnet_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_internal_network_subnet_name
       type: string
       description: The name of the subnet
     packet_mirror_network_subnet_cidr:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_mirror_network_subnet_cidr
       type: string
       description: The Classless Inter-Domain Routing
     availability_zone_0:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: availability_zone_0
       type: string
       description: Name of the availability zone for server placement
     packet_internal_network_subnet_cidr:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_internal_network_subnet_cidr
       type: string
       description: The Classless Inter-Domain Routing
     region_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: region_name
       type: string
       description: Name of region to be used
     availability_zone_1:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: availability_zone_1
       type: string
       description: Name of the availability zone for server placement
     manager_name_0:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: manager_name_0
       type: string
       description: VM Name for Manager VM 0
     manager_oam_direct_ip_0:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: manager_oam_direct_ip_0
       type: string
       description: The public ip address of the manager
     packet_mirror_network_subnet_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_mirror_network_subnet_name
       type: string
       description: The name of the subnet
     rpmrepository_ip_0:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: rpmrepository_ip_0
       type: string
       description: The public ip address of the repository
   node_templates:
@@ -182,4 +350,4 @@ topology_template:
       - QRouter
       - packet_internal_network
       - cdr_network_port
-      - oam_private_net_network_port
\ No newline at end of file
+      - oam_private_net_network_port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedIn/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedIn/expectedoutputfiles/MainServiceTemplate.yaml
index 11e0c062c6..6e00f44eea 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedIn/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedIn/expectedoutputfiles/MainServiceTemplate.yaml
@@ -13,36 +13,84 @@ topology_template:
       label: PD flavor name
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: pd_flavor_name
       type: string
       description: flavor name of PD instance
     availabilityzone_name:
       label: availabilityzone name
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: availabilityzone_name
       type: string
       description: availabilityzone name
     oam_flavor_name:
       label: OAM flavor name
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: oam_flavor_name
       type: string
       description: flavor name of OAM instance
     pd_image_name:
       label: image name
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: pd_image_name
       type: string
       description: PD image name
     packet_mirror_network_name:
       label: packet mirror network name
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_mirror_network_name
       type: string
       description: name of the oam network
     pd_server_names:
       label: PD server names
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: pd_server_names
       type: list
       description: name of the PD instance
       entry_schema:
@@ -51,6 +99,14 @@ topology_template:
       label: oam network name
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: oam_net_name
       type: string
       description: name of the oam network
   node_templates:
@@ -128,4 +184,4 @@ topology_template:
       - pd01_port_0
       - resources_with_dependOn
       - pd02_port_0
-      - server_pd_01
\ No newline at end of file
+      - server_pd_01
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedInOut/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedInOut/expectedoutputfiles/MainServiceTemplate.yaml
index 38fd7be3d8..32d1f50c82 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedInOut/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedInOut/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,106 +12,274 @@ topology_template:
     tenant_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: tenant_name
       type: string
       description: Name of tenant to be used
     oam_private_net_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: oam_private_net_name
       type: string
       description: A string specifying a symbolic name for the network
     packet_internal_network_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_internal_network_name
       type: string
       description: A string specifying a symbolic name for the network
     packet_mirror_network_subnet_alloc_start:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_mirror_network_subnet_alloc_start
       type: string
       description: Start address for the allocation pool
     packet_mirror_network_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_mirror_network_name
       type: string
       description: A string specifying a symbolic name for the network
     base_image_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: base_image_name
       type: string
       description: The base ID or name of the image to boot with
     cdr_network:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: cdr_network
       type: string
       description: A string specifying a symbolic name for the network
     packet_internal_network_subnet_alloc_start:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_internal_network_subnet_alloc_start
       type: string
       description: Start address for the allocation pool
     packet_internal_network_subnet_alloc_end:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_internal_network_subnet_alloc_end
       type: string
       description: End address for the allocation pool
     domain_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: domain_name
       type: string
       description: The servers domain
     packet_mirror_network_subnet_alloc_end:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_mirror_network_subnet_alloc_end
       type: string
       description: End address for the allocation pool
     packet_internal_network_subnet_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_internal_network_subnet_name
       type: string
       description: The name of the subnet
     packet_mirror_network_subnet_cidr:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_mirror_network_subnet_cidr
       type: string
       description: The Classless Inter-Domain Routing
     availability_zone_0:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: availability_zone_0
       type: string
       description: Name of the availability zone for server placement
     packet_internal_network_subnet_cidr:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_internal_network_subnet_cidr
       type: string
       description: The Classless Inter-Domain Routing
     region_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: region_name
       type: string
       description: Name of region to be used
     availability_zone_1:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: availability_zone_1
       type: string
       description: Name of the availability zone for server placement
     manager_name_0:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: manager_name_0
       type: string
       description: VM Name for Manager VM 0
     manager_oam_direct_ip_0:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: manager_oam_direct_ip_0
       type: string
       description: The public ip address of the manager
     packet_mirror_network_subnet_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_mirror_network_subnet_name
       type: string
       description: The name of the subnet
     rpmrepository_ip_0:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: rpmrepository_ip_0
       type: string
       description: The public ip address of the repository
   node_templates:
@@ -192,4 +360,4 @@ topology_template:
       - packet_mirror_network
       - packet_internal_network
       - cdr_network_port
-      - oam_private_net_network_port
\ No newline at end of file
+      - oam_private_net_network_port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedOut/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedOut/expectedoutputfiles/MainServiceTemplate.yaml
index 248998d69e..7b75e051f7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedOut/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedOut/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,106 +12,274 @@ topology_template:
     tenant_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: tenant_name
       type: string
       description: Name of tenant to be used
     oam_private_net_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: oam_private_net_name
       type: string
       description: A string specifying a symbolic name for the network
     packet_internal_network_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_internal_network_name
       type: string
       description: A string specifying a symbolic name for the network
     packet_mirror_network_subnet_alloc_start:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_mirror_network_subnet_alloc_start
       type: string
       description: Start address for the allocation pool
     packet_mirror_network_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_mirror_network_name
       type: string
       description: A string specifying a symbolic name for the network
     base_image_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: base_image_name
       type: string
       description: The base ID or name of the image to boot with
     cdr_network:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: cdr_network
       type: string
       description: A string specifying a symbolic name for the network
     packet_internal_network_subnet_alloc_start:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_internal_network_subnet_alloc_start
       type: string
       description: Start address for the allocation pool
     packet_internal_network_subnet_alloc_end:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_internal_network_subnet_alloc_end
       type: string
       description: End address for the allocation pool
     domain_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: domain_name
       type: string
       description: The servers domain
     packet_mirror_network_subnet_alloc_end:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_mirror_network_subnet_alloc_end
       type: string
       description: End address for the allocation pool
     packet_internal_network_subnet_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_internal_network_subnet_name
       type: string
       description: The name of the subnet
     packet_mirror_network_subnet_cidr:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_mirror_network_subnet_cidr
       type: string
       description: The Classless Inter-Domain Routing
     availability_zone_0:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: availability_zone_0
       type: string
       description: Name of the availability zone for server placement
     packet_internal_network_subnet_cidr:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_internal_network_subnet_cidr
       type: string
       description: The Classless Inter-Domain Routing
     region_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: region_name
       type: string
       description: Name of region to be used
     availability_zone_1:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: availability_zone_1
       type: string
       description: Name of the availability zone for server placement
     manager_name_0:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: manager_name_0
       type: string
       description: VM Name for Manager VM 0
     manager_oam_direct_ip_0:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: manager_oam_direct_ip_0
       type: string
       description: The public ip address of the manager
     packet_mirror_network_subnet_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_mirror_network_subnet_name
       type: string
       description: The name of the subnet
     rpmrepository_ip_0:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: rpmrepository_ip_0
       type: string
       description: The public ip address of the repository
   node_templates:
@@ -191,4 +359,4 @@ topology_template:
       - QRouter
       - packet_internal_network
       - cdr_network_port
-      - oam_private_net_network_port
\ No newline at end of file
+      - oam_private_net_network_port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/removeInvalidDependencyFromTosca/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/removeInvalidDependencyFromTosca/expectedoutputfiles/MainServiceTemplate.yaml
index 54c47ee20f..4e45d6ca2c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/removeInvalidDependencyFromTosca/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/removeInvalidDependencyFromTosca/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,31 +12,79 @@ topology_template:
     MASTER_image_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: MASTER_image_name
       type: string
       description: JSA MASTER instance image name
     MASTER_names:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: MASTER_names
       type: string
       description: JSA MASTER instance name
     packet_internal_network_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_internal_network_name
       type: string
       description: A string specifying a symbolic name for the network
     security_group_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: security_group_name
       type: string
       description: security group name of JSA
     MASTER_flavor_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: MASTER_flavor_name
       type: string
       description: the flavor name of JSA MASTER instance
     oam_net_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: oam_net_name
       type: string
       description: network name of OAM network
   node_templates:
@@ -124,4 +172,4 @@ topology_template:
       - packet_internal_network
       - MASTER_mgmt_port_2
       - MASTER_mgmt_port
-      - MASTER_instance
\ No newline at end of file
+      - MASTER_instance
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/translationorderinvariance/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/translationorderinvariance/expectedoutputfiles/MainServiceTemplate.yaml
index a57daa2f56..7e0ac24cc7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/translationorderinvariance/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/translationorderinvariance/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,106 +12,274 @@ topology_template:
     tenant_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: tenant_name
       type: string
       description: Name of tenant to be used
     oam_private_net_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: oam_private_net_name
       type: string
       description: A string specifying a symbolic name for the network
     packet_internal_network_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_internal_network_name
       type: string
       description: A string specifying a symbolic name for the network
     packet_mirror_network_subnet_alloc_start:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_mirror_network_subnet_alloc_start
       type: string
       description: Start address for the allocation pool
     packet_mirror_network_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_mirror_network_name
       type: string
       description: A string specifying a symbolic name for the network
     base_image_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: base_image_name
       type: string
       description: The base ID or name of the image to boot with
     cdr_network:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: cdr_network
       type: string
       description: A string specifying a symbolic name for the network
     packet_internal_network_subnet_alloc_start:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_internal_network_subnet_alloc_start
       type: string
       description: Start address for the allocation pool
     packet_internal_network_subnet_alloc_end:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_internal_network_subnet_alloc_end
       type: string
       description: End address for the allocation pool
     domain_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: domain_name
       type: string
       description: The servers domain
     packet_mirror_network_subnet_alloc_end:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_mirror_network_subnet_alloc_end
       type: string
       description: End address for the allocation pool
     packet_internal_network_subnet_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_internal_network_subnet_name
       type: string
       description: The name of the subnet
     packet_mirror_network_subnet_cidr:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_mirror_network_subnet_cidr
       type: string
       description: The Classless Inter-Domain Routing
     availability_zone_0:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: availability_zone_0
       type: string
       description: Name of the availability zone for server placement
     packet_internal_network_subnet_cidr:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_internal_network_subnet_cidr
       type: string
       description: The Classless Inter-Domain Routing
     region_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: region_name
       type: string
       description: Name of region to be used
     availability_zone_1:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: availability_zone_1
       type: string
       description: Name of the availability zone for server placement
     manager_name_0:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: manager_name_0
       type: string
       description: VM Name for Manager VM 0
     manager_oam_direct_ip_0:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: manager_oam_direct_ip_0
       type: string
       description: The public ip address of the manager
     packet_mirror_network_subnet_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: packet_mirror_network_subnet_name
       type: string
       description: The name of the subnet
     rpmrepository_ip_0:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - input
+            source_type: HEAT
+            param_name: rpmrepository_ip_0
       type: string
       description: The public ip address of the repository
   node_templates:
@@ -191,4 +359,4 @@ topology_template:
       - packet_mirror_network
       - packet_internal_network
       - cdr_network_port
-      - oam_private_net_network_port
\ No newline at end of file
+      - oam_private_net_network_port