diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn')
4 files changed, 336 insertions, 336 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/in/hot-mog-0108-bs1271.yml index 46b8fc2141..d126130b32 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/in/hot-mog-0108-bs1271.yml @@ -215,15 +215,15 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_0} - - port: {get_resource: pd01_port_1} + - port: {get_resource: pd_server_0_oam_port_0} + - port: {get_resource: pd_server_1_oam_port_0} user_data_format: RAW - pd01_port_0: + pd_server_0_oam_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} - pd01_port_1: + pd_server_1_oam_port_0: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} @@ -234,8 +234,8 @@ outputs: value: {get_attr: [server_pd_01, accessIPv4]} out2: description: output_regula - value: {get_attr: [pd01_port_1, device_owner]} + value: {get_attr: [pd_server_1_oam_port_0, device_owner]} out3: description: output_regula value: - get_attr: [pd01_port_0, device_id] + get_attr: [pd_server_0_oam_port_0, device_id] diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index c43947bdf6..b8c1f7aade 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,24 +8,8 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pd01_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_0_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_0_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_0_network_role: - type: string + port_pd_server_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED compute_pd_server_availability_zone: @@ -44,58 +28,60 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_1_network_role: - type: string + port_pd_server_1_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_0_order: - type: integer + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_1_subnetpoolid: + port_pd_server_0_oam_port_0_network_role_tag: type: string required: true status: SUPPORTED - vm_image_name: - type: string + port_pd_server_0_oam_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_1_oam_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_1_network_role_tag: + port_pd_server_0_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_0_subnetpoolid: + port_pd_server_1_oam_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_1_network: + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_user_data_format: + port_pd_server_0_oam_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_0_network_role_tag: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_0_related_networks: - type: list + port_pd_server_1_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_1_ip_requirements: - type: list + port_pd_server_0_oam_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -104,48 +90,62 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_pd01_port_1_order: - type: integer + port_pd_server_1_oam_port_0_network_role_tag: + type: string required: true status: SUPPORTED - port_pd01_port_1_related_networks: + port_pd_server_1_oam_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_1_oam_port_0_vlan_requirements: + type: list required: true status: SUPPORTED - port_pd01_port_1_vlan_requirements: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1_oam_port_0_network_role: + type: string required: true status: SUPPORTED - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_1_oam_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_0_vlan_requirements: + entry_schema: + type: string + port_pd_server_0_oam_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string + port_pd_server_1_oam_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_0_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED attributes: - pd_server_pd01_port_0_device_id: + pd_server_accessIPv4: type: string status: SUPPORTED - pd_server_accessIPv4: + pd_server_pd_server_0_oam_port_0_device_id: type: string status: SUPPORTED - pd_server_pd01_port_1_device_owner: + pd_server_pd_server_1_oam_port_0_device_owner: type: string status: SUPPORTED requirements: @@ -163,41 +163,33 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port_1: + - dependency_pd_server_pd_server_1_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port_1: + - link_pd_server_pd_server_1_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_pd01_port_0: + - dependency_pd_server_pd_server_0_oam_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port_0: + - link_pd_server_pd_server_0_oam_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - binding_pd_server_pd01_port_0: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -209,133 +201,114 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_port_1: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - memory.usage_pd_server: + network.outgoing.bytes_pd_server_pd_server_1_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory_pd_server: + memory.usage_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.usage_pd_server: + memory_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - os_pd_server: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - disk.write.bytes.rate_pd_server: + disk.device.usage_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd_server_0_oam_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - cpu_util_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + os_pd_server: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_pd_server: + disk.write.bytes.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_pd_server_0_oam_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_pd_server: + network.incoming.bytes_pd_server_pd_server_1_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pd01_port_0: + cpu_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.iops_pd_server: + cpu_util_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port_1: + disk.device.write.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd01_port_1: + disk.read.bytes_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.resident_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pd_server_1_oam_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - cpu.delta_pd_server: + disk.device.read.bytes.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port_0: + network.outgoing.packets.rate_pd_server_pd_server_0_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd01_port_0: + disk.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port_1: + memory.resident_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port_0: + cpu.delta_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -353,11 +326,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port_0: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.device.write.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -369,23 +337,24 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.capacity_pd_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pd_server_pd_server_1_oam_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port_0: - type: org.openecomp.capabilities.Forwarder + disk.capacity_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port_1: - type: org.openecomp.capabilities.Forwarder + network.incoming.bytes_pd_server_pd_server_0_oam_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_pd01_port_1: + network.outgoing.bytes.rate_pd_server_pd_server_0_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -414,17 +383,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port_0: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_pd_server_0_oam_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED feature_pd_server: type: tosca.capabilities.Node @@ -437,7 +402,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port_1: + network.outgoing.bytes.rate_pd_server_pd_server_1_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -449,21 +414,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port_0: + network.incoming.packets_pd_server_pd_server_0_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port_1: + network.outgoing.bytes_pd_server_pd_server_0_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port_0: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_pd_server_0_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -485,19 +449,24 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_pd_server: + feature_pd_server_pd_server_1_oam_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pd_server_pd_server_1_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port_0: + disk.device.write.bytes_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port_1: + network.incoming.packets_pd_server_pd_server_1_oam_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -522,13 +491,20 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port_1: - type: tosca.capabilities.Node + attachment_pd_server_pd_server_1_oam_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port_0: - type: tosca.capabilities.Node + network.incoming.packets.rate_pd_server_pd_server_1_oam_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_pd_server_pd_server_1_oam_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -544,12 +520,30 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_1_oam_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pd_server_pd_server_0_oam_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.write.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_pd_server_pd_server_0_oam_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -573,4 +567,10 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED + network.outpoing.packets_pd_server_pd_server_0_oam_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml index 9e94e9736c..abdd106602 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml @@ -832,17 +832,6 @@ topology_template: directives: - substitutable properties: - port_pd01_port_0_mac_requirements: - mac_count_required: - is_required: false - port_pd01_port_0_network: - - get_input: oam_net_name - port_pd01_port_0_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -851,21 +840,32 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name + port_pd_server_1_oam_port_0_mac_requirements: + mac_count_required: + is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_1_network_role_tag: oam - port_pd01_port_1_network: - - get_input: oam_net_name + port_pd_server_0_oam_port_0_network_role_tag: oam compute_pd_server_user_data_format: - RAW - port_pd01_port_0_network_role_tag: oam - port_pd01_port_1_ip_requirements: + port_pd_server_1_oam_port_0_network_role_tag: oam + port_pd_server_0_oam_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd_server_1_oam_port_0_network: + - get_input: oam_net_name + port_pd_server_0_oam_port_0_network: + - get_input: oam_net_name + port_pd_server_1_oam_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_1_mac_requirements: + port_pd_server_0_oam_port_0_mac_requirements: mac_count_required: is_required: false service_template_filter: @@ -890,16 +890,16 @@ topology_template: value: get_attribute: - abstract_pd_server - - pd_server_pd01_port_1_device_owner + - pd_server_pd_server_1_oam_port_0_device_owner out3: description: output_regula value: get_attribute: - abstract_pd_server - - pd_server_pd01_port_0_device_id + - pd_server_pd_server_0_oam_port_0_device_id out1: description: output_regula value: get_attribute: - abstract_pd_server - - pd_server_accessIPv4
\ No newline at end of file + - pd_server_accessIPv4 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml index 72e80d7cc9..861529aeb2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml @@ -11,21 +11,8 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pd01_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_0_network: - type: list - required: true - entry_schema: - type: string - port_pd01_port_0_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_0_network_role: - type: string + port_pd_server_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true compute_pd_server_availability_zone: type: list @@ -40,47 +27,48 @@ topology_template: vm_flavor_name: type: string required: true - port_pd01_port_1_network_role: - type: string - required: true - port_pd01_port_0_order: - type: integer + port_pd_server_1_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_1_subnetpoolid: + vm_image_name: type: string required: true - vm_image_name: + port_pd_server_0_oam_port_0_network_role_tag: type: string required: true - port_pd01_port_1_network_role_tag: + port_pd_server_0_oam_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_1_oam_port_0_order: + type: integer + required: true + port_pd_server_0_oam_port_0_subnetpoolid: type: string required: true - port_pd01_port_0_subnetpoolid: + port_pd_server_1_oam_port_0_subnetpoolid: type: string required: true - port_pd01_port_1_network: + compute_pd_server_user_data_format: type: list required: true entry_schema: type: string - compute_pd_server_user_data_format: + port_pd_server_0_oam_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_0_network_role_tag: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_network_role: type: string required: true - port_pd01_port_0_related_networks: - type: list + port_pd_server_1_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_1_ip_requirements: - type: list + port_pd_server_0_oam_port_0_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -88,33 +76,45 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd01_port_1_order: - type: integer + port_pd_server_1_oam_port_0_network_role_tag: + type: string required: true - port_pd01_port_1_related_networks: + port_pd_server_1_oam_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_1_vlan_requirements: + port_pd_server_1_oam_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_0_oam_port_0_ip_requirements: + type: list required: true - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1_oam_port_0_network_role: + type: string required: true - port_pd01_port_0_vlan_requirements: + port_pd_server_1_oam_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string + port_pd_server_0_oam_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd_server_1_oam_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_0_oam_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -135,62 +135,62 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port_1: + pd_server_pd_server_1_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_1_exCP_naming + get_input: port_pd_server_1_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_1_vlan_requirements + get_input: port_pd_server_1_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_1_related_networks + get_input: port_pd_server_1_oam_port_0_related_networks ip_requirements: - get_input: port_pd01_port_1_ip_requirements + get_input: port_pd_server_1_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_1_network_role_tag + get_input: port_pd_server_1_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_1_mac_requirements + get_input: port_pd_server_1_oam_port_0_mac_requirements order: - get_input: port_pd01_port_1_order + get_input: port_pd_server_1_oam_port_0_order network_role: - get_input: port_pd01_port_1_network_role + get_input: port_pd_server_1_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_1_subnetpoolid + get_input: port_pd_server_1_oam_port_0_subnetpoolid network: get_input: - - port_pd01_port_1_network + - port_pd_server_1_oam_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo - pd_server_pd01_port_0: + pd_server_pd_server_0_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_0_exCP_naming + get_input: port_pd_server_0_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_0_vlan_requirements + get_input: port_pd_server_0_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_0_related_networks + get_input: port_pd_server_0_oam_port_0_related_networks ip_requirements: - get_input: port_pd01_port_0_ip_requirements + get_input: port_pd_server_0_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd01_port_0_network_role_tag + get_input: port_pd_server_0_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd01_port_0_mac_requirements + get_input: port_pd_server_0_oam_port_0_mac_requirements order: - get_input: port_pd01_port_0_order + get_input: port_pd_server_0_oam_port_0_order network_role: - get_input: port_pd01_port_0_network_role + get_input: port_pd_server_0_oam_port_0_network_role subnetpoolid: - get_input: port_pd01_port_0_subnetpoolid + get_input: port_pd_server_0_oam_port_0_subnetpoolid network: get_input: - - port_pd01_port_0_network + - port_pd_server_0_oam_port_0_network - index_value requirements: - binding: @@ -198,39 +198,36 @@ topology_template: node: pd_server relationship: tosca.relationships.network.BindsTo outputs: - pd_server_pd01_port_0_device_id: - type: string - value: - get_attribute: - - pd_server_pd01_port_0 - - device_id pd_server_accessIPv4: type: string value: get_attribute: - pd_server - accessIPv4 - pd_server_pd01_port_1_device_owner: + pd_server_pd_server_0_oam_port_0_device_id: + type: string + value: + get_attribute: + - pd_server_pd_server_0_oam_port_0 + - device_id + pd_server_pd_server_1_oam_port_0_device_owner: type: string value: get_attribute: - - pd_server_pd01_port_1 + - pd_server_pd_server_1_oam_port_0 - device_owner substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: - binding_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - binding scalable_pd_server: - pd_server - scalable disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate - binding_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - binding + network.outgoing.bytes_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outgoing.bytes memory.usage_pd_server: - pd_server - memory.usage @@ -240,12 +237,21 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage + forwarder_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - forwarder os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate + feature_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - feature + network.incoming.bytes_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -258,69 +264,48 @@ topology_template: disk.read.bytes_pd_server: - pd_server - disk.read.bytes + binding_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - binding disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.incoming.packets_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.packets + network.outgoing.packets.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outgoing.packets.rate disk.iops_pd_server: - pd_server - disk.iops - network.incoming.packets.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.packets.rate - network.incoming.bytes.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.bytes.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.packets.rate - network.incoming.bytes.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.bytes.rate - attachment_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - attachment - network.outgoing.packets.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.outgoing.packets.rate - network.outgoing.packets.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate - attachment_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - attachment disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint + forwarder_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - forwarder disk.capacity_pd_server: - pd_server - disk.capacity - forwarder_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - forwarder - forwarder_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - forwarder - network.incoming.packets_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.packets + network.incoming.bytes_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.bytes + network.outgoing.bytes.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outgoing.bytes.rate disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -333,33 +318,30 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests - network.outgoing.bytes.rate_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.outgoing.bytes.rate - network.outgoing.bytes.rate_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outgoing.bytes.rate + binding_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - binding feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - network.incoming.bytes_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.incoming.bytes + network.outgoing.bytes.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outgoing.bytes.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.outgoing.bytes_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outgoing.bytes - network.outgoing.bytes_pd_server_pd01_port_1: - - pd_server_pd01_port_1 + network.incoming.packets_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.packets + network.outgoing.bytes_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 - network.outgoing.bytes - network.incoming.bytes_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.incoming.bytes + attachment_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - attachment disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -369,15 +351,18 @@ topology_template: disk.device.read.bytes_pd_server: - pd_server - disk.device.read.bytes + feature_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - feature + network.incoming.bytes.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.bytes.rate disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes - network.outpoing.packets_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - network.outpoing.packets - network.outpoing.packets_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - network.outpoing.packets + network.incoming.packets_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -387,21 +372,33 @@ topology_template: host_pd_server: - pd_server - host - feature_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - feature - feature_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - feature + attachment_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - attachment + network.incoming.packets.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.packets.rate + network.outpoing.packets_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outpoing.packets disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + network.outgoing.packets.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outgoing.packets.rate + network.incoming.bytes.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.bytes.rate disk.write.requests_pd_server: - pd_server - disk.write.requests + network.incoming.packets.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.packets.rate disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -414,22 +411,25 @@ topology_template: disk.device.iops_pd_server: - pd_server - disk.device.iops + network.outpoing.packets_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outpoing.packets requirements: local_storage_pd_server: - pd_server - local_storage - dependency_pd_server_pd01_port_1: - - pd_server_pd01_port_1 + link_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - link + dependency_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 - dependency dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd01_port_0: - - pd_server_pd01_port_0 - - dependency - link_pd_server_pd01_port_0: - - pd_server_pd01_port_0 + link_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 - link - link_pd_server_pd01_port_1: - - pd_server_pd01_port_1 - - link
\ No newline at end of file + dependency_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - dependency |