diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup')
10 files changed, 138 insertions, 61 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/GlobalSubstitutionTypesServiceTemplate.yaml index 61f7cc7fbf..97718e0f5a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -68,15 +68,6 @@ node_types: status: SUPPORTED entry_schema: type: string - untrusted_num_vn: - type: float - description: Number of vDBE subinterface virtual Networks - required: true - status: SUPPORTED - constraints: - - in_range: - - 1 - - 77 port_vdbe_untr_port_order: type: integer required: true @@ -161,6 +152,18 @@ node_types: status: SUPPORTED entry_schema: type: string + subinterface_vdbe_untr_2_subports_service_template_filter_count: + type: list + required: true + status: SUPPORTED + entry_schema: + type: float + subinterface_vdbe_untr_1_subports_service_template_filter_count: + type: list + required: true + status: SUPPORTED + entry_schema: + type: float subinterface_vdbe_untr_1_subports_vn_network_list: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/MainServiceTemplate.yaml index f09a44335d..e7c838afe1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/MainServiceTemplate.yaml @@ -86,6 +86,23 @@ topology_template: param_name: vdbe_aap_untrusted_ip_prefix_len type: string description: ip prefix length for the primary vDBE VM on the VAN untrusted network + untrusted_num_vn: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: untrusted_num_vn + type: float + description: Number of vDBE subinterface virtual Networks + constraints: + - in_range: + - 1 + - 77 aap_address_mode: hidden: false immutable: false @@ -451,6 +468,10 @@ topology_template: is_required: false subinterface_vdbe_untr_1_subports_parent_interface: - vdbe_1_untr_port_1 + subinterface_vdbe_untr_2_subports_service_template_filter_count: + - 5 + subinterface_vdbe_untr_1_subports_service_template_filter_count: + - get_input: untrusted_num_vn subinterface_vdbe_untr_1_subports_vn_network_list: - get_input: untrusted_vn_networks port_vdbe_untr_port_name: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/Nested_vdbeServiceTemplate.yaml index b0ccbfac70..c5e13a106c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/Nested_vdbeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/Nested_vdbeServiceTemplate.yaml @@ -60,15 +60,6 @@ topology_template: required: true entry_schema: type: string - untrusted_num_vn: - hidden: false - immutable: false - type: float - description: Number of vDBE subinterface virtual Networks - constraints: - - in_range: - - 1 - - 77 port_vdbe_untr_port_order: type: integer required: true @@ -138,6 +129,16 @@ topology_template: required: true entry_schema: type: string + subinterface_vdbe_untr_2_subports_service_template_filter_count: + type: list + required: true + entry_schema: + type: float + subinterface_vdbe_untr_1_subports_service_template_filter_count: + type: list + required: true + entry_schema: + type: float subinterface_vdbe_untr_1_subports_vn_network_list: type: list required: true @@ -272,9 +273,11 @@ topology_template: - subinterface_vdbe_untr_1_subports_aap_address_mode - index_value service_template_filter: - substitute_service_template: nestedServiceTemplate.yaml count: - get_input: untrusted_num_vn + get_input: + - subinterface_vdbe_untr_1_subports_service_template_filter_count + - index_value + substitute_service_template: nestedServiceTemplate.yaml mandatory: false aap_untrusted_v6_ip_prefix: get_input: @@ -351,8 +354,11 @@ topology_template: - subinterface_vdbe_untr_2_subports_aap_address_mode - index_value service_template_filter: + count: + get_input: + - subinterface_vdbe_untr_2_subports_service_template_filter_count + - index_value substitute_service_template: nestedServiceTemplate.yaml - count: 5 mandatory: true aap_untrusted_v6_ip_prefix: get_input: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml index f61a83ec87..8088898fbb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -40,6 +40,12 @@ node_types: status: SUPPORTED entry_schema: type: string + subinterface_nested_service_template_filter_count: + type: list + required: true + status: SUPPORTED + entry_schema: + type: float subinterface_nested_aap_untrusted_v6_ip_prefix_len: type: list required: true @@ -50,15 +56,6 @@ node_types: type: string required: true status: SUPPORTED - untrusted_num_vn: - type: float - description: Number of vDBE subinterface virtual Networks - required: true - status: SUPPORTED - constraints: - - in_range: - - 1 - - 77 port_vdbe_untr_port_order: type: integer required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml index 56f3113e61..69c79c3e42 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml @@ -86,6 +86,23 @@ topology_template: param_name: vdbe_aap_untrusted_ip_prefix_len type: string description: ip prefix length for the primary vDBE VM on the VAN untrusted network + untrusted_num_vn: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: untrusted_num_vn + type: float + description: Number of vDBE subinterface virtual Networks + constraints: + - in_range: + - 1 + - 77 aap_address_mode: hidden: false immutable: false @@ -396,6 +413,8 @@ topology_template: - get_input: untrusted_vlan_tags compute_vdbe_availability_zone: - get_input: availability_zone_1 + subinterface_nested_service_template_filter_count: + - get_input: untrusted_num_vn subinterface_nested_aap_untrusted_v6_ip_prefix_len: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len vm_flavor_name: @@ -496,6 +515,8 @@ topology_template: - get_input: untrusted_vlan_tags compute_vdbe_availability_zone: - get_input: availability_zone_1 + subinterface_nested_service_template_filter_count: + - 5 subinterface_nested_aap_untrusted_v6_ip_prefix_len: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len vm_flavor_name: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml index 7b4ca1b63d..16381420bd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml @@ -37,6 +37,11 @@ topology_template: required: true entry_schema: type: string + subinterface_nested_service_template_filter_count: + type: list + required: true + entry_schema: + type: float subinterface_nested_aap_untrusted_v6_ip_prefix_len: type: list required: true @@ -45,15 +50,6 @@ topology_template: vm_flavor_name: type: string required: true - untrusted_num_vn: - hidden: false - immutable: false - type: float - description: Number of vDBE subinterface virtual Networks - constraints: - - in_range: - - 1 - - 77 port_vdbe_untr_port_order: type: integer required: true @@ -243,8 +239,11 @@ topology_template: - subinterface_nested_aap_address_mode - index_value service_template_filter: + count: + get_input: + - subinterface_nested_service_template_filter_count + - index_value substitute_service_template: nestedServiceTemplate.yaml - count: 5 mandatory: true aap_untrusted_v6_ip_prefix: get_input: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml index 714f8b63de..7485e0dd99 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -156,15 +156,6 @@ node_types: type: string required: true status: SUPPORTED - untrusted_num_vn: - type: float - description: Number of vDBE subinterface virtual Networks - required: true - status: SUPPORTED - constraints: - - in_range: - - 1 - - 77 port_vdbe_untr_port_order: type: integer required: true @@ -201,6 +192,12 @@ node_types: status: SUPPORTED entry_schema: type: json + subinterface_nested1_service_template_filter_count: + type: list + required: true + status: SUPPORTED + entry_schema: + type: float subinterface_nested1_aap_untrusted_v6_ip_prefix: type: list required: true @@ -905,6 +902,12 @@ node_types: type: string required: true status: SUPPORTED + subinterface_nested2_service_template_filter_count: + type: list + required: true + status: SUPPORTED + entry_schema: + type: float subinterface_nested2_counter: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml index 97275e472c..0e805a44b4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml @@ -86,6 +86,23 @@ topology_template: param_name: vdbe_aap_untrusted_ip_prefix_len type: string description: ip prefix length for the primary vDBE VM on the VAN untrusted network + untrusted_num_vn: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: untrusted_num_vn + type: float + description: Number of vDBE subinterface virtual Networks + constraints: + - in_range: + - 1 + - 77 aap_address_mode: hidden: false immutable: false @@ -453,6 +470,8 @@ topology_template: - get_input: untrusted_vlan_tags subinterface_nested2_aap_untrusted_ip_prefix_len: - get_input: vdbe_aap_untrusted_ip_prefix_len + subinterface_nested2_service_template_filter_count: + - 5 subinterface_nested2_counter: - get_input: counter subinterface_nested2_aap_untrusted_v6_ip_prefix_len: @@ -522,6 +541,8 @@ topology_template: get_input: vnf_id vnf_name: get_input: vnf_name + subinterface_nested1_service_template_filter_count: + - get_input: untrusted_num_vn subinterface_nested1_aap_untrusted_v6_ip_prefix: - get_input: vdbe_aap_untrusted_v6_ip_prefix subinterface_nested1_parent_interface: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml index e249e3f9b5..4b5ef9d76d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml @@ -40,15 +40,6 @@ topology_template: vm_flavor_name: type: string required: true - untrusted_num_vn: - hidden: false - immutable: false - type: float - description: Number of vDBE subinterface virtual Networks - constraints: - - in_range: - - 1 - - 77 port_vdbe_untr_port_order: type: integer required: true @@ -78,6 +69,11 @@ topology_template: required: true entry_schema: type: json + subinterface_nested1_service_template_filter_count: + type: list + required: true + entry_schema: + type: float subinterface_nested1_aap_untrusted_v6_ip_prefix: type: list required: true @@ -192,9 +188,11 @@ topology_template: - subinterface_nested1_aap_address_mode - index_value service_template_filter: - substitute_service_template: nested1ServiceTemplate.yaml count: - get_input: untrusted_num_vn + get_input: + - subinterface_nested1_service_template_filter_count + - index_value + substitute_service_template: nested1ServiceTemplate.yaml mandatory: false aap_untrusted_v6_ip_prefix: get_input: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbe_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbe_1ServiceTemplate.yaml index 0d70da9d40..be49ab843c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbe_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbe_1ServiceTemplate.yaml @@ -112,6 +112,11 @@ topology_template: port_vdbe_untr_port_network_role: type: string required: true + subinterface_nested2_service_template_filter_count: + type: list + required: true + entry_schema: + type: float subinterface_nested2_counter: type: list required: true @@ -187,8 +192,11 @@ topology_template: - subinterface_nested2_aap_address_mode - index_value service_template_filter: + count: + get_input: + - subinterface_nested2_service_template_filter_count + - index_value substitute_service_template: nested2ServiceTemplate.yaml - count: 5 mandatory: true aap_untrusted_v6_ip_prefix: get_input: |