1 files changed, 414 insertions, 50 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nestedServiceTemplate.yaml
index 8001ba9d7d..bd00c83084 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nestedServiceTemplate.yaml
@@ -2,34 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0
 metadata:
   template_name: nested
 imports:
-  ContrailComputeGlobalTypes:
-    file: ContrailComputeGlobalTypesServiceTemplate.yaml
-  CinderVolumeGlobalTypes:
-    file: CinderVolumeGlobalTypesServiceTemplate.yaml
-  ContrailVirtualNetworkGlobalType:
-    file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml
-  AbstractSubstituteGlobalTypes:
-    file: AbstractSubstituteGlobalTypesServiceTemplate.yaml
-  ContrailPortGlobalTypes:
-    file: ContrailPortGlobalTypesServiceTemplate.yaml
-  GlobalSubstitutionTypes:
+- openecomp_heat_index:
+    file: openecomp-heat/_index.yml
+- 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.cmaui:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
@@ -83,6 +59,12 @@ topology_template:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy: AUTO
+        ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
         security_groups:
         - get_input: shared_security_group_id1
         fixed_ips:
@@ -90,6 +72,9 @@ topology_template:
             get_input:
             - cmaui_oam_ips
             - 0
+        mac_requirements:
+          mac_count_required:
+            is_required: false
         network:
           get_input: net
       requirements:
@@ -117,6 +102,10 @@ topology_template:
           get_input: availability_zone_0
         image:
           get_input: cmaui_image
+        metadata:
+          get_attribute:
+          - test_nested2
+          - availability_zone_0
         name:
           get_input:
           - cmaui_names
@@ -125,6 +114,12 @@ topology_template:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy: AUTO
+        ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
         security_groups:
         - get_input: shared_security_group_id1
         - get_input: p2
@@ -133,6 +128,9 @@ topology_template:
             get_input:
             - cmaui_oam_ips
             - 0
+        mac_requirements:
+          mac_count_required:
+            is_required: false
         network:
           get_input: net
       requirements:
@@ -141,7 +139,7 @@ topology_template:
           node: server_cmaui
           relationship: tosca.relationships.network.BindsTo
   groups:
-    nested:
+    nested_group:
       type: org.openecomp.groups.heat.HeatStack
       properties:
         heat_file: ../Artifacts/nested.yml
@@ -151,67 +149,433 @@ topology_template:
       - test_nested2
       - server_cmaui
       - cmaui_port_1
+  outputs:
+    output_attr_1:
+      value:
+        get_attribute:
+        - test_nested2
+        - availability_zone_0
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested
     capabilities:
-      os_server_cmaui:
+      cpu.delta_server_cmaui:
       - server_cmaui
-      - os
+      - cpu.delta
+      disk.device.write.requests.rate_server_cmaui:
+      - server_cmaui
+      - disk.device.write.requests.rate
+      network.incoming.packets.rate_cmaui_port_22_test_nested2:
+      - test_nested2
+      - network.incoming.packets.rate_cmaui_port_22
+      disk.device.allocation_server_cmaui:
+      - server_cmaui
+      - disk.device.allocation
+      disk.write.requests.rate_server_cmaui_test_nested2:
+      - test_nested2
+      - disk.write.requests.rate_server_cmaui
+      disk.capacity_server_cmaui_test_nested2:
+      - test_nested2
+      - disk.capacity_server_cmaui
       scalable_server_cmaui:
       - server_cmaui
       - scalable
+      disk.read.bytes.rate_server_cmaui:
+      - server_cmaui
+      - disk.read.bytes.rate
+      disk.latency_server_cmaui_test_nested2:
+      - test_nested2
+      - disk.latency_server_cmaui
+      disk.read.bytes.rate_server_cmaui_test_nested2:
+      - test_nested2
+      - disk.read.bytes.rate_server_cmaui
       host_server_cmaui:
       - server_cmaui
       - host
