diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out')
5 files changed, 1991 insertions, 1991 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml index c2bde7bca1..fc83a30f88 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,39 +8,33 @@ node_types: org.openecomp.resource.abstract.nodes.plt: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_plt_data_0_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_plt_oam_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_plt_oam_0_port_subnetpoolid: + port_plt_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_plt_internal_0_port_allowed_address_pairs: + port_plt_data_port_0_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair - port_plt_oam_0_port_security_groups: + port_plt_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements + port_plt_oam_port_0_network_role: + type: string + required: true + status: SUPPORTED compute_plt_config_drive: type: list required: true status: SUPPORTED entry_schema: type: boolean - port_plt_data_0_port_subnetpoolid: + port_plt_data_port_0_network_role_tag: type: string required: true status: SUPPORTED @@ -48,145 +42,153 @@ node_types: type: string required: true status: SUPPORTED - port_plt_internal_0_port_vlan_requirements: + port_plt_internal_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_plt_data_0_port_fixed_ips: + port_plt_data_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_plt_internal_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: string + port_plt_data_port_0_security_groups: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json vm_image_name: type: string required: true status: SUPPORTED - compute_plt_availability_zone: + port_plt_oam_port_0_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_plt_oam_0_port_name: + compute_plt_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_plt_internal_0_port_security_groups: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_plt_internal_0_port_network_role_tag: + port_plt_internal_port_0_network_role: type: string required: true status: SUPPORTED - port_plt_oam_0_port_ip_requirements: + port_plt_data_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_plt_data_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_plt_data_0_port_allowed_address_pairs: + port_plt_data_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_plt_internal_0_port_subnetpoolid: + type: string + port_plt_internal_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_plt_data_0_port_ip_requirements: + port_plt_data_port_0_order: + type: integer + required: true + status: SUPPORTED + port_plt_oam_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_plt_internal_0_port_network: + type: json + port_plt_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_plt_internal_port_0_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: string - compute_plt_metadata: + type: org.openecomp.datatypes.heat.network.AddressPair + port_plt_internal_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - port_plt_data_0_port_security_groups: + type: org.openecomp.datatypes.network.IpRequirements + compute_plt_metadata: type: list required: true status: SUPPORTED entry_schema: type: json - port_plt_oam_0_port_related_networks: + port_plt_internal_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_plt_internal_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_plt_oam_port_0_fixed_ips: + type: list required: true status: SUPPORTED - port_plt_data_0_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_plt_internal_port_0_security_groups: + type: list required: true status: SUPPORTED - port_plt_data_0_port_vlan_requirements: + entry_schema: + type: json + port_plt_data_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_plt_data_0_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_plt_internal_0_port_order: - type: integer - required: true - status: SUPPORTED - port_plt_internal_0_port_ip_requirements: + port_plt_oam_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_plt_oam_0_port_fixed_ips: + type: string + port_plt_oam_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_plt_oam_0_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_plt_internal_0_port_name: + type: string + port_plt_oam_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_plt_internal_0_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_plt_data_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_plt_oam_0_port_order: + port_plt_internal_port_0_order: + type: integer + required: true + status: SUPPORTED + port_plt_internal_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_plt_oam_port_0_order: type: integer required: true status: SUPPORTED @@ -196,56 +198,40 @@ node_types: status: SUPPORTED entry_schema: type: string - port_plt_oam_0_port_network_role: + port_plt_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_plt_oam_0_port_allowed_address_pairs: - type: list + port_plt_internal_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_plt_data_0_port_name: - type: list + port_plt_data_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_plt_data_0_port_exCP_naming: + port_plt_data_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_plt_internal_0_port_network_role: - type: string - required: true - status: SUPPORTED compute_plt_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - port_plt_internal_0_port_replacement_policy: + port_plt_internal_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_plt_data_0_port_network: + port_plt_data_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_plt_data_0_port_network_role: - type: string - required: true - status: SUPPORTED - port_plt_internal_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED + type: org.openecomp.datatypes.heat.neutron.port.FixedIps index_value: type: integer description: Index value of this substitution service template runtime instance @@ -254,62 +240,76 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_plt_oam_0_port_network: + port_plt_data_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_plt_internal_port_0_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_plt_oam_0_port_replacement_policy: + port_plt_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_plt_data_0_port_replacement_policy: + type: org.openecomp.datatypes.network.VlanRequirements + compute_plt_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_plt_oam_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_plt_internal_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - compute_plt_name: + port_plt_data_port_0_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_plt_oam_0_port_vlan_requirements: + port_plt_data_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string + port_plt_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_plt_oam_port_0_allowed_address_pairs: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair requirements: - - dependency_plt_plt_internal_0_port: + - dependency_plt_plt_data_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_plt_plt_internal_0_port: + - link_plt_plt_data_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_plt_plt_data_0_port: + - dependency_plt_plt_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_plt_plt_data_0_port: + - link_plt_plt_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -329,21 +329,32 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_plt_plt_oam_0_port: + - dependency_plt_plt_internal_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_plt_plt_oam_0_port: + - link_plt_plt_internal_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - network.outgoing.bytes.rate_plt_plt_oam_0_port: + network.incoming.packets_plt_plt_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_plt_plt_internal_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_plt_plt_internal_port_0: 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,6 +366,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_plt_plt_data_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 disk.iops_plt: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -367,6 +386,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_plt_plt_data_port_0: + type: org.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_plt: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -379,13 +404,13 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.bytes_plt: + network.outgoing.packets.rate_plt_plt_internal_port_0: type: org.openecomp.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_plt_plt_internal_0_port: + disk.read.bytes_plt: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -403,118 +428,120 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_plt: + network.outpoing.packets_plt_plt_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 - endpoint_plt: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED - disk.read.requests_plt: + network.outgoing.bytes.rate_plt_plt_internal_port_0: type: org.openecomp.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_plt_plt_oam_0_port: + network.outgoing.packets.rate_plt_plt_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_plt: + network.outgoing.bytes_plt_plt_internal_port_0: type: org.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_plt_plt_data_0_port: - type: tosca.capabilities.Attachment + disk.device.read.bytes.rate_plt: + type: org.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_plt: - type: tosca.capabilities.Node + network.incoming.bytes.rate_plt_plt_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 - cpu_plt: + network.incoming.bytes_plt_plt_internal_port_0: type: org.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_plt: + network.incoming.bytes_plt_plt_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_plt_plt_internal_0_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + endpoint_plt: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_plt: + disk.read.requests_plt: type: org.openecomp.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_plt_plt_oam_0_port: + disk.device.write.requests.rate_plt: type: org.openecomp.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_plt_plt_internal_0_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_plt: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes_plt_plt_internal_0_port: + cpu_plt: type: org.openecomp.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_plt_plt_oam_0_port: + network.incoming.packets_plt_plt_data_port_0: type: org.openecomp.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_plt_plt_oam_0_port: + disk.write.requests_plt: type: org.openecomp.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_plt_plt_data_0_port: + disk.device.write.bytes_plt: type: org.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_plt_plt_internal_0_port: - type: tosca.capabilities.Attachment + feature_plt_plt_internal_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - binding_plt: + binding_plt_plt_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_plt_plt_oam_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_plt_plt_oam_0_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_plt: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED @@ -530,19 +557,17 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_plt_plt_data_0_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_plt_plt_oam_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_plt_plt_internal_0_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_plt_plt_data_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - binding_plt_plt_internal_0_port: + binding_plt_plt_internal_port_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -550,11 +575,6 @@ node_types: occurrences: - 0 - UNBOUNDED - feature_plt_plt_internal_0_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED instance_plt: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -567,198 +587,178 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_plt: + network.incoming.packets.rate_plt_plt_internal_port_0: type: org.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_plt: + network.outgoing.bytes_plt_plt_data_port_0: type: org.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_plt: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_plt_plt_data_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - binding_plt_plt_oam_0_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 - memory.usage_plt: + disk.write.bytes.rate_plt: type: org.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_plt_plt_oam_0_port: - type: tosca.capabilities.Attachment + network.outgoing.packets.rate_plt_plt_data_port_0: + type: org.openecomp.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_plt_plt_oam_0_port: + disk.ephemeral.size_plt: type: org.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_plt: + cpu_util_plt: type: org.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_plt_plt_oam_0_port: - type: org.openecomp.capabilities.Forwarder + attachment_plt_plt_data_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - binding_plt_plt_data_0_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.device.read.requests_plt: + network.incoming.packets.rate_plt_plt_data_port_0: type: org.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_plt: + network.incoming.packets.rate_plt_plt_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.packets.rate_plt_plt_internal_0_port: + network.outgoing.bytes_plt_plt_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 - scalable_plt: - type: tosca.capabilities.Scalable + memory.usage_plt: + type: org.openecomp.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_plt_plt_oam_0_port: + network.outgoing.bytes.rate_plt_plt_data_port_0: type: org.openecomp.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_plt_plt_data_0_port: + network.outpoing.packets_plt_plt_data_port_0: type: org.openecomp.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_plt_plt_data_0_port: + disk.device.capacity_plt: type: org.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_plt: + disk.device.read.requests_plt: type: org.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_plt_plt_oam_0_port: - type: tosca.capabilities.Node + forwarder_plt_plt_internal_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_plt_plt_internal_0_port: + memory.resident_plt: type: org.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_plt: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_plt: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - disk.root.size_plt: + network.outpoing.packets_plt_plt_internal_port_0: type: org.openecomp.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_plt_plt_data_0_port: + network.incoming.bytes_plt_plt_data_port_0: type: org.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_plt: + network.outgoing.bytes.rate_plt_plt_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_plt: + disk.usage_plt: type: org.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_plt_plt_data_0_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_plt_plt_data_0_port: + network.incoming.packets_plt_plt_internal_port_0: type: org.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_plt: + memory_plt: type: org.openecomp.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_plt_plt_data_0_port: + disk.root.size_plt: type: org.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_plt: - type: tosca.capabilities.OperatingSystem + cpu.delta_plt: + type: org.openecomp.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_plt_plt_internal_0_port: + disk.device.write.requests_plt: type: org.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_plt_plt_internal_0_port: - type: org.openecomp.capabilities.Forwarder + disk.device.read.requests.rate_plt: + type: org.openecomp.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_plt_plt_data_0_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + os_plt: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED @@ -793,66 +793,66 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_plt_plt_data_0_port: - type: org.openecomp.capabilities.Forwarder + attachment_plt_plt_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED org.openecomp.resource.abstract.nodes.app: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_app_data_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED compute_app_scheduler_hints: type: list required: true status: SUPPORTED entry_schema: type: json - port_app_internal_0_port_ip_requirements: + port_app_data_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_app_data_0_port_network_role: + type: string + port_app_internal_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + vm_flavor_name: type: string required: true status: SUPPORTED - port_app_oam_0_port_replacement_policy: + port_app_oam_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: string - port_app_oam_0_port_network: + type: json + port_app_internal_port_0_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: string - vm_flavor_name: - type: string + type: org.openecomp.datatypes.heat.network.AddressPair + port_app_oam_port_0_network: + type: list required: true status: SUPPORTED - port_app_data_0_port_fixed_ips: + entry_schema: + type: string + port_app_internal_port_0_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: string vm_image_name: type: string required: true status: SUPPORTED - port_app_oam_0_port_name: - type: list + port_app_internal_port_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_app_availability_zone: type: list required: true @@ -865,216 +865,216 @@ node_types: status: SUPPORTED entry_schema: type: boolean - port_app_oam_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_app_data_0_port_network: + port_app_data_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_app_data_0_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_app_oam_0_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_app_data_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_app_oam_port_0_ip_requirements: + type: list required: true status: SUPPORTED - port_app_data_0_port_vlan_requirements: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_app_data_port_0_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_app_internal_0_port_network_role_tag: - type: string + type: string + port_app_oam_port_0_order: + type: integer required: true status: SUPPORTED - port_app_internal_0_port_related_networks: + port_app_oam_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_app_oam_0_port_network_role: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_app_internal_port_0_replacement_policy: + type: list required: true status: SUPPORTED - compute_app_metadata: + entry_schema: + type: string + port_app_data_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: json - port_app_data_0_port_related_networks: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_app_data_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_app_data_0_port_ip_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_app_data_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + compute_app_metadata: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_app_internal_0_port_network_role: - type: string + type: json + port_app_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_app_internal_0_port_subnetpoolid: - type: string + port_app_internal_port_0_order: + type: integer required: true status: SUPPORTED - port_app_internal_0_port_allowed_address_pairs: - type: list + port_app_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_app_oam_0_port_related_networks: + port_app_internal_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_app_data_0_port_subnetpoolid: + type: json + port_app_oam_port_0_network_role: type: string required: true status: SUPPORTED - port_app_oam_0_port_subnetpoolid: + port_app_internal_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_app_internal_0_port_order: - type: integer + port_app_data_port_0_network_role: + type: string required: true status: SUPPORTED - port_app_internal_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_app_internal_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_app_data_0_port_name: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_app_oam_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_app_oam_0_port_ip_requirements: + port_app_data_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_app_oam_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_app_data_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_app_internal_0_port_network: + port_app_data_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_app_data_0_port_security_groups: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_app_internal_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - port_app_oam_0_port_order: - type: integer + type: org.openecomp.datatypes.network.IpRequirements + port_app_data_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_app_internal_0_port_vlan_requirements: - type: list - required: true + 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 - port_app_internal_0_port_replacement_policy: + constraints: + - greater_or_equal: 0 + compute_app_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_app_internal_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_app_data_0_port_order: - type: integer + port_app_oam_port_0_related_networks: + type: list required: true status: SUPPORTED - port_app_oam_0_port_security_groups: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_app_data_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: type: json - port_app_internal_0_port_name: + port_app_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - index_value: + type: org.openecomp.datatypes.network.VlanRequirements + port_app_oam_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_app_data_port_0_order: type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 + required: true status: SUPPORTED - constraints: - - greater_or_equal: 0 - port_app_oam_0_port_fixed_ips: - type: list + port_app_data_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_app_data_0_port_replacement_policy: + port_app_internal_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - compute_app_name: + compute_app_image_update_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_app_oam_0_port_vlan_requirements: + port_app_internal_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_app_internal_0_port_security_groups: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_app_oam_port_0_name: type: list required: true status: SUPPORTED entry_schema: - type: json - compute_app_image_update_policy: - type: list + type: string + port_app_oam_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_app_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string + port_app_internal_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_app_internal_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED requirements: - dependency_app: capability: tosca.capabilities.Node @@ -1090,40 +1090,40 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_app_app_internal_0_port: + - dependency_app_app_data_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_app_app_internal_0_port: + - link_app_app_data_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_app_app_oam_0_port: + - dependency_app_app_internal_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_app_app_oam_0_port: + - link_app_app_internal_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_app_app_data_0_port: + - dependency_app_app_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_app_app_data_0_port: + - link_app_app_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1136,8 +1136,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_app_app_oam_0_port: - type: tosca.capabilities.Node + network.incoming.bytes_app_app_data_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -1159,25 +1160,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_app_app_oam_0_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.bytes.rate_app_app_data_0_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.bytes_app_app_oam_0_port: + network.outpoing.packets_app_app_internal_port_0: type: org.openecomp.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_app_app_internal_0_port: + network.outgoing.bytes.rate_app_app_data_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1214,8 +1203,15 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_app_app_oam_0_port: - type: org.openecomp.capabilities.Forwarder + network.outgoing.packets.rate_app_app_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_app_app_internal_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -1225,7 +1221,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_app_app_oam_0_port: + network.incoming.bytes.rate_app_app_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: @@ -1243,13 +1239,11 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_app_app_data_0_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.outgoing.bytes_app_app_internal_port_0: + 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.read.requests.rate_app: type: org.openecomp.capabilities.metric.Ceilometer @@ -1257,20 +1251,41 @@ node_types: occurrences: - 1 - UNBOUNDED - vcpus_app: + network.outgoing.bytes.rate_app_app_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.requests_app: + network.incoming.bytes.rate_app_app_data_port_0: type: org.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_app_app_internal_0_port: - type: tosca.capabilities.Node + network.outgoing.bytes_app_app_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 + vcpus_app: + type: org.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_app_app_internal_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 + disk.device.read.requests_app: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -1280,12 +1295,17 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_app_app_internal_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED endpoint_app: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_app_app_data_0_port: + network.incoming.bytes.rate_app_app_internal_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1309,6 +1329,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_app_app_data_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.latency_app: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1321,174 +1346,171 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_app_app_oam_0_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED os_app: type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - network.incoming.packets_app_app_internal_0_port: + network.outgoing.bytes_app_app_data_port_0: type: org.openecomp.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_app_app_oam_0_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_app_app_oam_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_app_app_internal_0_port: + memory_app: type: org.openecomp.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_app_app_oam_0_port: + disk.read.requests_app: type: org.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_app_app_internal_0_port: + forwarder_app_app_oam_port_0: type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - memory_app: + disk.write.bytes_app: type: org.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_app: + binding_app_app_data_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 + disk.allocation_app: type: org.openecomp.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_app_app_oam_0_port: + network.incoming.packets_app_app_data_port_0: type: org.openecomp.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_app_app_data_0_port: + memory.resident_app: type: org.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_app: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_app_app_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_app_app_internal_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.allocation_app: + cpu_app: type: org.openecomp.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_app_app_internal_0_port: + disk.usage_app: type: org.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_app_app_data_0_port: - type: tosca.capabilities.Attachment + feature_app: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_app_app_oam_0_port: + disk.read.bytes_app: type: org.openecomp.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_app_app_internal_0_port: + network.outpoing.packets_app_app_data_port_0: type: org.openecomp.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_app_app_internal_0_port: + network.incoming.bytes_app_app_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.resident_app: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_app: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_app_app_oam_0_port: + network.incoming.bytes_app_app_internal_port_0: type: org.openecomp.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_app_app_data_0_port: + network.outgoing.bytes.rate_app_app_internal_port_0: type: org.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_app: + network.outpoing.packets_app_app_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 - feature_app_app_data_0_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - disk.usage_app: + network.incoming.packets.rate_app_app_data_port_0: type: org.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_app: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - disk.read.bytes_app: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_app_app_internal_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - scalable_app: - type: tosca.capabilities.Scalable + forwarder_app_app_data_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_app_app_data_0_port: + disk.device.read.bytes.rate_app: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_app: + disk.device.allocation_app: type: org.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_app: + network.incoming.packets.rate_app_app_internal_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1505,75 +1527,53 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_app_app_oam_0_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.device.usage_app: type: org.openecomp.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_app_app_data_0_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_app_app_data_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_app_app_data_0_port: + network.outgoing.packets.rate_app_app_internal_port_0: type: org.openecomp.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_app_app_internal_0_port: + network.incoming.packets.rate_app_app_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_app_app_data_0_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - disk.write.requests_app: + network.incoming.packets_app_app_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 - binding_app_app_internal_0_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 - instance_app: + disk.write.requests_app: type: org.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_app_app_internal_0_port: + attachment_app_app_oam_port_0: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.packets_app_app_data_0_port: + network.outgoing.packets.rate_app_app_data_port_0: type: org.openecomp.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_app_app_internal_0_port: + instance_app: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1588,70 +1588,48 @@ node_types: org.openecomp.resource.abstract.nodes.iox: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_iox_data_0_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_iox_oam_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_iox_internal_0_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_iox_data_0_port_name: - type: list + port_iox_oam_port_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_iox_data_0_port_related_networks: + port_iox_oam_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_iox_data_port_0_network_role: type: string required: true status: SUPPORTED - port_iox_data_0_port_subnetpoolid: + vm_flavor_name: type: string required: true status: SUPPORTED - port_iox_data_0_port_allowed_address_pairs: - type: list + port_iox_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_iox_internal_0_port_ip_requirements: - type: list + port_iox_data_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true status: SUPPORTED - port_iox_oam_0_port_name: + port_iox_oam_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_iox_oam_0_port_network_role_tag: - type: string + port_iox_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_iox_oam_0_port_subnetpoolid: - type: string + port_iox_internal_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED compute_iox_user_data_format: @@ -1660,145 +1638,175 @@ node_types: status: SUPPORTED entry_schema: type: string - port_iox_data_0_port_fixed_ips: - type: list + port_iox_internal_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_iox_internal_0_port_allowed_address_pairs: + port_iox_data_port_0_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair - compute_iox_config_drive: + port_iox_data_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: boolean - port_iox_internal_0_port_order: - type: integer - required: true - status: SUPPORTED - port_iox_oam_0_port_replacement_policy: + type: org.openecomp.datatypes.network.IpRequirements + port_iox_internal_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_iox_data_0_port_security_groups: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + compute_iox_config_drive: type: list required: true status: SUPPORTED entry_schema: - type: json - port_iox_internal_0_port_vlan_requirements: + type: boolean + port_iox_internal_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - compute_iox_image_update_policy: + port_iox_internal_port_0_order: + type: integer + required: true + status: SUPPORTED + port_iox_data_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_iox_oam_0_port_order: + port_iox_internal_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_iox_oam_port_0_order: type: integer required: true status: SUPPORTED - port_iox_oam_0_port_network: + compute_iox_image_update_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_iox_oam_0_port_related_networks: + port_iox_data_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_iox_internal_0_port_security_groups: + type: org.openecomp.datatypes.network.VlanRequirements + port_iox_data_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_iox_internal_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - port_iox_oam_0_port_vlan_requirements: + type: org.openecomp.datatypes.network.IpRequirements + port_iox_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_iox_data_0_port_order: + port_iox_data_port_0_order: type: integer required: true status: SUPPORTED - port_iox_internal_0_port_name: + compute_iox_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_iox_oam_0_port_fixed_ips: + port_iox_oam_port_0_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_iox_data_0_port_vlan_requirements: + type: org.openecomp.datatypes.heat.network.AddressPair + port_iox_oam_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_iox_name: + type: string + port_iox_internal_port_0_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_iox_data_0_port_network: + port_iox_internal_port_0_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: string - port_iox_internal_0_port_replacement_policy: + type: org.openecomp.datatypes.heat.network.AddressPair + port_iox_oam_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_iox_data_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_iox_internal_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_iox_data_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - port_iox_data_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_iox_oam_port_0_security_groups: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_iox_internal_port_0_security_groups: + type: list required: true status: SUPPORTED - port_iox_data_0_port_exCP_naming: + entry_schema: + type: json + port_iox_oam_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_iox_data_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_iox_oam_0_port_network_role: - type: string + port_iox_data_port_0_related_networks: + type: list required: true status: SUPPORTED - port_iox_internal_0_port_network_role: - type: string + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_iox_data_port_0_security_groups: + type: list required: true status: SUPPORTED - port_iox_data_0_port_network_role: - type: string + entry_schema: + type: json + port_iox_internal_port_0_network: + type: list required: true status: SUPPORTED - port_iox_data_0_port_replacement_policy: + entry_schema: + type: string + port_iox_internal_port_0_replacement_policy: type: list required: true status: SUPPORTED @@ -1810,6 +1818,12 @@ node_types: status: SUPPORTED entry_schema: type: json + port_iox_data_port_0_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -1818,23 +1832,15 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_iox_internal_0_port_network_role_tag: + port_iox_internal_port_0_network_role: type: string required: true status: SUPPORTED - port_iox_internal_0_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_iox_oam_0_port_allowed_address_pairs: - type: list + port_iox_internal_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_iox_internal_0_port_subnetpoolid: + port_iox_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED @@ -1844,44 +1850,25 @@ node_types: status: SUPPORTED entry_schema: type: string - port_iox_oam_0_port_security_groups: + port_iox_oam_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: json - port_iox_oam_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_iox_oam_0_port_ip_requirements: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_iox_data_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_iox_internal_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_iox_data_0_port_network_role_tag: - type: string + type: string + port_iox_oam_port_0_name: + type: list required: true status: SUPPORTED + entry_schema: + type: string requirements: - - dependency_iox_iox_data_0_port: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_iox_iox_data_0_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_iox: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -1896,38 +1883,46 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_iox_iox_oam_0_port: + - dependency_iox_iox_internal_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_iox_iox_oam_0_port: + - link_iox_iox_internal_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_iox_iox_internal_0_port: + - dependency_iox_iox_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_iox_iox_internal_0_port: + - link_iox_iox_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - capabilities: - forwarder_iox_iox_oam_0_port: - type: org.openecomp.capabilities.Forwarder + - dependency_iox_iox_data_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: - - 1 + - 0 - UNBOUNDED + - link_iox_iox_data_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + capabilities: cpu.delta_iox: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1946,19 +1941,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_iox_iox_data_0_port: + disk.device.read.bytes_iox: type: org.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_iox: + disk.read.requests_iox: type: org.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_iox: + network.incoming.packets_iox_iox_data_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1970,13 +1965,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_iox_iox_oam_0_port: + network.outpoing.packets_iox_iox_internal_port_0: type: org.openecomp.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_iox_iox_internal_0_port: + network.incoming.packets.rate_iox_iox_data_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2006,121 +2001,122 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_iox: + network.outgoing.packets.rate_iox_iox_internal_port_0: type: org.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_iox: + network.incoming.packets_iox_iox_internal_port_0: type: org.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_iox_iox_data_0_port: - type: tosca.capabilities.Node + disk.device.write.requests_iox: + type: org.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_iox: + disk.device.allocation_iox: type: org.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_iox: + disk.root.size_iox: type: org.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_iox: + network.outgoing.bytes.rate_iox_iox_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_iox_iox_data_0_port: + vcpus_iox: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_iox: + disk.device.iops_iox: type: org.openecomp.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_iox_iox_oam_0_port: + network.outgoing.bytes_iox_iox_data_port_0: type: org.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_iox_iox_data_0_port: - type: tosca.capabilities.Attachment + disk.read.bytes.rate_iox: + type: org.openecomp.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_iox_iox_oam_0_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_iox_iox_oam_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.latency_iox: + network.outgoing.bytes_iox_iox_internal_port_0: type: org.openecomp.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_iox_iox_data_0_port: + binding_iox_iox_data_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + network.incoming.packets.rate_iox_iox_internal_port_0: type: org.openecomp.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_iox_iox_internal_0_port: + disk.latency_iox: type: org.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_iox: + network.incoming.bytes.rate_iox_iox_data_port_0: type: org.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_iox_iox_oam_0_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.incoming.bytes_iox_iox_data_0_port: + network.incoming.packets.rate_iox_iox_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_iox: + cpu_util_iox: type: org.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_iox: + disk.device.capacity_iox: type: org.openecomp.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_iox_iox_internal_0_port: + disk.iops_iox: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2131,14 +2127,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_iox_iox_internal_0_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.device.read.requests_iox: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2151,28 +2139,17 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_iox_iox_internal_0_port: + attachment_iox_iox_data_port_0: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_iox_iox_internal_0_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_iox: type: org.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_iox_iox_oam_0_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.usage_iox: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2189,45 +2166,41 @@ node_types: occurrences: - 1 - UNBOUNDED - memory.resident_iox: + network.incoming.bytes_iox_iox_data_port_0: type: org.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_iox: + memory.resident_iox: type: org.openecomp.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_iox_iox_internal_0_port: + disk.device.write.bytes_iox: type: org.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_iox_iox_data_0_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + attachment_iox_iox_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - - 0 + - 1 - UNBOUNDED - network.outgoing.bytes.rate_iox_iox_oam_0_port: + network.incoming.packets_iox_iox_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_iox_iox_internal_0_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_iox_iox_internal_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_iox_iox_oam_0_port: + network.outpoing.packets_iox_iox_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: @@ -2239,7 +2212,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_iox_iox_oam_0_port: + forwarder_iox_iox_internal_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + binding_iox_iox_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 + network.incoming.bytes_iox_iox_internal_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2255,6 +2241,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_iox_iox_internal_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 host_iox: type: tosca.capabilities.Container valid_source_types: @@ -2262,107 +2256,113 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_iox: + network.outgoing.packets.rate_iox_iox_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.rate_iox: + disk.write.requests.rate_iox: type: org.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_iox: + disk.write.bytes.rate_iox: type: org.openecomp.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_iox_iox_oam_0_port: + disk.read.bytes_iox: type: org.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_iox: + network.outgoing.bytes.rate_iox_iox_internal_port_0: type: org.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_iox: + instance_iox: type: org.openecomp.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_iox_iox_data_0_port: + disk.ephemeral.size_iox: type: org.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_iox_iox_oam_0_port: + attachment_iox_iox_internal_port_0: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - feature_iox_iox_internal_0_port: - type: tosca.capabilities.Node + forwarder_iox_iox_data_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.packets_iox_iox_internal_0_port: + network.incoming.bytes.rate_iox_iox_internal_port_0: type: org.openecomp.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_iox_iox_oam_0_port: + forwarder_iox_iox_oam_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_iox_iox_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_iox_iox_data_0_port: - type: org.openecomp.capabilities.Forwarder + feature_iox_iox_data_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_iox: + network.incoming.bytes.rate_iox_iox_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_iox_iox_data_0_port: + network.outgoing.bytes_iox_iox_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_iox_iox_data_0_port: + disk.device.read.bytes.rate_iox: type: org.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_iox: + network.outpoing.packets_iox_iox_data_port_0: type: org.openecomp.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_iox_iox_internal_0_port: + network.outgoing.bytes.rate_iox_iox_data_port_0: type: org.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_iox_iox_internal_0_port: - type: org.openecomp.capabilities.Forwarder + disk.device.write.bytes.rate_iox: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -2372,7 +2372,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_iox_iox_data_0_port: + network.outgoing.packets.rate_iox_iox_data_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml index bc241a4c9c..40695ff356 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml @@ -902,92 +902,97 @@ topology_template: directives: - substitutable properties: - port_iox_data_0_port_ip_requirements: - - ip_version: 6 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_iox_internal_0_port_network: - - internal_net_0 - port_iox_data_0_port_name: - - str_replace: - template: $vnf_name-iox_data_1_port_0 - params: - $vnf_name: - get_input: vnf_name + port_iox_oam_port_0_fixed_ips: + - ip_address: + get_input: + - iox_oam_ips + - 1 vm_flavor_name: get_input: iox_flavor_name - port_iox_data_0_port_allowed_address_pairs: + port_iox_data_port_0_mac_requirements: + mac_count_required: + is_required: false + vm_image_name: + get_input: iox_image_name + port_iox_oam_port_0_replacement_policy: + - AUTO + port_iox_oam_port_0_mac_requirements: + mac_count_required: + is_required: false + port_iox_internal_port_0_mac_requirements: + mac_count_required: + is_required: false + compute_iox_user_data_format: + - RAW + port_iox_data_port_0_allowed_address_pairs: - ip_address: get_attribute: - network:data:vip:m004:m003 - fixed_ips - 0 - ip_address - port_iox_internal_0_port_ip_requirements: - - ip_version: 4 + port_iox_data_port_0_ip_requirements: + - ip_version: 6 ip_count_required: - is_required: false + is_required: true floating_ip_count_required: is_required: false - vm_image_name: - get_input: iox_image_name - port_iox_oam_0_port_name: - - str_replace: - template: $vnf_name-iox_oam_1_port_0 - params: - $vnf_name: - get_input: vnf_name - port_iox_oam_0_port_network_role_tag: oam - compute_iox_user_data_format: - - RAW - port_iox_data_0_port_fixed_ips: - - ip_address: - get_input: - - iox_data_v6_ips - - 1 - port_iox_internal_0_port_allowed_address_pairs: - - ip_address: - get_input: internal_subnet_cidr compute_iox_config_drive: - true - port_iox_oam_0_port_replacement_policy: - - AUTO - port_iox_data_0_port_security_groups: - - get_input: data_security_groups + port_iox_data_port_0_network: + - get_input: data_net_id compute_iox_image_update_policy: - REBUILD - port_iox_oam_0_port_network: + port_iox_data_port_0_network_role_tag: data + port_iox_internal_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + compute_iox_name: + - get_input: + - iox_names + - 1 + port_iox_oam_port_0_allowed_address_pairs: + - ip_address: + get_attribute: + - network:io:vip:m004:m003 + - fixed_ips + - 0 + - ip_address + port_iox_oam_port_0_network: - get_input: oam_net_id - port_iox_internal_0_port_security_groups: - - get_input: iox_security_groups - port_iox_internal_0_port_name: + port_iox_internal_port_0_name: - str_replace: template: $vnf_name-iox_internal_1_port_0 params: $vnf_name: get_input: vnf_name - port_iox_oam_0_port_fixed_ips: + port_iox_internal_port_0_allowed_address_pairs: + - ip_address: + get_input: internal_subnet_cidr + port_iox_oam_port_0_network_role_tag: oam + port_iox_data_port_0_fixed_ips: - ip_address: get_input: - - iox_oam_ips + - iox_data_v6_ips - 1 - compute_iox_name: - - get_input: - - iox_names - - 1 - port_iox_data_0_port_network: - - get_input: data_net_id - port_iox_internal_0_port_replacement_policy: - - AUTO - port_iox_internal_0_port_mac_requirements: - mac_count_required: - is_required: false - port_iox_data_0_port_mac_requirements: - mac_count_required: + port_iox_oam_port_0_security_groups: + - get_input: oam_security_groups + port_iox_internal_port_0_security_groups: + - get_input: iox_security_groups + port_iox_oam_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: is_required: false - port_iox_data_0_port_replacement_policy: + port_iox_data_port_0_security_groups: + - get_input: data_security_groups + port_iox_internal_port_0_network: + - internal_net_0 + port_iox_internal_port_0_replacement_policy: - AUTO compute_iox_metadata: - vf_module_id: @@ -999,27 +1004,22 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name - port_iox_oam_0_port_allowed_address_pairs: - - ip_address: - get_attribute: - - network:io:vip:m004:m003 - - fixed_ips - - 0 - - ip_address + port_iox_data_port_0_name: + - str_replace: + template: $vnf_name-iox_data_1_port_0 + params: + $vnf_name: + get_input: vnf_name compute_iox_availability_zone: - get_input: availability_zone_1 - port_iox_oam_0_port_security_groups: - - get_input: oam_security_groups - port_iox_oam_0_port_mac_requirements: - mac_count_required: - is_required: false - port_iox_oam_0_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_iox_data_0_port_network_role_tag: data + port_iox_data_port_0_replacement_policy: + - AUTO + port_iox_oam_port_0_name: + - str_replace: + template: $vnf_name-iox_oam_1_port_0 + params: + $vnf_name: + get_input: vnf_name service_template_filter: substitute_service_template: Nested_ioxServiceTemplate.yaml count: 1 @@ -1029,7 +1029,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_iox_iox_internal_0_port: + - link_iox_iox_internal_port_0: capability: tosca.capabilities.network.Linkable node: internal_net_0 relationship: tosca.relationships.network.LinksTo @@ -1038,42 +1038,55 @@ topology_template: directives: - substitutable properties: - port_app_data_0_port_mac_requirements: - mac_count_required: - is_required: false compute_app_scheduler_hints: - group: app_server_group_group - port_app_internal_0_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: + port_app_data_port_0_network: + - get_input: data_net_id + port_app_internal_port_0_mac_requirements: + mac_count_required: is_required: false - port_app_oam_0_port_replacement_policy: - - AUTO - port_app_oam_0_port_network: - - get_input: oam_net_id vm_flavor_name: get_input: app_flavor_name - vm_image_name: - get_input: app_image_name - port_app_oam_0_port_name: + port_app_oam_port_0_security_groups: + - get_input: oam_security_groups + port_app_internal_port_0_allowed_address_pairs: + - ip_address: + get_input: internal_subnet_cidr + port_app_oam_port_0_network: + - get_input: oam_net_id + port_app_internal_port_0_name: - str_replace: - template: $vnf_name-app_oam_2_port_0 + template: $vnf_name-app_internal_2_port_0 params: $vnf_name: get_input: vnf_name + vm_image_name: + get_input: app_image_name compute_app_availability_zone: - get_input: availability_zone_0 compute_app_config_drive: - true - port_app_oam_0_port_mac_requirements: - mac_count_required: + port_app_data_port_0_replacement_policy: + - AUTO + port_app_oam_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: is_required: false - port_app_data_0_port_network: - - get_input: data_net_id - port_app_data_0_port_network_role_tag: data - port_app_oam_0_port_network_role_tag: oam + port_app_data_port_0_name: + - str_replace: + template: $vnf_name-app_data_2_port_0 + params: + $vnf_name: + get_input: vnf_name + port_app_oam_port_0_fixed_ips: + - ip_address: + get_input: + - app_oam_ips + - 2 + port_app_internal_port_0_replacement_policy: + - AUTO compute_app_metadata: - vf_module_id: get_input: vf_module_id @@ -1084,59 +1097,46 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name - port_app_data_0_port_ip_requirements: + port_app_oam_port_0_mac_requirements: + mac_count_required: + is_required: false + port_app_internal_port_0_security_groups: + - get_input: app_security_groups + port_app_oam_port_0_replacement_policy: + - AUTO + port_app_data_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_app_internal_0_port_allowed_address_pairs: - - ip_address: - get_input: internal_subnet_cidr - port_app_data_0_port_name: - - str_replace: - template: $vnf_name-app_data_2_port_0 - params: - $vnf_name: - get_input: vnf_name - port_app_oam_0_port_ip_requirements: + port_app_data_port_0_mac_requirements: + mac_count_required: + is_required: false + port_app_internal_port_0_ip_requirements: - ip_version: 4 ip_count_required: - is_required: true - floating_ip_count_required: is_required: false - port_app_internal_0_port_network: - - internal_net_0 - port_app_data_0_port_security_groups: - - get_input: data_security_groups - port_app_internal_0_port_replacement_policy: - - AUTO - port_app_internal_0_port_mac_requirements: - mac_count_required: + floating_ip_count_required: is_required: false - port_app_oam_0_port_security_groups: - - get_input: oam_security_groups - port_app_internal_0_port_name: - - str_replace: - template: $vnf_name-app_internal_2_port_0 - params: - $vnf_name: - get_input: vnf_name - port_app_oam_0_port_fixed_ips: - - ip_address: - get_input: - - app_oam_ips - - 2 - port_app_data_0_port_replacement_policy: - - AUTO + port_app_data_port_0_network_role_tag: data compute_app_name: - get_input: - app_names - 2 - port_app_internal_0_port_security_groups: - - get_input: app_security_groups + port_app_data_port_0_security_groups: + - get_input: data_security_groups + port_app_internal_port_0_network: + - internal_net_0 compute_app_image_update_policy: - REBUILD + port_app_oam_port_0_name: + - str_replace: + template: $vnf_name-app_oam_2_port_0 + params: + $vnf_name: + get_input: vnf_name + port_app_oam_port_0_network_role_tag: oam compute_app_user_data_format: - RAW service_template_filter: @@ -1148,7 +1148,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_app_app_internal_0_port: + - link_app_app_internal_port_0: capability: tosca.capabilities.network.Linkable node: internal_net_0 relationship: tosca.relationships.network.LinksTo @@ -1187,87 +1187,92 @@ topology_template: directives: - substitutable properties: - port_iox_data_0_port_ip_requirements: - - ip_version: 6 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_iox_internal_0_port_network: - - internal_net_0 - port_iox_data_0_port_name: - - str_replace: - template: $vnf_name-iox_data_0_port_0 - params: - $vnf_name: - get_input: vnf_name vm_flavor_name: get_input: iox_flavor_name - port_iox_data_0_port_allowed_address_pairs: + port_iox_data_port_0_mac_requirements: + mac_count_required: + is_required: false + vm_image_name: + get_input: iox_image_name + port_iox_oam_port_0_replacement_policy: + - AUTO + port_iox_oam_port_0_mac_requirements: + mac_count_required: + is_required: false + port_iox_internal_port_0_mac_requirements: + mac_count_required: + is_required: false + compute_iox_user_data_format: + - RAW + port_iox_data_port_0_allowed_address_pairs: - ip_address: get_attribute: - network:data:vip:m004:m003 - fixed_ips - 0 - ip_address - port_iox_internal_0_port_ip_requirements: + port_iox_data_port_0_ip_requirements: + - ip_version: 6 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + compute_iox_config_drive: + - true + port_iox_data_port_0_network: + - get_input: data_net_id + compute_iox_image_update_policy: + - REBUILD + port_iox_data_port_0_network_role_tag: data + port_iox_internal_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - vm_image_name: - get_input: iox_image_name - port_iox_oam_0_port_name: + compute_iox_name: + - get_input: + - iox_names + - 0 + port_iox_oam_port_0_allowed_address_pairs: + - ip_address: + get_attribute: + - network:io:vip:m004:m003 + - fixed_ips + - 0 + - ip_address + port_iox_oam_port_0_network: + - get_input: oam_net_id + port_iox_internal_port_0_name: - str_replace: - template: $vnf_name-iox_oam_0_port_0 + template: $vnf_name-iox_internal_0_port_0 params: $vnf_name: get_input: vnf_name - port_iox_oam_0_port_network_role_tag: oam - compute_iox_user_data_format: - - RAW - port_iox_data_0_port_fixed_ips: + port_iox_internal_port_0_allowed_address_pairs: + - ip_address: + get_input: internal_subnet_cidr + port_iox_oam_port_0_network_role_tag: oam + port_iox_data_port_0_fixed_ips: - ip_address: get_input: - iox_data_v6_ips - 0 - port_iox_internal_0_port_allowed_address_pairs: - - ip_address: - get_input: internal_subnet_cidr - compute_iox_config_drive: - - true - port_iox_oam_0_port_replacement_policy: - - AUTO - port_iox_data_0_port_security_groups: - - get_input: data_security_groups - compute_iox_image_update_policy: - - REBUILD - port_iox_oam_0_port_network: - - get_input: oam_net_id - port_iox_internal_0_port_security_groups: + port_iox_oam_port_0_security_groups: + - get_input: oam_security_groups + port_iox_internal_port_0_security_groups: - get_input: iox_security_groups - port_iox_internal_0_port_name: - - str_replace: - template: $vnf_name-iox_internal_0_port_0 - params: - $vnf_name: - get_input: vnf_name - compute_iox_name: - - get_input: - - iox_names - - 0 - port_iox_data_0_port_network: - - get_input: data_net_id - port_iox_internal_0_port_replacement_policy: - - AUTO - port_iox_internal_0_port_mac_requirements: - mac_count_required: + port_iox_oam_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: is_required: false - port_iox_data_0_port_mac_requirements: - mac_count_required: + floating_ip_count_required: is_required: false - port_iox_data_0_port_replacement_policy: + port_iox_data_port_0_security_groups: + - get_input: data_security_groups + port_iox_internal_port_0_network: + - internal_net_0 + port_iox_internal_port_0_replacement_policy: - AUTO compute_iox_metadata: - vf_module_id: @@ -1279,27 +1284,22 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name - port_iox_oam_0_port_allowed_address_pairs: - - ip_address: - get_attribute: - - network:io:vip:m004:m003 - - fixed_ips - - 0 - - ip_address + port_iox_data_port_0_name: + - str_replace: + template: $vnf_name-iox_data_0_port_0 + params: + $vnf_name: + get_input: vnf_name compute_iox_availability_zone: - get_input: availability_zone_0 - port_iox_oam_0_port_security_groups: - - get_input: oam_security_groups - port_iox_oam_0_port_mac_requirements: - mac_count_required: - is_required: false - port_iox_oam_0_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_iox_data_0_port_network_role_tag: data + port_iox_data_port_0_replacement_policy: + - AUTO + port_iox_oam_port_0_name: + - str_replace: + template: $vnf_name-iox_oam_0_port_0 + params: + $vnf_name: + get_input: vnf_name service_template_filter: substitute_service_template: Nested_ioxServiceTemplate.yaml count: 1 @@ -1309,7 +1309,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_iox_iox_internal_0_port: + - link_iox_iox_internal_port_0: capability: tosca.capabilities.network.Linkable node: internal_net_0 relationship: tosca.relationships.network.LinksTo @@ -1318,47 +1318,60 @@ topology_template: directives: - substitutable properties: - port_app_data_0_port_mac_requirements: - mac_count_required: - is_required: false compute_app_scheduler_hints: - group: app_server_group_group - port_app_internal_0_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: + port_app_data_port_0_network: + - get_input: data_net_id + port_app_internal_port_0_mac_requirements: + mac_count_required: is_required: false - port_app_oam_0_port_replacement_policy: - - AUTO - port_app_oam_0_port_network: - - get_input: oam_net_id vm_flavor_name: get_input: app_flavor_name - port_app_data_0_port_fixed_ips: + port_app_oam_port_0_security_groups: + - get_input: oam_security_groups + port_app_internal_port_0_allowed_address_pairs: - ip_address: - get_input: - - app_data_v6_ips - - 1 - vm_image_name: - get_input: app_image_name - port_app_oam_0_port_name: + get_input: internal_subnet_cidr + port_app_oam_port_0_network: + - get_input: oam_net_id + port_app_internal_port_0_name: - str_replace: - template: $vnf_name-app_oam_1_port_0 + template: $vnf_name-app_internal_1_port_0 params: $vnf_name: get_input: vnf_name + vm_image_name: + get_input: app_image_name compute_app_availability_zone: - get_input: availability_zone_1 compute_app_config_drive: - true - port_app_oam_0_port_mac_requirements: - mac_count_required: + port_app_data_port_0_replacement_policy: + - AUTO + port_app_oam_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: is_required: false - port_app_data_0_port_network: - - get_input: data_net_id - port_app_data_0_port_network_role_tag: data - port_app_oam_0_port_network_role_tag: oam + port_app_data_port_0_name: + - str_replace: + template: $vnf_name-app_data_1_port_0 + params: + $vnf_name: + get_input: vnf_name + port_app_oam_port_0_fixed_ips: + - ip_address: + get_input: + - app_oam_ips + - 1 + port_app_internal_port_0_replacement_policy: + - AUTO + port_app_data_port_0_fixed_ips: + - ip_address: + get_input: + - app_data_v6_ips + - 1 compute_app_metadata: - vf_module_id: get_input: vf_module_id @@ -1369,59 +1382,46 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name - port_app_data_0_port_ip_requirements: + port_app_oam_port_0_mac_requirements: + mac_count_required: + is_required: false + port_app_internal_port_0_security_groups: + - get_input: app_security_groups + port_app_oam_port_0_replacement_policy: + - AUTO + port_app_data_port_0_ip_requirements: - ip_version: 6 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_app_internal_0_port_allowed_address_pairs: - - ip_address: - get_input: internal_subnet_cidr - port_app_data_0_port_name: - - str_replace: - template: $vnf_name-app_data_1_port_0 - params: - $vnf_name: - get_input: vnf_name - port_app_oam_0_port_ip_requirements: + port_app_data_port_0_mac_requirements: + mac_count_required: + is_required: false + port_app_internal_port_0_ip_requirements: - ip_version: 4 ip_count_required: - is_required: true - floating_ip_count_required: is_required: false - port_app_internal_0_port_network: - - internal_net_0 - port_app_data_0_port_security_groups: - - get_input: data_security_groups - port_app_internal_0_port_replacement_policy: - - AUTO - port_app_internal_0_port_mac_requirements: - mac_count_required: + floating_ip_count_required: is_required: false - port_app_oam_0_port_security_groups: - - get_input: oam_security_groups - port_app_internal_0_port_name: - - str_replace: - template: $vnf_name-app_internal_1_port_0 - params: - $vnf_name: - get_input: vnf_name - port_app_oam_0_port_fixed_ips: - - ip_address: - get_input: - - app_oam_ips - - 1 - port_app_data_0_port_replacement_policy: - - AUTO + port_app_data_port_0_network_role_tag: data compute_app_name: - get_input: - app_names - 1 - port_app_internal_0_port_security_groups: - - get_input: app_security_groups + port_app_data_port_0_security_groups: + - get_input: data_security_groups + port_app_internal_port_0_network: + - internal_net_0 compute_app_image_update_policy: - REBUILD + port_app_oam_port_0_name: + - str_replace: + template: $vnf_name-app_oam_1_port_0 + params: + $vnf_name: + get_input: vnf_name + port_app_oam_port_0_network_role_tag: oam compute_app_user_data_format: - RAW service_template_filter: @@ -1433,7 +1433,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_app_app_internal_0_port: + - link_app_app_internal_port_0: capability: tosca.capabilities.network.Linkable node: internal_net_0 relationship: tosca.relationships.network.LinksTo @@ -1442,47 +1442,55 @@ topology_template: directives: - substitutable properties: - port_app_data_0_port_mac_requirements: - mac_count_required: - is_required: false compute_app_scheduler_hints: - group: app_server_group_group - port_app_internal_0_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: + port_app_data_port_0_network: + - get_input: data_net_id + port_app_internal_port_0_mac_requirements: + mac_count_required: is_required: false - port_app_oam_0_port_replacement_policy: - - AUTO - port_app_oam_0_port_network: - - get_input: oam_net_id vm_flavor_name: get_input: app_flavor_name - port_app_data_0_port_fixed_ips: + port_app_oam_port_0_security_groups: + - get_input: oam_security_groups + port_app_internal_port_0_allowed_address_pairs: - ip_address: - get_input: - - app_data_v6_ips - - 0 - vm_image_name: - get_input: app_image_name - port_app_oam_0_port_name: + get_input: internal_subnet_cidr + port_app_oam_port_0_network: + - get_input: oam_net_id + port_app_internal_port_0_name: - str_replace: - template: $vnf_name-app_oam_0_port_0 + template: $vnf_name-app_internal_0_port_0 params: $vnf_name: get_input: vnf_name + vm_image_name: + get_input: app_image_name compute_app_availability_zone: - get_input: availability_zone_0 compute_app_config_drive: - true - port_app_oam_0_port_mac_requirements: - mac_count_required: + port_app_data_port_0_replacement_policy: + - AUTO + port_app_oam_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: is_required: false - port_app_data_0_port_network: - - get_input: data_net_id - port_app_data_0_port_network_role_tag: data - port_app_oam_0_port_network_role_tag: oam + floating_ip_count_required: + is_required: false + port_app_data_port_0_name: + - str_replace: + template: $vnf_name-app_data_0_port_0 + params: + $vnf_name: + get_input: vnf_name + port_app_internal_port_0_replacement_policy: + - AUTO + port_app_data_port_0_fixed_ips: + - ip_address: + get_input: + - app_data_v6_ips + - 0 compute_app_metadata: - vf_module_id: get_input: vf_module_id @@ -1493,54 +1501,46 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name - port_app_data_0_port_ip_requirements: + port_app_oam_port_0_mac_requirements: + mac_count_required: + is_required: false + port_app_internal_port_0_security_groups: + - get_input: app_security_groups + port_app_oam_port_0_replacement_policy: + - AUTO + port_app_data_port_0_ip_requirements: - ip_version: 6 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_app_internal_0_port_allowed_address_pairs: - - ip_address: - get_input: internal_subnet_cidr - port_app_data_0_port_name: - - str_replace: - template: $vnf_name-app_data_0_port_0 - params: - $vnf_name: - get_input: vnf_name - port_app_oam_0_port_ip_requirements: + port_app_data_port_0_mac_requirements: + mac_count_required: + is_required: false + port_app_internal_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_app_internal_0_port_network: - - internal_net_0 - port_app_data_0_port_security_groups: - - get_input: data_security_groups - port_app_internal_0_port_replacement_policy: - - AUTO - port_app_internal_0_port_mac_requirements: - mac_count_required: - is_required: false - port_app_oam_0_port_security_groups: - - get_input: oam_security_groups - port_app_internal_0_port_name: - - str_replace: - template: $vnf_name-app_internal_0_port_0 - params: - $vnf_name: - get_input: vnf_name - port_app_data_0_port_replacement_policy: - - AUTO + port_app_data_port_0_network_role_tag: data compute_app_name: - get_input: - app_names - 0 - port_app_internal_0_port_security_groups: - - get_input: app_security_groups + port_app_data_port_0_security_groups: + - get_input: data_security_groups + port_app_internal_port_0_network: + - internal_net_0 compute_app_image_update_policy: - REBUILD + port_app_oam_port_0_name: + - str_replace: + template: $vnf_name-app_oam_0_port_0 + params: + $vnf_name: + get_input: vnf_name + port_app_oam_port_0_network_role_tag: oam compute_app_user_data_format: - RAW service_template_filter: @@ -1552,7 +1552,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_app_app_internal_0_port: + - link_app_app_internal_port_0: capability: tosca.capabilities.network.Linkable node: internal_net_0 relationship: tosca.relationships.network.LinksTo @@ -1583,56 +1583,61 @@ topology_template: directives: - substitutable properties: - port_plt_internal_0_port_allowed_address_pairs: + port_plt_oam_port_0_network_role_tag: oam + port_plt_data_port_0_allowed_address_pairs: - ip_address: - get_input: internal_subnet_cidr - port_plt_oam_0_port_security_groups: - - get_input: oam_security_groups + get_attribute: + - network:data:vip:m001:m002 + - fixed_ips + - 0 + - ip_address + port_plt_oam_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_plt_config_drive: - true + port_plt_data_port_0_network_role_tag: data vm_flavor_name: get_input: plt_flavor_name - port_plt_data_0_port_fixed_ips: - - ip_address: - get_input: - - plt_data_v6_ips - - 1 + port_plt_internal_port_0_replacement_policy: + - AUTO + port_plt_data_port_0_security_groups: + - get_input: data_security_groups vm_image_name: get_input: plt_image_name - compute_plt_availability_zone: - - get_input: availability_zone_1 - port_plt_oam_0_port_name: + port_plt_oam_port_0_name: - str_replace: template: $vnf_name-plt_oam_0_port_0 params: $vnf_name: get_input: vnf_name - port_plt_internal_0_port_security_groups: - - get_input: plt_security_groups - port_plt_oam_0_port_ip_requirements: - - ip_version: 4 + compute_plt_availability_zone: + - get_input: availability_zone_1 + port_plt_data_port_0_ip_requirements: + - ip_version: 6 ip_count_required: - is_required: false + is_required: true floating_ip_count_required: is_required: false - port_plt_data_0_port_mac_requirements: + port_plt_data_port_0_replacement_policy: + - AUTO + port_plt_oam_port_0_security_groups: + - get_input: oam_security_groups + port_plt_oam_port_0_mac_requirements: mac_count_required: is_required: false - port_plt_data_0_port_allowed_address_pairs: + port_plt_internal_port_0_allowed_address_pairs: - ip_address: - get_attribute: - - network:data:vip:m001:m002 - - fixed_ips - - 0 - - ip_address - port_plt_data_0_port_ip_requirements: - - ip_version: 6 + get_input: internal_subnet_cidr + port_plt_internal_port_0_ip_requirements: + - ip_version: 4 ip_count_required: - is_required: true + is_required: false floating_ip_count_required: is_required: false - port_plt_internal_0_port_network: - - internal_net_0 compute_plt_metadata: - vf_module_id: get_input: vf_module_id @@ -1643,59 +1648,54 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name - port_plt_data_0_port_security_groups: - - get_input: data_security_groups - port_plt_internal_0_port_mac_requirements: + port_plt_internal_port_0_security_groups: + - get_input: plt_security_groups + port_plt_oam_port_0_network: + - get_input: oam_net_id + port_plt_oam_port_0_replacement_policy: + - AUTO + port_plt_internal_port_0_mac_requirements: mac_count_required: is_required: false - port_plt_data_0_port_network_role_tag: data - port_plt_internal_0_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: + compute_plt_image_update_policy: + - REBUILD + compute_plt_user_data_format: + - RAW + port_plt_internal_port_0_network: + - internal_net_0 + port_plt_data_port_0_fixed_ips: + - ip_address: + get_input: + - plt_data_v6_ips + - 1 + port_plt_data_port_0_mac_requirements: + mac_count_required: is_required: false - port_plt_oam_0_port_network_role_tag: oam - port_plt_internal_0_port_name: + port_plt_internal_port_0_name: - str_replace: template: $vnf_name-plt_internal_0_port_0 params: $vnf_name: get_input: vnf_name - compute_plt_image_update_policy: - - REBUILD - port_plt_oam_0_port_allowed_address_pairs: - - ip_address: - get_attribute: - - network:oam:vip:m001:m002 - - fixed_ips - - 0 - - ip_address - port_plt_data_0_port_name: + compute_plt_name: + - get_input: + - plt_names + - 1 + port_plt_data_port_0_name: - str_replace: template: $vnf_name-plt_data_0_port_0 params: $vnf_name: get_input: vnf_name - compute_plt_user_data_format: - - RAW - port_plt_internal_0_port_replacement_policy: - - AUTO - port_plt_data_0_port_network: + port_plt_data_port_0_network: - get_input: data_net_id - port_plt_oam_0_port_network: - - get_input: oam_net_id - port_plt_oam_0_port_replacement_policy: - - AUTO - port_plt_data_0_port_replacement_policy: - - AUTO - port_plt_oam_0_port_mac_requirements: - mac_count_required: - is_required: false - compute_plt_name: - - get_input: - - plt_names - - 1 + port_plt_oam_port_0_allowed_address_pairs: + - ip_address: + get_attribute: + - network:oam:vip:m001:m002 + - fixed_ips + - 0 + - ip_address service_template_filter: substitute_service_template: Nested_pltServiceTemplate.yaml count: 1 @@ -1705,7 +1705,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_plt_plt_internal_0_port: + - link_plt_plt_internal_port_0: capability: tosca.capabilities.network.Linkable node: internal_net_0 relationship: tosca.relationships.network.LinksTo @@ -1714,56 +1714,61 @@ topology_template: directives: - substitutable properties: - port_plt_internal_0_port_allowed_address_pairs: + port_plt_oam_port_0_network_role_tag: oam + port_plt_data_port_0_allowed_address_pairs: - ip_address: - get_input: internal_subnet_cidr - port_plt_oam_0_port_security_groups: - - get_input: oam_security_groups + get_attribute: + - network:data:vip:m001:m002 + - fixed_ips + - 0 + - ip_address + port_plt_oam_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false compute_plt_config_drive: - true + port_plt_data_port_0_network_role_tag: data vm_flavor_name: get_input: plt_flavor_name - port_plt_data_0_port_fixed_ips: - - ip_address: - get_input: - - plt_data_v6_ips - - 0 + port_plt_internal_port_0_replacement_policy: + - AUTO + port_plt_data_port_0_security_groups: + - get_input: data_security_groups vm_image_name: get_input: plt_image_name - compute_plt_availability_zone: - - get_input: availability_zone_0 - port_plt_oam_0_port_name: + port_plt_oam_port_0_name: - str_replace: template: $vnf_name-plt_oam_0_port_0 params: $vnf_name: get_input: vnf_name - port_plt_internal_0_port_security_groups: - - get_input: plt_security_groups - port_plt_oam_0_port_ip_requirements: - - ip_version: 4 + compute_plt_availability_zone: + - get_input: availability_zone_0 + port_plt_data_port_0_ip_requirements: + - ip_version: 6 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_plt_data_0_port_mac_requirements: + port_plt_data_port_0_replacement_policy: + - AUTO + port_plt_oam_port_0_security_groups: + - get_input: oam_security_groups + port_plt_oam_port_0_mac_requirements: mac_count_required: is_required: false - port_plt_data_0_port_allowed_address_pairs: + port_plt_internal_port_0_allowed_address_pairs: - ip_address: - get_attribute: - - network:data:vip:m001:m002 - - fixed_ips - - 0 - - ip_address - port_plt_data_0_port_ip_requirements: - - ip_version: 6 + get_input: internal_subnet_cidr + port_plt_internal_port_0_ip_requirements: + - ip_version: 4 ip_count_required: - is_required: true + is_required: false floating_ip_count_required: is_required: false - port_plt_internal_0_port_network: - - internal_net_0 compute_plt_metadata: - vf_module_id: get_input: vf_module_id @@ -1774,64 +1779,59 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name - port_plt_data_0_port_security_groups: - - get_input: data_security_groups - port_plt_internal_0_port_mac_requirements: - mac_count_required: - is_required: false - port_plt_data_0_port_network_role_tag: data - port_plt_internal_0_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_plt_oam_0_port_fixed_ips: + port_plt_oam_port_0_fixed_ips: - ip_address: get_input: - plt_oam_ips - 0 - port_plt_oam_0_port_network_role_tag: oam - port_plt_internal_0_port_name: - - str_replace: - template: $vnf_name-plt_internal_0_port_0 - params: - $vnf_name: - get_input: vnf_name + port_plt_internal_port_0_security_groups: + - get_input: plt_security_groups + port_plt_oam_port_0_network: + - get_input: oam_net_id + port_plt_oam_port_0_replacement_policy: + - AUTO + port_plt_internal_port_0_mac_requirements: + mac_count_required: + is_required: false compute_plt_image_update_policy: - REBUILD - port_plt_oam_0_port_allowed_address_pairs: + compute_plt_user_data_format: + - RAW + port_plt_internal_port_0_network: + - internal_net_0 + port_plt_data_port_0_fixed_ips: - ip_address: - get_attribute: - - network:oam:vip:m001:m002 - - fixed_ips + get_input: + - plt_data_v6_ips - 0 - - ip_address - port_plt_data_0_port_name: + port_plt_data_port_0_mac_requirements: + mac_count_required: + is_required: false + port_plt_internal_port_0_name: - str_replace: - template: $vnf_name-plt_data_0_port_0 + template: $vnf_name-plt_internal_0_port_0 params: $vnf_name: get_input: vnf_name - compute_plt_user_data_format: - - RAW - port_plt_internal_0_port_replacement_policy: - - AUTO - port_plt_data_0_port_network: - - get_input: data_net_id - port_plt_oam_0_port_network: - - get_input: oam_net_id - port_plt_oam_0_port_replacement_policy: - - AUTO - port_plt_data_0_port_replacement_policy: - - AUTO - port_plt_oam_0_port_mac_requirements: - mac_count_required: - is_required: false compute_plt_name: - get_input: - plt_names - 0 + port_plt_data_port_0_name: + - str_replace: + template: $vnf_name-plt_data_0_port_0 + params: + $vnf_name: + get_input: vnf_name + port_plt_data_port_0_network: + - get_input: data_net_id + port_plt_oam_port_0_allowed_address_pairs: + - ip_address: + get_attribute: + - network:oam:vip:m001:m002 + - fixed_ips + - 0 + - ip_address service_template_filter: substitute_service_template: Nested_pltServiceTemplate.yaml count: 1 @@ -1841,7 +1841,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_plt_plt_internal_0_port: + - link_plt_plt_internal_port_0: capability: tosca.capabilities.network.Linkable node: internal_net_0 relationship: tosca.relationships.network.LinksTo @@ -1943,4 +1943,4 @@ topology_template: get_input: vnf_name container_type: host targets: - - app_server_group_group + - app_server_group_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/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml index 081b35ad6d..a6bb612c4a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml @@ -11,48 +11,48 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_app_data_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true compute_app_scheduler_hints: type: list required: true entry_schema: type: json - port_app_internal_0_port_ip_requirements: + port_app_data_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_app_data_0_port_network_role: + type: string + port_app_internal_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + vm_flavor_name: type: string required: true - port_app_oam_0_port_replacement_policy: + port_app_oam_port_0_security_groups: type: list required: true entry_schema: - type: string - port_app_oam_0_port_network: + type: json + port_app_internal_port_0_allowed_address_pairs: type: list required: true entry_schema: - type: string - vm_flavor_name: - type: string + type: org.openecomp.datatypes.heat.network.AddressPair + port_app_oam_port_0_network: + type: list required: true - port_app_data_0_port_fixed_ips: + entry_schema: + type: string + port_app_internal_port_0_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: string vm_image_name: type: string required: true - port_app_oam_0_port_name: - type: list + port_app_internal_port_0_network_role: + type: string required: true - entry_schema: - type: string compute_app_availability_zone: type: list required: true @@ -63,134 +63,106 @@ topology_template: required: true entry_schema: type: boolean - port_app_oam_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_app_data_0_port_network: + port_app_data_port_0_replacement_policy: type: list required: true entry_schema: type: string - port_app_data_0_port_network_role_tag: - type: string - required: true - port_app_oam_0_port_network_role_tag: - type: string - required: true - port_app_data_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_app_data_0_port_vlan_requirements: + port_app_oam_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_app_internal_0_port_network_role_tag: - type: string - required: true - port_app_internal_0_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_app_data_port_0_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_app_oam_0_port_network_role: - type: string + type: string + port_app_oam_port_0_order: + type: integer required: true - compute_app_metadata: + port_app_oam_port_0_fixed_ips: type: list required: true entry_schema: - type: json - port_app_data_0_port_related_networks: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_app_internal_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_app_data_0_port_ip_requirements: + type: string + port_app_data_port_0_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_app_internal_0_port_network_role: - type: string - required: true - port_app_internal_0_port_subnetpoolid: - type: string - required: true - port_app_internal_0_port_allowed_address_pairs: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_app_data_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_app_oam_0_port_related_networks: + type: org.openecomp.datatypes.network.VlanRequirements + port_app_data_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + compute_app_metadata: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_app_data_0_port_subnetpoolid: - type: string - required: true - port_app_oam_0_port_subnetpoolid: - type: string + type: json + port_app_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_app_internal_0_port_order: + port_app_internal_port_0_order: type: integer required: true - port_app_internal_0_port_exCP_naming: + port_app_oam_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_app_data_0_port_name: + port_app_internal_port_0_security_groups: type: list required: true entry_schema: - type: string - port_app_oam_0_port_ip_requirements: - type: list + type: json + port_app_oam_port_0_network_role: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_app_oam_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_app_internal_port_0_subnetpoolid: + type: string required: true - port_app_internal_0_port_network: - type: list + port_app_data_port_0_network_role: + type: string required: true - entry_schema: - type: string - port_app_data_0_port_security_groups: + port_app_internal_port_0_vlan_requirements: type: list required: true entry_schema: - type: json - port_app_oam_0_port_order: - type: integer - required: true - port_app_internal_0_port_vlan_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_app_oam_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_app_internal_0_port_replacement_policy: + type: string + port_app_data_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_app_internal_0_port_mac_requirements: + type: org.openecomp.datatypes.network.IpRequirements + port_app_data_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_app_data_0_port_order: - type: integer - required: true - port_app_oam_0_port_security_groups: + port_app_data_port_0_related_networks: type: list required: true entry_schema: - type: json - port_app_internal_0_port_name: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_app_internal_port_0_ip_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.IpRequirements + port_app_data_port_0_network_role_tag: + type: string + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -198,41 +170,69 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_app_oam_0_port_fixed_ips: + compute_app_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_app_data_0_port_replacement_policy: + type: string + port_app_oam_port_0_related_networks: type: list required: true entry_schema: - type: string - compute_app_name: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_app_data_port_0_security_groups: type: list required: true entry_schema: - type: string - port_app_oam_0_port_vlan_requirements: + type: json + port_app_oam_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_app_internal_0_port_security_groups: + port_app_oam_port_0_subnetpoolid: + type: string + required: true + port_app_data_port_0_order: + type: integer + required: true + port_app_data_port_0_subnetpoolid: + type: string + required: true + port_app_internal_port_0_network: type: list required: true entry_schema: - type: json + type: string compute_app_image_update_policy: type: list required: true entry_schema: type: string + port_app_internal_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_app_oam_port_0_name: + type: list + required: true + entry_schema: + type: string + port_app_oam_port_0_network_role_tag: + type: string + required: true compute_app_user_data_format: type: list required: true entry_schema: type: string + port_app_internal_port_0_network_role_tag: + type: string + required: true + port_app_internal_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true node_templates: app: type: org.openecomp.resource.vfc.compute.nodes.heat.app @@ -269,139 +269,139 @@ topology_template: get_input: - compute_app_user_data_format - index_value - app_app_internal_0_port: + app_app_data_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_app_internal_0_port_replacement_policy + - port_app_data_port_0_replacement_policy - index_value mac_requirements: - get_input: port_app_internal_0_port_mac_requirements - allowed_address_pairs: - get_input: port_app_internal_0_port_allowed_address_pairs + get_input: port_app_data_port_0_mac_requirements order: - get_input: port_app_internal_0_port_order + get_input: port_app_data_port_0_order security_groups: get_input: - - port_app_internal_0_port_security_groups + - port_app_data_port_0_security_groups - index_value exCP_naming: - get_input: port_app_internal_0_port_exCP_naming + get_input: port_app_data_port_0_exCP_naming vlan_requirements: - get_input: port_app_internal_0_port_vlan_requirements + get_input: port_app_data_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_app_internal_0_port_related_networks + get_input: port_app_data_port_0_related_networks ip_requirements: - get_input: port_app_internal_0_port_ip_requirements + get_input: port_app_data_port_0_ip_requirements network_role_tag: - get_input: port_app_internal_0_port_network_role_tag + get_input: port_app_data_port_0_network_role_tag network_role: - get_input: port_app_internal_0_port_network_role + get_input: port_app_data_port_0_network_role subnetpoolid: - get_input: port_app_internal_0_port_subnetpoolid + get_input: port_app_data_port_0_subnetpoolid + fixed_ips: + get_input: + - port_app_data_port_0_fixed_ips + - index_value name: get_input: - - port_app_internal_0_port_name + - port_app_data_port_0_name - index_value network: get_input: - - port_app_internal_0_port_network + - port_app_data_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: app relationship: tosca.relationships.network.BindsTo - app_app_oam_0_port: + app_app_internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_app_oam_0_port_replacement_policy + - port_app_internal_port_0_replacement_policy - index_value mac_requirements: - get_input: port_app_oam_0_port_mac_requirements + get_input: port_app_internal_port_0_mac_requirements + allowed_address_pairs: + get_input: port_app_internal_port_0_allowed_address_pairs order: - get_input: port_app_oam_0_port_order + get_input: port_app_internal_port_0_order security_groups: get_input: - - port_app_oam_0_port_security_groups + - port_app_internal_port_0_security_groups - index_value exCP_naming: - get_input: port_app_oam_0_port_exCP_naming + get_input: port_app_internal_port_0_exCP_naming vlan_requirements: - get_input: port_app_oam_0_port_vlan_requirements + get_input: port_app_internal_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_app_oam_0_port_related_networks + get_input: port_app_internal_port_0_related_networks ip_requirements: - get_input: port_app_oam_0_port_ip_requirements + get_input: port_app_internal_port_0_ip_requirements network_role_tag: - get_input: port_app_oam_0_port_network_role_tag + get_input: port_app_internal_port_0_network_role_tag network_role: - get_input: port_app_oam_0_port_network_role + get_input: port_app_internal_port_0_network_role subnetpoolid: - get_input: port_app_oam_0_port_subnetpoolid - fixed_ips: - get_input: - - port_app_oam_0_port_fixed_ips - - index_value + get_input: port_app_internal_port_0_subnetpoolid name: get_input: - - port_app_oam_0_port_name + - port_app_internal_port_0_name - index_value network: get_input: - - port_app_oam_0_port_network + - port_app_internal_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: app relationship: tosca.relationships.network.BindsTo - app_app_data_0_port: + app_app_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_app_data_0_port_replacement_policy + - port_app_oam_port_0_replacement_policy - index_value mac_requirements: - get_input: port_app_data_0_port_mac_requirements + get_input: port_app_oam_port_0_mac_requirements order: - get_input: port_app_data_0_port_order + get_input: port_app_oam_port_0_order security_groups: get_input: - - port_app_data_0_port_security_groups + - port_app_oam_port_0_security_groups - index_value exCP_naming: - get_input: port_app_data_0_port_exCP_naming + get_input: port_app_oam_port_0_exCP_naming vlan_requirements: - get_input: port_app_data_0_port_vlan_requirements + get_input: port_app_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_app_data_0_port_related_networks + get_input: port_app_oam_port_0_related_networks ip_requirements: - get_input: port_app_data_0_port_ip_requirements + get_input: port_app_oam_port_0_ip_requirements network_role_tag: - get_input: port_app_data_0_port_network_role_tag + get_input: port_app_oam_port_0_network_role_tag network_role: - get_input: port_app_data_0_port_network_role + get_input: port_app_oam_port_0_network_role subnetpoolid: - get_input: port_app_data_0_port_subnetpoolid + get_input: port_app_oam_port_0_subnetpoolid fixed_ips: get_input: - - port_app_data_0_port_fixed_ips + - port_app_oam_port_0_fixed_ips - index_value name: get_input: - - port_app_data_0_port_name + - port_app_oam_port_0_name - index_value network: get_input: - - port_app_data_0_port_network + - port_app_oam_port_0_network - index_value requirements: - binding: @@ -414,9 +414,9 @@ topology_template: disk.device.write.requests_app: - app - disk.device.write.requests - feature_app_app_oam_0_port: - - app_app_oam_0_port - - feature + network.incoming.bytes_app_app_data_port_0: + - app_app_data_port_0 + - network.incoming.bytes disk.device.capacity_app: - app - disk.device.capacity @@ -426,18 +426,12 @@ topology_template: disk.device.iops_app: - app - disk.device.iops - network.incoming.packets.rate_app_app_oam_0_port: - - app_app_oam_0_port - - network.incoming.packets.rate - network.incoming.bytes.rate_app_app_data_0_port: - - app_app_data_0_port - - network.incoming.bytes.rate - network.incoming.bytes_app_app_oam_0_port: - - app_app_oam_0_port - - network.incoming.bytes - network.incoming.packets.rate_app_app_internal_0_port: - - app_app_internal_0_port - - network.incoming.packets.rate + network.outpoing.packets_app_app_internal_port_0: + - app_app_internal_port_0 + - network.outpoing.packets + network.outgoing.bytes.rate_app_app_data_port_0: + - app_app_data_port_0 + - network.outgoing.bytes.rate cpu.delta_app: - app - cpu.delta @@ -453,45 +447,60 @@ topology_template: disk.device.latency_app: - app - disk.device.latency - forwarder_app_app_oam_0_port: - - app_app_oam_0_port - - forwarder + network.outgoing.packets.rate_app_app_oam_port_0: + - app_app_oam_port_0 + - network.outgoing.packets.rate + network.incoming.packets_app_app_internal_port_0: + - app_app_internal_port_0 + - network.incoming.packets disk.ephemeral.size_app: - app - disk.ephemeral.size - network.outgoing.bytes_app_app_oam_0_port: - - app_app_oam_0_port - - network.outgoing.bytes + network.incoming.bytes.rate_app_app_oam_port_0: + - app_app_oam_port_0 + - network.incoming.bytes.rate disk.device.write.requests.rate_app: - app - disk.device.write.requests.rate disk.device.read.bytes_app: - app - disk.device.read.bytes - binding_app_app_data_0_port: - - app_app_data_0_port - - binding + network.outgoing.bytes_app_app_internal_port_0: + - app_app_internal_port_0 + - network.outgoing.bytes disk.device.read.requests.rate_app: - app - disk.device.read.requests.rate + network.outgoing.bytes.rate_app_app_oam_port_0: + - app_app_oam_port_0 + - network.outgoing.bytes.rate + network.incoming.bytes.rate_app_app_data_port_0: + - app_app_data_port_0 + - network.incoming.bytes.rate + network.outgoing.bytes_app_app_oam_port_0: + - app_app_oam_port_0 + - network.outgoing.bytes vcpus_app: - app - vcpus + binding_app_app_internal_port_0: + - app_app_internal_port_0 + - binding disk.device.read.requests_app: - app - disk.device.read.requests - feature_app_app_internal_0_port: - - app_app_internal_0_port - - feature cpu_util_app: - app - cpu_util + attachment_app_app_internal_port_0: + - app_app_internal_port_0 + - attachment endpoint_app: - app - endpoint - network.incoming.packets.rate_app_app_data_0_port: - - app_app_data_0_port - - network.incoming.packets.rate + network.incoming.bytes.rate_app_app_internal_port_0: + - app_app_internal_port_0 + - network.incoming.bytes.rate disk.iops_app: - app - disk.iops @@ -501,81 +510,57 @@ topology_template: disk.read.bytes.rate_app: - app - disk.read.bytes.rate + attachment_app_app_data_port_0: + - app_app_data_port_0 + - attachment disk.latency_app: - app - disk.latency memory.usage_app: - app - memory.usage - attachment_app_app_oam_0_port: - - app_app_oam_0_port - - attachment os_app: - app - os - network.incoming.packets_app_app_internal_0_port: - - app_app_internal_0_port - - network.incoming.packets - network.incoming.packets_app_app_oam_0_port: - - app_app_oam_0_port - - network.incoming.packets - network.outgoing.bytes.rate_app_app_internal_0_port: - - app_app_internal_0_port - - network.outgoing.bytes.rate - network.outgoing.bytes.rate_app_app_oam_0_port: - - app_app_oam_0_port - - network.outgoing.bytes.rate - forwarder_app_app_internal_0_port: - - app_app_internal_0_port - - forwarder + network.outgoing.bytes_app_app_data_port_0: + - app_app_data_port_0 + - network.outgoing.bytes + feature_app_app_oam_port_0: + - app_app_oam_port_0 + - feature memory_app: - app - memory disk.read.requests_app: - app - disk.read.requests - network.outpoing.packets_app_app_oam_0_port: - - app_app_oam_0_port - - network.outpoing.packets - network.incoming.bytes_app_app_data_0_port: - - app_app_data_0_port - - network.incoming.bytes + forwarder_app_app_oam_port_0: + - app_app_oam_port_0 + - forwarder disk.write.bytes_app: - app - disk.write.bytes + binding_app_app_data_port_0: + - app_app_data_port_0 + - binding disk.allocation_app: - app - disk.allocation - network.outgoing.bytes_app_app_internal_0_port: - - app_app_internal_0_port - - network.outgoing.bytes - attachment_app_app_data_0_port: - - app_app_data_0_port - - attachment - network.incoming.bytes.rate_app_app_oam_0_port: - - app_app_oam_0_port - - network.incoming.bytes.rate - network.outgoing.packets.rate_app_app_internal_0_port: - - app_app_internal_0_port - - network.outgoing.packets.rate - network.incoming.bytes.rate_app_app_internal_0_port: - - app_app_internal_0_port - - network.incoming.bytes.rate + network.incoming.packets_app_app_data_port_0: + - app_app_data_port_0 + - network.incoming.packets memory.resident_app: - app - memory.resident - network.outgoing.packets.rate_app_app_oam_0_port: - - app_app_oam_0_port - - network.outgoing.packets.rate - network.outgoing.bytes.rate_app_app_data_0_port: - - app_app_data_0_port - - network.outgoing.bytes.rate + binding_app_app_oam_port_0: + - app_app_oam_port_0 + - binding + feature_app_app_internal_port_0: + - app_app_internal_port_0 + - feature cpu_app: - app - cpu - feature_app_app_data_0_port: - - app_app_data_0_port - - feature disk.usage_app: - app - disk.usage @@ -585,85 +570,100 @@ topology_template: disk.read.bytes_app: - app - disk.read.bytes + network.outpoing.packets_app_app_data_port_0: + - app_app_data_port_0 + - network.outpoing.packets + network.incoming.bytes_app_app_oam_port_0: + - app_app_oam_port_0 + - network.incoming.bytes scalable_app: - app - scalable - network.outgoing.packets.rate_app_app_data_0_port: - - app_app_data_0_port - - network.outgoing.packets.rate + network.incoming.bytes_app_app_internal_port_0: + - app_app_internal_port_0 + - network.incoming.bytes + network.outgoing.bytes.rate_app_app_internal_port_0: + - app_app_internal_port_0 + - network.outgoing.bytes.rate + network.outpoing.packets_app_app_oam_port_0: + - app_app_oam_port_0 + - network.outpoing.packets + network.incoming.packets.rate_app_app_data_port_0: + - app_app_data_port_0 + - network.incoming.packets.rate + forwarder_app_app_internal_port_0: + - app_app_internal_port_0 + - forwarder + forwarder_app_app_data_port_0: + - app_app_data_port_0 + - forwarder disk.device.read.bytes.rate_app: - app - disk.device.read.bytes.rate disk.device.allocation_app: - app - disk.device.allocation + network.incoming.packets.rate_app_app_internal_port_0: + - app_app_internal_port_0 + - network.incoming.packets.rate binding_app: - app - binding disk.device.write.bytes.rate_app: - app - disk.device.write.bytes.rate - binding_app_app_oam_0_port: - - app_app_oam_0_port - - binding disk.device.usage_app: - app - disk.device.usage - network.outpoing.packets_app_app_data_0_port: - - app_app_data_0_port - - network.outpoing.packets - network.outgoing.bytes_app_app_data_0_port: - - app_app_data_0_port - - network.outgoing.bytes - network.incoming.bytes_app_app_internal_0_port: - - app_app_internal_0_port - - network.incoming.bytes - forwarder_app_app_data_0_port: - - app_app_data_0_port - - forwarder + feature_app_app_data_port_0: + - app_app_data_port_0 + - feature + network.outgoing.packets.rate_app_app_internal_port_0: + - app_app_internal_port_0 + - network.outgoing.packets.rate + network.incoming.packets.rate_app_app_oam_port_0: + - app_app_oam_port_0 + - network.incoming.packets.rate + network.incoming.packets_app_app_oam_port_0: + - app_app_oam_port_0 + - network.incoming.packets disk.write.requests_app: - app - disk.write.requests - binding_app_app_internal_0_port: - - app_app_internal_0_port - - binding + attachment_app_app_oam_port_0: + - app_app_oam_port_0 + - attachment + network.outgoing.packets.rate_app_app_data_port_0: + - app_app_data_port_0 + - network.outgoing.packets.rate instance_app: - app - instance - attachment_app_app_internal_0_port: - - app_app_internal_0_port - - attachment - network.incoming.packets_app_app_data_0_port: - - app_app_data_0_port - - network.incoming.packets - network.outpoing.packets_app_app_internal_0_port: - - app_app_internal_0_port - - network.outpoing.packets disk.capacity_app: - app - disk.capacity requirements: - link_app_app_oam_0_port: - - app_app_oam_0_port - - link - dependency_app_app_internal_0_port: - - app_app_internal_0_port + dependency_app_app_oam_port_0: + - app_app_oam_port_0 + - dependency + dependency_app_app_data_port_0: + - app_app_data_port_0 - dependency dependency_app: - app - dependency - dependency_app_app_oam_0_port: - - app_app_oam_0_port - - dependency + link_app_app_data_port_0: + - app_app_data_port_0 + - link + link_app_app_internal_port_0: + - app_app_internal_port_0 + - link local_storage_app: - app - local_storage - link_app_app_internal_0_port: - - app_app_internal_0_port - - link - link_app_app_data_0_port: - - app_app_data_0_port + link_app_app_oam_port_0: + - app_app_oam_port_0 - link - dependency_app_app_data_0_port: - - app_app_data_0_port + dependency_app_app_internal_port_0: + - app_app_internal_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/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml index 49e8ee1c5c..2e97fde0fb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml @@ -11,177 +11,183 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_iox_data_0_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_iox_oam_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_iox_internal_0_port_network: - type: list - required: true - entry_schema: - type: string - port_iox_data_0_port_name: - type: list + port_iox_oam_port_0_network_role: + type: string required: true - entry_schema: - type: string - port_iox_data_0_port_related_networks: + port_iox_oam_port_0_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_iox_data_port_0_network_role: type: string required: true - port_iox_data_0_port_subnetpoolid: + vm_flavor_name: type: string required: true - port_iox_data_0_port_allowed_address_pairs: - type: list + port_iox_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_iox_internal_0_port_ip_requirements: - type: list + port_iox_data_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true - port_iox_oam_0_port_name: + port_iox_oam_port_0_replacement_policy: type: list required: true entry_schema: type: string - port_iox_oam_0_port_network_role_tag: - type: string + port_iox_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_iox_oam_0_port_subnetpoolid: - type: string + port_iox_internal_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true compute_iox_user_data_format: type: list required: true entry_schema: type: string - port_iox_data_0_port_fixed_ips: - type: list + port_iox_internal_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_iox_internal_0_port_allowed_address_pairs: + port_iox_data_port_0_allowed_address_pairs: type: list required: true entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair - compute_iox_config_drive: + port_iox_data_port_0_ip_requirements: type: list required: true entry_schema: - type: boolean - port_iox_internal_0_port_order: - type: integer - required: true - port_iox_oam_0_port_replacement_policy: + type: org.openecomp.datatypes.network.IpRequirements + port_iox_internal_port_0_related_networks: type: list required: true entry_schema: - type: string - port_iox_data_0_port_security_groups: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + compute_iox_config_drive: type: list required: true entry_schema: - type: json - port_iox_internal_0_port_vlan_requirements: + type: boolean + port_iox_internal_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - compute_iox_image_update_policy: + port_iox_internal_port_0_order: + type: integer + required: true + port_iox_data_port_0_network: type: list required: true entry_schema: type: string - port_iox_oam_0_port_order: + port_iox_internal_port_0_network_role_tag: + type: string + required: true + port_iox_oam_port_0_order: type: integer required: true - port_iox_oam_0_port_network: + compute_iox_image_update_policy: type: list required: true entry_schema: type: string - port_iox_oam_0_port_related_networks: + port_iox_data_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_iox_internal_0_port_security_groups: + type: org.openecomp.datatypes.network.VlanRequirements + port_iox_data_port_0_network_role_tag: + type: string + required: true + port_iox_internal_port_0_ip_requirements: type: list required: true entry_schema: - type: json - port_iox_oam_0_port_vlan_requirements: + type: org.openecomp.datatypes.network.IpRequirements + port_iox_oam_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_iox_data_0_port_order: + port_iox_data_port_0_order: type: integer required: true - port_iox_internal_0_port_name: + compute_iox_name: type: list required: true entry_schema: type: string - port_iox_oam_0_port_fixed_ips: + port_iox_oam_port_0_allowed_address_pairs: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_iox_data_0_port_vlan_requirements: + type: org.openecomp.datatypes.heat.network.AddressPair + port_iox_oam_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_iox_name: + type: string + port_iox_internal_port_0_name: type: list required: true entry_schema: type: string - port_iox_data_0_port_network: + port_iox_internal_port_0_allowed_address_pairs: type: list required: true entry_schema: - type: string - port_iox_internal_0_port_replacement_policy: + type: org.openecomp.datatypes.heat.network.AddressPair + port_iox_oam_port_0_network_role_tag: + type: string + required: true + port_iox_data_port_0_fixed_ips: type: list required: true entry_schema: - type: string - port_iox_internal_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_iox_data_port_0_subnetpoolid: + type: string required: true - port_iox_data_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_iox_oam_port_0_security_groups: + type: list + required: true + entry_schema: + type: json + port_iox_internal_port_0_security_groups: + type: list required: true - port_iox_data_0_port_exCP_naming: + entry_schema: + type: json + port_iox_oam_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_iox_data_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_iox_oam_0_port_network_role: - type: string + port_iox_data_port_0_related_networks: + type: list required: true - port_iox_internal_0_port_network_role: - type: string + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_iox_data_port_0_security_groups: + type: list required: true - port_iox_data_0_port_network_role: - type: string + entry_schema: + type: json + port_iox_internal_port_0_network: + type: list required: true - port_iox_data_0_port_replacement_policy: + entry_schema: + type: string + port_iox_internal_port_0_replacement_policy: type: list required: true entry_schema: @@ -191,6 +197,11 @@ topology_template: required: true entry_schema: type: json + port_iox_data_port_0_name: + type: list + required: true + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -198,20 +209,13 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_iox_internal_0_port_network_role_tag: + port_iox_internal_port_0_network_role: type: string required: true - port_iox_internal_0_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_iox_oam_0_port_allowed_address_pairs: - type: list + port_iox_internal_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_iox_internal_0_port_subnetpoolid: + port_iox_oam_port_0_subnetpoolid: type: string required: true compute_iox_availability_zone: @@ -219,75 +223,22 @@ topology_template: required: true entry_schema: type: string - port_iox_oam_0_port_security_groups: + port_iox_oam_port_0_related_networks: type: list required: true entry_schema: - type: json - port_iox_oam_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_iox_oam_0_port_ip_requirements: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_iox_data_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_iox_internal_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_iox_data_0_port_network_role_tag: - type: string + type: string + port_iox_oam_port_0_name: + type: list required: true + entry_schema: + type: string node_templates: - iox_iox_data_0_port: - type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port - properties: - replacement_policy: - get_input: - - port_iox_data_0_port_replacement_policy - - index_value - mac_requirements: - get_input: port_iox_data_0_port_mac_requirements - allowed_address_pairs: - get_input: port_iox_data_0_port_allowed_address_pairs - order: - get_input: port_iox_data_0_port_order - security_groups: - get_input: - - port_iox_data_0_port_security_groups - - index_value - exCP_naming: - get_input: port_iox_data_0_port_exCP_naming - vlan_requirements: - get_input: port_iox_data_0_port_vlan_requirements - subinterface_indicator: false - related_networks: - get_input: port_iox_data_0_port_related_networks - ip_requirements: - get_input: port_iox_data_0_port_ip_requirements - network_role_tag: - get_input: port_iox_data_0_port_network_role_tag - network_role: - get_input: port_iox_data_0_port_network_role - subnetpoolid: - get_input: port_iox_data_0_port_subnetpoolid - fixed_ips: - get_input: - - port_iox_data_0_port_fixed_ips - - index_value - name: - get_input: - - port_iox_data_0_port_name - - index_value - network: - get_input: - - port_iox_data_0_port_network - - index_value - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: iox - relationship: tosca.relationships.network.BindsTo iox: type: org.openecomp.resource.vfc.compute.nodes.heat.iox properties: @@ -319,94 +270,143 @@ topology_template: get_input: - compute_iox_user_data_format - index_value - iox_iox_oam_0_port: + iox_iox_internal_port_0: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + replacement_policy: + get_input: + - port_iox_internal_port_0_replacement_policy + - index_value + mac_requirements: + get_input: port_iox_internal_port_0_mac_requirements + allowed_address_pairs: + get_input: port_iox_internal_port_0_allowed_address_pairs + order: + get_input: port_iox_internal_port_0_order + security_groups: + get_input: + - port_iox_internal_port_0_security_groups + - index_value + exCP_naming: + get_input: port_iox_internal_port_0_exCP_naming + vlan_requirements: + get_input: port_iox_internal_port_0_vlan_requirements + subinterface_indicator: false + related_networks: + get_input: port_iox_internal_port_0_related_networks + ip_requirements: + get_input: port_iox_internal_port_0_ip_requirements + network_role_tag: + get_input: port_iox_internal_port_0_network_role_tag + network_role: + get_input: port_iox_internal_port_0_network_role + subnetpoolid: + get_input: port_iox_internal_port_0_subnetpoolid + name: + get_input: + - port_iox_internal_port_0_name + - index_value + network: + get_input: + - port_iox_internal_port_0_network + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: iox + relationship: tosca.relationships.network.BindsTo + iox_iox_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_iox_oam_0_port_replacement_policy + - port_iox_oam_port_0_replacement_policy - index_value mac_requirements: - get_input: port_iox_oam_0_port_mac_requirements + get_input: port_iox_oam_port_0_mac_requirements allowed_address_pairs: - get_input: port_iox_oam_0_port_allowed_address_pairs + get_input: port_iox_oam_port_0_allowed_address_pairs order: - get_input: port_iox_oam_0_port_order + get_input: port_iox_oam_port_0_order security_groups: get_input: - - port_iox_oam_0_port_security_groups + - port_iox_oam_port_0_security_groups - index_value exCP_naming: - get_input: port_iox_oam_0_port_exCP_naming + get_input: port_iox_oam_port_0_exCP_naming vlan_requirements: - get_input: port_iox_oam_0_port_vlan_requirements + get_input: port_iox_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_iox_oam_0_port_related_networks + get_input: port_iox_oam_port_0_related_networks ip_requirements: - get_input: port_iox_oam_0_port_ip_requirements + get_input: port_iox_oam_port_0_ip_requirements network_role_tag: - get_input: port_iox_oam_0_port_network_role_tag + get_input: port_iox_oam_port_0_network_role_tag network_role: - get_input: port_iox_oam_0_port_network_role + get_input: port_iox_oam_port_0_network_role subnetpoolid: - get_input: port_iox_oam_0_port_subnetpoolid + get_input: port_iox_oam_port_0_subnetpoolid fixed_ips: get_input: - - port_iox_oam_0_port_fixed_ips + - port_iox_oam_port_0_fixed_ips - index_value name: get_input: - - port_iox_oam_0_port_name + - port_iox_oam_port_0_name - index_value network: get_input: - - port_iox_oam_0_port_network + - port_iox_oam_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: iox relationship: tosca.relationships.network.BindsTo - iox_iox_internal_0_port: + iox_iox_data_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_iox_internal_0_port_replacement_policy + - port_iox_data_port_0_replacement_policy - index_value mac_requirements: - get_input: port_iox_internal_0_port_mac_requirements + get_input: port_iox_data_port_0_mac_requirements allowed_address_pairs: - get_input: port_iox_internal_0_port_allowed_address_pairs + get_input: port_iox_data_port_0_allowed_address_pairs order: - get_input: port_iox_internal_0_port_order + get_input: port_iox_data_port_0_order security_groups: get_input: - - port_iox_internal_0_port_security_groups + - port_iox_data_port_0_security_groups - index_value exCP_naming: - get_input: port_iox_internal_0_port_exCP_naming + get_input: port_iox_data_port_0_exCP_naming vlan_requirements: - get_input: port_iox_internal_0_port_vlan_requirements + get_input: port_iox_data_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_iox_internal_0_port_related_networks + get_input: port_iox_data_port_0_related_networks ip_requirements: - get_input: port_iox_internal_0_port_ip_requirements + get_input: port_iox_data_port_0_ip_requirements network_role_tag: - get_input: port_iox_internal_0_port_network_role_tag + get_input: port_iox_data_port_0_network_role_tag network_role: - get_input: port_iox_internal_0_port_network_role + get_input: port_iox_data_port_0_network_role subnetpoolid: - get_input: port_iox_internal_0_port_subnetpoolid + get_input: port_iox_data_port_0_subnetpoolid + fixed_ips: + get_input: + - port_iox_data_port_0_fixed_ips + - index_value name: get_input: - - port_iox_internal_0_port_name + - port_iox_data_port_0_name - index_value network: get_input: - - port_iox_internal_0_port_network + - port_iox_data_port_0_network - index_value requirements: - binding: @@ -416,9 +416,6 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.iox capabilities: - forwarder_iox_iox_oam_0_port: - - iox_iox_oam_0_port - - forwarder cpu.delta_iox: - iox - cpu.delta @@ -428,23 +425,23 @@ topology_template: memory_iox: - iox - memory - network.outgoing.packets.rate_iox_iox_data_0_port: - - iox_iox_data_0_port - - network.outgoing.packets.rate disk.device.read.bytes_iox: - iox - disk.device.read.bytes disk.read.requests_iox: - iox - disk.read.requests + network.incoming.packets_iox_iox_data_port_0: + - iox_iox_data_port_0 + - network.incoming.packets disk.write.requests_iox: - iox - disk.write.requests - network.incoming.bytes_iox_iox_oam_0_port: - - iox_iox_oam_0_port - - network.incoming.bytes - network.incoming.packets.rate_iox_iox_internal_0_port: - - iox_iox_internal_0_port + network.outpoing.packets_iox_iox_internal_port_0: + - iox_iox_internal_port_0 + - network.outpoing.packets + network.incoming.packets.rate_iox_iox_data_port_0: + - iox_iox_data_port_0 - network.incoming.packets.rate disk.device.read.requests.rate_iox: - iox @@ -458,90 +455,81 @@ topology_template: disk.write.bytes_iox: - iox - disk.write.bytes + network.outgoing.packets.rate_iox_iox_internal_port_0: + - iox_iox_internal_port_0 + - network.outgoing.packets.rate + network.incoming.packets_iox_iox_internal_port_0: + - iox_iox_internal_port_0 + - network.incoming.packets disk.device.write.requests_iox: - iox - disk.device.write.requests disk.device.allocation_iox: - iox - disk.device.allocation - feature_iox_iox_data_0_port: - - iox_iox_data_0_port - - feature disk.root.size_iox: - iox - disk.root.size + network.outgoing.bytes.rate_iox_iox_oam_port_0: + - iox_iox_oam_port_0 + - network.outgoing.bytes.rate vcpus_iox: - iox - vcpus disk.device.iops_iox: - iox - disk.device.iops - network.outgoing.bytes.rate_iox_iox_data_0_port: - - iox_iox_data_0_port - - network.outgoing.bytes.rate + network.outgoing.bytes_iox_iox_data_port_0: + - iox_iox_data_port_0 + - network.outgoing.bytes disk.read.bytes.rate_iox: - iox - disk.read.bytes.rate - network.outgoing.bytes_iox_iox_oam_0_port: - - iox_iox_oam_0_port + feature_iox_iox_oam_port_0: + - iox_iox_oam_port_0 + - feature + network.outgoing.bytes_iox_iox_internal_port_0: + - iox_iox_internal_port_0 - network.outgoing.bytes - attachment_iox_iox_data_0_port: - - iox_iox_data_0_port - - attachment - network.incoming.packets.rate_iox_iox_oam_0_port: - - iox_iox_oam_0_port + binding_iox_iox_data_port_0: + - iox_iox_data_port_0 + - binding + network.incoming.packets.rate_iox_iox_internal_port_0: + - iox_iox_internal_port_0 - network.incoming.packets.rate disk.latency_iox: - iox - disk.latency - network.incoming.packets.rate_iox_iox_data_0_port: - - iox_iox_data_0_port + network.incoming.bytes.rate_iox_iox_data_port_0: + - iox_iox_data_port_0 + - network.incoming.bytes.rate + network.incoming.packets.rate_iox_iox_oam_port_0: + - iox_iox_oam_port_0 - network.incoming.packets.rate - network.incoming.bytes_iox_iox_internal_0_port: - - iox_iox_internal_0_port - - network.incoming.bytes cpu_util_iox: - iox - cpu_util - binding_iox_iox_oam_0_port: - - iox_iox_oam_0_port - - binding - network.incoming.bytes_iox_iox_data_0_port: - - iox_iox_data_0_port - - network.incoming.bytes disk.device.capacity_iox: - iox - disk.device.capacity disk.iops_iox: - iox - disk.iops - network.outpoing.packets_iox_iox_internal_0_port: - - iox_iox_internal_0_port - - network.outpoing.packets endpoint_iox: - iox - endpoint - binding_iox_iox_internal_0_port: - - iox_iox_internal_0_port - - binding disk.device.read.requests_iox: - iox - disk.device.read.requests memory.usage_iox: - iox - memory.usage - attachment_iox_iox_internal_0_port: - - iox_iox_internal_0_port + attachment_iox_iox_data_port_0: + - iox_iox_data_port_0 - attachment - network.outgoing.bytes_iox_iox_internal_0_port: - - iox_iox_internal_0_port - - network.outgoing.bytes cpu_iox: - iox - cpu - feature_iox_iox_oam_0_port: - - iox_iox_oam_0_port - - feature disk.usage_iox: - iox - disk.usage @@ -551,42 +539,54 @@ topology_template: feature_iox: - iox - feature + network.incoming.bytes_iox_iox_data_port_0: + - iox_iox_data_port_0 + - network.incoming.bytes memory.resident_iox: - iox - memory.resident disk.device.write.bytes_iox: - iox - disk.device.write.bytes - network.outgoing.packets.rate_iox_iox_internal_0_port: - - iox_iox_internal_0_port - - network.outgoing.packets.rate - binding_iox_iox_data_0_port: - - iox_iox_data_0_port - - binding - network.outgoing.bytes.rate_iox_iox_oam_0_port: - - iox_iox_oam_0_port - - network.outgoing.bytes.rate - network.incoming.bytes.rate_iox_iox_internal_0_port: - - iox_iox_internal_0_port - - network.incoming.bytes.rate - network.incoming.bytes.rate_iox_iox_oam_0_port: - - iox_iox_oam_0_port - - network.incoming.bytes.rate + attachment_iox_iox_oam_port_0: + - iox_iox_oam_port_0 + - attachment + network.incoming.packets_iox_iox_oam_port_0: + - iox_iox_oam_port_0 + - network.incoming.packets + feature_iox_iox_internal_port_0: + - iox_iox_internal_port_0 + - feature + network.outpoing.packets_iox_iox_oam_port_0: + - iox_iox_oam_port_0 + - network.outpoing.packets disk.allocation_iox: - iox - disk.allocation - network.outgoing.packets.rate_iox_iox_oam_0_port: - - iox_iox_oam_0_port - - network.outgoing.packets.rate + forwarder_iox_iox_internal_port_0: + - iox_iox_internal_port_0 + - forwarder + binding_iox_iox_oam_port_0: + - iox_iox_oam_port_0 + - binding + network.incoming.bytes_iox_iox_internal_port_0: + - iox_iox_internal_port_0 + - network.incoming.bytes binding_iox: - iox - binding os_iox: - iox - os + binding_iox_iox_internal_port_0: + - iox_iox_internal_port_0 + - binding host_iox: - iox - host + network.outgoing.packets.rate_iox_iox_oam_port_0: + - iox_iox_oam_port_0 + - network.outgoing.packets.rate disk.write.requests.rate_iox: - iox - disk.write.requests.rate @@ -596,79 +596,79 @@ topology_template: disk.read.bytes_iox: - iox - disk.read.bytes - network.incoming.packets_iox_iox_oam_0_port: - - iox_iox_oam_0_port - - network.incoming.packets + network.outgoing.bytes.rate_iox_iox_internal_port_0: + - iox_iox_internal_port_0 + - network.outgoing.bytes.rate instance_iox: - iox - instance disk.ephemeral.size_iox: - iox - disk.ephemeral.size - network.outpoing.packets_iox_iox_data_0_port: - - iox_iox_data_0_port - - network.outpoing.packets - attachment_iox_iox_oam_0_port: - - iox_iox_oam_0_port + attachment_iox_iox_internal_port_0: + - iox_iox_internal_port_0 - attachment - feature_iox_iox_internal_0_port: - - iox_iox_internal_0_port - - feature - network.incoming.packets_iox_iox_internal_0_port: - - iox_iox_internal_0_port - - network.incoming.packets - network.outpoing.packets_iox_iox_oam_0_port: - - iox_iox_oam_0_port - - network.outpoing.packets - forwarder_iox_iox_data_0_port: - - iox_iox_data_0_port + forwarder_iox_iox_data_port_0: + - iox_iox_data_port_0 - forwarder + network.incoming.bytes.rate_iox_iox_internal_port_0: + - iox_iox_internal_port_0 + - network.incoming.bytes.rate + forwarder_iox_iox_oam_port_0: + - iox_iox_oam_port_0 + - forwarder + network.incoming.bytes_iox_iox_oam_port_0: + - iox_iox_oam_port_0 + - network.incoming.bytes + feature_iox_iox_data_port_0: + - iox_iox_data_port_0 + - feature + network.incoming.bytes.rate_iox_iox_oam_port_0: + - iox_iox_oam_port_0 + - network.incoming.bytes.rate + network.outgoing.bytes_iox_iox_oam_port_0: + - iox_iox_oam_port_0 + - network.outgoing.bytes disk.device.read.bytes.rate_iox: - iox - disk.device.read.bytes.rate - network.incoming.bytes.rate_iox_iox_data_0_port: - - iox_iox_data_0_port - - network.incoming.bytes.rate - network.incoming.packets_iox_iox_data_0_port: - - iox_iox_data_0_port - - network.incoming.packets + network.outpoing.packets_iox_iox_data_port_0: + - iox_iox_data_port_0 + - network.outpoing.packets + network.outgoing.bytes.rate_iox_iox_data_port_0: + - iox_iox_data_port_0 + - network.outgoing.bytes.rate disk.device.write.bytes.rate_iox: - iox - disk.device.write.bytes.rate - network.outgoing.bytes.rate_iox_iox_internal_0_port: - - iox_iox_internal_0_port - - network.outgoing.bytes.rate - forwarder_iox_iox_internal_0_port: - - iox_iox_internal_0_port - - forwarder disk.device.usage_iox: - iox - disk.device.usage - network.outgoing.bytes_iox_iox_data_0_port: - - iox_iox_data_0_port - - network.outgoing.bytes + network.outgoing.packets.rate_iox_iox_data_port_0: + - iox_iox_data_port_0 + - network.outgoing.packets.rate requirements: - dependency_iox_iox_internal_0_port: - - iox_iox_internal_0_port + dependency_iox_iox_data_port_0: + - iox_iox_data_port_0 - dependency - link_iox_iox_oam_0_port: - - iox_iox_oam_0_port - - link dependency_iox: - iox - dependency - dependency_iox_iox_data_0_port: - - iox_iox_data_0_port + dependency_iox_iox_oam_port_0: + - iox_iox_oam_port_0 - dependency - link_iox_iox_data_0_port: - - iox_iox_data_0_port - - link - link_iox_iox_internal_0_port: - - iox_iox_internal_0_port + link_iox_iox_internal_port_0: + - iox_iox_internal_port_0 - link + dependency_iox_iox_internal_port_0: + - iox_iox_internal_port_0 + - dependency local_storage_iox: - iox - local_storage - dependency_iox_iox_oam_0_port: - - iox_iox_oam_0_port - - dependency + link_iox_iox_data_port_0: + - iox_iox_data_port_0 + - link + link_iox_iox_oam_port_0: + - iox_iox_oam_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/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml index bc794e70bd..27818cb820 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml @@ -11,151 +11,153 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_plt_data_0_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_plt_oam_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_plt_oam_0_port_subnetpoolid: + port_plt_oam_port_0_network_role_tag: type: string required: true - port_plt_internal_0_port_allowed_address_pairs: + port_plt_data_port_0_allowed_address_pairs: type: list required: true entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair - port_plt_oam_0_port_security_groups: + port_plt_oam_port_0_ip_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements + port_plt_oam_port_0_network_role: + type: string + required: true compute_plt_config_drive: type: list required: true entry_schema: type: boolean - port_plt_data_0_port_subnetpoolid: + port_plt_data_port_0_network_role_tag: type: string required: true vm_flavor_name: type: string required: true - port_plt_internal_0_port_vlan_requirements: + port_plt_internal_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_plt_data_0_port_fixed_ips: + port_plt_data_port_0_network_role: + type: string + required: true + port_plt_internal_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: string + port_plt_data_port_0_security_groups: + type: list + required: true + entry_schema: + type: json vm_image_name: type: string required: true - compute_plt_availability_zone: + port_plt_oam_port_0_name: type: list required: true entry_schema: type: string - port_plt_oam_0_port_name: + compute_plt_availability_zone: type: list required: true entry_schema: type: string - port_plt_internal_0_port_security_groups: - type: list - required: true - entry_schema: - type: json - port_plt_internal_0_port_network_role_tag: + port_plt_internal_port_0_network_role: type: string required: true - port_plt_oam_0_port_ip_requirements: + port_plt_data_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_plt_data_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_plt_data_0_port_allowed_address_pairs: + port_plt_data_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_plt_internal_0_port_subnetpoolid: + type: string + port_plt_internal_port_0_subnetpoolid: type: string required: true - port_plt_data_0_port_ip_requirements: + port_plt_data_port_0_order: + type: integer + required: true + port_plt_oam_port_0_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_plt_internal_0_port_network: + type: json + port_plt_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_plt_internal_port_0_allowed_address_pairs: type: list required: true entry_schema: - type: string - compute_plt_metadata: + type: org.openecomp.datatypes.heat.network.AddressPair + port_plt_internal_port_0_ip_requirements: type: list required: true entry_schema: - type: json - port_plt_data_0_port_security_groups: + type: org.openecomp.datatypes.network.IpRequirements + compute_plt_metadata: type: list required: true entry_schema: type: json - port_plt_oam_0_port_related_networks: + port_plt_internal_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_plt_internal_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_plt_oam_port_0_fixed_ips: + type: list required: true - port_plt_data_0_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_plt_internal_port_0_security_groups: + type: list required: true - port_plt_data_0_port_vlan_requirements: + entry_schema: + type: json + port_plt_data_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_plt_data_0_port_network_role_tag: - type: string - required: true - port_plt_internal_0_port_order: - type: integer - required: true - port_plt_internal_0_port_ip_requirements: + port_plt_oam_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_plt_oam_0_port_fixed_ips: + type: string + port_plt_oam_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_plt_oam_0_port_network_role_tag: - type: string - required: true - port_plt_internal_0_port_name: + type: string + port_plt_oam_port_0_related_networks: type: list required: true entry_schema: - type: string - port_plt_internal_0_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_plt_data_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_plt_oam_0_port_order: + port_plt_internal_port_0_order: + type: integer + required: true + port_plt_internal_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_plt_oam_port_0_order: type: integer required: true compute_plt_image_update_policy: @@ -163,46 +165,33 @@ topology_template: required: true entry_schema: type: string - port_plt_oam_0_port_network_role: + port_plt_oam_port_0_subnetpoolid: type: string required: true - port_plt_oam_0_port_allowed_address_pairs: - type: list + port_plt_internal_port_0_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_plt_data_0_port_name: - type: list + port_plt_data_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: string - port_plt_data_0_port_exCP_naming: + port_plt_data_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_plt_internal_0_port_network_role: - type: string - required: true compute_plt_user_data_format: type: list required: true entry_schema: type: string - port_plt_internal_0_port_replacement_policy: + port_plt_internal_port_0_network: type: list required: true entry_schema: type: string - port_plt_data_0_port_network: + port_plt_data_port_0_fixed_ips: type: list required: true entry_schema: - type: string - port_plt_data_0_port_network_role: - type: string - required: true - port_plt_internal_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true + type: org.openecomp.datatypes.heat.neutron.port.FixedIps index_value: type: integer description: Index value of this substitution service template runtime instance @@ -210,123 +199,138 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_plt_oam_0_port_network: + port_plt_data_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_plt_internal_port_0_name: type: list required: true entry_schema: type: string - port_plt_oam_0_port_replacement_policy: + port_plt_oam_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_plt_data_0_port_replacement_policy: + type: org.openecomp.datatypes.network.VlanRequirements + compute_plt_name: type: list required: true entry_schema: type: string - port_plt_oam_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_plt_internal_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - compute_plt_name: + port_plt_data_port_0_name: type: list required: true entry_schema: type: string - port_plt_oam_0_port_vlan_requirements: + port_plt_data_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string + port_plt_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_plt_oam_port_0_allowed_address_pairs: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair node_templates: - plt_plt_internal_0_port: + plt_plt_data_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_plt_internal_0_port_replacement_policy + - port_plt_data_port_0_replacement_policy - index_value mac_requirements: - get_input: port_plt_internal_0_port_mac_requirements + get_input: port_plt_data_port_0_mac_requirements allowed_address_pairs: - get_input: port_plt_internal_0_port_allowed_address_pairs + get_input: port_plt_data_port_0_allowed_address_pairs order: - get_input: port_plt_internal_0_port_order + get_input: port_plt_data_port_0_order security_groups: get_input: - - port_plt_internal_0_port_security_groups + - port_plt_data_port_0_security_groups - index_value exCP_naming: - get_input: port_plt_internal_0_port_exCP_naming + get_input: port_plt_data_port_0_exCP_naming vlan_requirements: - get_input: port_plt_internal_0_port_vlan_requirements + get_input: port_plt_data_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_plt_internal_0_port_related_networks + get_input: port_plt_data_port_0_related_networks ip_requirements: - get_input: port_plt_internal_0_port_ip_requirements + get_input: port_plt_data_port_0_ip_requirements network_role_tag: - get_input: port_plt_internal_0_port_network_role_tag + get_input: port_plt_data_port_0_network_role_tag network_role: - get_input: port_plt_internal_0_port_network_role + get_input: port_plt_data_port_0_network_role subnetpoolid: - get_input: port_plt_internal_0_port_subnetpoolid + get_input: port_plt_data_port_0_subnetpoolid + fixed_ips: + get_input: + - port_plt_data_port_0_fixed_ips + - index_value name: get_input: - - port_plt_internal_0_port_name + - port_plt_data_port_0_name - index_value network: get_input: - - port_plt_internal_0_port_network + - port_plt_data_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: plt relationship: tosca.relationships.network.BindsTo - plt_plt_data_0_port: + plt_plt_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_plt_data_0_port_replacement_policy + - port_plt_oam_port_0_replacement_policy - index_value mac_requirements: - get_input: port_plt_data_0_port_mac_requirements + get_input: port_plt_oam_port_0_mac_requirements allowed_address_pairs: - get_input: port_plt_data_0_port_allowed_address_pairs + get_input: port_plt_oam_port_0_allowed_address_pairs order: - get_input: port_plt_data_0_port_order + get_input: port_plt_oam_port_0_order security_groups: get_input: - - port_plt_data_0_port_security_groups + - port_plt_oam_port_0_security_groups - index_value exCP_naming: - get_input: port_plt_data_0_port_exCP_naming + get_input: port_plt_oam_port_0_exCP_naming vlan_requirements: - get_input: port_plt_data_0_port_vlan_requirements + get_input: port_plt_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_plt_data_0_port_related_networks + get_input: port_plt_oam_port_0_related_networks ip_requirements: - get_input: port_plt_data_0_port_ip_requirements + get_input: port_plt_oam_port_0_ip_requirements network_role_tag: - get_input: port_plt_data_0_port_network_role_tag + get_input: port_plt_oam_port_0_network_role_tag network_role: - get_input: port_plt_data_0_port_network_role + get_input: port_plt_oam_port_0_network_role subnetpoolid: - get_input: port_plt_data_0_port_subnetpoolid + get_input: port_plt_oam_port_0_subnetpoolid fixed_ips: get_input: - - port_plt_data_0_port_fixed_ips + - port_plt_oam_port_0_fixed_ips - index_value name: get_input: - - port_plt_data_0_port_name + - port_plt_oam_port_0_name - index_value network: get_input: - - port_plt_data_0_port_network + - port_plt_oam_port_0_network - index_value requirements: - binding: @@ -364,49 +368,45 @@ topology_template: get_input: - compute_plt_user_data_format - index_value - plt_plt_oam_0_port: + plt_plt_internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_plt_oam_0_port_replacement_policy + - port_plt_internal_port_0_replacement_policy - index_value mac_requirements: - get_input: port_plt_oam_0_port_mac_requirements + get_input: port_plt_internal_port_0_mac_requirements allowed_address_pairs: - get_input: port_plt_oam_0_port_allowed_address_pairs + get_input: port_plt_internal_port_0_allowed_address_pairs order: - get_input: port_plt_oam_0_port_order + get_input: port_plt_internal_port_0_order security_groups: get_input: - - port_plt_oam_0_port_security_groups + - port_plt_internal_port_0_security_groups - index_value exCP_naming: - get_input: port_plt_oam_0_port_exCP_naming + get_input: port_plt_internal_port_0_exCP_naming vlan_requirements: - get_input: port_plt_oam_0_port_vlan_requirements + get_input: port_plt_internal_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_plt_oam_0_port_related_networks + get_input: port_plt_internal_port_0_related_networks ip_requirements: - get_input: port_plt_oam_0_port_ip_requirements + get_input: port_plt_internal_port_0_ip_requirements network_role_tag: - get_input: port_plt_oam_0_port_network_role_tag + get_input: port_plt_internal_port_0_network_role_tag network_role: - get_input: port_plt_oam_0_port_network_role + get_input: port_plt_internal_port_0_network_role subnetpoolid: - get_input: port_plt_oam_0_port_subnetpoolid - fixed_ips: - get_input: - - port_plt_oam_0_port_fixed_ips - - index_value + get_input: port_plt_internal_port_0_subnetpoolid name: get_input: - - port_plt_oam_0_port_name + - port_plt_internal_port_0_name - index_value network: get_input: - - port_plt_oam_0_port_network + - port_plt_internal_port_0_network - index_value requirements: - binding: @@ -416,219 +416,219 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.plt capabilities: - network.outgoing.bytes.rate_plt_plt_oam_0_port: - - plt_plt_oam_0_port - - network.outgoing.bytes.rate + network.incoming.packets_plt_plt_oam_port_0: + - plt_plt_oam_port_0 + - network.incoming.packets + attachment_plt_plt_internal_port_0: + - plt_plt_internal_port_0 + - attachment + network.incoming.bytes.rate_plt_plt_internal_port_0: + - plt_plt_internal_port_0 + - network.incoming.bytes.rate disk.device.usage_plt: - plt - disk.device.usage + binding_plt_plt_data_port_0: + - plt_plt_data_port_0 + - binding disk.iops_plt: - plt - disk.iops disk.read.bytes.rate_plt: - plt - disk.read.bytes.rate + network.incoming.bytes.rate_plt_plt_data_port_0: + - plt_plt_data_port_0 + - network.incoming.bytes.rate disk.device.allocation_plt: - plt - disk.device.allocation disk.device.write.bytes.rate_plt: - plt - disk.device.write.bytes.rate + network.outgoing.packets.rate_plt_plt_internal_port_0: + - plt_plt_internal_port_0 + - network.outgoing.packets.rate disk.read.bytes_plt: - plt - disk.read.bytes - network.incoming.packets_plt_plt_internal_0_port: - - plt_plt_internal_0_port - - network.incoming.packets disk.capacity_plt: - plt - disk.capacity disk.write.bytes_plt: - plt - disk.write.bytes + network.outpoing.packets_plt_plt_oam_port_0: + - plt_plt_oam_port_0 + - network.outpoing.packets + network.outgoing.bytes.rate_plt_plt_internal_port_0: + - plt_plt_internal_port_0 + - network.outgoing.bytes.rate + network.outgoing.packets.rate_plt_plt_oam_port_0: + - plt_plt_oam_port_0 + - network.outgoing.packets.rate + network.outgoing.bytes_plt_plt_internal_port_0: + - plt_plt_internal_port_0 + - network.outgoing.bytes disk.device.read.bytes.rate_plt: - plt - disk.device.read.bytes.rate + network.incoming.bytes.rate_plt_plt_oam_port_0: + - plt_plt_oam_port_0 + - network.incoming.bytes.rate + network.incoming.bytes_plt_plt_internal_port_0: + - plt_plt_internal_port_0 + - network.incoming.bytes + network.incoming.bytes_plt_plt_oam_port_0: + - plt_plt_oam_port_0 + - network.incoming.bytes endpoint_plt: - plt - endpoint disk.read.requests_plt: - plt - disk.read.requests - network.outpoing.packets_plt_plt_oam_0_port: - - plt_plt_oam_0_port - - network.outpoing.packets disk.device.write.requests.rate_plt: - plt - disk.device.write.requests.rate - attachment_plt_plt_data_0_port: - - plt_plt_data_0_port - - attachment feature_plt: - plt - feature cpu_plt: - plt - cpu + network.incoming.packets_plt_plt_data_port_0: + - plt_plt_data_port_0 + - network.incoming.packets disk.write.requests_plt: - plt - disk.write.requests - network.incoming.packets.rate_plt_plt_internal_0_port: - - plt_plt_internal_0_port - - network.incoming.packets.rate disk.device.write.bytes_plt: - plt - disk.device.write.bytes - network.outgoing.bytes_plt_plt_oam_0_port: - - plt_plt_oam_0_port - - network.outgoing.bytes - network.outpoing.packets_plt_plt_internal_0_port: - - plt_plt_internal_0_port - - network.outpoing.packets - network.incoming.bytes_plt_plt_internal_0_port: - - plt_plt_internal_0_port - - network.incoming.bytes - network.outgoing.packets.rate_plt_plt_oam_0_port: - - plt_plt_oam_0_port - - network.outgoing.packets.rate - network.incoming.bytes_plt_plt_oam_0_port: - - plt_plt_oam_0_port - - network.incoming.bytes - network.incoming.bytes_plt_plt_data_0_port: - - plt_plt_data_0_port - - network.incoming.bytes - attachment_plt_plt_internal_0_port: - - plt_plt_internal_0_port - - attachment + feature_plt_plt_internal_port_0: + - plt_plt_internal_port_0 + - feature + binding_plt_plt_oam_port_0: + - plt_plt_oam_port_0 + - binding + feature_plt_plt_oam_port_0: + - plt_plt_oam_port_0 + - feature binding_plt: - plt - binding - network.incoming.bytes.rate_plt_plt_oam_0_port: - - plt_plt_oam_0_port - - network.incoming.bytes.rate disk.device.read.bytes_plt: - plt - disk.device.read.bytes disk.device.latency_plt: - plt - disk.device.latency - network.incoming.packets.rate_plt_plt_data_0_port: - - plt_plt_data_0_port - - network.incoming.packets.rate - network.outgoing.bytes_plt_plt_internal_0_port: - - plt_plt_internal_0_port - - network.outgoing.bytes - binding_plt_plt_internal_0_port: - - plt_plt_internal_0_port + forwarder_plt_plt_oam_port_0: + - plt_plt_oam_port_0 + - forwarder + forwarder_plt_plt_data_port_0: + - plt_plt_data_port_0 + - forwarder + binding_plt_plt_internal_port_0: + - plt_plt_internal_port_0 - binding - feature_plt_plt_internal_0_port: - - plt_plt_internal_0_port - - feature instance_plt: - plt - instance disk.latency_plt: - plt - disk.latency + network.incoming.packets.rate_plt_plt_internal_port_0: + - plt_plt_internal_port_0 + - network.incoming.packets.rate + network.outgoing.bytes_plt_plt_data_port_0: + - plt_plt_data_port_0 + - network.outgoing.bytes + feature_plt_plt_data_port_0: + - plt_plt_data_port_0 + - feature disk.write.bytes.rate_plt: - plt - disk.write.bytes.rate + network.outgoing.packets.rate_plt_plt_data_port_0: + - plt_plt_data_port_0 + - network.outgoing.packets.rate disk.ephemeral.size_plt: - plt - disk.ephemeral.size cpu_util_plt: - plt - cpu_util - binding_plt_plt_oam_0_port: - - plt_plt_oam_0_port - - binding + attachment_plt_plt_data_port_0: + - plt_plt_data_port_0 + - attachment + network.incoming.packets.rate_plt_plt_data_port_0: + - plt_plt_data_port_0 + - network.incoming.packets.rate + network.incoming.packets.rate_plt_plt_oam_port_0: + - plt_plt_oam_port_0 + - network.incoming.packets.rate + network.outgoing.bytes_plt_plt_oam_port_0: + - plt_plt_oam_port_0 + - network.outgoing.bytes memory.usage_plt: - plt - memory.usage - attachment_plt_plt_oam_0_port: - - plt_plt_oam_0_port - - attachment - network.incoming.packets_plt_plt_oam_0_port: - - plt_plt_oam_0_port - - network.incoming.packets + network.outgoing.bytes.rate_plt_plt_data_port_0: + - plt_plt_data_port_0 + - network.outgoing.bytes.rate + network.outpoing.packets_plt_plt_data_port_0: + - plt_plt_data_port_0 + - network.outpoing.packets disk.device.capacity_plt: - plt - disk.device.capacity - forwarder_plt_plt_oam_0_port: - - plt_plt_oam_0_port - - forwarder - binding_plt_plt_data_0_port: - - plt_plt_data_0_port - - binding disk.device.read.requests_plt: - plt - disk.device.read.requests + forwarder_plt_plt_internal_port_0: + - plt_plt_internal_port_0 + - forwarder memory.resident_plt: - plt - memory.resident - network.outgoing.packets.rate_plt_plt_internal_0_port: - - plt_plt_internal_0_port - - network.outgoing.packets.rate scalable_plt: - plt - scalable - network.incoming.packets.rate_plt_plt_oam_0_port: - - plt_plt_oam_0_port - - network.incoming.packets.rate - network.outgoing.packets.rate_plt_plt_data_0_port: - - plt_plt_data_0_port - - network.outgoing.packets.rate - network.incoming.bytes.rate_plt_plt_data_0_port: - - plt_plt_data_0_port - - network.incoming.bytes.rate + network.outpoing.packets_plt_plt_internal_port_0: + - plt_plt_internal_port_0 + - network.outpoing.packets + network.incoming.bytes_plt_plt_data_port_0: + - plt_plt_data_port_0 + - network.incoming.bytes + network.outgoing.bytes.rate_plt_plt_oam_port_0: + - plt_plt_oam_port_0 + - network.outgoing.bytes.rate disk.usage_plt: - plt - disk.usage - feature_plt_plt_oam_0_port: - - plt_plt_oam_0_port - - feature - network.incoming.bytes.rate_plt_plt_internal_0_port: - - plt_plt_internal_0_port - - network.incoming.bytes.rate + network.incoming.packets_plt_plt_internal_port_0: + - plt_plt_internal_port_0 + - network.incoming.packets memory_plt: - plt - memory disk.root.size_plt: - plt - disk.root.size - network.outgoing.bytes_plt_plt_data_0_port: - - plt_plt_data_0_port - - network.outgoing.bytes cpu.delta_plt: - plt - cpu.delta disk.device.write.requests_plt: - plt - disk.device.write.requests - feature_plt_plt_data_0_port: - - plt_plt_data_0_port - - feature - network.outgoing.bytes.rate_plt_plt_data_0_port: - - plt_plt_data_0_port - - network.outgoing.bytes.rate disk.device.read.requests.rate_plt: - plt - disk.device.read.requests.rate - network.outpoing.packets_plt_plt_data_0_port: - - plt_plt_data_0_port - - network.outpoing.packets os_plt: - plt - os - network.outgoing.bytes.rate_plt_plt_internal_0_port: - - plt_plt_internal_0_port - - network.outgoing.bytes.rate - forwarder_plt_plt_internal_0_port: - - plt_plt_internal_0_port - - forwarder - network.incoming.packets_plt_plt_data_0_port: - - plt_plt_data_0_port - - network.incoming.packets disk.allocation_plt: - plt - disk.allocation @@ -644,31 +644,31 @@ topology_template: disk.write.requests.rate_plt: - plt - disk.write.requests.rate - forwarder_plt_plt_data_0_port: - - plt_plt_data_0_port - - forwarder + attachment_plt_plt_oam_port_0: + - plt_plt_oam_port_0 + - attachment requirements: local_storage_plt: - plt - local_storage - link_plt_plt_internal_0_port: - - plt_plt_internal_0_port - - link - dependency_plt_plt_oam_0_port: - - plt_plt_oam_0_port + dependency_plt_plt_oam_port_0: + - plt_plt_oam_port_0 - dependency - dependency_plt_plt_data_0_port: - - plt_plt_data_0_port + dependency_plt_plt_internal_port_0: + - plt_plt_internal_port_0 - dependency - link_plt_plt_data_0_port: - - plt_plt_data_0_port + link_plt_plt_internal_port_0: + - plt_plt_internal_port_0 - link - dependency_plt_plt_internal_0_port: - - plt_plt_internal_0_port + link_plt_plt_data_port_0: + - plt_plt_data_port_0 + - link + dependency_plt_plt_data_port_0: + - plt_plt_data_port_0 - dependency - link_plt_plt_oam_0_port: - - plt_plt_oam_0_port + link_plt_plt_oam_port_0: + - plt_plt_oam_port_0 - link dependency_plt: - plt - - dependency + - dependency
\ No newline at end of file |