diff options
author | 2017-10-02 13:54:55 +0300 | |
---|---|---|
committer | 2017-10-02 14:28:15 +0300 | |
commit | 100491b13595ffeb8f847fc25b46192b607118af (patch) | |
tree | 33d7d93b64180c49ee83c0e6df12ae8293b06dc5 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out | |
parent | 9cee73a8b2a2ac82c57d100d5d3aebffec6d2f19 (diff) |
Change node template prefix
Add "".compute" to nested compute node types in substitution service templates
Issue - Id : SDC-425
Change-Id: I00902576a3adf8d0463ef1352961629663efd96c
Signed-off-by: talio <tali.orenbach@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out')
15 files changed, 26 insertions, 1082 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml index c23d70e2e9..b41b4dece5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -10535,176 +10535,6 @@ node_types: occurrences: - 1 - UNBOUNDED - org.openecomp.resource.vfc.nodes.heat.ps_server_nested2_1b: - derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server - properties: - port_ps_server_nested_b_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_ps_server_nested_b_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps_server_nested_b_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - compute_ps_server_nested2_1b_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_ps_server_nested_b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - compute_ps_server_nested2_1b_availability_zone: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_ps_server_nested_b_port_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_ps_server_nested_b_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_ps_server_nested_b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string - required: true - status: SUPPORTED - port_ps_server_nested_b_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_ps_server_nested_b_port_network_role: - type: string - required: true - status: SUPPORTED - port_ps_server_nested_b_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_ps_server_nested_b_port_order: - type: integer - required: true - status: SUPPORTED - org.openecomp.resource.vfc.nodes.heat.ps_server_main_1b: - derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server - properties: - port_ps_server_main_b_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_ps_server_main_b_port_network_role: - type: string - required: true - status: SUPPORTED - compute_ps_server_main_1b_availability_zone: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_ps_server_main_b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - port_ps_server_main_b_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_ps_server_main_b_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_ps_server_main_b_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_ps_server_main_b_port_order: - type: integer - required: true - status: SUPPORTED - port_ps_server_main_b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_ps_server_main_b_port_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - vm_image_name: - type: string - required: true - status: SUPPORTED - port_ps_server_main_b_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_ps_server_main_1b_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_ps_server_main_b_port_subnetpoolid: - type: string - required: true - status: SUPPORTED org.openecomp.resource.abstract.nodes.ps_server_main_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -11126,346 +10956,6 @@ node_types: occurrences: - 1 - UNBOUNDED - org.openecomp.resource.vfc.nodes.heat.cmaui_1c1_main: - derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server - properties: - port_cmaui_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cmaui_port_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_cmaui_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - port_cmaui_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_cmaui_port_order: - type: integer - required: true - status: SUPPORTED - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_cmaui_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_cmaui_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_cmaui_port_network_role: - type: string - required: true - status: SUPPORTED - vm_image_name: - type: string - required: true - status: SUPPORTED - port_cmaui_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - compute_cmaui_1c1_main_availability_zone: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - compute_cmaui_1c1_main_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_cmaui_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - org.openecomp.resource.vfc.nodes.heat.cmaui_1c1_nested2: - derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server - properties: - port_cmaui_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cmaui_port_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cmaui_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_cmaui_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - port_cmaui_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_cmaui_port_order: - type: integer - required: true - status: SUPPORTED - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_cmaui_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_cmaui_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_cmaui_port_network_role: - type: string - required: true - status: SUPPORTED - vm_image_name: - type: string - required: true - status: SUPPORTED - port_cmaui_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - compute_cmaui_1c1_nested2_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_cmaui_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - compute_cmaui_1c1_nested2_availability_zone: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - org.openecomp.resource.vfc.nodes.heat.pd_server_nested2_1b: - derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server - properties: - port_pd_server_nested_b_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_nested_b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - port_pd_server_nested_b_port_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_nested_b_port_network_role_tag: - type: string - required: true - status: SUPPORTED - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_pd_server_nested_b_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - compute_pd_server_nested2_1b_availability_zone: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - compute_pd_server_nested2_1b_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd_server_nested_b_port_order: - type: integer - required: true - status: SUPPORTED - port_pd_server_nested_b_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd_server_nested_b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd_server_nested_b_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - vm_image_name: - type: string - required: true - status: SUPPORTED - port_pd_server_nested_b_port_network_role: - type: string - required: true - status: SUPPORTED - port_pd_server_nested_b_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - org.openecomp.resource.vfc.nodes.heat.pd_server_main_1b: - derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server - properties: - port_pd_server_main_b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - port_pd_server_main_b_port_order: - type: integer - required: true - status: SUPPORTED - compute_pd_server_main_1b_availability_zone: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd_server_main_b_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd_server_main_b_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd_server_main_b_port_network_role_tag: - type: string - required: true - status: SUPPORTED - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_pd_server_main_b_port_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_main_b_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_main_b_port_network_role: - type: string - required: true - status: SUPPORTED - port_pd_server_main_b_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string - required: true - status: SUPPORTED - port_pd_server_main_b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - compute_pd_server_main_1b_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd_server_main_b_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string org.openecomp.resource.abstract.nodes.cmaui_1c1_nested2: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -13273,549 +12763,3 @@ node_types: occurrences: - 1 - UNBOUNDED - org.openecomp.resource.vfc.nodes.heat.pd_server_pattern4: - derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server - properties: - pd_server_pattern4_ips: - type: string - required: true - status: SUPPORTED - p1: - type: string - description: UID of OAM network - required: true - status: SUPPORTED - p2: - type: string - description: UID of OAM network - required: true - status: SUPPORTED - port_pd_server_pattern4_port_2_order: - type: integer - required: true - status: SUPPORTED - port_pd_server_pattern4_port_2_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_pattern4_port_2_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd_server_pattern4_port_2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - availability_zone_0: - type: string - description: availabilityzone name - required: true - status: SUPPORTED - port_pd_server_pattern4_port_2_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_pattern4_port_1_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - net: - type: string - required: true - status: SUPPORTED - port_pd_server_pattern4_port_1_network_role_tag: - type: string - required: true - status: SUPPORTED - pd_server_pattern4_flavor: - type: string - description: Flavor for PD server - required: true - status: SUPPORTED - port_pd_server_pattern4_port_2_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd_server_pattern4_port_1_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_pattern4_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - security_group_name: - type: list - description: CMAUI1, CMAUI2 server names - required: true - status: SUPPORTED - entry_schema: - type: string - ps_server_flavor: - type: string - description: Flavor for PS server - required: true - status: SUPPORTED - port_pd_server_pattern4_port_1_order: - type: integer - required: true - status: SUPPORTED - pd_server_pattern4_image: - type: string - description: Flavor for PD server - required: true - status: SUPPORTED - port_pd_server_pattern4_port_1_network_role: - type: string - required: true - status: SUPPORTED - port_pd_server_pattern4_port_2_network_role: - type: string - required: true - status: SUPPORTED - port_pd_server_pattern4_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd_server_pattern4_port_1_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd_server_pattern4_port_2_subnetpoolid: - type: string - required: true - status: SUPPORTED - pd_server_pattern4_names: - type: list - description: PD server names - required: true - status: SUPPORTED - entry_schema: - type: string - attributes: - pattern4_attr_1: - type: string - description: pattern4_attr_1_value - status: SUPPORTED - requirements: - - dependency_server_pd_pattern4: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - local_storage_server_pd_pattern4: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: - - 0 - - UNBOUNDED - - dependency_pd_server_pattern4_port_1: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_pd_server_pattern4_port_1: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_pd_server_pattern4_port_2: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_pd_server_pattern4_port_2: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - capabilities: - disk.root.size_server_pd_pattern4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - disk.device.write.bytes_server_pd_pattern4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes_pd_server_pattern4_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - disk.allocation_server_pd_pattern4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - disk.device.usage_server_pd_pattern4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes_pd_server_pattern4_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - disk.write.bytes.rate_server_pd_pattern4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - disk.ephemeral.size_server_pd_pattern4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - cpu.delta_server_pd_pattern4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - disk.write.bytes_server_pd_pattern4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - feature_pd_server_pattern4_port_2: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - feature_pd_server_pattern4_port_1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - disk.latency_server_pd_pattern4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - endpoint_server_pd_pattern4: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED - attachment_pd_server_pattern4_port_2: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - attachment_pd_server_pattern4_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - feature_server_pd_pattern4: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - disk.device.read.requests.rate_server_pd_pattern4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - instance_server_pd_pattern4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - cpu_server_pd_pattern4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - disk.device.read.requests_server_pd_pattern4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - host_server_pd_pattern4: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent - occurrences: - - 1 - - UNBOUNDED - cpu_util_server_pd_pattern4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - memory.resident_server_pd_pattern4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - disk.read.requests_server_pd_pattern4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - disk.read.bytes.rate_server_pd_pattern4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - disk.device.write.bytes.rate_server_pd_pattern4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - disk.device.read.bytes_server_pd_pattern4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - disk.write.requests_server_pd_pattern4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - disk.device.write.requests.rate_server_pd_pattern4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - memory.usage_server_pd_pattern4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - vcpus_server_pd_pattern4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - disk.capacity_server_pd_pattern4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - binding_server_pd_pattern4: - type: tosca.capabilities.network.Bindable - occurrences: - - 1 - - UNBOUNDED - network.outpoing.packets_pd_server_pattern4_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.outpoing.packets_pd_server_pattern4_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets.rate_pd_server_pattern4_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_pd_server_pattern4_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - disk.device.iops_server_pd_pattern4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets.rate_pd_server_pattern4_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_pd_server_pattern4_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - disk.device.read.bytes.rate_server_pd_pattern4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - disk.device.allocation_server_pd_pattern4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pattern4_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pattern4_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - disk.usage_server_pd_pattern4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - disk.read.bytes_server_pd_pattern4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - os_server_pd_pattern4: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - memory_server_pd_pattern4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - disk.iops_server_pd_pattern4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - scalable_server_pd_pattern4: - type: tosca.capabilities.Scalable - occurrences: - - 1 - - UNBOUNDED - binding_pd_server_pattern4_port_2: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - network.incoming.bytes.rate_pd_server_pattern4_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - disk.write.requests.rate_server_pd_pattern4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - disk.device.latency_server_pd_pattern4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - binding_pd_server_pattern4_port_1: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - network.incoming.bytes.rate_pd_server_pattern4_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_pd_server_pattern4_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - disk.device.write.requests_server_pd_pattern4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_pd_server_pattern4_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_pd_server_pattern4_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_pd_server_pattern4_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - disk.device.capacity_server_pd_pattern4: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - 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/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml index 5de9f39ea9..db86de004f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml @@ -319,4 +319,4 @@ topology_template: - test_nested_pattern_4_main_0 - abstract_pd_server_main_1b_1 - abstract_ps_server_main_1b_1 - - abstract_cmaui_1c1_main_1
\ No newline at end of file + - abstract_cmaui_1c1_main_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_mainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_mainServiceTemplate.yaml index fa347fbf57..9b9694d6bd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_mainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_mainServiceTemplate.yaml @@ -7,7 +7,7 @@ imports: - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml node_types: - org.openecomp.resource.vfc.nodes.heat.cmaui_1c1_main: + org.openecomp.resource.vfc.compute.nodes.heat.cmaui_1c1_main: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: @@ -113,7 +113,7 @@ topology_template: node: cmaui_1c1_main relationship: tosca.relationships.network.BindsTo cmaui_1c1_main: - type: org.openecomp.resource.vfc.nodes.heat.cmaui_1c1_main + type: org.openecomp.resource.vfc.compute.nodes.heat.cmaui_1c1_main properties: availability_zone: get_input: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml index 5ea692050e..3d5388a9b8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml @@ -7,7 +7,7 @@ imports: - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml node_types: - org.openecomp.resource.vfc.nodes.heat.cmaui_1c1_main: + org.openecomp.resource.vfc.compute.nodes.heat.cmaui_1c1_main: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: @@ -113,7 +113,7 @@ topology_template: node: cmaui_1c1_main relationship: tosca.relationships.network.BindsTo cmaui_1c1_main: - type: org.openecomp.resource.vfc.nodes.heat.cmaui_1c1_main + type: org.openecomp.resource.vfc.compute.nodes.heat.cmaui_1c1_main properties: availability_zone: get_input: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_nested2ServiceTemplate.yaml index 01cb3e6096..6b35975e45 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_nested2ServiceTemplate.yaml @@ -7,7 +7,7 @@ imports: - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml node_types: - org.openecomp.resource.vfc.nodes.heat.cmaui_1c1_nested2: + org.openecomp.resource.vfc.compute.nodes.heat.cmaui_1c1_nested2: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: @@ -113,7 +113,7 @@ topology_template: node: cmaui_1c1_nested2 relationship: tosca.relationships.network.BindsTo cmaui_1c1_nested2: - type: org.openecomp.resource.vfc.nodes.heat.cmaui_1c1_nested2 + type: org.openecomp.resource.vfc.compute.nodes.heat.cmaui_1c1_nested2 properties: availability_zone: get_input: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml index fd6f3d63a5..697a9a1f1a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml @@ -7,7 +7,7 @@ imports: - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml node_types: - org.openecomp.resource.vfc.nodes.heat.pd_server_main_1b: + org.openecomp.resource.vfc.compute.nodes.heat.pd_server_main_1b: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: @@ -79,7 +79,7 @@ topology_template: type: string node_templates: pd_server_main_1b: - type: org.openecomp.resource.vfc.nodes.heat.pd_server_main_1b + type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_main_1b properties: availability_zone: get_input: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml index 56e89cb733..164b9eee61 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml @@ -7,7 +7,7 @@ imports: - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml node_types: - org.openecomp.resource.vfc.nodes.heat.pd_server_main_1b: + org.openecomp.resource.vfc.compute.nodes.heat.pd_server_main_1b: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: @@ -79,7 +79,7 @@ topology_template: type: string node_templates: pd_server_main_1b: - type: org.openecomp.resource.vfc.nodes.heat.pd_server_main_1b + type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_main_1b properties: availability_zone: get_input: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml index 6b763621d4..13bd976915 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml @@ -7,7 +7,7 @@ imports: - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml node_types: - org.openecomp.resource.vfc.nodes.heat.pd_server_nested2_1b: + org.openecomp.resource.vfc.compute.nodes.heat.pd_server_nested2_1b: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: @@ -113,7 +113,7 @@ topology_template: node: pd_server_nested2_1b relationship: tosca.relationships.network.BindsTo pd_server_nested2_1b: - type: org.openecomp.resource.vfc.nodes.heat.pd_server_nested2_1b + type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_nested2_1b properties: availability_zone: get_input: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml index 99e9b836b4..b6af3a68ed 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml @@ -7,7 +7,7 @@ imports: - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml node_types: - org.openecomp.resource.vfc.nodes.heat.ps_server_main_1b: + org.openecomp.resource.vfc.compute.nodes.heat.ps_server_main_1b: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: @@ -113,7 +113,7 @@ topology_template: node: ps_server_main_1b relationship: tosca.relationships.network.BindsTo ps_server_main_1b: - type: org.openecomp.resource.vfc.nodes.heat.ps_server_main_1b + type: org.openecomp.resource.vfc.compute.nodes.heat.ps_server_main_1b properties: availability_zone: get_input: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml index b840bc59bc..e37760f13e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml @@ -7,7 +7,7 @@ imports: - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml node_types: - org.openecomp.resource.vfc.nodes.heat.ps_server_main_1b: + org.openecomp.resource.vfc.compute.nodes.heat.ps_server_main_1b: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: @@ -113,7 +113,7 @@ topology_template: node: ps_server_main_1b relationship: tosca.relationships.network.BindsTo ps_server_main_1b: - type: org.openecomp.resource.vfc.nodes.heat.ps_server_main_1b + type: org.openecomp.resource.vfc.compute.nodes.heat.ps_server_main_1b properties: availability_zone: get_input: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml index 01e6852416..c39aa2dc26 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml @@ -7,7 +7,7 @@ imports: - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml node_types: - org.openecomp.resource.vfc.nodes.heat.ps_server_nested2_1b: + org.openecomp.resource.vfc.compute.nodes.heat.ps_server_nested2_1b: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: @@ -113,7 +113,7 @@ topology_template: node: ps_server_nested2_1b relationship: tosca.relationships.network.BindsTo ps_server_nested2_1b: - type: org.openecomp.resource.vfc.nodes.heat.ps_server_nested2_1b + type: org.openecomp.resource.vfc.compute.nodes.heat.ps_server_nested2_1b properties: availability_zone: get_input: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4-same-typeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4-same-typeServiceTemplate.yaml index c7fa924e21..91a958fe18 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4-same-typeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4-same-typeServiceTemplate.yaml @@ -7,7 +7,7 @@ imports: - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml node_types: - org.openecomp.resource.vfc.nodes.heat.pd_server_pattern4: + org.openecomp.resource.vfc.compute.nodes.heat.pd_server_pattern4: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: @@ -122,7 +122,7 @@ topology_template: type: string node_templates: server_pd_pattern4: - type: org.openecomp.resource.vfc.nodes.heat.pd_server_pattern4 + type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_pattern4 properties: flavor: get_input: pd_server_pattern4_flavor diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4ServiceTemplate.yaml index 237b5e728c..b202e39caa 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4ServiceTemplate.yaml @@ -7,7 +7,7 @@ imports: - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml node_types: - org.openecomp.resource.vfc.nodes.heat.pd_server_pattern4: + org.openecomp.resource.vfc.compute.nodes.heat.pd_server_pattern4: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: @@ -122,7 +122,7 @@ topology_template: type: string node_templates: server_pd_pattern4: - type: org.openecomp.resource.vfc.nodes.heat.pd_server_pattern4 + type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_pattern4 properties: flavor: get_input: pd_server_pattern4_flavor @@ -422,4 +422,4 @@ topology_template: - link dependency_server_pd_pattern4: - server_pd_pattern4 - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml index 7e4eb5122e..c411944118 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml @@ -2320,4 +2320,4 @@ topology_template: - dependency_test_nested_pattern_4_nested2 dependency_test_nested3Level_test_nested2Level: - test_nested2Level - - dependency_test_nested3Level
\ No newline at end of file + - dependency_test_nested3Level diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml index ffc5015e19..244b6a21cb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml @@ -1498,4 +1498,4 @@ topology_template: - dependency dependency_pd_server_pattern4_port_1_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - - dependency_pd_server_pattern4_port_1
\ No newline at end of file + - dependency_pd_server_pattern4_port_1 |