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>

10 files changed, 838 insertions, 10 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/MainServiceTemplate.yaml
index 471de08e0c..773101be16 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/MainServiceTemplate.yaml
@@ -11,28 +11,84 @@ topology_template:
     p2:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: p2
       type: string
       description: shared_vol2
     cmaui_cinder_volume_size:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - vol_b
+            - vol_a
+            - main
+            source_type: HEAT
+            param_name: cmaui_cinder_volume_size
       type: string
     exposed_vol1:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: exposed_vol1
       type: string
     contrail_net_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - vol_b
+            - vol_a
+            - main
+            source_type: HEAT
+            param_name: contrail_net_name
       type: string
       description: network name of jsa log network
     CMAUI_volume_type:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - vol_b
+            - vol_a
+            - main
+            source_type: HEAT
+            param_name: CMAUI_volume_type
       type: string
     jsa_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - vol_b
+            - vol_a
+            - main
+            source_type: HEAT
+            param_name: jsa_name
       type: string
       description: network name of jsa log network
   node_templates:
@@ -163,4 +219,4 @@ topology_template:
     p2:
       value: test_vol2
     exposed_vol1:
-      value: test_vol1
\ No newline at end of file
+      value: test_vol1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/MainServiceTemplate.yaml
index d3c471ef0e..0f6b7e72c0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/MainServiceTemplate.yaml
@@ -11,6 +11,14 @@ topology_template:
     cmaui_names:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: cmaui_names
       type: list
       description: CMAUI1, CMAUI2 server names
       entry_schema:
@@ -19,69 +27,166 @@ topology_template:
       label: CMAUI Cinder volume size
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - a_vol
+            - main
+            source_type: HEAT
+            param_name: cmaui_cinder_volume_size
       type: float
       description: the size of the CMAUI Cinder volume
     timezone:
       label: timezone
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: timezone
       type: string
       description: timezone
     security_group_name:
       label: security group name
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: security_group_name
       type: string
       description: the name of security group
     oam_network_netmask:
       label: oam network netmask
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: oam_network_netmask
       type: string
       description: oam network gateway
     cmaui_image:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: cmaui_image
       type: string
       description: Image for CMAUI server
     vnf_id:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: vnf_id
       type: string
       description: Unique ID for this VNF instance
       default: This_is_ths_MMSC-CMAUI_id
     cmaui_flavor:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: cmaui_flavor
       type: string
       description: Flavor for CMAUI server
     oam_network_gateway:
       label: oam network gateway
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: oam_network_gateway
       type: string
       description: oam network gateway
     availability_zone_0:
       label: availabilityzone name
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: availability_zone_0
       type: string
       description: availabilityzone name
     inner_cmaui_volume_a2:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: inner_cmaui_volume_a2
       type: string
       description: Unique ID for this VNF instance
       default: This_is_ths_MMSC-CMAUI_id
     inner_cmaui_volume_b3:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: inner_cmaui_volume_b3
       type: list
       entry_schema:
         type: string
     inner_cmaui_volume_a1:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: inner_cmaui_volume_a1
       type: string
       description: Unique ID for this VNF instance
       default: This_is_ths_MMSC-CMAUI_id
@@ -89,6 +194,14 @@ topology_template:
       label: CMAUI oam_net IP addresses
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: cmaui_oam_ips
       type: list
       description: CMAUI oam_net IP addresses
       entry_schema:
@@ -97,23 +210,56 @@ topology_template:
       label: dns server
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: external_dns
       type: string
       description: dns server
     oam_net_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: oam_net_name
       type: string
       description: UID of OAM network
     external_ntp:
       label: ntp server
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: external_ntp
       type: string
       description: ntp server
     CMAUI_volume_type:
       label: CMAUI vm volume type
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - a_vol
+            - main
+            source_type: HEAT
+            param_name: CMAUI_volume_type
       type: string
       description: the name of the target volume backend
   node_templates:
@@ -179,4 +325,4 @@ topology_template:
     inner_cmaui_volume_b3:
       value: inner_cmaui_volume_a1
     inner_cmaui_volume_a1:
-      value: inner_cmaui_volume_a1
\ No newline at end of file
+      value: inner_cmaui_volume_a1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/multinotconnected/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/multinotconnected/expectedoutputfiles/MainServiceTemplate.yaml
index 2c7d854590..fe9c34a568 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/multinotconnected/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/multinotconnected/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,6 +12,15 @@ topology_template:
     cmaui_names:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            - main
