diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution')
82 files changed, 7694 insertions, 7694 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 7055e47c27..d4d9603c71 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,26 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role: + type: string + required: true + status: SUPPORTED compute_pd_server_availability_zone: type: list required: true @@ -24,41 +44,45 @@ node_types: type: string required: true status: SUPPORTED - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: string + port_pd01_port_0_order: + type: integer required: true status: SUPPORTED vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: - type: list + port_pd02_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + port_pd01_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: + type: string + port_pd02_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED @@ -72,72 +96,48 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_exCP_naming: + port_pd02_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd02_port_order: - type: integer + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd02_port_subnetpoolid: + port_pd02_port_0_network_role: type: string required: true status: SUPPORTED - port_pd02_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_network: - type: list + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: + port_pd02_port_0_order: type: integer required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_0_related_networks: + type: list required: true status: SUPPORTED - port_pd01_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd02_port_ip_requirements: + port_pd02_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd02_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -153,33 +153,49 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd02_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd02_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_pd02_port: + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd02_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd02_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 + binding_pd_server_pd01_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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -209,12 +225,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -226,7 +236,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + network.outgoing.packets.rate_pd_server_pd02_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: @@ -262,21 +272,13 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd02_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 - network.outgoing.bytes_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd02_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.packets.rate_pd_server_pd02_port: + network.incoming.packets_pd_server_pd01_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: @@ -300,30 +302,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: - 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_pd02_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd02_port: + network.incoming.packets.rate_pd_server_pd01_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 - feature_pd_server_pd02_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd02_port: + network.incoming.bytes.rate_pd_server_pd01_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_pd02_port: + network.outgoing.packets.rate_pd_server_pd01_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: @@ -341,6 +337,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + 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. @@ -352,35 +353,24 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - forwarder_pd_server_pd02_port: - 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 - 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. + forwarder_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder 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_pd_server_pd02_port: + 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: @@ -397,6 +387,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_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 feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -408,33 +404,37 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd02_port: + network.outgoing.bytes.rate_pd_server_pd02_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 - binding_pd_server_pd01_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 + 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: - - 0 + - 1 - UNBOUNDED - disk.write.bytes_pd_server: + network.outgoing.bytes_pd_server_pd02_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_pd01_port: + network.outgoing.bytes_pd_server_pd01_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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd02_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_pd01_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: @@ -464,6 +464,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_server_pd02_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_pd01_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.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. @@ -483,19 +495,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd02_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 - attachment_pd_server_pd02_port: - type: tosca.capabilities.Attachment + network.incoming.bytes.rate_pd_server_pd02_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_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -511,24 +524,18 @@ node_types: occurrences: - 1 - UNBOUNDED - 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 - feature_pd_server_pd01_port: - type: tosca.capabilities.Node + attachment_pd_server_pd02_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.latency_pd_server: + 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 - network.incoming.packets.rate_pd_server_pd02_port: + 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: @@ -546,21 +553,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.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 - network.incoming.bytes_pd_server_pd02_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_pd_server_pd02_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml index f6acc07dc4..9bc9edec91 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml @@ -832,6 +832,17 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - get_input: oam_net_name + port_pd01_port_0_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: @@ -840,34 +851,23 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_network_role_tag: oam - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false + port_pd02_port_0_network: + - get_input: oam_net_name vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + port_pd02_port_0_network_role_tag: oam compute_pd_server_user_data_format: - RAW - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false - port_pd01_port_network: - - get_input: oam_net_name - port_pd02_port_ip_requirements: + port_pd02_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network_role_tag: oam - port_pd02_port_network: - - get_input: oam_net_name + port_pd01_port_0_network_role_tag: oam + port_pd02_port_0_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/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/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml index e894e5c65f..36787625a8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/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/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,22 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role: + type: string + required: true compute_pd_server_availability_zone: type: list required: true @@ -24,34 +40,37 @@ topology_template: vm_flavor_name: type: string required: true - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_network: + type: list required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: string + port_pd01_port_0_order: + type: integer required: true vm_image_name: type: string required: true - port_pd01_port_ip_requirements: - type: list + port_pd02_port_0_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + port_pd01_port_0_subnetpoolid: type: string required: true - port_pd01_port_vlan_requirements: + compute_pd_server_user_data_format: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: + type: string + port_pd02_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + port_pd01_port_0_related_networks: type: list required: true entry_schema: @@ -63,58 +82,39 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_exCP_naming: + port_pd02_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd02_port_order: - type: integer + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd02_port_subnetpoolid: + port_pd02_port_0_network_role: type: string required: true - port_pd02_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_network: - type: list + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - port_pd01_port_order: + port_pd02_port_0_order: type: integer required: true - port_pd01_port_subnetpoolid: - type: string - required: true - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_0_related_networks: + type: list required: true - port_pd01_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: type: string required: true - port_pd02_port_ip_requirements: + port_pd02_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network_role_tag: - type: string - required: true - port_pd02_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -135,62 +135,62 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd02_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd02_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd02_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd02_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd02_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd02_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd02_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd02_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd02_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd02_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd02_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo - pd_server_pd02_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd02_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd02_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd02_port_related_networks + get_input: port_pd01_port_0_related_networks ip_requirements: - get_input: port_pd02_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: port_pd02_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: port_pd02_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd02_port_order + get_input: port_pd01_port_0_order network_role: - get_input: port_pd02_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd02_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_input: - - port_pd02_port_network + - port_pd01_port_0_network - index_value requirements: - binding: @@ -200,6 +200,12 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + binding_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - binding + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -215,18 +221,15 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes + network.outgoing.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.packets.rate cpu_pd_server: - pd_server - cpu @@ -242,15 +245,12 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - binding_pd_server_pd02_port: - - pd_server_pd02_port - - binding - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes - network.outgoing.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.packets.rate + network.outpoing.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outpoing.packets + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -260,78 +260,78 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate - network.outgoing.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes - feature_pd_server_pd02_port: - - pd_server_pd02_port + feature_pd_server_pd02_port_0: + - pd_server_pd02_port_0 - feature - network.incoming.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.bytes.rate - network.outgoing.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment - forwarder_pd_server_pd02_port: - - pd_server_pd02_port - - forwarder disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation disk.allocation_pd_server: - pd_server - disk.allocation - network.incoming.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - network.outpoing.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.outpoing.packets - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.outgoing.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -344,6 +344,12 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.incoming.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -353,64 +359,58 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - attachment_pd_server_pd02_port: - - pd_server_pd02_port - - attachment - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + network.incoming.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes.rate + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + attachment_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - attachment disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency - network.incoming.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets.rate disk.latency_pd_server: - pd_server - disk.latency disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops - network.incoming.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes + forwarder_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - forwarder requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd02_port: - - pd_server_pd02_port - - link - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd02_port: - - pd_server_pd02_port - - dependency
\ No newline at end of file + link_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - link + dependency_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - dependency + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 687aafc255..2321b10d51 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,26 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role: + type: string + required: true + status: SUPPORTED compute_pd_server_availability_zone: type: list required: true @@ -20,7 +40,7 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_replacement_policy: + port_pd01_port_0_replacement_policy: type: list required: true status: SUPPORTED @@ -30,53 +50,57 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_security_groups: + port_pd02_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: json - port_pd02_port_network_role_tag: - type: string + type: string + port_pd01_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + vm_image_name: + type: string required: true status: SUPPORTED - vm_image_name: + port_pd02_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd02_port_replacement_policy: + port_pd02_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_ip_requirements: - type: list + port_pd01_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: - type: string + compute_pd_server_user_data_format: + type: list required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + entry_schema: + type: string + port_pd02_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: + type: json + port_pd02_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED @@ -90,78 +114,54 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_exCP_naming: + port_pd02_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd02_port_order: - type: integer + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd02_port_subnetpoolid: + port_pd02_port_0_network_role: type: string required: true status: SUPPORTED - port_pd02_port_vlan_requirements: - type: list + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd02_port_security_groups: - type: list + port_pd02_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: json - port_pd01_port_network: + port_pd02_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd01_port_network_role: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd02_port_ip_requirements: + port_pd02_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network_role_tag: - type: string + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_pd02_port_network: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: string + type: json requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -177,33 +177,49 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd02_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd02_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_pd02_port: + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd02_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd02_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 + binding_pd_server_pd01_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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -233,12 +249,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -250,7 +260,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + network.outgoing.packets.rate_pd_server_pd02_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: @@ -286,21 +296,13 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd02_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 - network.outgoing.bytes_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd02_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.packets.rate_pd_server_pd02_port: + network.incoming.packets_pd_server_pd01_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: @@ -324,30 +326,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: - 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_pd02_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd02_port: + network.incoming.packets.rate_pd_server_pd01_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 - feature_pd_server_pd02_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd02_port: + network.incoming.bytes.rate_pd_server_pd01_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_pd02_port: + network.outgoing.packets.rate_pd_server_pd01_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: @@ -365,6 +361,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + 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. @@ -376,35 +377,24 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - forwarder_pd_server_pd02_port: - 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 - 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. + forwarder_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder 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_pd_server_pd02_port: + 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: @@ -421,6 +411,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_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 feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -432,33 +428,37 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd02_port: + network.outgoing.bytes.rate_pd_server_pd02_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 - binding_pd_server_pd01_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 + 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: - - 0 + - 1 - UNBOUNDED - disk.write.bytes_pd_server: + network.outgoing.bytes_pd_server_pd02_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_pd_server_pd01_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_pd01_port: + network.incoming.bytes_pd_server_pd02_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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd01_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: @@ -488,6 +488,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_server_pd02_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_pd01_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.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. @@ -507,19 +519,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd02_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 - attachment_pd_server_pd02_port: - type: tosca.capabilities.Attachment + network.incoming.bytes.rate_pd_server_pd02_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_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -535,24 +548,18 @@ node_types: occurrences: - 1 - UNBOUNDED - 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 - feature_pd_server_pd01_port: - type: tosca.capabilities.Node + attachment_pd_server_pd02_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.latency_pd_server: + 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 - network.incoming.packets.rate_pd_server_pd02_port: + 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: @@ -570,21 +577,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.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 - network.incoming.bytes_pd_server_pd02_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_pd_server_pd02_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml index 424fcd66ab..9ab904ed53 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml @@ -140,11 +140,11 @@ topology_template: direction: ingress requirements: - port: - capability: attachment_pd_server_pd01_port + capability: attachment_pd_server_pd01_port_0 node: abstract_pd_server relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_pd_server_pd02_port + capability: attachment_pd_server_pd02_port_0 node: abstract_pd_server relationship: org.openecomp.relationships.AttachesTo abstract_pd_server: @@ -152,50 +152,50 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - get_input: oam_net_name + port_pd01_port_0_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: - get_input: - pd_server_names - 0 - port_pd01_port_replacement_policy: + port_pd01_port_0_replacement_policy: - AUTO vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_security_groups: - - - jsa_security_group - port_pd02_port_network_role_tag: oam - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false + port_pd02_port_0_network: + - get_input: oam_net_name vm_image_name: get_input: pd_image_name - port_pd02_port_replacement_policy: + port_pd02_port_0_network_role_tag: oam + port_pd02_port_0_replacement_policy: - AUTO - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false compute_pd_server_user_data_format: - RAW - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false - port_pd02_port_security_groups: + port_pd02_port_0_security_groups: - - jsa_security_group - port_pd01_port_network: - - get_input: oam_net_name - port_pd02_port_ip_requirements: + port_pd02_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network_role_tag: oam - port_pd02_port_network: - - get_input: oam_net_name + port_pd01_port_0_network_role_tag: oam + port_pd02_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_security_groups: + - - jsa_security_group service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -213,4 +213,4 @@ topology_template: members: - resources_with_dependOn - jsa_security_group - - abstract_pd_server + - abstract_pd_server
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/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/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml index e0cd25ba18..9219f62902 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/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/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,22 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role: + type: string + required: true compute_pd_server_availability_zone: type: list required: true @@ -21,7 +37,7 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_replacement_policy: + port_pd01_port_0_replacement_policy: type: list required: true entry_schema: @@ -29,44 +45,47 @@ topology_template: vm_flavor_name: type: string required: true - port_pd01_port_security_groups: + port_pd02_port_0_network: type: list required: true entry_schema: - type: json - port_pd02_port_network_role_tag: - type: string - required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: string + port_pd01_port_0_order: + type: integer required: true vm_image_name: type: string required: true - port_pd02_port_replacement_policy: + port_pd02_port_0_network_role_tag: + type: string + required: true + port_pd02_port_0_replacement_policy: type: list required: true entry_schema: type: string - port_pd01_port_ip_requirements: + port_pd01_port_0_subnetpoolid: + type: string + required: true + compute_pd_server_user_data_format: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: - type: string - required: true - port_pd01_port_vlan_requirements: + type: string + port_pd02_port_0_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: + type: json + port_pd02_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + port_pd01_port_0_related_networks: type: list required: true entry_schema: @@ -78,63 +97,44 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_exCP_naming: + port_pd02_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd02_port_order: - type: integer + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd02_port_subnetpoolid: + port_pd02_port_0_network_role: type: string required: true - port_pd02_port_vlan_requirements: - type: list + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd02_port_security_groups: - type: list + port_pd02_port_0_order: + type: integer required: true - entry_schema: - type: json - port_pd01_port_network: + port_pd02_port_0_related_networks: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: - type: string - required: true - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_network_role: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: type: string required: true - port_pd02_port_ip_requirements: + port_pd02_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network_role_tag: - type: string + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_vlan_requirements: + type: list required: true - port_pd02_port_network: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_security_groups: type: list required: true entry_schema: - type: string + type: json node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -155,78 +155,78 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd02_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd01_port_replacement_policy + - port_pd02_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd02_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd02_port_0_order security_groups: get_input: - - port_pd01_port_security_groups + - port_pd02_port_0_security_groups - index_value exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd02_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd02_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd02_port_0_ip_requirements related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd02_port_0_related_networks network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd02_port_0_network_role_tag network_role: - get_input: port_pd01_port_network_role + get_input: port_pd02_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd02_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd02_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo - pd_server_pd02_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd02_port_replacement_policy + - port_pd01_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd02_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd02_port_order + get_input: port_pd01_port_0_order security_groups: get_input: - - port_pd02_port_security_groups + - port_pd01_port_0_security_groups - index_value exCP_naming: - get_input: port_pd02_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd02_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd02_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements related_networks: - get_input: port_pd02_port_related_networks + get_input: port_pd01_port_0_related_networks network_role_tag: - get_input: port_pd02_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag network_role: - get_input: port_pd02_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd02_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_input: - - port_pd02_port_network + - port_pd01_port_0_network - index_value requirements: - binding: @@ -236,6 +236,12 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + binding_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - binding + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -251,18 +257,15 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes + network.outgoing.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.packets.rate cpu_pd_server: - pd_server - cpu @@ -278,15 +281,12 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - binding_pd_server_pd02_port: - - pd_server_pd02_port - - binding - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes - network.outgoing.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.packets.rate + network.outpoing.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outpoing.packets + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -296,78 +296,78 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate - network.outgoing.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes - feature_pd_server_pd02_port: - - pd_server_pd02_port + feature_pd_server_pd02_port_0: + - pd_server_pd02_port_0 - feature - network.incoming.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.bytes.rate - network.outgoing.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment - forwarder_pd_server_pd02_port: - - pd_server_pd02_port - - forwarder disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation disk.allocation_pd_server: - pd_server - disk.allocation - network.incoming.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - network.outpoing.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.outpoing.packets - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.outgoing.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -380,6 +380,12 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.incoming.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -389,64 +395,58 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - attachment_pd_server_pd02_port: - - pd_server_pd02_port - - attachment - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + network.incoming.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes.rate + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + attachment_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - attachment disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency - network.incoming.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets.rate disk.latency_pd_server: - pd_server - disk.latency disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops - network.incoming.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes + forwarder_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - forwarder requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd02_port: - - pd_server_pd02_port - - link - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd02_port: - - pd_server_pd02_port - - dependency
\ No newline at end of file + link_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - link + dependency_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - dependency + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index c2489543e8..1a8c8aba68 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,26 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role: + type: string + required: true + status: SUPPORTED compute_pd_server_availability_zone: type: list required: true @@ -20,7 +40,7 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_replacement_policy: + port_pd01_port_0_replacement_policy: type: list required: true status: SUPPORTED @@ -30,47 +50,51 @@ node_types: type: string required: true status: SUPPORTED - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: string + port_pd01_port_0_order: + type: integer required: true status: SUPPORTED vm_image_name: type: string required: true status: SUPPORTED - port_pd02_port_replacement_policy: - type: list + port_pd02_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port_ip_requirements: + port_pd02_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + type: string + port_pd01_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: + type: string + port_pd02_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED @@ -84,72 +108,48 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_exCP_naming: + port_pd02_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd02_port_order: - type: integer + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd02_port_subnetpoolid: + port_pd02_port_0_network_role: type: string required: true status: SUPPORTED - port_pd02_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_network: - type: list + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: + port_pd02_port_0_order: type: integer required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_0_related_networks: + type: list required: true status: SUPPORTED - port_pd01_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd02_port_ip_requirements: + port_pd02_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd02_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -165,33 +165,49 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd02_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd02_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_pd02_port: + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd02_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd02_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 + binding_pd_server_pd01_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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -221,12 +237,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -238,7 +248,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + network.outgoing.packets.rate_pd_server_pd02_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: @@ -274,21 +284,13 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd02_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 - network.outgoing.bytes_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd02_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.packets.rate_pd_server_pd02_port: + network.incoming.packets_pd_server_pd01_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: @@ -312,30 +314,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: - 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_pd02_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd02_port: + network.incoming.packets.rate_pd_server_pd01_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 - feature_pd_server_pd02_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd02_port: + network.incoming.bytes.rate_pd_server_pd01_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_pd02_port: + network.outgoing.packets.rate_pd_server_pd01_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: @@ -353,6 +349,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + 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. @@ -364,35 +365,24 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - forwarder_pd_server_pd02_port: - 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 - 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. + forwarder_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder 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_pd_server_pd02_port: + 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: @@ -409,6 +399,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_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 feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -420,33 +416,37 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd02_port: + network.outgoing.bytes.rate_pd_server_pd02_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 - binding_pd_server_pd01_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 + 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: - - 0 + - 1 - UNBOUNDED - disk.write.bytes_pd_server: + network.outgoing.bytes_pd_server_pd02_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_pd01_port: + network.outgoing.bytes_pd_server_pd01_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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd02_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_pd01_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: @@ -476,6 +476,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_server_pd02_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_pd01_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.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. @@ -495,19 +507,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd02_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 - attachment_pd_server_pd02_port: - type: tosca.capabilities.Attachment + network.incoming.bytes.rate_pd_server_pd02_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_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -523,24 +536,18 @@ node_types: occurrences: - 1 - UNBOUNDED - 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 - feature_pd_server_pd01_port: - type: tosca.capabilities.Node + attachment_pd_server_pd02_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.latency_pd_server: + 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 - network.incoming.packets.rate_pd_server_pd02_port: + 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: @@ -558,21 +565,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.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 - network.incoming.bytes_pd_server_pd02_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_pd_server_pd02_port_0: + type: org.openecomp.capabilities.Forwarder 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/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml index 0ad20baa65..db272f1db9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml @@ -164,44 +164,44 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - packet_mirror_network + port_pd01_port_0_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: - get_input: - pd_server_names - 0 - port_pd01_port_replacement_policy: + port_pd01_port_0_replacement_policy: - AUTO vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false + port_pd02_port_0_network: + - packet_mirror_network vm_image_name: get_input: pd_image_name - port_pd02_port_replacement_policy: + port_pd02_port_0_replacement_policy: - AUTO - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false compute_pd_server_user_data_format: - RAW - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false - port_pd01_port_network: - - packet_mirror_network - port_pd02_port_ip_requirements: + port_pd02_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd02_port_network: - - packet_mirror_network + port_pd02_port_0_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -215,11 +215,11 @@ topology_template: capability: tosca.capabilities.Node node: packet_mirror_network relationship: tosca.relationships.DependsOn - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable node: packet_mirror_network relationship: tosca.relationships.network.LinksTo - - link_pd_server_pd02_port: + - link_pd_server_pd02_port_0: capability: tosca.capabilities.network.Linkable node: packet_mirror_network relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/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/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml index ad02c9e146..4a66e6d072 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/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/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,22 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role: + type: string + required: true compute_pd_server_availability_zone: type: list required: true @@ -21,7 +37,7 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_replacement_policy: + port_pd01_port_0_replacement_policy: type: list required: true entry_schema: @@ -29,39 +45,42 @@ topology_template: vm_flavor_name: type: string required: true - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_network: + type: list required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: string + port_pd01_port_0_order: + type: integer required: true vm_image_name: type: string required: true - port_pd02_port_replacement_policy: - type: list + port_pd02_port_0_network_role_tag: + type: string required: true - entry_schema: - type: string - port_pd01_port_ip_requirements: + port_pd02_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + type: string + port_pd01_port_0_subnetpoolid: type: string required: true - port_pd01_port_vlan_requirements: + compute_pd_server_user_data_format: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: + type: string + port_pd02_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + port_pd01_port_0_related_networks: type: list required: true entry_schema: @@ -73,58 +92,39 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_exCP_naming: + port_pd02_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd02_port_order: - type: integer + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd02_port_subnetpoolid: + port_pd02_port_0_network_role: type: string required: true - port_pd02_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_network: - type: list + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - port_pd01_port_order: + port_pd02_port_0_order: type: integer required: true - port_pd01_port_subnetpoolid: - type: string - required: true - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_0_related_networks: + type: list required: true - port_pd01_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: type: string required: true - port_pd02_port_ip_requirements: + port_pd02_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network_role_tag: - type: string - required: true - port_pd02_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -145,70 +145,70 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd02_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd01_port_replacement_policy + - port_pd02_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd02_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd02_port_0_order exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd02_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd02_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd02_port_0_ip_requirements related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd02_port_0_related_networks network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd02_port_0_network_role_tag network_role: - get_input: port_pd01_port_network_role + get_input: port_pd02_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd02_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd02_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo - pd_server_pd02_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd02_port_replacement_policy + - port_pd01_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd02_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd02_port_order + get_input: port_pd01_port_0_order exCP_naming: - get_input: port_pd02_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd02_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd02_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements related_networks: - get_input: port_pd02_port_related_networks + get_input: port_pd01_port_0_related_networks network_role_tag: - get_input: port_pd02_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag network_role: - get_input: port_pd02_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd02_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_input: - - port_pd02_port_network + - port_pd01_port_0_network - index_value requirements: - binding: @@ -218,6 +218,12 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + binding_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - binding + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -233,18 +239,15 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes + network.outgoing.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.packets.rate cpu_pd_server: - pd_server - cpu @@ -260,15 +263,12 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - binding_pd_server_pd02_port: - - pd_server_pd02_port - - binding - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes - network.outgoing.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.packets.rate + network.outpoing.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outpoing.packets + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -278,78 +278,78 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate - network.outgoing.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes - feature_pd_server_pd02_port: - - pd_server_pd02_port + feature_pd_server_pd02_port_0: + - pd_server_pd02_port_0 - feature - network.incoming.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.bytes.rate - network.outgoing.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment - forwarder_pd_server_pd02_port: - - pd_server_pd02_port - - forwarder disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation disk.allocation_pd_server: - pd_server - disk.allocation - network.incoming.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - network.outpoing.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.outpoing.packets - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.outgoing.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -362,6 +362,12 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.incoming.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -371,64 +377,58 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - attachment_pd_server_pd02_port: - - pd_server_pd02_port - - attachment - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + network.incoming.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes.rate + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + attachment_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - attachment disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency - network.incoming.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets.rate disk.latency_pd_server: - pd_server - disk.latency disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops - network.incoming.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes + forwarder_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - forwarder requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd02_port: - - pd_server_pd02_port - - link - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd02_port: - - pd_server_pd02_port - - dependency
\ No newline at end of file + link_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - link + dependency_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - dependency + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 76400dd289..f19d7cf6e8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -18,18 +18,18 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_0_ip_requirements: + port_pd01_port_1_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_1_security_groups: + type: json + port_pd01_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role: type: string required: true @@ -76,22 +76,28 @@ node_types: type: string required: true status: SUPPORTED + port_pd01_port_1_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string port_pd01_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_1_network: + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_user_data_format: + port_pd01_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role_tag: type: string required: true @@ -102,12 +108,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_1_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml index 3529fedc3a..646e15fffc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml @@ -157,14 +157,14 @@ topology_template: is_required: false port_pd01_port_0_network: - get_input: oam_net_name + port_pd01_port_1_security_groups: + - - jsa_security_group port_pd01_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_1_security_groups: - - - jsa_security_group compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -182,13 +182,13 @@ topology_template: - get_input: oam_net_name compute_pd_server_user_data_format: - RAW - port_pd01_port_0_network_role_tag: oam port_pd01_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false + port_pd01_port_0_network_role_tag: oam port_pd01_port_1_mac_requirements: mac_count_required: is_required: false @@ -213,4 +213,4 @@ topology_template: members: - resources_with_dependOn - jsa_security_group - - abstract_pd_server + - abstract_pd_server
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/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/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml index a67096d3d6..cd07a7447d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/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/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml @@ -19,16 +19,16 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_0_ip_requirements: + port_pd01_port_1_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_1_security_groups: + type: json + port_pd01_port_0_ip_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role: type: string required: true @@ -65,19 +65,24 @@ topology_template: port_pd01_port_1_network_role_tag: type: string required: true - port_pd01_port_0_subnetpoolid: - type: string - required: true port_pd01_port_1_network: type: list required: true entry_schema: type: string + port_pd01_port_0_subnetpoolid: + type: string + required: true compute_pd_server_user_data_format: type: list required: true entry_schema: type: string + port_pd01_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role_tag: type: string required: true @@ -86,11 +91,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_1_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/in/hot-mog-0108-bs1271.yml index ec4bb05ba4..fa07863c2f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/in/hot-mog-0108-bs1271.yml @@ -55,8 +55,8 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_0} - - port: {get_resource: pd01_port_1} + - port: {get_resource: pd_server_0_oam_port_0} + - port: {get_resource: pd_server_1_oam_port_0} user_data_format: RAW packet_mirror_network: type: OS::Neutron::Net @@ -68,12 +68,12 @@ resources: properties: name: get_param: packet_internal_network_name - pd01_port_0: + pd_server_0_oam_port_0: type: OS::Neutron::Port properties: network: { get_resource: packet_mirror_network } replacement_policy: AUTO - pd01_port_1: + pd_server_1_oam_port_0: type: OS::Neutron::Port properties: network: { get_resource: packet_internal_network } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index dae69366c8..ab0d206d17 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,24 +8,8 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pd01_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_0_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_0_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_0_network_role: - type: string + port_pd_server_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED compute_pd_server_availability_zone: @@ -40,7 +24,7 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_0_replacement_policy: + port_pd_server_0_oam_port_0_replacement_policy: type: list required: true status: SUPPORTED @@ -50,58 +34,66 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_1_network_role: - type: string + port_pd_server_1_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_0_order: - type: integer + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_1_subnetpoolid: + port_pd_server_0_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - vm_image_name: - type: string + port_pd_server_0_oam_port_0_related_networks: + type: list required: true status: SUPPORTED - port_pd01_port_1_network_role_tag: + 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_pd01_port_0_subnetpoolid: + port_pd_server_1_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_1_network: + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_user_data_format: + port_pd_server_0_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_0_network_role_tag: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_0_related_networks: - type: list + port_pd_server_1_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_1_ip_requirements: + port_pd_server_0_oam_port_0_order: + type: integer + required: true + status: SUPPORTED + port_pd_server_1_oam_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -110,46 +102,54 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd01_port_1_order: - type: integer + port_pd_server_1_oam_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_pd01_port_1_related_networks: + port_pd_server_1_oam_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_1_oam_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_pd01_port_1_vlan_requirements: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1_oam_port_0_network_role: + type: string required: true status: SUPPORTED - port_pd01_port_1_replacement_policy: + port_pd_server_1_oam_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_0_oam_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_0_vlan_requirements: + entry_schema: + 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 + 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 requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -165,41 +165,33 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_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_pd01_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_pd01_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_pd01_port_0: + - link_pd_server_pd_server_0_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - binding_pd_server_pd01_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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -211,133 +203,114 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 - memory.usage_pd_server: + 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_pd_server: + 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 - disk.device.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 - os_pd_server: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - disk.write.bytes.rate_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 - 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. + forwarder_pd_server_pd_server_0_oam_port_0: + type: org.openecomp.capabilities.Forwarder 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. + os_pd_server: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_pd_server: + disk.write.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 - disk.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. + feature_pd_server_pd_server_0_oam_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_pd_server: + 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 - network.incoming.packets_pd_server_pd01_port_0: + 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 - disk.iops_pd_server: + 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 - network.incoming.packets.rate_pd_server_pd01_port_1: + 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. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd01_port_1: + disk.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 - 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. + 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 - cpu.delta_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.packets.rate_pd_server_pd01_port_0: + 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.rate_pd_server_pd01_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: - 1 - UNBOUNDED - attachment_pd_server_pd01_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port_1: + 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.packets.rate_pd_server_pd01_port_0: + 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: @@ -355,11 +328,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port_0: - type: tosca.capabilities.Attachment - 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. @@ -371,23 +339,24 @@ node_types: 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. + forwarder_pd_server_pd_server_1_oam_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port_0: - type: org.openecomp.capabilities.Forwarder + 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 - forwarder_pd_server_pd01_port_1: - type: org.openecomp.capabilities.Forwarder + 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 - network.incoming.packets_pd_server_pd01_port_1: + 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: @@ -416,17 +385,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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. + 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: - - 1 + - 0 - UNBOUNDED feature_pd_server: type: tosca.capabilities.Node @@ -439,7 +404,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port_1: + 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: @@ -451,21 +416,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port_0: + 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_pd_server_pd01_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_pd_server_pd01_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 @@ -487,19 +451,24 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_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 - network.outpoing.packets_pd_server_pd01_port_0: + 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.outpoing.packets_pd_server_pd01_port_1: + 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: @@ -524,13 +493,20 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port_1: - type: tosca.capabilities.Node + attachment_pd_server_pd_server_1_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port_0: - type: tosca.capabilities.Node + 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 + 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 @@ -546,12 +522,30 @@ node_types: occurrences: - 1 - UNBOUNDED + 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 + 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 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 + 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.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. @@ -575,4 +569,10 @@ node_types: 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 + 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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml index 3f3e490da9..3fe0da473a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml @@ -183,44 +183,44 @@ topology_template: directives: - substitutable properties: - port_pd01_port_0_mac_requirements: - mac_count_required: - is_required: false - port_pd01_port_0_network: - - packet_mirror_network - port_pd01_port_0_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: - get_input: - pd_server_names - 0 - port_pd01_port_0_replacement_policy: + port_pd_server_0_oam_port_0_replacement_policy: - AUTO vm_flavor_name: get_input: pd_flavor_name + port_pd_server_1_oam_port_0_mac_requirements: + mac_count_required: + is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_1_network: - - packet_internal_network compute_pd_server_user_data_format: - RAW - port_pd01_port_1_ip_requirements: + port_pd_server_1_oam_port_0_replacement_policy: + - AUTO + 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_server_1_oam_port_0_network: + - packet_internal_network + port_pd_server_0_oam_port_0_network: + - packet_mirror_network + 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_pd01_port_1_mac_requirements: + port_pd_server_0_oam_port_0_mac_requirements: mac_count_required: is_required: false - port_pd01_port_1_replacement_policy: - - AUTO service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -234,11 +234,11 @@ topology_template: capability: tosca.capabilities.Node node: packet_mirror_network relationship: tosca.relationships.DependsOn - - link_pd_server_pd01_port_0: + - link_pd_server_pd_server_0_oam_port_0: capability: tosca.capabilities.network.Linkable node: packet_mirror_network relationship: tosca.relationships.network.LinksTo - - link_pd_server_pd01_port_1: + - link_pd_server_pd_server_1_oam_port_0: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/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/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml index c2e283a51c..6dae9d7082 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/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/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml @@ -11,21 +11,8 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pd01_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_0_network: - type: list - required: true - entry_schema: - type: string - port_pd01_port_0_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_0_network_role: - type: string + port_pd_server_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true compute_pd_server_availability_zone: type: list @@ -37,7 +24,7 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_0_replacement_policy: + port_pd_server_0_oam_port_0_replacement_policy: type: list required: true entry_schema: @@ -45,47 +32,53 @@ topology_template: vm_flavor_name: type: string required: true - port_pd01_port_1_network_role: - type: string - required: true - port_pd01_port_0_order: - type: integer + port_pd_server_1_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_1_subnetpoolid: + 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_pd01_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_pd01_port_0_subnetpoolid: + port_pd_server_1_oam_port_0_subnetpoolid: type: string required: true - port_pd01_port_1_network: + compute_pd_server_user_data_format: type: list required: true entry_schema: type: string - compute_pd_server_user_data_format: + port_pd_server_0_oam_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_0_network_role_tag: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_network_role: type: string required: true - port_pd01_port_0_related_networks: - type: list + port_pd_server_1_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_1_ip_requirements: + port_pd_server_0_oam_port_0_order: + type: integer + required: true + port_pd_server_1_oam_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -93,38 +86,45 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd01_port_1_order: - type: integer + port_pd_server_1_oam_port_0_network_role_tag: + type: string required: true - port_pd01_port_1_related_networks: + port_pd_server_1_oam_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_1_vlan_requirements: + port_pd_server_1_oam_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_0_oam_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1_oam_port_0_network_role: + type: string required: true - port_pd01_port_1_replacement_policy: + port_pd_server_1_oam_port_0_network: type: list required: true entry_schema: type: string - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_0_oam_port_0_network: + type: list required: true - port_pd01_port_0_vlan_requirements: + entry_schema: + type: string + port_pd_server_1_oam_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + 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: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -145,70 +145,70 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port_1: + pd_server_pd_server_1_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd01_port_1_replacement_policy + - port_pd_server_1_oam_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd01_port_1_mac_requirements + get_input: port_pd_server_1_oam_port_0_mac_requirements order: - get_input: port_pd01_port_1_order + get_input: port_pd_server_1_oam_port_0_order exCP_naming: - get_input: port_pd01_port_1_exCP_naming + get_input: port_pd_server_1_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_1_vlan_requirements + get_input: port_pd_server_1_oam_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_1_ip_requirements + get_input: port_pd_server_1_oam_port_0_ip_requirements related_networks: - get_input: port_pd01_port_1_related_networks + get_input: port_pd_server_1_oam_port_0_related_networks network_role_tag: - get_input: port_pd01_port_1_network_role_tag + get_input: port_pd_server_1_oam_port_0_network_role_tag network_role: - get_input: port_pd01_port_1_network_role + get_input: port_pd_server_1_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_1_subnetpoolid + get_input: port_pd_server_1_oam_port_0_subnetpoolid network: get_input: - - port_pd01_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_pd01_port_0: + pd_server_pd_server_0_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd01_port_0_replacement_policy + - port_pd_server_0_oam_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd01_port_0_mac_requirements + get_input: port_pd_server_0_oam_port_0_mac_requirements order: - get_input: port_pd01_port_0_order + get_input: port_pd_server_0_oam_port_0_order exCP_naming: - get_input: port_pd01_port_0_exCP_naming + get_input: port_pd_server_0_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_0_vlan_requirements + get_input: port_pd_server_0_oam_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_0_ip_requirements + get_input: port_pd_server_0_oam_port_0_ip_requirements related_networks: - get_input: port_pd01_port_0_related_networks + get_input: port_pd_server_0_oam_port_0_related_networks network_role_tag: - get_input: port_pd01_port_0_network_role_tag + get_input: port_pd_server_0_oam_port_0_network_role_tag network_role: - get_input: port_pd01_port_0_network_role + get_input: port_pd_server_0_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_0_subnetpoolid + get_input: port_pd_server_0_oam_port_0_subnetpoolid network: get_input: - - port_pd01_port_0_network + - port_pd_server_0_oam_port_0_network - index_value requirements: - binding: @@ -218,18 +218,15 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: - binding_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - binding scalable_pd_server: - pd_server - scalable disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate - binding_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - binding + 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 @@ -239,12 +236,21 @@ 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 + 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 @@ -257,69 +263,48 @@ topology_template: 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.incoming.packets_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.packets + 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.packets.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.packets.rate - network.incoming.bytes.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.bytes.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.packets.rate - network.incoming.bytes.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.bytes.rate - attachment_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - attachment - network.outgoing.packets.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.outgoing.packets.rate - network.outgoing.packets.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate - attachment_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests 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 - forwarder_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - forwarder - forwarder_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - forwarder - network.incoming.packets_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.packets + 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 @@ -332,33 +317,30 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests - network.outgoing.bytes.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.outgoing.bytes.rate - network.outgoing.bytes.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outgoing.bytes.rate + 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.incoming.bytes_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.bytes + 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.outgoing.bytes_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outgoing.bytes - network.outgoing.bytes_pd_server_pd01_port_1: - - pd_server_pd01_port_1 + 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 - network.incoming.bytes_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.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 @@ -368,15 +350,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.outpoing.packets_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outpoing.packets - network.outpoing.packets_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.outpoing.packets + 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 @@ -386,21 +371,33 @@ topology_template: host_pd_server: - pd_server - host - feature_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - feature - feature_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - feature + 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.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 @@ -413,22 +410,25 @@ topology_template: 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 - dependency_pd_server_pd01_port_1: - - pd_server_pd01_port_1 + 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_pd01_port_0: - - pd_server_pd01_port_0 - - dependency - link_pd_server_pd01_port_0: - - pd_server_pd01_port_0 + link_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 - link - link_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - link
\ No newline at end of file + dependency_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml index dff3ddaa23..296881d7c1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,26 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role: + type: string + required: true + status: SUPPORTED compute_pd_server_availability_zone: type: list required: true @@ -24,41 +44,45 @@ node_types: type: string required: true status: SUPPORTED - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: string + port_pd01_port_0_order: + type: integer required: true status: SUPPORTED vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: - type: list + port_pd02_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + port_pd01_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: + type: string + port_pd02_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED @@ -72,72 +96,48 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_exCP_naming: + port_pd02_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd02_port_order: - type: integer + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd02_port_subnetpoolid: + port_pd02_port_0_network_role: type: string required: true status: SUPPORTED - port_pd02_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_network: - type: list + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: + port_pd02_port_0_order: type: integer required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_0_related_networks: + type: list required: true status: SUPPORTED - port_pd01_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd02_port_ip_requirements: + port_pd02_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd02_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -153,33 +153,49 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd02_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd02_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_pd02_port: + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd02_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd02_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 + binding_pd_server_pd01_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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -209,12 +225,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -226,7 +236,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + network.outgoing.packets.rate_pd_server_pd02_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: @@ -262,21 +272,13 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd02_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 - network.outgoing.bytes_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd02_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.packets.rate_pd_server_pd02_port: + network.incoming.packets_pd_server_pd01_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: @@ -300,30 +302,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: - 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_pd02_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd02_port: + network.incoming.packets.rate_pd_server_pd01_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 - feature_pd_server_pd02_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd02_port: + network.incoming.bytes.rate_pd_server_pd01_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_pd02_port: + network.outgoing.packets.rate_pd_server_pd01_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: @@ -341,6 +337,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + 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. @@ -352,35 +353,24 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - forwarder_pd_server_pd02_port: - 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 - 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. + forwarder_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder 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_pd_server_pd02_port: + 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: @@ -397,6 +387,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_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 feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -408,33 +404,37 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd02_port: + network.outgoing.bytes.rate_pd_server_pd02_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 - binding_pd_server_pd01_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 + 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: - - 0 + - 1 - UNBOUNDED - disk.write.bytes_pd_server: + network.outgoing.bytes_pd_server_pd02_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_pd01_port: + network.outgoing.bytes_pd_server_pd01_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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd02_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_pd01_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: @@ -464,6 +464,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_server_pd02_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_pd01_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.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. @@ -483,19 +495,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd02_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 - attachment_pd_server_pd02_port: - type: tosca.capabilities.Attachment + network.incoming.bytes.rate_pd_server_pd02_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_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -511,24 +524,18 @@ node_types: occurrences: - 1 - UNBOUNDED - 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 - feature_pd_server_pd01_port: - type: tosca.capabilities.Node + attachment_pd_server_pd02_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.latency_pd_server: + 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 - network.incoming.packets.rate_pd_server_pd02_port: + 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: @@ -546,21 +553,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.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 - network.incoming.bytes_pd_server_pd02_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_pd_server_pd02_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -1183,4 +1183,4 @@ node_types: 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/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml index e615ef760e..e79660adfa 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml @@ -863,6 +863,17 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - get_input: oam_net_name + port_pd01_port_0_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: @@ -871,34 +882,23 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_network_role_tag: oam - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false + port_pd02_port_0_network: + - get_input: oam_net_name vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + port_pd02_port_0_network_role_tag: oam compute_pd_server_user_data_format: - RAW - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false - port_pd01_port_network: - - get_input: oam_net_name - port_pd02_port_ip_requirements: + port_pd02_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network_role_tag: oam - port_pd02_port_network: - - get_input: oam_net_name + port_pd01_port_0_network_role_tag: oam + port_pd02_port_0_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -915,4 +915,4 @@ topology_template: description: heat template that creates MOG stack members: - server_pcm_003 - - 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/computewithtwodiffporttypesandnested/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/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml index e894e5c65f..4eb94fbdaa 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/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/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,22 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role: + type: string + required: true compute_pd_server_availability_zone: type: list required: true @@ -24,34 +40,37 @@ topology_template: vm_flavor_name: type: string required: true - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_network: + type: list required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: string + port_pd01_port_0_order: + type: integer required: true vm_image_name: type: string required: true - port_pd01_port_ip_requirements: - type: list + port_pd02_port_0_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + port_pd01_port_0_subnetpoolid: type: string required: true - port_pd01_port_vlan_requirements: + compute_pd_server_user_data_format: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: + type: string + port_pd02_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + port_pd01_port_0_related_networks: type: list required: true entry_schema: @@ -63,58 +82,39 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_exCP_naming: + port_pd02_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd02_port_order: - type: integer + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd02_port_subnetpoolid: + port_pd02_port_0_network_role: type: string required: true - port_pd02_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_network: - type: list + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - port_pd01_port_order: + port_pd02_port_0_order: type: integer required: true - port_pd01_port_subnetpoolid: - type: string - required: true - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_0_related_networks: + type: list required: true - port_pd01_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: type: string required: true - port_pd02_port_ip_requirements: + port_pd02_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network_role_tag: - type: string - required: true - port_pd02_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -135,62 +135,62 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd02_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd02_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd02_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd02_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd02_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd02_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd02_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd02_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd02_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd02_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd02_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo - pd_server_pd02_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd02_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd02_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd02_port_related_networks + get_input: port_pd01_port_0_related_networks ip_requirements: - get_input: port_pd02_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: port_pd02_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: port_pd02_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd02_port_order + get_input: port_pd01_port_0_order network_role: - get_input: port_pd02_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd02_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_input: - - port_pd02_port_network + - port_pd01_port_0_network - index_value requirements: - binding: @@ -200,6 +200,12 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + binding_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - binding + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -215,18 +221,15 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes + network.outgoing.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.packets.rate cpu_pd_server: - pd_server - cpu @@ -242,15 +245,12 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - binding_pd_server_pd02_port: - - pd_server_pd02_port - - binding - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes - network.outgoing.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.packets.rate + network.outpoing.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outpoing.packets + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -260,78 +260,78 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate - network.outgoing.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes - feature_pd_server_pd02_port: - - pd_server_pd02_port + feature_pd_server_pd02_port_0: + - pd_server_pd02_port_0 - feature - network.incoming.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.bytes.rate - network.outgoing.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment - forwarder_pd_server_pd02_port: - - pd_server_pd02_port - - forwarder disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation disk.allocation_pd_server: - pd_server - disk.allocation - network.incoming.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - network.outpoing.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.outpoing.packets - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.outgoing.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -344,6 +344,12 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.incoming.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -353,64 +359,58 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - attachment_pd_server_pd02_port: - - pd_server_pd02_port - - attachment - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + network.incoming.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes.rate + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + attachment_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - attachment disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency - network.incoming.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets.rate disk.latency_pd_server: - pd_server - disk.latency disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops - network.incoming.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes + forwarder_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - forwarder requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd02_port: - - pd_server_pd02_port - - link - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd02_port: - - pd_server_pd02_port - - dependency
\ No newline at end of file + link_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - link + dependency_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - dependency + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/in/hot-mog-0108-bs1271.yml index 57479ff130..2ed32a389d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/in/hot-mog-0108-bs1271.yml @@ -215,15 +215,15 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_0} - - port: {get_resource: pd01_port_1} + - port: {get_resource: pd_server_0_oam_port_0} + - port: {get_resource: pd_server_1_oam_port_0} user_data_format: RAW - pd01_port_0: + pd_server_0_oam_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - pd01_port_1: + pd_server_1_oam_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml index dd9ab9af97..2e4b2ff854 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,24 +8,8 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pd01_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_0_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_0_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_0_network_role: - type: string + port_pd_server_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED compute_pd_server_availability_zone: @@ -44,58 +28,60 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_1_network_role: - type: string + port_pd_server_1_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_0_order: - type: integer + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_1_subnetpoolid: + port_pd_server_0_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - vm_image_name: - type: string + port_pd_server_0_oam_port_0_related_networks: + type: list required: true status: SUPPORTED - port_pd01_port_1_network_role_tag: + 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_pd01_port_0_subnetpoolid: + port_pd_server_1_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_1_network: + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_user_data_format: + port_pd_server_0_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_0_network_role_tag: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_0_related_networks: - type: list + port_pd_server_1_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_1_ip_requirements: - type: list + port_pd_server_0_oam_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -104,40 +90,54 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd01_port_1_order: - type: integer + port_pd_server_1_oam_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_pd01_port_1_related_networks: + port_pd_server_1_oam_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_1_oam_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_pd01_port_1_vlan_requirements: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1_oam_port_0_network_role: + type: string required: true status: SUPPORTED - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_1_oam_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_0_vlan_requirements: + entry_schema: + type: string + port_pd_server_0_oam_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string + port_pd_server_1_oam_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + 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 requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -153,41 +153,33 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_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_pd01_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_pd01_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_pd01_port_0: + - link_pd_server_pd_server_0_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - binding_pd_server_pd01_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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -199,133 +191,114 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 - memory.usage_pd_server: + 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_pd_server: + 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 - disk.device.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 - os_pd_server: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - disk.write.bytes.rate_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 - 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. + forwarder_pd_server_pd_server_0_oam_port_0: + type: org.openecomp.capabilities.Forwarder 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. + os_pd_server: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_pd_server: + disk.write.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 - disk.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. + feature_pd_server_pd_server_0_oam_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_pd_server: + 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 - network.incoming.packets_pd_server_pd01_port_0: + 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 - disk.iops_pd_server: + 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 - network.incoming.packets.rate_pd_server_pd01_port_1: + 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. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd01_port_1: + disk.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 - 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. + 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 - cpu.delta_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.packets.rate_pd_server_pd01_port_0: + 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.rate_pd_server_pd01_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: - 1 - UNBOUNDED - attachment_pd_server_pd01_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port_1: + 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.packets.rate_pd_server_pd01_port_0: + 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: @@ -343,11 +316,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port_0: - type: tosca.capabilities.Attachment - 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. @@ -359,23 +327,24 @@ node_types: 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. + forwarder_pd_server_pd_server_1_oam_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port_0: - type: org.openecomp.capabilities.Forwarder + 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 - forwarder_pd_server_pd01_port_1: - type: org.openecomp.capabilities.Forwarder + 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 - network.incoming.packets_pd_server_pd01_port_1: + 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: @@ -404,17 +373,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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. + 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: - - 1 + - 0 - UNBOUNDED feature_pd_server: type: tosca.capabilities.Node @@ -427,7 +392,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port_1: + 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: @@ -439,21 +404,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port_0: + 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_pd_server_pd01_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_pd_server_pd01_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 @@ -475,19 +439,24 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_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 - network.outpoing.packets_pd_server_pd01_port_0: + 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.outpoing.packets_pd_server_pd01_port_1: + 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: @@ -512,13 +481,20 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port_1: - type: tosca.capabilities.Node + attachment_pd_server_pd_server_1_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port_0: - type: tosca.capabilities.Node + 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 + 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 @@ -534,12 +510,30 @@ node_types: occurrences: - 1 - UNBOUNDED + 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 + 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 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 + 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.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. @@ -563,4 +557,10 @@ node_types: 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_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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml index 585eb1e4cb..60a5fd2eb1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml @@ -832,17 +832,6 @@ topology_template: directives: - substitutable properties: - port_pd01_port_0_mac_requirements: - mac_count_required: - is_required: false - port_pd01_port_0_network: - - get_input: oam_net_name - port_pd01_port_0_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: @@ -851,21 +840,32 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name + port_pd_server_1_oam_port_0_mac_requirements: + mac_count_required: + is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_1_network_role_tag: oam - port_pd01_port_1_network: - - get_input: oam_net_name + port_pd_server_0_oam_port_0_network_role_tag: oam compute_pd_server_user_data_format: - RAW - port_pd01_port_0_network_role_tag: oam - port_pd01_port_1_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_server_1_oam_port_0_network: + - get_input: oam_net_name + port_pd_server_0_oam_port_0_network: + - get_input: oam_net_name + 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_pd01_port_1_mac_requirements: + port_pd_server_0_oam_port_0_mac_requirements: mac_count_required: is_required: false service_template_filter: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/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/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml index bdf0a31df8..315836c88c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/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/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml @@ -11,21 +11,8 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pd01_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_0_network: - type: list - required: true - entry_schema: - type: string - port_pd01_port_0_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_0_network_role: - type: string + port_pd_server_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true compute_pd_server_availability_zone: type: list @@ -40,47 +27,48 @@ topology_template: vm_flavor_name: type: string required: true - port_pd01_port_1_network_role: - type: string - required: true - port_pd01_port_0_order: - type: integer + port_pd_server_1_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_1_subnetpoolid: + 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_pd01_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_pd01_port_0_subnetpoolid: + port_pd_server_1_oam_port_0_subnetpoolid: type: string required: true - port_pd01_port_1_network: + compute_pd_server_user_data_format: type: list required: true entry_schema: type: string - compute_pd_server_user_data_format: + port_pd_server_0_oam_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_0_network_role_tag: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_network_role: type: string required: true - port_pd01_port_0_related_networks: - type: list + port_pd_server_1_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_1_ip_requirements: - type: list + port_pd_server_0_oam_port_0_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -88,33 +76,45 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd01_port_1_order: - type: integer + port_pd_server_1_oam_port_0_network_role_tag: + type: string required: true - port_pd01_port_1_related_networks: + port_pd_server_1_oam_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_1_vlan_requirements: + port_pd_server_1_oam_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_0_oam_port_0_ip_requirements: + type: list required: true - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1_oam_port_0_network_role: + type: string required: true - port_pd01_port_0_vlan_requirements: + port_pd_server_1_oam_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string + port_pd_server_0_oam_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd_server_1_oam_port_0_ip_requirements: + type: list + required: true + entry_schema: + 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: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -135,62 +135,62 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_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_pd01_port_1_exCP_naming + get_input: port_pd_server_1_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_1_vlan_requirements + get_input: port_pd_server_1_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_1_related_networks + get_input: port_pd_server_1_oam_port_0_related_networks ip_requirements: - get_input: port_pd01_port_1_ip_requirements + get_input: port_pd_server_1_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_1_network_role_tag + get_input: port_pd_server_1_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_1_mac_requirements + get_input: port_pd_server_1_oam_port_0_mac_requirements order: - get_input: port_pd01_port_1_order + get_input: port_pd_server_1_oam_port_0_order network_role: - get_input: port_pd01_port_1_network_role + get_input: port_pd_server_1_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_1_subnetpoolid + get_input: port_pd_server_1_oam_port_0_subnetpoolid network: get_input: - - port_pd01_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_pd01_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_pd01_port_0_exCP_naming + get_input: port_pd_server_0_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_0_vlan_requirements + get_input: port_pd_server_0_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_0_related_networks + get_input: port_pd_server_0_oam_port_0_related_networks ip_requirements: - get_input: port_pd01_port_0_ip_requirements + get_input: port_pd_server_0_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_0_network_role_tag + get_input: port_pd_server_0_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_0_mac_requirements + get_input: port_pd_server_0_oam_port_0_mac_requirements order: - get_input: port_pd01_port_0_order + get_input: port_pd_server_0_oam_port_0_order network_role: - get_input: port_pd01_port_0_network_role + get_input: port_pd_server_0_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_0_subnetpoolid + get_input: port_pd_server_0_oam_port_0_subnetpoolid network: get_input: - - port_pd01_port_0_network + - port_pd_server_0_oam_port_0_network - index_value requirements: - binding: @@ -200,18 +200,15 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: - binding_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - binding scalable_pd_server: - pd_server - scalable disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate - binding_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - binding + 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 @@ -221,12 +218,21 @@ 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 + 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 @@ -239,69 +245,48 @@ topology_template: 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.incoming.packets_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.packets + 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.packets.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.packets.rate - network.incoming.bytes.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.bytes.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.packets.rate - network.incoming.bytes.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.bytes.rate - attachment_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - attachment - network.outgoing.packets.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.outgoing.packets.rate - network.outgoing.packets.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate - attachment_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests 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 - forwarder_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - forwarder - forwarder_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - forwarder - network.incoming.packets_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.packets + 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 @@ -314,33 +299,30 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests - network.outgoing.bytes.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.outgoing.bytes.rate - network.outgoing.bytes.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outgoing.bytes.rate + 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.incoming.bytes_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.bytes + 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.outgoing.bytes_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outgoing.bytes - network.outgoing.bytes_pd_server_pd01_port_1: - - pd_server_pd01_port_1 + 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 - network.incoming.bytes_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.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 @@ -350,15 +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.outpoing.packets_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outpoing.packets - network.outpoing.packets_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.outpoing.packets + 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 @@ -368,21 +353,33 @@ topology_template: host_pd_server: - pd_server - host - feature_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - feature - feature_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - feature + 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.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 @@ -395,22 +392,25 @@ topology_template: 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 - dependency_pd_server_pd01_port_1: - - pd_server_pd01_port_1 + 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_pd01_port_0: - - pd_server_pd01_port_0 - - dependency - link_pd_server_pd01_port_0: - - pd_server_pd01_port_0 + link_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 - link - link_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - link
\ No newline at end of file + dependency_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/in/hot-mog-0108-bs1271.yml index a63128c832..2ed32a389d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/in/hot-mog-0108-bs1271.yml @@ -215,15 +215,15 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd_oam1_port_0} - - port: {get_resource: pd_oam1_port_1} + - port: {get_resource: pd_server_0_oam_port_0} + - port: {get_resource: pd_server_1_oam_port_0} user_data_format: RAW - pd_oam1_port_0: + pd_server_0_oam_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - pd_oam1_port_1: + pd_server_1_oam_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} 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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index a8909d0fcc..bef997b5b3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,26 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role: + type: string + required: true + status: SUPPORTED compute_pd_server_availability_zone: type: list required: true @@ -24,41 +44,45 @@ node_types: type: string required: true status: SUPPORTED - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: string + port_pd01_port_0_order: + type: integer required: true status: SUPPORTED vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: - type: list + port_pd02_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + port_pd01_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: + type: string + port_pd02_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED @@ -72,80 +96,56 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_exCP_naming: + port_pd02_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd02_port_order: - type: integer + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd02_port_subnetpoolid: + port_pd02_port_0_network_role: type: string required: true status: SUPPORTED - port_pd02_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_network: - type: list + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: + port_pd02_port_0_order: type: integer required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_0_related_networks: + type: list required: true status: SUPPORTED - port_pd01_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd02_port_ip_requirements: + port_pd02_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd02_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements attributes: - pd_server_accessIPv4: + pd_server_pd01_port_0_device_id: type: string status: SUPPORTED - pd_server_pd02_port_device_owner: + pd_server_accessIPv4: type: string status: SUPPORTED - pd_server_pd01_port_device_id: + pd_server_pd02_port_0_device_owner: type: string status: SUPPORTED requirements: @@ -163,33 +163,49 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd02_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd02_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_pd02_port: + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd02_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd02_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 + binding_pd_server_pd01_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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -219,12 +235,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -236,7 +246,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + network.outgoing.packets.rate_pd_server_pd02_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: @@ -272,21 +282,13 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd02_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 - network.outgoing.bytes_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd02_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.packets.rate_pd_server_pd02_port: + network.incoming.packets_pd_server_pd01_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: @@ -310,30 +312,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: - 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_pd02_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd02_port: + network.incoming.packets.rate_pd_server_pd01_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 - feature_pd_server_pd02_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd02_port: + network.incoming.bytes.rate_pd_server_pd01_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_pd02_port: + network.outgoing.packets.rate_pd_server_pd01_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: @@ -351,6 +347,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + 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. @@ -362,35 +363,24 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - forwarder_pd_server_pd02_port: - 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 - 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. + forwarder_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder 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_pd_server_pd02_port: + 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: @@ -407,6 +397,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_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 feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -418,33 +414,37 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd02_port: + network.outgoing.bytes.rate_pd_server_pd02_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 - binding_pd_server_pd01_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 + 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: - - 0 + - 1 - UNBOUNDED - disk.write.bytes_pd_server: + network.outgoing.bytes_pd_server_pd02_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_pd01_port: + network.outgoing.bytes_pd_server_pd01_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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd02_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_pd01_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: @@ -474,6 +474,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_server_pd02_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_pd01_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.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. @@ -493,19 +505,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd02_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 - attachment_pd_server_pd02_port: - type: tosca.capabilities.Attachment + network.incoming.bytes.rate_pd_server_pd02_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_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -521,24 +534,18 @@ node_types: occurrences: - 1 - UNBOUNDED - 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 - feature_pd_server_pd01_port: - type: tosca.capabilities.Node + attachment_pd_server_pd02_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.latency_pd_server: + 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 - network.incoming.packets.rate_pd_server_pd02_port: + 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: @@ -556,21 +563,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.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 - network.incoming.bytes_pd_server_pd02_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_pd_server_pd02_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml index c07b4fffca..5c85dd2bea 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml @@ -832,6 +832,17 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - get_input: oam_net_name + port_pd01_port_0_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: @@ -840,34 +851,23 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_network_role_tag: oam - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false + port_pd02_port_0_network: + - get_input: oam_net_name vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + port_pd02_port_0_network_role_tag: oam compute_pd_server_user_data_format: - RAW - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false - port_pd01_port_network: - - get_input: oam_net_name - port_pd02_port_ip_requirements: + port_pd02_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network_role_tag: oam - port_pd02_port_network: - - get_input: oam_net_name + port_pd01_port_0_network_role_tag: oam + port_pd02_port_0_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -890,13 +890,13 @@ topology_template: value: get_attribute: - abstract_pd_server - - pd_server_pd02_port_device_owner + - pd_server_pd02_port_0_device_owner out3: description: output_regula value: get_attribute: - abstract_pd_server - - pd_server_pd01_port_device_id + - pd_server_pd01_port_0_device_id out1: description: output_regula value: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/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/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml index 2703eb2e77..3655e81659 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/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/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,22 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role: + type: string + required: true compute_pd_server_availability_zone: type: list required: true @@ -24,34 +40,37 @@ topology_template: vm_flavor_name: type: string required: true - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_network: + type: list required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: string + port_pd01_port_0_order: + type: integer required: true vm_image_name: type: string required: true - port_pd01_port_ip_requirements: - type: list + port_pd02_port_0_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + port_pd01_port_0_subnetpoolid: type: string required: true - port_pd01_port_vlan_requirements: + compute_pd_server_user_data_format: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: + type: string + port_pd02_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + port_pd01_port_0_related_networks: type: list required: true entry_schema: @@ -63,58 +82,39 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_exCP_naming: + port_pd02_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd02_port_order: - type: integer + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd02_port_subnetpoolid: + port_pd02_port_0_network_role: type: string required: true - port_pd02_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_network: - type: list + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - port_pd01_port_order: + port_pd02_port_0_order: type: integer required: true - port_pd01_port_subnetpoolid: - type: string - required: true - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_0_related_networks: + type: list required: true - port_pd01_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: type: string required: true - port_pd02_port_ip_requirements: + port_pd02_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network_role_tag: - type: string - required: true - port_pd02_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -135,62 +135,62 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd02_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd02_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd02_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd02_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd02_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd02_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd02_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd02_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd02_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd02_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd02_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo - pd_server_pd02_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd02_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd02_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd02_port_related_networks + get_input: port_pd01_port_0_related_networks ip_requirements: - get_input: port_pd02_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: port_pd02_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: port_pd02_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd02_port_order + get_input: port_pd01_port_0_order network_role: - get_input: port_pd02_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd02_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_input: - - port_pd02_port_network + - port_pd01_port_0_network - index_value requirements: - binding: @@ -198,27 +198,33 @@ topology_template: node: pd_server relationship: tosca.relationships.network.BindsTo outputs: + pd_server_pd01_port_0_device_id: + type: string + value: + get_attribute: + - pd_server_pd01_port_0 + - device_id pd_server_accessIPv4: type: string value: get_attribute: - pd_server - accessIPv4 - pd_server_pd02_port_device_owner: + pd_server_pd02_port_0_device_owner: type: string value: get_attribute: - - pd_server_pd02_port + - pd_server_pd02_port_0 - device_owner - pd_server_pd01_port_device_id: - type: string - value: - get_attribute: - - pd_server_pd01_port - - device_id substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + binding_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - binding + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -234,18 +240,15 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes + network.outgoing.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.packets.rate cpu_pd_server: - pd_server - cpu @@ -261,15 +264,12 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - binding_pd_server_pd02_port: - - pd_server_pd02_port - - binding - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes - network.outgoing.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.packets.rate + network.outpoing.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outpoing.packets + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -279,78 +279,78 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate - network.outgoing.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes - feature_pd_server_pd02_port: - - pd_server_pd02_port + feature_pd_server_pd02_port_0: + - pd_server_pd02_port_0 - feature - network.incoming.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.bytes.rate - network.outgoing.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment - forwarder_pd_server_pd02_port: - - pd_server_pd02_port - - forwarder disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation disk.allocation_pd_server: - pd_server - disk.allocation - network.incoming.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - network.outpoing.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.outpoing.packets - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.outgoing.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -363,6 +363,12 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.incoming.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -372,64 +378,58 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - attachment_pd_server_pd02_port: - - pd_server_pd02_port - - attachment - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + network.incoming.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes.rate + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + attachment_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - attachment disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency - network.incoming.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets.rate disk.latency_pd_server: - pd_server - disk.latency disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops - network.incoming.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes + forwarder_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - forwarder requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd02_port: - - pd_server_pd02_port - - link - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd02_port: - - pd_server_pd02_port - - dependency
\ No newline at end of file + link_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - link + dependency_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - dependency + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml index ddd2d22fa3..1b612b79fa 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,110 +8,120 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_template_VMInt_OAM_lb_4_network_role: + type: string + required: true + status: SUPPORTED compute_pd_server_key_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_replacement_policy: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_personality: type: list required: true status: SUPPORTED entry_schema: type: json + port_pd01_port_0_replacement_policy: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string compute_pd_server_image_update_policy: type: list required: true status: SUPPORTED entry_schema: type: string + port_pd01_port_0_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_security_groups: + port_pd01_port_0_binding:vnic_type: type: list required: true status: SUPPORTED entry_schema: - type: json - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: string + port_pd01_port_0_order: + type: integer required: true status: SUPPORTED - vm_image_name: - type: string + port_template_VMInt_OAM_lb_4_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true status: SUPPORTED - port_template_VMInt_OAM_lb_virtual_machine_interface_properties: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties + vm_image_name: + type: string required: true status: SUPPORTED - port_template_VMInt_OAM_lb_related_networks: + port_pd01_port_0_port_security_enabled: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_device_id: + type: boolean + port_pd01_port_0_value_specs: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_admin_state_up: + type: json + port_pd01_port_0_admin_state_up: type: list required: true status: SUPPORTED entry_schema: type: boolean - port_pd01_port_vlan_requirements: + port_pd01_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_template_VMInt_OAM_lb_4_virtual_network_refs: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: json compute_pd_server_metadata: type: list required: true status: SUPPORTED entry_schema: type: json - port_template_VMInt_OAM_lb_subnetpoolid: - type: string - required: true - status: SUPPORTED compute_pd_server_diskConfig: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_mac_address: + port_pd01_port_0_mac_address: type: string required: true status: SUPPORTED - port_template_VMInt_OAM_lb_network_role: + port_pd01_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_allowed_address_pairs: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED compute_pd_server_admin_pass: type: list required: true @@ -124,39 +134,39 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_related_networks: + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_template_VMInt_OAM_lb_4_security_group_refs: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_template_VMInt_OAM_lb_ip_requirements: + type: json + port_template_VMInt_OAM_lb_4_virtual_machine_interface_mac_addresses: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_template_VMInt_OAM_lb_exCP_naming: + type: json + port_template_VMInt_OAM_lb_4_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true - status: SUPPORTED - port_pd01_port_value_specs: + port_template_VMInt_OAM_lb_4_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: json - compute_pd_server_security_groups: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd01_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: json - port_template_VMInt_OAM_lb_port_tuple_refs: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + compute_pd_server_security_groups: type: list required: true status: SUPPORTED @@ -168,74 +178,70 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - compute_pd_server_scheduler_hints: + port_pd01_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: type: json - port_pd01_port_name: + compute_pd_server_scheduler_hints: type: list required: true status: SUPPORTED entry_schema: - type: string + type: json compute_pd_server_contrail_service_instance_ind: type: list required: true status: SUPPORTED entry_schema: type: boolean - compute_pd_server_availability_zone: + port_template_VMInt_OAM_lb_4_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - compute_pd_server_name: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_template_VMInt_OAM_lb_network_role_tag: + port_pd01_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_binding:vnic_type: + compute_pd_server_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_device_owner: + compute_pd_server_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_fixed_ips: - type: list + port_template_VMInt_OAM_lb_4_virtual_machine_interface_properties: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd01_port_ip_requirements: + port_template_VMInt_OAM_lb_4_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_qos_policy: - type: list + port_template_VMInt_OAM_lb_4_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_template_VMInt_OAM_lb_4_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_pd_server_config_drive: type: list required: true @@ -248,192 +254,186 @@ node_types: status: SUPPORTED entry_schema: type: string - port_template_VMInt_OAM_lb_virtual_network_refs: + port_pd01_port_0_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: json - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - port_template_VMInt_OAM_lb_order: - type: integer - required: true - status: SUPPORTED - port_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses: + type: org.openecomp.datatypes.heat.network.AddressPair + port_pd01_port_0_device_id: type: list required: true status: SUPPORTED entry_schema: - type: json - port_template_VMInt_OAM_lb_name: + type: string + port_pd01_port_0_qos_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_port_security_enabled: + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: boolean - port_template_VMInt_OAM_lb_vlan_requirements: - type: list - required: true + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_update_policy: + constraints: + - greater_or_equal: 0 + port_template_VMInt_OAM_lb_4_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_network: + port_template_VMInt_OAM_lb_4_order: + type: integer + required: true + status: SUPPORTED + compute_pd_server_user_data_update_policy: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_reservation_id: + port_pd01_port_0_device_owner: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_order: - type: integer - required: true - status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_template_VMInt_OAM_lb_mac_requirements: + port_template_VMInt_OAM_lb_4_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_network_role: - type: string - required: true - status: SUPPORTED - port_template_VMInt_OAM_lb_security_group_refs: + compute_pd_server_reservation_id: type: list required: true status: SUPPORTED entry_schema: - type: json - attributes: - pd_server_pd01_port_allowed_address_pairs: + type: string + port_template_VMInt_OAM_lb_4_port_tuple_refs: type: list + required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses: + type: json + port_pd01_port_0_vlan_requirements: type: list + required: true status: SUPPORTED entry_schema: - type: string - pd_server_template_VMInt_OAM_lb_virtual_network_refs: - type: list + type: org.openecomp.datatypes.network.VlanRequirements + attributes: + pd_server_pd01_port_0_port_security_enabled: + type: boolean status: SUPPORTED - entry_schema: - type: string - pd_server_template_VMInt_OAM_lb_fq_name: + pd_server_show: type: string status: SUPPORTED - pd_server_show: + pd_server_template_VMInt_OAM_lb_4_name: type: string status: SUPPORTED + pd_server_pd01_port_0_allowed_address_pairs: + type: list + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair pd_server_console_urls: type: string status: SUPPORTED - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - status: SUPPORTED - pd_server_pd01_port_security_groups: + pd_server_pd01_port_0_security_groups: type: list status: SUPPORTED entry_schema: type: string - pd_server_pd01_port_port_security_enabled: - type: boolean - status: SUPPORTED - pd_server_pd01_port_status: + pd_server_pd01_port_0_tenant_id: type: string status: SUPPORTED - pd_server_template_VMInt_OAM_lb_port_tuple_refs: + pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_mac_addresses: type: list status: SUPPORTED entry_schema: type: string - pd_server_pd01_port_fixed_ips: - type: list + pd_server_template_VMInt_OAM_lb_4_fq_name: + type: string status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - pd_server_accessIPv6: + pd_server_pd01_port_0_name: type: string status: SUPPORTED - pd_server_pd01_port_admin_state_up: - type: boolean + pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_properties: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties status: SUPPORTED - pd_server_instance_name: - type: string + pd_server_pd01_port_0_subnets: + type: list status: SUPPORTED - pd_server_template_VMInt_OAM_lb_name: + entry_schema: + type: string + pd_server_pd01_port_0_show: type: string status: SUPPORTED - pd_server_accessIPv4: + pd_server_pd01_port_0_status: type: string status: SUPPORTED - pd_server_pd01_port_device_owner: + pd_server_pd01_port_0_qos_policy: type: string status: SUPPORTED - pd_server_pd01_port_show: + pd_server_accessIPv6: type: string status: SUPPORTED - pd_server_pd01_port_network: + pd_server_instance_name: type: string status: SUPPORTED - pd_server_pd01_port_qos_policy: + pd_server_accessIPv4: type: string status: SUPPORTED - pd_server_pd01_port_mac_address: - type: string + pd_server_pd01_port_0_admin_state_up: + type: boolean status: SUPPORTED + pd_server_template_VMInt_OAM_lb_4_virtual_network_refs: + type: list + status: SUPPORTED + entry_schema: + type: string pd_server_addresses: type: map status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo - pd_server_pd01_port_tenant_id: + pd_server_pd01_port_0_device_id: type: string status: SUPPORTED - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_properties: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties - status: SUPPORTED - pd_server_pd01_port_device_id: + pd_server_pd01_port_0_network: type: string status: SUPPORTED - pd_server_pd01_port_name: + pd_server_pd01_port_0_mac_address: type: string status: SUPPORTED - pd_server_template_VMInt_OAM_lb_show: + pd_server_pd01_port_0_device_owner: type: string status: SUPPORTED - pd_server_pd01_port_subnets: + pd_server_pd01_port_0_fixed_ips: + type: list + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + pd_server_template_VMInt_OAM_lb_4_port_tuple_refs: type: list status: SUPPORTED entry_schema: type: string + pd_server_template_VMInt_OAM_lb_4_show: + type: string + status: SUPPORTED + pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + status: SUPPORTED requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -449,33 +449,41 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_template_VMInt_OAM_lb: + - dependency_pd_server_template_VMInt_OAM_lb_4: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_template_VMInt_OAM_lb: + - link_pd_server_template_VMInt_OAM_lb_4: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd01_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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -487,31 +495,31 @@ node_types: occurrences: - 1 - UNBOUNDED - memory.usage_pd_server: + network.outpoing.packets_pd_server_template_VMInt_OAM_lb_4: 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: + 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 - disk.device.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 - network.outgoing.packets.rate_pd_server_pd01_port: + 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 - network.outgoing.packets.rate_pd_server_template_VMInt_OAM_lb: + network.incoming.packets_pd_server_template_VMInt_OAM_lb_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -528,7 +536,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + network.outgoing.bytes.rate_pd_server_template_VMInt_OAM_lb_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -540,12 +548,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_template_VMInt_OAM_lb: - 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_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. @@ -570,7 +572,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + network.incoming.packets_pd_server_pd01_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: @@ -582,70 +584,80 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_template_VMInt_OAM_lb: + 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 - memory.resident_pd_server: + 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: - 1 - UNBOUNDED - cpu.delta_pd_server: + network.incoming.packets.rate_pd_server_pd01_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.rate_pd_server_pd01_port: + network.incoming.bytes.rate_pd_server_pd01_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 - vcpus_pd_server: + network.outgoing.packets.rate_pd_server_pd01_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.bytes.rate_pd_server: + 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. occurrences: - 1 - UNBOUNDED - disk.device.write.requests_pd_server: + disk.device.write.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 - endpoint_pd_server: - type: tosca.capabilities.Endpoint.Admin + forwarder_pd_server_template_VMInt_OAM_lb_4: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: + attachment_pd_server_pd01_port_0: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_template_VMInt_OAM_lb: + 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 + endpoint_pd_server: + type: tosca.capabilities.Endpoint.Admin + 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 + forwarder_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - 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. @@ -669,62 +681,60 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server: - type: tosca.capabilities.Node + network.incoming.bytes_pd_server_template_VMInt_OAM_lb_4: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.usage_pd_server: + network.outgoing.bytes.rate_pd_server_pd01_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 - binding_pd_server_pd01_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 + feature_pd_server: + type: tosca.capabilities.Node occurrences: - - 0 + - 1 - UNBOUNDED - disk.write.bytes_pd_server: + disk.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 - network.incoming.bytes.rate_pd_server_pd01_port: + 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.incoming.packets_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_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.requests.rate_pd_server: + network.incoming.bytes_pd_server_pd01_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.root.size_pd_server: + 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 - disk.device.read.bytes_pd_server: + 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 - network.incoming.bytes_pd_server_template_VMInt_OAM_lb: + 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: @@ -736,24 +746,19 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_template_VMInt_OAM_lb: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - disk.device.read.requests_pd_server: + network.outpoing.packets_pd_server_pd01_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_template_VMInt_OAM_lb: + network.incoming.bytes.rate_pd_server_template_VMInt_OAM_lb_4: 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_template_VMInt_OAM_lb: + 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: @@ -772,27 +777,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_template_VMInt_OAM_lb_4: 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_template_VMInt_OAM_lb: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - binding_pd_server_template_VMInt_OAM_lb: - 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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -808,20 +800,21 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_pd_server: + network.outgoing.packets.rate_pd_server_template_VMInt_OAM_lb_4: 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_template_VMInt_OAM_lb: + 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 - feature_pd_server_pd01_port: - type: tosca.capabilities.Node + network.outgoing.bytes_pd_server_template_VMInt_OAM_lb_4: + 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 @@ -843,12 +836,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port: - 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_template_VMInt_OAM_lb_4: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED + binding_pd_server_template_VMInt_OAM_lb_4: + 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.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. diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml index 4712348457..efc5e3cf12 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml @@ -264,20 +264,20 @@ topology_template: availability_zone: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses + - pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_mac_addresses - mac_address image: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_port_tuple_refs + - pd_server_template_VMInt_OAM_lb_4_port_tuple_refs metadata: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses + - pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_mac_addresses volume_type: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs + - pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_allowed_address_pairs - allowed_address_pair - 0 - ip @@ -285,7 +285,7 @@ topology_template: volume_id: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs + - pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_allowed_address_pairs - allowed_address_pair - 0 - ip @@ -293,30 +293,30 @@ topology_template: snapshot_id: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs + - pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_allowed_address_pairs - allowed_address_pair - 0 - address_mode description: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_virtual_network_refs + - pd_server_template_VMInt_OAM_lb_4_virtual_network_refs device_type: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_properties + - pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_properties - virtual_machine_interface_properties_service_interface_type disk_bus: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs + - pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_allowed_address_pairs - allowed_address_pair - 0 - ip source_volid: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs + - pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_allowed_address_pairs - allowed_address_pair - 0 - mac @@ -324,79 +324,79 @@ topology_template: name: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_name + - pd_server_template_VMInt_OAM_lb_4_name swap_size: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_show + - pd_server_template_VMInt_OAM_lb_4_show delete_on_termination: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_fq_name + - pd_server_template_VMInt_OAM_lb_4_fq_name multiattach: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_properties + - pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_properties cmaui_volume_test_neutron_port_properties: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: image: get_attribute: - abstract_pd_server - - pd_server_pd01_port_admin_state_up + - pd_server_pd01_port_0_admin_state_up metadata: get_attribute: - abstract_pd_server - - pd_server_pd01_port_allowed_address_pairs + - pd_server_pd01_port_0_allowed_address_pairs volume_type: get_attribute: - abstract_pd_server - - pd_server_pd01_port_security_groups + - pd_server_pd01_port_0_security_groups volume_id: get_attribute: - abstract_pd_server - - pd_server_pd01_port_qos_policy + - pd_server_pd01_port_0_qos_policy snapshot_id: get_attribute: - abstract_pd_server - - pd_server_pd01_port_name + - pd_server_pd01_port_0_name device_type: get_attribute: - abstract_pd_server - - pd_server_pd01_port_show + - pd_server_pd01_port_0_show disk_bus: get_attribute: - abstract_pd_server - - pd_server_pd01_port_subnets + - pd_server_pd01_port_0_subnets backup_id: get_attribute: - abstract_pd_server - - pd_server_pd01_port_network + - pd_server_pd01_port_0_network source_volid: get_attribute: - abstract_pd_server - - pd_server_pd01_port_port_security_enabled + - pd_server_pd01_port_0_port_security_enabled size: '(get_attribute : [pd01_port_0, network]) * 1024' read_only: get_attribute: - abstract_pd_server - - pd_server_pd01_port_device_owner + - pd_server_pd01_port_0_device_owner name: get_attribute: - abstract_pd_server - - pd_server_pd01_port_device_id + - pd_server_pd01_port_0_device_id scheduler_hints: get_attribute: - abstract_pd_server - - pd_server_pd01_port_fixed_ips + - pd_server_pd01_port_0_fixed_ips swap_size: get_attribute: - abstract_pd_server - - pd_server_pd01_port_tenant_id + - pd_server_pd01_port_0_tenant_id delete_on_termination: get_attribute: - abstract_pd_server - - pd_server_pd01_port_status + - pd_server_pd01_port_0_status jsa_net4: type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork properties: @@ -409,98 +409,98 @@ topology_template: properties: compute_pd_server_key_name: - SERVER_PD_KEY_NAME - port_pd01_port_replacement_policy: - - AUTO + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: true + port_pd01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false compute_pd_server_personality: - value: SERVER_PD_PERSONALITY + port_pd01_port_0_replacement_policy: + - AUTO compute_pd_server_image_update_policy: - REBUILD_PRESERVE_EPHEMERAL + port_pd01_port_0_name: + - PORT_PD_NAME vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_security_groups: - - - DB_Affinity_group - port_pd01_port_mac_requirements: - mac_count_required: - is_required: true + port_pd01_port_0_binding:vnic_type: + - direct-physical vm_image_name: get_input: pd_image_name - port_pd01_port_device_id: - - PORT_PD_DEVICE_ID - port_pd01_port_admin_state_up: + port_pd01_port_0_port_security_enabled: + - false + port_pd01_port_0_value_specs: + - value: PORT_PD_VALUE_SPECS + port_pd01_port_0_admin_state_up: - true + port_template_VMInt_OAM_lb_4_virtual_network_refs: + - - get_attribute: + - jsa_net4 + - fq_name compute_pd_server_metadata: - value: SERVER_PD_METADATA compute_pd_server_diskConfig: - AUTO - port_pd01_port_mac_address: 00-13-24-01-44-35 - port_pd01_port_allowed_address_pairs: - - mac_address: 00-14-22-01-23-45 - ip_address: 10.12.13.134 - - mac_address: 00-13-24-01-44-35 - ip_address: 127.0.13.134 + port_pd01_port_0_mac_address: 00-13-24-01-44-35 compute_pd_server_admin_pass: - SERVER_PD_ADMIN_PASS compute_pd_server_flavor_update_policy: - REPLACE - port_pd01_port_value_specs: - - value: PORT_PD_VALUE_SPECS + port_template_VMInt_OAM_lb_4_security_group_refs: + - - get_input: oam_sec_group_name + port_template_VMInt_OAM_lb_4_virtual_machine_interface_mac_addresses: + - - get_input: mac_address + port_pd01_port_0_fixed_ips: + - ip_address: + get_input: pd_port_fixed_ips_address + - subnet: + get_input: pd_port_fixed_ips_subnet compute_pd_server_security_groups: - - get_input: pd_security_group_name - port_template_VMInt_OAM_lb_port_tuple_refs: - - - get_input: template_PortTuple_LB1 compute_pd_server_software_config_transport: - POLL_SERVER_HEAT + port_pd01_port_0_security_groups: + - - DB_Affinity_group compute_pd_server_scheduler_hints: - group: DB_Affinity_group - port_pd01_port_name: - - PORT_PD_NAME compute_pd_server_contrail_service_instance_ind: - true + port_pd01_port_0_network: + - PORT_PD_NETWORK_ID compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: - get_input: - pd_server_names - 0 - port_pd01_port_binding:vnic_type: - - direct-physical - port_pd01_port_device_owner: - - PORT_PD_DEVICE_OWNER - port_pd01_port_fixed_ips: - - ip_address: - get_input: pd_port_fixed_ips_address - - subnet: - get_input: pd_port_fixed_ips_subnet - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_pd01_port_qos_policy: - - PORT_PD_QOS_POLICY compute_pd_server_config_drive: - true compute_pd_server_user_data_format: - RAW - port_template_VMInt_OAM_lb_virtual_network_refs: - - - get_attribute: - - jsa_net4 - - fq_name - port_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses: - - - get_input: mac_address - port_template_VMInt_OAM_lb_name: + port_pd01_port_0_allowed_address_pairs: + - mac_address: 00-14-22-01-23-45 + ip_address: 10.12.13.134 + - mac_address: 00-13-24-01-44-35 + ip_address: 127.0.13.134 + port_pd01_port_0_device_id: + - PORT_PD_DEVICE_ID + port_pd01_port_0_qos_policy: + - PORT_PD_QOS_POLICY + port_template_VMInt_OAM_lb_4_name: - template_VMInt_OAM_lb_NAME - port_pd01_port_port_security_enabled: - - false compute_pd_server_user_data_update_policy: - IGNORE - port_pd01_port_network: - - PORT_PD_NETWORK_ID + port_pd01_port_0_device_owner: + - PORT_PD_DEVICE_OWNER compute_pd_server_reservation_id: - SERVER_PD_RESERVATION_ID - port_template_VMInt_OAM_lb_security_group_refs: - - - get_input: oam_sec_group_name + port_template_VMInt_OAM_lb_4_port_tuple_refs: + - - get_input: template_PortTuple_LB1 service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -558,4 +558,4 @@ topology_template: properties: container_type: host targets: - - DB_Affinity_group + - DB_Affinity_group
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/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/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml index d3a355c174..20ce70c20b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/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/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml @@ -11,90 +11,98 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_template_VMInt_OAM_lb_4_network_role: + type: string + required: true compute_pd_server_key_name: type: list required: true entry_schema: type: string - port_pd01_port_replacement_policy: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_0_ip_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_personality: type: list required: true entry_schema: type: json + port_pd01_port_0_replacement_policy: + type: list + required: true + entry_schema: + type: string compute_pd_server_image_update_policy: type: list required: true entry_schema: type: string + port_pd01_port_0_name: + type: list + required: true + entry_schema: + type: string vm_flavor_name: type: string required: true - port_pd01_port_security_groups: + port_pd01_port_0_binding:vnic_type: type: list required: true entry_schema: - type: json - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: string + port_pd01_port_0_order: + type: integer + required: true + port_template_VMInt_OAM_lb_4_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true vm_image_name: type: string required: true - port_template_VMInt_OAM_lb_virtual_machine_interface_properties: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties - required: true - port_template_VMInt_OAM_lb_related_networks: + port_pd01_port_0_port_security_enabled: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_device_id: + type: boolean + port_pd01_port_0_value_specs: type: list required: true entry_schema: - type: string - port_pd01_port_admin_state_up: + type: json + port_pd01_port_0_admin_state_up: type: list required: true entry_schema: type: boolean - port_pd01_port_vlan_requirements: + port_pd01_port_0_subnetpoolid: + type: string + required: true + port_template_VMInt_OAM_lb_4_virtual_network_refs: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: json compute_pd_server_metadata: type: list required: true entry_schema: type: json - port_template_VMInt_OAM_lb_subnetpoolid: - type: string - required: true compute_pd_server_diskConfig: type: list required: true entry_schema: type: string - port_pd01_port_mac_address: + port_pd01_port_0_mac_address: type: string required: true - port_template_VMInt_OAM_lb_network_role: + port_pd01_port_0_network_role_tag: type: string required: true - port_pd01_port_allowed_address_pairs: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true compute_pd_server_admin_pass: type: list required: true @@ -105,33 +113,33 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_related_networks: + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_template_VMInt_OAM_lb_4_security_group_refs: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_template_VMInt_OAM_lb_ip_requirements: + type: json + port_template_VMInt_OAM_lb_4_virtual_machine_interface_mac_addresses: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_template_VMInt_OAM_lb_exCP_naming: + type: json + port_template_VMInt_OAM_lb_4_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true - port_pd01_port_value_specs: + port_template_VMInt_OAM_lb_4_related_networks: type: list required: true entry_schema: - type: json - compute_pd_server_security_groups: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd01_port_0_fixed_ips: type: list required: true entry_schema: - type: json - port_template_VMInt_OAM_lb_port_tuple_refs: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + compute_pd_server_security_groups: type: list required: true entry_schema: @@ -141,62 +149,58 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_network_role_tag: - type: string - required: true - compute_pd_server_scheduler_hints: + port_pd01_port_0_security_groups: type: list required: true entry_schema: type: json - port_pd01_port_name: + compute_pd_server_scheduler_hints: type: list required: true entry_schema: - type: string + type: json compute_pd_server_contrail_service_instance_ind: type: list required: true entry_schema: type: boolean - compute_pd_server_availability_zone: + port_template_VMInt_OAM_lb_4_vlan_requirements: type: list required: true entry_schema: - type: string - compute_pd_server_name: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_network: type: list required: true entry_schema: type: string - port_template_VMInt_OAM_lb_network_role_tag: + port_pd01_port_0_network_role: type: string required: true - port_pd01_port_binding:vnic_type: + compute_pd_server_availability_zone: type: list required: true entry_schema: type: string - port_pd01_port_device_owner: + compute_pd_server_name: type: list required: true entry_schema: type: string - port_pd01_port_fixed_ips: - type: list + port_template_VMInt_OAM_lb_4_virtual_machine_interface_properties: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd01_port_ip_requirements: + port_template_VMInt_OAM_lb_4_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_qos_policy: - type: list + port_template_VMInt_OAM_lb_4_subnetpoolid: + type: string + required: true + port_template_VMInt_OAM_lb_4_network_role_tag: + type: string required: true - entry_schema: - type: string compute_pd_server_config_drive: type: list required: true @@ -207,73 +211,69 @@ topology_template: required: true entry_schema: type: string - port_template_VMInt_OAM_lb_virtual_network_refs: + port_pd01_port_0_allowed_address_pairs: type: list required: true entry_schema: - type: json - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - port_template_VMInt_OAM_lb_order: - type: integer - required: true - port_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses: + type: org.openecomp.datatypes.heat.network.AddressPair + port_pd01_port_0_device_id: type: list required: true entry_schema: - type: json - port_template_VMInt_OAM_lb_name: + type: string + port_pd01_port_0_qos_policy: type: list required: true entry_schema: type: string - port_pd01_port_port_security_enabled: + port_pd01_port_0_related_networks: type: list required: true entry_schema: - type: boolean - port_template_VMInt_OAM_lb_vlan_requirements: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_template_VMInt_OAM_lb_4_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string + port_template_VMInt_OAM_lb_4_order: + type: integer + required: true compute_pd_server_user_data_update_policy: type: list required: true entry_schema: type: string - port_pd01_port_network: + port_pd01_port_0_device_owner: type: list required: true entry_schema: type: string + port_template_VMInt_OAM_lb_4_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true compute_pd_server_reservation_id: type: list required: true entry_schema: type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: - type: string - required: true - port_template_VMInt_OAM_lb_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_network_role: - type: string - required: true - port_template_VMInt_OAM_lb_security_group_refs: + port_template_VMInt_OAM_lb_4_port_tuple_refs: type: list required: true entry_schema: type: json + port_pd01_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -350,134 +350,134 @@ topology_template: get_input: - compute_pd_server_flavor_update_policy - index_value - pd_server_template_VMInt_OAM_lb: + pd_server_template_VMInt_OAM_lb_4: type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface properties: mac_requirements: - get_input: port_template_VMInt_OAM_lb_mac_requirements + get_input: port_template_VMInt_OAM_lb_4_mac_requirements order: - get_input: port_template_VMInt_OAM_lb_order + get_input: port_template_VMInt_OAM_lb_4_order exCP_naming: - get_input: port_template_VMInt_OAM_lb_exCP_naming + get_input: port_template_VMInt_OAM_lb_4_exCP_naming virtual_machine_interface_allowed_address_pairs: get_input: - - port_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs + - port_template_VMInt_OAM_lb_4_virtual_machine_interface_allowed_address_pairs - index_value vlan_requirements: - get_input: port_template_VMInt_OAM_lb_vlan_requirements + get_input: port_template_VMInt_OAM_lb_4_vlan_requirements virtual_machine_interface_properties: get_input: - - port_template_VMInt_OAM_lb_virtual_machine_interface_properties + - port_template_VMInt_OAM_lb_4_virtual_machine_interface_properties - index_value subinterface_indicator: false related_networks: - get_input: port_template_VMInt_OAM_lb_related_networks + get_input: port_template_VMInt_OAM_lb_4_related_networks security_group_refs: get_input: - - port_template_VMInt_OAM_lb_security_group_refs + - port_template_VMInt_OAM_lb_4_security_group_refs - index_value virtual_network_refs: get_input: - - port_template_VMInt_OAM_lb_virtual_network_refs + - port_template_VMInt_OAM_lb_4_virtual_network_refs - index_value ip_requirements: - get_input: port_template_VMInt_OAM_lb_ip_requirements + get_input: port_template_VMInt_OAM_lb_4_ip_requirements network_role_tag: - get_input: port_template_VMInt_OAM_lb_network_role_tag + get_input: port_template_VMInt_OAM_lb_4_network_role_tag virtual_machine_interface_mac_addresses: get_input: - - port_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses + - port_template_VMInt_OAM_lb_4_virtual_machine_interface_mac_addresses - index_value port_tuple_refs: get_input: - - port_template_VMInt_OAM_lb_port_tuple_refs + - port_template_VMInt_OAM_lb_4_port_tuple_refs - index_value network_role: - get_input: port_template_VMInt_OAM_lb_network_role + get_input: port_template_VMInt_OAM_lb_4_network_role subnetpoolid: - get_input: port_template_VMInt_OAM_lb_subnetpoolid + get_input: port_template_VMInt_OAM_lb_4_subnetpoolid name: get_input: - - port_template_VMInt_OAM_lb_name + - port_template_VMInt_OAM_lb_4_name - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo - pd_server_pd01_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: allowed_address_pairs: - get_input: port_pd01_port_allowed_address_pairs + get_input: port_pd01_port_0_allowed_address_pairs binding:vnic_type: get_input: - - port_pd01_port_binding:vnic_type + - port_pd01_port_0_binding:vnic_type - index_value value_specs: get_input: - - port_pd01_port_value_specs + - port_pd01_port_0_value_specs - index_value network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag fixed_ips: get_input: - - port_pd01_port_fixed_ips + - port_pd01_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid name: get_input: - - port_pd01_port_name + - port_pd01_port_0_name - index_value network: get_input: - - port_pd01_port_network + - port_pd01_port_0_network - index_value replacement_policy: get_input: - - port_pd01_port_replacement_policy + - port_pd01_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_0_order device_owner: get_input: - - port_pd01_port_device_owner + - port_pd01_port_0_device_owner - index_value mac_address: - get_input: port_pd01_port_mac_address + get_input: port_pd01_port_0_mac_address security_groups: get_input: - - port_pd01_port_security_groups + - port_pd01_port_0_security_groups - index_value exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements qos_policy: get_input: - - port_pd01_port_qos_policy + - port_pd01_port_0_qos_policy - index_value subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_0_related_networks port_security_enabled: get_input: - - port_pd01_port_port_security_enabled + - port_pd01_port_0_port_security_enabled - index_value admin_state_up: get_input: - - port_pd01_port_admin_state_up + - port_pd01_port_0_admin_state_up - index_value network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_0_network_role device_id: get_input: - - port_pd01_port_device_id + - port_pd01_port_0_device_id - index_value requirements: - binding: @@ -485,150 +485,136 @@ topology_template: node: pd_server relationship: tosca.relationships.network.BindsTo outputs: - pd_server_pd01_port_allowed_address_pairs: + pd_server_pd01_port_0_port_security_enabled: + type: boolean + value: + get_attribute: + - pd_server_pd01_port_0 + - port_security_enabled + pd_server_show: + type: string + value: + get_attribute: + - pd_server + - show + pd_server_template_VMInt_OAM_lb_4_name: + type: string + value: + get_attribute: + - pd_server_template_VMInt_OAM_lb_4 + - name + pd_server_pd01_port_0_allowed_address_pairs: type: list value: get_attribute: - - pd_server_pd01_port + - pd_server_pd01_port_0 - allowed_address_pairs entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses: + pd_server_console_urls: + type: string + value: + get_attribute: + - pd_server + - console_urls + pd_server_pd01_port_0_security_groups: type: list value: get_attribute: - - pd_server_template_VMInt_OAM_lb - - virtual_machine_interface_mac_addresses + - pd_server_pd01_port_0 + - security_groups entry_schema: type: string - pd_server_template_VMInt_OAM_lb_virtual_network_refs: + pd_server_pd01_port_0_tenant_id: + type: string + value: + get_attribute: + - pd_server_pd01_port_0 + - tenant_id + pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_mac_addresses: type: list value: get_attribute: - - pd_server_template_VMInt_OAM_lb - - virtual_network_refs + - pd_server_template_VMInt_OAM_lb_4 + - virtual_machine_interface_mac_addresses entry_schema: type: string - pd_server_template_VMInt_OAM_lb_fq_name: + pd_server_template_VMInt_OAM_lb_4_fq_name: type: string value: get_attribute: - - pd_server_template_VMInt_OAM_lb + - pd_server_template_VMInt_OAM_lb_4 - fq_name - pd_server_show: - type: string - value: - get_attribute: - - pd_server - - show - pd_server_console_urls: + pd_server_pd01_port_0_name: type: string value: get_attribute: - - pd_server - - console_urls - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + - pd_server_pd01_port_0 + - name + pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_properties: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties value: get_attribute: - - pd_server_template_VMInt_OAM_lb - - virtual_machine_interface_allowed_address_pairs - pd_server_pd01_port_security_groups: + - pd_server_template_VMInt_OAM_lb_4 + - virtual_machine_interface_properties + pd_server_pd01_port_0_subnets: type: list value: get_attribute: - - pd_server_pd01_port - - security_groups + - pd_server_pd01_port_0 + - subnets entry_schema: type: string - pd_server_pd01_port_port_security_enabled: - type: boolean + pd_server_pd01_port_0_show: + type: string value: get_attribute: - - pd_server_pd01_port - - port_security_enabled - pd_server_pd01_port_status: + - pd_server_pd01_port_0 + - show + pd_server_pd01_port_0_status: type: string value: get_attribute: - - pd_server_pd01_port + - pd_server_pd01_port_0 - status - pd_server_template_VMInt_OAM_lb_port_tuple_refs: - type: list - value: - get_attribute: - - pd_server_template_VMInt_OAM_lb - - port_tuple_refs - entry_schema: - type: string - pd_server_pd01_port_fixed_ips: - type: list + pd_server_pd01_port_0_qos_policy: + type: string value: get_attribute: - - pd_server_pd01_port - - fixed_ips - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + - pd_server_pd01_port_0 + - qos_policy pd_server_accessIPv6: type: string value: get_attribute: - pd_server - accessIPv6 - pd_server_pd01_port_admin_state_up: - type: boolean - value: - get_attribute: - - pd_server_pd01_port - - admin_state_up pd_server_instance_name: type: string value: get_attribute: - pd_server - instance_name - pd_server_template_VMInt_OAM_lb_name: - type: string - value: - get_attribute: - - pd_server_template_VMInt_OAM_lb - - name pd_server_accessIPv4: type: string value: get_attribute: - pd_server - accessIPv4 - pd_server_pd01_port_device_owner: - type: string - value: - get_attribute: - - pd_server_pd01_port - - device_owner - pd_server_pd01_port_show: - type: string - value: - get_attribute: - - pd_server_pd01_port - - show - pd_server_pd01_port_network: - type: string - value: - get_attribute: - - pd_server_pd01_port - - network - pd_server_pd01_port_qos_policy: - type: string + pd_server_pd01_port_0_admin_state_up: + type: boolean value: get_attribute: - - pd_server_pd01_port - - qos_policy - pd_server_pd01_port_mac_address: - type: string + - pd_server_pd01_port_0 + - admin_state_up + pd_server_template_VMInt_OAM_lb_4_virtual_network_refs: + type: list value: get_attribute: - - pd_server_pd01_port - - mac_address + - pd_server_template_VMInt_OAM_lb_4 + - virtual_network_refs + entry_schema: + type: string pd_server_addresses: type: map value: @@ -637,53 +623,73 @@ topology_template: - addresses entry_schema: type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo - pd_server_pd01_port_tenant_id: + pd_server_pd01_port_0_device_id: type: string value: get_attribute: - - pd_server_pd01_port - - tenant_id - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_properties: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties + - pd_server_pd01_port_0 + - device_id + pd_server_pd01_port_0_network: + type: string value: get_attribute: - - pd_server_template_VMInt_OAM_lb - - virtual_machine_interface_properties - pd_server_pd01_port_device_id: + - pd_server_pd01_port_0 + - network + pd_server_pd01_port_0_mac_address: type: string value: get_attribute: - - pd_server_pd01_port - - device_id - pd_server_pd01_port_name: + - pd_server_pd01_port_0 + - mac_address + pd_server_pd01_port_0_device_owner: type: string value: get_attribute: - - pd_server_pd01_port - - name - pd_server_template_VMInt_OAM_lb_show: - type: string + - pd_server_pd01_port_0 + - device_owner + pd_server_pd01_port_0_fixed_ips: + type: list value: get_attribute: - - pd_server_template_VMInt_OAM_lb - - show - pd_server_pd01_port_subnets: + - pd_server_pd01_port_0 + - fixed_ips + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + pd_server_template_VMInt_OAM_lb_4_port_tuple_refs: type: list value: get_attribute: - - pd_server_pd01_port - - subnets + - pd_server_template_VMInt_OAM_lb_4 + - port_tuple_refs entry_schema: type: string + pd_server_template_VMInt_OAM_lb_4_show: + type: string + value: + get_attribute: + - pd_server_template_VMInt_OAM_lb_4 + - show + pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + value: + get_attribute: + - pd_server_template_VMInt_OAM_lb_4 + - virtual_machine_interface_allowed_address_pairs substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + network.outpoing.packets_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - network.outpoing.packets memory.usage_pd_server: - pd_server - memory.usage @@ -693,27 +699,21 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate - network.outgoing.packets.rate_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - network.outgoing.packets.rate + network.incoming.packets_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - network.incoming.packets os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes + network.outgoing.bytes.rate_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - network.outgoing.bytes.rate cpu_pd_server: - pd_server - cpu - network.outpoing.packets_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - network.outpoing.packets cpu_util_pd_server: - pd_server - cpu_util @@ -726,45 +726,51 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops - network.incoming.packets.rate_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - network.incoming.packets.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + forwarder_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - forwarder + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment - network.outgoing.bytes_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - network.outgoing.bytes disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -777,24 +783,27 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.bytes_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - network.incoming.bytes + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -804,57 +813,45 @@ topology_template: disk.device.read.bytes_pd_server: - pd_server - disk.device.read.bytes - network.incoming.bytes_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - network.incoming.bytes disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes - feature_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - feature + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets + network.incoming.bytes.rate_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - network.incoming.bytes.rate disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests - network.incoming.bytes.rate_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - network.incoming.bytes.rate - network.incoming.packets_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - network.incoming.packets instance_pd_server: - pd_server - instance host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - forwarder - binding_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - binding - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + network.incoming.packets.rate_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - network.incoming.packets.rate + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature 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_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - network.outgoing.packets.rate disk.write.requests_pd_server: - pd_server - disk.write.requests - network.outgoing.bytes.rate_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - network.outgoing.bytes.rate - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature + network.outgoing.bytes_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - network.outgoing.bytes disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -864,9 +861,12 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate + feature_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - feature + binding_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - binding disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -874,18 +874,18 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - dependency_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - dependency - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - dependency - link_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - link
\ No newline at end of file + link_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - link + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link + dependency_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index bef66244d3..14892d8ec9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,26 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role: + type: string + required: true + status: SUPPORTED compute_pd_server_availability_zone: type: list required: true @@ -24,41 +44,45 @@ node_types: type: string required: true status: SUPPORTED - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: string + port_pd01_port_0_order: + type: integer required: true status: SUPPORTED vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: - type: list + port_pd02_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + port_pd01_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: + type: string + port_pd02_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED @@ -72,77 +96,53 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_exCP_naming: + port_pd02_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd02_port_order: - type: integer + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd02_port_subnetpoolid: + port_pd02_port_0_network_role: type: string required: true status: SUPPORTED - port_pd02_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_network: - type: list + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: + port_pd02_port_0_order: type: integer required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_0_related_networks: + type: list required: true status: SUPPORTED - port_pd01_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd02_port_ip_requirements: + port_pd02_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd02_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements attributes: pd_server_accessIPv4: type: string status: SUPPORTED - pd_server_pd01_port_device_owner: + pd_server_pd01_port_0_device_owner: type: string status: SUPPORTED requirements: @@ -160,33 +160,49 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd02_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd02_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_pd02_port: + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd02_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd02_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 + binding_pd_server_pd01_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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -216,12 +232,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -233,7 +243,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + network.outgoing.packets.rate_pd_server_pd02_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: @@ -269,21 +279,13 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd02_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 - network.outgoing.bytes_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd02_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.packets.rate_pd_server_pd02_port: + network.incoming.packets_pd_server_pd01_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: @@ -307,30 +309,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: - 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_pd02_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd02_port: + network.incoming.packets.rate_pd_server_pd01_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 - feature_pd_server_pd02_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd02_port: + network.incoming.bytes.rate_pd_server_pd01_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_pd02_port: + network.outgoing.packets.rate_pd_server_pd01_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: @@ -348,6 +344,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + 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. @@ -359,35 +360,24 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - forwarder_pd_server_pd02_port: - 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 - 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. + forwarder_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder 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_pd_server_pd02_port: + 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: @@ -404,6 +394,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_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 feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -415,33 +411,37 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd02_port: + network.outgoing.bytes.rate_pd_server_pd02_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 - binding_pd_server_pd01_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 + 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: - - 0 + - 1 - UNBOUNDED - disk.write.bytes_pd_server: + network.outgoing.bytes_pd_server_pd02_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_pd01_port: + network.outgoing.bytes_pd_server_pd01_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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd02_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_pd01_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: @@ -471,6 +471,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_server_pd02_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_pd01_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.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. @@ -490,19 +502,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd02_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 - attachment_pd_server_pd02_port: - type: tosca.capabilities.Attachment + network.incoming.bytes.rate_pd_server_pd02_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_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -518,24 +531,18 @@ node_types: occurrences: - 1 - UNBOUNDED - 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 - feature_pd_server_pd01_port: - type: tosca.capabilities.Node + attachment_pd_server_pd02_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.latency_pd_server: + 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 - network.incoming.packets.rate_pd_server_pd02_port: + 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: @@ -553,21 +560,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.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 - network.incoming.bytes_pd_server_pd02_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_pd_server_pd02_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml index cb35f4e324..b1d498c69f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml @@ -832,6 +832,17 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - get_input: oam_net_name + port_pd01_port_0_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: @@ -840,34 +851,23 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_network_role_tag: oam - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false + port_pd02_port_0_network: + - get_input: oam_net_name vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + port_pd02_port_0_network_role_tag: oam compute_pd_server_user_data_format: - RAW - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false - port_pd01_port_network: - - get_input: oam_net_name - port_pd02_port_ip_requirements: + port_pd02_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network_role_tag: oam - port_pd02_port_network: - - get_input: oam_net_name + port_pd01_port_0_network_role_tag: oam + port_pd02_port_0_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -882,7 +882,7 @@ topology_template: entries: get_attribute: - abstract_pd_server - - pd_server_pd01_port_device_owner + - pd_server_pd01_port_0_device_owner network_policy_server: type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules properties: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/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/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml index c987c415ce..192479bbe2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/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/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,22 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role: + type: string + required: true compute_pd_server_availability_zone: type: list required: true @@ -24,34 +40,37 @@ topology_template: vm_flavor_name: type: string required: true - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_network: + type: list required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: string + port_pd01_port_0_order: + type: integer required: true vm_image_name: type: string required: true - port_pd01_port_ip_requirements: - type: list + port_pd02_port_0_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + port_pd01_port_0_subnetpoolid: type: string required: true - port_pd01_port_vlan_requirements: + compute_pd_server_user_data_format: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: + type: string + port_pd02_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + port_pd01_port_0_related_networks: type: list required: true entry_schema: @@ -63,58 +82,39 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_exCP_naming: + port_pd02_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd02_port_order: - type: integer + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd02_port_subnetpoolid: + port_pd02_port_0_network_role: type: string required: true - port_pd02_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_network: - type: list + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - port_pd01_port_order: + port_pd02_port_0_order: type: integer required: true - port_pd01_port_subnetpoolid: - type: string - required: true - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_0_related_networks: + type: list required: true - port_pd01_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: type: string required: true - port_pd02_port_ip_requirements: + port_pd02_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network_role_tag: - type: string - required: true - port_pd02_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -135,62 +135,62 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd02_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd02_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd02_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd02_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd02_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd02_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd02_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd02_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd02_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd02_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd02_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo - pd_server_pd02_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd02_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd02_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd02_port_related_networks + get_input: port_pd01_port_0_related_networks ip_requirements: - get_input: port_pd02_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: port_pd02_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: port_pd02_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd02_port_order + get_input: port_pd01_port_0_order network_role: - get_input: port_pd02_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd02_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_input: - - port_pd02_port_network + - port_pd01_port_0_network - index_value requirements: - binding: @@ -204,15 +204,21 @@ topology_template: get_attribute: - pd_server - accessIPv4 - pd_server_pd01_port_device_owner: + pd_server_pd01_port_0_device_owner: type: string value: get_attribute: - - pd_server_pd01_port + - pd_server_pd01_port_0 - device_owner substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + binding_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - binding + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -228,18 +234,15 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes + network.outgoing.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.packets.rate cpu_pd_server: - pd_server - cpu @@ -255,15 +258,12 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - binding_pd_server_pd02_port: - - pd_server_pd02_port - - binding - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes - network.outgoing.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.packets.rate + network.outpoing.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outpoing.packets + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -273,78 +273,78 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate - network.outgoing.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes - feature_pd_server_pd02_port: - - pd_server_pd02_port + feature_pd_server_pd02_port_0: + - pd_server_pd02_port_0 - feature - network.incoming.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.bytes.rate - network.outgoing.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment - forwarder_pd_server_pd02_port: - - pd_server_pd02_port - - forwarder disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation disk.allocation_pd_server: - pd_server - disk.allocation - network.incoming.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - network.outpoing.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.outpoing.packets - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.outgoing.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -357,6 +357,12 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.incoming.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -366,64 +372,58 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - attachment_pd_server_pd02_port: - - pd_server_pd02_port - - attachment - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + network.incoming.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes.rate + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + attachment_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - attachment disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency - network.incoming.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets.rate disk.latency_pd_server: - pd_server - disk.latency disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops - network.incoming.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes + forwarder_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - forwarder requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd02_port: - - pd_server_pd02_port - - link - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd02_port: - - pd_server_pd02_port - - dependency
\ No newline at end of file + link_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - link + dependency_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - dependency + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 7055e47c27..d4d9603c71 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,26 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role: + type: string + required: true + status: SUPPORTED compute_pd_server_availability_zone: type: list required: true @@ -24,41 +44,45 @@ node_types: type: string required: true status: SUPPORTED - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: string + port_pd01_port_0_order: + type: integer required: true status: SUPPORTED vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: - type: list + port_pd02_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + port_pd01_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: + type: string + port_pd02_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED @@ -72,72 +96,48 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_exCP_naming: + port_pd02_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd02_port_order: - type: integer + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd02_port_subnetpoolid: + port_pd02_port_0_network_role: type: string required: true status: SUPPORTED - port_pd02_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_network: - type: list + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: + port_pd02_port_0_order: type: integer required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_0_related_networks: + type: list required: true status: SUPPORTED - port_pd01_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd02_port_ip_requirements: + port_pd02_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd02_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -153,33 +153,49 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd02_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd02_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_pd02_port: + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd02_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd02_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 + binding_pd_server_pd01_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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -209,12 +225,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -226,7 +236,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + network.outgoing.packets.rate_pd_server_pd02_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: @@ -262,21 +272,13 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd02_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 - network.outgoing.bytes_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd02_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.packets.rate_pd_server_pd02_port: + network.incoming.packets_pd_server_pd01_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: @@ -300,30 +302,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: - 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_pd02_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd02_port: + network.incoming.packets.rate_pd_server_pd01_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 - feature_pd_server_pd02_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd02_port: + network.incoming.bytes.rate_pd_server_pd01_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_pd02_port: + network.outgoing.packets.rate_pd_server_pd01_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: @@ -341,6 +337,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + 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. @@ -352,35 +353,24 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - forwarder_pd_server_pd02_port: - 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 - 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. + forwarder_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder 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_pd_server_pd02_port: + 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: @@ -397,6 +387,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_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 feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -408,33 +404,37 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd02_port: + network.outgoing.bytes.rate_pd_server_pd02_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 - binding_pd_server_pd01_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 + 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: - - 0 + - 1 - UNBOUNDED - disk.write.bytes_pd_server: + network.outgoing.bytes_pd_server_pd02_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_pd01_port: + network.outgoing.bytes_pd_server_pd01_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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd02_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_pd01_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: @@ -464,6 +464,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_server_pd02_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_pd01_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.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. @@ -483,19 +495,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd02_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 - attachment_pd_server_pd02_port: - type: tosca.capabilities.Attachment + network.incoming.bytes.rate_pd_server_pd02_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_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -511,24 +524,18 @@ node_types: occurrences: - 1 - UNBOUNDED - 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 - feature_pd_server_pd01_port: - type: tosca.capabilities.Node + attachment_pd_server_pd02_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.latency_pd_server: + 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 - network.incoming.packets.rate_pd_server_pd02_port: + 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: @@ -546,21 +553,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.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 - network.incoming.bytes_pd_server_pd02_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_pd_server_pd02_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml index acaaee9ca4..207a2308af 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml @@ -832,6 +832,19 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - get_attribute: + - network_policy_server + - name + port_pd01_port_0_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: @@ -842,35 +855,22 @@ topology_template: get_attribute: - network_policy_server - name - port_pd02_port_network_role_tag: oam - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false + port_pd02_port_0_network: + - get_input: oam_net_name vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + port_pd02_port_0_network_role_tag: oam compute_pd_server_user_data_format: - RAW - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false - port_pd01_port_network: - - get_attribute: - - network_policy_server - - name - port_pd02_port_ip_requirements: + port_pd02_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd02_port_network: - - get_input: oam_net_name + port_pd02_port_0_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/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/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml index e894e5c65f..36787625a8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/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/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,22 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role: + type: string + required: true compute_pd_server_availability_zone: type: list required: true @@ -24,34 +40,37 @@ topology_template: vm_flavor_name: type: string required: true - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_network: + type: list required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: string + port_pd01_port_0_order: + type: integer required: true vm_image_name: type: string required: true - port_pd01_port_ip_requirements: - type: list + port_pd02_port_0_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + port_pd01_port_0_subnetpoolid: type: string required: true - port_pd01_port_vlan_requirements: + compute_pd_server_user_data_format: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: + type: string + port_pd02_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + port_pd01_port_0_related_networks: type: list required: true entry_schema: @@ -63,58 +82,39 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_exCP_naming: + port_pd02_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd02_port_order: - type: integer + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd02_port_subnetpoolid: + port_pd02_port_0_network_role: type: string required: true - port_pd02_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_network: - type: list + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - port_pd01_port_order: + port_pd02_port_0_order: type: integer required: true - port_pd01_port_subnetpoolid: - type: string - required: true - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_0_related_networks: + type: list required: true - port_pd01_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: type: string required: true - port_pd02_port_ip_requirements: + port_pd02_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network_role_tag: - type: string - required: true - port_pd02_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -135,62 +135,62 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd02_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd02_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd02_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd02_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd02_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd02_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd02_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd02_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd02_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd02_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd02_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo - pd_server_pd02_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd02_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd02_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd02_port_related_networks + get_input: port_pd01_port_0_related_networks ip_requirements: - get_input: port_pd02_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: port_pd02_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: port_pd02_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd02_port_order + get_input: port_pd01_port_0_order network_role: - get_input: port_pd02_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd02_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_input: - - port_pd02_port_network + - port_pd01_port_0_network - index_value requirements: - binding: @@ -200,6 +200,12 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + binding_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - binding + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -215,18 +221,15 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes + network.outgoing.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.packets.rate cpu_pd_server: - pd_server - cpu @@ -242,15 +245,12 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - binding_pd_server_pd02_port: - - pd_server_pd02_port - - binding - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes - network.outgoing.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.packets.rate + network.outpoing.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outpoing.packets + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -260,78 +260,78 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate - network.outgoing.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes - feature_pd_server_pd02_port: - - pd_server_pd02_port + feature_pd_server_pd02_port_0: + - pd_server_pd02_port_0 - feature - network.incoming.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.bytes.rate - network.outgoing.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment - forwarder_pd_server_pd02_port: - - pd_server_pd02_port - - forwarder disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation disk.allocation_pd_server: - pd_server - disk.allocation - network.incoming.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - network.outpoing.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.outpoing.packets - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.outgoing.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -344,6 +344,12 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.incoming.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -353,64 +359,58 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - attachment_pd_server_pd02_port: - - pd_server_pd02_port - - attachment - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + network.incoming.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes.rate + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + attachment_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - attachment disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency - network.incoming.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets.rate disk.latency_pd_server: - pd_server - disk.latency disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops - network.incoming.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes + forwarder_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - forwarder requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd02_port: - - pd_server_pd02_port - - link - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd02_port: - - pd_server_pd02_port - - dependency
\ No newline at end of file + link_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - link + dependency_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - dependency + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/in/hot-mog-0108-bs1271.yml index 30cdec1506..9b3c49dff6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/in/hot-mog-0108-bs1271.yml @@ -34,15 +34,15 @@ resources: flavor: {get_attr: [network_policy_server, name]} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_0} - - port: {get_resource: pd01_port_1} + - port: {get_resource: pd_server_0_oam_port_0} + - port: {get_resource: pd_server_1_oam_port_0} user_data_format: RAW - pd01_port_0: + pd_server_0_oam_port_0: type: OS::Neutron::Port properties: network: {get_attr: [network_policy_server, name]} - pd01_port_1: + pd_server_1_oam_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index dd9ab9af97..2e4b2ff854 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,24 +8,8 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pd01_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_0_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_0_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_0_network_role: - type: string + port_pd_server_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED compute_pd_server_availability_zone: @@ -44,58 +28,60 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_1_network_role: - type: string + port_pd_server_1_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_0_order: - type: integer + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_1_subnetpoolid: + port_pd_server_0_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - vm_image_name: - type: string + port_pd_server_0_oam_port_0_related_networks: + type: list required: true status: SUPPORTED - port_pd01_port_1_network_role_tag: + 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_pd01_port_0_subnetpoolid: + port_pd_server_1_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_1_network: + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_user_data_format: + port_pd_server_0_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_0_network_role_tag: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_0_related_networks: - type: list + port_pd_server_1_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_1_ip_requirements: - type: list + port_pd_server_0_oam_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -104,40 +90,54 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd01_port_1_order: - type: integer + port_pd_server_1_oam_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_pd01_port_1_related_networks: + port_pd_server_1_oam_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_1_oam_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_pd01_port_1_vlan_requirements: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1_oam_port_0_network_role: + type: string required: true status: SUPPORTED - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_1_oam_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_0_vlan_requirements: + entry_schema: + type: string + port_pd_server_0_oam_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string + port_pd_server_1_oam_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + 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 requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -153,41 +153,33 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_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_pd01_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_pd01_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_pd01_port_0: + - link_pd_server_pd_server_0_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - binding_pd_server_pd01_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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -199,133 +191,114 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 - memory.usage_pd_server: + 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_pd_server: + 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 - disk.device.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 - os_pd_server: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - disk.write.bytes.rate_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 - 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. + forwarder_pd_server_pd_server_0_oam_port_0: + type: org.openecomp.capabilities.Forwarder 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. + os_pd_server: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_pd_server: + disk.write.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 - disk.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. + feature_pd_server_pd_server_0_oam_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_pd_server: + 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 - network.incoming.packets_pd_server_pd01_port_0: + 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 - disk.iops_pd_server: + 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 - network.incoming.packets.rate_pd_server_pd01_port_1: + 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. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd01_port_1: + disk.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 - 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. + 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 - cpu.delta_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.packets.rate_pd_server_pd01_port_0: + 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.rate_pd_server_pd01_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: - 1 - UNBOUNDED - attachment_pd_server_pd01_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port_1: + 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.packets.rate_pd_server_pd01_port_0: + 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: @@ -343,11 +316,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port_0: - type: tosca.capabilities.Attachment - 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. @@ -359,23 +327,24 @@ node_types: 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. + forwarder_pd_server_pd_server_1_oam_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port_0: - type: org.openecomp.capabilities.Forwarder + 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 - forwarder_pd_server_pd01_port_1: - type: org.openecomp.capabilities.Forwarder + 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 - network.incoming.packets_pd_server_pd01_port_1: + 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: @@ -404,17 +373,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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. + 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: - - 1 + - 0 - UNBOUNDED feature_pd_server: type: tosca.capabilities.Node @@ -427,7 +392,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port_1: + 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: @@ -439,21 +404,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port_0: + 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_pd_server_pd01_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_pd_server_pd01_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 @@ -475,19 +439,24 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_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 - network.outpoing.packets_pd_server_pd01_port_0: + 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.outpoing.packets_pd_server_pd01_port_1: + 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: @@ -512,13 +481,20 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port_1: - type: tosca.capabilities.Node + attachment_pd_server_pd_server_1_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port_0: - type: tosca.capabilities.Node + 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 + 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 @@ -534,12 +510,30 @@ node_types: occurrences: - 1 - UNBOUNDED + 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 + 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 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 + 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.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. @@ -563,4 +557,10 @@ node_types: 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_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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml index 4b300d39b7..f1aee8d60b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml @@ -93,19 +93,6 @@ topology_template: directives: - substitutable properties: - port_pd01_port_0_mac_requirements: - mac_count_required: - is_required: false - port_pd01_port_0_network: - - get_attribute: - - network_policy_server - - name - port_pd01_port_0_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: @@ -116,20 +103,33 @@ topology_template: get_attribute: - network_policy_server - name + port_pd_server_1_oam_port_0_mac_requirements: + mac_count_required: + is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_1_network_role_tag: oam - port_pd01_port_1_network: - - get_input: oam_net_name compute_pd_server_user_data_format: - RAW - port_pd01_port_1_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_server_1_oam_port_0_network: + - get_input: oam_net_name + port_pd_server_0_oam_port_0_network: + - get_attribute: + - network_policy_server + - name + 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_pd01_port_1_mac_requirements: + port_pd_server_0_oam_port_0_mac_requirements: mac_count_required: is_required: false service_template_filter: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/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/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml index bdf0a31df8..315836c88c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/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/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml @@ -11,21 +11,8 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pd01_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_0_network: - type: list - required: true - entry_schema: - type: string - port_pd01_port_0_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_0_network_role: - type: string + port_pd_server_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true compute_pd_server_availability_zone: type: list @@ -40,47 +27,48 @@ topology_template: vm_flavor_name: type: string required: true - port_pd01_port_1_network_role: - type: string - required: true - port_pd01_port_0_order: - type: integer + port_pd_server_1_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_1_subnetpoolid: + 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_pd01_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_pd01_port_0_subnetpoolid: + port_pd_server_1_oam_port_0_subnetpoolid: type: string required: true - port_pd01_port_1_network: + compute_pd_server_user_data_format: type: list required: true entry_schema: type: string - compute_pd_server_user_data_format: + port_pd_server_0_oam_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_0_network_role_tag: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_network_role: type: string required: true - port_pd01_port_0_related_networks: - type: list + port_pd_server_1_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_1_ip_requirements: - type: list + port_pd_server_0_oam_port_0_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -88,33 +76,45 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd01_port_1_order: - type: integer + port_pd_server_1_oam_port_0_network_role_tag: + type: string required: true - port_pd01_port_1_related_networks: + port_pd_server_1_oam_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_1_vlan_requirements: + port_pd_server_1_oam_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_0_oam_port_0_ip_requirements: + type: list required: true - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1_oam_port_0_network_role: + type: string required: true - port_pd01_port_0_vlan_requirements: + port_pd_server_1_oam_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string + port_pd_server_0_oam_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd_server_1_oam_port_0_ip_requirements: + type: list + required: true + entry_schema: + 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: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -135,62 +135,62 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_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_pd01_port_1_exCP_naming + get_input: port_pd_server_1_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_1_vlan_requirements + get_input: port_pd_server_1_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_1_related_networks + get_input: port_pd_server_1_oam_port_0_related_networks ip_requirements: - get_input: port_pd01_port_1_ip_requirements + get_input: port_pd_server_1_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_1_network_role_tag + get_input: port_pd_server_1_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_1_mac_requirements + get_input: port_pd_server_1_oam_port_0_mac_requirements order: - get_input: port_pd01_port_1_order + get_input: port_pd_server_1_oam_port_0_order network_role: - get_input: port_pd01_port_1_network_role + get_input: port_pd_server_1_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_1_subnetpoolid + get_input: port_pd_server_1_oam_port_0_subnetpoolid network: get_input: - - port_pd01_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_pd01_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_pd01_port_0_exCP_naming + get_input: port_pd_server_0_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_0_vlan_requirements + get_input: port_pd_server_0_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_0_related_networks + get_input: port_pd_server_0_oam_port_0_related_networks ip_requirements: - get_input: port_pd01_port_0_ip_requirements + get_input: port_pd_server_0_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_0_network_role_tag + get_input: port_pd_server_0_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_0_mac_requirements + get_input: port_pd_server_0_oam_port_0_mac_requirements order: - get_input: port_pd01_port_0_order + get_input: port_pd_server_0_oam_port_0_order network_role: - get_input: port_pd01_port_0_network_role + get_input: port_pd_server_0_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_0_subnetpoolid + get_input: port_pd_server_0_oam_port_0_subnetpoolid network: get_input: - - port_pd01_port_0_network + - port_pd_server_0_oam_port_0_network - index_value requirements: - binding: @@ -200,18 +200,15 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: - binding_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - binding scalable_pd_server: - pd_server - scalable disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate - binding_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - binding + 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 @@ -221,12 +218,21 @@ 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 + 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 @@ -239,69 +245,48 @@ topology_template: 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.incoming.packets_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.packets + 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.packets.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.packets.rate - network.incoming.bytes.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.bytes.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.packets.rate - network.incoming.bytes.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.bytes.rate - attachment_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - attachment - network.outgoing.packets.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.outgoing.packets.rate - network.outgoing.packets.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate - attachment_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests 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 - forwarder_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - forwarder - forwarder_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - forwarder - network.incoming.packets_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.packets + 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 @@ -314,33 +299,30 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests - network.outgoing.bytes.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.outgoing.bytes.rate - network.outgoing.bytes.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outgoing.bytes.rate + 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.incoming.bytes_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.bytes + 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.outgoing.bytes_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outgoing.bytes - network.outgoing.bytes_pd_server_pd01_port_1: - - pd_server_pd01_port_1 + 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 - network.incoming.bytes_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.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 @@ -350,15 +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.outpoing.packets_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outpoing.packets - network.outpoing.packets_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.outpoing.packets + 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 @@ -368,21 +353,33 @@ topology_template: host_pd_server: - pd_server - host - feature_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - feature - feature_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - feature + 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.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 @@ -395,22 +392,25 @@ topology_template: 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 - dependency_pd_server_pd01_port_1: - - pd_server_pd01_port_1 + 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_pd01_port_0: - - pd_server_pd01_port_0 - - dependency - link_pd_server_pd01_port_0: - - pd_server_pd01_port_0 + link_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 - link - link_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - link
\ No newline at end of file + dependency_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/in/hot-mog-0108-bs1271.yml index 3b336e3619..c468e8d40f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/in/hot-mog-0108-bs1271.yml @@ -215,15 +215,15 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_0} - - port: {get_resource: pd01_port_1} + - port: {get_resource: pd_server_0_oam_port_0} + - port: {get_resource: pd_server_1_oam_port_0} user_data_format: RAW - pd01_port_0: + pd_server_0_oam_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - pd01_port_1: + pd_server_1_oam_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} @@ -236,9 +236,9 @@ resources: network_policy_port0: type: OS::Contrail::NetworkPolicy properties: - entries: {get_attr: [pd01_port_0, device_owner]} + entries: {get_attr: [pd_server_0_oam_port_0, device_owner]} network_policy_port1: type: OS::Contrail::NetworkPolicy properties: - entries: {get_attr: [pd01_port_1, device_owner]} + entries: {get_attr: [pd_server_1_oam_port_0, device_owner]} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 0bba951360..a9716b4faa 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,24 +8,8 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pd01_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_0_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_0_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_0_network_role: - type: string + port_pd_server_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED compute_pd_server_availability_zone: @@ -44,58 +28,60 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_1_network_role: - type: string + port_pd_server_1_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_0_order: - type: integer + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_1_subnetpoolid: + port_pd_server_0_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - vm_image_name: - type: string + 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_pd01_port_1_network_role_tag: + port_pd_server_0_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_0_subnetpoolid: + port_pd_server_1_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_1_network: + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_user_data_format: + port_pd_server_0_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_0_network_role_tag: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_0_related_networks: - type: list + port_pd_server_1_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_1_ip_requirements: - type: list + port_pd_server_0_oam_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -104,48 +90,62 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd01_port_1_order: - type: integer + port_pd_server_1_oam_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_pd01_port_1_related_networks: + port_pd_server_1_oam_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_1_oam_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_pd01_port_1_vlan_requirements: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1_oam_port_0_network_role: + type: string required: true status: SUPPORTED - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_1_oam_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_0_vlan_requirements: + entry_schema: + type: string + port_pd_server_0_oam_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string + port_pd_server_1_oam_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + 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 attributes: pd_server_accessIPv4: type: string status: SUPPORTED - pd_server_pd01_port_1_device_owner: + pd_server_pd_server_1_oam_port_0_device_owner: type: string status: SUPPORTED - pd_server_pd01_port_0_device_owner: + pd_server_pd_server_0_oam_port_0_device_owner: type: string status: SUPPORTED requirements: @@ -163,41 +163,33 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_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_pd01_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_pd01_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_pd01_port_0: + - link_pd_server_pd_server_0_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - binding_pd_server_pd01_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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -209,133 +201,114 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 - memory.usage_pd_server: + 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_pd_server: + 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 - disk.device.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 - os_pd_server: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - disk.write.bytes.rate_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 - 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. + forwarder_pd_server_pd_server_0_oam_port_0: + type: org.openecomp.capabilities.Forwarder 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. + os_pd_server: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_pd_server: + disk.write.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 - disk.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. + feature_pd_server_pd_server_0_oam_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_pd_server: + 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 - network.incoming.packets_pd_server_pd01_port_0: + 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 - disk.iops_pd_server: + 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 - network.incoming.packets.rate_pd_server_pd01_port_1: + 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. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd01_port_1: + disk.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 - 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. + 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 - cpu.delta_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.packets.rate_pd_server_pd01_port_0: + 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.rate_pd_server_pd01_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: - 1 - UNBOUNDED - attachment_pd_server_pd01_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port_1: + 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.packets.rate_pd_server_pd01_port_0: + 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: @@ -353,11 +326,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port_0: - type: tosca.capabilities.Attachment - 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. @@ -369,23 +337,24 @@ node_types: 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. + forwarder_pd_server_pd_server_1_oam_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port_0: - type: org.openecomp.capabilities.Forwarder + 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 - forwarder_pd_server_pd01_port_1: - type: org.openecomp.capabilities.Forwarder + 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 - network.incoming.packets_pd_server_pd01_port_1: + 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: @@ -414,17 +383,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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. + 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: - - 1 + - 0 - UNBOUNDED feature_pd_server: type: tosca.capabilities.Node @@ -437,7 +402,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port_1: + 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: @@ -449,21 +414,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port_0: + 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_pd_server_pd01_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_pd_server_pd01_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 @@ -485,19 +449,24 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_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 - network.outpoing.packets_pd_server_pd01_port_0: + 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.outpoing.packets_pd_server_pd01_port_1: + 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: @@ -522,13 +491,20 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port_1: - type: tosca.capabilities.Node + attachment_pd_server_pd_server_1_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port_0: - type: tosca.capabilities.Node + 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 + 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 @@ -544,12 +520,30 @@ node_types: occurrences: - 1 - UNBOUNDED + 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 + 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 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 + 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.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. @@ -573,4 +567,10 @@ node_types: 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 + 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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml index 5e52cb5fda..4dc8c7edc1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml @@ -832,17 +832,6 @@ topology_template: directives: - substitutable properties: - port_pd01_port_0_mac_requirements: - mac_count_required: - is_required: false - port_pd01_port_0_network: - - get_input: oam_net_name - port_pd01_port_0_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: @@ -851,21 +840,32 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name + port_pd_server_1_oam_port_0_mac_requirements: + mac_count_required: + is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_1_network_role_tag: oam - port_pd01_port_1_network: - - get_input: oam_net_name + port_pd_server_0_oam_port_0_network_role_tag: oam compute_pd_server_user_data_format: - RAW - port_pd01_port_0_network_role_tag: oam - port_pd01_port_1_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_server_1_oam_port_0_network: + - get_input: oam_net_name + port_pd_server_0_oam_port_0_network: + - get_input: oam_net_name + 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_pd01_port_1_mac_requirements: + port_pd_server_0_oam_port_0_mac_requirements: mac_count_required: is_required: false service_template_filter: @@ -882,7 +882,7 @@ topology_template: entries: get_attribute: - abstract_pd_server - - pd_server_pd01_port_0_device_owner + - pd_server_pd_server_0_oam_port_0_device_owner network_policy_server: type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules properties: @@ -896,7 +896,7 @@ topology_template: entries: get_attribute: - abstract_pd_server - - pd_server_pd01_port_1_device_owner + - pd_server_pd_server_1_oam_port_0_device_owner groups: hot-mog-0108-bs1271_group: type: org.openecomp.groups.heat.HeatStack @@ -907,4 +907,4 @@ topology_template: - network_policy_port0 - network_policy_server - network_policy_port1 - - 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/oneComputeSamePortsAndGetAttrIn/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/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml index 4a4f1998ca..32d83a02af 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/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/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml @@ -11,21 +11,8 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pd01_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_0_network: - type: list - required: true - entry_schema: - type: string - port_pd01_port_0_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_0_network_role: - type: string + port_pd_server_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true compute_pd_server_availability_zone: type: list @@ -40,47 +27,48 @@ topology_template: vm_flavor_name: type: string required: true - port_pd01_port_1_network_role: - type: string - required: true - port_pd01_port_0_order: - type: integer + port_pd_server_1_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_1_subnetpoolid: + 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_pd01_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_pd01_port_0_subnetpoolid: + port_pd_server_1_oam_port_0_subnetpoolid: type: string required: true - port_pd01_port_1_network: + compute_pd_server_user_data_format: type: list required: true entry_schema: type: string - compute_pd_server_user_data_format: + port_pd_server_0_oam_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_0_network_role_tag: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_network_role: type: string required: true - port_pd01_port_0_related_networks: - type: list + port_pd_server_1_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_1_ip_requirements: - type: list + port_pd_server_0_oam_port_0_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -88,33 +76,45 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd01_port_1_order: - type: integer + port_pd_server_1_oam_port_0_network_role_tag: + type: string required: true - port_pd01_port_1_related_networks: + port_pd_server_1_oam_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_1_vlan_requirements: + port_pd_server_1_oam_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_0_oam_port_0_ip_requirements: + type: list required: true - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1_oam_port_0_network_role: + type: string required: true - port_pd01_port_0_vlan_requirements: + port_pd_server_1_oam_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string + port_pd_server_0_oam_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd_server_1_oam_port_0_ip_requirements: + type: list + required: true + entry_schema: + 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: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -135,62 +135,62 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_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_pd01_port_1_exCP_naming + get_input: port_pd_server_1_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_1_vlan_requirements + get_input: port_pd_server_1_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_1_related_networks + get_input: port_pd_server_1_oam_port_0_related_networks ip_requirements: - get_input: port_pd01_port_1_ip_requirements + get_input: port_pd_server_1_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_1_network_role_tag + get_input: port_pd_server_1_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_1_mac_requirements + get_input: port_pd_server_1_oam_port_0_mac_requirements order: - get_input: port_pd01_port_1_order + get_input: port_pd_server_1_oam_port_0_order network_role: - get_input: port_pd01_port_1_network_role + get_input: port_pd_server_1_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_1_subnetpoolid + get_input: port_pd_server_1_oam_port_0_subnetpoolid network: get_input: - - port_pd01_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_pd01_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_pd01_port_0_exCP_naming + get_input: port_pd_server_0_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_0_vlan_requirements + get_input: port_pd_server_0_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_0_related_networks + get_input: port_pd_server_0_oam_port_0_related_networks ip_requirements: - get_input: port_pd01_port_0_ip_requirements + get_input: port_pd_server_0_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_0_network_role_tag + get_input: port_pd_server_0_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_0_mac_requirements + get_input: port_pd_server_0_oam_port_0_mac_requirements order: - get_input: port_pd01_port_0_order + get_input: port_pd_server_0_oam_port_0_order network_role: - get_input: port_pd01_port_0_network_role + get_input: port_pd_server_0_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_0_subnetpoolid + get_input: port_pd_server_0_oam_port_0_subnetpoolid network: get_input: - - port_pd01_port_0_network + - port_pd_server_0_oam_port_0_network - index_value requirements: - binding: @@ -204,33 +204,30 @@ topology_template: get_attribute: - pd_server - accessIPv4 - pd_server_pd01_port_1_device_owner: + pd_server_pd_server_1_oam_port_0_device_owner: type: string value: get_attribute: - - pd_server_pd01_port_1 + - pd_server_pd_server_1_oam_port_0 - device_owner - pd_server_pd01_port_0_device_owner: + pd_server_pd_server_0_oam_port_0_device_owner: type: string value: get_attribute: - - pd_server_pd01_port_0 + - pd_server_pd_server_0_oam_port_0 - device_owner substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: - binding_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - binding scalable_pd_server: - pd_server - scalable disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate - binding_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - binding + 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 @@ -240,12 +237,21 @@ 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 + 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 @@ -258,69 +264,48 @@ topology_template: 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.incoming.packets_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.packets + 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.packets.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.packets.rate - network.incoming.bytes.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.bytes.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.packets.rate - network.incoming.bytes.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.bytes.rate - attachment_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - attachment - network.outgoing.packets.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.outgoing.packets.rate - network.outgoing.packets.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate - attachment_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests 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 - forwarder_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - forwarder - forwarder_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - forwarder - network.incoming.packets_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.packets + 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 @@ -333,33 +318,30 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests - network.outgoing.bytes.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.outgoing.bytes.rate - network.outgoing.bytes.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outgoing.bytes.rate + 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.incoming.bytes_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.bytes + 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.outgoing.bytes_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outgoing.bytes - network.outgoing.bytes_pd_server_pd01_port_1: - - pd_server_pd01_port_1 + 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 - network.incoming.bytes_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.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 @@ -369,15 +351,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.outpoing.packets_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outpoing.packets - network.outpoing.packets_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.outpoing.packets + 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 @@ -387,21 +372,33 @@ topology_template: host_pd_server: - pd_server - host - feature_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - feature - feature_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - feature + 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.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 @@ -414,22 +411,25 @@ topology_template: 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 - dependency_pd_server_pd01_port_1: - - pd_server_pd01_port_1 + 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_pd01_port_0: - - pd_server_pd01_port_0 - - dependency - link_pd_server_pd01_port_0: - - pd_server_pd01_port_0 + link_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 - link - link_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - link
\ No newline at end of file + dependency_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/in/hot-mog-0108-bs1271.yml index 46b8fc2141..d126130b32 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/in/hot-mog-0108-bs1271.yml @@ -215,15 +215,15 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_0} - - port: {get_resource: pd01_port_1} + - port: {get_resource: pd_server_0_oam_port_0} + - port: {get_resource: pd_server_1_oam_port_0} user_data_format: RAW - pd01_port_0: + pd_server_0_oam_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - pd01_port_1: + pd_server_1_oam_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} @@ -234,8 +234,8 @@ outputs: value: {get_attr: [server_pd_01, accessIPv4]} out2: description: output_regula - value: {get_attr: [pd01_port_1, device_owner]} + value: {get_attr: [pd_server_1_oam_port_0, device_owner]} out3: description: output_regula value: - get_attr: [pd01_port_0, device_id] + get_attr: [pd_server_0_oam_port_0, device_id] diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index c43947bdf6..b8c1f7aade 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,24 +8,8 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pd01_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_0_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_0_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_0_network_role: - type: string + port_pd_server_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED compute_pd_server_availability_zone: @@ -44,58 +28,60 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_1_network_role: - type: string + port_pd_server_1_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_0_order: - type: integer + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_1_subnetpoolid: + port_pd_server_0_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - vm_image_name: - type: string + 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_pd01_port_1_network_role_tag: + port_pd_server_0_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_0_subnetpoolid: + port_pd_server_1_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_1_network: + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_user_data_format: + port_pd_server_0_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_0_network_role_tag: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_0_related_networks: - type: list + port_pd_server_1_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_1_ip_requirements: - type: list + port_pd_server_0_oam_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -104,48 +90,62 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd01_port_1_order: - type: integer + port_pd_server_1_oam_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_pd01_port_1_related_networks: + port_pd_server_1_oam_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_1_oam_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_pd01_port_1_vlan_requirements: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1_oam_port_0_network_role: + type: string required: true status: SUPPORTED - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_1_oam_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_0_vlan_requirements: + entry_schema: + type: string + port_pd_server_0_oam_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string + port_pd_server_1_oam_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + 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 attributes: - pd_server_pd01_port_0_device_id: + pd_server_accessIPv4: type: string status: SUPPORTED - pd_server_accessIPv4: + pd_server_pd_server_0_oam_port_0_device_id: type: string status: SUPPORTED - pd_server_pd01_port_1_device_owner: + pd_server_pd_server_1_oam_port_0_device_owner: type: string status: SUPPORTED requirements: @@ -163,41 +163,33 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_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_pd01_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_pd01_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_pd01_port_0: + - link_pd_server_pd_server_0_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - binding_pd_server_pd01_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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -209,133 +201,114 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 - memory.usage_pd_server: + 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_pd_server: + 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 - disk.device.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 - os_pd_server: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - disk.write.bytes.rate_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 - 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. + forwarder_pd_server_pd_server_0_oam_port_0: + type: org.openecomp.capabilities.Forwarder 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. + os_pd_server: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_pd_server: + disk.write.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 - disk.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. + feature_pd_server_pd_server_0_oam_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_pd_server: + 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 - network.incoming.packets_pd_server_pd01_port_0: + 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 - disk.iops_pd_server: + 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 - network.incoming.packets.rate_pd_server_pd01_port_1: + 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. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd01_port_1: + disk.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 - 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. + 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 - cpu.delta_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.packets.rate_pd_server_pd01_port_0: + 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.rate_pd_server_pd01_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: - 1 - UNBOUNDED - attachment_pd_server_pd01_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port_1: + 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.packets.rate_pd_server_pd01_port_0: + 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: @@ -353,11 +326,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port_0: - type: tosca.capabilities.Attachment - 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. @@ -369,23 +337,24 @@ node_types: 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. + forwarder_pd_server_pd_server_1_oam_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port_0: - type: org.openecomp.capabilities.Forwarder + 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 - forwarder_pd_server_pd01_port_1: - type: org.openecomp.capabilities.Forwarder + 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 - network.incoming.packets_pd_server_pd01_port_1: + 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: @@ -414,17 +383,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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. + 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: - - 1 + - 0 - UNBOUNDED feature_pd_server: type: tosca.capabilities.Node @@ -437,7 +402,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port_1: + 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: @@ -449,21 +414,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port_0: + 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_pd_server_pd01_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_pd_server_pd01_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 @@ -485,19 +449,24 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_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 - network.outpoing.packets_pd_server_pd01_port_0: + 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.outpoing.packets_pd_server_pd01_port_1: + 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: @@ -522,13 +491,20 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port_1: - type: tosca.capabilities.Node + attachment_pd_server_pd_server_1_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port_0: - type: tosca.capabilities.Node + 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 + 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 @@ -544,12 +520,30 @@ node_types: occurrences: - 1 - UNBOUNDED + 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 + 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 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 + 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.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. @@ -573,4 +567,10 @@ node_types: 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 + 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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml index 9e94e9736c..abdd106602 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml @@ -832,17 +832,6 @@ topology_template: directives: - substitutable properties: - port_pd01_port_0_mac_requirements: - mac_count_required: - is_required: false - port_pd01_port_0_network: - - get_input: oam_net_name - port_pd01_port_0_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: @@ -851,21 +840,32 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name + port_pd_server_1_oam_port_0_mac_requirements: + mac_count_required: + is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_1_network_role_tag: oam - port_pd01_port_1_network: - - get_input: oam_net_name + port_pd_server_0_oam_port_0_network_role_tag: oam compute_pd_server_user_data_format: - RAW - port_pd01_port_0_network_role_tag: oam - port_pd01_port_1_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_server_1_oam_port_0_network: + - get_input: oam_net_name + port_pd_server_0_oam_port_0_network: + - get_input: oam_net_name + 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_pd01_port_1_mac_requirements: + port_pd_server_0_oam_port_0_mac_requirements: mac_count_required: is_required: false service_template_filter: @@ -890,16 +890,16 @@ topology_template: value: get_attribute: - abstract_pd_server - - pd_server_pd01_port_1_device_owner + - pd_server_pd_server_1_oam_port_0_device_owner out3: description: output_regula value: get_attribute: - abstract_pd_server - - pd_server_pd01_port_0_device_id + - pd_server_pd_server_0_oam_port_0_device_id out1: description: output_regula value: get_attribute: - abstract_pd_server - - pd_server_accessIPv4
\ No newline at end of file + - pd_server_accessIPv4 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/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/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml index 72e80d7cc9..861529aeb2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/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/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml @@ -11,21 +11,8 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pd01_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_0_network: - type: list - required: true - entry_schema: - type: string - port_pd01_port_0_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_0_network_role: - type: string + port_pd_server_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true compute_pd_server_availability_zone: type: list @@ -40,47 +27,48 @@ topology_template: vm_flavor_name: type: string required: true - port_pd01_port_1_network_role: - type: string - required: true - port_pd01_port_0_order: - type: integer + port_pd_server_1_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_1_subnetpoolid: + 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_pd01_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_pd01_port_0_subnetpoolid: + port_pd_server_1_oam_port_0_subnetpoolid: type: string required: true - port_pd01_port_1_network: + compute_pd_server_user_data_format: type: list required: true entry_schema: type: string - compute_pd_server_user_data_format: + port_pd_server_0_oam_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_0_network_role_tag: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_network_role: type: string required: true - port_pd01_port_0_related_networks: - type: list + port_pd_server_1_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_1_ip_requirements: - type: list + port_pd_server_0_oam_port_0_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -88,33 +76,45 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd01_port_1_order: - type: integer + port_pd_server_1_oam_port_0_network_role_tag: + type: string required: true - port_pd01_port_1_related_networks: + port_pd_server_1_oam_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_1_vlan_requirements: + port_pd_server_1_oam_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_0_oam_port_0_ip_requirements: + type: list required: true - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1_oam_port_0_network_role: + type: string required: true - port_pd01_port_0_vlan_requirements: + port_pd_server_1_oam_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string + port_pd_server_0_oam_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd_server_1_oam_port_0_ip_requirements: + type: list + required: true + entry_schema: + 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: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -135,62 +135,62 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_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_pd01_port_1_exCP_naming + get_input: port_pd_server_1_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_1_vlan_requirements + get_input: port_pd_server_1_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_1_related_networks + get_input: port_pd_server_1_oam_port_0_related_networks ip_requirements: - get_input: port_pd01_port_1_ip_requirements + get_input: port_pd_server_1_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_1_network_role_tag + get_input: port_pd_server_1_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_1_mac_requirements + get_input: port_pd_server_1_oam_port_0_mac_requirements order: - get_input: port_pd01_port_1_order + get_input: port_pd_server_1_oam_port_0_order network_role: - get_input: port_pd01_port_1_network_role + get_input: port_pd_server_1_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_1_subnetpoolid + get_input: port_pd_server_1_oam_port_0_subnetpoolid network: get_input: - - port_pd01_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_pd01_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_pd01_port_0_exCP_naming + get_input: port_pd_server_0_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_0_vlan_requirements + get_input: port_pd_server_0_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_0_related_networks + get_input: port_pd_server_0_oam_port_0_related_networks ip_requirements: - get_input: port_pd01_port_0_ip_requirements + get_input: port_pd_server_0_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_0_network_role_tag + get_input: port_pd_server_0_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_0_mac_requirements + get_input: port_pd_server_0_oam_port_0_mac_requirements order: - get_input: port_pd01_port_0_order + get_input: port_pd_server_0_oam_port_0_order network_role: - get_input: port_pd01_port_0_network_role + get_input: port_pd_server_0_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_0_subnetpoolid + get_input: port_pd_server_0_oam_port_0_subnetpoolid network: get_input: - - port_pd01_port_0_network + - port_pd_server_0_oam_port_0_network - index_value requirements: - binding: @@ -198,39 +198,36 @@ topology_template: node: pd_server relationship: tosca.relationships.network.BindsTo outputs: - pd_server_pd01_port_0_device_id: - type: string - value: - get_attribute: - - pd_server_pd01_port_0 - - device_id pd_server_accessIPv4: type: string value: get_attribute: - pd_server - accessIPv4 - pd_server_pd01_port_1_device_owner: + pd_server_pd_server_0_oam_port_0_device_id: + type: string + value: + get_attribute: + - pd_server_pd_server_0_oam_port_0 + - device_id + pd_server_pd_server_1_oam_port_0_device_owner: type: string value: get_attribute: - - pd_server_pd01_port_1 + - pd_server_pd_server_1_oam_port_0 - device_owner substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: - binding_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - binding scalable_pd_server: - pd_server - scalable disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate - binding_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - binding + 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 @@ -240,12 +237,21 @@ 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 + 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 @@ -258,69 +264,48 @@ topology_template: 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.incoming.packets_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.packets + 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.packets.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.packets.rate - network.incoming.bytes.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.bytes.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.packets.rate - network.incoming.bytes.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.bytes.rate - attachment_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - attachment - network.outgoing.packets.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.outgoing.packets.rate - network.outgoing.packets.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate - attachment_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests 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 - forwarder_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - forwarder - forwarder_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - forwarder - network.incoming.packets_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.packets + 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 @@ -333,33 +318,30 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests - network.outgoing.bytes.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.outgoing.bytes.rate - network.outgoing.bytes.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outgoing.bytes.rate + 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.incoming.bytes_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.bytes + 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.outgoing.bytes_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outgoing.bytes - network.outgoing.bytes_pd_server_pd01_port_1: - - pd_server_pd01_port_1 + 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 - network.incoming.bytes_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.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 @@ -369,15 +351,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.outpoing.packets_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outpoing.packets - network.outpoing.packets_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.outpoing.packets + 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 @@ -387,21 +372,33 @@ topology_template: host_pd_server: - pd_server - host - feature_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - feature - feature_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - feature + 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.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 @@ -414,22 +411,25 @@ topology_template: 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 - dependency_pd_server_pd01_port_1: - - pd_server_pd01_port_1 + 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_pd01_port_0: - - pd_server_pd01_port_0 - - dependency - link_pd_server_pd01_port_0: - - pd_server_pd01_port_0 + link_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 - link - link_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - link
\ No newline at end of file + dependency_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/in/hot-mog-0108-bs1271.yml index ebdece7be3..1f09bbd0cd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/in/hot-mog-0108-bs1271.yml @@ -104,7 +104,7 @@ resources: scheduler_hints: { group: { get_resource: BE_Affinity }} block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_ps_boot_volume }, delete_on_termination: "false" }] networks: - - port: {get_resource: pd01_port_0} + - port: {get_resource: ps_server_0_oam_port_0} user_data_format: RAW server_pd_01: @@ -120,7 +120,7 @@ resources: scheduler_hints: { group: { get_resource: BE_Affinity }} block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_pd_boot_volume }, delete_on_termination: "false" }] networks: - - port: {get_resource: pd01_port_1} + - port: {get_resource: pd_server_0_oam_port_0} user_data_format: RAW server_oam_01: @@ -136,22 +136,22 @@ resources: scheduler_hints: { group: { get_resource: BE_Affinity }} block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_oam_boot_volume }, delete_on_termination: "false" }] networks: - - port: {get_resource: pd01_port_2} + - port: {get_resource: oam_server_0_oam_port_0} user_data_format: RAW - pd01_port_0: + ps_server_0_oam_port_0: type: OS::Neutron::Port properties: network: {get_attr: [network_policy_server, name]} security_groups: [{get_resource: jsa_security_group}] - pd01_port_1: + pd_server_0_oam_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} security_groups: [{get_resource: jsa_security_group}] - pd01_port_2: + oam_server_0_oam_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} @@ -216,9 +216,9 @@ outputs: value: {get_attr: [server_oam_01, accessIPv4]} out4: description: output_regula - value: {get_attr: [pd01_port_1, device_owner]} + value: {get_attr: [pd_server_0_oam_port_0, device_owner]} out5: description: output_regula value: - get_attr: [pd01_port_0, device_id] + get_attr: [ps_server_0_oam_port_0, device_id] diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml index 6892a548bf..7a2d9ce520 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,12 +8,20 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED compute_pd_server_scheduler_hints: type: list required: true status: SUPPORTED entry_schema: type: json + port_pd_server_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -34,79 +42,71 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_oam_port_0_network_role: + type: string required: true status: SUPPORTED - port_pd01_port_related_networks: + vm_flavor_name: + type: string + required: true + status: SUPPORTED + port_pd_server_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_security_groups: + port_pd_server_oam_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: json - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd_server_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: + port_pd_server_oam_port_0_order: type: integer required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role_tag: + port_pd_server_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd_server_oam_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string + port_pd_server_oam_port_0_security_groups: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json attributes: pd_server_accessIPv4: type: string status: SUPPORTED - pd_server_pd01_port_device_owner: + pd_server_pd_server_oam_port_0_device_owner: type: string status: SUPPORTED requirements: @@ -124,20 +124,25 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd_server_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd_server_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + feature_pd_server_pd_server_oam_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -149,25 +154,25 @@ node_types: occurrences: - 1 - UNBOUNDED - memory.usage_pd_server: + network.outpoing.packets_pd_server_pd_server_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_pd_server: + 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 - disk.device.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 - network.outgoing.packets.rate_pd_server_pd01_port: + 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: @@ -184,19 +189,27 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + binding_pd_server_pd_server_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 + 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 - cpu_pd_server: + 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 - cpu_util_pd_server: + network.incoming.bytes.rate_pd_server_pd_server_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: @@ -220,7 +233,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd_server_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: @@ -244,25 +257,30 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + 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. occurrences: - 1 - UNBOUNDED - vcpus_pd_server: + disk.device.write.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 - disk.device.write.bytes.rate_pd_server: + forwarder_pd_server_pd_server_oam_port_0: + type: org.openecomp.capabilities.Forwarder + 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 - disk.device.write.requests_pd_server: + network.outgoing.packets.rate_pd_server_pd_server_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: @@ -273,12 +291,19 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment + 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 - disk.capacity_pd_server: + network.outgoing.bytes_pd_server_pd_server_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.packets_pd_server_pd_server_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: @@ -318,32 +343,12 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 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.incoming.bytes.rate_pd_server_pd01_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.incoming.packets_pd_server_pd01_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. @@ -387,24 +392,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + 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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - disk.write.requests.rate_pd_server: + 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 - disk.ephemeral.size_pd_server: + network.incoming.packets.rate_pd_server_pd_server_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: @@ -416,8 +416,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_pd_server_pd_server_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 @@ -439,21 +440,34 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port: + 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: - 1 - UNBOUNDED - 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. + attachment_pd_server_pd_server_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED org.openecomp.resource.abstract.nodes.oam_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_oam_server_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_oam_server_oam_port_0_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_oam_server_oam_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -462,11 +476,7 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd01_port_related_networks: + port_oam_server_oam_port_0_related_networks: type: list required: true status: SUPPORTED @@ -476,16 +486,26 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_security_groups: + port_oam_server_oam_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_oam_server_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_oam_server_oam_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: type: json - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_oam_server_oam_port_0_network: + type: list required: true status: SUPPORTED + entry_schema: + type: string compute_oam_server_availability_zone: type: list required: true @@ -496,26 +516,16 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: - type: list + port_oam_server_oam_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + port_oam_server_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.IpRequirements compute_oam_server_user_data_format: type: list required: true @@ -528,20 +538,10 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd01_port_vlan_requirements: - type: list + port_oam_server_oam_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_oam_server_scheduler_hints: type: list required: true @@ -553,14 +553,14 @@ node_types: type: string status: SUPPORTED requirements: - - dependency_oam_server_pd01_port: + - dependency_oam_server_oam_server_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_oam_server_pd01_port: + - link_oam_server_oam_server_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -600,12 +600,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_oam_server_pd01_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 feature_oam_server: type: tosca.capabilities.Node occurrences: @@ -641,14 +635,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_oam_server_pd01_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 disk.write.bytes_oam_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -661,7 +647,7 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_oam_server_pd01_port: + forwarder_oam_server_oam_server_oam_port_0: type: org.openecomp.capabilities.Forwarder occurrences: - 1 @@ -678,21 +664,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_oam_server_pd01_port: + disk.device.read.requests.rate_oam_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_oam_server: + network.incoming.packets_oam_server_oam_server_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_oam_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_oam_server_oam_server_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -708,12 +693,24 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_oam_server_oam_server_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.write.requests.rate_oam_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_oam_server_oam_server_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 instance_oam_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -773,24 +770,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_oam_server_pd01_port: + disk.latency_oam_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 - attachment_oam_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - disk.latency_oam_server: + disk.read.requests_oam_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.read.requests_oam_server: + network.outgoing.packets.rate_oam_server_oam_server_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: @@ -814,8 +806,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_oam_server_pd01_port: - type: tosca.capabilities.Node + network.outgoing.bytes_oam_server_oam_server_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 @@ -835,19 +828,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_oam_server_pd01_port: + disk.write.requests.rate_oam_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.write.requests.rate_oam_server: + network.incoming.packets.rate_oam_server_oam_server_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.packets.rate_oam_server_pd01_port: + network.outpoing.packets_oam_server_oam_server_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: @@ -876,15 +869,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_oam_server_pd01_port: + network.incoming.bytes.rate_oam_server_oam_server_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_oam_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_oam_server_oam_server_oam_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -894,6 +886,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_oam_server_oam_server_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 org.openecomp.resource.abstract.nodes.ps_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -929,89 +929,76 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd01_port_related_networks: - type: list + port_ps_server_oam_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_security_groups: + port_ps_server_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_ps_server_oam_port_0_network: + type: list required: true status: SUPPORTED - vm_image_name: + entry_schema: + type: string + port_ps_server_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_ps_server_oam_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_ps_server_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_ps_server_oam_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_order: - type: integer + type: json + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + port_ps_server_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_network_role: - type: string + port_ps_server_oam_port_0_related_networks: + type: list required: true status: SUPPORTED - port_pd01_port_network_role_tag: - type: string + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_ps_server_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_vlan_requirements: - type: list + port_ps_server_oam_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements attributes: ps_server_accessIPv4: type: string status: SUPPORTED - ps_server_pd01_port_device_id: + ps_server_ps_server_oam_port_0_device_id: type: string status: SUPPORTED requirements: - - dependency_ps_server_pd01_port: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_ps_server_pd01_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_ps_server: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -1026,6 +1013,19 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_ps_server_ps_server_oam_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_ps_server_ps_server_oam_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 capabilities: instance_ps_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -1033,13 +1033,11 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_pd01_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 + network.incoming.packets.rate_ps_server_ps_server_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: - - 0 + - 1 - UNBOUNDED host_ps_server: type: tosca.capabilities.Container @@ -1101,13 +1099,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.iops_ps_server: + network.outgoing.packets.rate_ps_server_ps_server_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.packets_ps_server_ps_server_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_ps_server_pd01_port: + disk.device.iops_ps_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: @@ -1142,38 +1146,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_ps_server_pd01_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 - forwarder_ps_server_pd01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.write.requests_ps_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.rate_ps_server_pd01_port: + network.outgoing.bytes_ps_server_ps_server_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.packets_ps_server_pd01_port: + disk.latency_ps_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_ps_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_ps_server_ps_server_oam_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -1189,6 +1181,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_ps_server_oam_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.iops_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1201,7 +1198,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_pd01_port: + network.incoming.bytes_ps_server_ps_server_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: @@ -1231,21 +1228,25 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_pd01_port: - type: tosca.capabilities.Node + network.outpoing.packets_ps_server_ps_server_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_ps_server_pd01_port: + network.incoming.bytes.rate_ps_server_ps_server_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 - attachment_ps_server_pd01_port: - type: tosca.capabilities.Attachment + binding_ps_server_ps_server_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.device.write.requests.rate_ps_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -1253,12 +1254,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_server_pd01_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.requests_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1282,6 +1277,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_ps_server_ps_server_oam_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED os_ps_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -1305,12 +1305,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_pd01_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.usage_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1339,4 +1333,10 @@ node_types: 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 + network.outgoing.bytes.rate_ps_server_ps_server_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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml index 8002f73309..c86f14b3d7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml @@ -388,6 +388,9 @@ topology_template: properties: compute_pd_server_scheduler_hints: - group: BE_Affinity_group + port_pd_server_oam_port_0_mac_requirements: + mac_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -398,24 +401,21 @@ topology_template: get_attribute: - network_policy_server - name - port_pd01_port_security_groups: - - - jsa_security_group - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: + port_pd_server_oam_port_0_network_role_tag: oam + port_pd_server_oam_port_0_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW + port_pd_server_oam_port_0_security_groups: + - - jsa_security_group service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -448,23 +448,23 @@ topology_template: get_attribute: - network_policy_server - name - port_pd01_port_security_groups: - - - jsa_security_group - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name - port_pd01_port_ip_requirements: + port_ps_server_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: + port_ps_server_oam_port_0_network: - get_attribute: - network_policy_server - name + port_ps_server_oam_port_0_security_groups: + - - jsa_security_group + vm_image_name: + get_input: pd_image_name + port_ps_server_oam_port_0_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_ps_serverServiceTemplate.yaml count: 1 @@ -483,34 +483,34 @@ topology_template: directives: - substitutable properties: + port_oam_server_oam_port_0_mac_requirements: + mac_count_required: + is_required: false + port_oam_server_oam_port_0_network_role_tag: oam vm_flavor_name: get_attribute: - network_policy_server - name - port_pd01_port_security_groups: + port_oam_server_oam_port_0_security_groups: - - jsa_security_group - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false + port_oam_server_oam_port_0_network: + - get_input: oam_net_name compute_oam_server_availability_zone: - get_input: availabilityzone_name vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_oam_server_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - get_input: oam_net_name compute_oam_server_user_data_format: - RAW compute_oam_server_name: - get_input: - oam_server_names - 0 - port_pd01_port_network_role_tag: oam compute_oam_server_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -569,15 +569,15 @@ topology_template: direction: ingress requirements: - port: - capability: attachment_ps_server_pd01_port + capability: attachment_ps_server_ps_server_oam_port_0 node: abstract_ps_server relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_pd_server_pd01_port + capability: attachment_pd_server_pd_server_oam_port_0 node: abstract_pd_server relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_oam_server_pd01_port + capability: attachment_oam_server_oam_server_oam_port_0 node: abstract_oam_server relationship: org.openecomp.relationships.AttachesTo network_policy_server_pd: @@ -633,13 +633,13 @@ topology_template: value: get_attribute: - abstract_pd_server - - pd_server_pd01_port_device_owner + - pd_server_pd_server_oam_port_0_device_owner out5: description: output_regula value: get_attribute: - abstract_ps_server - - ps_server_pd01_port_device_id + - ps_server_ps_server_oam_port_0_device_id out1: description: output_regula value: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml index 51e1b2117d..9a3b6f93e5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml @@ -11,6 +11,17 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_oam_server_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_oam_server_oam_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_oam_server_oam_port_0_network_role_tag: + type: string + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -18,10 +29,7 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_related_networks: + port_oam_server_oam_port_0_related_networks: type: list required: true entry_schema: @@ -29,14 +37,22 @@ topology_template: vm_flavor_name: type: string required: true - port_pd01_port_security_groups: + port_oam_server_oam_port_0_network_role: + type: string + required: true + port_oam_server_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_oam_server_oam_port_0_security_groups: type: list required: true entry_schema: type: json - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_oam_server_oam_port_0_network: + type: list required: true + entry_schema: + type: string compute_oam_server_availability_zone: type: list required: true @@ -45,22 +61,14 @@ topology_template: vm_image_name: type: string required: true - port_pd01_port_ip_requirements: - type: list + port_oam_server_oam_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + port_oam_server_oam_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: - type: string - required: true + type: org.openecomp.datatypes.network.IpRequirements compute_oam_server_user_data_format: type: list required: true @@ -71,52 +79,44 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - port_pd01_port_network_role_tag: - type: string - required: true - port_pd01_port_vlan_requirements: - type: list + port_oam_server_oam_port_0_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_oam_server_scheduler_hints: type: list required: true entry_schema: type: json node_templates: - oam_server_pd01_port: + oam_server_oam_server_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_oam_server_oam_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_oam_server_oam_port_0_order security_groups: get_input: - - port_pd01_port_security_groups + - port_oam_server_oam_port_0_security_groups - index_value exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_oam_server_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_oam_server_oam_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_oam_server_oam_port_0_ip_requirements related_networks: - get_input: port_pd01_port_related_networks + get_input: port_oam_server_oam_port_0_related_networks network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_oam_server_oam_port_0_network_role_tag network_role: - get_input: port_pd01_port_network_role + get_input: port_oam_server_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_oam_server_oam_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_oam_server_oam_port_0_network - index_value requirements: - binding: @@ -165,9 +165,6 @@ topology_template: disk.usage_oam_server: - oam_server - disk.usage - network.incoming.bytes.rate_oam_server_pd01_port: - - oam_server_pd01_port - - network.incoming.bytes.rate feature_oam_server: - oam_server - feature @@ -186,17 +183,14 @@ topology_template: disk.read.bytes.rate_oam_server: - oam_server - disk.read.bytes.rate - binding_oam_server_pd01_port: - - oam_server_pd01_port - - binding disk.write.bytes_oam_server: - oam_server - disk.write.bytes disk.write.requests_oam_server: - oam_server - disk.write.requests - forwarder_oam_server_pd01_port: - - oam_server_pd01_port + forwarder_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 - forwarder cpu_oam_server: - oam_server @@ -204,24 +198,30 @@ topology_template: vcpus_oam_server: - oam_server - vcpus - network.incoming.packets_oam_server_pd01_port: - - oam_server_pd01_port - - network.incoming.packets disk.device.read.requests.rate_oam_server: - oam_server - disk.device.read.requests.rate - network.outpoing.packets_oam_server_pd01_port: - - oam_server_pd01_port - - network.outpoing.packets + network.incoming.packets_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - network.incoming.packets + attachment_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - attachment disk.allocation_oam_server: - oam_server - disk.allocation disk.write.bytes.rate_oam_server: - oam_server - disk.write.bytes.rate + network.outgoing.bytes.rate_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - network.outgoing.bytes.rate disk.device.write.requests.rate_oam_server: - oam_server - disk.device.write.requests.rate + network.incoming.bytes_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - network.incoming.bytes instance_oam_server: - oam_server - instance @@ -252,18 +252,15 @@ topology_template: disk.device.usage_oam_server: - oam_server - disk.device.usage - network.outgoing.packets.rate_oam_server_pd01_port: - - oam_server_pd01_port - - network.outgoing.packets.rate - attachment_oam_server_pd01_port: - - oam_server_pd01_port - - attachment disk.latency_oam_server: - oam_server - disk.latency disk.read.requests_oam_server: - oam_server - disk.read.requests + network.outgoing.packets.rate_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - network.outgoing.packets.rate disk.device.iops_oam_server: - oam_server - disk.device.iops @@ -273,9 +270,9 @@ topology_template: disk.device.latency_oam_server: - oam_server - disk.device.latency - feature_oam_server_pd01_port: - - oam_server_pd01_port - - feature + network.outgoing.bytes_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - network.outgoing.bytes memory.usage_oam_server: - oam_server - memory.usage @@ -285,15 +282,15 @@ topology_template: scalable_oam_server: - oam_server - scalable - network.incoming.bytes_oam_server_pd01_port: - - oam_server_pd01_port - - network.incoming.bytes disk.write.requests.rate_oam_server: - oam_server - disk.write.requests.rate - network.incoming.packets.rate_oam_server_pd01_port: - - oam_server_pd01_port + network.incoming.packets.rate_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 - network.incoming.packets.rate + network.outpoing.packets_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - network.outpoing.packets disk.device.read.bytes.rate_oam_server: - oam_server - disk.device.read.bytes.rate @@ -306,25 +303,28 @@ topology_template: disk.read.bytes_oam_server: - oam_server - disk.read.bytes - network.outgoing.bytes_oam_server_pd01_port: - - oam_server_pd01_port - - network.outgoing.bytes - network.outgoing.bytes.rate_oam_server_pd01_port: - - oam_server_pd01_port - - network.outgoing.bytes.rate + network.incoming.bytes.rate_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - network.incoming.bytes.rate + feature_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - feature disk.ephemeral.size_oam_server: - oam_server - disk.ephemeral.size + binding_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - binding requirements: - link_oam_server_pd01_port: - - oam_server_pd01_port + link_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 - link - dependency_oam_server_pd01_port: - - oam_server_pd01_port - - dependency local_storage_oam_server: - oam_server - local_storage + dependency_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - dependency dependency_oam_server: - oam_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/singleSubstitution/threeDiffComputesWithAllConnectivities/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/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml index f80b26c76a..7b21e1e88b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/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/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml @@ -11,11 +11,17 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true compute_pd_server_scheduler_hints: type: list required: true entry_schema: type: json + port_pd_server_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -33,60 +39,54 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_oam_port_0_network_role: + type: string required: true - port_pd01_port_related_networks: + vm_flavor_name: + type: string + required: true + port_pd_server_oam_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_oam_port_0_subnetpoolid: type: string required: true - port_pd01_port_security_groups: + port_pd_server_oam_port_0_related_networks: type: list required: true entry_schema: - type: json - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true - port_pd01_port_ip_requirements: + port_pd_server_oam_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list - required: true - entry_schema: - type: string - port_pd01_port_order: + port_pd_server_oam_port_0_order: type: integer required: true - port_pd01_port_subnetpoolid: - type: string - required: true - port_pd01_port_network_role: + port_pd_server_oam_port_0_network_role_tag: type: string required: true - port_pd01_port_network_role_tag: - type: string - required: true - port_pd01_port_vlan_requirements: + port_pd_server_oam_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string compute_pd_server_user_data_format: type: list required: true entry_schema: type: string + port_pd_server_oam_port_0_security_groups: + type: list + required: true + entry_schema: + type: json node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -111,35 +111,35 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd_server_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd_server_oam_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd_server_oam_port_0_order security_groups: get_input: - - port_pd01_port_security_groups + - port_pd_server_oam_port_0_security_groups - index_value exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd_server_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd_server_oam_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd_server_oam_port_0_ip_requirements related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd_server_oam_port_0_related_networks network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd_server_oam_port_0_network_role_tag network_role: - get_input: port_pd01_port_network_role + get_input: port_pd_server_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd_server_oam_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd_server_oam_port_0_network - index_value requirements: - binding: @@ -153,21 +153,27 @@ topology_template: get_attribute: - pd_server - accessIPv4 - pd_server_pd01_port_device_owner: + pd_server_pd_server_oam_port_0_device_owner: type: string value: get_attribute: - - pd_server_pd01_port + - pd_server_pd_server_oam_port_0 - device_owner substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + feature_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - feature scalable_pd_server: - pd_server - scalable disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + network.outpoing.packets_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - network.outpoing.packets memory.usage_pd_server: - pd_server - memory.usage @@ -177,24 +183,24 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes + binding_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - binding cpu_pd_server: - pd_server - cpu cpu_util_pd_server: - pd_server - cpu_util + network.incoming.bytes.rate_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - network.incoming.bytes.rate disk.device.write.requests.rate_pd_server: - pd_server - disk.device.write.requests.rate @@ -204,9 +210,9 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes + network.incoming.bytes_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - network.incoming.bytes disk.iops_pd_server: - pd_server - disk.iops @@ -216,27 +222,33 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + forwarder_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - forwarder disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests + network.outgoing.packets.rate_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - network.outgoing.packets.rate endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity + network.outgoing.bytes_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - network.outgoing.bytes + network.incoming.packets_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - network.incoming.packets disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -255,18 +267,9 @@ topology_template: disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -288,24 +291,21 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + network.incoming.packets.rate_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - network.incoming.packets.rate disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature + network.outgoing.bytes.rate_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - network.outgoing.bytes.rate disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -315,22 +315,22 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops + attachment_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - attachment requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port + dependency_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency + link_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml index 72a76e4df7..33bbcb22e2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml @@ -38,91 +38,56 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_related_networks: - type: list + port_ps_server_oam_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_pd01_port_security_groups: + port_ps_server_oam_port_0_ip_requirements: type: list required: true entry_schema: - type: json - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_ps_server_oam_port_0_network: + type: list required: true - vm_image_name: + entry_schema: + type: string + port_ps_server_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_ps_server_oam_port_0_network_role: type: string required: true - port_pd01_port_ip_requirements: + port_ps_server_oam_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_ps_server_oam_port_0_security_groups: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: - type: string - required: true - port_pd01_port_network_role: + type: json + vm_image_name: type: string required: true - port_pd01_port_network_role_tag: + port_ps_server_oam_port_0_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: + port_ps_server_oam_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_ps_server_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_ps_server_oam_port_0_order: + type: integer + required: true node_templates: - ps_server_pd01_port: - type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port - properties: - mac_requirements: - get_input: port_pd01_port_mac_requirements - order: - get_input: port_pd01_port_order - security_groups: - get_input: - - port_pd01_port_security_groups - - index_value - exCP_naming: - get_input: port_pd01_port_exCP_naming - vlan_requirements: - get_input: port_pd01_port_vlan_requirements - subinterface_indicator: false - ip_requirements: - get_input: port_pd01_port_ip_requirements - related_networks: - get_input: port_pd01_port_related_networks - network_role_tag: - get_input: port_pd01_port_network_role_tag - network_role: - get_input: port_pd01_port_network_role - subnetpoolid: - get_input: port_pd01_port_subnetpoolid - network: - get_input: - - port_pd01_port_network - - index_value - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: ps_server - relationship: tosca.relationships.network.BindsTo ps_server: type: org.openecomp.resource.vfc.compute.nodes.heat.ps_server properties: @@ -146,6 +111,41 @@ topology_template: get_input: - compute_ps_server_user_data_format - index_value + ps_server_ps_server_oam_port_0: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + mac_requirements: + get_input: port_ps_server_oam_port_0_mac_requirements + order: + get_input: port_ps_server_oam_port_0_order + security_groups: + get_input: + - port_ps_server_oam_port_0_security_groups + - index_value + exCP_naming: + get_input: port_ps_server_oam_port_0_exCP_naming + vlan_requirements: + get_input: port_ps_server_oam_port_0_vlan_requirements + subinterface_indicator: false + ip_requirements: + get_input: port_ps_server_oam_port_0_ip_requirements + related_networks: + get_input: port_ps_server_oam_port_0_related_networks + network_role_tag: + get_input: port_ps_server_oam_port_0_network_role_tag + network_role: + get_input: port_ps_server_oam_port_0_network_role + subnetpoolid: + get_input: port_ps_server_oam_port_0_subnetpoolid + network: + get_input: + - port_ps_server_oam_port_0_network + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: ps_server + relationship: tosca.relationships.network.BindsTo outputs: ps_server_accessIPv4: type: string @@ -153,11 +153,11 @@ topology_template: get_attribute: - ps_server - accessIPv4 - ps_server_pd01_port_device_id: + ps_server_ps_server_oam_port_0_device_id: type: string value: get_attribute: - - ps_server_pd01_port + - ps_server_ps_server_oam_port_0 - device_id substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.ps_server @@ -165,9 +165,9 @@ topology_template: instance_ps_server: - ps_server - instance - binding_ps_server_pd01_port: - - ps_server_pd01_port - - binding + network.incoming.packets.rate_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - network.incoming.packets.rate host_ps_server: - ps_server - host @@ -198,12 +198,15 @@ topology_template: disk.read.bytes_ps_server: - ps_server - disk.read.bytes + network.outgoing.packets.rate_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - network.outgoing.packets.rate + network.incoming.packets_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - network.incoming.packets disk.device.iops_ps_server: - ps_server - disk.device.iops - network.outpoing.packets_ps_server_pd01_port: - - ps_server_pd01_port - - network.outpoing.packets disk.device.latency_ps_server: - ps_server - disk.device.latency @@ -219,39 +222,36 @@ topology_template: disk.write.requests.rate_ps_server: - ps_server - disk.write.requests.rate - network.outgoing.bytes_ps_server_pd01_port: - - ps_server_pd01_port - - network.outgoing.bytes - forwarder_ps_server_pd01_port: - - ps_server_pd01_port - - forwarder disk.write.requests_ps_server: - ps_server - disk.write.requests - network.incoming.bytes.rate_ps_server_pd01_port: - - ps_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_ps_server_pd01_port: - - ps_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - network.outgoing.bytes disk.latency_ps_server: - ps_server - disk.latency + feature_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - feature disk.ephemeral.size_ps_server: - ps_server - disk.ephemeral.size disk.device.capacity_ps_server: - ps_server - disk.device.capacity + forwarder_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - forwarder disk.iops_ps_server: - ps_server - disk.iops disk.device.read.bytes.rate_ps_server: - ps_server - disk.device.read.bytes.rate - network.outgoing.packets.rate_ps_server_pd01_port: - - ps_server_pd01_port - - network.outgoing.packets.rate + network.incoming.bytes_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - network.incoming.bytes cpu_util_ps_server: - ps_server - cpu_util @@ -264,21 +264,18 @@ topology_template: disk.write.bytes_ps_server: - ps_server - disk.write.bytes - feature_ps_server_pd01_port: - - ps_server_pd01_port - - feature - network.outgoing.bytes.rate_ps_server_pd01_port: - - ps_server_pd01_port - - network.outgoing.bytes.rate - attachment_ps_server_pd01_port: - - ps_server_pd01_port - - attachment + network.outpoing.packets_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - network.outpoing.packets + network.incoming.bytes.rate_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - network.incoming.bytes.rate + binding_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - binding disk.device.write.requests.rate_ps_server: - ps_server - disk.device.write.requests.rate - network.incoming.packets.rate_ps_server_pd01_port: - - ps_server_pd01_port - - network.incoming.packets.rate disk.read.requests_ps_server: - ps_server - disk.read.requests @@ -291,6 +288,9 @@ topology_template: binding_ps_server: - ps_server - binding + attachment_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - attachment os_ps_server: - ps_server - os @@ -303,9 +303,6 @@ topology_template: vcpus_ps_server: - ps_server - vcpus - network.incoming.bytes_ps_server_pd01_port: - - ps_server_pd01_port - - network.incoming.bytes disk.usage_ps_server: - ps_server - disk.usage @@ -321,16 +318,19 @@ topology_template: disk.device.allocation_ps_server: - ps_server - disk.device.allocation + network.outgoing.bytes.rate_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - network.outgoing.bytes.rate requirements: + dependency_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - dependency dependency_ps_server: - ps_server - dependency - dependency_ps_server_pd01_port: - - ps_server_pd01_port - - dependency - link_ps_server_pd01_port: - - ps_server_pd01_port + link_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 - link local_storage_ps_server: - ps_server - - local_storage
\ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/in/hot-mog-0108-bs1271.yml index 9f4c7475d8..8401b6f3ce 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/in/hot-mog-0108-bs1271.yml @@ -90,7 +90,7 @@ resources: flavor: {get_attr: [network_policy_server, name]} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_0} + - port: {get_resource: ps_server_0_oam_port_0} user_data_format: RAW server_pd_01: @@ -102,7 +102,7 @@ resources: flavor: {get_attr: [network_policy_server, name]} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_1} + - port: {get_resource: pd_server_0_oam_port_0} user_data_format: RAW server_oam_01: @@ -114,18 +114,18 @@ resources: flavor: {get_attr: [network_policy_server, name]} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_2} + - port: {get_resource: oam_server_0_oam_port_0} user_data_format: RAW - pd01_port_0: + ps_server_0_oam_port_0: type: OS::Neutron::Port properties: network: {get_attr: [network_policy_server, name]} - pd01_port_1: + pd_server_0_oam_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - pd01_port_2: + oam_server_0_oam_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml index 26ddce2ded..f0fa48a8bd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,14 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd_server_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,62 +36,54 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_oam_port_0_network_role: + type: string + required: true + status: SUPPORTED + vm_flavor_name: + type: string required: true status: SUPPORTED - port_pd01_port_related_networks: + port_pd_server_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_oam_port_0_related_networks: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd_server_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: + port_pd_server_oam_port_0_order: type: integer required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role_tag: + port_pd_server_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd_server_oam_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string compute_pd_server_user_data_format: type: list required: true @@ -105,20 +105,25 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd_server_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd_server_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + feature_pd_server_pd_server_oam_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -130,25 +135,25 @@ node_types: occurrences: - 1 - UNBOUNDED - memory.usage_pd_server: + network.outpoing.packets_pd_server_pd_server_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_pd_server: + 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 - disk.device.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 - network.outgoing.packets.rate_pd_server_pd01_port: + 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: @@ -165,19 +170,27 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + binding_pd_server_pd_server_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 + 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 - cpu_pd_server: + 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 - cpu_util_pd_server: + network.incoming.bytes.rate_pd_server_pd_server_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: @@ -201,7 +214,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd_server_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: @@ -225,25 +238,30 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + 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. occurrences: - 1 - UNBOUNDED - vcpus_pd_server: + disk.device.write.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 - disk.device.write.bytes.rate_pd_server: + forwarder_pd_server_pd_server_oam_port_0: + type: org.openecomp.capabilities.Forwarder + 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 - disk.device.write.requests_pd_server: + network.outgoing.packets.rate_pd_server_pd_server_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: @@ -254,12 +272,19 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment + 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 - disk.capacity_pd_server: + network.outgoing.bytes_pd_server_pd_server_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.packets_pd_server_pd_server_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: @@ -299,32 +324,12 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 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.incoming.bytes.rate_pd_server_pd01_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.incoming.packets_pd_server_pd01_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. @@ -368,24 +373,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + 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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - disk.write.requests.rate_pd_server: + 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 - disk.ephemeral.size_pd_server: + network.incoming.packets.rate_pd_server_pd_server_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: @@ -397,8 +397,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_pd_server_pd_server_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 @@ -420,21 +421,34 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port: + 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: - 1 - UNBOUNDED - 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. + attachment_pd_server_pd_server_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED org.openecomp.resource.abstract.nodes.oam_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_oam_server_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_oam_server_oam_port_0_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_oam_server_oam_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -443,11 +457,7 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd01_port_related_networks: + port_oam_server_oam_port_0_related_networks: type: list required: true status: SUPPORTED @@ -457,40 +467,40 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - compute_oam_server_availability_zone: - type: list + port_oam_server_oam_port_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: string - vm_image_name: - type: string + port_oam_server_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_oam_server_oam_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + compute_oam_server_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_order: - type: integer + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + port_oam_server_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED + port_oam_server_oam_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements compute_oam_server_user_data_format: type: list required: true @@ -503,29 +513,19 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd01_port_vlan_requirements: - type: list + port_oam_server_oam_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements requirements: - - dependency_oam_server_pd01_port: + - dependency_oam_server_oam_server_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_oam_server_pd01_port: + - link_oam_server_oam_server_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -565,12 +565,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_oam_server_pd01_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 feature_oam_server: type: tosca.capabilities.Node occurrences: @@ -606,14 +600,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_oam_server_pd01_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 disk.write.bytes_oam_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -626,7 +612,7 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_oam_server_pd01_port: + forwarder_oam_server_oam_server_oam_port_0: type: org.openecomp.capabilities.Forwarder occurrences: - 1 @@ -643,21 +629,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_oam_server_pd01_port: + disk.device.read.requests.rate_oam_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_oam_server: + network.incoming.packets_oam_server_oam_server_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_oam_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_oam_server_oam_server_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -673,12 +658,24 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_oam_server_oam_server_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.write.requests.rate_oam_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_oam_server_oam_server_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 instance_oam_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -738,24 +735,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_oam_server_pd01_port: + disk.latency_oam_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 - attachment_oam_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - disk.latency_oam_server: + disk.read.requests_oam_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.read.requests_oam_server: + network.outgoing.packets.rate_oam_server_oam_server_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: @@ -779,8 +771,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_oam_server_pd01_port: - type: tosca.capabilities.Node + network.outgoing.bytes_oam_server_oam_server_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 @@ -800,19 +793,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_oam_server_pd01_port: + disk.write.requests.rate_oam_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.write.requests.rate_oam_server: + network.incoming.packets.rate_oam_server_oam_server_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.packets.rate_oam_server_pd01_port: + network.outpoing.packets_oam_server_oam_server_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: @@ -841,15 +834,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_oam_server_pd01_port: + network.incoming.bytes.rate_oam_server_oam_server_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_oam_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_oam_server_oam_server_oam_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -859,6 +851,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_oam_server_oam_server_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 org.openecomp.resource.abstract.nodes.ps_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -888,76 +888,63 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd01_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + port_ps_server_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_ps_server_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + port_ps_server_oam_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_order: - type: integer + port_ps_server_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + port_ps_server_oam_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_network_role: + port_ps_server_oam_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_pd01_port_network_role_tag: + port_ps_server_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_ps_server_oam_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_ps_server_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_ps_server_oam_port_0_order: + type: integer + required: true + status: SUPPORTED requirements: - - dependency_ps_server_pd01_port: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_ps_server_pd01_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_ps_server: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -972,6 +959,19 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_ps_server_ps_server_oam_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_ps_server_ps_server_oam_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 capabilities: instance_ps_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -979,13 +979,11 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_pd01_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 + network.incoming.packets.rate_ps_server_ps_server_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: - - 0 + - 1 - UNBOUNDED host_ps_server: type: tosca.capabilities.Container @@ -1047,13 +1045,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.iops_ps_server: + network.outgoing.packets.rate_ps_server_ps_server_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.packets_ps_server_ps_server_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_ps_server_pd01_port: + disk.device.iops_ps_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: @@ -1088,38 +1092,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_ps_server_pd01_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 - forwarder_ps_server_pd01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.write.requests_ps_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.rate_ps_server_pd01_port: + network.outgoing.bytes_ps_server_ps_server_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.packets_ps_server_pd01_port: + disk.latency_ps_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_ps_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_ps_server_ps_server_oam_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -1135,6 +1127,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_ps_server_oam_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.iops_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1147,7 +1144,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_pd01_port: + network.incoming.bytes_ps_server_ps_server_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: @@ -1177,21 +1174,25 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_pd01_port: - type: tosca.capabilities.Node + network.outpoing.packets_ps_server_ps_server_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_ps_server_pd01_port: + network.incoming.bytes.rate_ps_server_ps_server_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 - attachment_ps_server_pd01_port: - type: tosca.capabilities.Attachment + binding_ps_server_ps_server_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.device.write.requests.rate_ps_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -1199,12 +1200,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_server_pd01_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.requests_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1228,6 +1223,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_ps_server_ps_server_oam_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED os_ps_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -1251,12 +1251,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_pd01_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.usage_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1285,4 +1279,10 @@ node_types: 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 + network.outgoing.bytes.rate_ps_server_ps_server_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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml index 0bb61d1682..bf59f34752 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml @@ -327,6 +327,9 @@ topology_template: directives: - substitutable properties: + port_pd_server_oam_port_0_mac_requirements: + mac_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -337,20 +340,17 @@ topology_template: get_attribute: - network_policy_server - name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: + port_pd_server_oam_port_0_network_role_tag: oam + port_pd_server_oam_port_0_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -378,21 +378,21 @@ topology_template: get_attribute: - network_policy_server - name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name - port_pd01_port_ip_requirements: + port_ps_server_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: + port_ps_server_oam_port_0_network: - get_attribute: - network_policy_server - name + vm_image_name: + get_input: pd_image_name + port_ps_server_oam_port_0_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_ps_serverServiceTemplate.yaml count: 1 @@ -406,32 +406,32 @@ topology_template: directives: - substitutable properties: + port_oam_server_oam_port_0_mac_requirements: + mac_count_required: + is_required: false + port_oam_server_oam_port_0_network_role_tag: oam vm_flavor_name: get_attribute: - network_policy_server - name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false + port_oam_server_oam_port_0_network: + - get_input: oam_net_name compute_oam_server_availability_zone: - get_input: availabilityzone_name vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_oam_server_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - get_input: oam_net_name compute_oam_server_user_data_format: - RAW compute_oam_server_name: - get_input: - oam_server_names - 0 - port_pd01_port_network_role_tag: oam service_template_filter: substitute_service_template: Nested_oam_serverServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml index 2893981349..8c188adb4f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml @@ -11,6 +11,17 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_oam_server_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_oam_server_oam_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_oam_server_oam_port_0_network_role_tag: + type: string + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -18,10 +29,7 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_related_networks: + port_oam_server_oam_port_0_related_networks: type: list required: true entry_schema: @@ -29,9 +37,17 @@ topology_template: vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_oam_server_oam_port_0_network_role: + type: string + required: true + port_oam_server_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_oam_server_oam_port_0_network: + type: list required: true + entry_schema: + type: string compute_oam_server_availability_zone: type: list required: true @@ -40,22 +56,14 @@ topology_template: vm_image_name: type: string required: true - port_pd01_port_ip_requirements: - type: list + port_oam_server_oam_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + port_oam_server_oam_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: - type: string - required: true + type: org.openecomp.datatypes.network.IpRequirements compute_oam_server_user_data_format: type: list required: true @@ -66,43 +74,35 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - port_pd01_port_network_role_tag: - type: string - required: true - port_pd01_port_vlan_requirements: - type: list + port_oam_server_oam_port_0_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements node_templates: - oam_server_pd01_port: + oam_server_oam_server_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_oam_server_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_oam_server_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_oam_server_oam_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_oam_server_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_oam_server_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_oam_server_oam_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_oam_server_oam_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_oam_server_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_oam_server_oam_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_oam_server_oam_port_0_network - index_value requirements: - binding: @@ -140,9 +140,6 @@ topology_template: disk.usage_oam_server: - oam_server - disk.usage - network.incoming.bytes.rate_oam_server_pd01_port: - - oam_server_pd01_port - - network.incoming.bytes.rate feature_oam_server: - oam_server - feature @@ -161,17 +158,14 @@ topology_template: disk.read.bytes.rate_oam_server: - oam_server - disk.read.bytes.rate - binding_oam_server_pd01_port: - - oam_server_pd01_port - - binding disk.write.bytes_oam_server: - oam_server - disk.write.bytes disk.write.requests_oam_server: - oam_server - disk.write.requests - forwarder_oam_server_pd01_port: - - oam_server_pd01_port + forwarder_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 - forwarder cpu_oam_server: - oam_server @@ -179,24 +173,30 @@ topology_template: vcpus_oam_server: - oam_server - vcpus - network.incoming.packets_oam_server_pd01_port: - - oam_server_pd01_port - - network.incoming.packets disk.device.read.requests.rate_oam_server: - oam_server - disk.device.read.requests.rate - network.outpoing.packets_oam_server_pd01_port: - - oam_server_pd01_port - - network.outpoing.packets + network.incoming.packets_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - network.incoming.packets + attachment_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - attachment disk.allocation_oam_server: - oam_server - disk.allocation disk.write.bytes.rate_oam_server: - oam_server - disk.write.bytes.rate + network.outgoing.bytes.rate_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - network.outgoing.bytes.rate disk.device.write.requests.rate_oam_server: - oam_server - disk.device.write.requests.rate + network.incoming.bytes_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - network.incoming.bytes instance_oam_server: - oam_server - instance @@ -227,18 +227,15 @@ topology_template: disk.device.usage_oam_server: - oam_server - disk.device.usage - network.outgoing.packets.rate_oam_server_pd01_port: - - oam_server_pd01_port - - network.outgoing.packets.rate - attachment_oam_server_pd01_port: - - oam_server_pd01_port - - attachment disk.latency_oam_server: - oam_server - disk.latency disk.read.requests_oam_server: - oam_server - disk.read.requests + network.outgoing.packets.rate_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - network.outgoing.packets.rate disk.device.iops_oam_server: - oam_server - disk.device.iops @@ -248,9 +245,9 @@ topology_template: disk.device.latency_oam_server: - oam_server - disk.device.latency - feature_oam_server_pd01_port: - - oam_server_pd01_port - - feature + network.outgoing.bytes_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - network.outgoing.bytes memory.usage_oam_server: - oam_server - memory.usage @@ -260,15 +257,15 @@ topology_template: scalable_oam_server: - oam_server - scalable - network.incoming.bytes_oam_server_pd01_port: - - oam_server_pd01_port - - network.incoming.bytes disk.write.requests.rate_oam_server: - oam_server - disk.write.requests.rate - network.incoming.packets.rate_oam_server_pd01_port: - - oam_server_pd01_port + network.incoming.packets.rate_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 - network.incoming.packets.rate + network.outpoing.packets_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - network.outpoing.packets disk.device.read.bytes.rate_oam_server: - oam_server - disk.device.read.bytes.rate @@ -281,25 +278,28 @@ topology_template: disk.read.bytes_oam_server: - oam_server - disk.read.bytes - network.outgoing.bytes_oam_server_pd01_port: - - oam_server_pd01_port - - network.outgoing.bytes - network.outgoing.bytes.rate_oam_server_pd01_port: - - oam_server_pd01_port - - network.outgoing.bytes.rate + network.incoming.bytes.rate_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - network.incoming.bytes.rate + feature_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - feature disk.ephemeral.size_oam_server: - oam_server - disk.ephemeral.size + binding_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - binding requirements: - link_oam_server_pd01_port: - - oam_server_pd01_port + link_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 - link - dependency_oam_server_pd01_port: - - oam_server_pd01_port - - dependency local_storage_oam_server: - oam_server - local_storage + dependency_oam_server_oam_server_oam_port_0: + - oam_server_oam_server_oam_port_0 + - dependency dependency_oam_server: - oam_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/singleSubstitution/threeDiffComputesWithPorts/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/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml index 2d01270aaf..689b0bf80a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/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/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,12 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd_server_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,50 +34,44 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_oam_port_0_network_role: + type: string + required: true + vm_flavor_name: + type: string required: true - port_pd01_port_related_networks: + port_pd_server_oam_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_oam_port_0_subnetpoolid: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_oam_port_0_related_networks: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true - port_pd01_port_ip_requirements: + port_pd_server_oam_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list - required: true - entry_schema: - type: string - port_pd01_port_order: + port_pd_server_oam_port_0_order: type: integer required: true - port_pd01_port_subnetpoolid: + port_pd_server_oam_port_0_network_role_tag: type: string required: true - port_pd01_port_network_role: - type: string - required: true - port_pd01_port_network_role_tag: - type: string - required: true - port_pd01_port_vlan_requirements: + port_pd_server_oam_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string compute_pd_server_user_data_format: type: list required: true @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd_server_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd_server_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd_server_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd_server_oam_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd_server_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd_server_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd_server_oam_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd_server_oam_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd_server_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd_server_oam_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd_server_oam_port_0_network - index_value requirements: - binding: @@ -131,12 +131,18 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + feature_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - feature scalable_pd_server: - pd_server - scalable disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + network.outpoing.packets_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - network.outpoing.packets memory.usage_pd_server: - pd_server - memory.usage @@ -146,24 +152,24 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes + binding_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - binding cpu_pd_server: - pd_server - cpu cpu_util_pd_server: - pd_server - cpu_util + network.incoming.bytes.rate_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - network.incoming.bytes.rate disk.device.write.requests.rate_pd_server: - pd_server - disk.device.write.requests.rate @@ -173,9 +179,9 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes + network.incoming.bytes_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - network.incoming.bytes disk.iops_pd_server: - pd_server - disk.iops @@ -185,27 +191,33 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + forwarder_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - forwarder disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests + network.outgoing.packets.rate_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - network.outgoing.packets.rate endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity + network.outgoing.bytes_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - network.outgoing.bytes + network.incoming.packets_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - network.incoming.packets disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -224,18 +236,9 @@ topology_template: disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -257,24 +260,21 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + network.incoming.packets.rate_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - network.incoming.packets.rate disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature + network.outgoing.bytes.rate_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - network.outgoing.bytes.rate disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -284,22 +284,22 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops + attachment_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - attachment requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port + dependency_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency + link_pd_server_pd_server_oam_port_0: + - pd_server_pd_server_oam_port_0 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml index 158f58ce62..6da2a82323 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml @@ -33,110 +33,110 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + port_ps_server_oam_port_0_subnetpoolid: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: + vm_flavor_name: type: string required: true - port_pd01_port_ip_requirements: + port_ps_server_oam_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + port_ps_server_oam_port_0_network: type: list required: true entry_schema: type: string - port_pd01_port_order: - type: integer + port_ps_server_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd01_port_subnetpoolid: + port_ps_server_oam_port_0_network_role: type: string required: true - port_pd01_port_network_role: + port_ps_server_oam_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: type: string required: true - port_pd01_port_network_role_tag: + port_ps_server_oam_port_0_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: + port_ps_server_oam_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_ps_server_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_ps_server_oam_port_0_order: + type: integer + required: true node_templates: - ps_server_pd01_port: + ps_server: + type: org.openecomp.resource.vfc.compute.nodes.heat.ps_server + properties: + availability_zone: + get_input: + - compute_ps_server_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_ps_server_name + - index_value + user_data_format: + get_input: + - compute_ps_server_user_data_format + - index_value + ps_server_ps_server_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_ps_server_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_ps_server_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_ps_server_oam_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_ps_server_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_ps_server_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_ps_server_oam_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_ps_server_oam_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_ps_server_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_ps_server_oam_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_ps_server_oam_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: ps_server relationship: tosca.relationships.network.BindsTo - ps_server: - type: org.openecomp.resource.vfc.compute.nodes.heat.ps_server - properties: - availability_zone: - get_input: - - compute_ps_server_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_ps_server_name - - index_value - user_data_format: - get_input: - - compute_ps_server_user_data_format - - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.ps_server capabilities: instance_ps_server: - ps_server - instance - binding_ps_server_pd01_port: - - ps_server_pd01_port - - binding + network.incoming.packets.rate_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - network.incoming.packets.rate host_ps_server: - ps_server - host @@ -167,12 +167,15 @@ topology_template: disk.read.bytes_ps_server: - ps_server - disk.read.bytes + network.outgoing.packets.rate_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - network.outgoing.packets.rate + network.incoming.packets_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - network.incoming.packets disk.device.iops_ps_server: - ps_server - disk.device.iops - network.outpoing.packets_ps_server_pd01_port: - - ps_server_pd01_port - - network.outpoing.packets disk.device.latency_ps_server: - ps_server - disk.device.latency @@ -188,39 +191,36 @@ topology_template: disk.write.requests.rate_ps_server: - ps_server - disk.write.requests.rate - network.outgoing.bytes_ps_server_pd01_port: - - ps_server_pd01_port - - network.outgoing.bytes - forwarder_ps_server_pd01_port: - - ps_server_pd01_port - - forwarder disk.write.requests_ps_server: - ps_server - disk.write.requests - network.incoming.bytes.rate_ps_server_pd01_port: - - ps_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_ps_server_pd01_port: - - ps_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - network.outgoing.bytes disk.latency_ps_server: - ps_server - disk.latency + feature_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - feature disk.ephemeral.size_ps_server: - ps_server - disk.ephemeral.size disk.device.capacity_ps_server: - ps_server - disk.device.capacity + forwarder_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - forwarder disk.iops_ps_server: - ps_server - disk.iops disk.device.read.bytes.rate_ps_server: - ps_server - disk.device.read.bytes.rate - network.outgoing.packets.rate_ps_server_pd01_port: - - ps_server_pd01_port - - network.outgoing.packets.rate + network.incoming.bytes_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - network.incoming.bytes cpu_util_ps_server: - ps_server - cpu_util @@ -233,21 +233,18 @@ topology_template: disk.write.bytes_ps_server: - ps_server - disk.write.bytes - feature_ps_server_pd01_port: - - ps_server_pd01_port - - feature - network.outgoing.bytes.rate_ps_server_pd01_port: - - ps_server_pd01_port - - network.outgoing.bytes.rate - attachment_ps_server_pd01_port: - - ps_server_pd01_port - - attachment + network.outpoing.packets_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - network.outpoing.packets + network.incoming.bytes.rate_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - network.incoming.bytes.rate + binding_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - binding disk.device.write.requests.rate_ps_server: - ps_server - disk.device.write.requests.rate - network.incoming.packets.rate_ps_server_pd01_port: - - ps_server_pd01_port - - network.incoming.packets.rate disk.read.requests_ps_server: - ps_server - disk.read.requests @@ -260,6 +257,9 @@ topology_template: binding_ps_server: - ps_server - binding + attachment_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - attachment os_ps_server: - ps_server - os @@ -272,9 +272,6 @@ topology_template: vcpus_ps_server: - ps_server - vcpus - network.incoming.bytes_ps_server_pd01_port: - - ps_server_pd01_port - - network.incoming.bytes disk.usage_ps_server: - ps_server - disk.usage @@ -290,16 +287,19 @@ topology_template: disk.device.allocation_ps_server: - ps_server - disk.device.allocation + network.outgoing.bytes.rate_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - network.outgoing.bytes.rate requirements: + dependency_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 + - dependency dependency_ps_server: - ps_server - dependency - dependency_ps_server_pd01_port: - - ps_server_pd01_port - - dependency - link_ps_server_pd01_port: - - ps_server_pd01_port + link_ps_server_ps_server_oam_port_0: + - ps_server_ps_server_oam_port_0 - link local_storage_ps_server: - ps_server - - local_storage
\ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml index 1d40ec29d0..2a5c880508 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,11 +34,11 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_1_order: + type: integer required: true status: SUPPORTED - port_pd01_port_related_networks: + port_pd01_port_1_related_networks: type: list required: true status: SUPPORTED @@ -42,42 +48,36 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: + port_pd01_port_1_network_role: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd01_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_order: - type: integer + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + port_pd01_port_1_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_network_role: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_network_role_tag: - type: string + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_vlan_requirements: - type: list + port_pd01_port_1_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_pd_server_user_data_format: type: list required: true @@ -99,14 +99,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd01_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -124,6 +124,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_pd01_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 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. @@ -142,12 +150,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -159,12 +161,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_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 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. @@ -195,13 +191,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + 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 - disk.iops_pd_server: + network.incoming.packets.rate_pd_server_pd01_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pd_server_pd01_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: @@ -219,7 +221,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + attachment_pd_server_pd01_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd01_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: @@ -248,12 +255,18 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment + 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 - disk.capacity_pd_server: + forwarder_pd_server_pd01_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_pd01_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: @@ -282,6 +295,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_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 feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -293,27 +312,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 - disk.write.bytes_pd_server: + network.incoming.bytes_pd_server_pd01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd01_port: + 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.incoming.packets_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_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: @@ -343,6 +354,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pd01_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.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. @@ -362,14 +379,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -391,11 +402,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED 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. @@ -414,12 +420,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.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. @@ -429,6 +429,30 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd01_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_pd01_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -449,56 +473,32 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd01_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string - required: true - status: SUPPORTED - port_pd01_port_ip_requirements: - type: list + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_order: + port_pd01_port_0_order: type: integer required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role_tag: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED compute_pd_server_user_data_format: type: list required: true @@ -520,20 +520,28 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd01_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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -563,12 +571,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -580,12 +582,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_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 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. @@ -616,7 +612,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + network.incoming.packets_pd_server_pd01_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: @@ -640,7 +636,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd01_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_pd01_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.packets.rate_pd_server_pd01_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: @@ -658,6 +666,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + 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. @@ -669,17 +682,17 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - 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 + forwarder_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - 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. @@ -703,6 +716,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_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 feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -714,27 +733,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 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.incoming.bytes.rate_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd01_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: @@ -764,6 +775,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pd01_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.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. @@ -783,14 +800,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -812,11 +823,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED 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. @@ -835,12 +841,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.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. @@ -850,6 +850,10 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_2: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_2_order: + type: integer + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -858,6 +862,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_pd01_port_2_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements compute_pd_server_availability_zone: type: list required: true @@ -870,68 +880,58 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + vm_flavor_name: + type: string required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list + port_pd01_port_2_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + port_pd01_port_2_network_role: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd01_port_2_subnetpoolid: + type: string required: true status: SUPPORTED vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd01_port_2_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd01_port_2_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role: - type: string + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd01_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_network_role_tag: - type: string + port_pd01_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: + type: string + port_pd01_port_2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.IpRequirements requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -947,14 +947,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd01_port_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -972,25 +972,32 @@ node_types: 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. + forwarder_pd_server_pd01_port_2: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - memory_pd_server: + binding_pd_server_pd01_port_2: + 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 + 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 - disk.device.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 - network.outgoing.packets.rate_pd_server_pd01_port: + 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: @@ -1007,12 +1014,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_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 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. @@ -1043,7 +1044,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd01_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pd_server_pd01_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1067,12 +1074,17 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.outgoing.packets.rate_pd_server_pd01_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_2: + 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. @@ -1096,12 +1108,13 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment + 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 - disk.capacity_pd_server: + network.incoming.packets_pd_server_pd01_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1130,6 +1143,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -1141,27 +1160,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 - disk.write.bytes_pd_server: + network.incoming.bytes_pd_server_pd01_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd01_port: + 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.incoming.packets_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1191,6 +1202,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pd01_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.read.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. @@ -1210,14 +1227,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -1239,11 +1250,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED 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. @@ -1262,12 +1268,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.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. diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml index 7863e55a5b..c719a090c2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml @@ -342,6 +342,12 @@ topology_template: directives: - substitutable properties: + port_pd01_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: @@ -350,17 +356,11 @@ topology_template: - 1 vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: + port_pd01_port_1_mac_requirements: mac_count_required: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false compute_pd_server_user_data_format: - RAW service_template_filter: @@ -384,22 +384,22 @@ topology_template: - 2 vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false + port_pd01_port_2_network_role_tag: oam vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd01_port_2_network: + - get_input: oam_net_name + port_pd01_port_2_mac_requirements: + mac_count_required: + is_required: false + compute_pd_server_user_data_format: + - RAW + port_pd01_port_2_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - get_input: oam_net_name - port_pd01_port_network_role_tag: oam - compute_pd_server_user_data_format: - - RAW service_template_filter: substitute_service_template: Nested_pd_server_2ServiceTemplate.yaml count: 1 @@ -418,6 +418,15 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_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: @@ -426,17 +435,8 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false compute_pd_server_user_data_format: - RAW service_template_filter: @@ -458,4 +458,4 @@ topology_template: - network_policy_server - abstract_pd_server - abstract_pd_server_1 - - abstract_pd_server_2 + - abstract_pd_server_2
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/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/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_serverServiceTemplate.yaml index 8d7ac38bed..9969c184f4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/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/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,10 +33,10 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_1_order: + type: integer required: true - port_pd01_port_related_networks: + port_pd01_port_1_related_networks: type: list required: true entry_schema: @@ -39,34 +44,29 @@ topology_template: vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: + port_pd01_port_1_network_role: type: string required: true - port_pd01_port_ip_requirements: + port_pd01_port_1_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_order: - type: integer + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_subnetpoolid: + port_pd01_port_1_subnetpoolid: type: string required: true - port_pd01_port_network_role: + vm_image_name: type: string required: true - port_pd01_port_network_role_tag: - type: string + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd01_port_vlan_requirements: - type: list + port_pd01_port_1_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_pd_server_user_data_format: type: list required: true @@ -92,28 +92,28 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd01_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_1_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_1_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_1_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_1_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_1_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_1_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_1_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_1_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_1_subnetpoolid network: get_attribute: - pd_server @@ -132,6 +132,9 @@ topology_template: disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + binding_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - binding memory.usage_pd_server: - pd_server - memory.usage @@ -141,18 +144,12 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -168,21 +165,27 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops + network.incoming.packets.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.bytes.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate + attachment_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - attachment + network.outgoing.packets.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus @@ -195,12 +198,15 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - forwarder + network.incoming.packets_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.packets disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -213,24 +219,24 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.incoming.bytes_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.bytes disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outgoing.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -243,6 +249,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.outpoing.packets_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -252,12 +261,9 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -267,9 +273,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -279,9 +282,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -289,12 +289,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port + dependency_pd_server_pd01_port_1: + - pd_server_pd01_port_1 - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency + link_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - link
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml index 402985b20c..10d4a8e75d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml @@ -11,6 +11,25 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + port_pd01_port_0_network_role: + type: string + required: true + port_pd01_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,45 +47,26 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string - required: true - port_pd01_port_ip_requirements: - type: list + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_order: + port_pd01_port_0_order: type: integer required: true - port_pd01_port_subnetpoolid: - type: string - required: true - port_pd01_port_network_role: - type: string - required: true - port_pd01_port_network_role_tag: + vm_image_name: type: string required: true - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true compute_pd_server_user_data_format: type: list required: true @@ -92,28 +92,28 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_attribute: - pd_server @@ -126,6 +126,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_1 capabilities: + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -141,18 +144,12 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -168,9 +165,9 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -180,27 +177,36 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -213,24 +219,24 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -243,6 +249,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -252,12 +261,9 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -267,9 +273,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -279,9 +282,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -289,12 +289,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml index 58900d43db..29363cf60d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml @@ -11,6 +11,9 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_2_order: + type: integer + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -18,6 +21,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_pd01_port_2_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements compute_pd_server_availability_zone: type: list required: true @@ -28,55 +36,47 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + vm_flavor_name: + type: string required: true - port_pd01_port_related_networks: - type: list + port_pd01_port_2_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + port_pd01_port_2_network_role: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd01_port_2_subnetpoolid: + type: string required: true vm_image_name: type: string required: true - port_pd01_port_ip_requirements: + port_pd01_port_2_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd01_port_2_related_networks: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: - type: string - required: true - port_pd01_port_network_role: - type: string + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd01_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_network_role_tag: - type: string + port_pd01_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd01_port_vlan_requirements: + compute_pd_server_user_data_format: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: + type: string + port_pd01_port_2_ip_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.IpRequirements node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd01_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_2_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_2_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_2_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_2_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_2_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_2_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_2_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_2_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_2_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_2_network - index_value requirements: - binding: @@ -137,6 +137,12 @@ topology_template: disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + forwarder_pd_server_pd01_port_2: + - pd_server_pd01_port_2 + - forwarder + binding_pd_server_pd01_port_2: + - pd_server_pd01_port_2 + - binding memory.usage_pd_server: - pd_server - memory.usage @@ -146,18 +152,12 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -173,9 +173,12 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes + network.incoming.packets.rate_pd_server_pd01_port_2: + - pd_server_pd01_port_2 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_2: + - pd_server_pd01_port_2 + - network.incoming.bytes.rate disk.iops_pd_server: - pd_server - disk.iops @@ -185,9 +188,12 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate + network.outgoing.packets.rate_pd_server_pd01_port_2: + - pd_server_pd01_port_2 + - network.outgoing.packets.rate + attachment_pd_server_pd01_port_2: + - pd_server_pd01_port_2 + - attachment vcpus_pd_server: - pd_server - vcpus @@ -200,12 +206,12 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity + network.incoming.packets_pd_server_pd01_port_2: + - pd_server_pd01_port_2 + - network.incoming.packets disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -218,24 +224,24 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_2: + - pd_server_pd01_port_2 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.incoming.bytes_pd_server_pd01_port_2: + - pd_server_pd01_port_2 + - network.incoming.bytes disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd01_port_2: + - pd_server_pd01_port_2 + - network.outgoing.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -248,6 +254,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.outpoing.packets_pd_server_pd01_port_2: + - pd_server_pd01_port_2 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -257,12 +266,9 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd01_port_2: + - pd_server_pd01_port_2 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -272,9 +278,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -284,9 +287,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -294,11 +294,11 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port + link_pd_server_pd01_port_2: + - pd_server_pd01_port_2 - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port + dependency_pd_server_pd01_port_2: + - pd_server_pd01_port_2 - dependency dependency_pd_server: - pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/in/hot-mog-0108-bs1271.yml index ac6b046317..1887bb9f93 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/in/hot-mog-0108-bs1271.yml @@ -114,8 +114,8 @@ resources: flavor: {get_attr: [network_policy_server, name]} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_2} - - port: {get_resource: pd01_port_3} + - port: {get_resource: pd_server_2_oam_port_0} + - port: {get_resource: pd_server_0_oam_port_0} user_data_format: RAW pd01_port_0: @@ -126,11 +126,11 @@ resources: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - pd01_port_2: + pd_server_2_oam_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - pd01_port_3: + pd_server_0_oam_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index a16a063daa..d3d5fbba28 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,11 +34,11 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_1_order: + type: integer required: true status: SUPPORTED - port_pd01_port_related_networks: + port_pd01_port_1_related_networks: type: list required: true status: SUPPORTED @@ -42,48 +48,42 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: + port_pd01_port_1_network_role: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd01_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: - type: integer + port_pd01_port_1_subnetpoolid: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_network_role: - type: string + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_network_role_tag: + port_pd01_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_1_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string compute_pd_server_user_data_format: type: list required: true @@ -105,14 +105,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd01_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -130,6 +130,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_pd01_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 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. @@ -148,12 +156,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -165,12 +167,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_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 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. @@ -201,13 +197,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + 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 - disk.iops_pd_server: + network.incoming.packets.rate_pd_server_pd01_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pd_server_pd01_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: @@ -225,7 +227,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + attachment_pd_server_pd01_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd01_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: @@ -254,12 +261,18 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment + 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 - disk.capacity_pd_server: + forwarder_pd_server_pd01_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_pd01_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: @@ -288,6 +301,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_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 feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -299,27 +318,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 - disk.write.bytes_pd_server: + network.incoming.bytes_pd_server_pd01_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd01_port: + 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.incoming.packets_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_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: @@ -349,6 +360,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pd01_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.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. @@ -368,14 +385,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -397,11 +408,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED 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. @@ -420,12 +426,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.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. @@ -435,82 +435,82 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: - type: list + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - compute_pd_server_name: + port_pd01_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd01_port_related_networks: + port_pd01_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: + port_pd01_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + compute_pd_server_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_order: - type: integer + compute_pd_server_name: + type: list required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + entry_schema: + type: string + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_network_role: - type: string + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd01_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_network_role_tag: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED compute_pd_server_user_data_format: type: list required: true @@ -532,20 +532,28 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd01_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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -575,12 +583,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -592,12 +594,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_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 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. @@ -628,7 +624,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + network.incoming.packets_pd_server_pd01_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: @@ -652,7 +648,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd01_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_pd01_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.packets.rate_pd_server_pd01_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: @@ -670,6 +678,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + 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. @@ -681,17 +694,17 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - 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 + forwarder_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - 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. @@ -715,6 +728,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_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 feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -726,27 +745,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 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.incoming.bytes.rate_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd01_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: @@ -776,6 +787,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pd01_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.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. @@ -795,14 +812,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -824,11 +835,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED 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. @@ -847,12 +853,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.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. @@ -862,26 +862,16 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_2: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pd01_port_2_order: - type: integer - required: true - status: SUPPORTED - port_pd01_port_3_network_role: - type: string - required: true - status: SUPPORTED - port_pd01_port_3_related_networks: + port_pd_server_2_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_2_vlan_requirements: - type: list + type: org.openecomp.datatypes.network.VlanRequirements + 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.VlanRequirements compute_pd_server_availability_zone: type: list required: true @@ -894,50 +884,44 @@ node_types: status: SUPPORTED entry_schema: type: string - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_pd01_port_2_network_role_tag: - type: string + port_pd_server_2_oam_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_3_ip_requirements: - type: list + port_pd_server_2_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_3_network: - type: list + port_pd_server_2_oam_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port_2_network_role: + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_2_subnetpoolid: - type: string + port_pd_server_2_oam_port_0_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_3_subnetpoolid: + port_pd_server_0_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_2_network: + port_pd_server_0_oam_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_0_oam_port_0_subnetpoolid: + type: string required: true status: SUPPORTED compute_pd_server_user_data_format: @@ -946,13 +930,21 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_2_ip_requirements: + port_pd_server_0_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_3_order: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_2_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd_server_0_oam_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_pd_server_0_oam_port_0_order: type: integer required: true status: SUPPORTED @@ -964,32 +956,40 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd01_port_3_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_0_oam_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_2_oam_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_pd01_port_2_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_pd01_port_3_vlan_requirements: + type: string + port_pd_server_2_oam_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_2_exCP_naming: - type: org.openecomp.datatypes.Naming + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_2_oam_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_3_network_role_tag: - type: string + entry_schema: + type: string + port_pd_server_0_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_3_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_2_oam_port_0_network_role: + type: string required: true status: SUPPORTED requirements: @@ -1007,27 +1007,27 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port_2: + - dependency_pd_server_pd_server_2_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port_2: + - link_pd_server_pd_server_2_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_pd01_port_3: + - 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_pd01_port_3: + - link_pd_server_pd_server_0_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1045,47 +1045,32 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port_2: - type: org.openecomp.capabilities.Forwarder + 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 - binding_pd_server_pd01_port_2: - 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 - forwarder_pd_server_pd01_port_3: - type: org.openecomp.capabilities.Forwarder + 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 - binding_pd_server_pd01_port_3: - 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 - memory.usage_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 - memory_pd_server: + network.incoming.bytes.rate_pd_server_pd_server_2_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.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. + forwarder_pd_server_pd_server_0_oam_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -1100,6 +1085,19 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_pd_server_0_oam_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + binding_pd_server_pd_server_2_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 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. @@ -1130,31 +1128,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd01_port_2: + network.outpoing.packets_pd_server_pd_server_2_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.iops_pd_server: + 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.packets.rate_pd_server_pd01_port_3: + network.incoming.packets.rate_pd_server_pd_server_2_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_pd01_port_3: + 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: @@ -1172,25 +1164,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port_3: - 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_pd01_port_2: + network.outgoing.bytes_pd_server_pd_server_2_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 - attachment_pd_server_pd01_port_2: - type: tosca.capabilities.Attachment + feature_pd_server_pd_server_2_oam_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port_3: - type: tosca.capabilities.Attachment + forwarder_pd_server_pd_server_2_oam_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -1223,25 +1209,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pd01_port_2: + 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_pd_server_pd01_port_3: + 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: @@ -1258,11 +1244,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + 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: - - 1 + - 0 - UNBOUNDED feature_pd_server: type: tosca.capabilities.Node @@ -1275,33 +1263,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port_3: + 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.bytes.rate_pd_server_pd01_port_3: + 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 - disk.write.bytes_pd_server: + 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.outgoing.bytes_pd_server_pd01_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_pd_server_0_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -1323,25 +1304,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port_3: - 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.outpoing.packets_pd_server_pd01_port_2: + network.outgoing.bytes.rate_pd_server_pd_server_2_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_pd01_port_3: + network.incoming.bytes_pd_server_pd_server_2_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: @@ -1366,23 +1341,25 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port_3: - type: tosca.capabilities.Node + 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 - feature_pd_server_pd01_port_2: - type: tosca.capabilities.Node + 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 - disk.write.requests.rate_pd_server: + network.incoming.packets_pd_server_pd_server_2_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.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: @@ -1394,6 +1371,12 @@ node_types: occurrences: - 1 - UNBOUNDED + 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.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. @@ -1412,9 +1395,26 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd_server_2_oam_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_2_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.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 + 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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml index f892137ee1..6be1a7887c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml @@ -327,6 +327,12 @@ topology_template: directives: - substitutable properties: + port_pd01_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: @@ -337,20 +343,14 @@ topology_template: get_attribute: - network_policy_server - name - port_pd01_port_mac_requirements: + port_pd01_port_1_mac_requirements: mac_count_required: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: + port_pd01_port_1_network_role_tag: oam + port_pd01_port_1_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -376,34 +376,34 @@ topology_template: get_attribute: - network_policy_server - name - port_pd01_port_2_network_role_tag: oam - port_pd01_port_3_ip_requirements: + port_pd_server_2_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_3_network: - - get_input: oam_net_name vm_image_name: get_input: pd_image_name - port_pd01_port_2_network: - - get_input: oam_net_name - port_pd01_port_2_mac_requirements: - mac_count_required: - is_required: false + port_pd_server_0_oam_port_0_network_role_tag: oam compute_pd_server_user_data_format: - RAW - port_pd01_port_2_ip_requirements: + port_pd_server_2_oam_port_0_mac_requirements: + mac_count_required: + is_required: false + 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_pd01_port_3_mac_requirements: + port_pd_server_2_oam_port_0_network_role_tag: oam + port_pd_server_0_oam_port_0_network: + - get_input: oam_net_name + port_pd_server_2_oam_port_0_network: + - get_input: oam_net_name + port_pd_server_0_oam_port_0_mac_requirements: mac_count_required: is_required: false - port_pd01_port_3_network_role_tag: oam service_template_filter: substitute_service_template: Nested_pd_server_2ServiceTemplate.yaml count: 1 @@ -422,6 +422,19 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - get_attribute: + - network_policy_server + - name + port_pd01_port_0_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: @@ -432,21 +445,8 @@ topology_template: get_attribute: - network_policy_server - name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: - - get_attribute: - - network_policy_server - - name compute_pd_server_user_data_format: - RAW service_template_filter: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/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/threeSameComputesNoConsolidation/out/Nested_pd_serverServiceTemplate.yaml index 2d01270aaf..734675faec 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/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/threeSameComputesNoConsolidation/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,10 +33,10 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_1_order: + type: integer required: true - port_pd01_port_related_networks: + port_pd01_port_1_related_networks: type: list required: true entry_schema: @@ -39,39 +44,34 @@ topology_template: vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: + port_pd01_port_1_network_role: type: string required: true - port_pd01_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + port_pd01_port_1_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_subnetpoolid: + port_pd01_port_1_subnetpoolid: type: string required: true - port_pd01_port_network_role: + vm_image_name: type: string required: true - port_pd01_port_network_role_tag: + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd01_port_1_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: + port_pd01_port_1_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string compute_pd_server_user_data_format: type: list required: true @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd01_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_1_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_1_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_1_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_1_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_1_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_1_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_1_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_1_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_1_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_1_network - index_value requirements: - binding: @@ -137,6 +137,9 @@ topology_template: disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + binding_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - binding memory.usage_pd_server: - pd_server - memory.usage @@ -146,18 +149,12 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -173,21 +170,27 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops + network.incoming.packets.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.bytes.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate + attachment_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - attachment + network.outgoing.packets.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus @@ -200,12 +203,15 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - forwarder + network.incoming.packets_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.packets disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -218,24 +224,24 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.incoming.bytes_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.bytes disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outgoing.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -248,6 +254,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.outpoing.packets_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -257,12 +266,9 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -272,9 +278,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -284,9 +287,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -294,12 +294,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port + dependency_pd_server_pd01_port_1: + - pd_server_pd01_port_1 - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency + link_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - link
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml index 34e182d166..6adf9df5ea 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml @@ -11,67 +11,67 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: - type: list + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - compute_pd_server_name: + port_pd01_port_0_network: type: list required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_related_networks: + port_pd01_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: + port_pd01_port_0_network_role: type: string required: true - port_pd01_port_ip_requirements: + port_pd01_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + compute_pd_server_availability_zone: type: list required: true entry_schema: type: string - port_pd01_port_order: - type: integer + compute_pd_server_name: + type: list required: true - port_pd01_port_subnetpoolid: + entry_schema: + type: string + vm_flavor_name: type: string required: true - port_pd01_port_network_role: - type: string + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd01_port_network_role_tag: + port_pd01_port_0_order: + type: integer + required: true + vm_image_name: type: string required: true - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true compute_pd_server_user_data_format: type: list required: true @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_0_network - index_value requirements: - binding: @@ -131,6 +131,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_1 capabilities: + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -146,18 +149,12 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -173,9 +170,9 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -185,27 +182,36 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -218,24 +224,24 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -248,6 +254,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -257,12 +266,9 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -272,9 +278,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -284,9 +287,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -294,12 +294,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml index 7b93f4a508..f7e37a33ac 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml @@ -11,22 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pd01_port_2_order: - type: integer - required: true - port_pd01_port_3_network_role: - type: string - required: true - port_pd01_port_3_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_2_vlan_requirements: + port_pd_server_2_oam_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true compute_pd_server_availability_zone: type: list required: true @@ -37,53 +29,54 @@ topology_template: required: true entry_schema: type: string - vm_flavor_name: + port_pd_server_2_oam_port_0_order: + type: integer + required: true + port_pd_server_2_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd_server_2_oam_port_0_subnetpoolid: type: string required: true - port_pd01_port_2_network_role_tag: + vm_flavor_name: type: string required: true - port_pd01_port_3_ip_requirements: + port_pd_server_2_oam_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_3_network: - type: list - required: true - entry_schema: - type: string - port_pd01_port_2_network_role: - type: string - required: true - port_pd01_port_2_subnetpoolid: - type: string - required: true vm_image_name: type: string required: true - port_pd01_port_3_subnetpoolid: + port_pd_server_0_oam_port_0_network_role_tag: type: string required: true - port_pd01_port_2_network: + port_pd_server_0_oam_port_0_related_networks: type: list required: true entry_schema: - type: string - port_pd01_port_2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_0_oam_port_0_subnetpoolid: + type: string required: true compute_pd_server_user_data_format: type: list required: true entry_schema: type: string - port_pd01_port_2_ip_requirements: + port_pd_server_0_oam_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_3_order: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_2_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd_server_0_oam_port_0_network_role: + type: string + required: true + port_pd_server_0_oam_port_0_order: type: integer required: true index_value: @@ -93,28 +86,35 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd01_port_3_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_0_oam_port_0_ip_requirements: + type: list required: true - port_pd01_port_2_related_networks: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_2_oam_port_0_network_role_tag: + type: string + required: true + port_pd_server_0_oam_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd_server_2_oam_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_3_vlan_requirements: + port_pd_server_2_oam_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_2_exCP_naming: - type: org.openecomp.datatypes.Naming + type: string + port_pd_server_0_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_3_network_role_tag: + port_pd_server_2_oam_port_0_network_role: type: string required: true - port_pd01_port_3_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -135,62 +135,62 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port_2: + pd_server_pd_server_2_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_2_exCP_naming + get_input: port_pd_server_2_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_2_vlan_requirements + get_input: port_pd_server_2_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_2_related_networks + get_input: port_pd_server_2_oam_port_0_related_networks ip_requirements: - get_input: port_pd01_port_2_ip_requirements + get_input: port_pd_server_2_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_2_network_role_tag + get_input: port_pd_server_2_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_2_mac_requirements + get_input: port_pd_server_2_oam_port_0_mac_requirements order: - get_input: port_pd01_port_2_order + get_input: port_pd_server_2_oam_port_0_order network_role: - get_input: port_pd01_port_2_network_role + get_input: port_pd_server_2_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_2_subnetpoolid + get_input: port_pd_server_2_oam_port_0_subnetpoolid network: get_input: - - port_pd01_port_2_network + - port_pd_server_2_oam_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo - pd_server_pd01_port_3: + pd_server_pd_server_0_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_3_exCP_naming + get_input: port_pd_server_0_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_3_vlan_requirements + get_input: port_pd_server_0_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_3_related_networks + get_input: port_pd_server_0_oam_port_0_related_networks ip_requirements: - get_input: port_pd01_port_3_ip_requirements + get_input: port_pd_server_0_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_3_network_role_tag + get_input: port_pd_server_0_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_3_mac_requirements + get_input: port_pd_server_0_oam_port_0_mac_requirements order: - get_input: port_pd01_port_3_order + get_input: port_pd_server_0_oam_port_0_order network_role: - get_input: port_pd01_port_3_network_role + get_input: port_pd_server_0_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_3_subnetpoolid + get_input: port_pd_server_0_oam_port_0_subnetpoolid network: get_input: - - port_pd01_port_3_network + - port_pd_server_0_oam_port_0_network - index_value requirements: - binding: @@ -206,18 +206,6 @@ topology_template: disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate - forwarder_pd_server_pd01_port_2: - - pd_server_pd01_port_2 - - forwarder - binding_pd_server_pd01_port_2: - - pd_server_pd01_port_2 - - binding - forwarder_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - forwarder - binding_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - binding memory.usage_pd_server: - pd_server - memory.usage @@ -227,12 +215,24 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage + network.incoming.bytes.rate_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 + - network.incoming.bytes.rate + 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 + feature_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - feature + binding_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 + - binding cpu_pd_server: - pd_server - cpu @@ -248,39 +248,33 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.incoming.packets.rate_pd_server_pd01_port_2: - - pd_server_pd01_port_2 + network.outpoing.packets_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 + - network.outpoing.packets + network.outgoing.packets.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outgoing.packets.rate + network.incoming.packets.rate_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 - network.incoming.packets.rate - network.incoming.bytes.rate_pd_server_pd01_port_2: - - pd_server_pd01_port_2 - - network.incoming.bytes.rate disk.iops_pd_server: - pd_server - disk.iops - network.incoming.packets.rate_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - network.incoming.packets.rate - network.incoming.bytes.rate_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - network.incoming.bytes.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.outgoing.packets.rate_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - network.outgoing.packets.rate - network.outgoing.packets.rate_pd_server_pd01_port_2: - - pd_server_pd01_port_2 - - network.outgoing.packets.rate - attachment_pd_server_pd01_port_2: - - pd_server_pd01_port_2 - - attachment - attachment_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - attachment + network.outgoing.bytes_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 + - network.outgoing.bytes + feature_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 + - feature + forwarder_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 + - forwarder vcpus_pd_server: - pd_server - vcpus @@ -296,48 +290,45 @@ topology_template: disk.capacity_pd_server: - pd_server - disk.capacity - network.incoming.packets_pd_server_pd01_port_2: - - pd_server_pd01_port_2 - - network.incoming.packets + 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_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - network.incoming.packets binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests - network.outgoing.bytes.rate_pd_server_pd01_port_2: - - pd_server_pd01_port_2 - - network.outgoing.bytes.rate + 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.incoming.bytes_pd_server_pd01_port_2: - - pd_server_pd01_port_2 - - network.incoming.bytes - network.incoming.bytes_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - network.incoming.bytes - network.outgoing.bytes.rate_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - network.outgoing.bytes.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.outgoing.bytes_pd_server_pd01_port_2: - - pd_server_pd01_port_2 + 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 @@ -347,18 +338,15 @@ topology_template: disk.device.read.bytes_pd_server: - pd_server - disk.device.read.bytes - network.outgoing.bytes_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - network.outgoing.bytes disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes - network.outpoing.packets_pd_server_pd01_port_2: - - pd_server_pd01_port_2 - - network.outpoing.packets - network.outpoing.packets_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - network.outpoing.packets + network.outgoing.bytes.rate_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 + - network.outgoing.bytes.rate + network.incoming.bytes_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 + - network.incoming.bytes disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -368,21 +356,24 @@ topology_template: host_pd_server: - pd_server - host - feature_pd_server_pd01_port_3: - - pd_server_pd01_port_3 - - feature - feature_pd_server_pd01_port_2: - - pd_server_pd01_port_2 - - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + network.incoming.packets_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 + - network.incoming.packets + 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.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 @@ -392,25 +383,34 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity + attachment_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 + - attachment + network.outgoing.packets.rate_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 + - network.outgoing.packets.rate 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_pd01_port_2: - - pd_server_pd01_port_2 + link_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 - link - link_pd_server_pd01_port_3: - - pd_server_pd01_port_3 + link_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 - link - dependency_pd_server_pd01_port_2: - - pd_server_pd01_port_2 - - dependency dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd01_port_3: - - pd_server_pd01_port_3 + dependency_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - dependency + dependency_pd_server_pd_server_2_oam_port_0: + - pd_server_pd_server_2_oam_port_0 - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml index a7bda34fb6..4e72ded9e5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,82 +8,82 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: - type: list + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - compute_pd_server_name: + port_pd01_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd01_port_related_networks: + port_pd01_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: + port_pd01_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + compute_pd_server_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_order: - type: integer + compute_pd_server_name: + type: list required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + entry_schema: + type: string + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_network_role: - type: string + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd01_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_network_role_tag: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED compute_pd_server_user_data_format: type: list required: true @@ -109,20 +109,28 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd01_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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -152,12 +160,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -169,12 +171,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_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 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. @@ -205,7 +201,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + network.incoming.packets_pd_server_pd01_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: @@ -229,7 +225,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd01_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_pd01_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.packets.rate_pd_server_pd01_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: @@ -247,6 +255,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + 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. @@ -258,17 +271,17 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - 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 + forwarder_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - 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. @@ -292,6 +305,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_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 feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -303,27 +322,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 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.incoming.bytes.rate_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd01_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: @@ -353,6 +364,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pd01_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.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. @@ -372,14 +389,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -401,11 +412,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED 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. @@ -424,12 +430,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.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. @@ -445,7 +445,7 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps01_port_subnetpoolid: + port_ps01_port_0_network_role: type: string required: true status: SUPPORTED @@ -461,6 +461,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_ps01_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 @@ -469,7 +475,13 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps01_port_vlan_requirements: + port_ps01_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_ps01_port_0_vlan_requirements: type: list required: true status: SUPPORTED @@ -479,13 +491,11 @@ node_types: type: string required: true status: SUPPORTED - port_ps01_port_related_networks: - type: list + port_ps01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps01_port_order: + port_ps01_port_0_order: type: integer required: true status: SUPPORTED @@ -493,80 +503,64 @@ node_types: type: string required: true status: SUPPORTED - port_ps01_port_network_role: + port_ps01_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_ps01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_ps01_port_network: - type: list + port_ps01_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_ps01_port_ip_requirements: + port_ps01_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_ps01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.RelatedNetworksAssignments attributes: ps_server_accessIPv4: type: string status: SUPPORTED requirements: - - dependency_ps_server: + - dependency_ps_server_ps01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_ps_server: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_ps_server_ps01_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_ps_server_ps01_port: + - 1 + - 1 + - dependency_ps_server: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_server_ps01_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - capabilities: - network.incoming.packets.rate_ps_server_ps01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + - local_storage_ps_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 + - 0 - UNBOUNDED + capabilities: instance_ps_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_ps_server_ps01_port: + network.incoming.packets_ps_server_ps01_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: @@ -579,12 +573,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_server_ps01_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 cpu.delta_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -597,12 +585,12 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_ps01_port: + feature_ps_server: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_ps_server: + feature_ps_server_ps01_port_0: type: tosca.capabilities.Node occurrences: - 1 @@ -649,12 +637,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_ps01_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.latency_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -720,19 +702,19 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu_util_ps_server: + network.outpoing.packets_ps_server_ps01_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_ps_server: + cpu_util_ps_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_ps_server_ps01_port: + memory.resident_ps_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: @@ -750,7 +732,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_server_ps01_port: + network.incoming.bytes_ps_server_ps01_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_ps_server_ps01_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: @@ -785,11 +773,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_ps_server_ps01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED os_ps_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -801,7 +784,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_ps01_port: + binding_ps_server_ps01_port_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -809,7 +792,7 @@ node_types: occurrences: - 0 - UNBOUNDED - forwarder_ps_server_ps01_port: + forwarder_ps_server_ps01_port_0: type: org.openecomp.capabilities.Forwarder occurrences: - 1 @@ -826,6 +809,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_ps_server_ps01_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.usage_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -849,7 +837,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_ps01_port: + network.outgoing.bytes_ps_server_ps01_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.packets.rate_ps_server_ps01_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: @@ -861,9 +855,15 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_ps_server_ps01_port: + network.incoming.packets.rate_ps_server_ps01_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 + network.incoming.bytes.rate_ps_server_ps01_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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml index 4d445e467c..6f9a2ce876 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml @@ -683,6 +683,18 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - get_input: oam_net_name + port_pd01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_0_network_role_tag: oam compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -691,22 +703,10 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false vm_image_name: get_attribute: - abstract_ps_server - ps_server_accessIPv4 - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: - - get_input: oam_net_name - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -730,24 +730,24 @@ topology_template: - get_input: availabilityzone_name compute_ps_server_user_data_format: - RAW - vm_flavor_name: - get_input: pd_flavor_name - vm_image_name: - get_attribute: - - abstract_pd_server - - pd_server_accessIPv4 - port_ps01_port_mac_requirements: - mac_count_required: - is_required: false - port_ps01_port_network: + port_ps01_port_0_network: - get_input: oam_net_name - port_ps01_port_ip_requirements: + port_ps01_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_ps01_port_network_role_tag: oam + vm_flavor_name: + get_input: pd_flavor_name + port_ps01_port_0_mac_requirements: + mac_count_required: + is_required: false + vm_image_name: + get_attribute: + - abstract_pd_server + - pd_server_accessIPv4 + port_ps01_port_0_network_role_tag: oam service_template_filter: substitute_service_template: Nested_ps_serverServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/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/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml index e0f1093cd2..f6a610a7ed 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/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/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml @@ -11,67 +11,67 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: - type: list + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - compute_pd_server_name: + port_pd01_port_0_network: type: list required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_related_networks: + port_pd01_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: + port_pd01_port_0_network_role: type: string required: true - port_pd01_port_ip_requirements: + port_pd01_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + compute_pd_server_availability_zone: type: list required: true entry_schema: type: string - port_pd01_port_order: - type: integer + compute_pd_server_name: + type: list required: true - port_pd01_port_subnetpoolid: + entry_schema: + type: string + vm_flavor_name: type: string required: true - port_pd01_port_network_role: - type: string + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd01_port_0_order: + type: integer required: true - port_pd01_port_network_role_tag: + vm_image_name: type: string required: true - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true compute_pd_server_user_data_format: type: list required: true @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_0_network - index_value requirements: - binding: @@ -138,6 +138,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -153,18 +156,12 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -180,9 +177,9 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -192,27 +189,36 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -225,24 +231,24 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -255,6 +261,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -264,12 +273,9 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -279,9 +285,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -291,9 +294,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -301,12 +301,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml index 4b513cac7f..76bdc2b7c1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml @@ -16,7 +16,7 @@ topology_template: required: true entry_schema: type: string - port_ps01_port_subnetpoolid: + port_ps01_port_0_network_role: type: string required: true compute_ps_server_availability_zone: @@ -29,6 +29,11 @@ topology_template: required: true entry_schema: type: string + port_ps01_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 @@ -36,7 +41,12 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps01_port_vlan_requirements: + port_ps01_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_ps01_port_0_vlan_requirements: type: list required: true entry_schema: @@ -44,90 +54,80 @@ topology_template: vm_flavor_name: type: string required: true - port_ps01_port_related_networks: - type: list + port_ps01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps01_port_order: + port_ps01_port_0_order: type: integer required: true vm_image_name: type: string required: true - port_ps01_port_network_role: + port_ps01_port_0_network_role_tag: type: string required: true - port_ps01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_ps01_port_network: - type: list + port_ps01_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: string - port_ps01_port_ip_requirements: + port_ps01_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps01_port_network_role_tag: - type: string - required: true - port_ps01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true + type: org.openecomp.datatypes.network.RelatedNetworksAssignments node_templates: - ps_server: - type: org.openecomp.resource.vfc.compute.nodes.heat.ps_server - properties: - availability_zone: - get_input: - - compute_ps_server_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_ps_server_name - - index_value - user_data_format: - get_input: - - compute_ps_server_user_data_format - - index_value - ps_server_ps01_port: + ps_server_ps01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_ps01_port_exCP_naming + get_input: port_ps01_port_0_exCP_naming vlan_requirements: - get_input: port_ps01_port_vlan_requirements + get_input: port_ps01_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_ps01_port_related_networks + get_input: port_ps01_port_0_related_networks ip_requirements: - get_input: port_ps01_port_ip_requirements + get_input: port_ps01_port_0_ip_requirements network_role_tag: - get_input: port_ps01_port_network_role_tag + get_input: port_ps01_port_0_network_role_tag mac_requirements: - get_input: port_ps01_port_mac_requirements + get_input: port_ps01_port_0_mac_requirements order: - get_input: port_ps01_port_order + get_input: port_ps01_port_0_order network_role: - get_input: port_ps01_port_network_role + get_input: port_ps01_port_0_network_role subnetpoolid: - get_input: port_ps01_port_subnetpoolid + get_input: port_ps01_port_0_subnetpoolid network: get_input: - - port_ps01_port_network + - port_ps01_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: ps_server relationship: tosca.relationships.network.BindsTo + ps_server: + type: org.openecomp.resource.vfc.compute.nodes.heat.ps_server + properties: + availability_zone: + get_input: + - compute_ps_server_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_ps_server_name + - index_value + user_data_format: + get_input: + - compute_ps_server_user_data_format + - index_value outputs: ps_server_accessIPv4: type: string @@ -138,33 +138,27 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.ps_server capabilities: - network.incoming.packets.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.packets.rate instance_ps_server: - ps_server - instance - network.outpoing.packets_ps_server_ps01_port: - - ps_server_ps01_port - - network.outpoing.packets + network.incoming.packets_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.incoming.packets host_ps_server: - ps_server - host - network.incoming.packets_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.packets cpu.delta_ps_server: - ps_server - cpu.delta disk.write.bytes.rate_ps_server: - ps_server - disk.write.bytes.rate - feature_ps_server_ps01_port: - - ps_server_ps01_port - - feature feature_ps_server: - ps_server - feature + feature_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - feature disk.root.size_ps_server: - ps_server - disk.root.size @@ -186,9 +180,6 @@ topology_template: disk.device.iops_ps_server: - ps_server - disk.device.iops - network.outgoing.packets.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.outgoing.packets.rate disk.device.latency_ps_server: - ps_server - disk.device.latency @@ -222,23 +213,26 @@ topology_template: disk.device.read.bytes.rate_ps_server: - ps_server - disk.device.read.bytes.rate + network.outpoing.packets_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.outpoing.packets cpu_util_ps_server: - ps_server - cpu_util memory.resident_ps_server: - ps_server - memory.resident - network.incoming.bytes_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.bytes disk.device.read.requests_ps_server: - ps_server - disk.device.read.requests disk.write.bytes_ps_server: - ps_server - disk.write.bytes - network.outgoing.bytes.rate_ps_server_ps01_port: - - ps_server_ps01_port + network.incoming.bytes_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.incoming.bytes + network.outgoing.bytes.rate_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - network.outgoing.bytes.rate disk.device.write.requests.rate_ps_server: - ps_server @@ -255,20 +249,17 @@ topology_template: binding_ps_server: - ps_server - binding - attachment_ps_server_ps01_port: - - ps_server_ps01_port - - attachment os_ps_server: - ps_server - os disk.device.usage_ps_server: - ps_server - disk.device.usage - binding_ps_server_ps01_port: - - ps_server_ps01_port + binding_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - binding - forwarder_ps_server_ps01_port: - - ps_server_ps01_port + forwarder_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - forwarder disk.device.write.bytes.rate_ps_server: - ps_server @@ -276,6 +267,9 @@ topology_template: vcpus_ps_server: - ps_server - vcpus + attachment_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - attachment disk.usage_ps_server: - ps_server - disk.usage @@ -288,25 +282,31 @@ topology_template: disk.capacity_ps_server: - ps_server - disk.capacity - network.incoming.bytes.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.bytes.rate + network.outgoing.bytes_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.outgoing.bytes + network.outgoing.packets.rate_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.outgoing.packets.rate disk.device.allocation_ps_server: - ps_server - disk.device.allocation - network.outgoing.bytes_ps_server_ps01_port: - - ps_server_ps01_port - - network.outgoing.bytes + network.incoming.packets.rate_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.incoming.bytes.rate requirements: dependency_ps_server: - ps_server - dependency - link_ps_server_ps01_port: - - ps_server_ps01_port - - link - dependency_ps_server_ps01_port: - - ps_server_ps01_port + dependency_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - dependency + link_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - link local_storage_ps_server: - ps_server - - local_storage
\ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml index 3ee76077dc..092c618595 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,82 +8,82 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: - type: list + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - compute_pd_server_name: + port_pd01_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd01_port_related_networks: + port_pd01_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: + port_pd01_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + compute_pd_server_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_order: - type: integer + compute_pd_server_name: + type: list required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + entry_schema: + type: string + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_network_role: - type: string + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd01_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_network_role_tag: + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED compute_pd_server_user_data_format: type: list required: true @@ -105,20 +105,28 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd01_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 scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -148,12 +156,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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 os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -165,12 +167,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_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 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. @@ -201,7 +197,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + network.incoming.packets_pd_server_pd01_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: @@ -225,7 +221,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd01_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_pd01_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.packets.rate_pd_server_pd01_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: @@ -243,6 +251,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + 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. @@ -254,17 +267,17 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - 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 + forwarder_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - 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. @@ -288,6 +301,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_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 feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -299,27 +318,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_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 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.incoming.bytes.rate_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_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_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd01_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: @@ -349,6 +360,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pd01_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.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. @@ -368,14 +385,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_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 - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -397,11 +408,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED 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. @@ -420,12 +426,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_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.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. @@ -441,7 +441,7 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps01_port_subnetpoolid: + port_ps01_port_0_network_role: type: string required: true status: SUPPORTED @@ -457,6 +457,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_ps01_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 @@ -465,7 +471,13 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps01_port_vlan_requirements: + port_ps01_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_ps01_port_0_vlan_requirements: type: list required: true status: SUPPORTED @@ -475,13 +487,11 @@ node_types: type: string required: true status: SUPPORTED - port_ps01_port_related_networks: - type: list + port_ps01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps01_port_order: + port_ps01_port_0_order: type: integer required: true status: SUPPORTED @@ -489,76 +499,60 @@ node_types: type: string required: true status: SUPPORTED - port_ps01_port_network_role: + port_ps01_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_ps01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_ps01_port_network: - type: list + port_ps01_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_ps01_port_ip_requirements: + port_ps01_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_ps01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.RelatedNetworksAssignments requirements: - - dependency_ps_server: + - dependency_ps_server_ps01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_ps_server: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_ps_server_ps01_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_ps_server_ps01_port: + - 1 + - 1 + - dependency_ps_server: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_server_ps01_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - capabilities: - network.incoming.packets.rate_ps_server_ps01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + - local_storage_ps_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 + - 0 - UNBOUNDED + capabilities: instance_ps_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_ps_server_ps01_port: + network.incoming.packets_ps_server_ps01_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: @@ -571,12 +565,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_server_ps01_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 cpu.delta_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -589,12 +577,12 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_ps01_port: + feature_ps_server: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_ps_server: + feature_ps_server_ps01_port_0: type: tosca.capabilities.Node occurrences: - 1 @@ -641,12 +629,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_ps01_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.latency_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -712,19 +694,19 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu_util_ps_server: + network.outpoing.packets_ps_server_ps01_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_ps_server: + cpu_util_ps_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_ps_server_ps01_port: + memory.resident_ps_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: @@ -742,7 +724,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_server_ps01_port: + network.incoming.bytes_ps_server_ps01_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_ps_server_ps01_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: @@ -777,11 +765,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_ps_server_ps01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED os_ps_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -793,7 +776,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_ps01_port: + binding_ps_server_ps01_port_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -801,7 +784,7 @@ node_types: occurrences: - 0 - UNBOUNDED - forwarder_ps_server_ps01_port: + forwarder_ps_server_ps01_port_0: type: org.openecomp.capabilities.Forwarder occurrences: - 1 @@ -818,6 +801,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_ps_server_ps01_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.usage_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -841,7 +829,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_ps01_port: + network.outgoing.bytes_ps_server_ps01_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.packets.rate_ps_server_ps01_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: @@ -853,9 +847,15 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_ps_server_ps01_port: + network.incoming.packets.rate_ps_server_ps01_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 + network.incoming.bytes.rate_ps_server_ps01_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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml index 3fe02b86e4..34880e6861 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml @@ -683,6 +683,18 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - get_input: oam_net_name + port_pd01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_0_network_role_tag: oam compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -691,20 +703,8 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: - - get_input: oam_net_name - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -728,22 +728,22 @@ topology_template: - get_input: availabilityzone_name compute_ps_server_user_data_format: - RAW - vm_flavor_name: - get_input: pd_flavor_name - vm_image_name: - get_input: pd_image_name - port_ps01_port_mac_requirements: - mac_count_required: - is_required: false - port_ps01_port_network: + port_ps01_port_0_network: - get_input: oam_net_name - port_ps01_port_ip_requirements: + port_ps01_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_ps01_port_network_role_tag: oam + vm_flavor_name: + get_input: pd_flavor_name + port_ps01_port_0_mac_requirements: + mac_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_ps01_port_0_network_role_tag: oam service_template_filter: substitute_service_template: Nested_ps_serverServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/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/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml index 2d01270aaf..d9500a25e0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/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/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml @@ -11,67 +11,67 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: - type: list + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - compute_pd_server_name: + port_pd01_port_0_network: type: list required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_related_networks: + port_pd01_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: + port_pd01_port_0_network_role: type: string required: true - port_pd01_port_ip_requirements: + port_pd01_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + compute_pd_server_availability_zone: type: list required: true entry_schema: type: string - port_pd01_port_order: - type: integer + compute_pd_server_name: + type: list required: true - port_pd01_port_subnetpoolid: + entry_schema: + type: string + vm_flavor_name: type: string required: true - port_pd01_port_network_role: - type: string + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd01_port_0_order: + type: integer required: true - port_pd01_port_network_role_tag: + vm_image_name: type: string required: true - port_pd01_port_vlan_requirements: + port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_subnetpoolid: + type: string + required: true compute_pd_server_user_data_format: type: list required: true @@ -97,31 +97,31 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd01_port_0_network - index_value requirements: - binding: @@ -131,6 +131,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -146,18 +149,12 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -173,9 +170,9 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -185,27 +182,36 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -218,24 +224,24 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -248,6 +254,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -257,12 +266,9 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -272,9 +278,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -284,9 +287,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -294,12 +294,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml index 87be4e0414..a462b8a6de 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml @@ -16,7 +16,7 @@ topology_template: required: true entry_schema: type: string - port_ps01_port_subnetpoolid: + port_ps01_port_0_network_role: type: string required: true compute_ps_server_availability_zone: @@ -29,6 +29,11 @@ topology_template: required: true entry_schema: type: string + port_ps01_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 @@ -36,7 +41,12 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps01_port_vlan_requirements: + port_ps01_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_ps01_port_0_vlan_requirements: type: list required: true entry_schema: @@ -44,120 +54,104 @@ topology_template: vm_flavor_name: type: string required: true - port_ps01_port_related_networks: - type: list + port_ps01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps01_port_order: + port_ps01_port_0_order: type: integer required: true vm_image_name: type: string required: true - port_ps01_port_network_role: + port_ps01_port_0_network_role_tag: type: string required: true - port_ps01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_ps01_port_network: - type: list + port_ps01_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: string - port_ps01_port_ip_requirements: + port_ps01_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps01_port_network_role_tag: - type: string - required: true - port_ps01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true + type: org.openecomp.datatypes.network.RelatedNetworksAssignments node_templates: - ps_server: - type: org.openecomp.resource.vfc.compute.nodes.heat.ps_server - properties: - availability_zone: - get_input: - - compute_ps_server_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - image: - get_input: vm_image_name - name: - get_input: - - compute_ps_server_name - - index_value - user_data_format: - get_input: - - compute_ps_server_user_data_format - - index_value - ps_server_ps01_port: + ps_server_ps01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_ps01_port_exCP_naming + get_input: port_ps01_port_0_exCP_naming vlan_requirements: - get_input: port_ps01_port_vlan_requirements + get_input: port_ps01_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_ps01_port_related_networks + get_input: port_ps01_port_0_related_networks ip_requirements: - get_input: port_ps01_port_ip_requirements + get_input: port_ps01_port_0_ip_requirements network_role_tag: - get_input: port_ps01_port_network_role_tag + get_input: port_ps01_port_0_network_role_tag mac_requirements: - get_input: port_ps01_port_mac_requirements + get_input: port_ps01_port_0_mac_requirements order: - get_input: port_ps01_port_order + get_input: port_ps01_port_0_order network_role: - get_input: port_ps01_port_network_role + get_input: port_ps01_port_0_network_role subnetpoolid: - get_input: port_ps01_port_subnetpoolid + get_input: port_ps01_port_0_subnetpoolid network: get_input: - - port_ps01_port_network + - port_ps01_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: ps_server relationship: tosca.relationships.network.BindsTo + ps_server: + type: org.openecomp.resource.vfc.compute.nodes.heat.ps_server + properties: + availability_zone: + get_input: + - compute_ps_server_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + image: + get_input: vm_image_name + name: + get_input: + - compute_ps_server_name + - index_value + user_data_format: + get_input: + - compute_ps_server_user_data_format + - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.ps_server capabilities: - network.incoming.packets.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.packets.rate instance_ps_server: - ps_server - instance - network.outpoing.packets_ps_server_ps01_port: - - ps_server_ps01_port - - network.outpoing.packets + network.incoming.packets_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.incoming.packets host_ps_server: - ps_server - host - network.incoming.packets_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.packets cpu.delta_ps_server: - ps_server - cpu.delta disk.write.bytes.rate_ps_server: - ps_server - disk.write.bytes.rate - feature_ps_server_ps01_port: - - ps_server_ps01_port - - feature feature_ps_server: - ps_server - feature + feature_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - feature disk.root.size_ps_server: - ps_server - disk.root.size @@ -179,9 +173,6 @@ topology_template: disk.device.iops_ps_server: - ps_server - disk.device.iops - network.outgoing.packets.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.outgoing.packets.rate disk.device.latency_ps_server: - ps_server - disk.device.latency @@ -215,23 +206,26 @@ topology_template: disk.device.read.bytes.rate_ps_server: - ps_server - disk.device.read.bytes.rate + network.outpoing.packets_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.outpoing.packets cpu_util_ps_server: - ps_server - cpu_util memory.resident_ps_server: - ps_server - memory.resident - network.incoming.bytes_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.bytes disk.device.read.requests_ps_server: - ps_server - disk.device.read.requests disk.write.bytes_ps_server: - ps_server - disk.write.bytes - network.outgoing.bytes.rate_ps_server_ps01_port: - - ps_server_ps01_port + network.incoming.bytes_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.incoming.bytes + network.outgoing.bytes.rate_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - network.outgoing.bytes.rate disk.device.write.requests.rate_ps_server: - ps_server @@ -248,20 +242,17 @@ topology_template: binding_ps_server: - ps_server - binding - attachment_ps_server_ps01_port: - - ps_server_ps01_port - - attachment os_ps_server: - ps_server - os disk.device.usage_ps_server: - ps_server - disk.device.usage - binding_ps_server_ps01_port: - - ps_server_ps01_port + binding_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - binding - forwarder_ps_server_ps01_port: - - ps_server_ps01_port + forwarder_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - forwarder disk.device.write.bytes.rate_ps_server: - ps_server @@ -269,6 +260,9 @@ topology_template: vcpus_ps_server: - ps_server - vcpus + attachment_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - attachment disk.usage_ps_server: - ps_server - disk.usage @@ -281,25 +275,31 @@ topology_template: disk.capacity_ps_server: - ps_server - disk.capacity - network.incoming.bytes.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.bytes.rate + network.outgoing.bytes_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.outgoing.bytes + network.outgoing.packets.rate_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.outgoing.packets.rate disk.device.allocation_ps_server: - ps_server - disk.device.allocation - network.outgoing.bytes_ps_server_ps01_port: - - ps_server_ps01_port - - network.outgoing.bytes + network.incoming.packets.rate_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - network.incoming.bytes.rate requirements: dependency_ps_server: - ps_server - dependency - link_ps_server_ps01_port: - - ps_server_ps01_port - - link - dependency_ps_server_ps01_port: - - ps_server_ps01_port + dependency_ps_server_ps01_port_0: + - ps_server_ps01_port_0 - dependency + link_ps_server_ps01_port_0: + - ps_server_ps01_port_0 + - link local_storage_ps_server: - ps_server - - local_storage
\ No newline at end of file + - local_storage |