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 | 64 ++++++---------------- .../out/SubstitutionServiceTemplate.yaml | 64 ++++++---------------- 2 files changed, 32 insertions(+), 96 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml index c0eca3b1b2..b994e51e02 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -13,11 +13,9 @@ node_types: required: true status: SUPPORTED port_FSB_OAM_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB1_Internal_ip_requirements: type: list required: true @@ -25,11 +23,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_FSB1_metadata: type: list required: true @@ -37,11 +33,9 @@ node_types: entry_schema: type: json port_FSB2_Internal2_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB2_Internal1_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -61,11 +55,9 @@ node_types: required: true status: SUPPORTED port_FSB2_Internal2_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB2_Internal1_ip_requirements: type: list required: true @@ -73,11 +65,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_FSB2_Internal1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB_OAM_ip_requirements: type: list required: true @@ -85,11 +75,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB2_Internal1_mac_address: type: string required: true @@ -111,11 +99,9 @@ node_types: required: true status: SUPPORTED port_FSB_OAM_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB_OAM_network: type: list required: true @@ -123,11 +109,9 @@ node_types: entry_schema: type: string port_FSB1_Internal_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB2_Internal1_network: type: list required: true @@ -143,11 +127,9 @@ node_types: required: true status: SUPPORTED port_FSB_OAM_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB2_Internal2_ip_requirements: type: list required: true @@ -179,11 +161,9 @@ node_types: constraints: - greater_or_equal: 0 port_FSB_OAM_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_FSB2_Internal2_network: type: list required: true @@ -197,29 +177,21 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_FSB2_Internal2_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB1_Internal_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_FSB2_Internal1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB2_Internal1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -231,17 +203,13 @@ node_types: entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_FSB2_Internal2_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_FSB2_Internal1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB1_Internal_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml index 94f859a517..583f92a2e6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml @@ -15,30 +15,24 @@ topology_template: type: string required: true port_FSB_OAM_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_FSB1_Internal_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string compute_FSB1_metadata: type: list required: true entry_schema: type: json port_FSB2_Internal2_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_FSB2_Internal1_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -54,30 +48,24 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_FSB2_Internal2_network_role: - type: list + type: string required: true - entry_schema: - type: string port_FSB2_Internal1_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_FSB2_Internal1_network_role: - type: list + type: string required: true - entry_schema: - type: string port_FSB_OAM_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_FSB2_Internal1_mac_address: type: string required: true @@ -95,20 +83,16 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_FSB_OAM_network_role: - type: list + type: string required: true - entry_schema: - type: string port_FSB_OAM_network: type: list required: true entry_schema: type: string port_FSB1_Internal_network_role: - type: list + type: string required: true - entry_schema: - type: string port_FSB2_Internal1_network: type: list required: true @@ -121,10 +105,8 @@ topology_template: type: org.openecomp.datatypes.network.MacRequirements required: true port_FSB_OAM_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_FSB2_Internal2_ip_requirements: type: list required: true @@ -151,10 +133,8 @@ topology_template: constraints: - greater_or_equal: 0 port_FSB_OAM_order: - type: list + type: integer required: true - entry_schema: - type: integer port_FSB2_Internal2_network: type: list required: true @@ -166,25 +146,17 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal1_order: - type: list + type: integer required: true - entry_schema: - type: integer port_FSB2_Internal2_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_FSB1_Internal_order: - type: list + type: integer required: true - entry_schema: - type: integer port_FSB2_Internal1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_FSB2_Internal1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -194,15 +166,11 @@ topology_template: entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_FSB2_Internal2_order: - type: list + type: integer required: true - entry_schema: - type: integer port_FSB2_Internal1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_FSB1_Internal_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true -- cgit 1.2.3-korg