+            source_type: HEAT
+            param_name: cmaui_names
       type: list
       description: CMAUI1, CMAUI2 server names
       entry_schema:
@@ -20,80 +29,203 @@ topology_template:
       label: availabilityzone name
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: availability_zone_10
       type: string
       description: availabilityzone name
     cmaui_cinder_volume_size:
       label: CMAUI Cinder volume size
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            - main
+            source_type: HEAT
+            param_name: cmaui_cinder_volume_size
       type: float
       description: the size of the CMAUI Cinder volume
     timezone:
       label: timezone
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            - main
+            source_type: HEAT
+            param_name: timezone
       type: string
       description: timezone
     security_group_name:
       label: security group name
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            - main
+            source_type: HEAT
+            param_name: security_group_name
       type: string
       description: the name of security group
     cmaui_volume:
       label: CMAUI vm volume type
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            - main
+            source_type: HEAT
+            param_name: cmaui_volume
       type: string
       description: the name of the target volume backend
     oam_network_netmask:
       label: oam network netmask
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            - main
+            source_type: HEAT
+            param_name: oam_network_netmask
       type: string
       description: oam network gateway
     cmaui_image:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            - main
+            source_type: HEAT
+            param_name: cmaui_image
       type: string
       description: Image for CMAUI server
     cmaui_volume_param1:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            source_type: HEAT
+            param_name: cmaui_volume_param1
       type: string
       description: nova server id
     vnf_id:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            - main
+            source_type: HEAT
+            param_name: vnf_id
       type: string
       description: Unique ID for this VNF instance
       default: This_is_ths_MMSC-CMAUI_id
     cmaui_flavor:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            - main
+            source_type: HEAT
+            param_name: cmaui_flavor
       type: string
       description: Flavor for CMAUI server
     oam_network_gateway:
       label: oam network gateway
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            - main
+            source_type: HEAT
+            param_name: oam_network_gateway
       type: string
       description: oam network gateway
     cmaui_volume_param2:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            source_type: HEAT
+            param_name: cmaui_volume_param2
       type: string
       description: nova server id
     availability_zone_0:
       label: availabilityzone name
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            - main
+            source_type: HEAT
+            param_name: availability_zone_0
       type: string
       description: availabilityzone name
     cmaui_oam_ips:
       label: CMAUI oam_net IP addresses
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            - main
+            source_type: HEAT
+            param_name: cmaui_oam_ips
       type: list
       description: CMAUI oam_net IP addresses
       entry_schema:
@@ -102,28 +234,72 @@ topology_template:
       label: dns server
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            - main
+            source_type: HEAT
+            param_name: external_dns
       type: string
       description: dns server
     server_cmaui21:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            source_type: HEAT
+            param_name: server_cmaui21
       type: string
       description: nova server id
     oam_net_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            - main
+            source_type: HEAT
+            param_name: oam_net_name
       type: string
       description: UID of OAM network
     CMAUI_volume_type:
       label: CMAUI vm volume type
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            - main
+            source_type: HEAT
+            param_name: CMAUI_volume_type
       type: string
       description: the name of the target volume backend
     external_ntp:
       label: ntp server
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            - main
+            source_type: HEAT
+            param_name: external_ntp
       type: string
       description: ntp server
   node_templates:
@@ -317,4 +493,4 @@ topology_template:
       - cmaui_port_2
       - server_cmaui2
       - server_cmaui1
-      - cmaui_port_1
\ No newline at end of file
+      - cmaui_port_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
index b48a12fabb..a6843e335d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
@@ -14,19 +14,51 @@ topology_template:
     cmaui_cinder_volume_size:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: cmaui_cinder_volume_size
       type: string
     contrail_net_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: contrail_net_name
       type: string
       description: network name of jsa log network
     CMAUI_volume_type:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: CMAUI_volume_type
       type: string
     jsa_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: jsa_name
       type: string
       description: network name of jsa log network
   node_templates:
@@ -151,4 +183,4 @@ topology_template:
       - test_vol1
       - test_resourceGroup
       - test_vol2
-      - test_nova
\ No newline at end of file
+      - test_nova
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/MainServiceTemplate.yaml
index eb88006897..ceb1117e4f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,12 +12,28 @@ topology_template:
       label: CMAUI Cinder volume size
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: cmaui_cinder_volume_size
       type: float
       description: the size of the CMAUI Cinder volume
     CMAUI_volume_type:
       label: CMAUI vm volume type
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: CMAUI_volume_type
       type: string
       description: the name of the target volume backend
   node_templates:
