Code Review / sdc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
[SDC] Onboarding 1710 rebase.
[sdc.git] / openecomp-be / lib / openecomp-sdc-translator-lib / openecomp-sdc-translator-core / src / test / resources / mock / services / heattotosca / fulltest / mixPatterns / twoAppearancePerPatternWithConnectivities / out / Nested_1c2_catalog_instanceServiceTemplate.yaml
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
similarity index 67%
rename from openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
rename to openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
index f09ccb2..06355d2 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
@@ -1,6 +1,6 @@
 tosca_definitions_version: tosca_simple_yaml_1_0_0
 metadata:
-  template_name: Nested_1c2_catalog_instance_0
+  template_name: Nested_1c2_catalog_instance
 imports:
 - openecomp_heat_index:
     file: openecomp-heat/_index.yml
@@ -11,59 +11,58 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_1c2_t2_port_order:
-      type: integer
-      required: true
     compute_1c2_catalog_instance_availability_zone:
       type: list
       required: true
       entry_schema:
         type: string
-    port_1c2_t2_port_subnetpoolid:
-      type: string
-      required: true
-    port_1c2_t2_port_network_role:
-      type: string
+    port_1c201_port_vlan_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
     vm_flavor_name:
       type: string
       required: true
-    port_1c2_t2_port_network_role_tag:
-      type: string
-      required: true
-    port_1c2_t1_port_vlan_requirements:
+    compute_1c2_catalog_instance_personality:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    vm_image_name:
+        type: json
+    port_2c202_port_subnetpoolid:
       type: string
       required: true
-    port_1c2_t2_port_exCP_naming:
+    port_2c202_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_1c201_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
-    port_1c2_t1_port_order:
-      type: integer
+    port_2c202_port_network_role_tag:
+      type: string
       required: true
-    port_1c2_t1_port_subnetpoolid:
+    port_2c202_port_network_role:
       type: string
       required: true
-    port_1c2_t2_port_ip_requirements:
-      type: list
+    vm_image_name:
+      type: string
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_1c2_t1_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_2c202_port_order:
+      type: integer
       required: true
-    port_1c2_t1_port_network_role:
+    port_1c201_port_network_role_tag:
       type: string
       required: true
-    port_1c2_t2_port_network:
+    port_1c201_port_order:
+      type: integer
+      required: true
+    port_2c202_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: string
+        type: org.openecomp.datatypes.network.VlanRequirements
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -71,45 +70,46 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    compute_1c2_catalog_instance_metadata:
-      type: list
-      required: true
-      entry_schema:
-        type: json
     compute_1c2_catalog_instance_name:
       type: list
       required: true
       entry_schema:
         type: string
-    port_1c2_t1_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
+    port_2c202_port_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_1c2_t1_port_network:
+    port_2c202_port_network:
       type: list
       required: true
       entry_schema:
         type: string
-    port_1c2_t2_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    port_1c2_t2_port_vlan_requirements:
+    port_1c201_port_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_1c201_port_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_2c202_port_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_1c201_port_subnetpoolid:
+      type: string
+      required: true
+    port_1c201_port_network_role:
+      type: string
+      required: true
     compute_1c2_catalog_instance_user_data_format:
       type: list
       required: true
       entry_schema:
         type: string
-    port_1c2_t1_port_network_role_tag:
-      type: string
-      required: true
-    port_1c2_t1_port_ip_requirements:
+    port_1c201_port_network:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
+        type: string
     compute_1c2_catalog_instance_scheduler_hints:
       type: list
       required: true
@@ -119,18 +119,22 @@ topology_template:
     1c2_catalog_instance:
       type: org.openecomp.resource.vfc.nodes.heat.1c2_catalog_instance
       properties:
+        personality:
+          get_input:
+          - compute_1c2_catalog_instance_personality
+          - index_value
         availability_zone:
           get_input:
           - compute_1c2_catalog_instance_availability_zone
           - index_value
         flavor:
           get_input: vm_flavor_name
-        metadata:
-          get_input:
-          - compute_1c2_catalog_instance_metadata
-          - index_value
         image:
           get_input: vm_image_name
+        diskConfig:
+          get_attribute:
+          - 1c2_catalog_instance_1c201_port
+          - tenant_id
         name:
           get_input:
           - compute_1c2_catalog_instance_name
@@ -143,56 +147,56 @@ topology_template:
           get_input:
           - compute_1c2_catalog_instance_user_data_format
           - index_value
-    1c2_catalog_instance_1c2_t2_port:
+    1c2_catalog_instance_1c201_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         exCP_naming:
-          get_input: port_1c2_t2_port_exCP_naming
+          get_input: port_1c201_port_exCP_naming
         vlan_requirements:
