4 files changed, 683 insertions, 750 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUC/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUC/expectedoutputfiles/MainServiceTemplate.yaml
deleted file mode 100644
index 746966189d..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUC/expectedoutputfiles/MainServiceTemplate.yaml
+++ /dev/null
@@ -1,750 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
-  template_name: Main
-imports:
-- openecomp_heat_index:
-    file: openecomp-heat/_index.yml
-node_types:
-  org.openecomp.resource.vfc.nodes.heat.FSB2:
-    derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
-  org.openecomp.resource.vfc.nodes.heat.FSB1:
-    derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
-topology_template:
-  inputs:
-    Internal2_name:
-      label: Internal2_name
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: Internal2_name
-      type: string
-      description: Internal2_name
-    FSB1_volume_name:
-      label: FSB1_volume
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: FSB1_volume_name
-      type: string
-      description: FSB1_volume_1
-    jsa_cidr:
-      label: jsa_cidr
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: jsa_cidr
-      type: string
-      description: jsa_cidr
-    availabilityzone_name:
-      label: availabilityzone_name
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: availabilityzone_name
-      type: string
-      description: availabilityzone_name
-    Internal2_external:
-      label: Internal2_external
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: Internal2_external
-      type: string
-      description: Internal2_external
-    vipr_atm_name_0:
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: vipr_atm_name_0
-      type: string
-      description: prop
-    Internal2_forwarding_mode:
-      label: Internal2_forwarding_mode
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: Internal2_forwarding_mode
-      type: string
-      description: Internal2_forwarding_mode
-    pcrf_vnf_id:
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: pcrf_vnf_id
-      type: string
-      description: prop
-    FSB_1_image:
-      label: MME_FSB1
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: FSB_1_image
-      type: string
-      description: MME_FSB1_15B-CP04-r5a01
-    fsb1-Internal1-mac:
-      label: FSB1_internal_mac
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: fsb1-Internal1-mac
-      type: string
-      description: FSB1_internal_mac
-    pcm_server_name:
-      label: pcm_server_name
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: pcm_server_name
-      type: string
-      description: pcm_server_name
-    oam_net_name:
-      label: oam_net_name
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: oam_net_name
-      type: string
-      description: oam_net_name
-    fsb1-Internal2-mac:
-      label: FSB1_internal_mac
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: fsb1-Internal2-mac
-      type: string
-      description: FSB1_internal_mac
-    fsb_zone:
-      label: FSB1_zone
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: fsb_zone
-      type: string
-      description: FSB1_zone
-    oam_net_gw:
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: oam_net_gw
-      type: string
-      description: prop
-    VMME_FSB1_boot_volume:
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: VMME_FSB1_boot_volume
-      type: string
-    network_name:
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: network_name
-      type: string
-      description: prop
-    cps_net_ip:
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: cps_net_ip
-      type: string
-      description: prop
-    pcrf_psm_server_name:
-      label: pcrf_psm_server_name
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: pcrf_psm_server_name
-      type: string
-      description: pcrf_psm_server_name
-    pcm_flavor_name:
-      label: pcm_flavor_name
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: pcm_flavor_name
-      type: string
-      description: pcm_flavor_name
-    pcrf_cps_net_ip:
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: pcrf_cps_net_ip
-      type: string
-      description: prop
-    fsb2-Internal1-mac:
-      label: FSB1_internal_mac
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: fsb2-Internal1-mac
-      type: string
-      description: FSB1_internal_mac
-    pcrf_cps_net_name:
-      label: pcrf_cps_net_name
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: pcrf_cps_net_name
-      type: string
-      description: pcrf_cps_net_name
-    pcm_vol:
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: pcm_vol
-      type: string
-      description: prop
-    Internal1_external:
-      label: Internal1_external
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: Internal1_external
-      type: string
-      description: Internal1_external
-    Internal1_shared:
-      label: Internal1_shared
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: Internal1_shared
-      type: string
-      description: Internal1_shared
-    fsb1-name:
-      label: FSB1_name
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: fsb1-name
-      type: string
-      description: FSB1_name
-    pcm_image_name:
-      label: pcm_image_name
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: pcm_image_name
-      type: string
-      description: pcm_image_name
-    pcrf_psm_flavor_name:
-      label: pcrf_psm_flavor_name
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: pcrf_psm_flavor_name
-      type: string
-      description: pcrf_psm_flavor_name
-    pcrf_psm_image_name:
-      label: pcrf_psm_image_name
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: pcrf_psm_image_name
-      type: string
-      description: pcrf_psm_image_name
-    snapshot01:
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: snapshot01
-      type: string
-      description: prop
-    volume_size:
-      label: volume size
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: volume_size
-      type: float
-      description: my volume size 320GB
-    snapshot02:
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: snapshot02
-      type: string
-      description: prop
-    Internal2_shared:
-      label: Internal2_shared
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: Internal2_shared
-      type: string
-      description: Internal2_shared
-    cps_net_mask:
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: cps_net_mask
-      type: string
-      description: prop
-    Internal1_net_name:
-      label: Internal1_net_name
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: Internal1_net_name
-      type: string
-      description: Internal1_net_name
-    fsb1-flavor:
-      label: FSB1_flavor
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: fsb1-flavor
-      type: string
-      description: FSB1_flavor
-    pcm_vol_01:
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: pcm_vol_01
-      type: string
-      description: prop
-    volume_type:
-      label: volume type
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: volume_type
-      type: string
-      description: volume type Gold
-    fsb1-zone:
-      label: FSB1_zone
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: fsb1-zone
-      type: string
-      description: FSB1_zone
-    security_group_name:
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: security_group_name
-      type: list
-      description: CMAUI1, CMAUI2 server names
-      entry_schema:
-        type: string
-    jsa_net_name:
-      label: jsa_net_name
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: jsa_net_name
-      type: string
-      description: jsa_net_name
-    port_name:
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: port_name
-      type: string
-      description: prop
-    oam_net_id:
-      label: oam_net_id
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: oam_net_id
-      type: string
-      description: oam_net_id
-    Internal1_forwarding_mode:
-      label: Internal1_forwarding_mode
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: Internal1_forwarding_mode
-      type: string
-      description: Internal1_forwarding_mode
-    cps_net_name:
-      label: cps_net_name
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: cps_net_name
-      type: string
-      description: cps_net_name
-    oam_net_ip:
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: oam_net_ip
-      type: string
-      description: prop
-    oam_net_mask:
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: oam_net_mask
-      type: string
-      description: prop
-    fsb1-oam-ip:
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: fsb1-oam-ip
-      type: string
-      description: prop
-    pcrf_security_group_name:
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - ep-jsa_net
-            source_type: HEAT
-            param_name: pcrf_security_group_name
-      type: list
-      description: CMAUI1, CMAUI2 server names
-      entry_schema:
-        type: string
-  node_templates:
-    VMI1:
-      type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
-      properties:
-        name:
-          str_replace:
-            template: VM_NAME_PORT_3
-            params:
-              VM_NAME:
-                get_input: vipr_atm_name_0
-        virtual_network_refs:
-        - get_input: network_name
-        virtual_machine_interface_properties:
-          service_interface_type: left
-        port_tuple_refs:
-        - get_input: port_name
-    FSB2:
-      type: org.openecomp.resource.vfc.nodes.heat.FSB2
-      properties:
-        flavor:
-          get_input: fsb1-flavor
-        availability_zone:
-          get_input: fsb_zone
-        name:
-          get_attribute:
-          - VMI1
-          - virtual_machine_interface_allowed_address_pairs
-          - allowed_address_pair
-          - ip
-          - ip_prefix
-    FSB1:
-      type: org.openecomp.resource.vfc.nodes.heat.FSB1
-      properties:
-        flavor:
-          get_input: fsb1-flavor
-        availability_zone:
-          get_input: fsb_zone
-        name:
-          get_attribute:
-          - VMI1
-          - name
-  groups:
-    ep-jsa_net_group:
-      type: org.openecomp.groups.heat.HeatStack
-      properties:
-        heat_file: ../Artifacts/ep-jsa_net.yaml
-        description: |
-          Version 2.0 02-09-2016 (Authors: Paul Phillips, pp2854 PROD)
-      members:
-      - VMI1
-      - FSB2
-      - FSB1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUC/expectedoutputfiles/ep-jsa_netServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUC/expectedoutputfiles/ep-jsa_netServiceTemplate.yaml
new file mode 100644
index 0000000000..23ea24e3dd
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUC/expectedoutputfiles/ep-jsa_netServiceTemplate.yaml
@@ -0,0 +1,656 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+  template_name: ep-jsa_net
+imports:
+- openecomp_heat_index:
+    file: openecomp-heat/_index.yml
+- GlobalSubstitutionTypes:
+    file: GlobalSubstitutionTypesServiceTemplate.yaml
+node_types:
+  org.openecomp.resource.vfc.nodes.heat.FSB2:
+    derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
+  org.openecomp.resource.vfc.nodes.heat.FSB1:
+    derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
+topology_template:
+  inputs:
+    Internal2_name:
+      label: Internal2_name
+      hidden: false
+      immutable: false
+      type: string
+      description: Internal2_name
+    FSB1_volume_name:
+      label: FSB1_volume
+      hidden: false
+      immutable: false
+      type: string
+      description: FSB1_volume_1
+    jsa_cidr:
+      label: jsa_cidr
+      hidden: false
+      immutable: false
+      type: string
+      description: jsa_cidr
+    availabilityzone_name:
+      label: availabilityzone_name
+      hidden: false
+      immutable: false
+      type: string
+      description: availabilityzone_name
+    Internal2_external:
+      label: Internal2_external
+      hidden: false
+      immutable: false
+      type: string
+      description: Internal2_external
+    vipr_atm_name_0:
+      hidden: false
+      immutable: false
+      type: string
+      description: prop
+    Internal2_forwarding_mode:
+      label: Internal2_forwarding_mode
+      hidden: false
+      immutable: false
+      type: string
+      description: Internal2_forwarding_mode
+    pcrf_vnf_id:
+      hidden: false
+      immutable: false
+      type: string
+      description: prop
+    FSB_1_image:
+      label: MME_FSB1
+      hidden: false
+      immutable: false
+      type: string
+      description: MME_FSB1_15B-CP04-r5a01
+    fsb1-Internal1-mac:
+      label: FSB1_internal_mac
+      hidden: false
+      immutable: false
+      type: string
+      description: FSB1_internal_mac
+    pcm_server_name:
+      label: pcm_server_name
+      hidden: false
+      immutable: false
+      type: string
+      description: pcm_server_name
+    oam_net_name:
+      label: oam_net_name
+      hidden: false
+      immutable: false
+      type: string
+      description: oam_net_name
+    fsb1-Internal2-mac:
+      label: FSB1_internal_mac
+      hidden: false
+      immutable: false
+      type: string
+      description: FSB1_internal_mac
+    fsb_zone:
+      label: FSB1_zone
+      hidden: false
+      immutable: false
+      type: string
+      description: FSB1_zone
+    oam_net_gw:
+      hidden: false
+      immutable: false
+      type: string
+      description: prop
+    VMME_FSB1_boot_volume:
+      hidden: false
+      immutable: false
+      type: string
+    network_name:
+      hidden: false
+      immutable: false
+      type: string
+      description: prop
+    cps_net_ip:
+      hidden: false
+      immutable: false
+      type: string
+      description: prop
+    pcrf_psm_server_name:
+      label: pcrf_psm_server_name
+      hidden: false
+      immutable: false
+      type: string
+      description: pcrf_psm_server_name
+    pcm_flavor_name:
+      label: pcm_flavor_name
+      hidden: false
+      immutable: false
+      type: string
+      description: pcm_flavor_name
+    pcrf_cps_net_ip:
+      hidden: false
+      immutable: false
+      type: string
+      description: prop
+    fsb2-Internal1-mac:
+      label: FSB1_internal_mac
+      hidden: false
+      immutable: false
+      type: string
+      description: FSB1_internal_mac
+    pcrf_cps_net_name:
+      label: pcrf_cps_net_name
+      hidden: false
+      immutable: false
+      type: string
+      description: pcrf_cps_net_name
+    pcm_vol:
+      hidden: false
+      immutable: false
+      type: string
+      description: prop
+    Internal1_external:
+      label: Internal1_external
+      hidden: false
+      immutable: false
+      type: string
+      description: Internal1_external
+    Internal1_shared:
+      label: Internal1_shared
+      hidden: false
+      immutable: false
+      type: string
+      description: Internal1_shared
+    fsb1-name:
+      label: FSB1_name
+      hidden: false
+      immutable: false
+      type: string
+      description: FSB1_name
+    pcm_image_name:
+      label: pcm_image_name
+      hidden: false
+      immutable: false
+      type: string
+      description: pcm_image_name
+    pcrf_psm_flavor_name:
+      label: pcrf_psm_flavor_name
+      hidden: false
+      immutable: false
+      type: string
+      description: pcrf_psm_flavor_name
+    pcrf_psm_image_name:
+      label: pcrf_psm_image_name
+      hidden: false
+      immutable: false
+      type: string
+      description: pcrf_psm_image_name
+    snapshot01:
+      hidden: false
+      immutable: false
+      type: string
+      description: prop
+    volume_size:
+      label: volume size
+      hidden: false
+      immutable: false
+      type: float
+      description: my volume size 320GB
+    snapshot02:
+      hidden: false
+      immutable: false
+      type: string
+      description: prop
+    Internal2_shared:
+      label: Internal2_shared
+      hidden: false
+      immutable: false
+      type: string
+      description: Internal2_shared
+    cps_net_mask:
+      hidden: false
+      immutable: false
+      type: string
+      description: prop
+    Internal1_net_name:
+      label: Internal1_net_name
+      hidden: false
+      immutable: false
+      type: string
+      description: Internal1_net_name
+    fsb1-flavor:
+      label: FSB1_flavor
+      hidden: false
+      immutable: false
+      type: string
+      description: FSB1_flavor
+    pcm_vol_01:
+      hidden: false
+      immutable: false
+      type: string
+      description: prop
+    volume_type:
+      label: volume type
+      hidden: false
+      immutable: false
+      type: string
+      description: volume type Gold
+    fsb1-zone:
+      label: FSB1_zone
+      hidden: false
+      immutable: false
+      type: string
+      description: FSB1_zone
+    security_group_name:
+      hidden: false
+      immutable: false
+      type: list
+      description: CMAUI1, CMAUI2 server names
+      entry_schema:
+        type: string
+    jsa_net_name:
+      label: jsa_net_name
+      hidden: false
+      immutable: false
+      type: string
+      description: jsa_net_name
+    port_name:
+      hidden: false
+      immutable: false
+      type: string
+      description: prop
+    oam_net_id:
+      label: oam_net_id
+      hidden: false
+      immutable: false
+      type: string
+      description: oam_net_id
+    Internal1_forwarding_mode:
+      label: Internal1_forwarding_mode
+      hidden: false
+      immutable: false
+      type: string
+      description: Internal1_forwarding_mode
+    cps_net_name:
+      label: cps_net_name
+      hidden: false
+      immutable: false
+      type: string
+      description: cps_net_name
+    oam_net_ip:
+      hidden: false
+      immutable: false
+      type: string
+      description: prop
+    oam_net_mask:
+      hidden: false
+      immutable: false
+      type: string
+      description: prop
+    fsb1-oam-ip:
+      hidden: false
+      immutable: false
+      type: string
+      description: prop
+    pcrf_security_group_name:
+      hidden: false
+      immutable: false
+      type: list
+      description: CMAUI1, CMAUI2 server names
+      entry_schema:
+        type: string
+  node_templates:
+    VMI1:
+      type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
+      properties:
+        name:
+          str_replace:
+            template: VM_NAME_PORT_3
+            params:
+              VM_NAME:
+                get_input: vipr_atm_name_0
+        virtual_network_refs:
+        - get_input: network_name
+        virtual_machine_interface_properties:
+          service_interface_type: left
+        port_tuple_refs:
+        - get_input: port_name
+    FSB2:
+      type: org.openecomp.resource.vfc.nodes.heat.FSB2
+      properties:
+        flavor:
+          get_input: fsb1-flavor
+        availability_zone:
+          get_input: fsb_zone
+        name:
+          get_attribute:
+          - VMI1
+          - virtual_machine_interface_allowed_address_pairs
+          - allowed_address_pair
+          - ip
+          - ip_prefix
+    FSB1:
+      type: org.openecomp.resource.vfc.nodes.heat.FSB1
+      properties:
+        flavor:
+          get_input: fsb1-flavor
+        availability_zone:
+          get_input: fsb_zone
+        name:
+          get_attribute:
+          - VMI1
+          - name
+  groups:
+    ep-jsa_net_group:
+      type: org.openecomp.groups.heat.HeatStack
+      properties:
+        heat_file: ../Artifacts/ep-jsa_net.yaml
+        description: |
+          Version 2.0 02-09-2016 (Authors: Paul Phillips, pp2854 PROD)
+      members:
+      - VMI1
+      - FSB2
+      - FSB1
+  substitution_mappings:
+    node_type: org.openecomp.resource.abstract.nodes.heat.ep-jsa_net
+    capabilities:
+      disk.device.write.requests.rate_FSB2:
+      - FSB2
+      - disk.device.write.requests.rate
+      disk.read.bytes.rate_FSB2:
+      - FSB2
+      - disk.read.bytes.rate
+      disk.read.bytes_FSB2:
+      - FSB2
+      - disk.read.bytes
+      disk.capacity_FSB2:
+      - FSB2
+      - disk.capacity
+      disk.capacity_FSB1:
+      - FSB1
+      - disk.capacity
+      disk.read.bytes.rate_FSB1:
+      - FSB1
+      - disk.read.bytes.rate
+      disk.device.latency_FSB2:
+      - FSB2
+      - disk.device.latency
+      disk.device.latency_FSB1:
+      - FSB1
+      - disk.device.latency
+      disk.allocation_FSB2:
+      - FSB2
+      - disk.allocation
+      disk.device.capacity_FSB2:
+      - FSB2
+      - disk.device.capacity
+      disk.allocation_FSB1:
+      - FSB1
+      - disk.allocation
+      disk.read.bytes_FSB1:
+      - FSB1
+      - disk.read.bytes
+      disk.device.capacity_FSB1:
+      - FSB1
+      - disk.device.capacity
+      cpu_util_FSB2:
+      - FSB2
+      - cpu_util
+      cpu_util_FSB1:
+      - FSB1
+      - cpu_util
+      disk.device.write.requests.rate_FSB1:
+      - FSB1
+      - disk.device.write.requests.rate
+      network.outpoing.packets_VMI1:
+      - VMI1
+      - network.outpoing.packets
+      disk.root.size_FSB1:
+      - FSB1
+      - disk.root.size
+      feature_FSB1:
+      - FSB1
+      - feature
+      network.incoming.packets_VMI1:
+      - VMI1
+      - network.incoming.packets
+      feature_FSB2:
+      - FSB2
+      - feature
+      memory.resident_FSB2:
+      - FSB2
+      - memory.resident
+      memory.resident_FSB1:
+      - FSB1
+      - memory.resident
+      disk.write.requests.rate_FSB2:
+      - FSB2
+      - disk.write.requests.rate
+      cpu_FSB1:
+      - FSB1
+      - cpu
+      network.incoming.bytes_VMI1:
+      - VMI1
+      - network.incoming.bytes
+      disk.write.requests.rate_FSB1:
+      - FSB1
+      - disk.write.requests.rate
+      instance_FSB2:
+      - FSB2
+      - instance
+      cpu_FSB2:
+      - FSB2
+      - cpu
+      instance_FSB1:
+      - FSB1
+      - instance
+      disk.device.read.bytes.rate_FSB1:
+      - FSB1
+      - disk.device.read.bytes.rate
+      disk.device.read.bytes.rate_FSB2:
+      - FSB2
+      - disk.device.read.bytes.rate
+      network.outgoing.packets.rate_VMI1:
+      - VMI1
+      - network.outgoing.packets.rate
+      disk.root.size_FSB2:
+      - FSB2
+      - disk.root.size
+      feature_VMI1:
+      - VMI1
+      - feature
+      cpu.delta_FSB1:
+      - FSB1
+      - cpu.delta
+      cpu.delta_FSB2:
+      - FSB2
+      - cpu.delta
+      disk.write.bytes_FSB2:
+      - FSB2
+      - disk.write.bytes
+      disk.write.bytes_FSB1:
+      - FSB1
+      - disk.write.bytes
+      disk.device.read.requests.rate_FSB2:
+      - FSB2
+      - disk.device.read.requests.rate
+      disk.device.read.requests.rate_FSB1:
+      - FSB1
+      - disk.device.read.requests.rate
+      disk.ephemeral.size_FSB2:
+      - FSB2
+      - disk.ephemeral.size
+      disk.device.read.requests_FSB1:
+      - FSB1
+      - disk.device.read.requests
+      disk.device.read.requests_FSB2:
+      - FSB2
+      - disk.device.read.requests
+      disk.ephemeral.size_FSB1:
+      - FSB1
+      - disk.ephemeral.size
+      network.outgoing.bytes_VMI1:
+      - VMI1
+      - network.outgoing.bytes
+      binding_FSB1:
+      - FSB1
+      - binding
+      disk.device.write.bytes_FSB1:
+      - FSB1
+      - disk.device.write.bytes
+      binding_FSB2:
+      - FSB2
+      - binding
+      disk.device.write.bytes_FSB2:
+      - FSB2
+      - disk.device.write.bytes
+      memory_FSB1:
+      - FSB1
+      - memory
+      memory_FSB2:
+      - FSB2
+      - memory
+      disk.device.read.bytes_FSB2:
+      - FSB2
+      - disk.device.read.bytes
+      disk.device.read.bytes_FSB1:
+      - FSB1
+      - disk.device.read.bytes
+      disk.device.usage_FSB1:
+      - FSB1
+      - disk.device.usage
+      scalable_FSB2:
+      - FSB2
+      - scalable
+      disk.write.bytes.rate_FSB1:
+      - FSB1
+      - disk.write.bytes.rate
+      disk.write.bytes.rate_FSB2:
+      - FSB2
+      - disk.write.bytes.rate
+      disk.device.usage_FSB2:
+      - FSB2
+      - disk.device.usage
+      scalable_FSB1:
+      - FSB1
+      - scalable
+      disk.write.requests_FSB2:
+      - FSB2
+      - disk.write.requests
+      disk.usage_FSB1:
+      - FSB1
+      - disk.usage
+      os_FSB2:
+      - FSB2
+      - os
+      disk.usage_FSB2:
+      - FSB2
+      - disk.usage
+      host_FSB1:
+      - FSB1
+      - host
+      disk.device.allocation_FSB2:
+      - FSB2
+      - disk.device.allocation
+      disk.device.allocation_FSB1:
+      - FSB1
+      - disk.device.allocation
+      os_FSB1:
+      - FSB1
+      - os
+      vcpus_FSB1:
+      - FSB1
+      - vcpus
+      vcpus_FSB2:
+      - FSB2
+      - vcpus
+      host_FSB2:
+      - FSB2
+      - host
+      disk.write.requests_FSB1:
+      - FSB1
+      - disk.write.requests
+      disk.device.write.bytes.rate_FSB1:
+      - FSB1
+      - disk.device.write.bytes.rate
+      disk.device.write.bytes.rate_FSB2:
+      - FSB2
+      - disk.device.write.bytes.rate
+      endpoint_FSB1:
+      - FSB1
+      - endpoint
+      endpoint_FSB2:
+      - FSB2
+      - endpoint
+      forwarder_VMI1:
+      - VMI1
+      - forwarder
+      disk.latency_FSB1:
+      - FSB1
+      - disk.latency
+      disk.latency_FSB2:
+      - FSB2
+      - disk.latency
+      memory.usage_FSB1:
+      - FSB1
+      - memory.usage
+      network.outgoing.bytes.rate_VMI1:
+      - VMI1
+      - network.outgoing.bytes.rate
+      disk.read.requests_FSB2:
+      - FSB2
+      - disk.read.requests
+      disk.read.requests_FSB1:
+      - FSB1
+      - disk.read.requests
+      disk.device.write.requests_FSB1:
+      - FSB1
+      - disk.device.write.requests
+      disk.device.iops_FSB2:
+      - FSB2
+      - disk.device.iops
+      network.incoming.bytes.rate_VMI1:
+      - VMI1
+      - network.incoming.bytes.rate
+      disk.device.write.requests_FSB2:
+      - FSB2
+      - disk.device.write.requests
+      network.incoming.packets.rate_VMI1:
+      - VMI1
+      - network.incoming.packets.rate
+      disk.iops_FSB1:
+      - FSB1
+      - disk.iops
+      binding_VMI1:
+      - VMI1
+      - binding
+      memory.usage_FSB2:
+      - FSB2
+      - memory.usage
+      disk.device.iops_FSB1:
+      - FSB1
+      - disk.device.iops
+      disk.iops_FSB2:
+      - FSB2
+      - disk.iops
+    requirements:
+      dependency_FSB1:
+      - FSB1
+      - dependency
+      link_VMI1:
+      - VMI1
+      - link
+      dependency_FSB2:
+      - FSB2
+      - dependency
+      dependency_VMI1:
+      - VMI1
+      - dependency
+      local_storage_FSB1:
+      - FSB1
+      - local_storage
+      local_storage_FSB2:
+      - FSB2
+      - local_storage
+      binding_VMI1:
+      - VMI1
+      - binding
+\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUC/inputfiles/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUC/inputfiles/MANIFEST.json
index 021b40da66..ef69faf321 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUC/inputfiles/MANIFEST.json
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUC/inputfiles/MANIFEST.json
@@ -4,6 +4,11 @@
   "version": "2013-05-23",
   "data": [
     {
+      "file": "base_ep-jsa_net.yaml",
+      "type": "HEAT",
+      "isBase": "true"
+    },
+    {
       "file": "ep-jsa_net.yaml",
       "type": "HEAT"
     },
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUC/inputfiles/base_ep-jsa_net.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUC/inputfiles/base_ep-jsa_net.yaml
new file mode 100644
index 0000000000..516d92a9ea
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUC/inputfiles/base_ep-jsa_net.yaml
@@ -0,0 +1,22 @@
+heat_template_version: 2013-05-23
+
+description: >
+  Version 2.0 02-09-2016 (Authors: Paul Phillips, pp2854 PROD)
+
+parameters:
+  lb_st_interface_type_oam:
+    type: string
+
+
+resources:
+  template_VMInt_INT1_VLC:
+    type: OS::Heat::ResourceGroup
+    properties:
+      count: 3
+      resource_def:
+        type: ep-jsa_net.yaml
+        properties:
+          virtual_machine_interface_properties:
+            {
+              virtual_machine_interface_properties_service_interface_type: { get_param: lb_st_interface_type_oam },
+            }
+\ No newline at end of file