@@ -49,4 +65,4 @@ topology_template:
           Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
       members:
       - test_vol
-      - test_nested
\ No newline at end of file
+      - test_nested
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/MainServiceTemplate.yaml
index 68a215fb8a..3ae12abd30 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/MainServiceTemplate.yaml
@@ -14,6 +14,14 @@ topology_template:
     cmaui_names:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: cmaui_names
       type: list
       description: CMAUI1, CMAUI2 server names
       entry_schema:
@@ -21,27 +29,67 @@ topology_template:
     p1:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: p1
       type: string
       description: UID of OAM network
     cmaui_image:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: cmaui_image
       type: string
       description: Image for CMAUI server
     cmaui_flavor:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: cmaui_flavor
       type: string
       description: Flavor for CMAUI server
     cmaui_cinder_volume_size:
       label: CMAUI Cinder volume size
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: cmaui_cinder_volume_size
       type: float
       description: the size of the CMAUI Cinder volume
     security_group_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: security_group_name
       type: list
       description: CMAUI1, CMAUI2 server names
       entry_schema:
@@ -50,16 +98,40 @@ topology_template:
       label: availabilityzone name
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: availability_zone_0
       type: string
       description: availabilityzone name
     cmaui_oam_ips:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: cmaui_oam_ips
       type: string
     CMAUI_volume_type:
       label: CMAUI vm volume type
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: CMAUI_volume_type
       type: string
       description: the name of the target volume backend
   node_templates:
@@ -128,4 +200,4 @@ topology_template:
       - server_cmaui1
       - test_vol
       - cmaui_port_1
-      - test_nested
\ No newline at end of file
+      - test_nested
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml
index a55e57dc3d..a82686f24b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,6 +12,14 @@ topology_template:
     cmaui_names:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            source_type: HEAT
+            param_name: cmaui_names
       type: list
       description: CMAUI1, CMAUI2 server names
       entry_schema:
@@ -20,74 +28,179 @@ topology_template:
       label: CMAUI Cinder volume size
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            - main
+            source_type: HEAT
+            param_name: cmaui_cinder_volume_size
       type: float
       description: the size of the CMAUI Cinder volume
     timezone:
       label: timezone
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            source_type: HEAT
+            param_name: timezone
       type: string
       description: timezone
     security_group_name:
       label: security group name
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            source_type: HEAT
+            param_name: security_group_name
       type: string
       description: the name of security group
     cmaui_volume:
       label: CMAUI vm volume type
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            source_type: HEAT
+            param_name: cmaui_volume
       type: string
       description: the name of the target volume backend
     oam_network_netmask:
       label: oam network netmask
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            source_type: HEAT
+            param_name: oam_network_netmask
       type: string
       description: oam network gateway
     cmaui_volume_param1:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            source_type: HEAT
+            param_name: cmaui_volume_param1
       type: string
       description: nova server id
     cmaui_image:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            source_type: HEAT
+            param_name: cmaui_image
       type: string
       description: Image for CMAUI server
     vnf_id:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            source_type: HEAT
+            param_name: vnf_id
       type: string
       description: Unique ID for this VNF instance
       default: This_is_ths_MMSC-CMAUI_id
     cmaui_flavor:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            source_type: HEAT
+            param_name: cmaui_flavor
       type: string
       description: Flavor for CMAUI server
     oam_network_gateway:
       label: oam network gateway
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            source_type: HEAT
+            param_name: oam_network_gateway
       type: string
       description: oam network gateway
     cmaui_volume_param2:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            source_type: HEAT
+            param_name: cmaui_volume_param2
       type: string
       description: nova server id
     availability_zone_0:
       label: availabilityzone name
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            source_type: HEAT
+            param_name: availability_zone_0
       type: string
       description: availabilityzone name
     cmaui_oam_ips:
       label: CMAUI oam_net IP addresses
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            source_type: HEAT
+            param_name: cmaui_oam_ips
       type: list
       description: CMAUI oam_net IP addresses
       entry_schema:
@@ -96,23 +209,56 @@ topology_template:
       label: dns server
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            source_type: HEAT
+            param_name: external_dns
       type: string
       description: dns server
     oam_net_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            source_type: HEAT
