X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=openecomp-be%2Flib%2Fopenecomp-sdc-translator-lib%2Fopenecomp-sdc-translator-core%2Fsrc%2Ftest%2Fresources%2Fmock%2Fservices%2Fheattotosca%2Ffulltest%2FsingleSubstitution%2FcomputeWithDiffPortTypeNodeConnectedIn%2Fout%2FGlobalSubstitutionTypesServiceTemplate.yaml;h=687aafc2553a6f6ccd5e4f04b633631edc9fd757;hb=1b700c8606f319cbda416a8abb70ea16dceb7a29;hp=7f623815f8f65359417e6b6c64ecbb3f7efcdd0b;hpb=00e935fc6b8baae4d9b9ffef2c748202a60b66b4;p=sdc.git diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 7f623815f8..687aafc255 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -5,8 +5,8 @@ imports: - openecomp_heat_index: file: openecomp-heat/_index.yml node_types: - org.openecomp.resource.vfc.nodes.heat.pd_server: - derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server + org.openecomp.resource.abstract.nodes.pd_server: + derived_from: org.openecomp.resource.abstract.nodes.VFC properties: compute_pd_server_availability_zone: type: list @@ -76,151 +76,12 @@ node_types: status: SUPPORTED entry_schema: type: string - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd02_port_order: - type: integer - required: true - status: SUPPORTED - port_pd02_port_subnetpoolid: - 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_pd02_port_security_groups: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_pd01_port_network: + port_pd02_port_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_pd02_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd01_port_network_role: - type: string - required: true - status: SUPPORTED - port_pd02_port_ip_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: list - required: true - status: SUPPORTED - entry_schema: - type: string - org.openecomp.resource.abstract.nodes.pd_server: - derived_from: org.openecomp.resource.abstract.nodes.VFC - properties: - compute_pd_server_availability_zone: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - compute_pd_server_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_pd01_port_security_groups: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_pd02_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string - required: true - status: SUPPORTED - port_pd02_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd02_port_network_role: - type: string - required: true - status: SUPPORTED - port_pd01_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_format: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -237,6 +98,12 @@ node_types: 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 required: true @@ -423,6 +290,7 @@ node_types: 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 @@ -513,6 +381,11 @@ node_types: 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. @@ -569,6 +442,7 @@ node_types: 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 @@ -644,6 +518,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd01_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.