diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute')
3 files changed, 176 insertions, 176 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml index 933ff40acc..654b73714e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -597,10 +597,12 @@ node_types: status: SUPPORTED entry_schema: type: string - port_compute_port_subnetpoolid: - type: string + port_compute_port_0_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 @@ -609,68 +611,66 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_compute_port_vlan_requirements: + compute_compute_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_compute_name: + type: string + port_compute_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_compute_port_network_role: - type: string + port_compute_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_compute_port_0_vlan_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED - port_compute_port_network: - type: list + port_compute_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: string - port_compute_port_related_networks: - type: list + port_compute_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_compute_port_network_role_tag: - type: string + port_compute_port_0_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements compute_compute_metadata: type: list required: true status: SUPPORTED entry_schema: type: json - port_compute_port_order: - type: integer - required: true - status: SUPPORTED - port_compute_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_compute_port_0_network_role: + type: string required: true status: SUPPORTED - port_compute_port_ip_requirements: - type: list + port_compute_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_compute_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_compute_port_0_order: + type: integer required: true status: SUPPORTED requirements: @@ -688,20 +688,25 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_compute_compute_port: + - dependency_compute_compute_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_compute_compute_port: + - link_compute_compute_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + attachment_compute_compute_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.write.requests_compute: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -714,25 +719,33 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_compute_compute_port: + disk.root.size_compute: 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.root.size_compute: + disk.write.requests.rate_compute: 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_compute: + disk.read.requests_compute: 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_compute: + binding_compute_compute_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: + - 0 + - UNBOUNDED + network.incoming.bytes_compute_compute_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: @@ -755,26 +768,32 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.iops_compute: + forwarder_compute_compute_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_compute_compute_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.bytes.rate_compute_compute_port: + network.incoming.bytes.rate_compute_compute_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.write.requests.rate_compute: + disk.device.iops_compute: 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_compute_compute_port: - type: tosca.capabilities.Attachment + disk.device.write.requests.rate_compute: + 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 @@ -785,25 +804,28 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_compute: + network.incoming.packets.rate_compute_compute_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 - cpu_compute: + feature_compute_compute_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_compute: 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_compute_compute_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 + cpu_compute: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED disk.allocation_compute: type: org.openecomp.capabilities.metric.Ceilometer @@ -822,29 +844,19 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_compute_compute_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.usage_compute: 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_compute_compute_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_compute_compute_port: + instance_compute: 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_compute: + network.outpoing.packets_compute_compute_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: @@ -880,25 +892,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_compute_compute_port: + disk.device.read.requests.rate_compute: 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_compute: + disk.read.bytes_compute: 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_compute: + disk.device.read.bytes_compute: 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_compute: + network.incoming.packets_compute_compute_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: @@ -916,7 +928,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_compute_compute_port: + network.outgoing.bytes_compute_compute_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: @@ -952,18 +964,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_compute_compute_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 - network.outgoing.bytes_compute_compute_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 endpoint_compute: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -991,27 +991,27 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_compute_compute_port: + disk.device.read.requests_compute: 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_compute: + disk.device.capacity_compute: 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_compute: + disk.device.allocation_compute: 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_compute: + network.outgoing.bytes.rate_compute_compute_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
\ 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/nestedWithOneCompute/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml index 038dc88281..fbf2553476 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml @@ -315,28 +315,28 @@ topology_template: - get_attribute: - server_pcm_001 - oam_net_gw + port_compute_port_0_network: + - get_input: port_net_name compute_compute_name: - compute_name: null vm_flavor_name: compute_flavor_name: null - vm_image_name: - get_input: compute_image_name - port_compute_port_network: - - get_input: port_net_name - port_compute_port_network_role_tag: port - compute_compute_metadata: - - get_attribute: - - server_pcm_001 - - server_pcm_id - port_compute_port_mac_requirements: + port_compute_port_0_mac_requirements: mac_count_required: is_required: false - port_compute_port_ip_requirements: + vm_image_name: + get_input: compute_image_name + port_compute_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false + compute_compute_metadata: + - get_attribute: + - server_pcm_001 + - server_pcm_id + port_compute_port_0_network_role_tag: port service_template_filter: substitute_service_template: Nested_computeServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml index 82f94141bf..f97da8b6bc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml @@ -16,9 +16,11 @@ topology_template: required: true entry_schema: type: string - port_compute_port_subnetpoolid: - type: string + port_compute_port_0_network: + type: list required: true + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -26,56 +28,54 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_compute_port_vlan_requirements: + compute_compute_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_compute_name: + type: string + port_compute_port_0_related_networks: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_compute_port_network_role: - type: string + port_compute_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true + port_compute_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true - port_compute_port_network: - type: list + port_compute_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: string - port_compute_port_related_networks: + port_compute_port_0_subnetpoolid: + type: string + required: true + port_compute_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_compute_port_network_role_tag: - type: string - required: true + type: org.openecomp.datatypes.network.IpRequirements compute_compute_metadata: type: list required: true entry_schema: type: json - port_compute_port_order: - type: integer - required: true - port_compute_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_compute_port_0_network_role: + type: string required: true - port_compute_port_ip_requirements: - type: list + port_compute_port_0_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_compute_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_compute_port_0_order: + type: integer required: true node_templates: compute: @@ -89,7 +89,7 @@ topology_template: - index_value config_drive: get_attribute: - - compute_compute_port + - compute_compute_port_0 - tenant_id - port_security_enabled - device_id @@ -115,31 +115,31 @@ topology_template: get_input: - compute_compute_user_data_format - index_value - compute_compute_port: + compute_compute_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_compute_port_exCP_naming + get_input: port_compute_port_0_exCP_naming vlan_requirements: - get_input: port_compute_port_vlan_requirements + get_input: port_compute_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_compute_port_related_networks + get_input: port_compute_port_0_related_networks ip_requirements: - get_input: port_compute_port_ip_requirements + get_input: port_compute_port_0_ip_requirements network_role_tag: - get_input: port_compute_port_network_role_tag + get_input: port_compute_port_0_network_role_tag mac_requirements: - get_input: port_compute_port_mac_requirements + get_input: port_compute_port_0_mac_requirements order: - get_input: port_compute_port_order + get_input: port_compute_port_0_order network_role: - get_input: port_compute_port_network_role + get_input: port_compute_port_0_network_role subnetpoolid: - get_input: port_compute_port_subnetpoolid + get_input: port_compute_port_0_subnetpoolid network: get_input: - - port_compute_port_network + - port_compute_port_0_network - index_value requirements: - binding: @@ -149,15 +149,15 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.compute capabilities: + attachment_compute_compute_port_0: + - compute_compute_port_0 + - attachment disk.write.requests_compute: - compute - disk.write.requests disk.latency_compute: - compute - disk.latency - network.incoming.bytes_compute_compute_port: - - compute_compute_port - - network.incoming.bytes disk.root.size_compute: - compute - disk.root.size @@ -167,6 +167,12 @@ topology_template: disk.read.requests_compute: - compute - disk.read.requests + binding_compute_compute_port_0: + - compute_compute_port_0 + - binding + network.incoming.bytes_compute_compute_port_0: + - compute_compute_port_0 + - network.incoming.bytes os_compute: - compute - os @@ -176,30 +182,36 @@ topology_template: vcpus_compute: - compute - vcpus + forwarder_compute_compute_port_0: + - compute_compute_port_0 + - forwarder + network.outgoing.packets.rate_compute_compute_port_0: + - compute_compute_port_0 + - network.outgoing.packets.rate + network.incoming.bytes.rate_compute_compute_port_0: + - compute_compute_port_0 + - network.incoming.bytes.rate disk.device.iops_compute: - compute - disk.device.iops - network.incoming.bytes.rate_compute_compute_port: - - compute_compute_port - - network.incoming.bytes.rate disk.device.write.requests.rate_compute: - compute - disk.device.write.requests.rate - attachment_compute_compute_port: - - compute_compute_port - - attachment host_compute: - compute - host + network.incoming.packets.rate_compute_compute_port_0: + - compute_compute_port_0 + - network.incoming.packets.rate + feature_compute_compute_port_0: + - compute_compute_port_0 + - feature disk.device.write.bytes_compute: - compute - disk.device.write.bytes cpu_compute: - compute - cpu - binding_compute_compute_port: - - compute_compute_port - - binding disk.allocation_compute: - compute - disk.allocation @@ -209,21 +221,15 @@ topology_template: binding_compute: - compute - binding - feature_compute_compute_port: - - compute_compute_port - - feature disk.device.usage_compute: - compute - disk.device.usage - forwarder_compute_compute_port: - - compute_compute_port - - forwarder - network.incoming.packets_compute_compute_port: - - compute_compute_port - - network.incoming.packets instance_compute: - compute - instance + network.outpoing.packets_compute_compute_port_0: + - compute_compute_port_0 + - network.outpoing.packets disk.ephemeral.size_compute: - compute - disk.ephemeral.size @@ -239,9 +245,6 @@ topology_template: disk.iops_compute: - compute - disk.iops - network.incoming.packets.rate_compute_compute_port: - - compute_compute_port - - network.incoming.packets.rate disk.device.read.requests.rate_compute: - compute - disk.device.read.requests.rate @@ -251,15 +254,18 @@ topology_template: disk.device.read.bytes_compute: - compute - disk.device.read.bytes + network.incoming.packets_compute_compute_port_0: + - compute_compute_port_0 + - network.incoming.packets disk.write.bytes_compute: - compute - disk.write.bytes disk.usage_compute: - compute - disk.usage - network.outgoing.bytes.rate_compute_compute_port: - - compute_compute_port - - network.outgoing.bytes.rate + network.outgoing.bytes_compute_compute_port_0: + - compute_compute_port_0 + - network.outgoing.bytes disk.capacity_compute: - compute - disk.capacity @@ -275,12 +281,6 @@ topology_template: disk.device.write.requests_compute: - compute - disk.device.write.requests - network.outgoing.packets.rate_compute_compute_port: - - compute_compute_port - - network.outgoing.packets.rate - network.outgoing.bytes_compute_compute_port: - - compute_compute_port - - network.outgoing.bytes endpoint_compute: - compute - endpoint @@ -296,9 +296,6 @@ topology_template: scalable_compute: - compute - scalable - network.outpoing.packets_compute_compute_port: - - compute_compute_port - - network.outpoing.packets disk.device.read.requests_compute: - compute - disk.device.read.requests @@ -308,16 +305,19 @@ topology_template: disk.device.allocation_compute: - compute - disk.device.allocation + network.outgoing.bytes.rate_compute_compute_port_0: + - compute_compute_port_0 + - network.outgoing.bytes.rate requirements: local_storage_compute: - compute - local_storage - dependency_compute_compute_port: - - compute_compute_port - - dependency - link_compute_compute_port: - - compute_compute_port + link_compute_compute_port_0: + - compute_compute_port_0 - link dependency_compute: - compute - - dependency
\ No newline at end of file + - dependency + dependency_compute_compute_port_0: + - compute_compute_port_0 + - dependency |