diff options
author | Tal Gitelman <tg851x@intl.att.com> | 2017-07-03 20:16:55 +0300 |
---|---|---|
committer | Tal Gitelman <tg851x@intl.att.com> | 2017-07-03 20:16:55 +0300 |
commit | 153a35821f0d25ce23cca467b76c5a7c5092c744 (patch) | |
tree | 0c66c4d1310019479e446ea3a4c26faffb0aa33f /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution | |
parent | ffdda7d685029d6a88ac82ac637e43bba96423cb (diff) |
[sdc] - last merges before moving to LF
Change-Id: I0df3ec795f0de84229ea4bb4806ec8f959243557
Signed-off-by: Tal Gitelman <tg851x@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')
71 files changed, 419 insertions, 1188 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 7beb5beb5b..b484bfb791 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -41,23 +41,17 @@ node_types: required: true status: SUPPORTED port_pd02_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd02_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -85,33 +79,25 @@ node_types: entry_schema: type: string port_pd02_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_ip_requirements: type: list required: true @@ -119,11 +105,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml index cb7fd89b59..43820275b4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml @@ -435,8 +435,7 @@ topology_template: is_required: false vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_network_role_tag: - - oam + port_pd02_port_network_role_tag: oam port_pd01_port_mac_requirements: mac_count_required: is_required: false @@ -456,8 +455,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam port_pd02_port_network: - get_input: oam_net_name compute_pd_server_user_data_format: @@ -477,4 +475,4 @@ topology_template: heat_file: ../Artifacts/hot-mog-0108-bs1271.yml description: heat template that creates MOG stack members: - - 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/computeWithDiffPortType/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/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml index f66e9f46ce..f066fe3962 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/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/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml @@ -38,20 +38,14 @@ topology_template: type: string required: true port_pd02_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd02_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -74,38 +68,28 @@ topology_template: entry_schema: type: string port_pd02_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml index 71ecda1cf9..b88f5d84f4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -25,11 +25,9 @@ node_types: entry_schema: type: string port_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -51,11 +49,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_flavor_name: type: string required: true @@ -73,11 +69,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_image_name: type: string required: true @@ -99,11 +93,9 @@ node_types: entry_schema: type: string port_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer compute_smp_scheduler_hints: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml index f171a22f9e..c325682f1b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml @@ -129,4 +129,4 @@ topology_template: name: def affinity: host targets: - - BE_Affinity_group
\ No newline at end of file + - BE_Affinity_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml index 53479a1785..61eebac0d2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml @@ -25,10 +25,8 @@ topology_template: entry_schema: type: string port_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -47,10 +45,8 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string vm_flavor_name: type: string required: true @@ -65,10 +61,8 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_port_network_role: - type: list + type: string required: true - entry_schema: - type: string vm_image_name: type: string required: true @@ -86,10 +80,8 @@ topology_template: entry_schema: type: string port_port_order: - type: list + type: integer required: true - entry_schema: - type: integer compute_smp_scheduler_hints: type: list required: true 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 e945040f2d..087649ff59 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 @@ -37,11 +37,9 @@ node_types: entry_schema: type: json port_pd02_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -63,11 +61,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd02_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -97,17 +93,13 @@ node_types: required: true status: SUPPORTED port_pd02_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd02_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_vlan_requirements: type: list required: true @@ -127,27 +119,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_ip_requirements: type: list required: true @@ -155,11 +141,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_network: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml index 134050d238..077dfc9a04 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml @@ -108,8 +108,7 @@ topology_template: get_input: pd_flavor_name port_pd01_port_security_groups: - - jsa_security_group - port_pd02_port_network_role_tag: - - oam + port_pd02_port_network_role_tag: oam port_pd01_port_mac_requirements: mac_count_required: is_required: false @@ -138,8 +137,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam port_pd02_port_network: - get_input: oam_net_name service_template_filter: @@ -159,4 +157,4 @@ topology_template: members: - resources_with_dependOn - jsa_security_group - - 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/computeWithDiffPortTypeNodeConnectedIn/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/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml index b488a50f55..6890c3608c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/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/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml @@ -35,10 +35,8 @@ topology_template: entry_schema: type: json port_pd02_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -56,10 +54,8 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd02_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -84,15 +80,11 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_pd02_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd02_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_vlan_requirements: type: list required: true @@ -109,33 +101,25 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_network: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 9fc8547b50..9be0ebfb48 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -31,11 +31,9 @@ node_types: required: true status: SUPPORTED port_pd02_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -57,11 +55,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd02_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -91,17 +87,13 @@ node_types: required: true status: SUPPORTED port_pd02_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd02_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_vlan_requirements: type: list required: true @@ -115,27 +107,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_ip_requirements: type: list required: true @@ -143,11 +129,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_network: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml index 7588e0236b..482b76338e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml @@ -170,4 +170,4 @@ topology_template: members: - packet_mirror_network - pd01_volume - - 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/computeWithDiffPortTypeNodeConnectedOut/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/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml index 2a5afbff47..89092eec9e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/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/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml @@ -30,10 +30,8 @@ topology_template: type: string required: true port_pd02_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -51,10 +49,8 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd02_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -79,15 +75,11 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_pd02_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd02_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_vlan_requirements: type: list required: true @@ -99,33 +91,25 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_network: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 331b527ddb..3bdd9e6fc1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -31,11 +31,9 @@ node_types: entry_schema: type: json port_pd01_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_pd_server_availability_zone: type: list required: true @@ -59,39 +57,29 @@ node_types: required: true status: SUPPORTED port_pd01_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_image_name: type: string required: true status: SUPPORTED port_pd01_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_1_network: type: list required: true @@ -105,11 +93,9 @@ node_types: entry_schema: type: string port_pd01_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_1_ip_requirements: type: list required: true @@ -125,11 +111,9 @@ node_types: constraints: - greater_or_equal: 0 port_pd01_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml index cbda5466e7..055edbcb85 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml @@ -121,14 +121,12 @@ topology_template: get_input: pd_flavor_name vm_image_name: get_input: pd_image_name - port_pd01_port_1_network_role_tag: - - oam + port_pd01_port_1_network_role_tag: oam port_pd01_port_1_network: - get_input: oam_net_name compute_pd_server_user_data_format: - RAW - port_pd01_port_0_network_role_tag: - - oam + port_pd01_port_0_network_role_tag: oam port_pd01_port_1_ip_requirements: - ip_version: 4 ip_count_required: @@ -159,4 +157,4 @@ topology_template: members: - resources_with_dependOn - jsa_security_group - - 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/computeWithSamePortTypeNodeConnectedIn/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/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml index 87e04942c0..b112335790 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/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/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml @@ -30,10 +30,8 @@ topology_template: entry_schema: type: json port_pd01_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string compute_pd_server_availability_zone: type: list required: true @@ -53,33 +51,23 @@ topology_template: type: string required: true port_pd01_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string vm_image_name: type: string required: true port_pd01_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_1_network: type: list required: true @@ -91,10 +79,8 @@ topology_template: entry_schema: type: string port_pd01_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_1_ip_requirements: type: list required: true @@ -108,10 +94,8 @@ topology_template: constraints: - greater_or_equal: 0 port_pd01_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 2d2089d7be..50a0b6a382 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -25,11 +25,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_pd_server_availability_zone: type: list required: true @@ -53,39 +51,29 @@ node_types: required: true status: SUPPORTED port_pd01_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_image_name: type: string required: true status: SUPPORTED port_pd01_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_1_network: type: list required: true @@ -99,11 +87,9 @@ node_types: entry_schema: type: string port_pd01_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_1_ip_requirements: type: list required: true @@ -119,11 +105,9 @@ node_types: constraints: - greater_or_equal: 0 port_pd01_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml index 4fd079f393..5931d1278c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml @@ -182,4 +182,4 @@ topology_template: - packet_mirror_network - pd01_volume - packet_internal_network - - 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/computeWithSamePortTypeNodeConnectedOut/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/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml index 5fc367779c..2de5078689 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/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/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml @@ -25,10 +25,8 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string compute_pd_server_availability_zone: type: list required: true @@ -48,33 +46,23 @@ topology_template: type: string required: true port_pd01_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string vm_image_name: type: string required: true port_pd01_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_1_network: type: list required: true @@ -86,10 +74,8 @@ topology_template: entry_schema: type: string port_pd01_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_1_ip_requirements: type: list required: true @@ -103,10 +89,8 @@ topology_template: constraints: - greater_or_equal: 0 port_pd01_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true 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 fb81c9e7ed..023b48b2a7 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 @@ -41,23 +41,17 @@ node_types: required: true status: SUPPORTED port_pd02_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd02_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -85,33 +79,25 @@ node_types: entry_schema: type: string port_pd02_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_ip_requirements: type: list required: true @@ -119,11 +105,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -560,17 +544,13 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_pcm_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string availabilityzone_name: type: string description: availabilityzone name @@ -593,29 +573,21 @@ node_types: required: true status: SUPPORTED port_pcm_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string pcm_server_name: type: string description: PCRF CM server name @@ -640,11 +612,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -717,11 +687,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer attributes: server_pcm_id: type: string 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 1da54ccd72..48d9735fb9 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 @@ -466,8 +466,7 @@ topology_template: is_required: false vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_network_role_tag: - - oam + port_pd02_port_network_role_tag: oam port_pd01_port_mac_requirements: mac_count_required: is_required: false @@ -487,8 +486,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam port_pd02_port_network: - get_input: oam_net_name compute_pd_server_user_data_format: @@ -509,4 +507,4 @@ topology_template: description: heat template that creates MOG stack members: - abstract_pd_server - - abstract_pcm_server_0
\ No newline at end of file + - abstract_pcm_server_0 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 f66e9f46ce..f066fe3962 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 @@ -38,20 +38,14 @@ topology_template: type: string required: true port_pd02_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd02_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -74,38 +68,28 @@ topology_template: entry_schema: type: string port_pd02_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true 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-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml index 5530999168..73aad65219 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -12,15 +12,11 @@ node_types: topology_template: inputs: port_pcm_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string availabilityzone_name: label: availabilityzone name hidden: false @@ -45,25 +41,17 @@ topology_template: type: string description: CPS network ip port_pcm_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string pcm_server_name: label: PCRF CM server name hidden: false @@ -89,10 +77,8 @@ topology_template: type: string description: OAM network name port_pcm_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -169,10 +155,8 @@ topology_template: type: string description: CPS network mask port_pcm_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer node_templates: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml index 754b59c1a7..5278a654c0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -25,17 +25,13 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_1_ip_requirements: type: list required: true @@ -63,11 +59,9 @@ node_types: entry_schema: type: string port_pd01_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer vm_flavor_name: type: string required: true @@ -77,17 +71,13 @@ node_types: required: true status: SUPPORTED port_pd01_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_1_vlan_requirements: type: list required: true @@ -99,11 +89,9 @@ node_types: required: true status: SUPPORTED port_pd01_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_image_name: type: string required: true @@ -113,11 +101,9 @@ node_types: required: true status: SUPPORTED port_pd01_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_vlan_requirements: type: list required: true @@ -125,11 +111,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_1_network: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml index 1aa61885d9..4715d0e7a8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml @@ -435,8 +435,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_0_network_role_tag: - - oam + port_pd01_port_0_network_role_tag: oam port_pd01_port_1_ip_requirements: - ip_version: 4 ip_count_required: @@ -456,8 +455,7 @@ topology_template: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_1_network_role_tag: - - oam + port_pd01_port_1_network_role_tag: oam port_pd01_port_1_network: - get_input: oam_net_name compute_pd_server_user_data_format: @@ -477,4 +475,4 @@ topology_template: heat_file: ../Artifacts/hot-mog-0108-bs1271.yml description: heat template that creates MOG stack members: - - 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/computewithtwosameporttypes/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/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml index 17c2a7bed2..72b3354e04 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/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/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml @@ -25,15 +25,11 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_1_ip_requirements: type: list required: true @@ -57,10 +53,8 @@ topology_template: entry_schema: type: string port_pd01_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer vm_flavor_name: type: string required: true @@ -68,15 +62,11 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_pd01_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_1_vlan_requirements: type: list required: true @@ -86,10 +76,8 @@ topology_template: type: org.openecomp.datatypes.network.MacRequirements required: true port_pd01_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string vm_image_name: type: string required: true @@ -97,20 +85,16 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_pd01_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_1_network: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 4cb3976455..f78767abf9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -41,23 +41,17 @@ node_types: required: true status: SUPPORTED port_pd02_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd02_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -85,33 +79,25 @@ node_types: entry_schema: type: string port_pd02_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_ip_requirements: type: list required: true @@ -119,11 +105,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml index bc00a0f1db..20504bcba2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml @@ -435,8 +435,7 @@ topology_template: is_required: false vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_network_role_tag: - - oam + port_pd02_port_network_role_tag: oam port_pd01_port_mac_requirements: mac_count_required: is_required: false @@ -456,8 +455,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam port_pd02_port_network: - get_input: oam_net_name compute_pd_server_user_data_format: @@ -496,4 +494,4 @@ topology_template: 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/diffPortTypeAndOutParamGetAttrIn/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/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml index 099ad6c4cf..cab0a4485f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/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/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml @@ -38,20 +38,14 @@ topology_template: type: string required: true port_pd02_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd02_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -74,38 +68,28 @@ topology_template: entry_schema: type: string port_pd02_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index b3672770f4..27c09dd6f4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -41,23 +41,17 @@ node_types: required: true status: SUPPORTED port_pd02_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd02_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -85,33 +79,25 @@ node_types: entry_schema: type: string port_pd02_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_ip_requirements: type: list required: true @@ -119,11 +105,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml index d5fd0f2287..697a93c4d2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml @@ -435,8 +435,7 @@ topology_template: is_required: false vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_network_role_tag: - - oam + port_pd02_port_network_role_tag: oam port_pd01_port_mac_requirements: mac_count_required: is_required: false @@ -456,8 +455,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam port_pd02_port_network: - get_input: oam_net_name compute_pd_server_user_data_format: @@ -493,4 +491,4 @@ topology_template: members: - network_policy_port - network_policy_server - - 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/oneComputeDiffPortTypesAndGetAttIn/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/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml index 957e59f341..21e31509e7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/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/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml @@ -38,20 +38,14 @@ topology_template: type: string required: true port_pd02_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd02_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -74,38 +68,28 @@ topology_template: entry_schema: type: string port_pd02_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 7beb5beb5b..b484bfb791 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -41,23 +41,17 @@ node_types: required: true status: SUPPORTED port_pd02_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd02_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -85,33 +79,25 @@ node_types: entry_schema: type: string port_pd02_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_ip_requirements: type: list required: true @@ -119,11 +105,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml index 113873099f..a33dea1421 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml @@ -437,8 +437,7 @@ topology_template: get_attribute: - network_policy_server - name - port_pd02_port_network_role_tag: - - oam + port_pd02_port_network_role_tag: oam port_pd01_port_mac_requirements: mac_count_required: is_required: false @@ -485,4 +484,4 @@ topology_template: description: heat template that creates MOG stack members: - network_policy_server - - 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/oneComputeDiffPortTypesAndGetAttOut/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/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml index f66e9f46ce..f066fe3962 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/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/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml @@ -38,20 +38,14 @@ topology_template: type: string required: true port_pd02_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd02_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -74,38 +68,28 @@ topology_template: entry_schema: type: string port_pd02_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 754b59c1a7..5278a654c0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -25,17 +25,13 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_1_ip_requirements: type: list required: true @@ -63,11 +59,9 @@ node_types: entry_schema: type: string port_pd01_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer vm_flavor_name: type: string required: true @@ -77,17 +71,13 @@ node_types: required: true status: SUPPORTED port_pd01_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_1_vlan_requirements: type: list required: true @@ -99,11 +89,9 @@ node_types: required: true status: SUPPORTED port_pd01_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_image_name: type: string required: true @@ -113,11 +101,9 @@ node_types: required: true status: SUPPORTED port_pd01_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_vlan_requirements: type: list required: true @@ -125,11 +111,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_1_network: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml index 489dcbaa7e..07ce00a6e0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml @@ -87,8 +87,6 @@ topology_template: 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 compute_pd_server_user_data_format: @@ -114,4 +112,4 @@ topology_template: description: heat template that creates MOG stack members: - network_policy_server - - 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/oneComputeSamePortTypesAndGetAttOut/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/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml index 17c2a7bed2..72b3354e04 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/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/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml @@ -25,15 +25,11 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_1_ip_requirements: type: list required: true @@ -57,10 +53,8 @@ topology_template: entry_schema: type: string port_pd01_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer vm_flavor_name: type: string required: true @@ -68,15 +62,11 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_pd01_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_1_vlan_requirements: type: list required: true @@ -86,10 +76,8 @@ topology_template: type: org.openecomp.datatypes.network.MacRequirements required: true port_pd01_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string vm_image_name: type: string required: true @@ -97,20 +85,16 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_pd01_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_1_network: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 5f072b923b..5b0d254fda 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -25,17 +25,13 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_1_ip_requirements: type: list required: true @@ -63,11 +59,9 @@ node_types: entry_schema: type: string port_pd01_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer vm_flavor_name: type: string required: true @@ -77,17 +71,13 @@ node_types: required: true status: SUPPORTED port_pd01_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_1_vlan_requirements: type: list required: true @@ -99,11 +89,9 @@ node_types: required: true status: SUPPORTED port_pd01_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_image_name: type: string required: true @@ -113,11 +101,9 @@ node_types: required: true status: SUPPORTED port_pd01_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_vlan_requirements: type: list required: true @@ -125,11 +111,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_1_network: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml index 561a5e2a7e..8b195d042a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml @@ -435,8 +435,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_0_network_role_tag: - - oam + port_pd01_port_0_network_role_tag: oam port_pd01_port_1_ip_requirements: - ip_version: 4 ip_count_required: @@ -456,8 +455,7 @@ topology_template: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_1_network_role_tag: - - oam + port_pd01_port_1_network_role_tag: oam port_pd01_port_1_network: - get_input: oam_net_name compute_pd_server_user_data_format: @@ -501,4 +499,4 @@ topology_template: - network_policy_port0 - network_policy_server - network_policy_port1 - - 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/oneComputeSamePortsAndGetAttrIn/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/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml index 6780cde331..a55c9d4f43 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/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/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml @@ -25,15 +25,11 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_1_ip_requirements: type: list required: true @@ -57,10 +53,8 @@ topology_template: entry_schema: type: string port_pd01_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer vm_flavor_name: type: string required: true @@ -68,15 +62,11 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_pd01_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_1_vlan_requirements: type: list required: true @@ -86,10 +76,8 @@ topology_template: type: org.openecomp.datatypes.network.MacRequirements required: true port_pd01_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string vm_image_name: type: string required: true @@ -97,20 +85,16 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_pd01_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_1_network: type: list required: true 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 c5b6091a2b..0ef3218a86 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 @@ -25,17 +25,13 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_1_ip_requirements: type: list required: true @@ -63,11 +59,9 @@ node_types: entry_schema: type: string port_pd01_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer vm_flavor_name: type: string required: true @@ -77,17 +71,13 @@ node_types: required: true status: SUPPORTED port_pd01_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_1_vlan_requirements: type: list required: true @@ -99,11 +89,9 @@ node_types: required: true status: SUPPORTED port_pd01_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_image_name: type: string required: true @@ -113,11 +101,9 @@ node_types: required: true status: SUPPORTED port_pd01_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_vlan_requirements: type: list required: true @@ -125,11 +111,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_1_network: type: list required: true 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 09a422b406..4295d6f211 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 @@ -435,8 +435,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_0_network_role_tag: - - oam + port_pd01_port_0_network_role_tag: oam port_pd01_port_1_ip_requirements: - ip_version: 4 ip_count_required: @@ -456,8 +455,7 @@ topology_template: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_1_network_role_tag: - - oam + port_pd01_port_1_network_role_tag: oam port_pd01_port_1_network: - get_input: oam_net_name compute_pd_server_user_data_format: @@ -496,4 +494,4 @@ topology_template: 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 7f61688aa3..0ab61b87f4 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 @@ -25,15 +25,11 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_1_ip_requirements: type: list required: true @@ -57,10 +53,8 @@ topology_template: entry_schema: type: string port_pd01_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer vm_flavor_name: type: string required: true @@ -68,15 +62,11 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_pd01_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_1_vlan_requirements: type: list required: true @@ -86,10 +76,8 @@ topology_template: type: org.openecomp.datatypes.network.MacRequirements required: true port_pd01_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string vm_image_name: type: string required: true @@ -97,20 +85,16 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_pd01_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_1_network: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml index cf65048b1c..753e1c5654 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -69,29 +69,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -503,17 +495,13 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_oam_server_user_data_format: type: list required: true @@ -527,17 +515,13 @@ node_types: entry_schema: type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -962,29 +946,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml index 540ba148b0..82259a7a1a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml @@ -229,8 +229,7 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -327,8 +326,7 @@ topology_template: - get_input: - oam_server_names - 0 - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam compute_oam_server_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -471,4 +469,4 @@ topology_template: name: def affinity: host targets: - - BE_Affinity_group
\ No newline at end of file + - BE_Affinity_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml index 86140ff463..edf8bd21d5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml @@ -51,15 +51,11 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string compute_oam_server_user_data_format: type: list required: true @@ -71,15 +67,11 @@ topology_template: entry_schema: type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/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/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml index 7f289a549c..19c74bf61a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/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/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml @@ -61,25 +61,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml index 1b1ba2fa31..c9443f5c9d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml @@ -66,25 +66,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml index dad62cb57f..ca9a33c87d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -57,29 +57,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -474,17 +466,13 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_oam_server_user_data_format: type: list required: true @@ -498,17 +486,13 @@ node_types: entry_schema: type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -909,29 +893,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml index bd59583f2b..927e672add 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml @@ -198,8 +198,7 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -280,8 +279,7 @@ topology_template: - get_input: - oam_server_names - 0 - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam service_template_filter: substitute_service_template: Nested_oam_serverServiceTemplate.yaml count: 1 @@ -305,4 +303,4 @@ topology_template: - network_policy_server - abstract_pd_server - abstract_ps_server - - abstract_oam_server
\ No newline at end of file + - abstract_oam_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml index 7f0cba4c4a..4c65966d38 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml @@ -46,15 +46,11 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string compute_oam_server_user_data_format: type: list required: true @@ -66,15 +62,11 @@ topology_template: entry_schema: type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/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/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml index 4e52db4495..fc9395c618 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/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/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml @@ -51,25 +51,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml index f0d3d289c8..71cb4b5c2a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml @@ -56,25 +56,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml index 590f311c75..44ad0fecd5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -51,29 +51,21 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -468,29 +460,21 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -891,29 +875,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml index 2d1315c354..46f451d8a2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml @@ -211,8 +211,7 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -307,4 +306,4 @@ topology_template: - network_policy_server - abstract_pd_server_0 - abstract_pd_server_1 - - abstract_pd_server_2
\ No newline at end of file + - abstract_pd_server_2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_0ServiceTemplate.yaml index 599756d390..a44d0824ee 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_0ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_0ServiceTemplate.yaml @@ -46,25 +46,17 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml index 5ed2bb6462..f923c1d445 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml @@ -46,25 +46,17 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml index 6dd9433313..828bcb6145 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml @@ -51,25 +51,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index 1f2d24b189..74f9812851 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -57,29 +57,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -480,29 +472,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -855,23 +839,17 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_pd01_port_2_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_3_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_3_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer index_value: type: integer description: Index value of this substitution service template runtime instance @@ -903,11 +881,9 @@ node_types: required: true status: SUPPORTED port_pd01_port_2_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_3_ip_requirements: type: list required: true @@ -925,27 +901,21 @@ node_types: entry_schema: type: string port_pd01_port_2_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_2_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_image_name: type: string required: true status: SUPPORTED port_pd01_port_3_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_2_network: type: list required: true @@ -967,11 +937,9 @@ node_types: required: true status: SUPPORTED port_pd01_port_3_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_pd_server_user_data_format: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml index 20bc8900a3..f50bc8b417 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml @@ -185,8 +185,7 @@ topology_template: get_attribute: - network_policy_server - name - port_pd01_port_2_network_role_tag: - - oam + port_pd01_port_2_network_role_tag: oam port_pd01_port_3_ip_requirements: - ip_version: 4 ip_count_required: @@ -205,8 +204,7 @@ topology_template: port_pd01_port_2_mac_requirements: mac_count_required: is_required: false - port_pd01_port_3_network_role_tag: - - oam + port_pd01_port_3_network_role_tag: oam compute_pd_server_user_data_format: - RAW port_pd01_port_2_ip_requirements: @@ -256,8 +254,7 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -318,4 +315,4 @@ topology_template: - network_policy_server - abstract_pd_server_0 - abstract_pd_server_1 - - abstract_pd_server_2
\ No newline at end of file + - abstract_pd_server_2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_0ServiceTemplate.yaml index 707bfc960d..b1f51f3f57 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_0ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_0ServiceTemplate.yaml @@ -51,25 +51,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml index 340d30e52a..a6d8533b57 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml @@ -51,25 +51,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml index 1a38b715e5..81642671ab 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml @@ -12,20 +12,14 @@ node_types: topology_template: inputs: port_pd01_port_2_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_3_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_3_order: - type: list + type: integer required: true - entry_schema: - type: integer index_value: type: integer description: Index value of this substitution service template runtime instance @@ -52,10 +46,8 @@ topology_template: type: string required: true port_pd01_port_2_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_3_ip_requirements: type: list required: true @@ -70,23 +62,17 @@ topology_template: entry_schema: type: string port_pd01_port_2_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_2_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string vm_image_name: type: string required: true port_pd01_port_3_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_2_network: type: list required: true @@ -104,10 +90,8 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_pd01_port_3_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string compute_pd_server_user_data_format: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml index b181fa11d4..b5daf7ce6f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -57,29 +57,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -444,11 +436,9 @@ node_types: entry_schema: type: string port_ps01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_ps_server_availability_zone: type: list required: true @@ -480,21 +470,17 @@ node_types: required: true status: SUPPORTED port_ps01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer vm_image_name: type: string required: true status: SUPPORTED port_ps01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_ps01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -512,11 +498,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_ps01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_ps01_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml index 5b70f82a07..69ccca59d7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml @@ -378,8 +378,7 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -420,8 +419,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_ps01_port_network_role_tag: - - oam + port_ps01_port_network_role_tag: oam service_template_filter: substitute_service_template: Nested_ps_serverServiceTemplate.yaml count: 1 @@ -438,4 +436,4 @@ topology_template: description: heat template that creates MOG stack members: - abstract_pd_server - - abstract_ps_server
\ No newline at end of file + - abstract_ps_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/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/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml index 94e2b1451c..38b011e2e3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/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/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml @@ -51,25 +51,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml index fdb4c585fe..4d002e7f4b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml @@ -17,10 +17,8 @@ topology_template: entry_schema: type: string port_ps01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string compute_ps_server_availability_zone: type: list required: true @@ -47,18 +45,14 @@ topology_template: type: string required: true port_ps01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer vm_image_name: type: string required: true port_ps01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_ps01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -73,10 +67,8 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_ps01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_ps01_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml index 1f66eb3d7a..8080962bc4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -57,29 +57,21 @@ node_types: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -438,11 +430,9 @@ node_types: entry_schema: type: string port_ps01_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_ps_server_availability_zone: type: list required: true @@ -474,21 +464,17 @@ node_types: required: true status: SUPPORTED port_ps01_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer vm_image_name: type: string required: true status: SUPPORTED port_ps01_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_ps01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -506,11 +492,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_ps01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_ps01_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml index 577954e72a..d3a239a575 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml @@ -376,8 +376,7 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -416,8 +415,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_ps01_port_network_role_tag: - - oam + port_ps01_port_network_role_tag: oam service_template_filter: substitute_service_template: Nested_ps_serverServiceTemplate.yaml count: 1 @@ -434,4 +432,4 @@ topology_template: description: heat template that creates MOG stack members: - abstract_pd_server - - abstract_ps_server
\ No newline at end of file + - abstract_ps_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/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/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml index 4e52db4495..fc9395c618 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/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/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml @@ -51,25 +51,17 @@ topology_template: entry_schema: type: string port_pd01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml index 6050581dc8..80443ab8da 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml @@ -17,10 +17,8 @@ topology_template: entry_schema: type: string port_ps01_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string compute_ps_server_availability_zone: type: list required: true @@ -47,18 +45,14 @@ topology_template: type: string required: true port_ps01_port_order: - type: list + type: integer required: true - entry_schema: - type: integer vm_image_name: type: string required: true port_ps01_port_network_role: - type: list + type: string required: true - entry_schema: - type: string port_ps01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -73,10 +67,8 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_ps01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_ps01_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true |