push addional code

Change-Id: Ia427bb3460cda3a896f8faced2de69eaf3807b74
Signed-off-by: Michael Lando <ml636r@att.com>

6 files changed, 1068 insertions, 0 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
new file mode 100644
index 0000000000..1b1c4dd621
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -0,0 +1,166 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+  template_name: GlobalSubstitutionTypes
+imports:
+  ContrailComputeGlobalTypes:
+    file: ContrailComputeGlobalTypesServiceTemplate.yaml
+  CinderVolumeGlobalTypes:
+    file: CinderVolumeGlobalTypesServiceTemplate.yaml
+  ContrailVirtualNetworkGlobalType:
+    file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml
+  AbstractSubstituteGlobalTypes:
+    file: AbstractSubstituteGlobalTypesServiceTemplate.yaml
+  ContrailPortGlobalTypes:
+    file: ContrailPortGlobalTypesServiceTemplate.yaml
+  NeutronPortGlobalTypes:
+    file: NeutronPortGlobalTypesServiceTemplate.yaml
+  NeutronNetGlobalTypes:
+    file: NeutronNetGlobalTypesServiceTemplate.yaml
+  CommonGlobalTypes:
+    file: CommonGlobalTypesServiceTemplate.yaml
+  ContrailAbstractSubstituteGlobalTypes:
+    file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml
+  ContrailNetworkRuleGlobalType:
+    file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml
+  NeutronSecurityRulesGlobalTypes:
+    file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml
+  NovaServerGlobalTypes:
+    file: NovaServerGlobalTypesServiceTemplate.yaml
+  ContrailV2VirtualMachineInterfaceGlobalType:
+    file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml
+node_types:
+  org.openecomp.resource.abstract.nodes.heat.mvs.nested.heat:
+    derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute
+    properties:
+      vf_module_id:
+        type: string
+        description: Unique ID for this VF_MODULE instance
+      vf_name:
+        type: string
+        description: The VF Name; defaults to VMVM for the virtual MVM VNF.
+        constraints:
+        - pattern: '[a-zA-Z0-9]+'
+        - max_length: 4
+        - min_length: 4
+      cloud_zone_id:
+        type: string
+        description: The cloud zone for this VF instance
+      vf_instance_num:
+        type: string
+        description: The number for this VF instance
+        constraints:
+        - pattern: '[0-9]+'
+        - max_length: 2
+        - min_length: 2
+      virtual_mgmt_ip_0:
+        type: string
+        description: Virtual management network ip address
+      indx:
+        type: float
+        description: Index of the current instance
+      mvs_mgmt_ip_0:
+        type: list
+        description: List of Management network IP addresses for IPv4
+        entry_schema:
+          type: string
+      flavor:
+        type: string
+        description: Server flavor
+        constraints: [
+          ]
+      key_name:
+        type: string
+        description: SSH key name
+        constraints: [
+          ]
+      vnf_id:
+        type: string
+        description: Unique ID for this VF instance
+      availability_zone_0:
+        type: list
+        description: List of Availability Zone IDs or Names
+        entry_schema:
+          type: string
+      mgmt_net_id:
+        type: string
+        description: Neutron UUID for the Management network
+        constraints: [
+          ]
+      vm_instance_num:
+        type: list
+        description: VM instance number list must be a list of three-digit numeric value
+        entry_schema:
+          type: string
+      bootimage:
+        type: string
+        description: Master bootimage volume id
+      sec_groups:
+        type: list
+        description: Security groups
+        entry_schema:
+          type: string
+      vf_component:
+        type: string
+        description: The component that this VF instance is running
+        constraints:
+        - pattern: '[a-zA-Z0-9]+'
+        - max_length: 3
+        - min_length: 3
+    requirements:
+    - local_storage_vnfci:
+        capability: tosca.capabilities.Attachment
+        node: tosca.nodes.BlockStorage
+        relationship: tosca.relationships.AttachesTo
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - link_mgmt_port:
+        capability: tosca.capabilities.network.Linkable
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
+    capabilities:
+      os_vnfci:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      attachment_mgmt_port:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      endpoint_vnfci:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      host_vnfci:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      binding_vnfci:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      attachment_boot_volume:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      scalable_vnfci:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      attachment_data_volume:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/MainServiceTemplate.yaml
new file mode 100644
index 0000000000..ffddcce43c
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/MainServiceTemplate.yaml
@@ -0,0 +1,240 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+  template_name: Main
+imports:
+  ContrailComputeGlobalTypes:
+    file: ContrailComputeGlobalTypesServiceTemplate.yaml
+  CinderVolumeGlobalTypes:
+    file: CinderVolumeGlobalTypesServiceTemplate.yaml
+  ContrailVirtualNetworkGlobalType:
+    file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml
+  AbstractSubstituteGlobalTypes:
+    file: AbstractSubstituteGlobalTypesServiceTemplate.yaml
+  ContrailPortGlobalTypes:
+    file: ContrailPortGlobalTypesServiceTemplate.yaml
+  GlobalSubstitutionTypes:
+    file: GlobalSubstitutionTypesServiceTemplate.yaml
+  NeutronPortGlobalTypes:
+    file: NeutronPortGlobalTypesServiceTemplate.yaml
+  NeutronNetGlobalTypes:
+    file: NeutronNetGlobalTypesServiceTemplate.yaml
+  CommonGlobalTypes:
+    file: CommonGlobalTypesServiceTemplate.yaml
+  ContrailAbstractSubstituteGlobalTypes:
+    file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml
+  ContrailNetworkRuleGlobalType:
+    file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml
+  NeutronSecurityRulesGlobalTypes:
+    file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml
+  NovaServerGlobalTypes:
+    file: NovaServerGlobalTypesServiceTemplate.yaml
+  ContrailV2VirtualMachineInterfaceGlobalType:
+    file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml
+topology_template:
+  inputs:
+    vf_module_id:
+      hidden: false
+      immutable: false
+      type: string
+      description: Unique ID for this VF_MODULE instance
+    vf_name:
+      hidden: false
+      immutable: false
+      type: string
+      description: The VF Name; defaults to VMVM for the virtual MVM VNF.
+      constraints:
+      - pattern: '[a-zA-Z0-9]+'
+      - max_length: 4
+      - min_length: 4
+    cloud_zone_id:
+      hidden: false
+      immutable: false
+      type: string
+      description: The cloud zone for this VF instance
+    vf_instance_num:
+      hidden: false
+      immutable: false
+      type: string
+      description: The number for this VF instance
+      constraints:
+      - pattern: '[0-9]+'
+      - max_length: 2
+      - min_length: 2
+    virtual_mgmt_ip_0:
+      hidden: false
+      immutable: false
+      type: string
+      description: Virtual management network ip address
+    mvs_mgmt_ip_0:
+      hidden: false
+      immutable: false
+      type: list
+      description: List of Management network IP addresses for IPv4
+      entry_schema:
+        type: string
+    flavor:
+      hidden: false
+      immutable: false
+      type: string
+      description: Server flavor
+      constraints: [
+        ]
+    key_name:
+      hidden: false
+      immutable: false
+      type: string
+      description: SSH key name
+      constraints: [
+        ]
+    vnf_id:
+      hidden: false
+      immutable: false
+      type: string
+      description: Unique ID for this VF instance
+    availability_zone_0:
+      hidden: false
+      immutable: false
+      type: list
+      description: List of Availability Zone IDs or Names
+      entry_schema:
+        type: string
+    mgmt_net_id:
+      hidden: false
+      immutable: false
+      type: string
+      description: Neutron UUID for the Management network
+      constraints: [
+        ]
+    vm_instance_num:
+      hidden: false
+      immutable: false
+      type: list
+      description: VM instance number list must be a list of three-digit numeric value
+      entry_schema:
+        type: string
+    bootimage:
+      hidden: false
+      immutable: false
+      type: string
+      description: Master bootimage volume id
+    sec_groups:
+      hidden: false
+      immutable: false
+      type: list
+      description: Security groups
+      entry_schema:
+        type: string
+    vf_component:
+      hidden: false
+      immutable: false
+      type: string
+      description: The component that this VF instance is running
+      constraints:
+      - pattern: '[a-zA-Z0-9]+'
+      - max_length: 3
+      - min_length: 3
+    num_instances:
+      hidden: false
+      immutable: false
+      type: float
+      description: number of instance of the VF_module
+  node_templates:
+    mvs_modules:
+      type: org.openecomp.resource.abstract.nodes.heat.mvs.nested.heat
+      directives:
+      - substitutable
+      properties:
+        vf_module_id:
+          get_input: vf_module_id
+        vf_name:
+          get_input: vf_name
+        cloud_zone_id:
+          get_input: cloud_zone_id
+        vf_instance_num:
+          get_input: vf_instance_num
+        virtual_mgmt_ip_0:
+          get_input: virtual_mgmt_ip_0
+        indx:
+          get_property:
+          - SELF
+          - service_template_filter
+          - index_value
+        mvs_mgmt_ip_0:
+          get_input: mvs_mgmt_ip_0
+        flavor:
+          get_input: flavor
+        key_name:
+          get_input: key_name
+        service_template_filter:
+          substitute_service_template: mvs.nested.heatServiceTemplate.yaml
+          count:
+            get_input: num_instances
+          mandatory: false
+        vnf_id:
+          get_input: vnf_id
+        availability_zone_0:
+          get_input: availability_zone_0
+        mgmt_net_id:
+          get_input: mgmt_net_id
+        vm_instance_num:
+          get_input: vm_instance_num
+        bootimage:
+          get_input: bootimage
+        sec_groups:
+          get_input: sec_groups
+        vf_component:
+          get_input: vf_component
+    mvs_modules_same_nested_heat_file_no_count:
+      type: org.openecomp.resource.abstract.nodes.heat.mvs.nested.heat
+      directives:
+      - substitutable
+      properties:
+        vf_module_id:
+          get_input: vf_module_id
+        vf_name:
+          get_input: vf_name
+        cloud_zone_id:
+          get_input: cloud_zone_id
+        vf_instance_num:
+          get_input: vf_instance_num
+        virtual_mgmt_ip_0:
+          get_input: virtual_mgmt_ip_0
+        indx:
+          get_property:
+          - SELF
+          - service_template_filter
+          - index_value
+        mvs_mgmt_ip_0:
+          get_input: mvs_mgmt_ip_0
+        flavor:
+          get_input: flavor
+        key_name:
+          get_input: key_name
+        service_template_filter:
+          substitute_service_template: mvs.nested.heatServiceTemplate.yaml
+          count: 1
+          mandatory: true
+        vnf_id:
+          get_input: vnf_id
+        availability_zone_0:
+          get_input: availability_zone_0
+        mgmt_net_id:
+          get_input: mgmt_net_id
+        vm_instance_num:
+          get_input: vm_instance_num
+        bootimage:
+          get_input: bootimage
+        sec_groups:
+          get_input: sec_groups
+        vf_component:
+          get_input: vf_component
+  groups:
+    mvs.vfmodule.heat:
+      type: org.openecomp.groups.heat.HeatStack
+      properties:
+        heat_file: ../Artifacts/mvs.vfmodule.heat.yaml
+        description: |
+          Metaswitch MVS (Metaview Server)
+      members:
+      - mvs_modules
+      - mvs_modules_same_nested_heat_file_no_count
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml
new file mode 100644
index 0000000000..315318d4f6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml
@@ -0,0 +1,320 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+  template_name: mvs.nested.heat
+imports:
+  ContrailComputeGlobalTypes:
+    file: ContrailComputeGlobalTypesServiceTemplate.yaml
+  CinderVolumeGlobalTypes:
+    file: CinderVolumeGlobalTypesServiceTemplate.yaml
+  ContrailVirtualNetworkGlobalType:
+    file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml
+  AbstractSubstituteGlobalTypes:
+    file: AbstractSubstituteGlobalTypesServiceTemplate.yaml
+  ContrailPortGlobalTypes:
+    file: ContrailPortGlobalTypesServiceTemplate.yaml
+  GlobalSubstitutionTypes:
+    file: GlobalSubstitutionTypesServiceTemplate.yaml
+  NeutronPortGlobalTypes:
+    file: NeutronPortGlobalTypesServiceTemplate.yaml
+  NeutronNetGlobalTypes:
+    file: NeutronNetGlobalTypesServiceTemplate.yaml
+  CommonGlobalTypes:
+    file: CommonGlobalTypesServiceTemplate.yaml
+  ContrailAbstractSubstituteGlobalTypes:
+    file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml
+  ContrailNetworkRuleGlobalType:
+    file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml
+  NeutronSecurityRulesGlobalTypes:
+    file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml
+  NovaServerGlobalTypes:
+    file: NovaServerGlobalTypesServiceTemplate.yaml
+  ContrailV2VirtualMachineInterfaceGlobalType:
+    file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml
+node_types:
+  org.openecomp.resource.vfc.nodes.heat.vnfci:
+    derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
+topology_template:
+  inputs:
+    vf_module_id:
+      hidden: false
+      immutable: false
+      type: string
+      description: Unique ID for this VF_MODULE instance
+    vf_name:
+      hidden: false
+      immutable: false
+      type: string
+      description: The VF Name; defaults to VMVM for the virtual MVM VNF.
+      constraints:
+      - pattern: '[a-zA-Z0-9]+'
+      - max_length: 4
+      - min_length: 4
+    cloud_zone_id:
+      hidden: false
+      immutable: false
+      type: string
+      description: The cloud zone for this VF instance
+    vf_instance_num:
+      hidden: false
+      immutable: false
+      type: string
+      description: The number for this VF instance
+      constraints:
+      - pattern: '[0-9]+'
+      - max_length: 2
+      - min_length: 2
+    virtual_mgmt_ip_0:
+      hidden: false
+      immutable: false
+      type: string
+      description: Virtual management network ip address
+    indx:
+      hidden: false
+      immutable: false
+      type: float
+      description: Index of the current instance
+    mvs_mgmt_ip_0:
+      hidden: false
+      immutable: false
+      type: list
+      description: List of Management network IP addresses for IPv4
+      entry_schema:
+        type: string
+    flavor:
+      hidden: false
+      immutable: false
+      type: string
+      description: Server flavor
+      constraints: [
+        ]
+    key_name:
+      hidden: false
+      immutable: false
+      type: string
+      description: SSH key name
+      constraints: [
+        ]
+    vnf_id:
+      hidden: false
+      immutable: false
+      type: string
+      description: Unique ID for this VF instance
+    availability_zone_0:
+      hidden: false
+      immutable: false
+      type: list
+      description: List of Availability Zone IDs or Names
+      entry_schema:
+        type: string
+    mgmt_net_id:
+      hidden: false
+      immutable: false
+      type: string
+      description: Neutron UUID for the Management network
+      constraints: [
+        ]
+    vm_instance_num:
+      hidden: false
+      immutable: false
+      type: list
+      description: VM instance number list must be a list of three-digit numeric value
+      entry_schema:
+        type: string
+    bootimage:
+      hidden: false
+      immutable: false
+      type: string
+      description: Master bootimage volume id
+    sec_groups:
+      hidden: false
+      immutable: false
+      type: list
+      description: Security groups
+      entry_schema:
+        type: string
+    vf_component:
+      hidden: false
+      immutable: false
+      type: string
+      description: The component that this VF instance is running
+      constraints:
+      - pattern: '[a-zA-Z0-9]+'
+      - max_length: 3
+      - min_length: 3
+  node_templates:
+    boot_volume:
+      type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
+      properties:
+        availability_zone:
+          Fn::Select:
+          - get_input: indx
+          - get_input:
+            - availability_zone_0
+        image:
+          get_input: bootimage
+        size: 35*1024
+        name:
+          str_replace:
+            template: Z$CLOUD_ZONE_ID$VF_NAME$VF_INSTANCE_NUM$VF_COMPONENT$VM_INSTANCE_NUM-boot-volume
+            params:
+              $VF_NAME:
+                get_input: vf_name
+              $CLOUD_ZONE_ID:
+                get_input: cloud_zone_id
+              $VM_INSTANCE_NUM:
+                Fn::Select:
+                - get_input: indx
+                - get_input:
+                  - vm_instance_num
+              $VF_COMPONENT:
+                get_input: vf_component
+              $VF_INSTANCE_NUM:
+                get_input: vf_instance_num
+    vnfci:
+      type: org.openecomp.resource.vfc.nodes.heat.vnfci
+      properties:
+        flavor:
+          get_input: flavor
+        key_name:
+          get_input: key_name
+        availability_zone:
+          Fn::Select:
+          - get_input: indx
+          - get_input:
+            - availability_zone_0
+        name:
+          str_replace:
+            template: Z$CLOUD_ZONE_ID$VF_NAME$VF_INSTANCE_NUM$VF_COMPONENT$VM_INSTANCE_NUM
+            params:
+              $VF_NAME:
+                get_input: vf_name
+              $CLOUD_ZONE_ID:
+                get_input: cloud_zone_id
+              $VM_INSTANCE_NUM:
+                Fn::Select:
+                - get_input: indx
+                - get_input:
+                  - vm_instance_num
+              $VF_COMPONENT:
+                get_input: vf_component
+              $VF_INSTANCE_NUM:
+                get_input: vf_instance_num
+      requirements:
+      - local_storage:
+          capability: tosca.capabilities.Attachment
+          node: boot_volume
+          relationship: tosca.relationships.AttachesTo
+      - local_storage:
+          capability: tosca.capabilities.Attachment
+          node: data_volume
+          relationship: tosca.relationships.AttachesTo
+    data_volume:
+      type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
+      properties:
+        availability_zone:
+          Fn::Select:
+          - get_input: indx
+          - get_input:
+            - availability_zone_0
+        size: 265*1024
+        name:
+          str_replace:
+            template: Z$CLOUD_ZONE_ID$VF_NAME$VF_INSTANCE_NUM$VF_COMPONENT$VM_INSTANCE_NUM-data-volume
+            params:
+              $VF_NAME:
+                get_input: vf_name
+              $CLOUD_ZONE_ID:
+                get_input: cloud_zone_id
+              $VM_INSTANCE_NUM:
+                Fn::Select:
+                - get_input: indx
+                - get_input:
+                  - vm_instance_num
+              $VF_COMPONENT:
+                get_input: vf_component
+              $VF_INSTANCE_NUM:
+                get_input: vf_instance_num
+    mgmt_port:
+      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+      properties:
+        security_groups:
+        - get_input: sec_groups
+        fixed_ips:
+        - ip_address:
+            Fn::Select:
+            - get_input: indx
+            - get_input:
+              - get_input: mvs_mgmt_ip_0
+        allowed_address_pairs:
+        - ip_address:
+            get_input: virtual_mgmt_ip_0
+        name:
+          str_replace:
+            template: Z$CLOUD_ZONE_ID$VF_NAME$VF_INSTANCE_NUM$VF_COMPONENT$VM_INSTANCE_NUM-mgmt-port
+            params:
+              $VF_NAME:
+                get_input: vf_name
+              $CLOUD_ZONE_ID:
+                get_input: cloud_zone_id
+              $VM_INSTANCE_NUM:
+                Fn::Select:
+                - get_input: indx
+                - get_input:
+                  - vm_instance_num
+              $VF_COMPONENT:
+                get_input: vf_component
+              $VF_INSTANCE_NUM:
+                get_input: vf_instance_num
+        network:
+          get_input: mgmt_net_id
+      requirements:
+      - binding:
+          capability: tosca.capabilities.network.Bindable
+          node: vnfci
+          relationship: tosca.relationships.network.BindsTo
+  groups:
+    mvs.nested.heat:
+      type: org.openecomp.groups.heat.HeatStack
+      properties:
+        heat_file: ../Artifacts/mvs.nested.heat.yaml
+        description: |
+          Metaswitch MVS (Metaview Server)
+      members:
+      - boot_volume
+      - vnfci
+      - data_volume
+      - mgmt_port
+  substitution_mappings:
+    node_type: org.openecomp.resource.abstract.nodes.heat.mvs.nested.heat
+    capabilities:
+      os_vnfci:
+      - vnfci
+      - os
+      attachment_mgmt_port:
+      - mgmt_port
+      - attachment
+      endpoint_vnfci:
+      - vnfci
+      - endpoint
+      host_vnfci:
+      - vnfci
+      - host
+      binding_vnfci:
+      - vnfci
+      - binding
+      attachment_boot_volume:
+      - boot_volume
+      - attachment
+      scalable_vnfci:
+      - vnfci
+      - scalable
+      attachment_data_volume:
+      - data_volume
+      - attachment
+    requirements:
+      local_storage_vnfci:
+      - vnfci
+      - local_storage
+      link_mgmt_port:
+      - mgmt_port
+      - link
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/inputs/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/inputs/MANIFEST.json
new file mode 100644
index 0000000000..c7729c8653
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/inputs/MANIFEST.json
@@ -0,0 +1,19 @@
+{
+  "name": "mvs.vfmodule.heat.yaml",
+  "description": "Metaswitch MVS (Metaview Server)",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "mvs.vfmodule.heat.yaml",
+      "type": "HEAT",
+      "data": [
+      ]
+    },
+    {
+      "file": "mvs.nested.heat.yaml",
+      "type": "HEAT",
+      "data": [
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/inputs/mvs.nested.heat.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/inputs/mvs.nested.heat.yaml
new file mode 100644
index 0000000000..8ddc5c6488
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/inputs/mvs.nested.heat.yaml
@@ -0,0 +1,165 @@
+heat_template_version: 2013-05-23
+
+description: >
+  Metaswitch MVS (Metaview Server)
+
+parameters:
+  cloud_zone_id:
+    type: string
+    description: The cloud zone for this VF instance
+  vf_name:
+    type: string
+    description: The VF Name; defaults to VMVM for the virtual MVM VNF.
+    constraints:
+      - allowed_pattern: "[a-zA-Z0-9]+"
+      - length: { min: 4, max: 4 }
+        description: Each VF will have a 4-character alphanumeric identifier
+  vf_instance_num:
+    type: string
+    description: The number for this VF instance
+    constraints:
+      - allowed_pattern: "[0-9]+"
+      - length: { min: 2, max: 2 }
+        description: VF instance number must be a two-digit numeric value
+  vf_component:
+    type: string
+    description: The component that this VF instance is running
+    constraints:
+      - allowed_pattern: "[a-zA-Z0-9]+"
+      - length: { min: 3, max: 3 }
+        description: Each VF component will have a 3-character alphanumeric identifier
+  vm_instance_num:
+    type: comma_delimited_list
+    description: VM instance number list must be a list of three-digit numeric value
+  vnf_id:
+    type: string
+    description: Unique ID for this VF instance
+  vf_module_id:
+    type: string
+    description: Unique ID for this VF_MODULE instance
+  bootimage:
+    type: string
+    description: Master bootimage volume id
+  flavor:
+    type: string
+    description: Server flavor
+    constraints:
+      - custom_constraint: nova.flavor
+  key_name:
+    type: string
+    description: SSH key name
+    constraints:
+      - custom_constraint: nova.keypair
+
+  availability_zone_0:
+    type: comma_delimited_list
+    description: List of Availability Zone IDs or Names
+
+  sec_groups:
+    type: comma_delimited_list
+    description: Security groups
+  mgmt_net_id:
+    type: string
+    description: Neutron UUID for the Management network
+    constraints:
+    - custom_constraint: neutron.network
+  virtual_mgmt_ip_0:
+    type: string
+    description: Virtual management network ip address
+
+  mvs_mgmt_ip_0:
+    type: comma_delimited_list
+    description: List of Management network IP addresses for IPv4
+
+  indx:
+    type: number
+    description: Index of the current instance
+
+resources:
+  mgmt_port:
+    type: OS::Neutron::Port
+    properties:
+      name:
+        str_replace:
+          template: Z$CLOUD_ZONE_ID$VF_NAME$VF_INSTANCE_NUM$VF_COMPONENT$VM_INSTANCE_NUM-mgmt-port
+          params:
+            $CLOUD_ZONE_ID: { get_param: cloud_zone_id }
+            $VF_NAME: { get_param: vf_name }
+            $VF_INSTANCE_NUM: { get_param: vf_instance_num }
+            $VF_COMPONENT: { get_param: vf_component }
+            $VM_INSTANCE_NUM: { "Fn::Select" : [ { get_param: indx }, { get_param: [vm_instance_num] } ] }
+      network_id: { get_param: mgmt_net_id }
+      security_groups: [{ get_param: sec_groups }]
+
+      fixed_ips:
+        - ip_address: { "Fn::Select" : [ { get_param: indx }, { get_param: [{ get_param: mvs_mgmt_ip_0 }] } ] }
+
+      allowed_address_pairs:
+        - ip_address: { get_param: virtual_mgmt_ip_0 }
+
+  boot_volume:
+    type: OS::Cinder::Volume
+    properties:
+      size: 35
+      name:
+        str_replace:
+          template: Z$CLOUD_ZONE_ID$VF_NAME$VF_INSTANCE_NUM$VF_COMPONENT$VM_INSTANCE_NUM-boot-volume
+          params:
+            $CLOUD_ZONE_ID: { get_param: cloud_zone_id }
+            $VF_NAME: { get_param: vf_name }
+            $VF_INSTANCE_NUM: { get_param: vf_instance_num }
+            $VF_COMPONENT: { get_param: vf_component }
+            $VM_INSTANCE_NUM: { "Fn::Select" : [ { get_param: indx }, { get_param: [vm_instance_num] } ] }
+
+      image: { get_param: bootimage }
+
+
+      availability_zone: { "Fn::Select" : [ { get_param: indx }, { get_param: [availability_zone_0] } ] }
+
+
+  data_volume:
+    type: OS::Cinder::Volume
+    properties:
+      size: 265
+      name:
+        str_replace:
+          template: Z$CLOUD_ZONE_ID$VF_NAME$VF_INSTANCE_NUM$VF_COMPONENT$VM_INSTANCE_NUM-data-volume
+          params:
+            $CLOUD_ZONE_ID: { get_param: cloud_zone_id }
+            $VF_NAME: { get_param: vf_name }
+            $VF_INSTANCE_NUM: { get_param: vf_instance_num }
+            $VF_COMPONENT: { get_param: vf_component }
+            $VM_INSTANCE_NUM: { "Fn::Select" : [ { get_param: indx }, { get_param: [vm_instance_num] } ] }
+
+      availability_zone: { "Fn::Select" : [ { get_param: indx }, { get_param: [availability_zone_0] } ] }
+
+
+  vnfci:
+    type: OS::Nova::Server
+    properties:
+      name:
+        str_replace:
+          template: Z$CLOUD_ZONE_ID$VF_NAME$VF_INSTANCE_NUM$VF_COMPONENT$VM_INSTANCE_NUM
+          params:
+            $CLOUD_ZONE_ID: { get_param: cloud_zone_id }
+            $VF_NAME: { get_param: vf_name }
+            $VF_INSTANCE_NUM: { get_param: vf_instance_num }
+            $VF_COMPONENT: { get_param: vf_component }
+            $VM_INSTANCE_NUM: { "Fn::Select" : [ { get_param: indx }, { get_param: [vm_instance_num] } ] }
+      block_device_mapping:
+        - device_name: vda
+          volume_id: { get_resource: boot_volume }
+          delete_on_termination: false
+        - device_name: vdb
+          volume_id: { get_resource: data_volume }
+          delete_on_termination: false
+      flavor: { get_param: flavor }
+      key_name: { get_param: key_name }
+      networks:
+        - port: { get_resource: mgmt_port }
+
+      availability_zone: { "Fn::Select" : [ { get_param: indx }, { get_param: [availability_zone_0] } ] }
+
+    metadata:
+      vnf_id: { get_param: vnf_id }
+      vf_module_id: { get_param: vf_module_id }
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/inputs/mvs.vfmodule.heat.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/inputs/mvs.vfmodule.heat.yaml
new file mode 100644
index 0000000000..55c98053a4
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/inputs/mvs.vfmodule.heat.yaml
@@ -0,0 +1,158 @@
+heat_template_version: 2013-05-23
+
+description: >
+  Metaswitch MVS (Metaview Server)
+
+parameters:
+  cloud_zone_id:
+    type: string
+    description: The cloud zone for this VF instance
+  vf_name:
+    type: string
+    description: The VF Name; defaults to VMVM for the virtual MVM VNF.
+    constraints:
+      - allowed_pattern: "[a-zA-Z0-9]+"
+      - length: { min: 4, max: 4 }
+        description: Each VF will have a 4-character alphanumeric identifier
+  vf_instance_num:
+    type: string
+    description: The number for this VF instance
+    constraints:
+      - allowed_pattern: "[0-9]+"
+      - length: { min: 2, max: 2 }
+        description: VF instance number must be a two-digit numeric value
+  vf_component:
+    type: string
+    description: The component that this VF instance is running
+    constraints:
+      - allowed_pattern: "[a-zA-Z0-9]+"
+      - length: { min: 3, max: 3 }
+        description: Each VF component will have a 3-character alphanumeric identifier
+  vm_instance_num:
+    type: comma_delimited_list
+    description: VM instance number list must be a list of three-digit numeric value
+  vnf_id:
+    type: string
+    description: Unique ID for this VF instance
+  vf_module_id:
+    type: string
+    description: Unique ID for this VF_MODULE instance
+  bootimage:
+    type: string
+    description: Master bootimage volume id
+  flavor:
+    type: string
+    description: Server flavor
+    constraints:
+      - custom_constraint: nova.flavor
+  key_name:
+    type: string
+    description: SSH key name
+    constraints:
+      - custom_constraint: nova.keypair
+
+  availability_zone_0:
+    type: comma_delimited_list
+    description: List of Availability Zone IDs or Names
+
+  sec_groups:
+    type: comma_delimited_list
+    description: Security groups
+  mgmt_net_id:
+    type: string
+    description: Neutron UUID for the Management network
+    constraints:
+    - custom_constraint: neutron.network
+  virtual_mgmt_ip_0:
+    type: string
+    description: Virtual management network ip address
+
+  mvs_mgmt_ip_0:
+    type: comma_delimited_list
+    description: List of Management network IP addresses for IPv4
+
+  num_instances:
+    type: number
+    description: number of instance of the VF_module
+
+resources:
+  mvs_modules:
+    type: OS::Heat::ResourceGroup
+    properties:
+      count: { get_param: num_instances }
+      resource_def:
+        type: mvs.nested.heat.yaml
+        properties:
+          cloud_zone_id: { get_param: cloud_zone_id }
+          vf_name:  { get_param: vf_name }
+          vf_instance_num: { get_param: vf_instance_num }
+          vf_component: { get_param: vf_component }
+          vm_instance_num: { get_param: vm_instance_num }
+          vnf_id: { get_param: vnf_id }
+          vf_module_id: { get_param: vf_module_id }
+          bootimage: { get_param: bootimage }
+          flavor: { get_param: flavor }
+          key_name: { get_param: key_name }
+
+          availability_zone_0: { get_param: availability_zone_0 }
+
+          sec_groups: { get_param: sec_groups }
+          mgmt_net_id: { get_param: mgmt_net_id }
+          virtual_mgmt_ip_0: { get_param: virtual_mgmt_ip_0 }
+
+          mvs_mgmt_ip_0: { get_param: mvs_mgmt_ip_0 }
+
+          indx: "%index%"
+  mvs_modules_same_nested_heat_file_no_count:
+    type: OS::Heat::ResourceGroup
+    properties:
+      resource_def:
+        type: mvs.nested.heat.yaml
+        properties:
+          cloud_zone_id: { get_param: cloud_zone_id }
+          vf_name:  { get_param: vf_name }
+          vf_instance_num: { get_param: vf_instance_num }
+          vf_component: { get_param: vf_component }
+          vm_instance_num: { get_param: vm_instance_num }
+          vnf_id: { get_param: vnf_id }
+          vf_module_id: { get_param: vf_module_id }
+          bootimage: { get_param: bootimage }
+          flavor: { get_param: flavor }
+          key_name: { get_param: key_name }
+
+          availability_zone_0: { get_param: availability_zone_0 }
+
+          sec_groups: { get_param: sec_groups }
+          mgmt_net_id: { get_param: mgmt_net_id }
+          virtual_mgmt_ip_0: { get_param: virtual_mgmt_ip_0 }
+
+          mvs_mgmt_ip_0: { get_param: mvs_mgmt_ip_0 }
+
+          indx: "%index%"
+  shouldnt_get_translated:
+    type: OS::Heat::ResourceGroup
+    properties:
+      count: { get_param: num_instances }
+      resource_def:
+        type: OS::Nova::Server
+        properties:
+          cloud_zone_id: { get_param: cloud_zone_id }
+          vf_name:  { get_param: vf_name }
+          vf_instance_num: { get_param: vf_instance_num }
+          vf_component: { get_param: vf_component }
+          vm_instance_num: { get_param: vm_instance_num }
+          vnf_id: { get_param: vnf_id }
+          vf_module_id: { get_param: vf_module_id }
+          bootimage: { get_param: bootimage }
+          flavor: { get_param: flavor }
+          key_name: { get_param: key_name }
+
+          availability_zone_0: { get_param: availability_zone_0 }
+
+          sec_groups: { get_param: sec_groups }
+          mgmt_net_id: { get_param: mgmt_net_id }
+          virtual_mgmt_ip_0: { get_param: virtual_mgmt_ip_0 }
+
+          mvs_mgmt_ip_0: { get_param: mvs_mgmt_ip_0 }
+
+          indx: "%index%"
\ No newline at end of file