diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate')
12 files changed, 272 insertions, 680 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 fcfd61365d..c0eca3b1b2 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 @@ -23,7 +23,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal_subnetpoolid: type: list required: true @@ -43,11 +43,9 @@ node_types: entry_schema: type: string port_FSB2_Internal1_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -57,13 +55,11 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal2_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_FSB2_Internal2_network_role: type: list required: true @@ -75,7 +71,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB2_Internal1_network_role: type: list required: true @@ -87,7 +83,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal_network_role_tag: type: list required: true @@ -103,19 +99,17 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_FSB1_Internal_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_FSB1_Internal_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_FSB_OAM_network_role: type: list required: true @@ -145,11 +139,9 @@ node_types: required: true status: SUPPORTED port_FSB2_Internal2_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_FSB_OAM_subnetpoolid: type: list required: true @@ -161,13 +153,11 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB_OAM_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json compute_FSB1_availability_zone: type: list required: true @@ -205,7 +195,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal1_order: type: list required: true @@ -231,11 +221,9 @@ node_types: entry_schema: type: string port_FSB2_Internal1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_FSB_OAM_fixed_ips: type: list required: true @@ -255,17 +243,13 @@ node_types: entry_schema: type: string port_FSB1_Internal_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_FSB_OAM_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json compute_FSB1_name: type: list 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 c419c0df91..94f859a517 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 @@ -23,7 +23,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal_subnetpoolid: type: list required: true @@ -40,10 +40,8 @@ topology_template: entry_schema: type: string port_FSB2_Internal1_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -51,12 +49,10 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal2_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_FSB2_Internal2_network_role: type: list required: true @@ -66,7 +62,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB2_Internal1_network_role: type: list required: true @@ -76,7 +72,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal_network_role_tag: type: list required: true @@ -89,17 +85,15 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_FSB1_Internal_vlan_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_FSB1_Internal_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_FSB_OAM_network_role: type: list required: true @@ -124,10 +118,8 @@ topology_template: type: string required: true port_FSB2_Internal2_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_FSB_OAM_subnetpoolid: type: list required: true @@ -137,12 +129,10 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB_OAM_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json compute_FSB1_availability_zone: type: list required: true @@ -174,7 +164,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal1_order: type: list required: true @@ -196,10 +186,8 @@ topology_template: entry_schema: type: string port_FSB2_Internal1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_FSB_OAM_fixed_ips: type: list required: true @@ -216,15 +204,11 @@ topology_template: entry_schema: type: string port_FSB1_Internal_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_FSB_OAM_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json compute_FSB1_name: type: list required: true @@ -235,37 +219,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_FSB1_Internal_exCP_naming - - index_value + get_input: port_FSB1_Internal_exCP_naming vlan_requirements: - get_input: - - port_FSB1_Internal_vlan_requirements - - index_value + get_input: port_FSB1_Internal_vlan_requirements ip_requirements: - get_input: - - port_FSB1_Internal_ip_requirements - - index_value + get_input: port_FSB1_Internal_ip_requirements network_role_tag: - get_input: - - port_FSB1_Internal_network_role_tag - - index_value + get_input: port_FSB1_Internal_network_role_tag mac_requirements: - get_input: - - port_FSB1_Internal_mac_requirements - - index_value + get_input: port_FSB1_Internal_mac_requirements order: - get_input: - - port_FSB1_Internal_order - - index_value + get_input: port_FSB1_Internal_order network_role: - get_input: - - port_FSB1_Internal_network_role - - index_value + get_input: port_FSB1_Internal_network_role subnetpoolid: - get_input: - - port_FSB1_Internal_subnetpoolid - - index_value + get_input: port_FSB1_Internal_subnetpoolid network: get_input: - port_FSB1_Internal_network @@ -281,37 +249,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_FSB_OAM_exCP_naming - - index_value + get_input: port_FSB_OAM_exCP_naming vlan_requirements: - get_input: - - port_FSB_OAM_vlan_requirements - - index_value + get_input: port_FSB_OAM_vlan_requirements ip_requirements: - get_input: - - port_FSB_OAM_ip_requirements - - index_value + get_input: port_FSB_OAM_ip_requirements network_role_tag: - get_input: - - port_FSB_OAM_network_role_tag - - index_value + get_input: port_FSB_OAM_network_role_tag mac_requirements: - get_input: - - port_FSB_OAM_mac_requirements - - index_value + get_input: port_FSB_OAM_mac_requirements order: - get_input: - - port_FSB_OAM_order - - index_value + get_input: port_FSB_OAM_order network_role: - get_input: - - port_FSB_OAM_network_role - - index_value + get_input: port_FSB_OAM_network_role subnetpoolid: - get_input: - - port_FSB_OAM_subnetpoolid - - index_value + get_input: port_FSB_OAM_subnetpoolid fixed_ips: get_input: port_FSB_OAM_fixed_ips network: @@ -327,37 +279,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_FSB2_Internal2_exCP_naming - - index_value + get_input: port_FSB2_Internal2_exCP_naming vlan_requirements: - get_input: - - port_FSB2_Internal2_vlan_requirements - - index_value + get_input: port_FSB2_Internal2_vlan_requirements ip_requirements: - get_input: - - port_FSB2_Internal2_ip_requirements - - index_value + get_input: port_FSB2_Internal2_ip_requirements network_role_tag: - get_input: - - port_FSB2_Internal2_network_role_tag - - index_value + get_input: port_FSB2_Internal2_network_role_tag mac_requirements: - get_input: - - port_FSB2_Internal2_mac_requirements - - index_value + get_input: port_FSB2_Internal2_mac_requirements order: - get_input: - - port_FSB2_Internal2_order - - index_value + get_input: port_FSB2_Internal2_order network_role: - get_input: - - port_FSB2_Internal2_network_role - - index_value + get_input: port_FSB2_Internal2_network_role subnetpoolid: - get_input: - - port_FSB2_Internal2_subnetpoolid - - index_value + get_input: port_FSB2_Internal2_subnetpoolid network: get_input: - port_FSB2_Internal2_network @@ -397,37 +333,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_FSB2_Internal1_exCP_naming - - index_value + get_input: port_FSB2_Internal1_exCP_naming vlan_requirements: - get_input: - - port_FSB2_Internal1_vlan_requirements - - index_value + get_input: port_FSB2_Internal1_vlan_requirements ip_requirements: - get_input: - - port_FSB2_Internal1_ip_requirements - - index_value + get_input: port_FSB2_Internal1_ip_requirements network_role_tag: - get_input: - - port_FSB2_Internal1_network_role_tag - - index_value + get_input: port_FSB2_Internal1_network_role_tag mac_requirements: - get_input: - - port_FSB2_Internal1_mac_requirements - - index_value + get_input: port_FSB2_Internal1_mac_requirements order: - get_input: - - port_FSB2_Internal1_order - - index_value + get_input: port_FSB2_Internal1_order network_role: - get_input: - - port_FSB2_Internal1_network_role - - index_value + get_input: port_FSB2_Internal1_network_role subnetpoolid: - get_input: - - port_FSB2_Internal1_subnetpoolid - - index_value + get_input: port_FSB2_Internal1_subnetpoolid network: get_input: - port_FSB2_Internal1_network 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 b7a2b294db..17b4b1c090 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 @@ -23,7 +23,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal_subnetpoolid: type: list required: true @@ -41,7 +41,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_order: type: list required: true @@ -53,7 +53,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true @@ -63,7 +63,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_network_role: type: list required: true @@ -75,7 +75,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal_network_role_tag: type: list required: true @@ -87,7 +87,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_subnetpoolid: type: list required: true @@ -95,11 +95,9 @@ node_types: entry_schema: type: string port_FSB1_Internal_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_FSB_OAM_network_role: type: list required: true @@ -125,11 +123,9 @@ node_types: entry_schema: type: string port_FSB_OAM_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json compute_FSB1_availability_zone: type: list required: true @@ -157,21 +153,17 @@ node_types: entry_schema: type: integer port_FSB2_Internal_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_FSB2_Internal_mac_address: type: string required: true status: SUPPORTED port_FSB2_Internal_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_FSB1_Internal_order: type: list required: true @@ -191,17 +183,13 @@ node_types: entry_schema: type: string port_FSB1_Internal_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_FSB_OAM_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json compute_FSB1_name: type: list 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/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 ca12b431e2..c963d31807 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 @@ -23,7 +23,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal_subnetpoolid: type: list required: true @@ -38,7 +38,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_order: type: list required: true @@ -48,7 +48,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true @@ -56,7 +56,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_network_role: type: list required: true @@ -66,7 +66,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal_network_role_tag: type: list required: true @@ -76,17 +76,15 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_subnetpoolid: type: list required: true entry_schema: type: string port_FSB1_Internal_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_FSB_OAM_network_role: type: list required: true @@ -108,10 +106,8 @@ topology_template: entry_schema: type: string port_FSB_OAM_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json compute_FSB1_availability_zone: type: list required: true @@ -135,18 +131,14 @@ topology_template: entry_schema: type: integer port_FSB2_Internal_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_FSB2_Internal_mac_address: type: string required: true port_FSB2_Internal_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_FSB1_Internal_order: type: list required: true @@ -163,15 +155,11 @@ topology_template: entry_schema: type: string port_FSB1_Internal_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_FSB_OAM_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json compute_FSB1_name: type: list required: true @@ -187,37 +175,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_FSB1_Internal_exCP_naming - - index_value + get_input: port_FSB1_Internal_exCP_naming vlan_requirements: - get_input: - - port_FSB1_Internal_vlan_requirements - - index_value + get_input: port_FSB1_Internal_vlan_requirements ip_requirements: - get_input: - - port_FSB1_Internal_ip_requirements - - index_value + get_input: port_FSB1_Internal_ip_requirements network_role_tag: - get_input: - - port_FSB1_Internal_network_role_tag - - index_value + get_input: port_FSB1_Internal_network_role_tag mac_requirements: - get_input: - - port_FSB1_Internal_mac_requirements - - index_value + get_input: port_FSB1_Internal_mac_requirements order: - get_input: - - port_FSB1_Internal_order - - index_value + get_input: port_FSB1_Internal_order network_role: - get_input: - - port_FSB1_Internal_network_role - - index_value + get_input: port_FSB1_Internal_network_role subnetpoolid: - get_input: - - port_FSB1_Internal_subnetpoolid - - index_value + get_input: port_FSB1_Internal_subnetpoolid network: get_input: - port_FSB1_Internal_network @@ -233,37 +205,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_FSB2_Internal_exCP_naming - - index_value + get_input: port_FSB2_Internal_exCP_naming vlan_requirements: - get_input: - - port_FSB2_Internal_vlan_requirements - - index_value + get_input: port_FSB2_Internal_vlan_requirements ip_requirements: - get_input: - - port_FSB2_Internal_ip_requirements - - index_value + get_input: port_FSB2_Internal_ip_requirements network_role_tag: - get_input: - - port_FSB2_Internal_network_role_tag - - index_value + get_input: port_FSB2_Internal_network_role_tag mac_requirements: - get_input: - - port_FSB2_Internal_mac_requirements - - index_value + get_input: port_FSB2_Internal_mac_requirements order: - get_input: - - port_FSB2_Internal_order - - index_value + get_input: port_FSB2_Internal_order network_role: - get_input: - - port_FSB2_Internal_network_role - - index_value + get_input: port_FSB2_Internal_network_role subnetpoolid: - get_input: - - port_FSB2_Internal_subnetpoolid - - index_value + get_input: port_FSB2_Internal_subnetpoolid network: get_input: - port_FSB2_Internal_network @@ -279,37 +235,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_FSB_OAM_exCP_naming - - index_value + get_input: port_FSB_OAM_exCP_naming vlan_requirements: - get_input: - - port_FSB_OAM_vlan_requirements - - index_value + get_input: port_FSB_OAM_vlan_requirements ip_requirements: - get_input: - - port_FSB_OAM_ip_requirements - - index_value + get_input: port_FSB_OAM_ip_requirements network_role_tag: - get_input: - - port_FSB_OAM_network_role_tag - - index_value + get_input: port_FSB_OAM_network_role_tag mac_requirements: - get_input: - - port_FSB_OAM_mac_requirements - - index_value + get_input: port_FSB_OAM_mac_requirements order: - get_input: - - port_FSB_OAM_order - - index_value + get_input: port_FSB_OAM_order network_role: - get_input: - - port_FSB_OAM_network_role - - index_value + get_input: port_FSB_OAM_network_role subnetpoolid: - get_input: - - port_FSB_OAM_subnetpoolid - - index_value + get_input: port_FSB_OAM_subnetpoolid fixed_ips: get_input: port_FSB_OAM_fixed_ips network: 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 aabb513dba..d7f0bd24dc 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 @@ -17,7 +17,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal_subnetpoolid: type: list required: true @@ -35,7 +35,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_order: type: list required: true @@ -47,7 +47,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true @@ -69,7 +69,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_subnetpoolid: type: list required: true @@ -77,11 +77,9 @@ node_types: entry_schema: type: string port_FSB1_Internal_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_FSB1_Internal_network_role: type: list required: true @@ -109,21 +107,17 @@ node_types: constraints: - greater_or_equal: 0 port_FSB2_Internal_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_FSB2_Internal_mac_address: type: string required: true status: SUPPORTED port_FSB2_Internal_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_FSB1_Internal_order: type: list required: true @@ -137,11 +131,9 @@ node_types: entry_schema: type: string port_FSB1_Internal_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json compute_FSB1_name: type: list required: true 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 39e93ab08d..9ccc191797 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 @@ -18,7 +18,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal_subnetpoolid: type: list required: true @@ -33,7 +33,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_order: type: list required: true @@ -43,7 +43,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true @@ -61,17 +61,15 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_subnetpoolid: type: list required: true entry_schema: type: string port_FSB1_Internal_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_FSB1_Internal_network_role: type: list required: true @@ -95,18 +93,14 @@ topology_template: constraints: - greater_or_equal: 0 port_FSB2_Internal_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_FSB2_Internal_mac_address: type: string required: true port_FSB2_Internal_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_FSB1_Internal_order: type: list required: true @@ -118,10 +112,8 @@ topology_template: entry_schema: type: string port_FSB1_Internal_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json compute_FSB1_name: type: list required: true @@ -137,37 +129,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_FSB1_Internal_exCP_naming - - index_value + get_input: port_FSB1_Internal_exCP_naming vlan_requirements: - get_input: - - port_FSB1_Internal_vlan_requirements - - index_value + get_input: port_FSB1_Internal_vlan_requirements ip_requirements: - get_input: - - port_FSB1_Internal_ip_requirements - - index_value + get_input: port_FSB1_Internal_ip_requirements network_role_tag: - get_input: - - port_FSB1_Internal_network_role_tag - - index_value + get_input: port_FSB1_Internal_network_role_tag mac_requirements: - get_input: - - port_FSB1_Internal_mac_requirements - - index_value + get_input: port_FSB1_Internal_mac_requirements order: - get_input: - - port_FSB1_Internal_order - - index_value + get_input: port_FSB1_Internal_order network_role: - get_input: - - port_FSB1_Internal_network_role - - index_value + get_input: port_FSB1_Internal_network_role subnetpoolid: - get_input: - - port_FSB1_Internal_subnetpoolid - - index_value + get_input: port_FSB1_Internal_subnetpoolid network: get_input: - port_FSB1_Internal_network @@ -183,37 +159,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_FSB2_Internal_exCP_naming - - index_value + get_input: port_FSB2_Internal_exCP_naming vlan_requirements: - get_input: - - port_FSB2_Internal_vlan_requirements - - index_value + get_input: port_FSB2_Internal_vlan_requirements ip_requirements: - get_input: - - port_FSB2_Internal_ip_requirements - - index_value + get_input: port_FSB2_Internal_ip_requirements network_role_tag: - get_input: - - port_FSB2_Internal_network_role_tag - - index_value + get_input: port_FSB2_Internal_network_role_tag mac_requirements: - get_input: - - port_FSB2_Internal_mac_requirements - - index_value + get_input: port_FSB2_Internal_mac_requirements order: - get_input: - - port_FSB2_Internal_order - - index_value + get_input: port_FSB2_Internal_order network_role: - get_input: - - port_FSB2_Internal_network_role - - index_value + get_input: port_FSB2_Internal_network_role subnetpoolid: - get_input: - - port_FSB2_Internal_subnetpoolid - - index_value + get_input: port_FSB2_Internal_subnetpoolid network: get_input: - port_FSB2_Internal_network 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 f50192de3c..1f8e6d3331 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 @@ -23,7 +23,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal_subnetpoolid: type: list required: true @@ -41,7 +41,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_order: type: list required: true @@ -53,7 +53,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true @@ -63,7 +63,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_network_role: type: list required: true @@ -75,7 +75,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal_network_role_tag: type: list required: true @@ -87,7 +87,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_subnetpoolid: type: list required: true @@ -95,11 +95,9 @@ node_types: entry_schema: type: string port_FSB1_Internal_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_FSB_OAM_network_role: type: list required: true @@ -125,11 +123,9 @@ node_types: entry_schema: type: string port_FSB_OAM_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json compute_FSB1_availability_zone: type: list required: true @@ -157,21 +153,17 @@ node_types: entry_schema: type: integer port_FSB2_Internal_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_FSB2_Internal_mac_address: type: string required: true status: SUPPORTED port_FSB2_Internal_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_FSB1_Internal_order: type: list required: true @@ -191,17 +183,13 @@ node_types: entry_schema: type: string port_FSB1_Internal_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_FSB_OAM_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json compute_FSB1_name: type: list required: true 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 62d483639b..ec54c8d254 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 @@ -23,7 +23,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal_subnetpoolid: type: list required: true @@ -38,7 +38,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_order: type: list required: true @@ -48,7 +48,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true @@ -56,7 +56,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_network_role: type: list required: true @@ -66,7 +66,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal_network_role_tag: type: list required: true @@ -76,17 +76,15 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_subnetpoolid: type: list required: true entry_schema: type: string port_FSB1_Internal_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_FSB_OAM_network_role: type: list required: true @@ -108,10 +106,8 @@ topology_template: entry_schema: type: string port_FSB_OAM_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json compute_FSB1_availability_zone: type: list required: true @@ -135,18 +131,14 @@ topology_template: entry_schema: type: integer port_FSB2_Internal_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_FSB2_Internal_mac_address: type: string required: true port_FSB2_Internal_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_FSB1_Internal_order: type: list required: true @@ -163,15 +155,11 @@ topology_template: entry_schema: type: string port_FSB1_Internal_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_FSB_OAM_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json compute_FSB1_name: type: list required: true @@ -187,37 +175,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_FSB1_Internal_exCP_naming - - index_value + get_input: port_FSB1_Internal_exCP_naming vlan_requirements: - get_input: - - port_FSB1_Internal_vlan_requirements - - index_value + get_input: port_FSB1_Internal_vlan_requirements ip_requirements: - get_input: - - port_FSB1_Internal_ip_requirements - - index_value + get_input: port_FSB1_Internal_ip_requirements network_role_tag: - get_input: - - port_FSB1_Internal_network_role_tag - - index_value + get_input: port_FSB1_Internal_network_role_tag mac_requirements: - get_input: - - port_FSB1_Internal_mac_requirements - - index_value + get_input: port_FSB1_Internal_mac_requirements order: - get_input: - - port_FSB1_Internal_order - - index_value + get_input: port_FSB1_Internal_order network_role: - get_input: - - port_FSB1_Internal_network_role - - index_value + get_input: port_FSB1_Internal_network_role subnetpoolid: - get_input: - - port_FSB1_Internal_subnetpoolid - - index_value + get_input: port_FSB1_Internal_subnetpoolid network: get_input: - port_FSB1_Internal_network @@ -233,37 +205,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_FSB2_Internal_exCP_naming - - index_value + get_input: port_FSB2_Internal_exCP_naming vlan_requirements: - get_input: - - port_FSB2_Internal_vlan_requirements - - index_value + get_input: port_FSB2_Internal_vlan_requirements ip_requirements: - get_input: - - port_FSB2_Internal_ip_requirements - - index_value + get_input: port_FSB2_Internal_ip_requirements network_role_tag: - get_input: - - port_FSB2_Internal_network_role_tag - - index_value + get_input: port_FSB2_Internal_network_role_tag mac_requirements: - get_input: - - port_FSB2_Internal_mac_requirements - - index_value + get_input: port_FSB2_Internal_mac_requirements order: - get_input: - - port_FSB2_Internal_order - - index_value + get_input: port_FSB2_Internal_order network_role: - get_input: - - port_FSB2_Internal_network_role - - index_value + get_input: port_FSB2_Internal_network_role subnetpoolid: - get_input: - - port_FSB2_Internal_subnetpoolid - - index_value + get_input: port_FSB2_Internal_subnetpoolid network: get_input: - port_FSB2_Internal_network @@ -279,37 +235,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_FSB_OAM_exCP_naming - - index_value + get_input: port_FSB_OAM_exCP_naming vlan_requirements: - get_input: - - port_FSB_OAM_vlan_requirements - - index_value + get_input: port_FSB_OAM_vlan_requirements ip_requirements: - get_input: - - port_FSB_OAM_ip_requirements - - index_value + get_input: port_FSB_OAM_ip_requirements network_role_tag: - get_input: - - port_FSB_OAM_network_role_tag - - index_value + get_input: port_FSB_OAM_network_role_tag mac_requirements: - get_input: - - port_FSB_OAM_mac_requirements - - index_value + get_input: port_FSB_OAM_mac_requirements order: - get_input: - - port_FSB_OAM_order - - index_value + get_input: port_FSB_OAM_order network_role: - get_input: - - port_FSB_OAM_network_role - - index_value + get_input: port_FSB_OAM_network_role subnetpoolid: - get_input: - - port_FSB_OAM_subnetpoolid - - index_value + get_input: port_FSB_OAM_subnetpoolid fixed_ips: get_input: port_FSB_OAM_fixed_ips network: 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 ecbec2f2b4..4810bdd367 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 @@ -17,7 +17,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal_subnetpoolid: type: list required: true @@ -35,7 +35,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_order: type: list required: true @@ -57,17 +57,15 @@ node_types: constraints: - greater_or_equal: 0 port_FSB2_Internal_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_FSB2_Internal_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true @@ -83,11 +81,9 @@ node_types: entry_schema: type: string port_FSB2_Internal_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_FSB1_Internal_network_role_tag: type: list required: true @@ -105,7 +101,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_network: type: list required: true @@ -119,11 +115,9 @@ node_types: entry_schema: type: string port_FSB1_Internal_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json compute_FSB1_name: type: list required: true @@ -131,11 +125,9 @@ node_types: entry_schema: type: string port_FSB1_Internal_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_FSB1_Internal_network_role: type: list required: true 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 07013e3833..a4b53fa2bb 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 @@ -18,7 +18,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal_subnetpoolid: type: list required: true @@ -33,7 +33,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_order: type: list required: true @@ -52,15 +52,13 @@ topology_template: constraints: - greater_or_equal: 0 port_FSB2_Internal_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_FSB2_Internal_ip_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true @@ -73,10 +71,8 @@ topology_template: entry_schema: type: string port_FSB2_Internal_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_FSB1_Internal_network_role_tag: type: list required: true @@ -91,7 +87,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_network: type: list required: true @@ -103,20 +99,16 @@ topology_template: entry_schema: type: string port_FSB1_Internal_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json compute_FSB1_name: type: list required: true entry_schema: type: string port_FSB1_Internal_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_FSB1_Internal_network_role: type: list required: true @@ -132,37 +124,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_FSB1_Internal_exCP_naming - - index_value + get_input: port_FSB1_Internal_exCP_naming vlan_requirements: - get_input: - - port_FSB1_Internal_vlan_requirements - - index_value + get_input: port_FSB1_Internal_vlan_requirements ip_requirements: - get_input: - - port_FSB1_Internal_ip_requirements - - index_value + get_input: port_FSB1_Internal_ip_requirements network_role_tag: - get_input: - - port_FSB1_Internal_network_role_tag - - index_value + get_input: port_FSB1_Internal_network_role_tag mac_requirements: - get_input: - - port_FSB1_Internal_mac_requirements - - index_value + get_input: port_FSB1_Internal_mac_requirements order: - get_input: - - port_FSB1_Internal_order - - index_value + get_input: port_FSB1_Internal_order network_role: - get_input: - - port_FSB1_Internal_network_role - - index_value + get_input: port_FSB1_Internal_network_role subnetpoolid: - get_input: - - port_FSB1_Internal_subnetpoolid - - index_value + get_input: port_FSB1_Internal_subnetpoolid network: get_attribute: - FSB1_FSB2_Internal @@ -178,37 +154,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_FSB2_Internal_exCP_naming - - index_value + get_input: port_FSB2_Internal_exCP_naming vlan_requirements: - get_input: - - port_FSB2_Internal_vlan_requirements - - index_value + get_input: port_FSB2_Internal_vlan_requirements ip_requirements: - get_input: - - port_FSB2_Internal_ip_requirements - - index_value + get_input: port_FSB2_Internal_ip_requirements network_role_tag: - get_input: - - port_FSB2_Internal_network_role_tag - - index_value + get_input: port_FSB2_Internal_network_role_tag mac_requirements: - get_input: - - port_FSB2_Internal_mac_requirements - - index_value + get_input: port_FSB2_Internal_mac_requirements order: - get_input: - - port_FSB2_Internal_order - - index_value + get_input: port_FSB2_Internal_order network_role: - get_input: - - port_FSB2_Internal_network_role - - index_value + get_input: port_FSB2_Internal_network_role subnetpoolid: - get_input: - - port_FSB2_Internal_subnetpoolid - - index_value + get_input: port_FSB2_Internal_subnetpoolid device_id: get_attribute: - FSB1 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 8c6ae90130..f7be3ae374 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 @@ -23,7 +23,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal_subnetpoolid: type: list required: true @@ -35,7 +35,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_order: type: list required: true @@ -47,7 +47,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true @@ -57,7 +57,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_network_role: type: list required: true @@ -69,7 +69,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal_network_role_tag: type: list required: true @@ -81,7 +81,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_subnetpoolid: type: list required: true @@ -89,11 +89,9 @@ node_types: entry_schema: type: string port_FSB1_Internal_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_FSB_OAM_network_role: type: list required: true @@ -119,11 +117,9 @@ node_types: entry_schema: type: string port_FSB_OAM_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_FSB1_Internal_network: type: list required: true @@ -145,21 +141,17 @@ node_types: entry_schema: type: integer port_FSB2_Internal_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_FSB2_Internal_mac_address: type: string required: true status: SUPPORTED port_FSB2_Internal_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_FSB1_Internal_order: type: list required: true @@ -179,17 +171,13 @@ node_types: entry_schema: type: string port_FSB1_Internal_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_FSB_OAM_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_FSB2_Internal_network_role_tag: type: list required: true 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 c6275a1ab8..0992b6e56b 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 @@ -23,7 +23,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal_subnetpoolid: type: list required: true @@ -33,7 +33,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_order: type: list required: true @@ -43,7 +43,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true @@ -51,7 +51,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_network_role: type: list required: true @@ -61,7 +61,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal_network_role_tag: type: list required: true @@ -71,17 +71,15 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_subnetpoolid: type: list required: true entry_schema: type: string port_FSB1_Internal_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_FSB_OAM_network_role: type: list required: true @@ -103,10 +101,8 @@ topology_template: entry_schema: type: string port_FSB_OAM_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_FSB1_Internal_network: type: list required: true @@ -125,18 +121,14 @@ topology_template: entry_schema: type: integer port_FSB2_Internal_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_FSB2_Internal_mac_address: type: string required: true port_FSB2_Internal_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_FSB1_Internal_order: type: list required: true @@ -153,15 +145,11 @@ topology_template: entry_schema: type: string port_FSB1_Internal_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_FSB_OAM_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_FSB2_Internal_network_role_tag: type: list required: true @@ -172,37 +160,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_FSB1_Internal_exCP_naming - - index_value + get_input: port_FSB1_Internal_exCP_naming vlan_requirements: - get_input: - - port_FSB1_Internal_vlan_requirements - - index_value + get_input: port_FSB1_Internal_vlan_requirements ip_requirements: - get_input: - - port_FSB1_Internal_ip_requirements - - index_value + get_input: port_FSB1_Internal_ip_requirements network_role_tag: - get_input: - - port_FSB1_Internal_network_role_tag - - index_value + get_input: port_FSB1_Internal_network_role_tag mac_requirements: - get_input: - - port_FSB1_Internal_mac_requirements - - index_value + get_input: port_FSB1_Internal_mac_requirements order: - get_input: - - port_FSB1_Internal_order - - index_value + get_input: port_FSB1_Internal_order network_role: - get_input: - - port_FSB1_Internal_network_role - - index_value + get_input: port_FSB1_Internal_network_role subnetpoolid: - get_input: - - port_FSB1_Internal_subnetpoolid - - index_value + get_input: port_FSB1_Internal_subnetpoolid network: get_input: - port_FSB1_Internal_network @@ -218,37 +190,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_FSB2_Internal_exCP_naming - - index_value + get_input: port_FSB2_Internal_exCP_naming vlan_requirements: - get_input: - - port_FSB2_Internal_vlan_requirements - - index_value + get_input: port_FSB2_Internal_vlan_requirements ip_requirements: - get_input: - - port_FSB2_Internal_ip_requirements - - index_value + get_input: port_FSB2_Internal_ip_requirements network_role_tag: - get_input: - - port_FSB2_Internal_network_role_tag - - index_value + get_input: port_FSB2_Internal_network_role_tag mac_requirements: - get_input: - - port_FSB2_Internal_mac_requirements - - index_value + get_input: port_FSB2_Internal_mac_requirements order: - get_input: - - port_FSB2_Internal_order - - index_value + get_input: port_FSB2_Internal_order network_role: - get_input: - - port_FSB2_Internal_network_role - - index_value + get_input: port_FSB2_Internal_network_role subnetpoolid: - get_input: - - port_FSB2_Internal_subnetpoolid - - index_value + get_input: port_FSB2_Internal_subnetpoolid network: get_input: - port_FSB2_Internal_network @@ -264,37 +220,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_FSB_OAM_exCP_naming - - index_value + get_input: port_FSB_OAM_exCP_naming vlan_requirements: - get_input: - - port_FSB_OAM_vlan_requirements - - index_value + get_input: port_FSB_OAM_vlan_requirements ip_requirements: - get_input: - - port_FSB_OAM_ip_requirements - - index_value + get_input: port_FSB_OAM_ip_requirements network_role_tag: - get_input: - - port_FSB_OAM_network_role_tag - - index_value + get_input: port_FSB_OAM_network_role_tag mac_requirements: - get_input: - - port_FSB_OAM_mac_requirements - - index_value + get_input: port_FSB_OAM_mac_requirements order: - get_input: - - port_FSB_OAM_order - - index_value + get_input: port_FSB_OAM_order network_role: - get_input: - - port_FSB_OAM_network_role - - index_value + get_input: port_FSB_OAM_network_role subnetpoolid: - get_input: - - port_FSB_OAM_subnetpoolid - - index_value + get_input: port_FSB_OAM_subnetpoolid fixed_ips: get_input: port_FSB_OAM_fixed_ips network: |