From 68ccc45de18f41cddb79de33a245bceb3b063ffb Mon Sep 17 00:00:00 2001 From: Tal Gitelman Date: Thu, 22 Jun 2017 18:23:07 +0300 Subject: [sdc] - latest code changes Change-Id: I861387094b000367218bb417624fe50d3c37f70e Signed-off-by: Tal Gitelman --- .../GlobalSubstitutionTypesServiceTemplate.yaml | 48 ++---- .../out/SubstitutionServiceTemplate.yaml | 176 ++++++--------------- 2 files changed, 64 insertions(+), 160 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out') 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 -- cgit 1.2.3-korg