diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out')
9 files changed, 533 insertions, 2465 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/GlobalSubstitutionTypesServiceTemplate.yaml index 0b1b45b112..a3e595f5da 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -9,125 +9,29 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_FSB_OAM_network_role_tag: - type: string - required: true - status: SUPPORTED - port_FSB2_Internal2_network_role_tag: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_FSB2_Internal1_exCP_naming: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_FSB_OAM_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - compute_FSB2_availability_zone: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_FSB2_Internal2_exCP_naming: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_FSB_OAM_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal1_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal1_network_role: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_FSB2_Internal2_network_role: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - compute_FSB2_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_FSB2_Internal1_mac_address: - type: string - required: true - status: SUPPORTED - port_FSB2_Internal1_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_FSB_OAM_network_role: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB_OAM_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_FSB2_Internal1_network: + port_FSB2_Internal2_mac_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_FSB2_Internal2_mac_address: - type: string - required: true - status: SUPPORTED - port_FSB_OAM_subnetpoolid: + type: org.openecomp.datatypes.network.MacRequirements + port_FSB_OAM_mac_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_FSB2_Internal2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_FSB_OAM_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.MacRequirements port_FSB2_Internal2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json index_value: type: integer description: Index value of this substitution service template runtime instance @@ -136,37 +40,41 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_FSB_OAM_order: + port_FSB2_Internal2_network: type: list required: true status: SUPPORTED entry_schema: - type: integer - port_FSB2_Internal2_network: + type: string + vm_flavor_name: + type: string + required: true + status: SUPPORTED + compute_FSB2_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB2_Internal2_vlan_requirements: + port_FSB_OAM_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: json - port_FSB2_Internal1_order: + port_FSB2_Internal1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: integer - port_FSB2_Internal2_subnetpoolid: + type: json + compute_FSB2_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB2_Internal1_network_role_tag: + port_FSB2_Internal1_mac_address: type: list required: true status: SUPPORTED @@ -177,29 +85,31 @@ node_types: required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: json port_FSB2_Internal1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: list required: true status: SUPPORTED - port_FSB2_Internal2_order: + entry_schema: + type: org.openecomp.datatypes.network.MacRequirements + port_FSB_OAM_network: type: list required: true status: SUPPORTED entry_schema: - type: integer - port_FSB2_Internal1_subnetpoolid: + type: string + port_FSB2_Internal1_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB_OAM_exCP_naming: + port_FSB2_Internal2_mac_address: type: list required: true status: SUPPORTED entry_schema: - type: json + type: string requirements: - dependency_FSB2_FSB_OAM: capability: tosca.capabilities.Node @@ -695,32 +605,36 @@ node_types: org.openecomp.resource.abstract.nodes.VLC2: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_VLC_GTP_exCP_naming: + port_VLC_SCTP_A_network: type: list required: true status: SUPPORTED entry_schema: - type: json + type: string port_VLC_OAM_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string port_VLC_GTP_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json port_VLC2_Internal2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json port_VLC_SCTP_A_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.MacRequirements vm_flavor_name: type: string required: true @@ -730,219 +644,83 @@ node_types: required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json port_VLC_SCTP_A_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_VLC2_Internal1_network_role_tag: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_VLC2_Internal2_mac_address: - type: string - required: true - status: SUPPORTED - port_VLC_GTP_network_role_tag: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - vm_image_name: - type: string - required: true - status: SUPPORTED - port_VLC2_Internal1_mac_address: - type: string - required: true - status: SUPPORTED - port_VLC2_Internal2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_VLC2_Internal1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_VLC_SCTP_B_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_VLC_GTP_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_VLC2_Internal1_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_VLC_GTP_order: - type: list - required: true - status: SUPPORTED - entry_schema: - type: integer - port_VLC_OAM_exCP_naming: - type: list - required: true - status: SUPPORTED - entry_schema: type: json - port_VLC_SCTP_A_network_role_tag: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_VLC_GTP_vlan_requirements: + port_VLC_OAM_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: json - port_VLC_GTP_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_VLC_OAM_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_VLC2_Internal2_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_VLC_SCTP_A_network: + port_VLC2_Internal2_mac_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_VLC_SCTP_A_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_VLC_SCTP_A_order: - type: list - required: true - status: SUPPORTED - entry_schema: - type: integer - port_VLC_SCTP_B_exCP_naming: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_VLC_SCTP_A_exCP_naming: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_VLC_OAM_vlan_requirements: + port_VLC_OAM_fixed_ips: type: list required: true status: SUPPORTED entry_schema: type: json - port_VLC_OAM_ip_requirements: - type: list + vm_image_name: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_VLC_OAM_fixed_ips: + port_VLC2_Internal1_mac_address: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_VLC2_Internal1_order: + type: string + port_VLC2_Internal2_mac_requirements: type: list required: true status: SUPPORTED entry_schema: - type: integer - port_VLC_OAM_network_role: + type: org.openecomp.datatypes.network.MacRequirements + port_VLC2_Internal1_mac_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.MacRequirements port_VLC_SCTP_A_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_VLC2_Internal2_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: type: json - port_VLC_SCTP_A_subnetpoolid: + port_VLC_SCTP_B_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_VLC_OAM_subnetpoolid: + port_VLC_GTP_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_VLC_SCTP_B_network_role_tag: + port_VLC2_Internal1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: json compute_VLC2_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_VLC_OAM_order: - type: list - required: true - status: SUPPORTED - entry_schema: - type: integer - port_VLC2_Internal1_network_role: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_VLC2_Internal2_network_role: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -951,46 +729,18 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_VLC_SCTP_B_subnetpoolid: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_VLC2_Internal2_network_role_tag: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string port_VLC_SCTP_B_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_VLC_GTP_network_role: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_VLC_SCTP_A_network_role: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_VLC2_Internal2_order: + type: json + port_VLC_GTP_mac_requirements: type: list required: true status: SUPPORTED entry_schema: - type: integer - port_VLC_GTP_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.MacRequirements port_VLC2_Internal1_network: type: list required: true @@ -1003,63 +753,31 @@ node_types: status: SUPPORTED entry_schema: type: string - port_VLC2_Internal1_exCP_naming: + port_VLC_GTP_fixed_ips: type: list required: true status: SUPPORTED entry_schema: type: json port_VLC_OAM_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_VLC2_Internal1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - port_VLC2_Internal2_subnetpoolid: + type: org.openecomp.datatypes.network.MacRequirements + port_VLC_OAM_network: type: list required: true status: SUPPORTED entry_schema: type: string port_VLC_SCTP_B_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_VLC2_Internal2_exCP_naming: type: list required: true status: SUPPORTED entry_schema: - type: json - port_VLC_SCTP_B_order: - type: list - required: true - status: SUPPORTED - entry_schema: - type: integer - port_VLC_GTP_subnetpoolid: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_VLC2_Internal1_subnetpoolid: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_VLC_SCTP_B_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_VLC_SCTP_B_network_role: + type: org.openecomp.datatypes.network.MacRequirements + port_VLC2_Internal2_network: type: list required: true status: SUPPORTED @@ -1794,24 +1512,32 @@ node_types: org.openecomp.resource.abstract.nodes.NCB1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_NCB1_Internal1_network_role: + port_NCB1_Internal2_mac_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_NCB1_Internal2_network_role: + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + port_NCB1_Internal1_mac_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_NCB1_Internal1_network_role_tag: + port_NCB1_Internal1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: json vm_flavor_name: type: string required: true @@ -1822,112 +1548,40 @@ node_types: status: SUPPORTED entry_schema: type: string - port_NCB1_Internal2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string - required: true - status: SUPPORTED - port_NCB1_Internal2_order: - type: list - required: true - status: SUPPORTED - entry_schema: - type: integer - port_NCB1_Internal2_ip_requirements: + port_NCB1_Internal1_mac_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_NCB1_Internal1_exCP_naming: + type: org.openecomp.datatypes.network.MacRequirements + port_NCB1_Internal2_mac_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - port_NCB1_Internal1_subnetpoolid: + type: org.openecomp.datatypes.network.MacRequirements + port_NCB1_Internal1_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_NCB1_Internal2_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_NCB1_Internal2_subnetpoolid: + compute_NCB1_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_NCB1_Internal2_mac_address: - type: string - required: true - status: SUPPORTED - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - port_NCB1_Internal1_mac_address: + vm_image_name: type: string required: true status: SUPPORTED - port_NCB1_Internal1_order: - type: list - required: true - status: SUPPORTED - entry_schema: - type: integer - port_NCB1_Internal2_exCP_naming: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_NCB1_Internal1_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_NCB1_Internal1_vlan_requirements: + port_NCB1_Internal2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: json - port_NCB1_Internal1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_NCB1_Internal1_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - compute_NCB1_availability_zone: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_NCB1_Internal2_network_role_tag: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string port_NCB1_Internal2_network: type: list required: true @@ -2351,58 +2005,6 @@ node_types: org.openecomp.resource.abstract.nodes.NCB2: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - compute_NCB2_availability_zone: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_NCB2_Internal2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_NCB2_Internal1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string - required: true - status: SUPPORTED - port_NCB2_Internal1_exCP_naming: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_NCB2_Internal2_exCP_naming: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_NCB2_Internal1_order: - type: list - required: true - status: SUPPORTED - entry_schema: - type: integer - port_NCB2_Internal1_network_role: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_NCB2_Internal2_network_role: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2417,69 +2019,57 @@ node_types: status: SUPPORTED entry_schema: type: string - port_NCB2_Internal2_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_NCB2_Internal2_network_role_tag: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_NCB2_Internal2_network: + compute_NCB2_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_NCB2_Internal2_vlan_requirements: + port_NCB2_Internal2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: json - port_NCB2_Internal1_mac_address: - type: string - required: true - status: SUPPORTED - port_NCB2_Internal2_mac_address: + vm_flavor_name: type: string required: true status: SUPPORTED - port_NCB2_Internal1_subnetpoolid: + port_NCB2_Internal2_mac_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_NCB2_Internal1_network_role_tag: + type: org.openecomp.datatypes.network.MacRequirements + port_NCB2_Internal2_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_NCB2_Internal2_order: + port_NCB2_Internal1_mac_requirements: type: list required: true status: SUPPORTED entry_schema: - type: integer - compute_NCB2_name: + type: org.openecomp.datatypes.network.MacRequirements + port_NCB2_Internal1_mac_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_NCB2_Internal1_vlan_requirements: + port_NCB2_Internal2_mac_address: type: list required: true status: SUPPORTED entry_schema: - type: json - port_NCB2_Internal2_subnetpoolid: + type: string + vm_image_name: + type: string + required: true + status: SUPPORTED + compute_NCB2_name: type: list required: true status: SUPPORTED @@ -2490,7 +2080,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json requirements: - dependency_NCB2: capability: tosca.capabilities.Node @@ -2908,89 +2498,25 @@ node_types: org.openecomp.resource.abstract.nodes.GPB2: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_GPB2_Internal2_network_role_tag: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_GPB2_Internal2_order: - type: list - required: true - status: SUPPORTED - entry_schema: - type: integer - port_GPB2_Internal1_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_GPB2_Internal1_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_GPB2_Internal2_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string - required: true - status: SUPPORTED - port_GPB2_Internal2_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_GPB2_Internal1_network_role: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - compute_GPB2_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_GPB2_Internal1_subnetpoolid: + port_GPB2_Internal2_mac_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_GPB2_Internal2_subnetpoolid: + port_GPB2_Internal2_mac_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_GPB2_Internal2_mac_address: - type: string - required: true - status: SUPPORTED - port_GPB2_Internal2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.MacRequirements port_GPB2_Internal1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_GPB2_Internal2_network_role: + type: json + port_GPB2_Internal1_network: type: list required: true status: SUPPORTED @@ -3010,38 +2536,38 @@ node_types: status: SUPPORTED entry_schema: type: string - port_GPB2_Internal2_exCP_naming: - type: list + vm_flavor_name: + type: string required: true status: SUPPORTED - entry_schema: - type: json - port_GPB2_Internal1_order: + port_GPB2_Internal1_mac_requirements: type: list required: true status: SUPPORTED entry_schema: - type: integer - port_GPB2_Internal1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_GPB2_Internal1_exCP_naming: + type: org.openecomp.datatypes.network.MacRequirements + port_GPB2_Internal2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: json - port_GPB2_Internal1_network_role_tag: + vm_image_name: + type: string + required: true + status: SUPPORTED + compute_GPB2_name: type: list required: true status: SUPPORTED entry_schema: type: string port_GPB2_Internal1_mac_address: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string port_GPB2_Internal2_network: type: list required: true @@ -3466,214 +2992,64 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_VLC1_Internal2_mac_address: - type: string - required: true - status: SUPPORTED - port_VLC_GTP_exCP_naming: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_VLC_OAM_network_role_tag: - type: string - required: true - status: SUPPORTED - port_VLC1_Internal1_mac_address: - type: string - required: true - status: SUPPORTED - port_VLC_GTP_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_VLC1_Internal2_exCP_naming: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_VLC1_Internal2_network_role: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_VLC_SCTP_A_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_VLC1_Internal2_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_VLC_SCTP_B_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_VLC_SCTP_A_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_VLC1_Internal2_network_role_tag: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_VLC_GTP_network_role_tag: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - vm_image_name: - type: string - required: true - status: SUPPORTED - port_VLC1_Internal1_subnetpoolid: type: list required: true status: SUPPORTED entry_schema: type: string - port_VLC_SCTP_B_network: + port_VLC1_Internal1_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_VLC1_Internal1_network_role_tag: + port_VLC_SCTP_A_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_VLC_GTP_network: + port_VLC_OAM_network_role_tag: type: list required: true status: SUPPORTED entry_schema: type: string - port_VLC_GTP_order: - type: list - required: true - status: SUPPORTED - entry_schema: - type: integer - port_VLC_OAM_exCP_naming: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_VLC1_Internal1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_VLC1_Internal1_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_VLC1_Internal1_order: - type: list - required: true - status: SUPPORTED - entry_schema: - type: integer - port_VLC_SCTP_A_network_role_tag: + port_VLC1_Internal1_mac_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_VLC_GTP_vlan_requirements: + port_VLC_GTP_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: json - port_VLC_GTP_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_VLC_OAM_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - compute_VLC1_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_VLC1_Internal2_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_VLC1_Internal1_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_VLC_SCTP_A_network: + port_VLC_SCTP_A_mac_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_VLC_SCTP_A_vlan_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements + vm_flavor_name: + type: string required: true status: SUPPORTED - entry_schema: - type: json - port_VLC1_Internal1_network_role: + port_VLC1_Internal2_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_VLC_SCTP_A_order: - type: list - required: true - status: SUPPORTED - entry_schema: - type: integer - port_VLC_SCTP_B_exCP_naming: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_VLC_SCTP_A_exCP_naming: + port_VLC_SCTP_B_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: json - port_VLC_OAM_vlan_requirements: + port_VLC_SCTP_A_fixed_ips: type: list required: true status: SUPPORTED @@ -3684,79 +3060,47 @@ node_types: required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json port_VLC1_Internal1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json port_VLC_OAM_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_VLC1_Internal2_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: type: json - port_VLC_OAM_network_role: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_VLC1_Internal2_order: - type: list - required: true - status: SUPPORTED - entry_schema: - type: integer - port_VLC1_Internal2_subnetpoolid: - type: list + vm_image_name: + type: string required: true status: SUPPORTED - entry_schema: - type: string port_VLC_SCTP_A_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_VLC_SCTP_A_subnetpoolid: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - compute_VLC1_availability_zone: + type: json + port_VLC_SCTP_B_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_VLC_OAM_subnetpoolid: + port_VLC_GTP_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_VLC_SCTP_B_network_role_tag: + compute_VLC1_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_VLC_OAM_order: - type: list - required: true - status: SUPPORTED - entry_schema: - type: integer index_value: type: integer description: Index value of this substitution service template runtime instance @@ -3765,76 +3109,66 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_VLC1_Internal2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_VLC1_Internal1_mac_requirements: + type: list required: true status: SUPPORTED - port_VLC_SCTP_B_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.MacRequirements + port_VLC1_Internal2_mac_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.MacRequirements port_VLC_SCTP_B_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_VLC_GTP_network_role: + type: json + port_VLC_GTP_mac_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_VLC_SCTP_A_network_role: + type: org.openecomp.datatypes.network.MacRequirements + port_VLC_GTP_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_VLC_GTP_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED + type: json port_VLC_OAM_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_VLC1_Internal1_exCP_naming: type: list required: true status: SUPPORTED entry_schema: - type: json - port_VLC_SCTP_B_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_VLC_SCTP_B_order: + type: org.openecomp.datatypes.network.MacRequirements + port_VLC_OAM_network: type: list required: true status: SUPPORTED entry_schema: - type: integer - port_VLC_GTP_subnetpoolid: + type: string + compute_VLC1_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_VLC_SCTP_B_vlan_requirements: + port_VLC_SCTP_B_mac_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - port_VLC_SCTP_B_network_role: + type: org.openecomp.datatypes.network.MacRequirements + port_VLC1_Internal2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: json requirements: - dependency_VLC1_VLC_SCTP_B: capability: tosca.capabilities.Node @@ -4565,119 +3899,35 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_FSB1_Internal1_mac_address: - type: string - required: true - status: SUPPORTED - port_FSB_OAM_network_role_tag: - type: string - required: true - status: SUPPORTED - port_FSB1_Internal2_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB1_Internal1_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_FSB_OAM_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_FSB1_Internal2_mac_address: - type: string - required: true - status: SUPPORTED - port_FSB_OAM_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB1_Internal1_subnetpoolid: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_FSB1_Internal2_subnetpoolid: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_FSB1_Internal1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_FSB_OAM_network_role: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_FSB1_Internal1_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB1_Internal1_order: - type: list - required: true - status: SUPPORTED - entry_schema: - type: integer - port_FSB_OAM_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_FSB1_Internal2_network_role: + port_FSB_OAM_network_role_tag: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB1_Internal1_network_role_tag: + port_FSB1_Internal2_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB_OAM_subnetpoolid: + port_FSB_OAM_mac_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_FSB_OAM_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.MacRequirements compute_FSB1_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB1_Internal1_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json index_value: type: integer description: Index value of this substitution service template runtime instance @@ -4686,76 +3936,70 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_FSB_OAM_order: + port_FSB1_Internal1_network: type: list required: true status: SUPPORTED entry_schema: - type: integer - port_FSB1_Internal1_network_role: - type: list + type: string + vm_flavor_name: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_FSB1_Internal2_network_role_tag: + port_FSB1_Internal2_mac_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB1_Internal2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_FSB1_Internal2_ip_requirements: + port_FSB_OAM_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB1_Internal2_order: + type: json + port_FSB1_Internal2_mac_requirements: type: list required: true status: SUPPORTED entry_schema: - type: integer - port_FSB_OAM_fixed_ips: + type: org.openecomp.datatypes.network.MacRequirements + port_FSB1_Internal2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_FSB1_Internal1_exCP_naming: + type: json + port_FSB_OAM_fixed_ips: type: list required: true status: SUPPORTED entry_schema: type: json - port_FSB_OAM_exCP_naming: + compute_FSB1_name: type: list required: true status: SUPPORTED entry_schema: - type: json - compute_FSB1_name: + type: string + port_FSB1_Internal1_mac_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_FSB1_Internal2_exCP_naming: + type: org.openecomp.datatypes.network.MacRequirements + port_FSB1_Internal1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: json - port_FSB1_Internal2_vlan_requirements: + port_FSB_OAM_network: type: list required: true status: SUPPORTED entry_schema: - type: json + type: string requirements: - dependency_FSB1_FSB1_Internal2: capability: tosca.capabilities.Node @@ -5251,13 +4495,21 @@ node_types: org.openecomp.resource.abstract.nodes.GPB1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_GPB1_Internal1_network_role: + port_GPB1_Internal2_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_GPB1_Internal2_network_role: + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + port_GPB1_Internal1_network: type: list required: true status: SUPPORTED @@ -5273,124 +4525,52 @@ node_types: type: string required: true status: SUPPORTED - port_GPB1_Internal2_mac_address: - type: string - required: true - status: SUPPORTED - port_GPB1_Internal1_order: - type: list - required: true - status: SUPPORTED - entry_schema: - type: integer - vm_image_name: - type: string - required: true - status: SUPPORTED - port_GPB1_Internal1_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_GPB1_Internal2_exCP_naming: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_GPB1_Internal1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - compute_GPB1_availability_zone: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_GPB1_Internal1_exCP_naming: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_GPB1_Internal2_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_GPB1_Internal2_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_GPB1_Internal1_network_role_tag: + port_GPB1_Internal2_mac_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_GPB1_Internal2_network: + type: org.openecomp.datatypes.network.MacRequirements + port_GPB1_Internal1_mac_address: type: list required: true status: SUPPORTED entry_schema: type: string - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - port_GPB1_Internal1_network: + port_GPB1_Internal2_mac_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_GPB1_Internal2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_GPB1_Internal1_mac_address: + vm_image_name: type: string required: true status: SUPPORTED - port_GPB1_Internal1_subnetpoolid: + port_GPB1_Internal1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_GPB1_Internal2_subnetpoolid: + type: json + port_GPB1_Internal1_mac_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_GPB1_Internal2_network_role_tag: + type: org.openecomp.datatypes.network.MacRequirements + compute_GPB1_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_GPB1_Internal1_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_GPB1_Internal2_order: + port_GPB1_Internal2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: integer + type: json requirements: - dependency_GPB1: capability: tosca.capabilities.Node @@ -5804,4 +4984,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED + - UNBOUNDED
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB1ServiceTemplate.yaml index a9acfcc5c3..d9a7752ac7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB1ServiceTemplate.yaml @@ -12,98 +12,30 @@ node_types: topology_template: inputs: port_FSB1_Internal1_mac_address: - type: string - required: true - port_FSB_OAM_network_role_tag: - type: string - required: true - port_FSB1_Internal2_network: - type: list - required: true - entry_schema: - type: string - port_FSB1_Internal1_network: - type: list - required: true - entry_schema: - type: string - vm_flavor_name: - type: string - required: true - port_FSB_OAM_vlan_requirements: - type: list - required: true - entry_schema: - type: json - port_FSB1_Internal2_mac_address: - type: string - required: true - port_FSB_OAM_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB1_Internal1_subnetpoolid: type: list required: true entry_schema: type: string - port_FSB1_Internal2_subnetpoolid: - type: list - required: true - entry_schema: - type: string - port_FSB1_Internal1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_FSB_OAM_network_role: - type: list - required: true - entry_schema: - type: string - port_FSB1_Internal1_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB1_Internal1_order: - type: list - required: true - entry_schema: - type: integer - port_FSB_OAM_network: - type: list - required: true - entry_schema: - type: string - port_FSB1_Internal2_network_role: + port_FSB_OAM_network_role_tag: type: list required: true entry_schema: type: string - port_FSB1_Internal1_network_role_tag: + port_FSB1_Internal2_network: type: list required: true entry_schema: type: string - port_FSB_OAM_subnetpoolid: + port_FSB_OAM_mac_requirements: type: list required: true entry_schema: - type: string - port_FSB_OAM_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true + type: org.openecomp.datatypes.network.MacRequirements compute_FSB1_availability_zone: type: list required: true entry_schema: type: string - port_FSB1_Internal1_vlan_requirements: - type: list - required: true - entry_schema: - type: json index_value: type: integer description: Index value of this substitution service template runtime instance @@ -111,102 +43,79 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_FSB_OAM_order: + port_FSB1_Internal1_network: type: list required: true entry_schema: - type: integer - port_FSB1_Internal1_network_role: + type: string + vm_flavor_name: + type: string + required: true + port_FSB1_Internal2_mac_address: type: list required: true entry_schema: type: string - port_FSB1_Internal2_network_role_tag: + port_FSB_OAM_ip_requirements: type: list required: true entry_schema: - type: string + type: json port_FSB1_Internal2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_FSB1_Internal2_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB1_Internal2_order: + type: org.openecomp.datatypes.network.MacRequirements + port_FSB1_Internal2_ip_requirements: type: list required: true entry_schema: - type: integer + type: json port_FSB_OAM_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_FSB1_Internal1_exCP_naming: - type: list - required: true - entry_schema: type: json - port_FSB_OAM_exCP_naming: + compute_FSB1_name: type: list required: true entry_schema: - type: json - compute_FSB1_name: + type: string + port_FSB1_Internal1_mac_requirements: type: list required: true entry_schema: - type: string - port_FSB1_Internal2_exCP_naming: + type: org.openecomp.datatypes.network.MacRequirements + port_FSB1_Internal1_ip_requirements: type: list required: true entry_schema: type: json - port_FSB1_Internal2_vlan_requirements: + port_FSB_OAM_network: type: list required: true entry_schema: - type: json + type: string node_templates: FSB1_FSB1_Internal2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_FSB1_Internal2_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_FSB1_Internal2_vlan_requirements - - index_value ip_requirements: - get_input: port_FSB1_Internal2_ip_requirements - network_role_tag: get_input: - - port_FSB1_Internal2_network_role_tag + - port_FSB1_Internal2_ip_requirements - index_value mac_requirements: - get_input: port_FSB1_Internal2_mac_requirements - order: - get_input: - - port_FSB1_Internal2_order - - index_value - network_role: - get_input: - - port_FSB1_Internal2_network_role - - index_value - subnetpoolid: get_input: - - port_FSB1_Internal2_subnetpoolid + - port_FSB1_Internal2_mac_requirements - index_value network: get_input: - port_FSB1_Internal2_network - index_value mac_address: - get_input: port_FSB1_Internal2_mac_address + get_input: + - port_FSB1_Internal2_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -215,40 +124,22 @@ topology_template: FSB1_FSB1_Internal1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_FSB1_Internal1_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_FSB1_Internal1_vlan_requirements - - index_value ip_requirements: - get_input: port_FSB1_Internal1_ip_requirements - network_role_tag: get_input: - - port_FSB1_Internal1_network_role_tag + - port_FSB1_Internal1_ip_requirements - index_value mac_requirements: - get_input: port_FSB1_Internal1_mac_requirements - order: get_input: - - port_FSB1_Internal1_order - - index_value - network_role: - get_input: - - port_FSB1_Internal1_network_role - - index_value - subnetpoolid: - get_input: - - port_FSB1_Internal1_subnetpoolid + - port_FSB1_Internal1_mac_requirements - index_value network: get_input: - port_FSB1_Internal1_network - index_value mac_address: - get_input: port_FSB1_Internal1_mac_address + get_input: + - port_FSB1_Internal1_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -257,34 +148,22 @@ topology_template: FSB1_FSB_OAM: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_FSB_OAM_exCP_naming - - index_value - vlan_requirements: + ip_requirements: get_input: - - port_FSB_OAM_vlan_requirements + - port_FSB_OAM_ip_requirements - index_value - ip_requirements: - get_input: port_FSB_OAM_ip_requirements network_role_tag: - get_input: port_FSB_OAM_network_role_tag - mac_requirements: - get_input: port_FSB_OAM_mac_requirements - order: get_input: - - port_FSB_OAM_order + - port_FSB_OAM_network_role_tag - index_value - network_role: + mac_requirements: get_input: - - port_FSB_OAM_network_role + - port_FSB_OAM_mac_requirements - index_value - subnetpoolid: + fixed_ips: get_input: - - port_FSB_OAM_subnetpoolid + - port_FSB_OAM_fixed_ips - index_value - fixed_ips: - get_input: port_FSB_OAM_fixed_ips network: get_input: - port_FSB_OAM_network @@ -556,4 +435,4 @@ topology_template: - dependency link_FSB1_FSB_OAM: - FSB1_FSB_OAM - - link + - link
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB2ServiceTemplate.yaml index 24b75d7835..9bb94360f6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB2ServiceTemplate.yaml @@ -12,103 +12,25 @@ node_types: topology_template: inputs: port_FSB_OAM_network_role_tag: - type: string - required: true - port_FSB2_Internal2_network_role_tag: - type: list - required: true - entry_schema: - type: string - port_FSB2_Internal1_exCP_naming: - type: list - required: true - entry_schema: - type: json - vm_flavor_name: - type: string - required: true - port_FSB_OAM_vlan_requirements: - type: list - required: true - entry_schema: - type: json - compute_FSB2_availability_zone: - type: list - required: true - entry_schema: - type: string - port_FSB2_Internal2_exCP_naming: - type: list - required: true - entry_schema: - type: json - port_FSB_OAM_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal1_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal1_network_role: - type: list - required: true - entry_schema: - type: string - port_FSB2_Internal2_network_role: - type: list - required: true - entry_schema: - type: string - compute_FSB2_name: type: list required: true entry_schema: type: string - port_FSB2_Internal1_mac_address: - type: string - required: true - port_FSB2_Internal1_vlan_requirements: - type: list - required: true - entry_schema: - type: json - port_FSB_OAM_network_role: - type: list - required: true - entry_schema: - type: string - port_FSB_OAM_network: - type: list - required: true - entry_schema: - type: string - port_FSB2_Internal1_network: + port_FSB2_Internal2_mac_requirements: type: list required: true entry_schema: - type: string - port_FSB2_Internal2_mac_address: - type: string - required: true - port_FSB_OAM_subnetpoolid: + type: org.openecomp.datatypes.network.MacRequirements + port_FSB_OAM_mac_requirements: type: list required: true entry_schema: - type: string - port_FSB2_Internal2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_FSB_OAM_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true + type: org.openecomp.datatypes.network.MacRequirements port_FSB2_Internal2_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json index_value: type: integer description: Index value of this substitution service template runtime instance @@ -116,32 +38,35 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_FSB_OAM_order: + port_FSB2_Internal2_network: type: list required: true entry_schema: - type: integer - port_FSB2_Internal2_network: + type: string + vm_flavor_name: + type: string + required: true + compute_FSB2_availability_zone: type: list required: true entry_schema: type: string - port_FSB2_Internal2_vlan_requirements: + port_FSB_OAM_ip_requirements: type: list required: true entry_schema: type: json - port_FSB2_Internal1_order: + port_FSB2_Internal1_ip_requirements: type: list required: true entry_schema: - type: integer - port_FSB2_Internal2_subnetpoolid: + type: json + compute_FSB2_name: type: list required: true entry_schema: type: string - port_FSB2_Internal1_network_role_tag: + port_FSB2_Internal1_mac_address: type: list required: true entry_schema: @@ -150,57 +75,47 @@ topology_template: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: json port_FSB2_Internal1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: list required: true - port_FSB2_Internal2_order: + entry_schema: + type: org.openecomp.datatypes.network.MacRequirements + port_FSB_OAM_network: type: list required: true entry_schema: - type: integer - port_FSB2_Internal1_subnetpoolid: + type: string + port_FSB2_Internal1_network: type: list required: true entry_schema: type: string - port_FSB_OAM_exCP_naming: + port_FSB2_Internal2_mac_address: type: list required: true entry_schema: - type: json + type: string node_templates: FSB2_FSB_OAM: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_FSB_OAM_exCP_naming - - index_value - vlan_requirements: + ip_requirements: get_input: - - port_FSB_OAM_vlan_requirements + - port_FSB_OAM_ip_requirements - index_value - ip_requirements: - get_input: port_FSB_OAM_ip_requirements network_role_tag: - get_input: port_FSB_OAM_network_role_tag - mac_requirements: - get_input: port_FSB_OAM_mac_requirements - order: get_input: - - port_FSB_OAM_order + - port_FSB_OAM_network_role_tag - index_value - network_role: + mac_requirements: get_input: - - port_FSB_OAM_network_role + - port_FSB_OAM_mac_requirements - index_value - subnetpoolid: + fixed_ips: get_input: - - port_FSB_OAM_subnetpoolid + - port_FSB_OAM_fixed_ips - index_value - fixed_ips: - get_input: port_FSB_OAM_fixed_ips network: get_input: - port_FSB_OAM_network @@ -226,40 +141,22 @@ topology_template: FSB2_FSB2_Internal2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_FSB2_Internal2_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_FSB2_Internal2_vlan_requirements - - index_value ip_requirements: - get_input: port_FSB2_Internal2_ip_requirements - network_role_tag: get_input: - - port_FSB2_Internal2_network_role_tag + - port_FSB2_Internal2_ip_requirements - index_value mac_requirements: - get_input: port_FSB2_Internal2_mac_requirements - order: - get_input: - - port_FSB2_Internal2_order - - index_value - network_role: get_input: - - port_FSB2_Internal2_network_role - - index_value - subnetpoolid: - get_input: - - port_FSB2_Internal2_subnetpoolid + - port_FSB2_Internal2_mac_requirements - index_value network: get_input: - port_FSB2_Internal2_network - index_value mac_address: - get_input: port_FSB2_Internal2_mac_address + get_input: + - port_FSB2_Internal2_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -268,40 +165,22 @@ topology_template: FSB2_FSB2_Internal1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_FSB2_Internal1_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_FSB2_Internal1_vlan_requirements - - index_value ip_requirements: - get_input: port_FSB2_Internal1_ip_requirements - network_role_tag: get_input: - - port_FSB2_Internal1_network_role_tag + - port_FSB2_Internal1_ip_requirements - index_value mac_requirements: - get_input: port_FSB2_Internal1_mac_requirements - order: get_input: - - port_FSB2_Internal1_order - - index_value - network_role: - get_input: - - port_FSB2_Internal1_network_role - - index_value - subnetpoolid: - get_input: - - port_FSB2_Internal1_subnetpoolid + - port_FSB2_Internal1_mac_requirements - index_value network: get_input: - port_FSB2_Internal1_network - index_value mac_address: - get_input: port_FSB2_Internal1_mac_address + get_input: + - port_FSB2_Internal1_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -556,4 +435,4 @@ topology_template: - local_storage link_FSB2_FSB2_Internal2: - FSB2_FSB2_Internal2 - - link + - link
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_GPB1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_GPB1ServiceTemplate.yaml index 6b23277221..eb3a63e8b9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_GPB1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_GPB1ServiceTemplate.yaml @@ -11,12 +11,19 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_GPB1_Internal1_network_role: + port_GPB1_Internal2_network: type: list required: true entry_schema: type: string - port_GPB1_Internal2_network_role: + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_GPB1_Internal1_network: type: list required: true entry_schema: @@ -29,103 +36,44 @@ topology_template: vm_flavor_name: type: string required: true - port_GPB1_Internal2_mac_address: - type: string - required: true - port_GPB1_Internal1_order: - type: list - required: true - entry_schema: - type: integer - vm_image_name: - type: string - required: true - port_GPB1_Internal1_vlan_requirements: - type: list - required: true - entry_schema: - type: json - port_GPB1_Internal2_exCP_naming: - type: list - required: true - entry_schema: - type: json - port_GPB1_Internal1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - compute_GPB1_availability_zone: - type: list - required: true - entry_schema: - type: string - port_GPB1_Internal1_exCP_naming: - type: list - required: true - entry_schema: - type: json - port_GPB1_Internal2_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_GPB1_Internal2_vlan_requirements: - type: list - required: true - entry_schema: - type: json - port_GPB1_Internal1_network_role_tag: + port_GPB1_Internal2_mac_requirements: type: list required: true entry_schema: - type: string - port_GPB1_Internal2_network: + type: org.openecomp.datatypes.network.MacRequirements + port_GPB1_Internal1_mac_address: type: list required: true entry_schema: type: string - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - port_GPB1_Internal1_network: + port_GPB1_Internal2_mac_address: type: list required: true entry_schema: type: string - port_GPB1_Internal2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_GPB1_Internal1_mac_address: + vm_image_name: type: string required: true - port_GPB1_Internal1_subnetpoolid: + port_GPB1_Internal1_ip_requirements: type: list required: true entry_schema: - type: string - port_GPB1_Internal2_subnetpoolid: + type: json + port_GPB1_Internal1_mac_requirements: type: list required: true entry_schema: - type: string - port_GPB1_Internal2_network_role_tag: + type: org.openecomp.datatypes.network.MacRequirements + compute_GPB1_availability_zone: type: list required: true entry_schema: type: string - port_GPB1_Internal1_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_GPB1_Internal2_order: + port_GPB1_Internal2_ip_requirements: type: list required: true entry_schema: - type: integer + type: json node_templates: GPB1: type: org.openecomp.resource.vfc.nodes.heat.GPB1 @@ -145,40 +93,22 @@ topology_template: GPB1_GPB1_Internal1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_GPB1_Internal1_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_GPB1_Internal1_vlan_requirements - - index_value ip_requirements: - get_input: port_GPB1_Internal1_ip_requirements - network_role_tag: get_input: - - port_GPB1_Internal1_network_role_tag + - port_GPB1_Internal1_ip_requirements - index_value mac_requirements: - get_input: port_GPB1_Internal1_mac_requirements - order: get_input: - - port_GPB1_Internal1_order - - index_value - network_role: - get_input: - - port_GPB1_Internal1_network_role - - index_value - subnetpoolid: - get_input: - - port_GPB1_Internal1_subnetpoolid + - port_GPB1_Internal1_mac_requirements - index_value network: get_input: - port_GPB1_Internal1_network - index_value mac_address: - get_input: port_GPB1_Internal1_mac_address + get_input: + - port_GPB1_Internal1_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -187,40 +117,22 @@ topology_template: GPB1_GPB1_Internal2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_GPB1_Internal2_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_GPB1_Internal2_vlan_requirements - - index_value ip_requirements: - get_input: port_GPB1_Internal2_ip_requirements - network_role_tag: get_input: - - port_GPB1_Internal2_network_role_tag + - port_GPB1_Internal2_ip_requirements - index_value mac_requirements: - get_input: port_GPB1_Internal2_mac_requirements - order: - get_input: - - port_GPB1_Internal2_order - - index_value - network_role: get_input: - - port_GPB1_Internal2_network_role - - index_value - subnetpoolid: - get_input: - - port_GPB1_Internal2_subnetpoolid + - port_GPB1_Internal2_mac_requirements - index_value network: get_input: - port_GPB1_Internal2_network - index_value mac_address: - get_input: port_GPB1_Internal2_mac_address + get_input: + - port_GPB1_Internal2_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -436,4 +348,4 @@ topology_template: - local_storage link_GPB1_GPB1_Internal1: - GPB1_GPB1_Internal1 - - link + - link
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_GPB2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_GPB2ServiceTemplate.yaml index 133d43efe2..d18d8f578f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_GPB2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_GPB2ServiceTemplate.yaml @@ -11,74 +11,22 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_GPB2_Internal2_network_role_tag: - type: list - required: true - entry_schema: - type: string - port_GPB2_Internal2_order: - type: list - required: true - entry_schema: - type: integer - port_GPB2_Internal1_network: - type: list - required: true - entry_schema: - type: string - port_GPB2_Internal1_vlan_requirements: - type: list - required: true - entry_schema: - type: json - vm_flavor_name: - type: string - required: true - port_GPB2_Internal2_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string - required: true - port_GPB2_Internal2_vlan_requirements: - type: list - required: true - entry_schema: - type: json - port_GPB2_Internal1_network_role: - type: list - required: true - entry_schema: - type: string - compute_GPB2_name: - type: list - required: true - entry_schema: - type: string - port_GPB2_Internal1_subnetpoolid: + port_GPB2_Internal2_mac_address: type: list required: true entry_schema: type: string - port_GPB2_Internal2_subnetpoolid: + port_GPB2_Internal2_mac_requirements: type: list required: true entry_schema: - type: string - port_GPB2_Internal2_mac_address: - type: string - required: true - port_GPB2_Internal2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true + type: org.openecomp.datatypes.network.MacRequirements port_GPB2_Internal1_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_GPB2_Internal2_network_role: + type: json + port_GPB2_Internal1_network: type: list required: true entry_schema: @@ -95,32 +43,32 @@ topology_template: required: true entry_schema: type: string - port_GPB2_Internal2_exCP_naming: - type: list + vm_flavor_name: + type: string required: true - entry_schema: - type: json - port_GPB2_Internal1_order: + port_GPB2_Internal1_mac_requirements: type: list required: true entry_schema: - type: integer - port_GPB2_Internal1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_GPB2_Internal1_exCP_naming: + type: org.openecomp.datatypes.network.MacRequirements + port_GPB2_Internal2_ip_requirements: type: list required: true entry_schema: type: json - port_GPB2_Internal1_network_role_tag: + vm_image_name: + type: string + required: true + compute_GPB2_name: type: list required: true entry_schema: type: string port_GPB2_Internal1_mac_address: - type: string + type: list required: true + entry_schema: + type: string port_GPB2_Internal2_network: type: list required: true @@ -130,40 +78,22 @@ topology_template: GPB2_GPB2_Internal2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_GPB2_Internal2_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_GPB2_Internal2_vlan_requirements - - index_value ip_requirements: - get_input: port_GPB2_Internal2_ip_requirements - network_role_tag: get_input: - - port_GPB2_Internal2_network_role_tag + - port_GPB2_Internal2_ip_requirements - index_value mac_requirements: - get_input: port_GPB2_Internal2_mac_requirements - order: - get_input: - - port_GPB2_Internal2_order - - index_value - network_role: get_input: - - port_GPB2_Internal2_network_role - - index_value - subnetpoolid: - get_input: - - port_GPB2_Internal2_subnetpoolid + - port_GPB2_Internal2_mac_requirements - index_value network: get_input: - port_GPB2_Internal2_network - index_value mac_address: - get_input: port_GPB2_Internal2_mac_address + get_input: + - port_GPB2_Internal2_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -172,40 +102,22 @@ topology_template: GPB2_GPB2_Internal1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_GPB2_Internal1_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_GPB2_Internal1_vlan_requirements - - index_value ip_requirements: - get_input: port_GPB2_Internal1_ip_requirements - network_role_tag: get_input: - - port_GPB2_Internal1_network_role_tag + - port_GPB2_Internal1_ip_requirements - index_value mac_requirements: - get_input: port_GPB2_Internal1_mac_requirements - order: - get_input: - - port_GPB2_Internal1_order - - index_value - network_role: get_input: - - port_GPB2_Internal1_network_role - - index_value - subnetpoolid: - get_input: - - port_GPB2_Internal1_subnetpoolid + - port_GPB2_Internal1_mac_requirements - index_value network: get_input: - port_GPB2_Internal1_network - index_value mac_address: - get_input: port_GPB2_Internal1_mac_address + get_input: + - port_GPB2_Internal1_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -436,4 +348,4 @@ topology_template: - dependency dependency_GPB2_GPB2_Internal1: - GPB2_GPB2_Internal1 - - dependency + - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB1ServiceTemplate.yaml index 2da2afc1ba..4e33b89be8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB1ServiceTemplate.yaml @@ -11,68 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_NCB1_Internal1_network_role: - type: list - required: true - entry_schema: - type: string - port_NCB1_Internal2_network_role: - type: list - required: true - entry_schema: - type: string - port_NCB1_Internal1_network_role_tag: - type: list - required: true - entry_schema: - type: string - vm_flavor_name: - type: string - required: true - compute_NCB1_name: - type: list - required: true - entry_schema: - type: string - port_NCB1_Internal2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string - required: true - port_NCB1_Internal2_order: - type: list - required: true - entry_schema: - type: integer - port_NCB1_Internal2_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_NCB1_Internal1_exCP_naming: - type: list - required: true - entry_schema: - type: json - port_NCB1_Internal1_subnetpoolid: - type: list - required: true - entry_schema: - type: string - port_NCB1_Internal2_vlan_requirements: - type: list - required: true - entry_schema: - type: json - port_NCB1_Internal2_subnetpoolid: + port_NCB1_Internal2_mac_address: type: list required: true entry_schema: type: string - port_NCB1_Internal2_mac_address: - type: string - required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -81,31 +24,33 @@ topology_template: constraints: - greater_or_equal: 0 port_NCB1_Internal1_mac_address: - type: string - required: true - port_NCB1_Internal1_order: type: list required: true entry_schema: - type: integer - port_NCB1_Internal2_exCP_naming: + type: string + port_NCB1_Internal1_ip_requirements: type: list required: true entry_schema: type: json - port_NCB1_Internal1_ip_requirements: + vm_flavor_name: + type: string + required: true + compute_NCB1_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_NCB1_Internal1_vlan_requirements: + type: string + port_NCB1_Internal1_mac_requirements: type: list required: true entry_schema: - type: json - port_NCB1_Internal1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.MacRequirements + port_NCB1_Internal2_mac_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.MacRequirements port_NCB1_Internal1_network: type: list required: true @@ -116,11 +61,14 @@ topology_template: required: true entry_schema: type: string - port_NCB1_Internal2_network_role_tag: + vm_image_name: + type: string + required: true + port_NCB1_Internal2_ip_requirements: type: list required: true entry_schema: - type: string + type: json port_NCB1_Internal2_network: type: list required: true @@ -145,40 +93,22 @@ topology_template: NCB1_NCB1_Internal1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_NCB1_Internal1_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_NCB1_Internal1_vlan_requirements - - index_value ip_requirements: - get_input: port_NCB1_Internal1_ip_requirements - network_role_tag: get_input: - - port_NCB1_Internal1_network_role_tag + - port_NCB1_Internal1_ip_requirements - index_value mac_requirements: - get_input: port_NCB1_Internal1_mac_requirements - order: get_input: - - port_NCB1_Internal1_order - - index_value - network_role: - get_input: - - port_NCB1_Internal1_network_role - - index_value - subnetpoolid: - get_input: - - port_NCB1_Internal1_subnetpoolid + - port_NCB1_Internal1_mac_requirements - index_value network: get_input: - port_NCB1_Internal1_network - index_value mac_address: - get_input: port_NCB1_Internal1_mac_address + get_input: + - port_NCB1_Internal1_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -187,40 +117,22 @@ topology_template: NCB1_NCB1_Internal2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_NCB1_Internal2_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_NCB1_Internal2_vlan_requirements - - index_value ip_requirements: - get_input: port_NCB1_Internal2_ip_requirements - network_role_tag: get_input: - - port_NCB1_Internal2_network_role_tag + - port_NCB1_Internal2_ip_requirements - index_value mac_requirements: - get_input: port_NCB1_Internal2_mac_requirements - order: - get_input: - - port_NCB1_Internal2_order - - index_value - network_role: get_input: - - port_NCB1_Internal2_network_role - - index_value - subnetpoolid: - get_input: - - port_NCB1_Internal2_subnetpoolid + - port_NCB1_Internal2_mac_requirements - index_value network: get_input: - port_NCB1_Internal2_network - index_value mac_address: - get_input: port_NCB1_Internal2_mac_address + get_input: + - port_NCB1_Internal2_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -436,4 +348,4 @@ topology_template: - dependency dependency_NCB1_NCB1_Internal2: - NCB1_NCB1_Internal2 - - dependency + - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB2ServiceTemplate.yaml index bdc13693f5..f7525eb8f6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB2ServiceTemplate.yaml @@ -11,48 +11,6 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - compute_NCB2_availability_zone: - type: list - required: true - entry_schema: - type: string - vm_flavor_name: - type: string - required: true - port_NCB2_Internal2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_NCB2_Internal1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string - required: true - port_NCB2_Internal1_exCP_naming: - type: list - required: true - entry_schema: - type: json - port_NCB2_Internal2_exCP_naming: - type: list - required: true - entry_schema: - type: json - port_NCB2_Internal1_order: - type: list - required: true - entry_schema: - type: integer - port_NCB2_Internal1_network_role: - type: list - required: true - entry_schema: - type: string - port_NCB2_Internal2_network_role: - type: list - required: true - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -65,58 +23,48 @@ topology_template: required: true entry_schema: type: string - port_NCB2_Internal2_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_NCB2_Internal2_network_role_tag: - type: list - required: true - entry_schema: - type: string - port_NCB2_Internal2_network: + compute_NCB2_availability_zone: type: list required: true entry_schema: type: string - port_NCB2_Internal2_vlan_requirements: + port_NCB2_Internal2_ip_requirements: type: list required: true entry_schema: type: json - port_NCB2_Internal1_mac_address: - type: string - required: true - port_NCB2_Internal2_mac_address: + vm_flavor_name: type: string required: true - port_NCB2_Internal1_subnetpoolid: + port_NCB2_Internal2_mac_requirements: type: list required: true entry_schema: - type: string - port_NCB2_Internal1_network_role_tag: + type: org.openecomp.datatypes.network.MacRequirements + port_NCB2_Internal2_network: type: list required: true entry_schema: type: string - port_NCB2_Internal2_order: + port_NCB2_Internal1_mac_requirements: type: list required: true entry_schema: - type: integer - compute_NCB2_name: + type: org.openecomp.datatypes.network.MacRequirements + port_NCB2_Internal1_mac_address: type: list required: true entry_schema: type: string - port_NCB2_Internal1_vlan_requirements: + port_NCB2_Internal2_mac_address: type: list required: true entry_schema: - type: json - port_NCB2_Internal2_subnetpoolid: + type: string + vm_image_name: + type: string + required: true + compute_NCB2_name: type: list required: true entry_schema: @@ -125,7 +73,7 @@ topology_template: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json node_templates: NCB2: type: org.openecomp.resource.vfc.nodes.heat.NCB2 @@ -145,40 +93,22 @@ topology_template: NCB2_NCB2_Internal1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_NCB2_Internal1_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_NCB2_Internal1_vlan_requirements - - index_value ip_requirements: - get_input: port_NCB2_Internal1_ip_requirements - network_role_tag: get_input: - - port_NCB2_Internal1_network_role_tag + - port_NCB2_Internal1_ip_requirements - index_value mac_requirements: - get_input: port_NCB2_Internal1_mac_requirements - order: - get_input: - - port_NCB2_Internal1_order - - index_value - network_role: get_input: - - port_NCB2_Internal1_network_role - - index_value - subnetpoolid: - get_input: - - port_NCB2_Internal1_subnetpoolid + - port_NCB2_Internal1_mac_requirements - index_value network: get_input: - port_NCB2_Internal1_network - index_value mac_address: - get_input: port_NCB2_Internal1_mac_address + get_input: + - port_NCB2_Internal1_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -187,40 +117,22 @@ topology_template: NCB2_NCB2_Internal2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_NCB2_Internal2_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_NCB2_Internal2_vlan_requirements - - index_value ip_requirements: - get_input: port_NCB2_Internal2_ip_requirements - network_role_tag: get_input: - - port_NCB2_Internal2_network_role_tag + - port_NCB2_Internal2_ip_requirements - index_value mac_requirements: - get_input: port_NCB2_Internal2_mac_requirements - order: - get_input: - - port_NCB2_Internal2_order - - index_value - network_role: get_input: - - port_NCB2_Internal2_network_role - - index_value - subnetpoolid: - get_input: - - port_NCB2_Internal2_subnetpoolid + - port_NCB2_Internal2_mac_requirements - index_value network: get_input: - port_NCB2_Internal2_network - index_value mac_address: - get_input: port_NCB2_Internal2_mac_address + get_input: + - port_NCB2_Internal2_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -436,4 +348,4 @@ topology_template: - link dependency_NCB2: - NCB2 - - dependency + - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_VLC1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_VLC1ServiceTemplate.yaml index 9f5a49cea9..90056b2c9a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_VLC1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_VLC1ServiceTemplate.yaml @@ -12,177 +12,54 @@ node_types: topology_template: inputs: port_VLC1_Internal2_mac_address: - type: string - required: true - port_VLC_GTP_exCP_naming: - type: list - required: true - entry_schema: - type: json - port_VLC_OAM_network_role_tag: - type: string - required: true - port_VLC1_Internal1_mac_address: - type: string - required: true - port_VLC_GTP_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_VLC1_Internal2_exCP_naming: - type: list - required: true - entry_schema: - type: json - port_VLC1_Internal2_network_role: - type: list - required: true - entry_schema: - type: string - port_VLC_SCTP_A_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_flavor_name: - type: string - required: true - port_VLC1_Internal2_network: type: list required: true entry_schema: type: string - port_VLC_SCTP_B_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_VLC_SCTP_A_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_VLC1_Internal2_network_role_tag: - type: list - required: true - entry_schema: - type: string - port_VLC_GTP_network_role_tag: - type: list - required: true - entry_schema: - type: string - vm_image_name: - type: string - required: true - port_VLC1_Internal1_subnetpoolid: - type: list - required: true - entry_schema: - type: string - port_VLC_SCTP_B_network: + port_VLC1_Internal1_network: type: list required: true entry_schema: type: string - port_VLC1_Internal1_network_role_tag: + port_VLC_SCTP_A_network: type: list required: true entry_schema: type: string - port_VLC_GTP_network: + port_VLC_OAM_network_role_tag: type: list required: true entry_schema: type: string - port_VLC_GTP_order: - type: list - required: true - entry_schema: - type: integer - port_VLC_OAM_exCP_naming: - type: list - required: true - entry_schema: - type: json - port_VLC1_Internal1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_VLC1_Internal1_vlan_requirements: - type: list - required: true - entry_schema: - type: json - port_VLC1_Internal1_order: - type: list - required: true - entry_schema: - type: integer - port_VLC_SCTP_A_network_role_tag: + port_VLC1_Internal1_mac_address: type: list required: true entry_schema: type: string - port_VLC_GTP_vlan_requirements: + port_VLC_GTP_ip_requirements: type: list required: true entry_schema: type: json - port_VLC_GTP_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_VLC_OAM_network: - type: list - required: true - entry_schema: - type: string - compute_VLC1_name: - type: list - required: true - entry_schema: - type: string - port_VLC1_Internal2_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_VLC1_Internal1_network: - type: list - required: true - entry_schema: - type: string - port_VLC_SCTP_A_network: + port_VLC_SCTP_A_mac_requirements: type: list required: true entry_schema: - type: string - port_VLC_SCTP_A_vlan_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements + vm_flavor_name: + type: string required: true - entry_schema: - type: json - port_VLC1_Internal1_network_role: + port_VLC1_Internal2_network: type: list required: true entry_schema: type: string - port_VLC_SCTP_A_order: - type: list - required: true - entry_schema: - type: integer - port_VLC_SCTP_B_exCP_naming: - type: list - required: true - entry_schema: - type: json - port_VLC_SCTP_A_exCP_naming: + port_VLC_SCTP_B_ip_requirements: type: list required: true entry_schema: type: json - port_VLC_OAM_vlan_requirements: + port_VLC_SCTP_A_fixed_ips: type: list required: true entry_schema: @@ -191,67 +68,40 @@ topology_template: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json port_VLC1_Internal1_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json port_VLC_OAM_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_VLC1_Internal2_vlan_requirements: - type: list - required: true - entry_schema: type: json - port_VLC_OAM_network_role: - type: list - required: true - entry_schema: - type: string - port_VLC1_Internal2_order: - type: list - required: true - entry_schema: - type: integer - port_VLC1_Internal2_subnetpoolid: - type: list + vm_image_name: + type: string required: true - entry_schema: - type: string port_VLC_SCTP_A_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_VLC_SCTP_A_subnetpoolid: - type: list - required: true - entry_schema: - type: string - compute_VLC1_availability_zone: + type: json + port_VLC_SCTP_B_network: type: list required: true entry_schema: type: string - port_VLC_OAM_subnetpoolid: + port_VLC_GTP_network: type: list required: true entry_schema: type: string - port_VLC_SCTP_B_network_role_tag: + compute_VLC1_availability_zone: type: list required: true entry_schema: type: string - port_VLC_OAM_order: - type: list - required: true - entry_schema: - type: integer index_value: type: integer description: Index value of this substitution service template runtime instance @@ -259,97 +109,72 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_VLC1_Internal2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_VLC1_Internal1_mac_requirements: + type: list required: true - port_VLC_SCTP_B_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.MacRequirements + port_VLC1_Internal2_mac_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.MacRequirements port_VLC_SCTP_B_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_VLC_GTP_network_role: + type: json + port_VLC_GTP_mac_requirements: type: list required: true entry_schema: - type: string - port_VLC_SCTP_A_network_role: + type: org.openecomp.datatypes.network.MacRequirements + port_VLC_GTP_fixed_ips: type: list required: true entry_schema: - type: string - port_VLC_GTP_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true + type: json port_VLC_OAM_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_VLC1_Internal1_exCP_naming: type: list required: true entry_schema: - type: json - port_VLC_SCTP_B_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_VLC_SCTP_B_order: + type: org.openecomp.datatypes.network.MacRequirements + port_VLC_OAM_network: type: list required: true entry_schema: - type: integer - port_VLC_GTP_subnetpoolid: + type: string + compute_VLC1_name: type: list required: true entry_schema: type: string - port_VLC_SCTP_B_vlan_requirements: + port_VLC_SCTP_B_mac_requirements: type: list required: true entry_schema: - type: json - port_VLC_SCTP_B_network_role: + type: org.openecomp.datatypes.network.MacRequirements + port_VLC1_Internal2_ip_requirements: type: list required: true entry_schema: - type: string + type: json node_templates: VLC1_VLC_SCTP_B: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_VLC_SCTP_B_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_VLC_SCTP_B_vlan_requirements - - index_value ip_requirements: - get_input: port_VLC_SCTP_B_ip_requirements - network_role_tag: get_input: - - port_VLC_SCTP_B_network_role_tag + - port_VLC_SCTP_B_ip_requirements - index_value mac_requirements: - get_input: port_VLC_SCTP_B_mac_requirements - order: get_input: - - port_VLC_SCTP_B_order + - port_VLC_SCTP_B_mac_requirements - index_value - network_role: - get_input: - - port_VLC_SCTP_B_network_role - - index_value - subnetpoolid: + fixed_ips: get_input: - - port_VLC_SCTP_B_subnetpoolid + - port_VLC_SCTP_B_fixed_ips - index_value - fixed_ips: - get_input: port_VLC_SCTP_B_fixed_ips network: get_input: - port_VLC_SCTP_B_network @@ -362,40 +187,22 @@ topology_template: VLC1_VLC1_Internal2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_VLC1_Internal2_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_VLC1_Internal2_vlan_requirements - - index_value ip_requirements: - get_input: port_VLC1_Internal2_ip_requirements - network_role_tag: get_input: - - port_VLC1_Internal2_network_role_tag + - port_VLC1_Internal2_ip_requirements - index_value mac_requirements: - get_input: port_VLC1_Internal2_mac_requirements - order: - get_input: - - port_VLC1_Internal2_order - - index_value - network_role: get_input: - - port_VLC1_Internal2_network_role - - index_value - subnetpoolid: - get_input: - - port_VLC1_Internal2_subnetpoolid + - port_VLC1_Internal2_mac_requirements - index_value network: get_input: - port_VLC1_Internal2_network - index_value mac_address: - get_input: port_VLC1_Internal2_mac_address + get_input: + - port_VLC1_Internal2_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -404,40 +211,22 @@ topology_template: VLC1_VLC1_Internal1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_VLC1_Internal1_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_VLC1_Internal1_vlan_requirements - - index_value ip_requirements: - get_input: port_VLC1_Internal1_ip_requirements - network_role_tag: get_input: - - port_VLC1_Internal1_network_role_tag + - port_VLC1_Internal1_ip_requirements - index_value mac_requirements: - get_input: port_VLC1_Internal1_mac_requirements - order: - get_input: - - port_VLC1_Internal1_order - - index_value - network_role: get_input: - - port_VLC1_Internal1_network_role - - index_value - subnetpoolid: - get_input: - - port_VLC1_Internal1_subnetpoolid + - port_VLC1_Internal1_mac_requirements - index_value network: get_input: - port_VLC1_Internal1_network - index_value mac_address: - get_input: port_VLC1_Internal1_mac_address + get_input: + - port_VLC1_Internal1_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -446,34 +235,22 @@ topology_template: VLC1_VLC_OAM: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_VLC_OAM_exCP_naming - - index_value - vlan_requirements: + ip_requirements: get_input: - - port_VLC_OAM_vlan_requirements + - port_VLC_OAM_ip_requirements - index_value - ip_requirements: - get_input: port_VLC_OAM_ip_requirements network_role_tag: - get_input: port_VLC_OAM_network_role_tag - mac_requirements: - get_input: port_VLC_OAM_mac_requirements - order: get_input: - - port_VLC_OAM_order + - port_VLC_OAM_network_role_tag - index_value - network_role: + mac_requirements: get_input: - - port_VLC_OAM_network_role + - port_VLC_OAM_mac_requirements - index_value - subnetpoolid: + fixed_ips: get_input: - - port_VLC_OAM_subnetpoolid + - port_VLC_OAM_fixed_ips - index_value - fixed_ips: - get_input: port_VLC_OAM_fixed_ips network: get_input: - port_VLC_OAM_network @@ -486,36 +263,18 @@ topology_template: VLC1_VLC_SCTP_A: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_VLC_SCTP_A_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_VLC_SCTP_A_vlan_requirements - - index_value ip_requirements: - get_input: port_VLC_SCTP_A_ip_requirements - network_role_tag: get_input: - - port_VLC_SCTP_A_network_role_tag + - port_VLC_SCTP_A_ip_requirements - index_value mac_requirements: - get_input: port_VLC_SCTP_A_mac_requirements - order: get_input: - - port_VLC_SCTP_A_order + - port_VLC_SCTP_A_mac_requirements - index_value - network_role: - get_input: - - port_VLC_SCTP_A_network_role - - index_value - subnetpoolid: + fixed_ips: get_input: - - port_VLC_SCTP_A_subnetpoolid + - port_VLC_SCTP_A_fixed_ips - index_value - fixed_ips: - get_input: port_VLC_SCTP_A_fixed_ips network: get_input: - port_VLC_SCTP_A_network @@ -543,36 +302,18 @@ topology_template: VLC1_VLC_GTP: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_VLC_GTP_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_VLC_GTP_vlan_requirements - - index_value ip_requirements: - get_input: port_VLC_GTP_ip_requirements - network_role_tag: get_input: - - port_VLC_GTP_network_role_tag + - port_VLC_GTP_ip_requirements - index_value mac_requirements: - get_input: port_VLC_GTP_mac_requirements - order: - get_input: - - port_VLC_GTP_order - - index_value - network_role: get_input: - - port_VLC_GTP_network_role + - port_VLC_GTP_mac_requirements - index_value - subnetpoolid: + fixed_ips: get_input: - - port_VLC_GTP_subnetpoolid + - port_VLC_GTP_fixed_ips - index_value - fixed_ips: - get_input: port_VLC_GTP_fixed_ips network: get_input: - port_VLC_GTP_network @@ -948,4 +689,4 @@ topology_template: - dependency dependency_VLC1_VLC_SCTP_A: - VLC1_VLC_SCTP_A - - dependency + - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_VLC2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_VLC2ServiceTemplate.yaml index 0254ce3d48..48c2c1d7b3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_VLC2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_VLC2ServiceTemplate.yaml @@ -11,27 +11,31 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_VLC_GTP_exCP_naming: + port_VLC_SCTP_A_network: type: list required: true entry_schema: - type: json + type: string port_VLC_OAM_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string port_VLC_GTP_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json port_VLC2_Internal2_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json port_VLC_SCTP_A_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.MacRequirements vm_flavor_name: type: string required: true @@ -39,182 +43,70 @@ topology_template: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json port_VLC_SCTP_A_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_VLC2_Internal1_network_role_tag: - type: list - required: true - entry_schema: - type: string - port_VLC2_Internal2_mac_address: - type: string - required: true - port_VLC_GTP_network_role_tag: - type: list - required: true - entry_schema: - type: string - vm_image_name: - type: string - required: true - port_VLC2_Internal1_mac_address: - type: string - required: true - port_VLC2_Internal2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_VLC2_Internal1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_VLC_SCTP_B_network: - type: list - required: true - entry_schema: - type: string - port_VLC_GTP_network: - type: list - required: true - entry_schema: - type: string - port_VLC2_Internal1_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_VLC_GTP_order: - type: list - required: true - entry_schema: - type: integer - port_VLC_OAM_exCP_naming: - type: list - required: true - entry_schema: type: json - port_VLC_SCTP_A_network_role_tag: - type: list - required: true - entry_schema: - type: string - port_VLC_GTP_vlan_requirements: + port_VLC_OAM_ip_requirements: type: list required: true entry_schema: type: json - port_VLC_GTP_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_VLC_OAM_network: - type: list - required: true - entry_schema: - type: string - port_VLC2_Internal2_network: - type: list - required: true - entry_schema: - type: string - port_VLC_SCTP_A_network: + port_VLC2_Internal2_mac_address: type: list required: true entry_schema: type: string - port_VLC_SCTP_A_vlan_requirements: - type: list - required: true - entry_schema: - type: json - port_VLC_SCTP_A_order: - type: list - required: true - entry_schema: - type: integer - port_VLC_SCTP_B_exCP_naming: - type: list - required: true - entry_schema: - type: json - port_VLC_SCTP_A_exCP_naming: - type: list - required: true - entry_schema: - type: json - port_VLC_OAM_vlan_requirements: + port_VLC_OAM_fixed_ips: type: list required: true entry_schema: type: json - port_VLC_OAM_ip_requirements: - type: list + vm_image_name: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_VLC_OAM_fixed_ips: + port_VLC2_Internal1_mac_address: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_VLC2_Internal1_order: + type: string + port_VLC2_Internal2_mac_requirements: type: list required: true entry_schema: - type: integer - port_VLC_OAM_network_role: + type: org.openecomp.datatypes.network.MacRequirements + port_VLC2_Internal1_mac_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.MacRequirements port_VLC_SCTP_A_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_VLC2_Internal2_vlan_requirements: - type: list - required: true - entry_schema: type: json - port_VLC_SCTP_A_subnetpoolid: + port_VLC_SCTP_B_network: type: list required: true entry_schema: type: string - port_VLC_OAM_subnetpoolid: + port_VLC_GTP_network: type: list required: true entry_schema: type: string - port_VLC_SCTP_B_network_role_tag: + port_VLC2_Internal1_ip_requirements: type: list required: true entry_schema: - type: string + type: json compute_VLC2_name: type: list required: true entry_schema: type: string - port_VLC_OAM_order: - type: list - required: true - entry_schema: - type: integer - port_VLC2_Internal1_network_role: - type: list - required: true - entry_schema: - type: string - port_VLC2_Internal2_network_role: - type: list - required: true - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -222,39 +114,16 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_VLC_SCTP_B_subnetpoolid: - type: list - required: true - entry_schema: - type: string - port_VLC2_Internal2_network_role_tag: - type: list - required: true - entry_schema: - type: string port_VLC_SCTP_B_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_VLC_GTP_network_role: - type: list - required: true - entry_schema: - type: string - port_VLC_SCTP_A_network_role: - type: list - required: true - entry_schema: - type: string - port_VLC2_Internal2_order: + type: json + port_VLC_GTP_mac_requirements: type: list required: true entry_schema: - type: integer - port_VLC_GTP_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true + type: org.openecomp.datatypes.network.MacRequirements port_VLC2_Internal1_network: type: list required: true @@ -265,53 +134,27 @@ topology_template: required: true entry_schema: type: string - port_VLC2_Internal1_exCP_naming: + port_VLC_GTP_fixed_ips: type: list required: true entry_schema: type: json port_VLC_OAM_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_VLC2_Internal1_vlan_requirements: type: list required: true entry_schema: - type: json - port_VLC2_Internal2_subnetpoolid: + type: org.openecomp.datatypes.network.MacRequirements + port_VLC_OAM_network: type: list required: true entry_schema: type: string port_VLC_SCTP_B_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_VLC2_Internal2_exCP_naming: - type: list - required: true - entry_schema: - type: json - port_VLC_SCTP_B_order: - type: list - required: true - entry_schema: - type: integer - port_VLC_GTP_subnetpoolid: type: list required: true entry_schema: - type: string - port_VLC2_Internal1_subnetpoolid: - type: list - required: true - entry_schema: - type: string - port_VLC_SCTP_B_vlan_requirements: - type: list - required: true - entry_schema: - type: json - port_VLC_SCTP_B_network_role: + type: org.openecomp.datatypes.network.MacRequirements + port_VLC2_Internal2_network: type: list required: true entry_schema: @@ -320,40 +163,22 @@ topology_template: VLC2_VLC2_Internal2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_VLC2_Internal2_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_VLC2_Internal2_vlan_requirements - - index_value ip_requirements: - get_input: port_VLC2_Internal2_ip_requirements - network_role_tag: get_input: - - port_VLC2_Internal2_network_role_tag + - port_VLC2_Internal2_ip_requirements - index_value mac_requirements: - get_input: port_VLC2_Internal2_mac_requirements - order: - get_input: - - port_VLC2_Internal2_order - - index_value - network_role: get_input: - - port_VLC2_Internal2_network_role - - index_value - subnetpoolid: - get_input: - - port_VLC2_Internal2_subnetpoolid + - port_VLC2_Internal2_mac_requirements - index_value network: get_input: - port_VLC2_Internal2_network - index_value mac_address: - get_input: port_VLC2_Internal2_mac_address + get_input: + - port_VLC2_Internal2_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -362,34 +187,22 @@ topology_template: VLC2_VLC_OAM: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_VLC_OAM_exCP_naming - - index_value - vlan_requirements: + ip_requirements: get_input: - - port_VLC_OAM_vlan_requirements + - port_VLC_OAM_ip_requirements - index_value - ip_requirements: - get_input: port_VLC_OAM_ip_requirements network_role_tag: - get_input: port_VLC_OAM_network_role_tag - mac_requirements: - get_input: port_VLC_OAM_mac_requirements - order: get_input: - - port_VLC_OAM_order + - port_VLC_OAM_network_role_tag - index_value - network_role: + mac_requirements: get_input: - - port_VLC_OAM_network_role + - port_VLC_OAM_mac_requirements - index_value - subnetpoolid: + fixed_ips: get_input: - - port_VLC_OAM_subnetpoolid + - port_VLC_OAM_fixed_ips - index_value - fixed_ips: - get_input: port_VLC_OAM_fixed_ips network: get_input: - port_VLC_OAM_network @@ -402,40 +215,22 @@ topology_template: VLC2_VLC2_Internal1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_VLC2_Internal1_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_VLC2_Internal1_vlan_requirements - - index_value ip_requirements: - get_input: port_VLC2_Internal1_ip_requirements - network_role_tag: get_input: - - port_VLC2_Internal1_network_role_tag + - port_VLC2_Internal1_ip_requirements - index_value mac_requirements: - get_input: port_VLC2_Internal1_mac_requirements - order: get_input: - - port_VLC2_Internal1_order - - index_value - network_role: - get_input: - - port_VLC2_Internal1_network_role - - index_value - subnetpoolid: - get_input: - - port_VLC2_Internal1_subnetpoolid + - port_VLC2_Internal1_mac_requirements - index_value network: get_input: - port_VLC2_Internal1_network - index_value mac_address: - get_input: port_VLC2_Internal1_mac_address + get_input: + - port_VLC2_Internal1_mac_address + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -444,36 +239,18 @@ topology_template: VLC2_VLC_SCTP_A: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_VLC_SCTP_A_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_VLC_SCTP_A_vlan_requirements - - index_value ip_requirements: - get_input: port_VLC_SCTP_A_ip_requirements - network_role_tag: get_input: - - port_VLC_SCTP_A_network_role_tag + - port_VLC_SCTP_A_ip_requirements - index_value mac_requirements: - get_input: port_VLC_SCTP_A_mac_requirements - order: get_input: - - port_VLC_SCTP_A_order + - port_VLC_SCTP_A_mac_requirements - index_value - network_role: - get_input: - - port_VLC_SCTP_A_network_role - - index_value - subnetpoolid: + fixed_ips: get_input: - - port_VLC_SCTP_A_subnetpoolid + - port_VLC_SCTP_A_fixed_ips - index_value - fixed_ips: - get_input: port_VLC_SCTP_A_fixed_ips network: get_input: - port_VLC_SCTP_A_network @@ -486,36 +263,18 @@ topology_template: VLC2_VLC_SCTP_B: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_VLC_SCTP_B_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_VLC_SCTP_B_vlan_requirements - - index_value ip_requirements: - get_input: port_VLC_SCTP_B_ip_requirements - network_role_tag: get_input: - - port_VLC_SCTP_B_network_role_tag + - port_VLC_SCTP_B_ip_requirements - index_value mac_requirements: - get_input: port_VLC_SCTP_B_mac_requirements - order: get_input: - - port_VLC_SCTP_B_order + - port_VLC_SCTP_B_mac_requirements - index_value - network_role: - get_input: - - port_VLC_SCTP_B_network_role - - index_value - subnetpoolid: + fixed_ips: get_input: - - port_VLC_SCTP_B_subnetpoolid + - port_VLC_SCTP_B_fixed_ips - index_value - fixed_ips: - get_input: port_VLC_SCTP_B_fixed_ips network: get_input: - port_VLC_SCTP_B_network @@ -528,36 +287,18 @@ topology_template: VLC2_VLC_GTP: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: - - port_VLC_GTP_exCP_naming - - index_value - vlan_requirements: - get_input: - - port_VLC_GTP_vlan_requirements - - index_value ip_requirements: - get_input: port_VLC_GTP_ip_requirements - network_role_tag: get_input: - - port_VLC_GTP_network_role_tag + - port_VLC_GTP_ip_requirements - index_value mac_requirements: - get_input: port_VLC_GTP_mac_requirements - order: - get_input: - - port_VLC_GTP_order - - index_value - network_role: get_input: - - port_VLC_GTP_network_role + - port_VLC_GTP_mac_requirements - index_value - subnetpoolid: + fixed_ips: get_input: - - port_VLC_GTP_subnetpoolid + - port_VLC_GTP_fixed_ips - index_value - fixed_ips: - get_input: port_VLC_GTP_fixed_ips network: get_input: - port_VLC_GTP_network @@ -948,4 +689,4 @@ topology_template: - dependency dependency_VLC2_VLC_GTP: - VLC2_VLC_GTP - - dependency + - dependency
\ No newline at end of file |