-          get_input: port_1c2_t2_port_vlan_requirements
+          get_input: port_1c201_port_vlan_requirements
         ip_requirements:
-          get_input: port_1c2_t2_port_ip_requirements
+          get_input: port_1c201_port_ip_requirements
         network_role_tag:
-          get_input: port_1c2_t2_port_network_role_tag
+          get_input: port_1c201_port_network_role_tag
         mac_requirements:
-          get_input: port_1c2_t2_port_mac_requirements
+          get_input: port_1c201_port_mac_requirements
         order:
-          get_input: port_1c2_t2_port_order
+          get_input: port_1c201_port_order
         network_role:
-          get_input: port_1c2_t2_port_network_role
+          get_input: port_1c201_port_network_role
         subnetpoolid:
-          get_input: port_1c2_t2_port_subnetpoolid
+          get_input: port_1c201_port_subnetpoolid
         network:
           get_input:
-          - port_1c2_t2_port_network
+          - port_1c201_port_network
           - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
           node: 1c2_catalog_instance
           relationship: tosca.relationships.network.BindsTo
-    1c2_catalog_instance_1c2_t1_port:
+    1c2_catalog_instance_2c202_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         exCP_naming:
-          get_input: port_1c2_t1_port_exCP_naming
+          get_input: port_2c202_port_exCP_naming
         vlan_requirements:
-          get_input: port_1c2_t1_port_vlan_requirements
+          get_input: port_2c202_port_vlan_requirements
         ip_requirements:
-          get_input: port_1c2_t1_port_ip_requirements
+          get_input: port_2c202_port_ip_requirements
         network_role_tag:
-          get_input: port_1c2_t1_port_network_role_tag
+          get_input: port_2c202_port_network_role_tag
         mac_requirements:
-          get_input: port_1c2_t1_port_mac_requirements
+          get_input: port_2c202_port_mac_requirements
         order:
-          get_input: port_1c2_t1_port_order
+          get_input: port_2c202_port_order
         network_role:
-          get_input: port_1c2_t1_port_network_role
+          get_input: port_2c202_port_network_role
         subnetpoolid:
-          get_input: port_1c2_t1_port_subnetpoolid
+          get_input: port_2c202_port_subnetpoolid
         network:
           get_input:
-          - port_1c2_t1_port_network
+          - port_2c202_port_network
           - index_value
       requirements:
       - binding:
@@ -201,78 +205,62 @@ topology_template:
           relationship: tosca.relationships.network.BindsTo
   outputs:
     1c2_catalog_instance_instance_name:
-      type: list
+      type: string
       value:
         get_attribute:
         - 1c2_catalog_instance
         - instance_name
-      entry_schema:
-        type: string
-    1c2_catalog_instance_1c2_t1_port_tenant_id:
-      type: list
+    1c2_catalog_instance_1c201_port_tenant_id:
+      type: string
       value:
         get_attribute:
-        - 1c2_catalog_instance_1c2_t1_port
+        - 1c2_catalog_instance_1c201_port
         - tenant_id
-      entry_schema:
-        type: string
   substitution_mappings:
-    node_type: org.openecomp.resource.abstract.nodes.1c2_catalog_instance_0
+    node_type: org.openecomp.resource.abstract.nodes.1c2_catalog_instance
     capabilities:
       disk.device.capacity_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.device.capacity
-      network.incoming.packets.rate_1c2_catalog_instance_1c2_t2_port:
-      - 1c2_catalog_instance_1c2_t2_port
+      attachment_1c2_catalog_instance_2c202_port:
+      - 1c2_catalog_instance_2c202_port
+      - attachment
+      network.incoming.bytes.rate_1c2_catalog_instance_2c202_port:
+      - 1c2_catalog_instance_2c202_port
+      - network.incoming.bytes.rate
+      network.incoming.packets_1c2_catalog_instance_2c202_port:
+      - 1c2_catalog_instance_2c202_port
+      - network.incoming.packets
+      network.incoming.packets.rate_1c2_catalog_instance_1c201_port:
+      - 1c2_catalog_instance_1c201_port
       - network.incoming.packets.rate
       disk.read.bytes.rate_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.read.bytes.rate
+      network.incoming.bytes_1c2_catalog_instance_1c201_port:
+      - 1c2_catalog_instance_1c201_port
+      - network.incoming.bytes
       memory.usage_1c2_catalog_instance:
       - 1c2_catalog_instance
       - memory.usage