-      endpoint_server_cmaui:
+      cpu_util_server_cmaui:
       - server_cmaui
-      - endpoint
-      attachment_cmaui_port_11_test_nested2:
+      - cpu_util
+      binding_cmaui_port_11_test_nested2:
       - test_nested2
-      - attachment_cmaui_port_11
-      binding_server_cmaui:
+      - binding_cmaui_port_11
+      endpoint_server_cmaui_test_nested2:
+      - test_nested2
+      - endpoint_server_cmaui
+      disk.device.read.bytes_server_cmaui_test_nested2:
+      - test_nested2
+      - disk.device.read.bytes_server_cmaui
+      disk.device.write.requests_server_cmaui:
+      - server_cmaui
+      - disk.device.write.requests
+      network.outgoing.bytes_cmaui_port_2:
+      - cmaui_port_2
+      - network.outgoing.bytes
+      network.outgoing.bytes_cmaui_port_1:
+      - cmaui_port_1
+      - network.outgoing.bytes
+      memory.usage_server_cmaui_test_nested2:
+      - test_nested2
+      - memory.usage_server_cmaui
+      network.incoming.packets.rate_cmaui_port_11_test_nested2:
+      - test_nested2
+      - network.incoming.packets.rate_cmaui_port_11
+      instance_server_cmaui:
       - server_cmaui
+      - instance
+      disk.device.read.bytes_server_cmaui:
+      - server_cmaui
+      - disk.device.read.bytes
+      disk.root.size_server_cmaui:
+      - server_cmaui
+      - disk.root.size
+      binding_cmaui_port_22_test_nested2:
+      - test_nested2
+      - binding_cmaui_port_22
+      binding_server_cmaui_test_nested2:
+      - test_nested2
+      - binding_server_cmaui
+      network.incoming.packets_cmaui_port_2:
+      - cmaui_port_2
+      - network.incoming.packets
+      os_server_cmaui:
+      - server_cmaui
+      - os
+      disk.device.write.bytes.rate_server_cmaui:
+      - server_cmaui
+      - disk.device.write.bytes.rate
+      disk.allocation_server_cmaui_test_nested2:
+      - test_nested2
+      - disk.allocation_server_cmaui
+      network.incoming.packets_cmaui_port_1:
+      - cmaui_port_1
+      - network.incoming.packets
+      disk.read.requests_server_cmaui_test_nested2:
+      - test_nested2
+      - disk.read.requests_server_cmaui
+      network.incoming.bytes.rate_cmaui_port_22_test_nested2:
+      - test_nested2
+      - network.incoming.bytes.rate_cmaui_port_22
+      disk.write.requests_server_cmaui_test_nested2:
+      - test_nested2
+      - disk.write.requests_server_cmaui
+      network.outpoing.packets_cmaui_port_11_test_nested2:
+      - test_nested2
+      - network.outpoing.packets_cmaui_port_11
+      os_server_cmaui_test_nested2:
+      - test_nested2
+      - os_server_cmaui
+      feature_cmaui_port_22_test_nested2:
+      - test_nested2
+      - feature_cmaui_port_22
+      cpu_util_server_cmaui_test_nested2:
+      - test_nested2
+      - cpu_util_server_cmaui
+      feature_server_cmaui:
+      - server_cmaui
+      - feature
+      binding_cmaui_port_1:
+      - cmaui_port_1
       - binding
-      attachment_cmaui_port_2:
+      binding_cmaui_port_2:
       - cmaui_port_2
-      - attachment
-      endpoint_server_cmaui_test_nested2:
+      - binding
+      disk.write.bytes_server_cmaui_test_nested2:
       - test_nested2
