diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities')
5 files changed, 366 insertions, 126 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml index 7c9866a5f0..7d05b9ccc7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,13 +8,49 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pd01_port_mac_requirements: + compute_pd_server_scheduler_hints: type: list required: true status: SUPPORTED entry_schema: type: json - compute_pd_server_scheduler_hints: + 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 + status: SUPPORTED + entry_schema: + type: string + compute_pd_server_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + vm_flavor_name: + type: string + required: true + status: SUPPORTED + port_pd01_port_security_groups: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_pd01_port_mac_requirements: type: list required: true status: SUPPORTED @@ -36,42 +72,36 @@ node_types: status: SUPPORTED entry_schema: type: string - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: + port_pd01_port_order: type: list required: true status: SUPPORTED entry_schema: - type: string - compute_pd_server_name: + type: integer + port_pd01_port_subnetpoolid: type: list required: true status: SUPPORTED entry_schema: type: string - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_pd01_port_security_groups: + port_pd01_port_network_role: type: list required: true status: SUPPORTED entry_schema: - type: json + type: string port_pd01_port_network_role_tag: type: list required: true status: SUPPORTED entry_schema: type: string + port_pd01_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json compute_pd_server_user_data_format: type: list required: true @@ -428,6 +458,30 @@ node_types: org.openecomp.resource.abstract.nodes.oam_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + 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_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + vm_flavor_name: + type: string + required: true + status: SUPPORTED + port_pd01_port_security_groups: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json port_pd01_port_mac_requirements: type: list required: true @@ -456,18 +510,18 @@ node_types: status: SUPPORTED entry_schema: type: string - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 + port_pd01_port_order: + type: list + required: true status: SUPPORTED - constraints: - - greater_or_equal: 0 - vm_flavor_name: - type: string + entry_schema: + type: integer + port_pd01_port_subnetpoolid: + type: list required: true status: SUPPORTED + entry_schema: + type: string compute_oam_server_user_data_format: type: list required: true @@ -480,18 +534,24 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_security_groups: + port_pd01_port_network_role: type: list required: true status: SUPPORTED entry_schema: - type: json + type: string port_pd01_port_network_role_tag: type: list required: true status: SUPPORTED entry_schema: type: string + port_pd01_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json compute_oam_server_scheduler_hints: type: list required: true @@ -843,22 +903,12 @@ node_types: org.openecomp.resource.abstract.nodes.ps_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pd01_port_mac_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json compute_ps_server_name: type: list required: true status: SUPPORTED entry_schema: type: string - vm_image_name: - type: string - required: true - status: SUPPORTED compute_ps_server_availability_zone: type: list required: true @@ -877,6 +927,40 @@ node_types: 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_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + vm_flavor_name: + type: string + required: true + status: SUPPORTED + port_pd01_port_security_groups: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_pd01_port_mac_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + vm_image_name: + type: string + required: true + status: SUPPORTED port_pd01_port_ip_requirements: type: list required: true @@ -889,19 +973,31 @@ node_types: status: SUPPORTED entry_schema: type: string - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 + port_pd01_port_order: + type: list + required: true status: SUPPORTED - constraints: - - greater_or_equal: 0 - vm_flavor_name: - type: string + entry_schema: + type: integer + port_pd01_port_subnetpoolid: + type: list required: true status: SUPPORTED - port_pd01_port_security_groups: + entry_schema: + type: string + port_pd01_port_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_vlan_requirements: type: list required: true status: SUPPORTED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml index 104d72f82a..21a0a374de 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml @@ -202,21 +202,8 @@ topology_template: directives: - substitutable properties: - port_pd01_port_mac_requirements: - - mac_count_required: - is_required: false compute_pd_server_scheduler_hints: - group: BE_Affinity_group - vm_image_name: - get_input: pd_image_name - port_pd01_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network: - - get_input: oam_net_name compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -229,6 +216,19 @@ topology_template: - name port_pd01_port_security_groups: - - jsa_security_group + port_pd01_port_mac_requirements: + - mac_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_pd01_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_network: + - get_input: oam_net_name port_pd01_port_network_role_tag: - oam compute_pd_server_user_data_format: @@ -251,21 +251,27 @@ topology_template: directives: - substitutable properties: - port_pd01_port_mac_requirements: - - mac_count_required: - is_required: false compute_ps_server_name: - get_input: - ps_server_names - 0 - vm_image_name: - get_input: pd_image_name compute_ps_server_availability_zone: - get_input: availabilityzone_name compute_ps_server_user_data_format: - RAW compute_ps_server_scheduler_hints: - group: BE_Affinity_group + vm_flavor_name: + get_attribute: + - network_policy_server + - name + port_pd01_port_security_groups: + - - jsa_security_group + port_pd01_port_mac_requirements: + - mac_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name port_pd01_port_ip_requirements: - - ip_version: 4 ip_count_required: @@ -276,12 +282,6 @@ topology_template: - get_attribute: - network_policy_server - name - vm_flavor_name: - get_attribute: - - network_policy_server - - name - port_pd01_port_security_groups: - - - jsa_security_group service_template_filter: substitute_service_template: Nested_ps_serverServiceTemplate.yaml count: 1 @@ -300,6 +300,12 @@ topology_template: directives: - substitutable properties: + vm_flavor_name: + get_attribute: + - network_policy_server + - name + port_pd01_port_security_groups: + - - jsa_security_group port_pd01_port_mac_requirements: - mac_count_required: is_required: false @@ -315,18 +321,12 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name - vm_flavor_name: - get_attribute: - - network_policy_server - - name compute_oam_server_user_data_format: - RAW compute_oam_server_name: - get_input: - oam_server_names - 0 - port_pd01_port_security_groups: - - - jsa_security_group port_pd01_port_network_role_tag: - oam compute_oam_server_scheduler_hints: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml index e9f9aee10e..4e1b24e7f0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml @@ -11,6 +11,26 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + 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_exCP_naming: + type: list + required: true + entry_schema: + type: json + vm_flavor_name: + type: string + required: true + port_pd01_port_security_groups: + type: list + required: true + entry_schema: + type: json port_pd01_port_mac_requirements: type: list required: true @@ -34,16 +54,16 @@ topology_template: required: true entry_schema: type: string - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - vm_flavor_name: - type: string + port_pd01_port_order: + type: list required: true + entry_schema: + type: integer + port_pd01_port_subnetpoolid: + type: list + required: true + entry_schema: + type: string compute_oam_server_user_data_format: type: list required: true @@ -54,16 +74,21 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_security_groups: + port_pd01_port_network_role: type: list required: true entry_schema: - type: json + type: string port_pd01_port_network_role_tag: type: list required: true entry_schema: type: string + port_pd01_port_vlan_requirements: + type: list + required: true + entry_schema: + type: json compute_oam_server_scheduler_hints: type: list required: true @@ -77,6 +102,14 @@ topology_template: get_input: - port_pd01_port_security_groups - index_value + exCP_naming: + get_input: + - port_pd01_port_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_pd01_port_vlan_requirements + - index_value ip_requirements: get_input: - port_pd01_port_ip_requirements @@ -89,6 +122,18 @@ topology_template: get_input: - port_pd01_port_mac_requirements - index_value + order: + get_input: + - port_pd01_port_order + - index_value + network_role: + get_input: + - port_pd01_port_network_role + - index_value + subnetpoolid: + get_input: + - port_pd01_port_subnetpoolid + - index_value network: get_input: - port_pd01_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/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/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml index c79dd4cc64..1356fb8878 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/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/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml @@ -11,12 +11,42 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pd01_port_mac_requirements: + compute_pd_server_scheduler_hints: type: list required: true entry_schema: type: json - compute_pd_server_scheduler_hints: + 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 + entry_schema: + type: string + compute_pd_server_name: + type: list + required: true + entry_schema: + type: string + port_pd01_port_exCP_naming: + type: list + required: true + entry_schema: + type: json + vm_flavor_name: + type: string + required: true + port_pd01_port_security_groups: + type: list + required: true + entry_schema: + type: json + port_pd01_port_mac_requirements: type: list required: true entry_schema: @@ -34,36 +64,31 @@ topology_template: required: true entry_schema: type: string - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: + port_pd01_port_order: type: list required: true entry_schema: - type: string - compute_pd_server_name: + type: integer + port_pd01_port_subnetpoolid: type: list required: true entry_schema: type: string - vm_flavor_name: - type: string - required: true - port_pd01_port_security_groups: + port_pd01_port_network_role: type: list required: true entry_schema: - type: json + type: string port_pd01_port_network_role_tag: type: list required: true entry_schema: type: string + port_pd01_port_vlan_requirements: + type: list + required: true + entry_schema: + type: json compute_pd_server_user_data_format: type: list required: true @@ -100,6 +125,14 @@ topology_template: get_input: - port_pd01_port_security_groups - index_value + exCP_naming: + get_input: + - port_pd01_port_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_pd01_port_vlan_requirements + - index_value ip_requirements: get_input: - port_pd01_port_ip_requirements @@ -112,6 +145,18 @@ topology_template: get_input: - port_pd01_port_mac_requirements - index_value + order: + get_input: + - port_pd01_port_order + - index_value + network_role: + get_input: + - port_pd01_port_network_role + - index_value + subnetpoolid: + get_input: + - port_pd01_port_subnetpoolid + - index_value network: get_input: - port_pd01_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml index b2c48a9534..f408bad2cc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml @@ -11,19 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pd01_port_mac_requirements: - type: list - required: true - entry_schema: - type: json compute_ps_server_name: type: list required: true entry_schema: type: string - vm_image_name: - type: string - required: true compute_ps_server_availability_zone: type: list required: true @@ -39,16 +31,6 @@ topology_template: required: true entry_schema: type: json - port_pd01_port_ip_requirements: - type: list - required: true - entry_schema: - type: json - port_pd01_port_network: - type: list - required: true - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -56,6 +38,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_pd01_port_exCP_naming: + type: list + required: true + entry_schema: + type: json vm_flavor_name: type: string required: true @@ -64,6 +51,49 @@ topology_template: required: true entry_schema: type: json + port_pd01_port_mac_requirements: + type: list + required: true + entry_schema: + type: json + vm_image_name: + type: string + required: true + port_pd01_port_ip_requirements: + type: list + required: true + entry_schema: + type: json + port_pd01_port_network: + type: list + required: true + entry_schema: + type: string + port_pd01_port_order: + type: list + required: true + entry_schema: + type: integer + port_pd01_port_subnetpoolid: + type: list + required: true + entry_schema: + type: string + port_pd01_port_network_role: + type: list + required: true + entry_schema: + type: string + port_pd01_port_network_role_tag: + type: list + required: true + entry_schema: + type: string + port_pd01_port_vlan_requirements: + type: list + required: true + entry_schema: + type: json node_templates: ps_server_pd01_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port @@ -72,14 +102,38 @@ topology_template: get_input: - port_pd01_port_security_groups - index_value + exCP_naming: + get_input: + - port_pd01_port_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_pd01_port_vlan_requirements + - index_value ip_requirements: get_input: - port_pd01_port_ip_requirements - index_value + network_role_tag: + get_input: + - port_pd01_port_network_role_tag + - index_value mac_requirements: get_input: - port_pd01_port_mac_requirements - index_value + order: + get_input: + - port_pd01_port_order + - index_value + network_role: + get_input: + - port_pd01_port_network_role + - index_value + subnetpoolid: + get_input: + - port_pd01_port_subnetpoolid + - index_value network: get_input: - port_pd01_port_network |