diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf')
10 files changed, 301 insertions, 653 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 d53617ed8d..0b1b45b112 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -9,11 +9,9 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_FSB_OAM_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB2_Internal2_network_role_tag: type: list required: true @@ -53,13 +51,13 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB2_Internal1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB2_Internal1_network_role: type: list required: true @@ -79,11 +77,9 @@ node_types: entry_schema: type: string port_FSB2_Internal1_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB2_Internal1_vlan_requirements: type: list required: true @@ -109,11 +105,9 @@ node_types: entry_schema: type: string port_FSB2_Internal2_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB_OAM_subnetpoolid: type: list required: true @@ -121,23 +115,19 @@ node_types: entry_schema: type: string port_FSB2_Internal2_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_FSB_OAM_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_FSB2_Internal2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -187,13 +177,11 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_FSB2_Internal1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_FSB2_Internal2_order: type: list required: true @@ -714,29 +702,25 @@ node_types: entry_schema: type: json port_VLC_OAM_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_VLC_GTP_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC2_Internal2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC_SCTP_A_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -746,13 +730,13 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC_SCTP_A_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_VLC2_Internal1_network_role_tag: type: list required: true @@ -760,11 +744,9 @@ node_types: entry_schema: type: string port_VLC2_Internal2_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_VLC_GTP_network_role_tag: type: list required: true @@ -776,23 +758,17 @@ node_types: required: true status: SUPPORTED port_VLC2_Internal1_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_VLC2_Internal2_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_VLC2_Internal1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_VLC_SCTP_B_network: type: list required: true @@ -810,7 +786,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC_GTP_order: type: list required: true @@ -840,7 +816,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_VLC_OAM_network: type: list required: true @@ -894,13 +870,13 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC_OAM_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_VLC2_Internal1_order: type: list required: true @@ -918,7 +894,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC2_Internal2_vlan_requirements: type: list required: true @@ -992,7 +968,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_VLC_GTP_network_role: type: list required: true @@ -1012,11 +988,9 @@ node_types: entry_schema: type: integer port_VLC_GTP_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_VLC2_Internal1_network: type: list required: true @@ -1036,11 +1010,9 @@ node_types: entry_schema: type: json port_VLC_OAM_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_VLC2_Internal1_vlan_requirements: type: list required: true @@ -1054,11 +1026,9 @@ node_types: entry_schema: type: string port_VLC_SCTP_B_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_VLC2_Internal2_exCP_naming: type: list required: true @@ -1853,11 +1823,9 @@ node_types: entry_schema: type: string port_NCB1_Internal2_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json vm_image_name: type: string required: true @@ -1873,7 +1841,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_NCB1_Internal1_exCP_naming: type: list required: true @@ -1899,11 +1867,9 @@ node_types: entry_schema: type: string port_NCB1_Internal2_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -1913,11 +1879,9 @@ node_types: constraints: - greater_or_equal: 0 port_NCB1_Internal1_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_NCB1_Internal1_order: type: list required: true @@ -1935,7 +1899,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_NCB1_Internal1_vlan_requirements: type: list required: true @@ -1943,11 +1907,9 @@ node_types: entry_schema: type: json port_NCB1_Internal1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_NCB1_Internal1_network: type: list required: true @@ -2400,17 +2362,13 @@ node_types: required: true status: SUPPORTED port_NCB2_Internal2_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_NCB2_Internal1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json vm_image_name: type: string required: true @@ -2464,7 +2422,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_NCB2_Internal2_network_role_tag: type: list required: true @@ -2484,17 +2442,13 @@ node_types: entry_schema: type: json port_NCB2_Internal1_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_NCB2_Internal2_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_NCB2_Internal1_subnetpoolid: type: list required: true @@ -2536,7 +2490,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements requirements: - dependency_NCB2: capability: tosca.capabilities.Node @@ -2987,7 +2941,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true @@ -3023,23 +2977,19 @@ node_types: entry_schema: type: string port_GPB2_Internal2_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_GPB2_Internal2_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_GPB2_Internal1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_GPB2_Internal2_network_role: type: list required: true @@ -3073,11 +3023,9 @@ node_types: entry_schema: type: integer port_GPB2_Internal1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_GPB2_Internal1_exCP_naming: type: list required: true @@ -3091,11 +3039,9 @@ node_types: entry_schema: type: string port_GPB2_Internal1_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_GPB2_Internal2_network: type: list required: true @@ -3520,11 +3466,9 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_VLC1_Internal2_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_VLC_GTP_exCP_naming: type: list required: true @@ -3532,23 +3476,19 @@ node_types: entry_schema: type: json port_VLC_OAM_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_VLC1_Internal1_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_VLC_GTP_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC1_Internal2_exCP_naming: type: list required: true @@ -3562,11 +3502,9 @@ node_types: entry_schema: type: string port_VLC_SCTP_A_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -3582,13 +3520,13 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC_SCTP_A_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_VLC1_Internal2_network_role_tag: type: list required: true @@ -3642,11 +3580,9 @@ node_types: entry_schema: type: json port_VLC1_Internal1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_VLC1_Internal1_vlan_requirements: type: list required: true @@ -3676,7 +3612,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_VLC_OAM_network: type: list required: true @@ -3694,7 +3630,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC1_Internal1_network: type: list required: true @@ -3748,19 +3684,19 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC1_Internal1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC_OAM_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_VLC1_Internal2_vlan_requirements: type: list required: true @@ -3790,7 +3726,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC_SCTP_A_subnetpoolid: type: list required: true @@ -3830,11 +3766,9 @@ node_types: constraints: - greater_or_equal: 0 port_VLC1_Internal2_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_VLC_SCTP_B_subnetpoolid: type: list required: true @@ -3846,7 +3780,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_VLC_GTP_network_role: type: list required: true @@ -3860,17 +3794,13 @@ node_types: entry_schema: type: string port_VLC_GTP_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_VLC_OAM_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_VLC1_Internal1_exCP_naming: type: list required: true @@ -3878,11 +3808,9 @@ node_types: entry_schema: type: json port_VLC_SCTP_B_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_VLC_SCTP_B_order: type: list required: true @@ -4637,17 +4565,13 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_FSB1_Internal1_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB_OAM_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB1_Internal2_network: type: list required: true @@ -4671,17 +4595,15 @@ node_types: entry_schema: type: json port_FSB1_Internal2_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB_OAM_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal1_subnetpoolid: type: list required: true @@ -4695,11 +4617,9 @@ node_types: entry_schema: type: string port_FSB1_Internal1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_FSB_OAM_network_role: type: list required: true @@ -4711,7 +4631,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal1_order: type: list required: true @@ -4743,11 +4663,9 @@ node_types: entry_schema: type: string port_FSB_OAM_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json compute_FSB1_availability_zone: type: list required: true @@ -4787,17 +4705,15 @@ node_types: entry_schema: type: string port_FSB1_Internal2_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_FSB1_Internal2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal2_order: type: list required: true @@ -4809,7 +4725,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_FSB1_Internal1_exCP_naming: type: list required: true @@ -5358,11 +5274,9 @@ node_types: required: true status: SUPPORTED port_GPB1_Internal2_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_GPB1_Internal1_order: type: list required: true @@ -5386,11 +5300,9 @@ node_types: entry_schema: type: json port_GPB1_Internal1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json compute_GPB1_availability_zone: type: list required: true @@ -5408,7 +5320,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_GPB1_Internal2_vlan_requirements: type: list required: true @@ -5442,17 +5354,13 @@ node_types: entry_schema: type: string port_GPB1_Internal2_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_GPB1_Internal1_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_GPB1_Internal1_subnetpoolid: type: list required: true @@ -5476,7 +5384,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_GPB1_Internal2_order: type: list required: true @@ -5896,4 +5804,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED 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 8ae59dca18..25470e4630 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,7 @@ topology_template: directives: - substitutable properties: - port_VLC_OAM_network_role_tag: - - oam + port_VLC_OAM_network_role_tag: oam port_VLC_GTP_ip_requirements: - - ip_version: 4 ip_count_required: @@ -642,7 +641,7 @@ topology_template: floating_ip_count_required: is_required: false port_VLC_SCTP_A_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false vm_flavor_name: get_input: vlc-flavor @@ -656,16 +655,16 @@ topology_template: - - ip_address: get_input: vlc2-sctp-a-ip port_VLC2_Internal2_mac_address: - - get_input: vlc2-Internal2-mac + get_input: vlc2-Internal1-mac vm_image_name: get_input: pxe-image port_VLC2_Internal1_mac_address: - - get_input: vlc2-Internal1-mac + get_input: vlc2-Internal1-mac port_VLC2_Internal2_mac_requirements: - - mac_count_required: + mac_count_required: is_required: true port_VLC2_Internal1_mac_requirements: - - mac_count_required: + mac_count_required: is_required: true port_VLC_SCTP_B_network: - epc-sctp-b-net @@ -707,17 +706,17 @@ topology_template: - - ip_address: get_input: vlc2-sctp-b-ip port_VLC_GTP_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false port_VLC2_Internal1_network: - Internal1-net compute_VLC2_availability_zone: - get_input: vlc_zone port_VLC_OAM_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false port_VLC_SCTP_B_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false service_template_filter: substitute_service_template: Nested_VLC2ServiceTemplate.yaml @@ -754,11 +753,10 @@ topology_template: - substitutable properties: port_VLC1_Internal2_mac_address: - - get_input: vlc1-Internal2-mac - port_VLC_OAM_network_role_tag: - - oam + get_input: vlc1-Internal1-mac + port_VLC_OAM_network_role_tag: oam port_VLC1_Internal1_mac_address: - - get_input: vlc1-Internal1-mac + get_input: vlc1-Internal1-mac port_VLC_GTP_ip_requirements: - - ip_version: 4 ip_count_required: @@ -766,7 +764,7 @@ topology_template: floating_ip_count_required: is_required: false port_VLC_SCTP_A_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false vm_flavor_name: get_input: vlc-flavor @@ -788,7 +786,7 @@ topology_template: port_VLC_GTP_network: - epc-gtp-net port_VLC1_Internal1_mac_requirements: - - mac_count_required: + mac_count_required: is_required: true port_VLC_GTP_fixed_ips: - - ip_address: @@ -831,19 +829,19 @@ topology_template: compute_VLC1_availability_zone: - get_input: vlc_zone port_VLC1_Internal2_mac_requirements: - - mac_count_required: + mac_count_required: is_required: true port_VLC_SCTP_B_fixed_ips: - - ip_address: get_input: vlc1-sctp-b-ip port_VLC_GTP_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false port_VLC_OAM_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false port_VLC_SCTP_B_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false service_template_filter: substitute_service_template: Nested_VLC1ServiceTemplate.yaml @@ -905,11 +903,11 @@ topology_template: vm_flavor_name: get_input: gpb-flavor port_GPB1_Internal2_mac_address: - - get_input: gpb1-Internal2-mac + get_input: gpb1-Internal1-mac vm_image_name: get_input: pxe-image port_GPB1_Internal1_mac_requirements: - - mac_count_required: + mac_count_required: is_required: true compute_GPB1_availability_zone: - get_input: gpb_zone @@ -924,10 +922,10 @@ topology_template: port_GPB1_Internal1_network: - Internal1-net port_GPB1_Internal2_mac_requirements: - - mac_count_required: + mac_count_required: is_required: true port_GPB1_Internal1_mac_address: - - get_input: gpb1-Internal1-mac + get_input: gpb1-Internal1-mac port_GPB1_Internal1_ip_requirements: - - ip_version: 4 ip_count_required: @@ -971,9 +969,9 @@ topology_template: compute_GPB2_name: - get_input: gpb2-name port_GPB2_Internal2_mac_address: - - get_input: gpb2-Internal2-mac + get_input: gpb2-Internal1-mac port_GPB2_Internal2_mac_requirements: - - mac_count_required: + mac_count_required: is_required: true port_GPB2_Internal1_ip_requirements: - - ip_version: 4 @@ -984,10 +982,10 @@ topology_template: compute_GPB2_availability_zone: - get_input: gpb_zone port_GPB2_Internal1_mac_requirements: - - mac_count_required: + mac_count_required: is_required: true port_GPB2_Internal1_mac_address: - - get_input: gpb2-Internal1-mac + get_input: gpb2-Internal1-mac port_GPB2_Internal2_network: - Internal2-net service_template_filter: @@ -1056,7 +1054,7 @@ topology_template: compute_NCB1_name: - get_input: ncb1-name port_NCB1_Internal2_mac_requirements: - - mac_count_required: + mac_count_required: is_required: true vm_image_name: get_input: pxe-image @@ -1067,9 +1065,9 @@ topology_template: floating_ip_count_required: is_required: false port_NCB1_Internal2_mac_address: - - get_input: ncb1-Internal2-mac + get_input: ncb1-Internal1-mac port_NCB1_Internal1_mac_address: - - get_input: ncb1-Internal1-mac + get_input: ncb1-Internal1-mac port_NCB1_Internal1_ip_requirements: - - ip_version: 4 ip_count_required: @@ -1077,7 +1075,7 @@ topology_template: floating_ip_count_required: is_required: false port_NCB1_Internal1_mac_requirements: - - mac_count_required: + mac_count_required: is_required: true port_NCB1_Internal1_network: - Internal1-net @@ -1112,10 +1110,10 @@ topology_template: vm_flavor_name: get_input: ncb-flavor port_NCB2_Internal2_mac_requirements: - - mac_count_required: + mac_count_required: is_required: true port_NCB2_Internal1_mac_requirements: - - mac_count_required: + mac_count_required: is_required: true vm_image_name: get_input: pxe-image @@ -1130,9 +1128,9 @@ topology_template: port_NCB2_Internal2_network: - Internal2-net port_NCB2_Internal1_mac_address: - - get_input: ncb2-Internal1-mac + get_input: ncb2-Internal1-mac port_NCB2_Internal2_mac_address: - - get_input: ncb2-Internal2-mac + get_input: ncb2-Internal1-mac compute_NCB2_name: - get_input: ncb2-name port_NCB2_Internal1_ip_requirements: @@ -1182,9 +1180,8 @@ topology_template: - substitutable properties: port_FSB1_Internal1_mac_address: - - get_input: fsb1-Internal1-mac - port_FSB_OAM_network_role_tag: - - oam + get_input: fsb1-Internal1-mac + port_FSB_OAM_network_role_tag: oam port_FSB1_Internal2_network: - Internal2-net port_FSB1_Internal1_network: @@ -1192,7 +1189,7 @@ topology_template: vm_flavor_name: get_input: fsb1-flavor port_FSB1_Internal2_mac_address: - - get_input: fsb1-Internal2-mac + get_input: fsb1-Internal1-mac port_FSB_OAM_ip_requirements: - - ip_version: 4 ip_count_required: @@ -1200,7 +1197,7 @@ topology_template: floating_ip_count_required: is_required: false port_FSB1_Internal1_mac_requirements: - - mac_count_required: + mac_count_required: is_required: true port_FSB1_Internal1_ip_requirements: - - ip_version: 4 @@ -1211,12 +1208,12 @@ topology_template: port_FSB_OAM_network: - get_input: oam_net_id port_FSB_OAM_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false compute_FSB1_availability_zone: - get_input: fsb_zone port_FSB1_Internal2_mac_requirements: - - mac_count_required: + mac_count_required: is_required: true port_FSB1_Internal2_ip_requirements: - - ip_version: 4 @@ -1251,8 +1248,7 @@ topology_template: directives: - substitutable properties: - port_FSB_OAM_network_role_tag: - - oam + port_FSB_OAM_network_role_tag: oam vm_flavor_name: get_input: fsb2-flavor compute_FSB2_availability_zone: @@ -1272,18 +1268,18 @@ topology_template: compute_FSB2_name: - get_input: fsb2-name port_FSB2_Internal1_mac_address: - - get_input: fsb2-Internal1-mac + get_input: fsb2-Internal1-mac 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 + get_input: fsb2-Internal1-mac port_FSB2_Internal2_mac_requirements: - - mac_count_required: + mac_count_required: is_required: true port_FSB_OAM_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false port_FSB2_Internal2_ip_requirements: - - ip_version: 4 @@ -1297,7 +1293,7 @@ topology_template: - - ip_address: get_input: fsb2-oam-ip port_FSB2_Internal1_mac_requirements: - - mac_count_required: + mac_count_required: is_required: true service_template_filter: substitute_service_template: Nested_FSB2ServiceTemplate.yaml 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 42ba1a647f..a9acfcc5c3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB1ServiceTemplate.yaml @@ -12,15 +12,11 @@ node_types: topology_template: inputs: port_FSB1_Internal1_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_FSB_OAM_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_FSB1_Internal2_network: type: list required: true @@ -40,15 +36,13 @@ topology_template: entry_schema: type: json port_FSB1_Internal2_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_FSB_OAM_ip_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal1_subnetpoolid: type: list required: true @@ -60,10 +54,8 @@ topology_template: entry_schema: type: string port_FSB1_Internal1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_FSB_OAM_network_role: type: list required: true @@ -73,7 +65,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal1_order: type: list required: true @@ -100,10 +92,8 @@ topology_template: entry_schema: type: string port_FSB_OAM_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json compute_FSB1_availability_zone: type: list required: true @@ -137,15 +127,13 @@ topology_template: entry_schema: type: string port_FSB1_Internal2_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_FSB1_Internal2_ip_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal2_order: type: list required: true @@ -155,7 +143,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_FSB1_Internal1_exCP_naming: type: list required: true @@ -194,17 +182,13 @@ topology_template: - port_FSB1_Internal2_vlan_requirements - index_value ip_requirements: - get_input: - - port_FSB1_Internal2_ip_requirements - - index_value + get_input: port_FSB1_Internal2_ip_requirements network_role_tag: get_input: - port_FSB1_Internal2_network_role_tag - index_value mac_requirements: - get_input: - - port_FSB1_Internal2_mac_requirements - - index_value + get_input: port_FSB1_Internal2_mac_requirements order: get_input: - port_FSB1_Internal2_order @@ -222,9 +206,7 @@ topology_template: - port_FSB1_Internal2_network - index_value mac_address: - get_input: - - port_FSB1_Internal2_mac_address - - index_value + get_input: port_FSB1_Internal2_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -242,17 +224,13 @@ topology_template: - port_FSB1_Internal1_vlan_requirements - index_value ip_requirements: - get_input: - - port_FSB1_Internal1_ip_requirements - - index_value + get_input: port_FSB1_Internal1_ip_requirements network_role_tag: get_input: - port_FSB1_Internal1_network_role_tag - index_value mac_requirements: - get_input: - - port_FSB1_Internal1_mac_requirements - - index_value + get_input: port_FSB1_Internal1_mac_requirements order: get_input: - port_FSB1_Internal1_order @@ -270,9 +248,7 @@ topology_template: - port_FSB1_Internal1_network - index_value mac_address: - get_input: - - port_FSB1_Internal1_mac_address - - index_value + get_input: port_FSB1_Internal1_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -290,17 +266,11 @@ topology_template: - port_FSB_OAM_vlan_requirements - index_value ip_requirements: - get_input: - - port_FSB_OAM_ip_requirements - - index_value + get_input: port_FSB_OAM_ip_requirements network_role_tag: - get_input: - - port_FSB_OAM_network_role_tag - - index_value + get_input: port_FSB_OAM_network_role_tag mac_requirements: - get_input: - - port_FSB_OAM_mac_requirements - - index_value + get_input: port_FSB_OAM_mac_requirements order: get_input: - port_FSB_OAM_order @@ -314,9 +284,7 @@ topology_template: - port_FSB_OAM_subnetpoolid - index_value fixed_ips: - get_input: - - port_FSB_OAM_fixed_ips - - index_value + get_input: port_FSB_OAM_fixed_ips network: get_input: - port_FSB_OAM_network @@ -588,4 +556,4 @@ topology_template: - dependency link_FSB1_FSB_OAM: - FSB1_FSB_OAM - - link
\ No newline at end of file + - link 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 a71818c237..24b75d7835 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB2ServiceTemplate.yaml @@ -12,10 +12,8 @@ node_types: topology_template: inputs: port_FSB_OAM_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_FSB2_Internal2_network_role_tag: type: list required: true @@ -48,12 +46,12 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB2_Internal1_ip_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB2_Internal1_network_role: type: list required: true @@ -70,10 +68,8 @@ topology_template: entry_schema: type: string port_FSB2_Internal1_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_FSB2_Internal1_vlan_requirements: type: list required: true @@ -95,30 +91,24 @@ topology_template: entry_schema: type: string port_FSB2_Internal2_mac_address: - type: list + type: string 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 + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_FSB_OAM_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_FSB2_Internal2_ip_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -160,12 +150,10 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_FSB2_Internal1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_FSB2_Internal2_order: type: list required: true @@ -194,17 +182,11 @@ topology_template: - port_FSB_OAM_vlan_requirements - index_value ip_requirements: - get_input: - - port_FSB_OAM_ip_requirements - - index_value + get_input: port_FSB_OAM_ip_requirements network_role_tag: - get_input: - - port_FSB_OAM_network_role_tag - - index_value + get_input: port_FSB_OAM_network_role_tag mac_requirements: - get_input: - - port_FSB_OAM_mac_requirements - - index_value + get_input: port_FSB_OAM_mac_requirements order: get_input: - port_FSB_OAM_order @@ -218,9 +200,7 @@ topology_template: - port_FSB_OAM_subnetpoolid - index_value fixed_ips: - get_input: - - port_FSB_OAM_fixed_ips - - index_value + get_input: port_FSB_OAM_fixed_ips network: get_input: - port_FSB_OAM_network @@ -255,17 +235,13 @@ topology_template: - port_FSB2_Internal2_vlan_requirements - index_value ip_requirements: - get_input: - - port_FSB2_Internal2_ip_requirements - - index_value + get_input: port_FSB2_Internal2_ip_requirements network_role_tag: get_input: - port_FSB2_Internal2_network_role_tag - index_value mac_requirements: - get_input: - - port_FSB2_Internal2_mac_requirements - - index_value + get_input: port_FSB2_Internal2_mac_requirements order: get_input: - port_FSB2_Internal2_order @@ -283,9 +259,7 @@ topology_template: - port_FSB2_Internal2_network - index_value mac_address: - get_input: - - port_FSB2_Internal2_mac_address - - index_value + get_input: port_FSB2_Internal2_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -303,17 +277,13 @@ topology_template: - port_FSB2_Internal1_vlan_requirements - index_value ip_requirements: - get_input: - - port_FSB2_Internal1_ip_requirements - - index_value + get_input: port_FSB2_Internal1_ip_requirements network_role_tag: get_input: - port_FSB2_Internal1_network_role_tag - index_value mac_requirements: - get_input: - - port_FSB2_Internal1_mac_requirements - - index_value + get_input: port_FSB2_Internal1_mac_requirements order: get_input: - port_FSB2_Internal1_order @@ -331,9 +301,7 @@ topology_template: - port_FSB2_Internal1_network - index_value mac_address: - get_input: - - port_FSB2_Internal1_mac_address - - index_value + get_input: port_FSB2_Internal1_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -588,4 +556,4 @@ topology_template: - local_storage link_FSB2_FSB2_Internal2: - FSB2_FSB2_Internal2 - - link
\ No newline at end of file + - link 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 04066334b2..6b23277221 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 @@ -30,10 +30,8 @@ topology_template: type: string required: true port_GPB1_Internal2_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_GPB1_Internal1_order: type: list required: true @@ -53,10 +51,8 @@ topology_template: entry_schema: type: json port_GPB1_Internal1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json compute_GPB1_availability_zone: type: list required: true @@ -71,7 +67,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_GPB1_Internal2_vlan_requirements: type: list required: true @@ -100,15 +96,11 @@ topology_template: entry_schema: type: string port_GPB1_Internal2_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_GPB1_Internal1_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_GPB1_Internal1_subnetpoolid: type: list required: true @@ -128,7 +120,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_GPB1_Internal2_order: type: list required: true @@ -162,17 +154,13 @@ topology_template: - port_GPB1_Internal1_vlan_requirements - index_value ip_requirements: - get_input: - - port_GPB1_Internal1_ip_requirements - - index_value + get_input: port_GPB1_Internal1_ip_requirements network_role_tag: get_input: - port_GPB1_Internal1_network_role_tag - index_value mac_requirements: - get_input: - - port_GPB1_Internal1_mac_requirements - - index_value + get_input: port_GPB1_Internal1_mac_requirements order: get_input: - port_GPB1_Internal1_order @@ -190,9 +178,7 @@ topology_template: - port_GPB1_Internal1_network - index_value mac_address: - get_input: - - port_GPB1_Internal1_mac_address - - index_value + get_input: port_GPB1_Internal1_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -210,17 +196,13 @@ topology_template: - port_GPB1_Internal2_vlan_requirements - index_value ip_requirements: - get_input: - - port_GPB1_Internal2_ip_requirements - - index_value + get_input: port_GPB1_Internal2_ip_requirements network_role_tag: get_input: - port_GPB1_Internal2_network_role_tag - index_value mac_requirements: - get_input: - - port_GPB1_Internal2_mac_requirements - - index_value + get_input: port_GPB1_Internal2_mac_requirements order: get_input: - port_GPB1_Internal2_order @@ -238,9 +220,7 @@ topology_template: - port_GPB1_Internal2_network - index_value mac_address: - get_input: - - port_GPB1_Internal2_mac_address - - index_value + get_input: port_GPB1_Internal2_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -456,4 +436,4 @@ topology_template: - local_storage link_GPB1_GPB1_Internal1: - GPB1_GPB1_Internal1 - - link
\ No newline at end of file + - link 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 64a239a2a5..133d43efe2 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 @@ -38,7 +38,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true @@ -68,20 +68,16 @@ topology_template: entry_schema: type: string port_GPB2_Internal2_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_GPB2_Internal2_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_GPB2_Internal1_ip_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_GPB2_Internal2_network_role: type: list required: true @@ -110,10 +106,8 @@ topology_template: entry_schema: type: integer port_GPB2_Internal1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_GPB2_Internal1_exCP_naming: type: list required: true @@ -125,10 +119,8 @@ topology_template: entry_schema: type: string port_GPB2_Internal1_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_GPB2_Internal2_network: type: list required: true @@ -147,17 +139,13 @@ topology_template: - port_GPB2_Internal2_vlan_requirements - index_value ip_requirements: - get_input: - - port_GPB2_Internal2_ip_requirements - - index_value + get_input: port_GPB2_Internal2_ip_requirements network_role_tag: get_input: - port_GPB2_Internal2_network_role_tag - index_value mac_requirements: - get_input: - - port_GPB2_Internal2_mac_requirements - - index_value + get_input: port_GPB2_Internal2_mac_requirements order: get_input: - port_GPB2_Internal2_order @@ -175,9 +163,7 @@ topology_template: - port_GPB2_Internal2_network - index_value mac_address: - get_input: - - port_GPB2_Internal2_mac_address - - index_value + get_input: port_GPB2_Internal2_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -195,17 +181,13 @@ topology_template: - port_GPB2_Internal1_vlan_requirements - index_value ip_requirements: - get_input: - - port_GPB2_Internal1_ip_requirements - - index_value + get_input: port_GPB2_Internal1_ip_requirements network_role_tag: get_input: - port_GPB2_Internal1_network_role_tag - index_value mac_requirements: - get_input: - - port_GPB2_Internal1_mac_requirements - - index_value + get_input: port_GPB2_Internal1_mac_requirements order: get_input: - port_GPB2_Internal1_order @@ -223,9 +205,7 @@ topology_template: - port_GPB2_Internal1_network - index_value mac_address: - get_input: - - port_GPB2_Internal1_mac_address - - index_value + get_input: port_GPB2_Internal1_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -456,4 +436,4 @@ topology_template: - dependency dependency_GPB2_GPB2_Internal1: - GPB2_GPB2_Internal1 - - dependency
\ No newline at end of file + - dependency 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 c41603b6bd..2da2afc1ba 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 @@ -35,10 +35,8 @@ topology_template: entry_schema: type: string port_NCB1_Internal2_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json vm_image_name: type: string required: true @@ -51,7 +49,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_NCB1_Internal1_exCP_naming: type: list required: true @@ -73,10 +71,8 @@ topology_template: entry_schema: type: string port_NCB1_Internal2_mac_address: - type: list + type: string required: true - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -85,10 +81,8 @@ topology_template: constraints: - greater_or_equal: 0 port_NCB1_Internal1_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_NCB1_Internal1_order: type: list required: true @@ -103,17 +97,15 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_NCB1_Internal1_vlan_requirements: type: list required: true entry_schema: type: json port_NCB1_Internal1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_NCB1_Internal1_network: type: list required: true @@ -162,17 +154,13 @@ topology_template: - port_NCB1_Internal1_vlan_requirements - index_value ip_requirements: - get_input: - - port_NCB1_Internal1_ip_requirements - - index_value + get_input: port_NCB1_Internal1_ip_requirements network_role_tag: get_input: - port_NCB1_Internal1_network_role_tag - index_value mac_requirements: - get_input: - - port_NCB1_Internal1_mac_requirements - - index_value + get_input: port_NCB1_Internal1_mac_requirements order: get_input: - port_NCB1_Internal1_order @@ -190,9 +178,7 @@ topology_template: - port_NCB1_Internal1_network - index_value mac_address: - get_input: - - port_NCB1_Internal1_mac_address - - index_value + get_input: port_NCB1_Internal1_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -210,17 +196,13 @@ topology_template: - port_NCB1_Internal2_vlan_requirements - index_value ip_requirements: - get_input: - - port_NCB1_Internal2_ip_requirements - - index_value + get_input: port_NCB1_Internal2_ip_requirements network_role_tag: get_input: - port_NCB1_Internal2_network_role_tag - index_value mac_requirements: - get_input: - - port_NCB1_Internal2_mac_requirements - - index_value + get_input: port_NCB1_Internal2_mac_requirements order: get_input: - port_NCB1_Internal2_order @@ -238,9 +220,7 @@ topology_template: - port_NCB1_Internal2_network - index_value mac_address: - get_input: - - port_NCB1_Internal2_mac_address - - index_value + get_input: port_NCB1_Internal2_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -456,4 +436,4 @@ topology_template: - dependency dependency_NCB1_NCB1_Internal2: - NCB1_NCB1_Internal2 - - dependency
\ No newline at end of file + - dependency 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 3ff3a61c8e..bdc13693f5 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 @@ -20,15 +20,11 @@ topology_template: type: string required: true port_NCB2_Internal2_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_NCB2_Internal1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json vm_image_name: type: string required: true @@ -73,7 +69,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_NCB2_Internal2_network_role_tag: type: list required: true @@ -90,15 +86,11 @@ topology_template: entry_schema: type: json port_NCB2_Internal1_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_NCB2_Internal2_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_NCB2_Internal1_subnetpoolid: type: list required: true @@ -133,7 +125,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements node_templates: NCB2: type: org.openecomp.resource.vfc.nodes.heat.NCB2 @@ -162,17 +154,13 @@ topology_template: - port_NCB2_Internal1_vlan_requirements - index_value ip_requirements: - get_input: - - port_NCB2_Internal1_ip_requirements - - index_value + get_input: port_NCB2_Internal1_ip_requirements network_role_tag: get_input: - port_NCB2_Internal1_network_role_tag - index_value mac_requirements: - get_input: - - port_NCB2_Internal1_mac_requirements - - index_value + get_input: port_NCB2_Internal1_mac_requirements order: get_input: - port_NCB2_Internal1_order @@ -190,9 +178,7 @@ topology_template: - port_NCB2_Internal1_network - index_value mac_address: - get_input: - - port_NCB2_Internal1_mac_address - - index_value + get_input: port_NCB2_Internal1_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -210,17 +196,13 @@ topology_template: - port_NCB2_Internal2_vlan_requirements - index_value ip_requirements: - get_input: - - port_NCB2_Internal2_ip_requirements - - index_value + get_input: port_NCB2_Internal2_ip_requirements network_role_tag: get_input: - port_NCB2_Internal2_network_role_tag - index_value mac_requirements: - get_input: - - port_NCB2_Internal2_mac_requirements - - index_value + get_input: port_NCB2_Internal2_mac_requirements order: get_input: - port_NCB2_Internal2_order @@ -238,9 +220,7 @@ topology_template: - port_NCB2_Internal2_network - index_value mac_address: - get_input: - - port_NCB2_Internal2_mac_address - - index_value + get_input: port_NCB2_Internal2_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -456,4 +436,4 @@ topology_template: - link dependency_NCB2: - NCB2 - - dependency
\ No newline at end of file + - dependency 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 d1f52d6035..9f5a49cea9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_VLC1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_VLC1ServiceTemplate.yaml @@ -12,30 +12,24 @@ node_types: topology_template: inputs: port_VLC1_Internal2_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_VLC_GTP_exCP_naming: type: list required: true entry_schema: type: json port_VLC_OAM_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_VLC1_Internal1_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_VLC_GTP_ip_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC1_Internal2_exCP_naming: type: list required: true @@ -47,10 +41,8 @@ topology_template: entry_schema: type: string port_VLC_SCTP_A_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -63,12 +55,12 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC_SCTP_A_fixed_ips: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_VLC1_Internal2_network_role_tag: type: list required: true @@ -113,10 +105,8 @@ topology_template: entry_schema: type: json port_VLC1_Internal1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_VLC1_Internal1_vlan_requirements: type: list required: true @@ -141,7 +131,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_VLC_OAM_network: type: list required: true @@ -156,7 +146,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC1_Internal1_network: type: list required: true @@ -201,17 +191,17 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC1_Internal1_ip_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC_OAM_fixed_ips: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_VLC1_Internal2_vlan_requirements: type: list required: true @@ -236,7 +226,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC_SCTP_A_subnetpoolid: type: list required: true @@ -270,10 +260,8 @@ topology_template: constraints: - greater_or_equal: 0 port_VLC1_Internal2_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_VLC_SCTP_B_subnetpoolid: type: list required: true @@ -283,7 +271,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_VLC_GTP_network_role: type: list required: true @@ -295,25 +283,19 @@ topology_template: entry_schema: type: string port_VLC_GTP_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_VLC_OAM_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_VLC1_Internal1_exCP_naming: type: list required: true entry_schema: type: json port_VLC_SCTP_B_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_VLC_SCTP_B_order: type: list required: true @@ -347,17 +329,13 @@ topology_template: - port_VLC_SCTP_B_vlan_requirements - index_value ip_requirements: - get_input: - - port_VLC_SCTP_B_ip_requirements - - index_value + get_input: port_VLC_SCTP_B_ip_requirements 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 + get_input: port_VLC_SCTP_B_mac_requirements order: get_input: - port_VLC_SCTP_B_order @@ -371,9 +349,7 @@ topology_template: - port_VLC_SCTP_B_subnetpoolid - index_value fixed_ips: - get_input: - - port_VLC_SCTP_B_fixed_ips - - index_value + get_input: port_VLC_SCTP_B_fixed_ips network: get_input: - port_VLC_SCTP_B_network @@ -395,17 +371,13 @@ topology_template: - port_VLC1_Internal2_vlan_requirements - index_value ip_requirements: - get_input: - - port_VLC1_Internal2_ip_requirements - - index_value + get_input: port_VLC1_Internal2_ip_requirements network_role_tag: get_input: - port_VLC1_Internal2_network_role_tag - index_value mac_requirements: - get_input: - - port_VLC1_Internal2_mac_requirements - - index_value + get_input: port_VLC1_Internal2_mac_requirements order: get_input: - port_VLC1_Internal2_order @@ -423,9 +395,7 @@ topology_template: - port_VLC1_Internal2_network - index_value mac_address: - get_input: - - port_VLC1_Internal2_mac_address - - index_value + get_input: port_VLC1_Internal2_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -443,17 +413,13 @@ topology_template: - port_VLC1_Internal1_vlan_requirements - index_value ip_requirements: - get_input: - - port_VLC1_Internal1_ip_requirements - - index_value + get_input: port_VLC1_Internal1_ip_requirements network_role_tag: get_input: - port_VLC1_Internal1_network_role_tag - index_value mac_requirements: - get_input: - - port_VLC1_Internal1_mac_requirements - - index_value + get_input: port_VLC1_Internal1_mac_requirements order: get_input: - port_VLC1_Internal1_order @@ -471,9 +437,7 @@ topology_template: - port_VLC1_Internal1_network - index_value mac_address: - get_input: - - port_VLC1_Internal1_mac_address - - index_value + get_input: port_VLC1_Internal1_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -491,17 +455,11 @@ topology_template: - port_VLC_OAM_vlan_requirements - index_value ip_requirements: - get_input: - - port_VLC_OAM_ip_requirements - - index_value + get_input: port_VLC_OAM_ip_requirements network_role_tag: - get_input: - - port_VLC_OAM_network_role_tag - - index_value + get_input: port_VLC_OAM_network_role_tag mac_requirements: - get_input: - - port_VLC_OAM_mac_requirements - - index_value + get_input: port_VLC_OAM_mac_requirements order: get_input: - port_VLC_OAM_order @@ -515,9 +473,7 @@ topology_template: - port_VLC_OAM_subnetpoolid - index_value fixed_ips: - get_input: - - port_VLC_OAM_fixed_ips - - index_value + get_input: port_VLC_OAM_fixed_ips network: get_input: - port_VLC_OAM_network @@ -539,17 +495,13 @@ topology_template: - port_VLC_SCTP_A_vlan_requirements - index_value ip_requirements: - get_input: - - port_VLC_SCTP_A_ip_requirements - - index_value + get_input: port_VLC_SCTP_A_ip_requirements 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 + get_input: port_VLC_SCTP_A_mac_requirements order: get_input: - port_VLC_SCTP_A_order @@ -563,9 +515,7 @@ topology_template: - port_VLC_SCTP_A_subnetpoolid - index_value fixed_ips: - get_input: - - port_VLC_SCTP_A_fixed_ips - - index_value + get_input: port_VLC_SCTP_A_fixed_ips network: get_input: - port_VLC_SCTP_A_network @@ -602,17 +552,13 @@ topology_template: - port_VLC_GTP_vlan_requirements - index_value ip_requirements: - get_input: - - port_VLC_GTP_ip_requirements - - index_value + get_input: port_VLC_GTP_ip_requirements network_role_tag: get_input: - port_VLC_GTP_network_role_tag - index_value mac_requirements: - get_input: - - port_VLC_GTP_mac_requirements - - index_value + get_input: port_VLC_GTP_mac_requirements order: get_input: - port_VLC_GTP_order @@ -626,9 +572,7 @@ topology_template: - port_VLC_GTP_subnetpoolid - index_value fixed_ips: - get_input: - - port_VLC_GTP_fixed_ips - - index_value + get_input: port_VLC_GTP_fixed_ips network: get_input: - port_VLC_GTP_network @@ -1004,4 +948,4 @@ topology_template: - dependency dependency_VLC1_VLC_SCTP_A: - VLC1_VLC_SCTP_A - - dependency
\ No newline at end of file + - dependency 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 75b8246a49..0254ce3d48 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 @@ -17,25 +17,21 @@ topology_template: entry_schema: type: json port_VLC_OAM_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_VLC_GTP_ip_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC2_Internal2_ip_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC_SCTP_A_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -43,22 +39,20 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC_SCTP_A_fixed_ips: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_VLC2_Internal1_network_role_tag: type: list required: true entry_schema: type: string port_VLC2_Internal2_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_VLC_GTP_network_role_tag: type: list required: true @@ -68,20 +62,14 @@ topology_template: type: string required: true port_VLC2_Internal1_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_VLC2_Internal2_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_VLC2_Internal1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_VLC_SCTP_B_network: type: list required: true @@ -96,7 +84,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC_GTP_order: type: list required: true @@ -121,7 +109,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_VLC_OAM_network: type: list required: true @@ -166,12 +154,12 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC_OAM_fixed_ips: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_VLC2_Internal1_order: type: list required: true @@ -186,7 +174,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC2_Internal2_vlan_requirements: type: list required: true @@ -248,7 +236,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_VLC_GTP_network_role: type: list required: true @@ -265,10 +253,8 @@ topology_template: entry_schema: type: integer port_VLC_GTP_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_VLC2_Internal1_network: type: list required: true @@ -285,10 +271,8 @@ topology_template: entry_schema: type: json port_VLC_OAM_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_VLC2_Internal1_vlan_requirements: type: list required: true @@ -300,10 +284,8 @@ topology_template: entry_schema: type: string port_VLC_SCTP_B_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_VLC2_Internal2_exCP_naming: type: list required: true @@ -347,17 +329,13 @@ topology_template: - port_VLC2_Internal2_vlan_requirements - index_value ip_requirements: - get_input: - - port_VLC2_Internal2_ip_requirements - - index_value + get_input: port_VLC2_Internal2_ip_requirements network_role_tag: get_input: - port_VLC2_Internal2_network_role_tag - index_value mac_requirements: - get_input: - - port_VLC2_Internal2_mac_requirements - - index_value + get_input: port_VLC2_Internal2_mac_requirements order: get_input: - port_VLC2_Internal2_order @@ -375,9 +353,7 @@ topology_template: - port_VLC2_Internal2_network - index_value mac_address: - get_input: - - port_VLC2_Internal2_mac_address - - index_value + get_input: port_VLC2_Internal2_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -395,17 +371,11 @@ topology_template: - port_VLC_OAM_vlan_requirements - index_value ip_requirements: - get_input: - - port_VLC_OAM_ip_requirements - - index_value + get_input: port_VLC_OAM_ip_requirements network_role_tag: - get_input: - - port_VLC_OAM_network_role_tag - - index_value + get_input: port_VLC_OAM_network_role_tag mac_requirements: - get_input: - - port_VLC_OAM_mac_requirements - - index_value + get_input: port_VLC_OAM_mac_requirements order: get_input: - port_VLC_OAM_order @@ -419,9 +389,7 @@ topology_template: - port_VLC_OAM_subnetpoolid - index_value fixed_ips: - get_input: - - port_VLC_OAM_fixed_ips - - index_value + get_input: port_VLC_OAM_fixed_ips network: get_input: - port_VLC_OAM_network @@ -443,17 +411,13 @@ topology_template: - port_VLC2_Internal1_vlan_requirements - index_value ip_requirements: - get_input: - - port_VLC2_Internal1_ip_requirements - - index_value + get_input: port_VLC2_Internal1_ip_requirements network_role_tag: get_input: - port_VLC2_Internal1_network_role_tag - index_value mac_requirements: - get_input: - - port_VLC2_Internal1_mac_requirements - - index_value + get_input: port_VLC2_Internal1_mac_requirements order: get_input: - port_VLC2_Internal1_order @@ -471,9 +435,7 @@ topology_template: - port_VLC2_Internal1_network - index_value mac_address: - get_input: - - port_VLC2_Internal1_mac_address - - index_value + get_input: port_VLC2_Internal1_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -491,17 +453,13 @@ topology_template: - port_VLC_SCTP_A_vlan_requirements - index_value ip_requirements: - get_input: - - port_VLC_SCTP_A_ip_requirements - - index_value + get_input: port_VLC_SCTP_A_ip_requirements 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 + get_input: port_VLC_SCTP_A_mac_requirements order: get_input: - port_VLC_SCTP_A_order @@ -515,9 +473,7 @@ topology_template: - port_VLC_SCTP_A_subnetpoolid - index_value fixed_ips: - get_input: - - port_VLC_SCTP_A_fixed_ips - - index_value + get_input: port_VLC_SCTP_A_fixed_ips network: get_input: - port_VLC_SCTP_A_network @@ -539,17 +495,13 @@ topology_template: - port_VLC_SCTP_B_vlan_requirements - index_value ip_requirements: - get_input: - - port_VLC_SCTP_B_ip_requirements - - index_value + get_input: port_VLC_SCTP_B_ip_requirements 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 + get_input: port_VLC_SCTP_B_mac_requirements order: get_input: - port_VLC_SCTP_B_order @@ -563,9 +515,7 @@ topology_template: - port_VLC_SCTP_B_subnetpoolid - index_value fixed_ips: - get_input: - - port_VLC_SCTP_B_fixed_ips - - index_value + get_input: port_VLC_SCTP_B_fixed_ips network: get_input: - port_VLC_SCTP_B_network @@ -587,17 +537,13 @@ topology_template: - port_VLC_GTP_vlan_requirements - index_value ip_requirements: - get_input: - - port_VLC_GTP_ip_requirements - - index_value + get_input: port_VLC_GTP_ip_requirements network_role_tag: get_input: - port_VLC_GTP_network_role_tag - index_value mac_requirements: - get_input: - - port_VLC_GTP_mac_requirements - - index_value + get_input: port_VLC_GTP_mac_requirements order: get_input: - port_VLC_GTP_order @@ -611,9 +557,7 @@ topology_template: - port_VLC_GTP_subnetpoolid - index_value fixed_ips: - get_input: - - port_VLC_GTP_fixed_ips - - index_value + get_input: port_VLC_GTP_fixed_ips network: get_input: - port_VLC_GTP_network @@ -1004,4 +948,4 @@ topology_template: - dependency dependency_VLC2_VLC_GTP: - VLC2_VLC_GTP - - dependency
\ No newline at end of file + - dependency |