-      - endpoint_server_cmaui
+      - disk.write.bytes_server_cmaui
+      vcpus_server_cmaui_test_nested2:
+      - test_nested2
+      - vcpus_server_cmaui
+      memory.usage_server_cmaui:
+      - server_cmaui
+      - memory.usage
+      disk.ephemeral.size_server_cmaui:
+      - server_cmaui
+      - disk.ephemeral.size
+      network.outgoing.bytes.rate_cmaui_port_2:
+      - cmaui_port_2
+      - network.outgoing.bytes.rate
+      cpu_server_cmaui_test_nested2:
+      - test_nested2
+      - cpu_server_cmaui
+      memory.resident_server_cmaui_test_nested2:
+      - test_nested2
+      - memory.resident_server_cmaui
+      network.outgoing.packets.rate_cmaui_port_22_test_nested2:
+      - test_nested2
+      - network.outgoing.packets.rate_cmaui_port_22
+      network.outgoing.bytes.rate_cmaui_port_1:
+      - cmaui_port_1
+      - network.outgoing.bytes.rate
+      network.outgoing.bytes.rate_cmaui_port_11_test_nested2:
+      - test_nested2
+      - network.outgoing.bytes.rate_cmaui_port_11
+      disk.iops_server_cmaui:
+      - server_cmaui
+      - disk.iops
       host_server_cmaui_test_nested2:
       - test_nested2
       - host_server_cmaui
-      binding_server_cmaui_test_nested2:
+      disk.usage_server_cmaui_test_nested2:
       - test_nested2
-      - binding_server_cmaui
+      - disk.usage_server_cmaui
+      disk.device.iops_server_cmaui:
+      - server_cmaui
+      - disk.device.iops
+      network.incoming.bytes_cmaui_port_2:
+      - cmaui_port_2
+      - network.incoming.bytes
+      disk.read.bytes_server_cmaui:
+      - server_cmaui
+      - disk.read.bytes
+      network.incoming.bytes_cmaui_port_1:
+      - cmaui_port_1
+      - network.incoming.bytes
+      disk.ephemeral.size_server_cmaui_test_nested2:
+      - test_nested2
+      - disk.ephemeral.size_server_cmaui
+      network.incoming.packets_cmaui_port_11_test_nested2:
+      - test_nested2
+      - network.incoming.packets_cmaui_port_11
+      network.incoming.bytes_cmaui_port_11_test_nested2:
+      - test_nested2
+      - network.incoming.bytes_cmaui_port_11
+      disk.device.read.requests.rate_server_cmaui_test_nested2:
+      - test_nested2
+      - disk.device.read.requests.rate_server_cmaui
+      network.incoming.packets.rate_cmaui_port_1:
+      - cmaui_port_1
+      - network.incoming.packets.rate
+      network.incoming.packets.rate_cmaui_port_2:
+      - cmaui_port_2
+      - network.incoming.packets.rate
+      cpu_server_cmaui:
+      - server_cmaui
+      - cpu
+      feature_cmaui_port_1:
+      - cmaui_port_1
+      - feature
+      feature_cmaui_port_2:
+      - cmaui_port_2
+      - feature
+      disk.write.bytes.rate_server_cmaui:
+      - server_cmaui
+      - disk.write.bytes.rate
+      disk.device.read.bytes.rate_server_cmaui:
+      - server_cmaui
+      - disk.device.read.bytes.rate
+      disk.device.write.bytes_server_cmaui_test_nested2:
+      - test_nested2
+      - disk.device.write.bytes_server_cmaui
+      network.incoming.bytes.rate_cmaui_port_11_test_nested2:
+      - test_nested2
+      - network.incoming.bytes.rate_cmaui_port_11
+      attachment_cmaui_port_2:
+      - cmaui_port_2
+      - attachment
       scalable_server_cmaui_test_nested2:
       - test_nested2
       - scalable_server_cmaui
-      os_server_cmaui_test_nested2:
+      feature_test_nested2:
       - test_nested2
-      - os_server_cmaui
+      - feature
+      disk.device.latency_server_cmaui:
+      - server_cmaui
+      - disk.device.latency
+      disk.read.requests_server_cmaui:
+      - server_cmaui
+      - disk.read.requests
       attachment_cmaui_port_22_test_nested2:
       - test_nested2
       - attachment_cmaui_port_22