-      network.outpoing.packets_1c2_catalog_instance_1c2_t1_port:
-      - 1c2_catalog_instance_1c2_t1_port
-      - network.outpoing.packets
+      binding_1c2_catalog_instance_1c201_port:
+      - 1c2_catalog_instance_1c201_port
+      - binding
       disk.write.bytes.rate_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.write.bytes.rate
-      binding_1c2_catalog_instance_1c2_t2_port:
-      - 1c2_catalog_instance_1c2_t2_port
-      - binding
-      network.incoming.bytes.rate_1c2_catalog_instance_1c2_t2_port:
-      - 1c2_catalog_instance_1c2_t2_port
-      - network.incoming.bytes.rate
-      network.incoming.packets_1c2_catalog_instance_1c2_t1_port:
-      - 1c2_catalog_instance_1c2_t1_port
-      - network.incoming.packets
       cpu_util_1c2_catalog_instance:
       - 1c2_catalog_instance
       - cpu_util
-      network.outpoing.packets_1c2_catalog_instance_1c2_t2_port:
-      - 1c2_catalog_instance_1c2_t2_port
-      - network.outpoing.packets
-      feature_1c2_catalog_instance_1c2_t1_port:
-      - 1c2_catalog_instance_1c2_t1_port
-      - feature
-      attachment_1c2_catalog_instance_1c2_t1_port:
-      - 1c2_catalog_instance_1c2_t1_port
-      - attachment
-      network.incoming.bytes_1c2_catalog_instance_1c2_t2_port:
-      - 1c2_catalog_instance_1c2_t2_port
-      - network.incoming.bytes
       cpu_1c2_catalog_instance:
       - 1c2_catalog_instance
       - cpu
       disk.read.requests_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.read.requests
-      binding_1c2_catalog_instance_1c2_t1_port:
-      - 1c2_catalog_instance_1c2_t1_port
-      - binding
-      network.incoming.bytes.rate_1c2_catalog_instance_1c2_t1_port:
-      - 1c2_catalog_instance_1c2_t1_port
-      - network.incoming.bytes.rate
+      network.outpoing.packets_1c2_catalog_instance_1c201_port:
+      - 1c2_catalog_instance_1c201_port
+      - network.outpoing.packets
       disk.ephemeral.size_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.ephemeral.size
@@ -285,15 +273,18 @@ topology_template:
       disk.device.write.requests.rate_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.device.write.requests.rate
-      network.incoming.bytes_1c2_catalog_instance_1c2_t1_port:
-      - 1c2_catalog_instance_1c2_t1_port
-      - network.incoming.bytes
       os_1c2_catalog_instance:
       - 1c2_catalog_instance
       - os
       disk.device.iops_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.device.iops
+      feature_1c2_catalog_instance_2c202_port:
+      - 1c2_catalog_instance_2c202_port
+      - feature
+      network.outgoing.packets.rate_1c2_catalog_instance_2c202_port:
+      - 1c2_catalog_instance_2c202_port
+      - network.outgoing.packets.rate
       endpoint_1c2_catalog_instance:
       - 1c2_catalog_instance
       - endpoint
@@ -303,33 +294,33 @@ topology_template:
       disk.latency_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.latency
-      network.outgoing.bytes.rate_1c2_catalog_instance_1c2_t1_port:
-      - 1c2_catalog_instance_1c2_t1_port
+      network.outgoing.bytes.rate_1c2_catalog_instance_2c202_port:
+      - 1c2_catalog_instance_2c202_port
       - network.outgoing.bytes.rate
-      network.outgoing.bytes_1c2_catalog_instance_1c2_t1_port:
-      - 1c2_catalog_instance_1c2_t1_port
-      - network.outgoing.bytes
       disk.iops_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.iops
-      network.outgoing.packets.rate_1c2_catalog_instance_1c2_t2_port:
-      - 1c2_catalog_instance_1c2_t2_port
-      - network.outgoing.packets.rate
-      network.incoming.packets_1c2_catalog_instance_1c2_t2_port:
-      - 1c2_catalog_instance_1c2_t2_port
-      - network.incoming.packets
+      binding_1c2_catalog_instance_2c202_port:
+      - 1c2_catalog_instance_2c202_port
+      - binding
       vcpus_1c2_catalog_instance:
       - 1c2_catalog_instance
       - vcpus
       disk.device.latency_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.device.latency
-      attachment_1c2_catalog_instance_1c2_t2_port:
-      - 1c2_catalog_instance_1c2_t2_port
+      network.outgoing.bytes_1c2_catalog_instance_1c201_port:
+      - 1c2_catalog_instance_1c201_port
+      - network.outgoing.bytes
+      attachment_1c2_catalog_instance_1c201_port:
+      - 1c2_catalog_instance_1c201_port
       - attachment