+            param_name: oam_net_name
       type: string
       description: UID of OAM network
     CMAUI_volume_type:
       label: CMAUI vm volume type
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            - main
+            source_type: HEAT
+            param_name: CMAUI_volume_type
       type: string
       description: the name of the target volume backend
     external_ntp:
       label: ntp server
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            source_type: HEAT
+            param_name: external_ntp
       type: string
       description: ntp server
   node_templates:
@@ -269,4 +415,4 @@ topology_template:
       - cmaui_port_2
       - server_cmaui2
       - server_cmaui1
-      - cmaui_port_1
\ No newline at end of file
+      - cmaui_port_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
index f618ad4beb..1bd7482d06 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
@@ -14,32 +14,92 @@ topology_template:
     p2:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            source_type: HEAT
+            param_name: p2
       type: string
       description: shared_vol2
     cmaui_cinder_volume_size:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            - base
+            source_type: HEAT
+            param_name: cmaui_cinder_volume_size
       type: string
     shared_nova:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            source_type: HEAT
+            param_name: shared_nova
       type: string
     shared_vol1:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            source_type: HEAT
+            param_name: shared_vol1
       type: string
     contrail_net_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            - base
+            source_type: HEAT
+            param_name: contrail_net_name
       type: string
       description: network name of jsa log network
     CMAUI_volume_type:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            - base
+            source_type: HEAT
+            param_name: CMAUI_volume_type
       type: string
     jsa_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            - base
+            source_type: HEAT
+            param_name: jsa_name
       type: string
       description: network name of jsa log network
   node_templates:
@@ -175,4 +235,4 @@ topology_template:
       members:
       - test_nested1Level
       - test_nestedInvalidConnectionToNova
-      - test_resourceGroup
\ No newline at end of file
+      - test_resourceGroup
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/MainServiceTemplate.yaml
index c8cf1df9cd..b0b26f59fa 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,22 +12,56 @@ topology_template:
       label: CMAUI Cinder volume size
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            - main
+            source_type: HEAT
+            param_name: cmaui_cinder_volume_size
       type: float
       description: the size of the CMAUI Cinder volume
     shared_vol1:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            source_type: HEAT
+            param_name: shared_vol1
       type: string
       description: volume name
     shared_vol2:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            source_type: HEAT
+            param_name: shared_vol2
       type: string
       description: volume name
     CMAUI_volume_type:
       label: CMAUI vm volume type
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            - main
+            source_type: HEAT
+            param_name: CMAUI_volume_type
       type: string
       description: the name of the target volume backend
   node_templates:
@@ -87,4 +121,4 @@ topology_template:
       - test_nested
   outputs:
     out1_not_shared:
-      value: test_nested
\ No newline at end of file
+      value: test_nested
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/MainServiceTemplate.yaml
index e73284b3b5..eaed82b0ea 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/MainServiceTemplate.yaml
@@ -14,6 +14,14 @@ topology_template:
     cmaui_names:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: cmaui_names
       type: list
       description: CMAUI1, CMAUI2 server names
       entry_schema:
@@ -21,27 +29,68 @@ topology_template:
     p1:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: p1
       type: string
       description: UID of OAM network
     cmaui_image:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: cmaui_image
       type: string
       description: Image for CMAUI server
     cmaui_flavor:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: cmaui_flavor
       type: string
       description: Flavor for CMAUI server
     cmaui_cinder_volume_size:
       label: CMAUI Cinder volume size
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            - main
+            source_type: HEAT
+            param_name: cmaui_cinder_volume_size
       type: float
       description: the size of the CMAUI Cinder volume
     security_group_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: security_group_name
       type: list
       description: CMAUI1, CMAUI2 server names
       entry_schema:
@@ -50,26 +99,67 @@ topology_template:
       label: availabilityzone name
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: availability_zone_0
       type: string
       description: availabilityzone name
     shared_vol1:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            source_type: HEAT
+            param_name: shared_vol1
       type: string
       description: volume name
     cmaui_oam_ips:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: cmaui_oam_ips
       type: string
     shared_vol2:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            source_type: HEAT
+            param_name: shared_vol2
       type: string
       description: volume name
     CMAUI_volume_type:
       label: CMAUI vm volume type
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - addOn
+            - main
+            source_type: HEAT
+            param_name: CMAUI_volume_type
       type: string
       description: the name of the target volume backend
   node_templates:
@@ -163,4 +253,4 @@ topology_template:
       - test_nested
   outputs:
     out1_not_shared:
-      value: test_nested
\ No newline at end of file
+      value: test_nested