diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition')
12 files changed, 136 insertions, 408 deletions
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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml index 17b4b1c090..8f4f687229 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/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 @@ -43,11 +39,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_FSB2_Internal_ip_requirements: type: list required: true @@ -65,11 +59,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB_OAM_ip_requirements: type: list required: true @@ -77,11 +69,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_FSB1_Internal_vlan_requirements: type: list required: true @@ -89,21 +79,17 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB1_Internal_exCP_naming: type: org.openecomp.datatypes.Naming 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 @@ -111,17 +97,13 @@ node_types: entry_schema: type: string port_FSB1_Internal_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB_OAM_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB_OAM_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -147,11 +129,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_Internal_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -165,11 +145,9 @@ node_types: required: true status: SUPPORTED port_FSB1_Internal_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_FSB_OAM_fixed_ips: type: list required: true @@ -197,11 +175,9 @@ node_types: entry_schema: type: string port_FSB2_Internal_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string requirements: - dependency_FSB1_FSB1_Internal: capability: tosca.capabilities.Node diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml index c963d31807..31f53ed6f9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml @@ -15,20 +15,16 @@ 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 @@ -40,10 +36,8 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_order: - type: list + type: integer required: true - entry_schema: - type: integer port_FSB2_Internal_ip_requirements: type: list required: true @@ -58,53 +52,41 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_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_FSB1_Internal_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_FSB1_Internal_exCP_naming: 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_FSB_OAM_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_FSB_OAM_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -126,10 +108,8 @@ topology_template: constraints: - greater_or_equal: 0 port_FSB_OAM_order: - type: list + type: integer required: true - entry_schema: - type: integer port_FSB2_Internal_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -140,10 +120,8 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_FSB1_Internal_order: - type: list + type: integer required: true - entry_schema: - type: integer port_FSB_OAM_fixed_ips: type: list required: true @@ -166,10 +144,8 @@ topology_template: entry_schema: type: string port_FSB2_Internal_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string node_templates: FSB1_FSB1_Internal: 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/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index d7f0bd24dc..9c1c0bb7be 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -19,11 +19,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 +35,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_FSB2_Internal_ip_requirements: type: list required: true @@ -53,17 +49,13 @@ node_types: required: true status: SUPPORTED port_FSB2_Internal_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB1_Internal_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB1_Internal_vlan_requirements: type: list required: true @@ -71,21 +63,17 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB1_Internal_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED port_FSB1_Internal_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_FSB1_availability_zone: type: list required: true @@ -119,11 +107,9 @@ node_types: required: true status: SUPPORTED port_FSB1_Internal_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_FSB2_Internal_network: type: list required: true @@ -141,11 +127,9 @@ node_types: entry_schema: type: string port_FSB2_Internal_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string attributes: FSB1_FSB1_Internal_network_id: type: list diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml index 9ccc191797..6b1c37dd23 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml @@ -20,10 +20,8 @@ topology_template: 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 @@ -35,10 +33,8 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_order: - type: list + type: integer required: true - entry_schema: - type: integer port_FSB2_Internal_ip_requirements: type: list required: true @@ -48,33 +44,25 @@ topology_template: type: string required: true port_FSB2_Internal_network_role: - type: list + type: string required: true - entry_schema: - type: string port_FSB1_Internal_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_FSB1_Internal_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_FSB1_Internal_exCP_naming: type: org.openecomp.datatypes.Naming required: true port_FSB1_Internal_network_role: - type: list + type: string required: true - entry_schema: - type: string compute_FSB1_availability_zone: type: list required: true @@ -102,10 +90,8 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_FSB1_Internal_order: - type: list + type: integer required: true - entry_schema: - type: integer port_FSB2_Internal_network: type: list required: true @@ -120,10 +106,8 @@ topology_template: entry_schema: type: string port_FSB2_Internal_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string node_templates: FSB1_FSB1_Internal: 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/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index 1f8e6d3331..9965624256 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/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 @@ -43,11 +39,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_FSB2_Internal_ip_requirements: type: list required: true @@ -65,11 +59,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB_OAM_ip_requirements: type: list required: true @@ -77,11 +69,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_FSB1_Internal_vlan_requirements: type: list required: true @@ -89,21 +79,17 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB1_Internal_exCP_naming: type: org.openecomp.datatypes.Naming 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 @@ -111,17 +97,13 @@ node_types: entry_schema: type: string port_FSB1_Internal_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB_OAM_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB_OAM_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -147,11 +129,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_Internal_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -165,11 +145,9 @@ node_types: required: true status: SUPPORTED port_FSB1_Internal_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_FSB_OAM_fixed_ips: type: list required: true @@ -197,11 +175,9 @@ node_types: entry_schema: type: string port_FSB2_Internal_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string attributes: FSB1_FSB1_Internal_network_id: type: list diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml index ec54c8d254..106cdcd388 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml @@ -15,20 +15,16 @@ 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 @@ -40,10 +36,8 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_order: - type: list + type: integer required: true - entry_schema: - type: integer port_FSB2_Internal_ip_requirements: type: list required: true @@ -58,53 +52,41 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_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_FSB1_Internal_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_FSB1_Internal_exCP_naming: 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_FSB_OAM_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_FSB_OAM_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -126,10 +108,8 @@ topology_template: constraints: - greater_or_equal: 0 port_FSB_OAM_order: - type: list + type: integer required: true - entry_schema: - type: integer port_FSB2_Internal_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -140,10 +120,8 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_FSB1_Internal_order: - type: list + type: integer required: true - entry_schema: - type: integer port_FSB_OAM_fixed_ips: type: list required: true @@ -166,10 +144,8 @@ topology_template: entry_schema: type: string port_FSB2_Internal_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string node_templates: FSB1_FSB1_Internal: 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/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index 4810bdd367..9807e6aabe 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -19,11 +19,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 +35,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer compute_FSB1_availability_zone: type: list required: true @@ -75,27 +71,21 @@ node_types: required: true status: SUPPORTED port_FSB2_Internal_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB2_Internal_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED port_FSB1_Internal_network_role_tag: - 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_FSB1_Internal_vlan_requirements: type: list required: true @@ -109,11 +99,9 @@ node_types: entry_schema: type: string port_FSB2_Internal_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 @@ -129,17 +117,13 @@ node_types: required: true status: SUPPORTED port_FSB1_Internal_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB2_Internal_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string attributes: FSB1_FSB1_Internal_network_id: type: list diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml index a4b53fa2bb..2261cefa27 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml @@ -20,10 +20,8 @@ topology_template: 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 @@ -35,10 +33,8 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_order: - type: list + type: integer required: true - entry_schema: - type: integer compute_FSB1_availability_zone: type: list required: true @@ -66,23 +62,17 @@ topology_template: type: string required: true port_FSB2_Internal_network_role: - type: list + type: string required: true - entry_schema: - type: string port_FSB2_Internal_exCP_naming: type: org.openecomp.datatypes.Naming required: true port_FSB1_Internal_network_role_tag: - 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_FSB1_Internal_vlan_requirements: type: list required: true @@ -94,10 +84,8 @@ topology_template: entry_schema: type: string port_FSB2_Internal_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_FSB1_Internal_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -110,15 +98,11 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_FSB1_Internal_network_role: - type: list + type: string required: true - entry_schema: - type: string port_FSB2_Internal_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string node_templates: FSB1_FSB1_Internal: 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/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index f7be3ae374..6ff916ceb2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/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 port_FSB2_Internal_vlan_requirements: type: list required: true @@ -37,11 +33,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_FSB2_Internal_ip_requirements: type: list required: true @@ -59,11 +53,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB_OAM_ip_requirements: type: list required: true @@ -71,11 +63,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_FSB1_Internal_vlan_requirements: type: list required: true @@ -83,21 +73,17 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB1_Internal_exCP_naming: type: org.openecomp.datatypes.Naming 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 @@ -105,17 +91,13 @@ node_types: entry_schema: type: string port_FSB1_Internal_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB_OAM_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB_OAM_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -135,11 +117,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_Internal_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -153,11 +133,9 @@ node_types: required: true status: SUPPORTED port_FSB1_Internal_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_FSB_OAM_fixed_ips: type: list required: true @@ -179,11 +157,9 @@ node_types: required: true status: SUPPORTED port_FSB2_Internal_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string attributes: FSB1_FSB1_Internal_network_id: type: list diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml index 0992b6e56b..af4ed4e441 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/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 port_FSB2_Internal_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_order: - type: list + type: integer required: true - entry_schema: - type: integer port_FSB2_Internal_ip_requirements: type: list required: true @@ -53,53 +47,41 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_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_FSB1_Internal_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_FSB1_Internal_exCP_naming: 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_FSB_OAM_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_FSB_OAM_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -116,10 +98,8 @@ topology_template: constraints: - greater_or_equal: 0 port_FSB_OAM_order: - type: list + type: integer required: true - entry_schema: - type: integer port_FSB2_Internal_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -130,10 +110,8 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_FSB1_Internal_order: - type: list + type: integer required: true - entry_schema: - type: integer port_FSB_OAM_fixed_ips: type: list required: true @@ -151,10 +129,8 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_FSB2_Internal_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string node_templates: FSB1_FSB1_Internal: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port |