diff options
author | 2018-08-26 11:53:35 +0300 | |
---|---|---|
committer | 2018-08-26 11:53:35 +0300 | |
commit | 1b700c8606f319cbda416a8abb70ea16dceb7a29 (patch) | |
tree | 1febba7da1dbdddccf917612acab08363a476f93 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn | |
parent | b111bbed40e9fe02d980fe0af360f60ca47f5ac6 (diff) |
related-networks property support as input
Change-Id: I2d6fb011f7440127559a8f02b1c8a72095694403
Issue-ID: SDC-1658
Signed-off-by: Assaf, Shay (sa726r) <sa726r@intl.att.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn')
3 files changed, 120 insertions, 94 deletions
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 32a7c0254d..c43947bdf6 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 @@ -24,28 +24,10 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_0_network_role_tag: - type: string - required: true - status: SUPPORTED port_pd01_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_1_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -58,74 +40,104 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_1_order: + vm_flavor_name: + type: string + required: true + status: SUPPORTED + port_pd01_port_1_network_role: + type: string + required: true + status: SUPPORTED + port_pd01_port_0_order: type: integer required: true status: SUPPORTED - vm_flavor_name: + port_pd01_port_1_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_1_network_role: + port_pd01_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_0_order: - type: integer + port_pd01_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - port_pd01_port_1_vlan_requirements: + port_pd01_port_1_network: 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: string + compute_pd_server_user_data_format: + type: list required: true status: SUPPORTED - port_pd01_port_1_subnetpoolid: + entry_schema: + type: string + port_pd01_port_0_network_role_tag: type: string required: true status: SUPPORTED - vm_image_name: - type: string + port_pd01_port_0_related_networks: + type: list required: true status: SUPPORTED - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd01_port_1_ip_requirements: + type: list required: true status: SUPPORTED - port_pd01_port_1_network_role_tag: - type: string + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + 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_pd01_port_1_order: + type: integer required: true status: SUPPORTED - port_pd01_port_0_vlan_requirements: + port_pd01_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_0_subnetpoolid: - type: string + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port_1_network: + port_pd01_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - compute_pd_server_user_data_format: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements attributes: pd_server_pd01_port_0_device_id: type: string @@ -561,4 +573,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED + - UNBOUNDED
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/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 d35d65a2d4..9e94e9736c 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 @@ -843,13 +843,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_0_network_role_tag: oam - port_pd01_port_1_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -858,9 +851,6 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_1_mac_requirements: - mac_count_required: - is_required: false vm_image_name: get_input: pd_image_name port_pd01_port_1_network_role_tag: oam @@ -868,6 +858,16 @@ topology_template: - get_input: oam_net_name compute_pd_server_user_data_format: - RAW + port_pd01_port_0_network_role_tag: oam + port_pd01_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_1_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -902,4 +902,4 @@ topology_template: value: get_attribute: - abstract_pd_server - - pd_server_accessIPv4 + - pd_server_accessIPv4
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/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 7f9ab67ca5..72e80d7cc9 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 @@ -24,24 +24,9 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_0_network_role_tag: - type: string - required: true port_pd01_port_0_network_role: type: string required: true - port_pd01_port_1_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -52,46 +37,24 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_1_order: - type: integer - required: true vm_flavor_name: type: string required: true - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true port_pd01_port_1_network_role: type: string required: true port_pd01_port_0_order: type: integer required: true - port_pd01_port_1_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 - required: true port_pd01_port_1_subnetpoolid: type: string required: true vm_image_name: type: string required: true - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true port_pd01_port_1_network_role_tag: type: string required: true - port_pd01_port_0_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_0_subnetpoolid: type: string required: true @@ -105,6 +68,53 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_0_network_role_tag: + type: string + required: true + port_pd01_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd01_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_pd01_port_1_order: + type: integer + required: true + port_pd01_port_1_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: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd01_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -133,6 +143,8 @@ topology_template: vlan_requirements: get_input: port_pd01_port_1_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_pd01_port_1_related_networks ip_requirements: get_input: port_pd01_port_1_ip_requirements network_role_tag: @@ -162,6 +174,8 @@ topology_template: vlan_requirements: get_input: port_pd01_port_0_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_pd01_port_0_related_networks ip_requirements: get_input: port_pd01_port_0_ip_requirements network_role_tag: @@ -418,4 +432,4 @@ topology_template: - link link_pd_server_pd01_port_1: - pd_server_pd01_port_1 - - link + - link
\ No newline at end of file |