-      network.outgoing.packets.rate_1c2_catalog_instance_1c2_t1_port:
-      - 1c2_catalog_instance_1c2_t1_port
-      - network.outgoing.packets.rate
+      network.incoming.bytes.rate_1c2_catalog_instance_1c201_port:
+      - 1c2_catalog_instance_1c201_port
+      - network.incoming.bytes.rate
+      network.incoming.packets_1c2_catalog_instance_1c201_port:
+      - 1c2_catalog_instance_1c201_port
+      - network.incoming.packets
       disk.read.bytes_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.read.bytes
@@ -345,15 +336,15 @@ topology_template:
       disk.device.read.bytes.rate_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.device.read.bytes.rate
+      network.incoming.bytes_1c2_catalog_instance_2c202_port:
+      - 1c2_catalog_instance_2c202_port
+      - network.incoming.bytes
       disk.device.allocation_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.device.allocation
       disk.device.read.bytes_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.device.read.bytes
-      network.outgoing.bytes.rate_1c2_catalog_instance_1c2_t2_port:
-      - 1c2_catalog_instance_1c2_t2_port
-      - network.outgoing.bytes.rate
       disk.device.read.requests_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.device.read.requests
@@ -372,24 +363,33 @@ topology_template:
       disk.root.size_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.root.size
+      feature_1c2_catalog_instance_1c201_port:
+      - 1c2_catalog_instance_1c201_port
+      - feature
+      network.outpoing.packets_1c2_catalog_instance_2c202_port:
+      - 1c2_catalog_instance_2c202_port
+      - network.outpoing.packets
+      network.incoming.packets.rate_1c2_catalog_instance_2c202_port:
+      - 1c2_catalog_instance_2c202_port
+      - network.incoming.packets.rate
       disk.device.usage_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.device.usage
-      network.outgoing.bytes_1c2_catalog_instance_1c2_t2_port:
-      - 1c2_catalog_instance_1c2_t2_port
-      - network.outgoing.bytes
+      network.outgoing.packets.rate_1c2_catalog_instance_1c201_port:
+      - 1c2_catalog_instance_1c201_port
+      - network.outgoing.packets.rate
       disk.usage_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.usage
       feature_1c2_catalog_instance:
       - 1c2_catalog_instance
       - feature
-      network.incoming.packets.rate_1c2_catalog_instance_1c2_t1_port:
-      - 1c2_catalog_instance_1c2_t1_port
-      - network.incoming.packets.rate
       memory_1c2_catalog_instance:
       - 1c2_catalog_instance
       - memory
+      network.outgoing.bytes.rate_1c2_catalog_instance_1c201_port:
+      - 1c2_catalog_instance_1c201_port
+      - network.outgoing.bytes.rate
       disk.write.requests.rate_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.write.requests.rate
@@ -402,28 +402,28 @@ topology_template:
       cpu.delta_1c2_catalog_instance:
       - 1c2_catalog_instance
       - cpu.delta
-      feature_1c2_catalog_instance_1c2_t2_port:
-      - 1c2_catalog_instance_1c2_t2_port
-      - feature
+      network.outgoing.bytes_1c2_catalog_instance_2c202_port:
+      - 1c2_catalog_instance_2c202_port
+      - network.outgoing.bytes
       disk.device.read.requests.rate_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.device.read.requests.rate
     requirements:
-      link_1c2_catalog_instance_1c2_t1_port:
-      - 1c2_catalog_instance_1c2_t1_port
-      - link
+      dependency_1c2_catalog_instance_2c202_port:
+      - 1c2_catalog_instance_2c202_port
+      - dependency
       dependency_1c2_catalog_instance:
       - 1c2_catalog_instance
       - dependency
       local_storage_1c2_catalog_instance:
       - 1c2_catalog_instance
       - local_storage
-      dependency_1c2_catalog_instance_1c2_t1_port:
-      - 1c2_catalog_instance_1c2_t1_port
-      - dependency
-      dependency_1c2_catalog_instance_1c2_t2_port:
-      - 1c2_catalog_instance_1c2_t2_port
-      - dependency
-      link_1c2_catalog_instance_1c2_t2_port:
-      - 1c2_catalog_instance_1c2_t2_port
+      link_1c2_catalog_instance_1c201_port:
+      - 1c2_catalog_instance_1c201_port
+      - link
+      link_1c2_catalog_instance_2c202_port:
+      - 1c2_catalog_instance_2c202_port
       - link
+      dependency_1c2_catalog_instance_1c201_port:
+      - 1c2_catalog_instance_1c201_port
+      - dependency
SDC Parent Project Catalog FE and BE