diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out')
4 files changed, 444 insertions, 444 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml index 438512f5e8..ce3d6964c1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,12 +8,28 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pcm_port_related_networks: + port_pcm_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pcm_port_1_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pcm_port_1_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pcm_port_1_security_groups: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json index_value: type: integer description: Index value of this substitution service template runtime instance @@ -34,80 +50,64 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pcm_port_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_network_role_tag: - type: string - required: true - status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_pcm_port_mac_requirements: + port_pcm_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pcm_port_order: - type: integer - required: true - status: SUPPORTED - port_pcm_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pcm_port_vlan_requirements: + port_pcm_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pcm_port_ip_requirements: + port_pcm_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_image_name: type: string required: true status: SUPPORTED - port_pcm_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pcm_port_network_role: + port_pcm_port_1_subnetpoolid: type: string required: true status: SUPPORTED - port_pcm_port_subnetpoolid: - type: string + port_pcm_port_1_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_config_drive: type: list required: true status: SUPPORTED entry_schema: type: boolean + port_pcm_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - port_pcm_port_security_groups: - type: list + port_pcm_port_1_order: + type: integer + required: true + status: SUPPORTED + port_pcm_port_1_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: json requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -123,25 +123,20 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pcm_port: + - dependency_pd_server_pcm_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pcm_port: + - link_pd_server_pcm_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - forwarder_pd_server_pcm_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -153,25 +148,30 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pcm_port: + memory.usage_pd_server: 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_pd_server: + memory_pd_server: 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_pd_server: + disk.device.usage_pd_server: 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_pd_server: + forwarder_pd_server_pcm_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_pcm_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: @@ -188,19 +188,12 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pcm_port: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_pd_server_pcm_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 - binding_pd_server_pcm_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED cpu_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -231,25 +224,36 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.iops_pd_server: + network.incoming.bytes.rate_pd_server_pcm_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 - memory.resident_pd_server: + attachment_pd_server_pcm_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_pd_server_pcm_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 - cpu.delta_pd_server: + disk.iops_pd_server: + 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_pd_server: 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_pcm_port: + cpu.delta_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -267,12 +271,23 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_pcm_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_pd_server: 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_pcm_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 endpoint_pd_server: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -284,6 +299,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_pcm_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED disk.device.allocation_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -307,7 +330,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pcm_port: + network.incoming.bytes_pd_server_pcm_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: @@ -330,12 +353,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pcm_port: - 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.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -354,41 +371,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pcm_port: - 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_pd_server: 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_pcm_port: - 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_pd_server: 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_pcm_port: - 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 - attachment_pd_server_pcm_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED instance_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -402,7 +396,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pcm_port: + network.outgoing.packets.rate_pd_server_pcm_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: @@ -450,15 +444,25 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pcm_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 org.openecomp.resource.abstract.nodes.pcm_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pcm_port_related_networks: + port_pcm_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_pcm_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -467,120 +471,116 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - compute_pcm_server_availability_zone: + port_pcm_port_0_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pcm_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pcm_port_fixed_ips: + port_pcm_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_network_role_tag: - type: string + type: org.openecomp.datatypes.network.VlanRequirements + compute_pcm_server_availability_zone: + type: list required: true status: SUPPORTED + entry_schema: + type: string vm_flavor_name: type: string required: true status: SUPPORTED - port_pcm_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pcm_port_order: - type: integer - required: true - status: SUPPORTED compute_pcm_server_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_pcm_port_network: + port_pcm_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pcm_port_vlan_requirements: + type: json + compute_pcm_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pcm_port_ip_requirements: - type: list + type: string + port_pcm_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - compute_pcm_server_user_data_format: - type: list + port_pcm_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_image_name: type: string required: true status: SUPPORTED - port_pcm_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pcm_port_0_related_networks: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_pcm_server_config_drive: type: list required: true status: SUPPORTED entry_schema: type: boolean - port_pcm_port_network_role: - type: string + port_pcm_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pcm_port_subnetpoolid: + port_pcm_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pcm_port_security_groups: - type: list + port_pcm_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json requirements: - - dependency_pcm_server: + - dependency_pcm_server_pcm_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_pcm_server: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_pcm_server_pcm_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_pcm_server_pcm_port: + - 1 + - 1 + - dependency_pcm_server: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_server_pcm_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + - local_storage_pcm_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 - - 1 + - 0 + - UNBOUNDED capabilities: disk.device.read.requests_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -594,16 +594,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pcm_server_pcm_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pcm_server_pcm_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - attachment_pcm_server_pcm_port: - type: tosca.capabilities.Attachment + binding_pcm_server_pcm_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED disk.root.size_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -629,7 +631,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pcm_server_pcm_port: + network.incoming.bytes.rate_pcm_server_pcm_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -647,41 +649,36 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_pcm_server: + network.incoming.packets.rate_pcm_server_pcm_port_0: 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_pcm_server: + network.outgoing.packets.rate_pcm_server_pcm_port_0: 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_pcm_server: + disk.device.write.requests_pcm_server: 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_pcm_server_pcm_port: + disk.read.requests_pcm_server: 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_pcm_server_pcm_port: + memory.resident_pcm_server: 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_pcm_server_pcm_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.iops_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -694,12 +691,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pcm_server_pcm_port: - 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_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -729,26 +720,26 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu_util_pcm_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pcm_server_pcm_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.allocation_pcm_server: + network.incoming.bytes_pcm_server_pcm_port_0: 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_pcm_server_pcm_port: + cpu_util_pcm_server: 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 - forwarder_pcm_server_pcm_port: - type: org.openecomp.capabilities.Forwarder + disk.allocation_pcm_server: + 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 @@ -801,13 +792,16 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pcm_server_pcm_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + attachment_pcm_server_pcm_port_0: + type: tosca.capabilities.Attachment occurrences: - - 0 + - 1 + - UNBOUNDED + network.outgoing.bytes_pcm_server_pcm_port_0: + 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_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -832,6 +826,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pcm_server_pcm_port_0: + 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_pcm_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -849,41 +849,41 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.bytes_pcm_server: + network.outpoing.packets_pcm_server_pcm_port_0: 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_pcm_server: + disk.write.bytes_pcm_server: 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_pcm_server: - type: tosca.capabilities.Endpoint.Admin + disk.ephemeral.size_pcm_server: + 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_pcm_server_pcm_port: + network.outgoing.bytes.rate_pcm_server_pcm_port_0: 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_pcm_server: - type: tosca.capabilities.Scalable + endpoint_pcm_server: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_pcm_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_pcm_server: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pcm_server_pcm_port: + disk.write.requests.rate_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1668,4 +1668,4 @@ node_types: type: tosca.capabilities.OperatingSystem occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml index 0e7c780c5d..520a821c20 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml @@ -11,11 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pcm_port_related_networks: + port_pcm_port_0_network_role: + type: string + required: true + port_pcm_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -23,138 +26,135 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - compute_pcm_server_availability_zone: + port_pcm_port_0_fixed_ips: type: list required: true entry_schema: - type: string - port_pcm_port_fixed_ips: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pcm_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_network_role_tag: - type: string - required: true - vm_flavor_name: - type: string - required: true - port_pcm_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pcm_port_order: - type: integer - required: true - compute_pcm_server_name: + type: string + port_pcm_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_pcm_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + compute_pcm_server_availability_zone: type: list required: true entry_schema: type: string - port_pcm_port_vlan_requirements: + vm_flavor_name: + type: string + required: true + compute_pcm_server_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pcm_port_ip_requirements: + type: string + port_pcm_port_0_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json compute_pcm_server_user_data_format: type: list required: true entry_schema: type: string + port_pcm_port_0_order: + type: integer + required: true + port_pcm_port_0_subnetpoolid: + type: string + required: true vm_image_name: type: string required: true - port_pcm_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pcm_port_0_related_networks: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_pcm_server_config_drive: type: list required: true entry_schema: type: boolean - port_pcm_port_network_role: - type: string + port_pcm_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pcm_port_subnetpoolid: + port_pcm_port_0_network_role_tag: type: string required: true - port_pcm_port_security_groups: - type: list + port_pcm_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json node_templates: - pcm_server: - type: org.openecomp.resource.vfc.compute.nodes.heat.pcm_server - properties: - availability_zone: - get_input: - - compute_pcm_server_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - config_drive: - get_input: - - compute_pcm_server_config_drive - - index_value - image: - get_input: vm_image_name - name: - get_input: - - compute_pcm_server_name - - index_value - user_data_format: - get_input: - - compute_pcm_server_user_data_format - - index_value - pcm_server_pcm_port: + pcm_server_pcm_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_pcm_port_mac_requirements + get_input: port_pcm_port_0_mac_requirements order: - get_input: port_pcm_port_order + get_input: port_pcm_port_0_order security_groups: get_input: - - port_pcm_port_security_groups + - port_pcm_port_0_security_groups - index_value exCP_naming: - get_input: port_pcm_port_exCP_naming + get_input: port_pcm_port_0_exCP_naming vlan_requirements: - get_input: port_pcm_port_vlan_requirements + get_input: port_pcm_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pcm_port_ip_requirements + get_input: port_pcm_port_0_ip_requirements related_networks: - get_input: port_pcm_port_related_networks + get_input: port_pcm_port_0_related_networks network_role_tag: - get_input: port_pcm_port_network_role_tag + get_input: port_pcm_port_0_network_role_tag network_role: - get_input: port_pcm_port_network_role + get_input: port_pcm_port_0_network_role fixed_ips: get_input: - - port_pcm_port_fixed_ips + - port_pcm_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_pcm_port_subnetpoolid + get_input: port_pcm_port_0_subnetpoolid network: get_input: - - port_pcm_port_network + - port_pcm_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pcm_server relationship: tosca.relationships.network.BindsTo + pcm_server: + type: org.openecomp.resource.vfc.compute.nodes.heat.pcm_server + properties: + availability_zone: + get_input: + - compute_pcm_server_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + config_drive: + get_input: + - compute_pcm_server_config_drive + - index_value + image: + get_input: vm_image_name + name: + get_input: + - compute_pcm_server_name + - index_value + user_data_format: + get_input: + - compute_pcm_server_user_data_format + - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pcm_server capabilities: @@ -164,12 +164,12 @@ topology_template: disk.device.write.requests.rate_pcm_server: - pcm_server - disk.device.write.requests.rate - network.outgoing.bytes.rate_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.outgoing.bytes.rate - attachment_pcm_server_pcm_port: - - pcm_server_pcm_port - - attachment + forwarder_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - forwarder + binding_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - binding disk.root.size_pcm_server: - pcm_server - disk.root.size @@ -182,15 +182,21 @@ topology_template: memory.usage_pcm_server: - pcm_server - memory.usage - network.outgoing.packets.rate_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.outgoing.packets.rate + network.incoming.bytes.rate_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - network.incoming.bytes.rate disk.device.read.requests.rate_pcm_server: - pcm_server - disk.device.read.requests.rate disk.device.latency_pcm_server: - pcm_server - disk.device.latency + network.incoming.packets.rate_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - network.incoming.packets.rate + network.outgoing.packets.rate_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - network.outgoing.packets.rate disk.device.write.requests_pcm_server: - pcm_server - disk.device.write.requests @@ -200,24 +206,12 @@ topology_template: memory.resident_pcm_server: - pcm_server - memory.resident - network.outgoing.bytes_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.outgoing.bytes - network.outpoing.packets_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.outpoing.packets - feature_pcm_server_pcm_port: - - pcm_server_pcm_port - - feature disk.iops_pcm_server: - pcm_server - disk.iops disk.capacity_pcm_server: - pcm_server - disk.capacity - network.incoming.bytes.rate_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.incoming.bytes.rate disk.read.bytes.rate_pcm_server: - pcm_server - disk.read.bytes.rate @@ -233,18 +227,18 @@ topology_template: disk.device.iops_pcm_server: - pcm_server - disk.device.iops + feature_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - feature + network.incoming.bytes_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - network.incoming.bytes cpu_util_pcm_server: - pcm_server - cpu_util disk.allocation_pcm_server: - pcm_server - disk.allocation - network.incoming.packets_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.incoming.packets - forwarder_pcm_server_pcm_port: - - pcm_server_pcm_port - - forwarder disk.device.usage_pcm_server: - pcm_server - disk.device.usage @@ -269,9 +263,12 @@ topology_template: disk.usage_pcm_server: - pcm_server - disk.usage - binding_pcm_server_pcm_port: - - pcm_server_pcm_port - - binding + attachment_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - attachment + network.outgoing.bytes_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - network.outgoing.bytes disk.device.read.bytes_pcm_server: - pcm_server - disk.device.read.bytes @@ -284,6 +281,9 @@ topology_template: disk.write.bytes.rate_pcm_server: - pcm_server - disk.write.bytes.rate + network.incoming.packets_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - network.incoming.packets os_pcm_server: - pcm_server - os @@ -293,40 +293,40 @@ topology_template: disk.read.bytes_pcm_server: - pcm_server - disk.read.bytes + network.outpoing.packets_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - network.outpoing.packets disk.write.bytes_pcm_server: - pcm_server - disk.write.bytes disk.ephemeral.size_pcm_server: - pcm_server - disk.ephemeral.size + network.outgoing.bytes.rate_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - network.outgoing.bytes.rate endpoint_pcm_server: - pcm_server - endpoint - network.incoming.bytes_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.incoming.bytes scalable_pcm_server: - pcm_server - scalable disk.write.requests.rate_pcm_server: - pcm_server - disk.write.requests.rate - network.incoming.packets.rate_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.incoming.packets.rate disk.device.read.bytes.rate_pcm_server: - pcm_server - disk.device.read.bytes.rate requirements: - link_pcm_server_pcm_port: - - pcm_server_pcm_port - - link - dependency_pcm_server_pcm_port: - - pcm_server_pcm_port + dependency_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 - dependency + link_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - link local_storage_pcm_server: - pcm_server - local_storage dependency_pcm_server: - pcm_server - - 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/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml index 33fc4138da..f808c5a23a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml @@ -11,11 +11,24 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pcm_port_related_networks: + port_pcm_port_1_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pcm_port_1_network_role_tag: + type: string + required: true + port_pcm_port_1_network: + type: list + required: true + entry_schema: + type: string + port_pcm_port_1_security_groups: + type: list + required: true + entry_schema: + type: json index_value: type: integer description: Index value of this substitution service template runtime instance @@ -33,65 +46,52 @@ topology_template: required: true entry_schema: type: string - port_pcm_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_network_role_tag: - type: string - required: true vm_flavor_name: type: string required: true - port_pcm_port_mac_requirements: + port_pcm_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_pcm_port_order: - type: integer - required: true - port_pcm_port_network: - type: list - required: true - entry_schema: - type: string - port_pcm_port_vlan_requirements: + port_pcm_port_1_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pcm_port_ip_requirements: + port_pcm_port_1_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_image_name: type: string required: true - port_pcm_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pcm_port_network_role: + port_pcm_port_1_subnetpoolid: type: string required: true - port_pcm_port_subnetpoolid: - type: string + port_pcm_port_1_ip_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_config_drive: type: list required: true entry_schema: type: boolean + port_pcm_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true compute_pd_server_user_data_format: type: list required: true entry_schema: type: string - port_pcm_port_security_groups: - type: list + port_pcm_port_1_order: + type: integer + required: true + port_pcm_port_1_network_role: + type: string required: true - entry_schema: - type: json node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -116,39 +116,39 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pcm_port: + pd_server_pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_pcm_port_mac_requirements + get_input: port_pcm_port_1_mac_requirements order: - get_input: port_pcm_port_order + get_input: port_pcm_port_1_order security_groups: get_input: - - port_pcm_port_security_groups + - port_pcm_port_1_security_groups - index_value exCP_naming: - get_input: port_pcm_port_exCP_naming + get_input: port_pcm_port_1_exCP_naming vlan_requirements: - get_input: port_pcm_port_vlan_requirements + get_input: port_pcm_port_1_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pcm_port_ip_requirements + get_input: port_pcm_port_1_ip_requirements related_networks: - get_input: port_pcm_port_related_networks + get_input: port_pcm_port_1_related_networks network_role_tag: - get_input: port_pcm_port_network_role_tag + get_input: port_pcm_port_1_network_role_tag network_role: - get_input: port_pcm_port_network_role + get_input: port_pcm_port_1_network_role fixed_ips: get_input: - - port_pcm_port_fixed_ips + - port_pcm_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_pcm_port_subnetpoolid + get_input: port_pcm_port_1_subnetpoolid network: get_input: - - port_pcm_port_network + - port_pcm_port_1_network - index_value requirements: - binding: @@ -158,18 +158,12 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: - forwarder_pd_server_pcm_port: - - pd_server_pcm_port - - forwarder scalable_pd_server: - pd_server - scalable disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate - network.incoming.bytes_pd_server_pcm_port: - - pd_server_pcm_port - - network.incoming.bytes memory.usage_pd_server: - pd_server - memory.usage @@ -179,18 +173,21 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage + forwarder_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - forwarder + network.incoming.packets_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - network.incoming.packets os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - feature_pd_server_pcm_port: - - pd_server_pcm_port - - feature - binding_pd_server_pcm_port: - - pd_server_pcm_port - - binding + network.outgoing.bytes.rate_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - network.outgoing.bytes.rate cpu_pd_server: - pd_server - cpu @@ -206,6 +203,15 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate + network.incoming.bytes.rate_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - network.incoming.bytes.rate + attachment_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - attachment + network.outgoing.bytes_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops @@ -215,24 +221,30 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.outgoing.bytes_pd_server_pcm_port: - - pd_server_pcm_port - - network.outgoing.bytes vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + feature_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - feature disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests + network.incoming.packets.rate_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - network.incoming.packets.rate endpoint_pd_server: - pd_server - endpoint disk.capacity_pd_server: - pd_server - disk.capacity + binding_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - binding disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -245,9 +257,9 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests - network.outgoing.packets.rate_pd_server_pcm_port: - - pd_server_pcm_port - - network.outgoing.packets.rate + network.incoming.bytes_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - network.incoming.bytes feature_pd_server: - pd_server - feature @@ -257,9 +269,6 @@ topology_template: disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pcm_port: - - pd_server_pcm_port - - network.incoming.bytes.rate disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -269,33 +278,21 @@ topology_template: disk.device.read.bytes_pd_server: - pd_server - disk.device.read.bytes - network.outpoing.packets_pd_server_pcm_port: - - pd_server_pcm_port - - network.outpoing.packets disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes - network.outgoing.bytes.rate_pd_server_pcm_port: - - pd_server_pcm_port - - network.outgoing.bytes.rate disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests - network.incoming.packets_pd_server_pcm_port: - - pd_server_pcm_port - - network.incoming.packets - attachment_pd_server_pcm_port: - - pd_server_pcm_port - - attachment instance_pd_server: - pd_server - instance host_pd_server: - pd_server - host - network.incoming.packets.rate_pd_server_pcm_port: - - pd_server_pcm_port - - network.incoming.packets.rate + network.outgoing.packets.rate_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - network.outgoing.packets.rate disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -317,16 +314,19 @@ topology_template: disk.device.iops_pd_server: - pd_server - disk.device.iops + network.outpoing.packets_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - network.outpoing.packets requirements: local_storage_pd_server: - pd_server - local_storage + link_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - link dependency_pd_server: - pd_server - dependency - link_pd_server_pcm_port: - - pd_server_pcm_port - - link - dependency_pd_server_pcm_port: - - pd_server_pcm_port - - dependency
\ No newline at end of file + dependency_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml index 8e26dac997..fc52a3f51b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -110,35 +110,35 @@ topology_template: directives: - substitutable properties: - compute_pcm_server_availability_zone: - - get_input: availabilityzone_name - port_pcm_port_fixed_ips: + port_pcm_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_pcm_port_0_fixed_ips: - ip_address: get_input: cps_net_ip - port_pcm_port_network_role_tag: cps + port_pcm_port_0_network: + - get_input: cps_net_name + compute_pcm_server_availability_zone: + - get_input: availabilityzone_name vm_flavor_name: get_input: pcm_flavor_name - port_pcm_port_mac_requirements: - mac_count_required: - is_required: false compute_pcm_server_name: - get_input: pcm_server_name - port_pcm_port_network: - - get_input: cps_net_name - port_pcm_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + port_pcm_port_0_security_groups: + - - get_input: security_group_name compute_pcm_server_user_data_format: - RAW vm_image_name: get_input: pcm_image_name compute_pcm_server_config_drive: - true - port_pcm_port_security_groups: - - - get_input: security_group_name + port_pcm_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pcm_port_0_network_role_tag: cps service_template_filter: substitute_service_template: Nested_pcm_serverServiceTemplate.yaml count: 1 @@ -152,35 +152,35 @@ topology_template: directives: - substitutable properties: + port_pcm_port_1_network_role_tag: oam + port_pcm_port_1_network: + - get_input: oam_net_name + port_pcm_port_1_security_groups: + - - get_input: security_group_name compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: - get_input: pd_server_name - port_pcm_port_fixed_ips: - - ip_address: - get_input: oam_net_ip - port_pcm_port_network_role_tag: oam vm_flavor_name: get_input: pd_flavor_name - port_pcm_port_mac_requirements: + port_pcm_port_1_mac_requirements: mac_count_required: is_required: false - port_pcm_port_network: - - get_input: oam_net_name - port_pcm_port_ip_requirements: + port_pcm_port_1_fixed_ips: + - ip_address: + get_input: oam_net_ip + vm_image_name: + get_input: pd_image_name + port_pcm_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - vm_image_name: - get_input: pd_image_name compute_pd_server_config_drive: - true compute_pd_server_user_data_format: - RAW - port_pcm_port_security_groups: - - - get_input: security_group_name service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -210,19 +210,19 @@ topology_template: capabilities: network.incoming.packets.rate_pcm_port_0: - abstract_pcm_server - - network.incoming.packets.rate_pcm_server_pcm_port + - network.incoming.packets.rate_pcm_server_pcm_port_0 disk.iops_server_pd_0: - abstract_pd_server - disk.iops_pd_server network.incoming.packets.rate_pcm_port_1: - abstract_pd_server - - network.incoming.packets.rate_pd_server_pcm_port + - network.incoming.packets.rate_pd_server_pcm_port_1 network.outpoing.packets_pcm_port_1: - abstract_pd_server - - network.outpoing.packets_pd_server_pcm_port + - network.outpoing.packets_pd_server_pcm_port_1 network.outpoing.packets_pcm_port_0: - abstract_pcm_server - - network.outpoing.packets_pcm_server_pcm_port + - network.outpoing.packets_pcm_server_pcm_port_0 disk.write.bytes.rate_server_pd_0: - abstract_pd_server - disk.write.bytes.rate_pd_server @@ -243,19 +243,19 @@ topology_template: - memory_pd_server network.incoming.bytes_pcm_port_0: - abstract_pcm_server - - network.incoming.bytes_pcm_server_pcm_port + - network.incoming.bytes_pcm_server_pcm_port_0 network.incoming.bytes_pcm_port_1: - abstract_pd_server - - network.incoming.bytes_pd_server_pcm_port + - network.incoming.bytes_pd_server_pcm_port_1 disk.usage_server_pcm_0: - abstract_pcm_server - disk.usage_pcm_server binding_pcm_port_0: - abstract_pcm_server - - binding_pcm_server_pcm_port + - binding_pcm_server_pcm_port_0 binding_pcm_port_1: - abstract_pd_server - - binding_pd_server_pcm_port + - binding_pd_server_pcm_port_1 vcpus_server_pcm_0: - abstract_pcm_server - vcpus_pcm_server @@ -270,34 +270,34 @@ topology_template: - feature_pcm_server network.outgoing.packets.rate_pcm_port_0: - abstract_pcm_server - - network.outgoing.packets.rate_pcm_server_pcm_port + - network.outgoing.packets.rate_pcm_server_pcm_port_0 network.outgoing.packets.rate_pcm_port_1: - abstract_pd_server - - network.outgoing.packets.rate_pd_server_pcm_port + - network.outgoing.packets.rate_pd_server_pcm_port_1 feature_pcm_port_1: - abstract_pd_server - - feature_pd_server_pcm_port + - feature_pd_server_pcm_port_1 disk.ephemeral.size_server_pd_0: - abstract_pd_server - disk.ephemeral.size_pd_server network.outgoing.bytes_pcm_port_0: - abstract_pcm_server - - network.outgoing.bytes_pcm_server_pcm_port + - network.outgoing.bytes_pcm_server_pcm_port_0 feature_pcm_port_0: - abstract_pcm_server - - feature_pcm_server_pcm_port + - feature_pcm_server_pcm_port_0 network.outgoing.bytes_pcm_port_1: - abstract_pd_server - - network.outgoing.bytes_pd_server_pcm_port + - network.outgoing.bytes_pd_server_pcm_port_1 cpu_server_pcm_0: - abstract_pcm_server - cpu_pcm_server attachment_pcm_port_0: - abstract_pcm_server - - attachment_pcm_server_pcm_port + - attachment_pcm_server_pcm_port_0 attachment_pcm_port_1: - abstract_pd_server - - attachment_pd_server_pcm_port + - attachment_pd_server_pcm_port_1 disk.write.bytes_server_pd_0: - abstract_pd_server - disk.write.bytes_pd_server @@ -444,10 +444,10 @@ topology_template: - cpu.delta_pcm_server forwarder_pcm_port_0: - abstract_pcm_server - - forwarder_pcm_server_pcm_port + - forwarder_pcm_server_pcm_port_0 forwarder_pcm_port_1: - abstract_pd_server - - forwarder_pd_server_pcm_port + - forwarder_pd_server_pcm_port_1 memory.resident_server_pd_0: - abstract_pd_server - memory.resident_pd_server @@ -480,10 +480,10 @@ topology_template: - disk.device.read.requests_pd_server network.outgoing.bytes.rate_pcm_port_1: - abstract_pd_server - - network.outgoing.bytes.rate_pd_server_pcm_port + - network.outgoing.bytes.rate_pd_server_pcm_port_1 network.incoming.packets_pcm_port_0: - abstract_pcm_server - - network.incoming.packets_pcm_server_pcm_port + - network.incoming.packets_pcm_server_pcm_port_0 disk.device.latency_server_pcm_0: - abstract_pcm_server - disk.device.latency_pcm_server @@ -495,13 +495,13 @@ topology_template: - disk.latency_pd_server network.outgoing.bytes.rate_pcm_port_0: - abstract_pcm_server - - network.outgoing.bytes.rate_pcm_server_pcm_port + - network.outgoing.bytes.rate_pcm_server_pcm_port_0 memory.usage_server_pd_0: - abstract_pd_server - memory.usage_pd_server network.incoming.packets_pcm_port_1: - abstract_pd_server - - network.incoming.packets_pd_server_pcm_port + - network.incoming.packets_pd_server_pcm_port_1 disk.device.write.requests_server_pcm_0: - abstract_pcm_server - disk.device.write.requests_pcm_server @@ -519,10 +519,10 @@ topology_template: - os_pcm_server network.incoming.bytes.rate_pcm_port_0: - abstract_pcm_server - - network.incoming.bytes.rate_pcm_server_pcm_port + - network.incoming.bytes.rate_pcm_server_pcm_port_0 network.incoming.bytes.rate_pcm_port_1: - abstract_pd_server - - network.incoming.bytes.rate_pd_server_pcm_port + - network.incoming.bytes.rate_pd_server_pcm_port_1 os_server_pd_0: - abstract_pd_server - os_pd_server @@ -535,13 +535,13 @@ topology_template: - local_storage_pcm_server link_pcm_port_0: - abstract_pcm_server - - link_pcm_server_pcm_port + - link_pcm_server_pcm_port_0 link_pcm_port_1: - abstract_pd_server - - link_pd_server_pcm_port + - link_pd_server_pcm_port_1 dependency_pcm_port_0: - abstract_pcm_server - - dependency_pcm_server_pcm_port + - dependency_pcm_server_pcm_port_0 local_storage_server_pd_0: - abstract_pd_server - local_storage_pd_server @@ -550,4 +550,4 @@ topology_template: - dependency_pd_server dependency_pcm_port_1: - abstract_pd_server - - dependency_pd_server_pcm_port + - dependency_pd_server_pcm_port_1 |