diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out')
3 files changed, 309 insertions, 309 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml index dff3ddaa23..296881d7c1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,26 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role: + type: string + required: true + status: SUPPORTED compute_pd_server_availability_zone: type: list required: true @@ -24,41 +44,45 @@ node_types: type: string required: true status: SUPPORTED - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: string + port_pd01_port_0_order: + type: integer required: true status: SUPPORTED vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: - type: list + port_pd02_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + port_pd01_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: + type: string + port_pd02_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED @@ -72,72 +96,48 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_exCP_naming: + port_pd02_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd02_port_order: - type: integer + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd02_port_subnetpoolid: + port_pd02_port_0_network_role: type: string required: true status: SUPPORTED - port_pd02_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_network: - type: list + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: + port_pd02_port_0_order: type: integer required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_0_related_networks: + type: list required: true status: SUPPORTED - port_pd01_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd02_port_ip_requirements: + port_pd02_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd02_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -153,33 +153,49 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd02_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd02_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_pd02_port: + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd02_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd02_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + binding_pd_server_pd01_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -209,12 +225,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED os_pd_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -226,7 +236,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + network.outgoing.packets.rate_pd_server_pd02_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -262,21 +272,13 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd02_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd02_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd02_port: + network.incoming.packets_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -300,30 +302,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd02_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd02_port: + network.incoming.packets.rate_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_pd_server_pd02_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd02_port: + network.incoming.bytes.rate_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd02_port: + network.outgoing.packets.rate_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -341,6 +337,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pd_server_pd01_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -352,35 +353,24 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - forwarder_pd_server_pd02_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.allocation_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.allocation_pd_server: + disk.device.allocation_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pd02_port: + disk.allocation_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -397,6 +387,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_pd01_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -408,33 +404,37 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd02_port: + network.outgoing.bytes.rate_pd_server_pd02_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + disk.write.bytes_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - disk.write.bytes_pd_server: + network.outgoing.bytes_pd_server_pd02_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pd01_port: + network.incoming.bytes_pd_server_pd02_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -464,6 +464,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_server_pd02_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_pd_server_pd01_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -483,19 +495,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd02_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd02_port: - type: tosca.capabilities.Attachment + network.incoming.bytes.rate_pd_server_pd02_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -511,24 +524,18 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node + attachment_pd_server_pd02_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.latency_pd_server: + disk.write.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd02_port: + disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -546,21 +553,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd02_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd02_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -1183,4 +1183,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml index e615ef760e..e79660adfa 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml @@ -863,6 +863,17 @@ topology_template: directives: - substitutable properties: + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_0_network: + - get_input: oam_net_name + port_pd01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -871,34 +882,23 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_network_role_tag: oam - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false + port_pd02_port_0_network: + - get_input: oam_net_name vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + port_pd02_port_0_network_role_tag: oam compute_pd_server_user_data_format: - RAW - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false - port_pd01_port_network: - - get_input: oam_net_name - port_pd02_port_ip_requirements: + port_pd02_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network_role_tag: oam - port_pd02_port_network: - - get_input: oam_net_name + port_pd01_port_0_network_role_tag: oam + port_pd02_port_0_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -915,4 +915,4 @@ topology_template: description: heat template that creates MOG stack members: - server_pcm_003 - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml index e894e5c65f..4eb94fbdaa 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,22 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd01_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role: + type: string + required: true compute_pd_server_availability_zone: type: list required: true @@ -24,34 +40,37 @@ topology_template: vm_flavor_name: type: string required: true - port_pd02_port_network_role_tag: - type: string + port_pd02_port_0_network: + type: list required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + entry_schema: + type: string + port_pd01_port_0_order: + type: integer required: true vm_image_name: type: string required: true - port_pd01_port_ip_requirements: - type: list + port_pd02_port_0_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: + port_pd01_port_0_subnetpoolid: type: string required: true - port_pd01_port_vlan_requirements: + compute_pd_server_user_data_format: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: + type: string + port_pd02_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_pd02_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_0_network_role_tag: + type: string + required: true + port_pd01_port_0_related_networks: type: list required: true entry_schema: @@ -63,58 +82,39 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_exCP_naming: + port_pd02_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd02_port_order: - type: integer + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd02_port_subnetpoolid: + port_pd02_port_0_network_role: type: string required: true - port_pd02_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_network: - type: list + port_pd02_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - port_pd01_port_order: + port_pd02_port_0_order: type: integer required: true - port_pd01_port_subnetpoolid: - type: string - required: true - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_0_related_networks: + type: list required: true - port_pd01_port_network_role: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd02_port_0_subnetpoolid: type: string required: true - port_pd02_port_ip_requirements: + port_pd02_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network_role_tag: - type: string - required: true - port_pd02_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -135,62 +135,62 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd02_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd02_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd02_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd02_port_0_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd02_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd02_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd02_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd02_port_0_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd02_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd02_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd02_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo - pd_server_pd02_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd02_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd02_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd02_port_related_networks + get_input: port_pd01_port_0_related_networks ip_requirements: - get_input: port_pd02_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: port_pd02_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: port_pd02_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd02_port_order + get_input: port_pd01_port_0_order network_role: - get_input: port_pd02_port_network_role + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: port_pd02_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid network: get_input: - - port_pd02_port_network + - port_pd01_port_0_network - index_value requirements: - binding: @@ -200,6 +200,12 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + binding_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - binding + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable @@ -215,18 +221,15 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes + network.outgoing.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.packets.rate cpu_pd_server: - pd_server - cpu @@ -242,15 +245,12 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - binding_pd_server_pd02_port: - - pd_server_pd02_port - - binding - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes - network.outgoing.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.packets.rate + network.outpoing.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outpoing.packets + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops @@ -260,78 +260,78 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate - network.outgoing.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes - feature_pd_server_pd02_port: - - pd_server_pd02_port + feature_pd_server_pd02_port_0: + - pd_server_pd02_port_0 - feature - network.incoming.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.bytes.rate - network.outgoing.bytes.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.outgoing.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment - forwarder_pd_server_pd02_port: - - pd_server_pd02_port - - forwarder disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation disk.allocation_pd_server: - pd_server - disk.allocation - network.incoming.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - network.outpoing.packets_pd_server_pd02_port: - - pd_server_pd02_port - - network.outpoing.packets - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.outgoing.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.outgoing.bytes + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -344,6 +344,12 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.incoming.packets_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -353,64 +359,58 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - attachment_pd_server_pd02_port: - - pd_server_pd02_port - - attachment - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + network.incoming.packets.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - network.incoming.bytes.rate + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + attachment_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - attachment disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency - network.incoming.packets.rate_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.packets.rate disk.latency_pd_server: - pd_server - disk.latency disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops - network.incoming.bytes_pd_server_pd02_port: - - pd_server_pd02_port - - network.incoming.bytes + forwarder_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - forwarder requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd02_port: - - pd_server_pd02_port - - link - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd02_port: - - pd_server_pd02_port - - dependency
\ No newline at end of file + link_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - link + dependency_pd_server_pd02_port_0: + - pd_server_pd02_port_0 + - dependency + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link |