+      disk.device.capacity_server_cmaui:
+      - server_cmaui
+      - disk.device.capacity
+      network.outgoing.packets.rate_cmaui_port_1:
+      - cmaui_port_1
+      - network.outgoing.packets.rate
+      network.outgoing.packets.rate_cmaui_port_2:
+      - cmaui_port_2
+      - network.outgoing.packets.rate
+      disk.device.allocation_server_cmaui_test_nested2:
+      - test_nested2
+      - disk.device.allocation_server_cmaui
+      disk.read.bytes_server_cmaui_test_nested2:
+      - test_nested2
+      - disk.read.bytes_server_cmaui
+      disk.usage_server_cmaui:
+      - server_cmaui
+      - disk.usage
+      disk.device.usage_server_cmaui:
+      - server_cmaui
+      - disk.device.usage
       attachment_cmaui_port_1:
       - cmaui_port_1
       - attachment
+      memory_server_cmaui_test_nested2:
+      - test_nested2
+      - memory_server_cmaui
+      disk.capacity_server_cmaui:
+      - server_cmaui
+      - disk.capacity
+      disk.write.requests.rate_server_cmaui:
+      - server_cmaui
+      - disk.write.requests.rate
+      disk.device.read.requests_server_cmaui_test_nested2:
+      - test_nested2
+      - disk.device.read.requests_server_cmaui
+      disk.device.read.bytes.rate_server_cmaui_test_nested2:
+      - test_nested2
+      - disk.device.read.bytes.rate_server_cmaui
+      disk.device.read.requests_server_cmaui:
+      - server_cmaui
+      - disk.device.read.requests
+      disk.device.latency_server_cmaui_test_nested2:
+      - test_nested2
+      - disk.device.latency_server_cmaui
+      network.outgoing.bytes_cmaui_port_11_test_nested2:
+      - test_nested2
+      - network.outgoing.bytes_cmaui_port_11
+      disk.device.write.bytes.rate_server_cmaui_test_nested2:
+      - test_nested2
+      - disk.device.write.bytes.rate_server_cmaui
+      instance_server_cmaui_test_nested2:
+      - test_nested2
+      - instance_server_cmaui
+      memory_server_cmaui:
+      - server_cmaui
+      - memory
+      disk.write.bytes.rate_server_cmaui_test_nested2:
+      - test_nested2
+      - disk.write.bytes.rate_server_cmaui
+      disk.device.usage_server_cmaui_test_nested2:
+      - test_nested2
+      - disk.device.usage_server_cmaui
+      binding_server_cmaui:
+      - server_cmaui
+      - binding
+      disk.iops_server_cmaui_test_nested2:
+      - test_nested2
+      - disk.iops_server_cmaui
+      disk.device.read.requests.rate_server_cmaui:
+      - server_cmaui
+      - disk.device.read.requests.rate
+      feature_server_cmaui_test_nested2:
+      - test_nested2
+      - feature_server_cmaui
+      disk.write.bytes_server_cmaui:
+      - server_cmaui
+      - disk.write.bytes
+      disk.device.iops_server_cmaui_test_nested2:
+      - test_nested2
+      - disk.device.iops_server_cmaui
+      disk.device.write.requests.rate_server_cmaui_test_nested2:
+      - test_nested2
+      - disk.device.write.requests.rate_server_cmaui
+      network.outgoing.packets.rate_cmaui_port_11_test_nested2:
+      - test_nested2
+      - network.outgoing.packets.rate_cmaui_port_11
+      disk.device.write.requests_server_cmaui_test_nested2:
+      - test_nested2
+      - disk.device.write.requests_server_cmaui
+      network.outgoing.bytes_cmaui_port_22_test_nested2:
+      - test_nested2
+      - network.outgoing.bytes_cmaui_port_22
+      memory.resident_server_cmaui:
+      - server_cmaui
+      - memory.resident
+      disk.latency_server_cmaui:
+      - server_cmaui
+      - disk.latency
+      vcpus_server_cmaui:
+      - server_cmaui
+      - vcpus
+      network.outgoing.bytes.rate_cmaui_port_22_test_nested2:
+      - test_nested2
+      - network.outgoing.bytes.rate_cmaui_port_22
+      disk.device.write.bytes_server_cmaui:
+      - server_cmaui
+      - disk.device.write.bytes
+      network.incoming.bytes.rate_cmaui_port_1:
+      - cmaui_port_1
+      - network.incoming.bytes.rate
+      network.incoming.bytes.rate_cmaui_port_2:
+      - cmaui_port_2
+      - network.incoming.bytes.rate
+      disk.root.size_server_cmaui_test_nested2:
+      - test_nested2
+      - disk.root.size_server_cmaui
+      disk.allocation_server_cmaui:
+      - server_cmaui
+      - disk.allocation
+      disk.write.requests_server_cmaui:
+      - server_cmaui
+      - disk.write.requests
+      network.outpoing.packets_cmaui_port_1:
+      - cmaui_port_1
+      - network.outpoing.packets
+      network.outpoing.packets_cmaui_port_2:
+      - cmaui_port_2
+      - network.outpoing.packets
+      network.incoming.packets_cmaui_port_22_test_nested2:
+      - test_nested2
+      - network.incoming.packets_cmaui_port_22
+      network.incoming.bytes_cmaui_port_22_test_nested2:
+      - test_nested2
+      - network.incoming.bytes_cmaui_port_22
+      cpu.delta_server_cmaui_test_nested2:
+      - test_nested2
+      - cpu.delta_server_cmaui
+      network.outpoing.packets_cmaui_port_22_test_nested2:
+      - test_nested2
+      - network.outpoing.packets_cmaui_port_22
+      endpoint_server_cmaui:
+      - server_cmaui
+      - endpoint
+      feature_cmaui_port_11_test_nested2:
+      - test_nested2
+      - feature_cmaui_port_11
+      attachment_cmaui_port_11_test_nested2:
+      - test_nested2
+      - attachment_cmaui_port_11
+      disk.device.capacity_server_cmaui_test_nested2:
+      - test_nested2
+      - disk.device.capacity_server_cmaui
     requirements:
