diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn')
3 files changed, 199 insertions, 49 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index cd7b7cd904..b956d579e3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -32,26 +32,12 @@ node_types: status: SUPPORTED entry_schema: type: json - port_pd01_port_0_network_role_tag: + port_pd01_port_0_network_role: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_1_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -74,23 +60,35 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_1_mac_requirements: + port_pd01_port_1_network_role: type: list required: true status: SUPPORTED entry_schema: - type: json + type: string + port_pd01_port_0_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer + port_pd01_port_1_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_1_replacement_policy: + port_pd01_port_1_network_role_tag: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_1_network_role_tag: + port_pd01_port_0_subnetpoolid: type: list required: true status: SUPPORTED @@ -108,6 +106,68 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_0_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + port_pd01_port_1_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer + port_pd01_port_0_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_pd01_port_1_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_pd01_port_1_mac_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_pd01_port_1_replacement_policy: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_1_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_pd01_port_0_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json port_pd01_port_0_security_groups: 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/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml index 215f5c0b83..7c295f9e48 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml @@ -109,14 +109,6 @@ topology_template: is_required: false port_pd01_port_1_security_groups: - - jsa_security_group - port_pd01_port_0_network_role_tag: - - oam - port_pd01_port_1_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -127,19 +119,27 @@ topology_template: - AUTO vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_1_mac_requirements: - - mac_count_required: - is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_1_replacement_policy: - - AUTO port_pd01_port_1_network_role_tag: - oam port_pd01_port_1_network: - get_input: oam_net_name compute_pd_server_user_data_format: - RAW + port_pd01_port_0_network_role_tag: + - oam + port_pd01_port_1_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_1_mac_requirements: + - mac_count_required: + is_required: false + port_pd01_port_1_replacement_policy: + - AUTO port_pd01_port_0_security_groups: - - jsa_security_group service_template_filter: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml index cc1724133c..75533f5049 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml @@ -31,23 +31,11 @@ topology_template: required: true entry_schema: type: json - port_pd01_port_0_network_role_tag: + port_pd01_port_0_network_role: type: list required: true entry_schema: type: string - port_pd01_port_1_ip_requirements: - type: list - required: true - entry_schema: - type: json - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -66,20 +54,30 @@ topology_template: vm_flavor_name: type: string required: true - port_pd01_port_1_mac_requirements: + port_pd01_port_1_network_role: type: list required: true entry_schema: - type: json + type: string + port_pd01_port_0_order: + type: list + required: true + entry_schema: + type: integer + port_pd01_port_1_subnetpoolid: + type: list + required: true + entry_schema: + type: string vm_image_name: type: string required: true - port_pd01_port_1_replacement_policy: + port_pd01_port_1_network_role_tag: type: list required: true entry_schema: type: string - port_pd01_port_1_network_role_tag: + port_pd01_port_0_subnetpoolid: type: list required: true entry_schema: @@ -94,6 +92,58 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_0_network_role_tag: + type: list + required: true + entry_schema: + type: string + port_pd01_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: json + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_pd01_port_1_order: + type: list + required: true + entry_schema: + type: integer + port_pd01_port_0_exCP_naming: + type: list + required: true + entry_schema: + type: json + port_pd01_port_1_vlan_requirements: + type: list + required: true + entry_schema: + type: json + port_pd01_port_1_mac_requirements: + type: list + required: true + entry_schema: + type: json + port_pd01_port_1_replacement_policy: + type: list + required: true + entry_schema: + type: string + port_pd01_port_1_exCP_naming: + type: list + required: true + entry_schema: + type: json + port_pd01_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: json port_pd01_port_0_security_groups: type: list required: true @@ -126,10 +176,18 @@ topology_template: get_input: - port_pd01_port_1_security_groups - index_value + exCP_naming: + get_input: + - port_pd01_port_1_exCP_naming + - index_value replacement_policy: get_input: - port_pd01_port_1_replacement_policy - index_value + vlan_requirements: + get_input: + - port_pd01_port_1_vlan_requirements + - index_value ip_requirements: get_input: - port_pd01_port_1_ip_requirements @@ -142,6 +200,18 @@ topology_template: get_input: - port_pd01_port_1_mac_requirements - index_value + order: + get_input: + - port_pd01_port_1_order + - index_value + network_role: + get_input: + - port_pd01_port_1_network_role + - index_value + subnetpoolid: + get_input: + - port_pd01_port_1_subnetpoolid + - index_value network: get_input: - port_pd01_port_1_network @@ -158,10 +228,18 @@ topology_template: get_input: - port_pd01_port_0_security_groups - index_value + exCP_naming: + get_input: + - port_pd01_port_0_exCP_naming + - index_value replacement_policy: get_input: - port_pd01_port_0_replacement_policy - index_value + vlan_requirements: + get_input: + - port_pd01_port_0_vlan_requirements + - index_value ip_requirements: get_input: - port_pd01_port_0_ip_requirements @@ -174,6 +252,18 @@ topology_template: get_input: - port_pd01_port_0_mac_requirements - index_value + order: + get_input: + - port_pd01_port_0_order + - index_value + network_role: + get_input: + - port_pd01_port_0_network_role + - index_value + subnetpoolid: + get_input: + - port_pd01_port_0_subnetpoolid + - index_value network: get_input: - port_pd01_port_0_network |