diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out')
3 files changed, 303 insertions, 303 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml index eb1d96a9b3..d817b21500 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,26 +8,10 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pd_oam1_port_0_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd_oam1_port_0_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_oam1_port_0_network_role: - type: string - required: true - status: SUPPORTED - port_pd_oam1_port_1_ip_requirements: - type: list + port_pd_server_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_availability_zone: type: list required: true @@ -44,23 +28,33 @@ node_types: type: string required: true status: SUPPORTED - port_pd_oam1_port_1_order: - type: integer + port_pd_server_1_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd_oam1_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + vm_image_name: + type: string required: true status: SUPPORTED - port_pd_oam1_port_1_network_role: + port_pd_server_0_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - vm_image_name: + port_pd_server_0_oam_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_1_oam_port_0_order: + type: integer + required: true + status: SUPPORTED + port_pd_server_0_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd_oam1_port_1_network_role_tag: + port_pd_server_1_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED @@ -70,6 +64,24 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd_server_0_oam_port_0_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_pd_server_1_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd_server_0_oam_port_0_order: + type: integer + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -78,63 +90,51 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd_oam1_port_0_ip_requirements: + port_pd_server_1_oam_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd_server_1_oam_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_oam1_port_0_vlan_requirements: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_1_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pd_oam1_port_1_network: + port_pd_server_0_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_oam1_port_1_subnetpoolid: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1_oam_port_0_network_role: type: string required: true status: SUPPORTED - port_pd_oam1_port_0_order: - type: integer - required: true - status: SUPPORTED - port_pd_oam1_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd_oam1_port_0_network: + port_pd_server_1_oam_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_oam1_port_0_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd_oam1_port_1_related_networks: + port_pd_server_0_oam_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_oam1_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd_oam1_port_1_vlan_requirements: + type: string + port_pd_server_1_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_oam1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_0_oam_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED @@ -153,27 +153,27 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd_oam1_port_1: + - dependency_pd_server_pd_server_1_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd_oam1_port_1: + - link_pd_server_pd_server_1_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_pd_oam1_port_0: + - dependency_pd_server_pd_server_0_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd_oam1_port_0: + - link_pd_server_pd_server_0_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -191,6 +191,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_pd_server_pd_server_1_oam_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.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. @@ -209,6 +215,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd_server_0_oam_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -220,50 +231,29 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pd_oam1_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. + feature_pd_server_pd_server_0_oam_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pd_oam1_port_0: + network.incoming.bytes_pd_server_pd_server_1_oam_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 - forwarder_pd_server_pd_oam1_port_0: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - 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. occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd_oam1_port_1: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - feature_pd_server_pd_oam1_port_1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED cpu_util_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 - feature_pd_server_pd_oam1_port_0: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.write.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. @@ -276,25 +266,27 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.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. + binding_pd_server_pd_server_1_oam_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.iops_pd_server: + disk.device.read.bytes.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. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd_oam1_port_1: + network.outgoing.packets.rate_pd_server_pd_server_0_oam_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_pd_server_pd_oam1_port_0: + 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: @@ -312,16 +304,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd_oam1_port_0: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - attachment_pd_server_pd_oam1_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED vcpus_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. @@ -345,31 +327,36 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd_server_1_oam_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.capacity_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_pd_oam1_port_0: + network.incoming.bytes_pd_server_pd_server_0_oam_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.allocation_pd_server: + network.outgoing.bytes.rate_pd_server_pd_server_0_oam_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.allocation_pd_server: + 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. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd_oam1_port_1: + disk.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. occurrences: @@ -386,6 +373,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_pd_server_0_oam_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 feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -397,67 +392,71 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.bytes_pd_server: + network.outgoing.bytes.rate_pd_server_pd_server_1_oam_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_pd_server_pd_oam1_port_1: + disk.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.packets.rate_pd_server_pd_oam1_port_1: + network.incoming.packets_pd_server_pd_server_0_oam_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.outgoing.bytes.rate_pd_server_pd_oam1_port_1: + network.outgoing.bytes_pd_server_pd_server_0_oam_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_pd_server_pd_oam1_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. + attachment_pd_server_pd_server_0_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd_oam1_port_0: + 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. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd_oam1_port_0: + disk.root.size_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.read.requests.rate_pd_server: + disk.device.read.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 - disk.root.size_pd_server: + feature_pd_server_pd_server_1_oam_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pd_server_pd_server_1_oam_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_pd_server: + 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 - disk.device.write.bytes_pd_server: + network.incoming.packets_pd_server_pd_server_1_oam_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: @@ -482,85 +481,86 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_pd_server: + attachment_pd_server_pd_server_1_oam_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_pd_server_pd_server_1_oam_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_pd_server: + network.outpoing.packets_pd_server_pd_server_1_oam_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.write.requests_pd_server: + disk.write.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. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd_oam1_port_0: + disk.ephemeral.size_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_pd_oam1_port_1: + network.outgoing.packets.rate_pd_server_pd_server_1_oam_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.latency_pd_server: + network.incoming.bytes.rate_pd_server_pd_server_0_oam_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.outpoing.packets_pd_server_pd_oam1_port_0: + disk.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 - disk.latency_pd_server: + network.incoming.packets.rate_pd_server_pd_server_0_oam_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.capacity_pd_server: + disk.device.latency_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.outpoing.packets_pd_server_pd_oam1_port_1: + disk.latency_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 - binding_pd_server_pd_oam1_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 + disk.device.capacity_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: - - 0 + - 1 - UNBOUNDED - binding_pd_server_pd_oam1_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 + disk.device.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: - - 0 + - 1 - UNBOUNDED - disk.device.iops_pd_server: + network.outpoing.packets_pd_server_pd_server_0_oam_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/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml index b64ee2fea5..f0a84c9283 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml @@ -832,13 +832,6 @@ topology_template: directives: - substitutable properties: - port_pd_oam1_port_0_network_role_tag: oam - port_pd_oam1_port_1_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -847,25 +840,32 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name - port_pd_oam1_port_1_mac_requirements: + port_pd_server_1_oam_port_0_mac_requirements: mac_count_required: is_required: false vm_image_name: get_input: pd_image_name - port_pd_oam1_port_1_network_role_tag: oam + port_pd_server_0_oam_port_0_network_role_tag: oam compute_pd_server_user_data_format: - RAW - port_pd_oam1_port_0_ip_requirements: + port_pd_server_1_oam_port_0_network_role_tag: oam + port_pd_server_0_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd_oam1_port_1_network: + port_pd_server_1_oam_port_0_network: - get_input: oam_net_name - port_pd_oam1_port_0_network: + port_pd_server_0_oam_port_0_network: - get_input: oam_net_name - port_pd_oam1_port_0_mac_requirements: + port_pd_server_1_oam_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd_server_0_oam_port_0_mac_requirements: mac_count_required: is_required: false service_template_filter: @@ -883,4 +883,4 @@ topology_template: heat_file: ../Artifacts/hot-mog-0108-bs1271.yml description: heat template that creates MOG stack members: - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/Nested_pd_serverServiceTemplate.yaml index b66be45d5e..b9772f3db6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/Nested_pd_serverServiceTemplate.yaml @@ -11,22 +11,9 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pd_oam1_port_0_network_role_tag: - type: string - required: true - port_pd_oam1_port_0_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_oam1_port_0_network_role: - type: string - required: true - port_pd_oam1_port_1_ip_requirements: - type: list + port_pd_server_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_availability_zone: type: list required: true @@ -40,19 +27,27 @@ topology_template: vm_flavor_name: type: string required: true - port_pd_oam1_port_1_order: - type: integer - required: true - port_pd_oam1_port_1_mac_requirements: + port_pd_server_1_oam_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd_oam1_port_1_network_role: + vm_image_name: type: string required: true - vm_image_name: + port_pd_server_0_oam_port_0_network_role_tag: type: string required: true - port_pd_oam1_port_1_network_role_tag: + port_pd_server_0_oam_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_1_oam_port_0_order: + type: integer + required: true + port_pd_server_0_oam_port_0_subnetpoolid: + type: string + required: true + port_pd_server_1_oam_port_0_subnetpoolid: type: string required: true compute_pd_server_user_data_format: @@ -60,6 +55,20 @@ topology_template: required: true entry_schema: type: string + port_pd_server_0_oam_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_network_role: + type: string + required: true + port_pd_server_1_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd_server_0_oam_port_0_order: + type: integer + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -67,52 +76,43 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd_oam1_port_0_ip_requirements: + port_pd_server_1_oam_port_0_network_role_tag: + type: string + required: true + port_pd_server_1_oam_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_oam1_port_0_vlan_requirements: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_1_oam_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pd_oam1_port_1_network: + port_pd_server_0_oam_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_pd_oam1_port_1_subnetpoolid: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1_oam_port_0_network_role: type: string required: true - port_pd_oam1_port_0_order: - type: integer - required: true - port_pd_oam1_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd_oam1_port_0_network: + port_pd_server_1_oam_port_0_network: type: list required: true entry_schema: type: string - port_pd_oam1_port_0_subnetpoolid: - type: string - required: true - port_pd_oam1_port_1_related_networks: + port_pd_server_0_oam_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_oam1_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd_oam1_port_1_vlan_requirements: + type: string + port_pd_server_1_oam_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_oam1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_0_oam_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true node_templates: @@ -135,62 +135,62 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd_oam1_port_1: + pd_server_pd_server_1_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd_oam1_port_1_exCP_naming + get_input: port_pd_server_1_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd_oam1_port_1_vlan_requirements + get_input: port_pd_server_1_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd_oam1_port_1_related_networks + get_input: port_pd_server_1_oam_port_0_related_networks ip_requirements: - get_input: port_pd_oam1_port_1_ip_requirements + get_input: port_pd_server_1_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd_oam1_port_1_network_role_tag + get_input: port_pd_server_1_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd_oam1_port_1_mac_requirements + get_input: port_pd_server_1_oam_port_0_mac_requirements order: - get_input: port_pd_oam1_port_1_order + get_input: port_pd_server_1_oam_port_0_order network_role: - get_input: port_pd_oam1_port_1_network_role + get_input: port_pd_server_1_oam_port_0_network_role subnetpoolid: - get_input: port_pd_oam1_port_1_subnetpoolid + get_input: port_pd_server_1_oam_port_0_subnetpoolid network: get_input: - - port_pd_oam1_port_1_network + - port_pd_server_1_oam_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo - pd_server_pd_oam1_port_0: + pd_server_pd_server_0_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd_oam1_port_0_exCP_naming + get_input: port_pd_server_0_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd_oam1_port_0_vlan_requirements + get_input: port_pd_server_0_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd_oam1_port_0_related_networks + get_input: port_pd_server_0_oam_port_0_related_networks ip_requirements: - get_input: port_pd_oam1_port_0_ip_requirements + get_input: port_pd_server_0_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd_oam1_port_0_network_role_tag + get_input: port_pd_server_0_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd_oam1_port_0_mac_requirements + get_input: port_pd_server_0_oam_port_0_mac_requirements order: - get_input: port_pd_oam1_port_0_order + get_input: port_pd_server_0_oam_port_0_order network_role: - get_input: port_pd_oam1_port_0_network_role + get_input: port_pd_server_0_oam_port_0_network_role subnetpoolid: - get_input: port_pd_oam1_port_0_subnetpoolid + get_input: port_pd_server_0_oam_port_0_subnetpoolid network: get_input: - - port_pd_oam1_port_0_network + - port_pd_server_0_oam_port_0_network - index_value requirements: - binding: @@ -206,6 +206,9 @@ topology_template: disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + network.outgoing.bytes_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outgoing.bytes memory.usage_pd_server: - pd_server - memory.usage @@ -215,66 +218,51 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage + forwarder_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - forwarder os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.packets_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - network.incoming.packets - network.incoming.packets_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - network.incoming.packets - forwarder_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - forwarder + feature_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - feature + network.incoming.bytes_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.bytes cpu_pd_server: - pd_server - cpu - forwarder_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - forwarder - feature_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - feature cpu_util_pd_server: - pd_server - cpu_util - feature_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - feature disk.device.write.requests.rate_pd_server: - pd_server - disk.device.write.requests.rate disk.read.bytes_pd_server: - pd_server - disk.read.bytes + binding_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - binding disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate + network.outgoing.packets.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outgoing.packets.rate disk.iops_pd_server: - pd_server - disk.iops - network.incoming.bytes_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - network.incoming.bytes - network.incoming.bytes_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - network.incoming.bytes memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - attachment_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - attachment - attachment_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - attachment vcpus_pd_server: - pd_server - vcpus @@ -287,54 +275,54 @@ topology_template: endpoint_pd_server: - pd_server - endpoint + forwarder_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - forwarder disk.capacity_pd_server: - pd_server - disk.capacity - network.incoming.packets.rate_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - network.incoming.packets.rate + network.incoming.bytes_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.bytes + network.outgoing.bytes.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outgoing.bytes.rate disk.device.allocation_pd_server: - pd_server - disk.device.allocation disk.allocation_pd_server: - pd_server - disk.allocation - network.incoming.packets.rate_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - network.incoming.packets.rate binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + binding_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - binding feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage + network.outgoing.bytes.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outgoing.bytes.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - network.incoming.bytes.rate - network.outgoing.packets.rate_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - network.outgoing.packets.rate - network.outgoing.bytes.rate_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - network.outgoing.bytes.rate - network.incoming.bytes.rate_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - network.incoming.bytes.rate - network.outgoing.bytes.rate_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - network.outgoing.bytes.rate - network.outgoing.packets.rate_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - network.outgoing.packets.rate + network.incoming.packets_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.packets + network.outgoing.bytes_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outgoing.bytes + attachment_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - attachment disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -344,9 +332,18 @@ topology_template: disk.device.read.bytes_pd_server: - pd_server - disk.device.read.bytes + feature_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - feature + network.incoming.bytes.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.bytes.rate disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.incoming.packets_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -356,61 +353,64 @@ topology_template: host_pd_server: - pd_server - host + attachment_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - attachment + network.incoming.packets.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.packets.rate + network.outpoing.packets_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outpoing.packets disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + network.outgoing.packets.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outgoing.packets.rate + network.incoming.bytes.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.bytes.rate disk.write.requests_pd_server: - pd_server - disk.write.requests - network.outgoing.bytes_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - network.outgoing.bytes - network.outgoing.bytes_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - network.outgoing.bytes + network.incoming.packets.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.packets.rate disk.device.latency_pd_server: - pd_server - disk.device.latency - network.outpoing.packets_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - network.outpoing.packets disk.latency_pd_server: - pd_server - disk.latency disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outpoing.packets_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - network.outpoing.packets - binding_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - binding - binding_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - binding disk.device.iops_pd_server: - pd_server - disk.device.iops + network.outpoing.packets_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outpoing.packets requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - link - link_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 + link_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 - link + dependency_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - dependency dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 + link_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - link + dependency_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 - dependency - dependency_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - dependency
\ No newline at end of file |