diff options
author | Michael Lando <ml636r@att.com> | 2017-06-11 14:22:02 +0300 |
---|---|---|
committer | Michael Lando <ml636r@att.com> | 2017-06-11 17:48:32 +0300 |
commit | b3d4898d9e8452ea0b8d848c048e712d43b8d9a3 (patch) | |
tree | 0609319203be13f6c29ccbe24cb39c9d64f90095 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out | |
parent | af9929df75604ce407d0ca542b200630164e0ae6 (diff) |
[SDC-29] rebase continue work to align source
Change-Id: I218f1c5ee23fb2c8314f1c70921d3ad8682c10f4
Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out')
10 files changed, 2664 insertions, 384 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 d1f7bb0857..d53617ed8d 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 @@ -14,6 +14,112 @@ node_types: status: SUPPORTED entry_schema: type: string + 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: json + port_FSB2_Internal1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + 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: list + required: true + status: SUPPORTED + entry_schema: + type: string + 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: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB2_Internal2_mac_address: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB_OAM_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string port_FSB2_Internal2_mac_requirements: type: list required: true @@ -40,41 +146,37 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_FSB2_Internal2_network: + port_FSB_OAM_order: type: list required: true status: SUPPORTED entry_schema: - type: string - vm_flavor_name: - type: string - required: true - status: SUPPORTED - compute_FSB2_availability_zone: + type: integer + port_FSB2_Internal2_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB_OAM_ip_requirements: + port_FSB2_Internal2_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: json - port_FSB2_Internal1_ip_requirements: + port_FSB2_Internal1_order: type: list required: true status: SUPPORTED entry_schema: - type: json - compute_FSB2_name: + type: integer + port_FSB2_Internal2_subnetpoolid: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB2_Internal1_mac_address: + port_FSB2_Internal1_network_role_tag: type: list required: true status: SUPPORTED @@ -92,24 +194,24 @@ node_types: status: SUPPORTED entry_schema: type: json - port_FSB_OAM_network: + port_FSB2_Internal2_order: type: list required: true status: SUPPORTED entry_schema: - type: string - port_FSB2_Internal1_network: + type: integer + port_FSB2_Internal1_subnetpoolid: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB2_Internal2_mac_address: + port_FSB_OAM_exCP_naming: type: list required: true status: SUPPORTED entry_schema: - type: string + type: json requirements: - dependency_FSB2_FSB_OAM: capability: tosca.capabilities.Node @@ -605,12 +707,12 @@ node_types: org.openecomp.resource.abstract.nodes.VLC2: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_VLC_SCTP_A_network: + port_VLC_GTP_exCP_naming: type: list required: true status: SUPPORTED entry_schema: - type: string + type: json port_VLC_OAM_network_role_tag: type: list required: true @@ -651,24 +753,24 @@ node_types: status: SUPPORTED entry_schema: type: json - port_VLC_OAM_ip_requirements: + port_VLC2_Internal1_network_role_tag: type: list required: true status: SUPPORTED entry_schema: - type: json + type: string port_VLC2_Internal2_mac_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_VLC_OAM_fixed_ips: + port_VLC_GTP_network_role_tag: type: list required: true status: SUPPORTED entry_schema: - type: json + type: string vm_image_name: type: string required: true @@ -691,36 +793,180 @@ node_types: status: SUPPORTED entry_schema: type: json - port_VLC_SCTP_A_ip_requirements: + 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: json - port_VLC_SCTP_B_network: + 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_network: + port_VLC_GTP_vlan_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: json + port_VLC_OAM_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_VLC2_Internal1_ip_requirements: + port_VLC2_Internal2_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_VLC_SCTP_A_network: + 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: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_VLC_OAM_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_VLC_OAM_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_VLC2_Internal1_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer + port_VLC_OAM_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_VLC_SCTP_A_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_VLC2_Internal2_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_VLC_SCTP_A_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_VLC_OAM_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_VLC_SCTP_B_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string 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 @@ -729,12 +975,42 @@ 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: json + 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: list + required: true + status: SUPPORTED + entry_schema: + type: integer port_VLC_GTP_mac_requirements: type: list required: true @@ -753,7 +1029,7 @@ node_types: status: SUPPORTED entry_schema: type: string - port_VLC_GTP_fixed_ips: + port_VLC2_Internal1_exCP_naming: type: list required: true status: SUPPORTED @@ -765,7 +1041,13 @@ node_types: status: SUPPORTED entry_schema: type: json - port_VLC_OAM_network: + port_VLC2_Internal1_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_VLC2_Internal2_subnetpoolid: type: list required: true status: SUPPORTED @@ -777,7 +1059,37 @@ node_types: status: SUPPORTED entry_schema: type: json - port_VLC2_Internal2_network: + 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: list required: true status: SUPPORTED @@ -1512,6 +1824,80 @@ node_types: org.openecomp.resource.abstract.nodes.NCB1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_NCB1_Internal1_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_NCB1_Internal2_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_NCB1_Internal1_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + vm_flavor_name: + type: string + required: true + status: SUPPORTED + compute_NCB1_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_NCB1_Internal2_mac_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + 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: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_NCB1_Internal1_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_NCB1_Internal1_subnetpoolid: + 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: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string port_NCB1_Internal2_mac_address: type: list required: true @@ -1532,29 +1918,31 @@ node_types: status: SUPPORTED entry_schema: type: string - port_NCB1_Internal1_ip_requirements: + port_NCB1_Internal1_order: type: list required: true status: SUPPORTED entry_schema: - type: json - vm_flavor_name: - type: string + type: integer + port_NCB1_Internal2_exCP_naming: + type: list required: true status: SUPPORTED - compute_NCB1_name: + entry_schema: + type: json + port_NCB1_Internal1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_NCB1_Internal1_mac_requirements: + type: json + port_NCB1_Internal1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: json - port_NCB1_Internal2_mac_requirements: + port_NCB1_Internal1_mac_requirements: type: list required: true status: SUPPORTED @@ -1572,16 +1960,12 @@ node_types: status: SUPPORTED entry_schema: type: string - vm_image_name: - type: string - required: true - status: SUPPORTED - port_NCB1_Internal2_ip_requirements: + port_NCB1_Internal2_network_role_tag: type: list required: true status: SUPPORTED entry_schema: - type: json + type: string port_NCB1_Internal2_network: type: list required: true @@ -2005,6 +2389,62 @@ 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: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_NCB2_Internal1_mac_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + 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 @@ -2019,62 +2459,78 @@ node_types: status: SUPPORTED entry_schema: type: string - compute_NCB2_availability_zone: + port_NCB2_Internal2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_NCB2_Internal2_ip_requirements: + type: json + port_NCB2_Internal2_network_role_tag: type: list required: true status: SUPPORTED entry_schema: - type: json - vm_flavor_name: - type: string + type: string + port_NCB2_Internal2_network: + type: list required: true status: SUPPORTED - port_NCB2_Internal2_mac_requirements: + entry_schema: + type: string + port_NCB2_Internal2_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: json - port_NCB2_Internal2_network: + port_NCB2_Internal1_mac_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_NCB2_Internal1_mac_requirements: + port_NCB2_Internal2_mac_address: type: list required: true status: SUPPORTED entry_schema: - type: json - port_NCB2_Internal1_mac_address: + type: string + port_NCB2_Internal1_subnetpoolid: type: list required: true status: SUPPORTED entry_schema: type: string - port_NCB2_Internal2_mac_address: + port_NCB2_Internal1_network_role_tag: type: list required: true status: SUPPORTED entry_schema: type: string - vm_image_name: - type: string + port_NCB2_Internal2_order: + type: list required: true status: SUPPORTED + entry_schema: + type: integer compute_NCB2_name: type: list required: true status: SUPPORTED entry_schema: type: string + port_NCB2_Internal1_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_NCB2_Internal2_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string port_NCB2_Internal1_ip_requirements: type: list required: true @@ -2498,6 +2954,74 @@ 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: json + 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: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_GPB2_Internal2_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string port_GPB2_Internal2_mac_address: type: list required: true @@ -2516,7 +3040,7 @@ node_types: status: SUPPORTED entry_schema: type: json - port_GPB2_Internal1_network: + port_GPB2_Internal2_network_role: type: list required: true status: SUPPORTED @@ -2536,27 +3060,31 @@ node_types: status: SUPPORTED entry_schema: type: string - vm_flavor_name: - type: string + port_GPB2_Internal2_exCP_naming: + type: list required: true status: SUPPORTED - port_GPB2_Internal1_mac_requirements: + entry_schema: + type: json + port_GPB2_Internal1_order: type: list required: true status: SUPPORTED entry_schema: - type: json - port_GPB2_Internal2_ip_requirements: + type: integer + port_GPB2_Internal1_mac_requirements: type: list required: true status: SUPPORTED entry_schema: type: json - vm_image_name: - type: string + port_GPB2_Internal1_exCP_naming: + type: list required: true status: SUPPORTED - compute_GPB2_name: + entry_schema: + type: json + port_GPB2_Internal1_network_role_tag: type: list required: true status: SUPPORTED @@ -2997,36 +3525,42 @@ node_types: status: SUPPORTED entry_schema: type: string - port_VLC1_Internal1_network: + port_VLC_GTP_exCP_naming: type: list required: true status: SUPPORTED entry_schema: - type: string - port_VLC_SCTP_A_network: + type: json + port_VLC_OAM_network_role_tag: type: list required: true status: SUPPORTED entry_schema: type: string - port_VLC_OAM_network_role_tag: + port_VLC1_Internal1_mac_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_VLC1_Internal1_mac_address: + port_VLC_GTP_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_VLC_GTP_ip_requirements: + type: json + 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: list required: true @@ -3055,6 +3589,160 @@ node_types: status: SUPPORTED entry_schema: type: json + 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: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_VLC1_Internal1_network_role_tag: + 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_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: list + required: true + status: SUPPORTED + entry_schema: + type: json + 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: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_VLC_GTP_vlan_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: json + 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: json + port_VLC1_Internal1_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_VLC_SCTP_A_network: + 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_VLC1_Internal1_network_role: + 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: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_VLC_OAM_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json port_VLC_OAM_ip_requirements: type: list required: true @@ -3073,34 +3761,66 @@ node_types: status: SUPPORTED entry_schema: type: json - vm_image_name: - type: string + 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 required: true status: SUPPORTED + entry_schema: + type: string port_VLC_SCTP_A_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: json - port_VLC_SCTP_B_network: + port_VLC_SCTP_A_subnetpoolid: type: list required: true status: SUPPORTED entry_schema: type: string - port_VLC_GTP_network: + compute_VLC1_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - compute_VLC1_availability_zone: + port_VLC_OAM_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_VLC_SCTP_B_network_role_tag: 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 @@ -3109,66 +3829,84 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_VLC1_Internal1_mac_requirements: + port_VLC1_Internal2_mac_requirements: type: list required: true status: SUPPORTED entry_schema: type: json - port_VLC1_Internal2_mac_requirements: + port_VLC_SCTP_B_subnetpoolid: type: list required: true status: SUPPORTED entry_schema: - type: json + type: string port_VLC_SCTP_B_fixed_ips: type: list required: true status: SUPPORTED entry_schema: type: json + 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_VLC_GTP_mac_requirements: type: list required: true status: SUPPORTED entry_schema: type: json - port_VLC_GTP_fixed_ips: + port_VLC_OAM_mac_requirements: type: list required: true status: SUPPORTED entry_schema: type: json - port_VLC_OAM_mac_requirements: + port_VLC1_Internal1_exCP_naming: type: list required: true status: SUPPORTED entry_schema: type: json - port_VLC_OAM_network: + port_VLC_SCTP_B_mac_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - compute_VLC1_name: + 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_VLC_SCTP_B_mac_requirements: + port_VLC_SCTP_B_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: json - port_VLC1_Internal2_ip_requirements: + port_VLC_SCTP_B_network_role: type: list required: true status: SUPPORTED entry_schema: - type: json + type: string requirements: - dependency_VLC1_VLC_SCTP_B: capability: tosca.capabilities.Node @@ -3916,6 +4654,94 @@ node_types: 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: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB_OAM_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + 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: 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_FSB1_Internal1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + 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: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB1_Internal1_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB_OAM_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string port_FSB_OAM_mac_requirements: type: list required: true @@ -3928,6 +4754,12 @@ node_types: 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 @@ -3936,28 +4768,24 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_FSB1_Internal1_network: + port_FSB_OAM_order: type: list required: true status: SUPPORTED entry_schema: - type: string - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_FSB1_Internal2_mac_address: + type: integer + port_FSB1_Internal1_network_role: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB_OAM_ip_requirements: + port_FSB1_Internal2_network_role_tag: type: list required: true status: SUPPORTED entry_schema: - type: json + type: string port_FSB1_Internal2_mac_requirements: type: list required: true @@ -3970,36 +4798,48 @@ node_types: status: SUPPORTED entry_schema: type: json + port_FSB1_Internal2_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer port_FSB_OAM_fixed_ips: type: list required: true status: SUPPORTED entry_schema: type: json - compute_FSB1_name: + port_FSB1_Internal1_exCP_naming: type: list required: true status: SUPPORTED entry_schema: - type: string - port_FSB1_Internal1_mac_requirements: + type: json + port_FSB_OAM_exCP_naming: type: list required: true status: SUPPORTED entry_schema: type: json - port_FSB1_Internal1_ip_requirements: + compute_FSB1_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB1_Internal2_exCP_naming: type: list required: true status: SUPPORTED entry_schema: type: json - port_FSB_OAM_network: + port_FSB1_Internal2_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: json requirements: - dependency_FSB1_FSB1_Internal2: capability: tosca.capabilities.Node @@ -4495,21 +5335,13 @@ node_types: org.openecomp.resource.abstract.nodes.GPB1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_GPB1_Internal2_network: + port_GPB1_Internal1_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 - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - port_GPB1_Internal1_network: + port_GPB1_Internal2_network_role: type: list required: true status: SUPPORTED @@ -4525,29 +5357,29 @@ node_types: type: string required: true status: SUPPORTED - port_GPB1_Internal2_mac_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_GPB1_Internal1_mac_address: + port_GPB1_Internal2_mac_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_GPB1_Internal2_mac_address: + port_GPB1_Internal1_order: type: list required: true status: SUPPORTED entry_schema: - type: string + type: integer vm_image_name: type: string required: true status: SUPPORTED - port_GPB1_Internal1_ip_requirements: + 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 @@ -4565,12 +5397,92 @@ node_types: 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: json + port_GPB1_Internal2_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_GPB1_Internal1_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_GPB1_Internal2_network: + 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: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_GPB1_Internal2_mac_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_GPB1_Internal1_mac_address: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_GPB1_Internal1_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_GPB1_Internal2_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_GPB1_Internal2_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_GPB1_Internal1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_GPB1_Internal2_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer requirements: - dependency_GPB1: capability: tosca.capabilities.Node diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/MainServiceTemplate.yaml index 8e78b6635d..8ae59dca18 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/MainServiceTemplate.yaml @@ -627,8 +627,6 @@ topology_template: directives: - substitutable properties: - port_VLC_SCTP_A_network: - - epc-sctp-a-net port_VLC_OAM_network_role_tag: - oam port_VLC_GTP_ip_requirements: @@ -657,17 +655,8 @@ topology_template: port_VLC_SCTP_A_fixed_ips: - - ip_address: get_input: vlc2-sctp-a-ip - port_VLC_OAM_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false port_VLC2_Internal2_mac_address: - get_input: vlc2-Internal2-mac - port_VLC_OAM_fixed_ips: - - - ip_address: - get_input: vlc2-oam-ip vm_image_name: get_input: pxe-image port_VLC2_Internal1_mac_address: @@ -678,12 +667,6 @@ topology_template: port_VLC2_Internal1_mac_requirements: - mac_count_required: is_required: true - port_VLC_SCTP_A_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false port_VLC_SCTP_B_network: - epc-sctp-b-net port_VLC_GTP_network: @@ -694,6 +677,30 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_VLC_GTP_fixed_ips: + - - ip_address: + get_input: vlc2-gtp-ip + port_VLC_OAM_network: + - get_input: oam_net_id + port_VLC2_Internal2_network: + - Internal2-net + port_VLC_SCTP_A_network: + - epc-sctp-a-net + port_VLC_OAM_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_VLC_OAM_fixed_ips: + - - ip_address: + get_input: vlc2-oam-ip + port_VLC_SCTP_A_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false compute_VLC2_name: - get_input: vlc2-name port_VLC_SCTP_B_fixed_ips: @@ -706,19 +713,12 @@ topology_template: - Internal1-net compute_VLC2_availability_zone: - get_input: vlc_zone - port_VLC_GTP_fixed_ips: - - - ip_address: - get_input: vlc2-gtp-ip port_VLC_OAM_mac_requirements: - mac_count_required: is_required: false - port_VLC_OAM_network: - - get_input: oam_net_id port_VLC_SCTP_B_mac_requirements: - mac_count_required: is_required: false - port_VLC2_Internal2_network: - - Internal2-net service_template_filter: substitute_service_template: Nested_VLC2ServiceTemplate.yaml count: 1 @@ -755,10 +755,6 @@ topology_template: properties: port_VLC1_Internal2_mac_address: - get_input: vlc1-Internal2-mac - port_VLC1_Internal1_network: - - Internal1-net - port_VLC_SCTP_A_network: - - epc-sctp-a-net port_VLC_OAM_network_role_tag: - oam port_VLC1_Internal1_mac_address: @@ -785,6 +781,32 @@ topology_template: port_VLC_SCTP_A_fixed_ips: - - ip_address: get_input: vlc1-sctp-a-ip + vm_image_name: + get_input: pxe-image + port_VLC_SCTP_B_network: + - epc-sctp-b-net + port_VLC_GTP_network: + - epc-gtp-net + port_VLC1_Internal1_mac_requirements: + - mac_count_required: + is_required: true + port_VLC_GTP_fixed_ips: + - - ip_address: + get_input: vlc1-gtp-ip + port_VLC_OAM_network: + - get_input: oam_net_id + compute_VLC1_name: + - get_input: vlc1-name + port_VLC1_Internal2_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_VLC1_Internal1_network: + - Internal1-net + port_VLC_SCTP_A_network: + - epc-sctp-a-net port_VLC_OAM_ip_requirements: - - ip_version: 4 ip_count_required: @@ -800,23 +822,14 @@ topology_template: port_VLC_OAM_fixed_ips: - - ip_address: get_input: vlc1-oam-ip - vm_image_name: - get_input: pxe-image port_VLC_SCTP_A_ip_requirements: - - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_VLC_SCTP_B_network: - - epc-sctp-b-net - port_VLC_GTP_network: - - epc-gtp-net compute_VLC1_availability_zone: - get_input: vlc_zone - port_VLC1_Internal1_mac_requirements: - - mac_count_required: - is_required: true port_VLC1_Internal2_mac_requirements: - mac_count_required: is_required: true @@ -826,25 +839,12 @@ topology_template: port_VLC_GTP_mac_requirements: - mac_count_required: is_required: false - port_VLC_GTP_fixed_ips: - - - ip_address: - get_input: vlc1-gtp-ip port_VLC_OAM_mac_requirements: - mac_count_required: is_required: false - port_VLC_OAM_network: - - get_input: oam_net_id - compute_VLC1_name: - - get_input: vlc1-name port_VLC_SCTP_B_mac_requirements: - mac_count_required: is_required: false - port_VLC1_Internal2_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false service_template_filter: substitute_service_template: Nested_VLC1ServiceTemplate.yaml count: 1 @@ -900,35 +900,35 @@ topology_template: directives: - substitutable properties: - port_GPB1_Internal2_network: - - Internal2-net - port_GPB1_Internal1_network: - - Internal1-net compute_GPB1_name: - get_input: gpb1-name vm_flavor_name: get_input: gpb-flavor - port_GPB1_Internal2_mac_requirements: - - mac_count_required: - is_required: true - port_GPB1_Internal1_mac_address: - - get_input: gpb1-Internal1-mac port_GPB1_Internal2_mac_address: - get_input: gpb1-Internal2-mac vm_image_name: get_input: pxe-image - port_GPB1_Internal1_ip_requirements: + port_GPB1_Internal1_mac_requirements: + - mac_count_required: + is_required: true + compute_GPB1_availability_zone: + - get_input: gpb_zone + port_GPB1_Internal2_ip_requirements: - - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_GPB1_Internal1_mac_requirements: + port_GPB1_Internal2_network: + - Internal2-net + port_GPB1_Internal1_network: + - Internal1-net + port_GPB1_Internal2_mac_requirements: - mac_count_required: is_required: true - compute_GPB1_availability_zone: - - get_input: gpb_zone - port_GPB1_Internal2_ip_requirements: + port_GPB1_Internal1_mac_address: + - get_input: gpb1-Internal1-mac + port_GPB1_Internal1_ip_requirements: - - ip_version: 4 ip_count_required: is_required: false @@ -956,6 +956,20 @@ topology_template: directives: - substitutable properties: + port_GPB2_Internal1_network: + - Internal1-net + vm_flavor_name: + get_input: gpb-flavor + port_GPB2_Internal2_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + vm_image_name: + get_input: pxe-image + compute_GPB2_name: + - get_input: gpb2-name port_GPB2_Internal2_mac_address: - get_input: gpb2-Internal2-mac port_GPB2_Internal2_mac_requirements: @@ -967,25 +981,11 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_GPB2_Internal1_network: - - Internal1-net compute_GPB2_availability_zone: - get_input: gpb_zone - vm_flavor_name: - get_input: gpb-flavor port_GPB2_Internal1_mac_requirements: - mac_count_required: is_required: true - port_GPB2_Internal2_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - vm_image_name: - get_input: pxe-image - compute_GPB2_name: - - get_input: gpb2-name port_GPB2_Internal1_mac_address: - get_input: gpb2-Internal1-mac port_GPB2_Internal2_network: @@ -1051,6 +1051,21 @@ topology_template: directives: - substitutable properties: + vm_flavor_name: + get_input: ncb-flavor + compute_NCB1_name: + - get_input: ncb1-name + port_NCB1_Internal2_mac_requirements: + - mac_count_required: + is_required: true + vm_image_name: + get_input: pxe-image + port_NCB1_Internal2_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false port_NCB1_Internal2_mac_address: - get_input: ncb1-Internal2-mac port_NCB1_Internal1_mac_address: @@ -1061,28 +1076,13 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - vm_flavor_name: - get_input: ncb-flavor - compute_NCB1_name: - - get_input: ncb1-name port_NCB1_Internal1_mac_requirements: - mac_count_required: is_required: true - port_NCB1_Internal2_mac_requirements: - - mac_count_required: - is_required: true port_NCB1_Internal1_network: - Internal1-net compute_NCB1_availability_zone: - get_input: ncb_zone - vm_image_name: - get_input: pxe-image - port_NCB1_Internal2_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false port_NCB1_Internal2_network: - Internal2-net service_template_filter: @@ -1107,32 +1107,32 @@ topology_template: directives: - substitutable properties: - port_NCB2_Internal1_network: - - Internal1-net compute_NCB2_availability_zone: - get_input: ncb_zone - port_NCB2_Internal2_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false vm_flavor_name: get_input: ncb-flavor port_NCB2_Internal2_mac_requirements: - mac_count_required: is_required: true - port_NCB2_Internal2_network: - - Internal2-net port_NCB2_Internal1_mac_requirements: - mac_count_required: is_required: true + vm_image_name: + get_input: pxe-image + port_NCB2_Internal1_network: + - Internal1-net + port_NCB2_Internal2_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_NCB2_Internal2_network: + - Internal2-net port_NCB2_Internal1_mac_address: - get_input: ncb2-Internal1-mac port_NCB2_Internal2_mac_address: - get_input: ncb2-Internal2-mac - vm_image_name: - get_input: pxe-image compute_NCB2_name: - get_input: ncb2-name port_NCB2_Internal1_ip_requirements: @@ -1187,11 +1187,6 @@ topology_template: - oam port_FSB1_Internal2_network: - Internal2-net - port_FSB_OAM_mac_requirements: - - mac_count_required: - is_required: false - compute_FSB1_availability_zone: - - get_input: fsb_zone port_FSB1_Internal1_network: - Internal1-net vm_flavor_name: @@ -1204,31 +1199,36 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - port_FSB1_Internal2_mac_requirements: + port_FSB1_Internal1_mac_requirements: - mac_count_required: is_required: true - port_FSB1_Internal2_ip_requirements: + port_FSB1_Internal1_ip_requirements: - - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_FSB_OAM_fixed_ips: - - - ip_address: - get_input: fsb1-oam-ip - compute_FSB1_name: - - get_input: fsb1-name - port_FSB1_Internal1_mac_requirements: + port_FSB_OAM_network: + - get_input: oam_net_id + port_FSB_OAM_mac_requirements: + - mac_count_required: + is_required: false + compute_FSB1_availability_zone: + - get_input: fsb_zone + port_FSB1_Internal2_mac_requirements: - mac_count_required: is_required: true - port_FSB1_Internal1_ip_requirements: + port_FSB1_Internal2_ip_requirements: - - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_FSB_OAM_network: - - get_input: oam_net_id + port_FSB_OAM_fixed_ips: + - - ip_address: + get_input: fsb1-oam-ip + compute_FSB1_name: + - get_input: fsb1-name service_template_filter: substitute_service_template: Nested_FSB1ServiceTemplate.yaml count: 1 @@ -1253,20 +1253,6 @@ topology_template: properties: port_FSB_OAM_network_role_tag: - oam - port_FSB2_Internal2_mac_requirements: - - mac_count_required: - is_required: true - port_FSB_OAM_mac_requirements: - - mac_count_required: - is_required: false - port_FSB2_Internal2_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_FSB2_Internal2_network: - - Internal2-net vm_flavor_name: get_input: fsb2-flavor compute_FSB2_availability_zone: @@ -1287,18 +1273,32 @@ topology_template: - get_input: fsb2-name port_FSB2_Internal1_mac_address: - get_input: fsb2-Internal1-mac - port_FSB_OAM_fixed_ips: - - - ip_address: - get_input: fsb2-oam-ip - port_FSB2_Internal1_mac_requirements: - - mac_count_required: - is_required: true port_FSB_OAM_network: - get_input: oam_net_id port_FSB2_Internal1_network: - Internal1-net port_FSB2_Internal2_mac_address: - get_input: fsb2-Internal2-mac + port_FSB2_Internal2_mac_requirements: + - mac_count_required: + is_required: true + port_FSB_OAM_mac_requirements: + - mac_count_required: + is_required: false + port_FSB2_Internal2_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_FSB2_Internal2_network: + - Internal2-net + port_FSB_OAM_fixed_ips: + - - ip_address: + get_input: fsb2-oam-ip + port_FSB2_Internal1_mac_requirements: + - mac_count_required: + is_required: true service_template_filter: substitute_service_template: Nested_FSB2ServiceTemplate.yaml count: 1 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 4331ecaa03..42ba1a647f 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 @@ -26,6 +26,79 @@ topology_template: 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: list + required: true + entry_schema: + type: string + port_FSB_OAM_ip_requirements: + type: list + required: true + entry_schema: + type: json + 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: list + required: true + entry_schema: + type: json + 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: json + 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: + type: list + required: true + entry_schema: + type: string + port_FSB1_Internal1_network_role_tag: + type: list + required: true + entry_schema: + type: string + port_FSB_OAM_subnetpoolid: + type: list + required: true + entry_schema: + type: string port_FSB_OAM_mac_requirements: type: list required: true @@ -36,6 +109,11 @@ topology_template: 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 @@ -43,24 +121,21 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_FSB1_Internal1_network: + port_FSB_OAM_order: type: list required: true entry_schema: - type: string - vm_flavor_name: - type: string - required: true - port_FSB1_Internal2_mac_address: + type: integer + port_FSB1_Internal1_network_role: type: list required: true entry_schema: type: string - port_FSB_OAM_ip_requirements: + port_FSB1_Internal2_network_role_tag: type: list required: true entry_schema: - type: json + type: string port_FSB1_Internal2_mac_requirements: type: list required: true @@ -71,43 +146,77 @@ topology_template: required: true entry_schema: type: json + port_FSB1_Internal2_order: + type: list + required: true + entry_schema: + type: integer port_FSB_OAM_fixed_ips: type: list required: true entry_schema: type: json - compute_FSB1_name: + port_FSB1_Internal1_exCP_naming: type: list required: true entry_schema: - type: string - port_FSB1_Internal1_mac_requirements: + type: json + port_FSB_OAM_exCP_naming: type: list required: true entry_schema: type: json - port_FSB1_Internal1_ip_requirements: + compute_FSB1_name: + type: list + required: true + entry_schema: + type: string + port_FSB1_Internal2_exCP_naming: type: list required: true entry_schema: type: json - port_FSB_OAM_network: + port_FSB1_Internal2_vlan_requirements: type: list required: true entry_schema: - type: string + type: json 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 - index_value + network_role_tag: + get_input: + - port_FSB1_Internal2_network_role_tag + - index_value mac_requirements: get_input: - port_FSB1_Internal2_mac_requirements - index_value + 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 + - index_value network: get_input: - port_FSB1_Internal2_network @@ -124,14 +233,38 @@ 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 - index_value + network_role_tag: + get_input: + - port_FSB1_Internal1_network_role_tag + - index_value mac_requirements: get_input: - port_FSB1_Internal1_mac_requirements - index_value + 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 + - index_value network: get_input: - port_FSB1_Internal1_network @@ -148,6 +281,14 @@ 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: + get_input: + - port_FSB_OAM_vlan_requirements + - index_value ip_requirements: get_input: - port_FSB_OAM_ip_requirements @@ -160,6 +301,18 @@ topology_template: get_input: - port_FSB_OAM_mac_requirements - index_value + order: + get_input: + - port_FSB_OAM_order + - index_value + network_role: + get_input: + - port_FSB_OAM_network_role + - index_value + subnetpoolid: + get_input: + - port_FSB_OAM_subnetpoolid + - index_value fixed_ips: get_input: - port_FSB_OAM_fixed_ips 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 a4d2f79275..a71818c237 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 @@ -16,6 +16,94 @@ topology_template: required: true entry_schema: type: string + 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: json + port_FSB2_Internal1_ip_requirements: + type: list + required: true + entry_schema: + type: json + 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: list + required: true + entry_schema: + type: string + 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: + type: list + required: true + entry_schema: + type: string + port_FSB2_Internal2_mac_address: + type: list + required: true + entry_schema: + type: string + port_FSB_OAM_subnetpoolid: + type: list + required: true + entry_schema: + type: string port_FSB2_Internal2_mac_requirements: type: list required: true @@ -38,35 +126,32 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_FSB2_Internal2_network: + port_FSB_OAM_order: type: list required: true entry_schema: - type: string - vm_flavor_name: - type: string - required: true - compute_FSB2_availability_zone: + type: integer + port_FSB2_Internal2_network: type: list required: true entry_schema: type: string - port_FSB_OAM_ip_requirements: + port_FSB2_Internal2_vlan_requirements: type: list required: true entry_schema: type: json - port_FSB2_Internal1_ip_requirements: + port_FSB2_Internal1_order: type: list required: true entry_schema: - type: json - compute_FSB2_name: + type: integer + port_FSB2_Internal2_subnetpoolid: type: list required: true entry_schema: type: string - port_FSB2_Internal1_mac_address: + port_FSB2_Internal1_network_role_tag: type: list required: true entry_schema: @@ -81,25 +166,33 @@ topology_template: required: true entry_schema: type: json - port_FSB_OAM_network: + port_FSB2_Internal2_order: type: list required: true entry_schema: - type: string - port_FSB2_Internal1_network: + type: integer + port_FSB2_Internal1_subnetpoolid: type: list required: true entry_schema: type: string - port_FSB2_Internal2_mac_address: + port_FSB_OAM_exCP_naming: type: list required: true entry_schema: - type: string + type: json 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: + get_input: + - port_FSB_OAM_vlan_requirements + - index_value ip_requirements: get_input: - port_FSB_OAM_ip_requirements @@ -112,6 +205,18 @@ topology_template: get_input: - port_FSB_OAM_mac_requirements - index_value + order: + get_input: + - port_FSB_OAM_order + - index_value + network_role: + get_input: + - port_FSB_OAM_network_role + - index_value + subnetpoolid: + get_input: + - port_FSB_OAM_subnetpoolid + - index_value fixed_ips: get_input: - port_FSB_OAM_fixed_ips @@ -141,14 +246,38 @@ 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 - index_value + network_role_tag: + get_input: + - port_FSB2_Internal2_network_role_tag + - index_value mac_requirements: get_input: - port_FSB2_Internal2_mac_requirements - index_value + 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 + - index_value network: get_input: - port_FSB2_Internal2_network @@ -165,14 +294,38 @@ 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 - index_value + network_role_tag: + get_input: + - port_FSB2_Internal1_network_role_tag + - index_value mac_requirements: get_input: - port_FSB2_Internal1_mac_requirements - index_value + 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 + - index_value network: get_input: - port_FSB2_Internal1_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/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 b8e6141f9b..04066334b2 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,19 +11,12 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_GPB1_Internal2_network: + port_GPB1_Internal1_network_role: 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_network_role: type: list required: true entry_schema: @@ -36,25 +29,25 @@ topology_template: vm_flavor_name: type: string required: true - port_GPB1_Internal2_mac_requirements: - type: list - required: true - entry_schema: - type: json - port_GPB1_Internal1_mac_address: + port_GPB1_Internal2_mac_address: type: list required: true entry_schema: type: string - port_GPB1_Internal2_mac_address: + port_GPB1_Internal1_order: type: list required: true entry_schema: - type: string + type: integer vm_image_name: type: string required: true - port_GPB1_Internal1_ip_requirements: + port_GPB1_Internal1_vlan_requirements: + type: list + required: true + entry_schema: + type: json + port_GPB1_Internal2_exCP_naming: type: list required: true entry_schema: @@ -69,11 +62,78 @@ topology_template: 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: json + port_GPB1_Internal2_vlan_requirements: + type: list + required: true + entry_schema: + type: json + port_GPB1_Internal1_network_role_tag: + type: list + required: true + entry_schema: + type: string + port_GPB1_Internal2_network: + 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: + type: list + required: true + entry_schema: + type: string + port_GPB1_Internal2_mac_requirements: + type: list + required: true + entry_schema: + type: json + port_GPB1_Internal1_mac_address: + type: list + required: true + entry_schema: + type: string + port_GPB1_Internal1_subnetpoolid: + type: list + required: true + entry_schema: + type: string + port_GPB1_Internal2_subnetpoolid: + type: list + required: true + entry_schema: + type: string + port_GPB1_Internal2_network_role_tag: + type: list + required: true + entry_schema: + type: string + port_GPB1_Internal1_ip_requirements: + type: list + required: true + entry_schema: + type: json + port_GPB1_Internal2_order: + type: list + required: true + entry_schema: + type: integer node_templates: GPB1: type: org.openecomp.resource.vfc.nodes.heat.GPB1 @@ -93,14 +153,38 @@ 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 - index_value + network_role_tag: + get_input: + - port_GPB1_Internal1_network_role_tag + - index_value mac_requirements: get_input: - port_GPB1_Internal1_mac_requirements - index_value + 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 + - index_value network: get_input: - port_GPB1_Internal1_network @@ -117,14 +201,38 @@ 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 - index_value + network_role_tag: + get_input: + - port_GPB1_Internal2_network_role_tag + - index_value mac_requirements: get_input: - port_GPB1_Internal2_mac_requirements - index_value + 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 + - index_value network: get_input: - port_GPB1_Internal2_network 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 3598778212..64a239a2a5 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,6 +11,62 @@ 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: json + 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: + type: list + required: true + entry_schema: + type: string + port_GPB2_Internal2_subnetpoolid: + type: list + required: true + entry_schema: + type: string port_GPB2_Internal2_mac_address: type: list required: true @@ -26,7 +82,7 @@ topology_template: required: true entry_schema: type: json - port_GPB2_Internal1_network: + port_GPB2_Internal2_network_role: type: list required: true entry_schema: @@ -43,23 +99,27 @@ topology_template: required: true entry_schema: type: string - vm_flavor_name: - type: string + port_GPB2_Internal2_exCP_naming: + type: list + required: true + entry_schema: + type: json + port_GPB2_Internal1_order: + type: list required: true + entry_schema: + type: integer port_GPB2_Internal1_mac_requirements: type: list required: true entry_schema: type: json - port_GPB2_Internal2_ip_requirements: + port_GPB2_Internal1_exCP_naming: type: list required: true entry_schema: type: json - vm_image_name: - type: string - required: true - compute_GPB2_name: + port_GPB2_Internal1_network_role_tag: type: list required: true entry_schema: @@ -78,14 +138,38 @@ 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 - index_value + network_role_tag: + get_input: + - port_GPB2_Internal2_network_role_tag + - index_value mac_requirements: get_input: - port_GPB2_Internal2_mac_requirements - index_value + 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 + - index_value network: get_input: - port_GPB2_Internal2_network @@ -102,14 +186,38 @@ 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 - index_value + network_role_tag: + get_input: + - port_GPB2_Internal1_network_role_tag + - index_value mac_requirements: get_input: - port_GPB2_Internal1_mac_requirements - index_value + 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 + - index_value network: get_input: - port_GPB2_Internal1_network 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 f0a3aaf507..c41603b6bd 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,6 +11,67 @@ 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: list + required: true + entry_schema: + type: json + 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: json + 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: + type: list + required: true + entry_schema: + type: string port_NCB1_Internal2_mac_address: type: list required: true @@ -28,25 +89,27 @@ topology_template: required: true entry_schema: type: string - port_NCB1_Internal1_ip_requirements: + port_NCB1_Internal1_order: type: list required: true entry_schema: - type: json - vm_flavor_name: - type: string + type: integer + port_NCB1_Internal2_exCP_naming: + type: list required: true - compute_NCB1_name: + entry_schema: + type: json + port_NCB1_Internal1_ip_requirements: type: list required: true entry_schema: - type: string - port_NCB1_Internal1_mac_requirements: + type: json + port_NCB1_Internal1_vlan_requirements: type: list required: true entry_schema: type: json - port_NCB1_Internal2_mac_requirements: + port_NCB1_Internal1_mac_requirements: type: list required: true entry_schema: @@ -61,14 +124,11 @@ topology_template: required: true entry_schema: type: string - vm_image_name: - type: string - required: true - port_NCB1_Internal2_ip_requirements: + port_NCB1_Internal2_network_role_tag: type: list required: true entry_schema: - type: json + type: string port_NCB1_Internal2_network: type: list required: true @@ -93,14 +153,38 @@ 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 - index_value + network_role_tag: + get_input: + - port_NCB1_Internal1_network_role_tag + - index_value mac_requirements: get_input: - port_NCB1_Internal1_mac_requirements - index_value + 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 + - index_value network: get_input: - port_NCB1_Internal1_network @@ -117,14 +201,38 @@ 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 - index_value + network_role_tag: + get_input: + - port_NCB1_Internal2_network_role_tag + - index_value mac_requirements: get_input: - port_NCB1_Internal2_mac_requirements - index_value + 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 + - index_value network: get_input: - port_NCB1_Internal2_network 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 7cfca623fa..3ff3a61c8e 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,6 +11,52 @@ 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: list + required: true + entry_schema: + type: json + port_NCB2_Internal1_mac_requirements: + type: list + required: true + entry_schema: + type: json + 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 @@ -23,30 +69,22 @@ topology_template: required: true entry_schema: type: string - compute_NCB2_availability_zone: - type: list - required: true - entry_schema: - type: string port_NCB2_Internal2_ip_requirements: type: list required: true entry_schema: type: json - vm_flavor_name: - type: string - required: true - port_NCB2_Internal2_mac_requirements: + port_NCB2_Internal2_network_role_tag: type: list required: true entry_schema: - type: json + type: string port_NCB2_Internal2_network: type: list required: true entry_schema: type: string - port_NCB2_Internal1_mac_requirements: + port_NCB2_Internal2_vlan_requirements: type: list required: true entry_schema: @@ -61,14 +99,36 @@ topology_template: required: true entry_schema: type: string - vm_image_name: - type: string + port_NCB2_Internal1_subnetpoolid: + type: list + required: true + entry_schema: + type: string + port_NCB2_Internal1_network_role_tag: + type: list + required: true + entry_schema: + type: string + port_NCB2_Internal2_order: + type: list required: true + entry_schema: + type: integer compute_NCB2_name: type: list required: true entry_schema: type: string + port_NCB2_Internal1_vlan_requirements: + type: list + required: true + entry_schema: + type: json + port_NCB2_Internal2_subnetpoolid: + type: list + required: true + entry_schema: + type: string port_NCB2_Internal1_ip_requirements: type: list required: true @@ -93,14 +153,38 @@ 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 - index_value + network_role_tag: + get_input: + - port_NCB2_Internal1_network_role_tag + - index_value mac_requirements: get_input: - port_NCB2_Internal1_mac_requirements - index_value + 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 + - index_value network: get_input: - port_NCB2_Internal1_network @@ -117,14 +201,38 @@ 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 - index_value + network_role_tag: + get_input: + - port_NCB2_Internal2_network_role_tag + - index_value mac_requirements: get_input: - port_NCB2_Internal2_mac_requirements - index_value + 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 + - index_value network: get_input: - port_NCB2_Internal2_network 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 3fbc173efe..d1f52d6035 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 @@ -16,16 +16,11 @@ topology_template: required: true entry_schema: type: string - port_VLC1_Internal1_network: - type: list - required: true - entry_schema: - type: string - port_VLC_SCTP_A_network: + port_VLC_GTP_exCP_naming: type: list required: true entry_schema: - type: string + type: json port_VLC_OAM_network_role_tag: type: list required: true @@ -41,6 +36,16 @@ topology_template: required: true entry_schema: type: json + 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: list required: true @@ -64,6 +69,134 @@ topology_template: required: true entry_schema: type: json + 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: + type: list + required: true + entry_schema: + type: string + port_VLC1_Internal1_network_role_tag: + type: list + required: true + entry_schema: + type: string + port_VLC_GTP_network: + 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: list + required: true + entry_schema: + type: json + 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: + type: list + required: true + entry_schema: + type: string + port_VLC_GTP_vlan_requirements: + type: list + required: true + entry_schema: + type: json + port_VLC_GTP_fixed_ips: + type: list + required: true + entry_schema: + type: json + 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: json + port_VLC1_Internal1_network: + type: list + required: true + entry_schema: + type: string + port_VLC_SCTP_A_network: + type: list + required: true + entry_schema: + type: string + port_VLC_SCTP_A_vlan_requirements: + type: list + required: true + entry_schema: + type: json + port_VLC1_Internal1_network_role: + 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: + type: list + required: true + entry_schema: + type: json + port_VLC_OAM_vlan_requirements: + type: list + required: true + entry_schema: + type: json port_VLC_OAM_ip_requirements: type: list required: true @@ -79,29 +212,56 @@ topology_template: required: true entry_schema: type: json - vm_image_name: - type: string + 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 + required: true + entry_schema: + type: string port_VLC_SCTP_A_ip_requirements: type: list required: true entry_schema: type: json - port_VLC_SCTP_B_network: + port_VLC_SCTP_A_subnetpoolid: type: list required: true entry_schema: type: string - port_VLC_GTP_network: + compute_VLC1_availability_zone: type: list required: true entry_schema: type: string - compute_VLC1_availability_zone: + port_VLC_OAM_subnetpoolid: + type: list + required: true + entry_schema: + type: string + port_VLC_SCTP_B_network_role_tag: 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 @@ -109,68 +269,107 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_VLC1_Internal1_mac_requirements: + port_VLC1_Internal2_mac_requirements: type: list required: true entry_schema: type: json - port_VLC1_Internal2_mac_requirements: + port_VLC_SCTP_B_subnetpoolid: type: list required: true entry_schema: - type: json + type: string port_VLC_SCTP_B_fixed_ips: type: list required: true entry_schema: type: json + 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_VLC_GTP_mac_requirements: type: list required: true entry_schema: type: json - port_VLC_GTP_fixed_ips: + port_VLC_OAM_mac_requirements: type: list required: true entry_schema: type: json - port_VLC_OAM_mac_requirements: + port_VLC1_Internal1_exCP_naming: type: list required: true entry_schema: type: json - port_VLC_OAM_network: + port_VLC_SCTP_B_mac_requirements: type: list required: true entry_schema: - type: string - compute_VLC1_name: + 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_VLC_SCTP_B_mac_requirements: + port_VLC_SCTP_B_vlan_requirements: type: list required: true entry_schema: type: json - port_VLC1_Internal2_ip_requirements: + port_VLC_SCTP_B_network_role: type: list required: true entry_schema: - type: json + type: string 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 - index_value + network_role_tag: + get_input: + - port_VLC_SCTP_B_network_role_tag + - index_value mac_requirements: get_input: - port_VLC_SCTP_B_mac_requirements - index_value + order: + get_input: + - port_VLC_SCTP_B_order + - index_value + network_role: + get_input: + - port_VLC_SCTP_B_network_role + - index_value + subnetpoolid: + get_input: + - port_VLC_SCTP_B_subnetpoolid + - index_value fixed_ips: get_input: - port_VLC_SCTP_B_fixed_ips @@ -187,14 +386,38 @@ 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 - index_value + network_role_tag: + get_input: + - port_VLC1_Internal2_network_role_tag + - index_value mac_requirements: get_input: - port_VLC1_Internal2_mac_requirements - index_value + 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 + - index_value network: get_input: - port_VLC1_Internal2_network @@ -211,14 +434,38 @@ 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 - index_value + network_role_tag: + get_input: + - port_VLC1_Internal1_network_role_tag + - index_value mac_requirements: get_input: - port_VLC1_Internal1_mac_requirements - index_value + 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 + - index_value network: get_input: - port_VLC1_Internal1_network @@ -235,6 +482,14 @@ 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: + get_input: + - port_VLC_OAM_vlan_requirements + - index_value ip_requirements: get_input: - port_VLC_OAM_ip_requirements @@ -247,6 +502,18 @@ topology_template: get_input: - port_VLC_OAM_mac_requirements - index_value + order: + get_input: + - port_VLC_OAM_order + - index_value + network_role: + get_input: + - port_VLC_OAM_network_role + - index_value + subnetpoolid: + get_input: + - port_VLC_OAM_subnetpoolid + - index_value fixed_ips: get_input: - port_VLC_OAM_fixed_ips @@ -263,14 +530,38 @@ 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 - index_value + network_role_tag: + get_input: + - port_VLC_SCTP_A_network_role_tag + - index_value mac_requirements: get_input: - port_VLC_SCTP_A_mac_requirements - index_value + order: + get_input: + - port_VLC_SCTP_A_order + - index_value + network_role: + get_input: + - port_VLC_SCTP_A_network_role + - index_value + subnetpoolid: + get_input: + - port_VLC_SCTP_A_subnetpoolid + - index_value fixed_ips: get_input: - port_VLC_SCTP_A_fixed_ips @@ -302,14 +593,38 @@ 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 - index_value + network_role_tag: + get_input: + - port_VLC_GTP_network_role_tag + - index_value mac_requirements: get_input: - port_VLC_GTP_mac_requirements - index_value + order: + get_input: + - port_VLC_GTP_order + - index_value + network_role: + get_input: + - port_VLC_GTP_network_role + - index_value + subnetpoolid: + get_input: + - port_VLC_GTP_subnetpoolid + - index_value fixed_ips: get_input: - port_VLC_GTP_fixed_ips 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 cb60cfcff3..75b8246a49 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,11 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_VLC_SCTP_A_network: + port_VLC_GTP_exCP_naming: type: list required: true entry_schema: - type: string + type: json port_VLC_OAM_network_role_tag: type: list required: true @@ -49,21 +49,21 @@ topology_template: required: true entry_schema: type: json - port_VLC_OAM_ip_requirements: + port_VLC2_Internal1_network_role_tag: type: list required: true entry_schema: - type: json + type: string port_VLC2_Internal2_mac_address: type: list required: true entry_schema: type: string - port_VLC_OAM_fixed_ips: + port_VLC_GTP_network_role_tag: type: list required: true entry_schema: - type: json + type: string vm_image_name: type: string required: true @@ -82,31 +82,151 @@ topology_template: required: true entry_schema: type: json - port_VLC_SCTP_A_ip_requirements: + 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: json - port_VLC_SCTP_B_network: + 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_network: + port_VLC_GTP_vlan_requirements: + type: list + required: true + entry_schema: + type: json + port_VLC_GTP_fixed_ips: + type: list + required: true + entry_schema: + type: json + port_VLC_OAM_network: type: list required: true entry_schema: type: string - port_VLC2_Internal1_ip_requirements: + port_VLC2_Internal2_network: + type: list + required: true + entry_schema: + type: string + port_VLC_SCTP_A_network: + 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: + type: list + required: true + entry_schema: + type: json + port_VLC_OAM_ip_requirements: + type: list + required: true + entry_schema: + type: json + port_VLC_OAM_fixed_ips: type: list required: true entry_schema: type: json + port_VLC2_Internal1_order: + type: list + required: true + entry_schema: + type: integer + port_VLC_OAM_network_role: + type: list + required: true + entry_schema: + type: string + port_VLC_SCTP_A_ip_requirements: + type: list + required: true + entry_schema: + type: json + port_VLC2_Internal2_vlan_requirements: + type: list + required: true + entry_schema: + type: json + port_VLC_SCTP_A_subnetpoolid: + type: list + required: true + entry_schema: + type: string + port_VLC_OAM_subnetpoolid: + type: list + required: true + entry_schema: + type: string + port_VLC_SCTP_B_network_role_tag: + type: list + required: true + entry_schema: + type: string 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 @@ -114,11 +234,36 @@ 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: json + 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: list + required: true + entry_schema: + type: integer port_VLC_GTP_mac_requirements: type: list required: true @@ -134,7 +279,7 @@ topology_template: required: true entry_schema: type: string - port_VLC_GTP_fixed_ips: + port_VLC2_Internal1_exCP_naming: type: list required: true entry_schema: @@ -144,7 +289,12 @@ topology_template: required: true entry_schema: type: json - port_VLC_OAM_network: + port_VLC2_Internal1_vlan_requirements: + type: list + required: true + entry_schema: + type: json + port_VLC2_Internal2_subnetpoolid: type: list required: true entry_schema: @@ -154,7 +304,32 @@ topology_template: required: true entry_schema: type: json - port_VLC2_Internal2_network: + 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: list required: true entry_schema: @@ -163,14 +338,38 @@ 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 - index_value + network_role_tag: + get_input: + - port_VLC2_Internal2_network_role_tag + - index_value mac_requirements: get_input: - port_VLC2_Internal2_mac_requirements - index_value + 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 + - index_value network: get_input: - port_VLC2_Internal2_network @@ -187,6 +386,14 @@ 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: + get_input: + - port_VLC_OAM_vlan_requirements + - index_value ip_requirements: get_input: - port_VLC_OAM_ip_requirements @@ -199,6 +406,18 @@ topology_template: get_input: - port_VLC_OAM_mac_requirements - index_value + order: + get_input: + - port_VLC_OAM_order + - index_value + network_role: + get_input: + - port_VLC_OAM_network_role + - index_value + subnetpoolid: + get_input: + - port_VLC_OAM_subnetpoolid + - index_value fixed_ips: get_input: - port_VLC_OAM_fixed_ips @@ -215,14 +434,38 @@ 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 - index_value + network_role_tag: + get_input: + - port_VLC2_Internal1_network_role_tag + - index_value mac_requirements: get_input: - port_VLC2_Internal1_mac_requirements - index_value + 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 + - index_value network: get_input: - port_VLC2_Internal1_network @@ -239,14 +482,38 @@ 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 - index_value + network_role_tag: + get_input: + - port_VLC_SCTP_A_network_role_tag + - index_value mac_requirements: get_input: - port_VLC_SCTP_A_mac_requirements - index_value + order: + get_input: + - port_VLC_SCTP_A_order + - index_value + network_role: + get_input: + - port_VLC_SCTP_A_network_role + - index_value + subnetpoolid: + get_input: + - port_VLC_SCTP_A_subnetpoolid + - index_value fixed_ips: get_input: - port_VLC_SCTP_A_fixed_ips @@ -263,14 +530,38 @@ 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 - index_value + network_role_tag: + get_input: + - port_VLC_SCTP_B_network_role_tag + - index_value mac_requirements: get_input: - port_VLC_SCTP_B_mac_requirements - index_value + order: + get_input: + - port_VLC_SCTP_B_order + - index_value + network_role: + get_input: + - port_VLC_SCTP_B_network_role + - index_value + subnetpoolid: + get_input: + - port_VLC_SCTP_B_subnetpoolid + - index_value fixed_ips: get_input: - port_VLC_SCTP_B_fixed_ips @@ -287,14 +578,38 @@ 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 - index_value + network_role_tag: + get_input: + - port_VLC_GTP_network_role_tag + - index_value mac_requirements: get_input: - port_VLC_GTP_mac_requirements - index_value + order: + get_input: + - port_VLC_GTP_order + - index_value + network_role: + get_input: + - port_VLC_GTP_network_role + - index_value + subnetpoolid: + get_input: + - port_VLC_GTP_subnetpoolid + - index_value fixed_ips: get_input: - port_VLC_GTP_fixed_ips |