diff options
author | 2017-07-03 20:16:55 +0300 | |
---|---|---|
committer | 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/computeWithSamePortTypeNodeConnectedIn | |
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/computeWithSamePortTypeNodeConnectedIn')
3 files changed, 19 insertions, 53 deletions
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 |