From 153a35821f0d25ce23cca467b76c5a7c5092c744 Mon Sep 17 00:00:00 2001 From: Tal Gitelman Date: Mon, 3 Jul 2017 20:16:55 +0300 Subject: [sdc] - last merges before moving to LF Change-Id: I0df3ec795f0de84229ea4bb4806ec8f959243557 Signed-off-by: Tal Gitelman --- .../GlobalSubstitutionTypesServiceTemplate.yaml | 32 ++++++---------------- .../out/MainServiceTemplate.yaml | 2 +- .../out/Nested_pd_serverServiceTemplate.yaml | 32 ++++++---------------- 3 files changed, 17 insertions(+), 49 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out') 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 -- cgit 1.2.3-korg