-      local_storage_server_cmaui_test_nested2:
+      dependency_cmaui_port_22_test_nested2:
       - test_nested2
-      - local_storage_server_cmaui
-      local_storage_server_cmaui:
+      - dependency_cmaui_port_22
+      dependency_server_cmaui:
       - server_cmaui
-      - local_storage
+      - dependency
+      dependency_server_cmaui_test_nested2:
+      - test_nested2
+      - dependency_server_cmaui
       link_cmaui_port_22_test_nested2:
       - test_nested2
       - link_cmaui_port_22
+      dependency_cmaui_port_11_test_nested2:
+      - test_nested2
+      - dependency_cmaui_port_11
       link_cmaui_port_2:
       - cmaui_port_2
       - link
+      link_cmaui_port_1:
+      - cmaui_port_1
+      - link
+      local_storage_server_cmaui_test_nested2:
+      - test_nested2
+      - local_storage_server_cmaui
+      local_storage_server_cmaui:
+      - server_cmaui
+      - local_storage
+      dependency_test_nested2:
+      - test_nested2
+      - dependency
+      dependency_cmaui_port_1:
+      - cmaui_port_1
+      - dependency
       link_cmaui_port_11_test_nested2:
       - test_nested2
       - link_cmaui_port_11
-      link_cmaui_port_1:
-      - cmaui_port_1
-      - link
-\ No newline at end of file
+      dependency_cmaui_port_2:
+      - cmaui_port_2
+      - dependency
+\ No newline at end of file