diff options
| author |   Michael Lando <ml636r@att.com> | 2017-06-11 14:22:02 +0300 |
|---|---|---|
| committer | Michael Lando <ml636r@att.com> | 2017-06-11 17:48:32 +0300 |
| commit | b3d4898d9e8452ea0b8d848c048e712d43b8d9a3 (patch) | |
| tree | 0609319203be13f6c29ccbe24cb39c9d64f90095 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns | |
| parent | af9929df75604ce407d0ca542b200630164e0ae6 (diff) | |
[SDC-29] rebase continue work to align source
Change-Id: I218f1c5ee23fb2c8314f1c70921d3ad8682c10f4
Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns')
9 files changed, 1464 insertions, 309 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml index da7b5979f9..a921a8e328 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -926,29 +926,92 @@ node_types: org.openecomp.resource.abstract.nodes.heat.pcm_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - server_group: - type: string - required: true - status: SUPPORTED - connectivityChk: - type: json + port_pcm_port_0_network_role: + type: list required: true status: SUPPORTED + entry_schema: + type: string availabilityzone_name: type: string description: availabilityzone name required: true status: SUPPORTED - oam_net_gw: - type: string - description: CPS network gateway + port_pcm_port_0_vlan_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: json pcm_image_name: type: string description: PCRF CM image name required: true status: SUPPORTED + port_pcm_port_0_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer + port_pcm_port_0_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pcm_port_1_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + pcm_server_name: + type: string + description: PCRF CM server name + required: true + status: SUPPORTED + cps_net_mask: + type: string + description: CPS network mask + required: true + status: SUPPORTED + port_pcm_port_1_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_pcm_port_0_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + oam_net_name: + type: string + description: OAM network name + required: true + status: SUPPORTED + port_pcm_port_1_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + server_group: + type: string + required: true + status: SUPPORTED + connectivityChk: + type: json + required: true + status: SUPPORTED + oam_net_gw: + type: string + description: CPS network gateway + required: true + status: SUPPORTED security_group_name: type: string description: the name of security group @@ -959,6 +1022,12 @@ node_types: description: CPS network ip required: true status: SUPPORTED + port_pcm_port_1_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json pcm_flavor_name: type: string description: flavor name of PCRF CM instance @@ -969,21 +1038,11 @@ node_types: description: CPS Cluman Cinder Volume required: true status: SUPPORTED - pcm_server_name: - type: string - description: PCRF CM server name - required: true - status: SUPPORTED cps_net_name: type: string description: CPS network name required: true status: SUPPORTED - cps_net_mask: - type: string - description: CPS network mask - required: true - status: SUPPORTED oam_net_ip: type: string description: OAM network ip @@ -994,11 +1053,12 @@ node_types: description: CPS network mask required: true status: SUPPORTED - oam_net_name: - type: string - description: OAM network name + port_pcm_port_1_order: + type: list required: true status: SUPPORTED + entry_schema: + type: integer attributes: server_pcm_id: type: string @@ -1421,7 +1481,13 @@ node_types: org.openecomp.resource.abstract.nodes.1c1_scalling_instance: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_1c1_t1_port_fixed_ips: + port_1c1_t1_port_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_1c1_t2_port_vlan_requirements: type: list required: true status: SUPPORTED @@ -1433,24 +1499,80 @@ node_types: status: SUPPORTED entry_schema: type: string - port_1c1_t2_port_ip_requirements: + port_1c1_t2_port_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + vm_flavor_name: + type: string + required: true + status: SUPPORTED + port_1c1_t1_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: json - port_1c1_t1_port_mac_requirements: + vm_image_name: + type: string + required: true + status: SUPPORTED + compute_1c1_scalling_instance_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_1c1_t1_port_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_1c1_t1_port_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_1c1_t2_port_fixed_ips: type: list required: true status: SUPPORTED entry_schema: type: json - port_1c1_t2_port_network_role_tag: + port_1c1_t2_port_network: type: list required: true status: SUPPORTED entry_schema: type: string + port_1c1_t1_port_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_1c1_t1_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_1c1_t2_port_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_1c1_t1_port_mac_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 @@ -1459,80 +1581,84 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_1c1_t2_port_mac_requirements: + port_1c1_t2_port_network_role: type: list required: true status: SUPPORTED entry_schema: - type: json - vm_flavor_name: - type: string + type: string + port_1c1_t2_port_order: + type: list required: true status: SUPPORTED + entry_schema: + type: integer + port_1c1_t2_port_mac_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json compute_1c1_scalling_instance_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c1_t1_port_ip_requirements: + port_1c1_t2_port_subnetpoolid: type: list required: true status: SUPPORTED entry_schema: - type: json + type: string port_1c1_t2_port_name: type: list required: true status: SUPPORTED entry_schema: type: string - vm_image_name: - type: string - required: true - status: SUPPORTED compute_1c1_scalling_instance_scheduler_hints: type: list required: true status: SUPPORTED entry_schema: type: json - compute_1c1_scalling_instance_metadata: + port_1c1_t2_port_exCP_naming: type: list required: true status: SUPPORTED entry_schema: type: json - compute_1c1_scalling_instance_name: + compute_1c1_scalling_instance_metadata: type: list required: true status: SUPPORTED entry_schema: - type: string - port_1c1_t1_port_name: + type: json + port_1c1_t1_port_subnetpoolid: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c1_t1_port_network: + port_1c1_t1_port_network_role_tag: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c1_t2_port_fixed_ips: + port_1c1_t1_port_network_role: type: list required: true status: SUPPORTED entry_schema: - type: json - port_1c1_t2_port_network: + type: string + port_1c1_t1_port_order: type: list required: true status: SUPPORTED entry_schema: - type: string + type: integer attributes: 1c1_scalling_instance_1c1_t1_port_tenant_id: type: list @@ -1972,6 +2098,74 @@ node_types: status: SUPPORTED entry_schema: type: json + port_1a_t1_port_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_1a_t2_port_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + vm_flavor_name: + type: string + required: true + status: SUPPORTED + port_1a_t2_port_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_1a_t2_port_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_1a_t1_port_mac_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_1a_t1_port_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_1a_t1_port_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + vm_image_name: + type: string + required: true + status: SUPPORTED + port_1a_t2_port_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_1a_t1_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_1a_t1_port_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json compute_a_single_1a_availability_zone: type: list required: true @@ -1992,50 +2186,48 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_1a_t1_port_ip_requirements: + port_1a_t1_port_network_role_tag: type: list required: true status: SUPPORTED entry_schema: - type: json - port_1a_t2_port_network_role_tag: + type: string + port_1a_t1_port_network_role: type: list required: true status: SUPPORTED entry_schema: type: string - vm_flavor_name: - type: string + port_1a_t1_port_order: + type: list required: true status: SUPPORTED - port_1a_t2_port_network: + entry_schema: + type: integer + port_1a_t2_port_exCP_naming: type: list required: true status: SUPPORTED entry_schema: - type: string - port_1a_t1_port_mac_requirements: + type: json + port_1a_t2_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: json - port_1a_t1_port_network: + port_1a_t2_port_subnetpoolid: type: list required: true status: SUPPORTED entry_schema: type: string - vm_image_name: - type: string - required: true - status: SUPPORTED - port_1a_t2_port_ip_requirements: + port_1a_t2_port_order: type: list required: true status: SUPPORTED entry_schema: - type: json + type: integer compute_a_single_1a_user_data_format: type: list required: true @@ -2482,6 +2674,74 @@ node_types: org.openecomp.resource.abstract.nodes.b_single_1b_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_1b_t1_port_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer + port_1b_t1_port_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_1b_t1_port_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + vm_flavor_name: + type: string + required: true + status: SUPPORTED + port_1b_t1_port_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + vm_image_name: + type: string + required: true + status: SUPPORTED + port_1b_t2_port_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_1b_t2_port_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer + compute_b_single_1b_user_data_format: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_1b_t2_port_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_1b_t2_port_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_1b_t2_port_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string port_1b_t2_port_mac_requirements: type: list required: true @@ -2508,16 +2768,18 @@ node_types: status: SUPPORTED entry_schema: type: json - port_1b_t2_port_ip_requirements: + port_1b_t2_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: json - vm_flavor_name: - type: string + port_1b_t2_port_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: json port_1b_t1_port_value_specs: type: list required: true @@ -2530,16 +2792,12 @@ node_types: status: SUPPORTED entry_schema: type: string - port_1b_t1_port_ip_requirements: + port_1b_t1_port_subnetpoolid: type: list required: true status: SUPPORTED entry_schema: - type: json - vm_image_name: - type: string - required: true - status: SUPPORTED + type: string port_1b_t1_port_mac_requirements: type: list required: true @@ -2552,12 +2810,12 @@ node_types: status: SUPPORTED entry_schema: type: string - compute_b_single_1b_user_data_format: + port_1b_t1_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: json port_1b_t1_port_network: type: list required: true @@ -2998,12 +3256,86 @@ node_types: org.openecomp.resource.abstract.nodes.1c2_catalog_instance_0: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_1c2_t2_port_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer + compute_1c2_catalog_instance_availability_zone: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_1c2_t2_port_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_1c2_t2_port_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + vm_flavor_name: + type: string + required: true + status: SUPPORTED + port_1c2_t2_port_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_1c2_t1_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + vm_image_name: + type: string + required: true + status: SUPPORTED + port_1c2_t2_port_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_1c2_t1_port_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer + port_1c2_t1_port_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_1c2_t2_port_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json port_1c2_t1_port_mac_requirements: type: list required: true status: SUPPORTED entry_schema: type: json + port_1c2_t1_port_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string port_1c2_t2_port_network: type: list required: true @@ -3018,12 +3350,6 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - compute_1c2_catalog_instance_availability_zone: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string compute_1c2_catalog_instance_metadata: type: list required: true @@ -3036,10 +3362,12 @@ node_types: status: SUPPORTED entry_schema: type: string - vm_flavor_name: - type: string + port_1c2_t1_port_exCP_naming: + type: list required: true status: SUPPORTED + entry_schema: + type: json port_1c2_t1_port_network: type: list required: true @@ -3052,11 +3380,7 @@ node_types: status: SUPPORTED entry_schema: type: json - vm_image_name: - type: string - required: true - status: SUPPORTED - port_1c2_t2_port_ip_requirements: + port_1c2_t2_port_vlan_requirements: type: list required: true status: SUPPORTED @@ -3514,12 +3838,86 @@ node_types: org.openecomp.resource.abstract.nodes.1c2_catalog_instance_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_1c2_t2_port_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer + compute_1c2_catalog_instance_availability_zone: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_1c2_t2_port_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_1c2_t2_port_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + vm_flavor_name: + type: string + required: true + status: SUPPORTED + port_1c2_t2_port_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_1c2_t1_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + vm_image_name: + type: string + required: true + status: SUPPORTED + port_1c2_t2_port_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_1c2_t1_port_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer + port_1c2_t1_port_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_1c2_t2_port_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json port_1c2_t1_port_mac_requirements: type: list required: true status: SUPPORTED entry_schema: type: json + port_1c2_t1_port_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string port_1c2_t2_port_network: type: list required: true @@ -3534,22 +3932,18 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - compute_1c2_catalog_instance_availability_zone: + compute_1c2_catalog_instance_name: type: list required: true status: SUPPORTED entry_schema: type: string - compute_1c2_catalog_instance_name: + port_1c2_t1_port_exCP_naming: type: list required: true status: SUPPORTED entry_schema: - type: string - vm_flavor_name: - type: string - required: true - status: SUPPORTED + type: json port_1c2_t1_port_network: type: list required: true @@ -3562,11 +3956,7 @@ node_types: status: SUPPORTED entry_schema: type: json - vm_image_name: - type: string - required: true - status: SUPPORTED - port_1c2_t2_port_ip_requirements: + port_1c2_t2_port_vlan_requirements: type: list required: true status: SUPPORTED @@ -4024,6 +4414,74 @@ node_types: org.openecomp.resource.abstract.nodes.b_single_1b_0: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_1b_t1_port_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer + port_1b_t1_port_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_1b_t1_port_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + vm_flavor_name: + type: string + required: true + status: SUPPORTED + port_1b_t1_port_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + vm_image_name: + type: string + required: true + status: SUPPORTED + port_1b_t2_port_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_1b_t2_port_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer + compute_b_single_1b_user_data_format: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_1b_t2_port_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_1b_t2_port_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_1b_t2_port_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string port_1b_t2_port_mac_requirements: type: list required: true @@ -4050,32 +4508,36 @@ node_types: status: SUPPORTED entry_schema: type: json - port_1b_t2_port_ip_requirements: + port_1b_t2_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: json - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_1b_t1_port_ip_requirements: + port_1b_t2_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: json - vm_image_name: - type: string + port_1b_t1_port_network_role_tag: + type: list required: true status: SUPPORTED + entry_schema: + type: string compute_b_single_1b_metadata: type: list required: true status: SUPPORTED entry_schema: type: json + port_1b_t1_port_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string port_1b_t1_port_mac_requirements: type: list required: true @@ -4088,12 +4550,12 @@ node_types: status: SUPPORTED entry_schema: type: string - compute_b_single_1b_user_data_format: + port_1b_t1_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: json compute_b_single_1b_name: 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/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml index 7a12426fa6..700c94ba91 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml @@ -143,6 +143,52 @@ topology_template: directives: - substitutable properties: + compute_1c1_scalling_instance_user_data_format: + - RAW2 + - RAW1 + port_1c1_t2_port_network_role_tag: + - ppds + - ppds + vm_flavor_name: + get_input: pd_flavor_name + port_1c1_t1_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + compute_1c1_scalling_instance_name: + - get_input: + - 1c1_scalling_instance_names + - 2 + - get_input: + - 1c1_scalling_instance_names + - 1 + port_1c1_t1_port_name: + - 1c1_t1_port_1 + - 1c1_t1_port_0 + port_1c1_t1_port_network: + - 1c1_scalling_instance_network + - 1c1_scalling_instance_network + port_1c1_t2_port_fixed_ips: + - - ip_address: + get_input: + - myIPs + - 4 + - - ip_address: + get_input: + - myIPs + - 2 + port_1c1_t2_port_network: + - get_input: ppds_net_name + - get_input: ppds_net_name port_1c1_t1_port_fixed_ips: - - ip_address: get_input: @@ -152,9 +198,6 @@ topology_template: get_input: - myIPs - 1 - compute_1c1_scalling_instance_user_data_format: - - RAW2 - - RAW1 port_1c1_t2_port_ip_requirements: - - ip_version: 4 ip_count_required: @@ -171,35 +214,17 @@ topology_template: is_required: false - mac_count_required: is_required: false - port_1c1_t2_port_network_role_tag: - - ppds - - ppds port_1c1_t2_port_mac_requirements: - mac_count_required: is_required: false - mac_count_required: is_required: false - vm_flavor_name: - get_input: pd_flavor_name compute_1c1_scalling_instance_availability_zone: - get_input: availabilityzone_name - get_input: availabilityzone_name - port_1c1_t1_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false port_1c1_t2_port_name: - 1c1_t2_port_1 - 1c1_t2_port_0 - vm_image_name: - get_input: pd_image_name compute_1c1_scalling_instance_scheduler_hints: - group: BE_Affinity_group - group: BE_Affinity_group @@ -233,31 +258,6 @@ topology_template: get_attribute: - abstract_b_single_1b_0 - b_single_1b_instance_name - compute_1c1_scalling_instance_name: - - get_input: - - 1c1_scalling_instance_names - - 2 - - get_input: - - 1c1_scalling_instance_names - - 1 - port_1c1_t1_port_name: - - 1c1_t1_port_1 - - 1c1_t1_port_0 - port_1c1_t1_port_network: - - 1c1_scalling_instance_network - - 1c1_scalling_instance_network - port_1c1_t2_port_fixed_ips: - - - ip_address: - get_input: - - myIPs - - 4 - - - ip_address: - get_input: - - myIPs - - 2 - port_1c1_t2_port_network: - - get_input: ppds_net_name - - get_input: ppds_net_name service_template_filter: substitute_service_template: Nested_1c1_scalling_instanceServiceTemplate.yaml count: 2 @@ -276,6 +276,18 @@ topology_template: directives: - substitutable properties: + vm_flavor_name: + get_input: pd_flavor_name + port_1b_t1_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + compute_b_single_1b_user_data_format: + - RAW port_1b_t2_port_mac_requirements: - mac_count_required: is_required: false @@ -289,16 +301,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - vm_flavor_name: - get_input: pd_flavor_name - port_1b_t1_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name compute_b_single_1b_metadata: - connectivityTo4PNested: get_attribute: @@ -329,8 +331,6 @@ topology_template: is_required: false port_1b_t2_port_network: - b_single_1b_network - compute_b_single_1b_user_data_format: - - RAW compute_b_single_1b_name: - get_input: - b_single_1b_names @@ -358,13 +358,23 @@ topology_template: directives: - substitutable properties: + compute_1c2_catalog_instance_availability_zone: + - get_input: availabilityzone_name + vm_flavor_name: + get_input: pd_flavor_name + vm_image_name: + get_input: pd_image_name + port_1c2_t2_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false port_1c2_t1_port_mac_requirements: - mac_count_required: is_required: false port_1c2_t2_port_network: - 1c2_catalog_instance_network - compute_1c2_catalog_instance_availability_zone: - - get_input: availabilityzone_name compute_1c2_catalog_instance_metadata: - connectivityTo4PNested: get_attribute: @@ -398,21 +408,11 @@ topology_template: - get_input: - 1c2_catalog_instance_names - 1 - vm_flavor_name: - get_input: pd_flavor_name port_1c2_t1_port_network: - get_input: oam_net_name port_1c2_t2_port_mac_requirements: - mac_count_required: is_required: false - vm_image_name: - get_input: pd_image_name - port_1c2_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false compute_1c2_catalog_instance_user_data_format: - RAW1 port_1c2_t1_port_network_role_tag: @@ -443,32 +443,32 @@ topology_template: directives: - substitutable properties: + compute_1c2_catalog_instance_availability_zone: + - get_input: availabilityzone_name + vm_flavor_name: + get_input: pd_flavor_name + vm_image_name: + get_input: pd_image_name + port_1c2_t2_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false port_1c2_t1_port_mac_requirements: - mac_count_required: is_required: false port_1c2_t2_port_network: - 1c2_catalog_instance_network - compute_1c2_catalog_instance_availability_zone: - - get_input: availabilityzone_name compute_1c2_catalog_instance_name: - get_input: - 1c2_catalog_instance_names - 2 - vm_flavor_name: - get_input: pd_flavor_name port_1c2_t1_port_network: - get_input: oam_net_name port_1c2_t2_port_mac_requirements: - mac_count_required: is_required: false - vm_image_name: - get_input: pd_image_name - port_1c2_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false compute_1c2_catalog_instance_user_data_format: - get_attribute: - abstract_1c2_catalog_instance_0 @@ -661,10 +661,6 @@ topology_template: get_attribute: - abstract_1c1_scalling_instance - 1c1_scalling_instance_1c1_t2_port_tenant_id - compute_a_single_1a_availability_zone: - - get_input: availabilityzone_name - compute_a_single_1a_scheduler_hints: - - group: BE_Affinity_group port_1a_t1_port_ip_requirements: - - ip_version: 4 ip_count_required: @@ -690,6 +686,10 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + compute_a_single_1a_availability_zone: + - get_input: availabilityzone_name + compute_a_single_1a_scheduler_hints: + - group: BE_Affinity_group compute_a_single_1a_user_data_format: - RAW compute_a_single_1a_name: @@ -877,6 +877,18 @@ topology_template: directives: - substitutable properties: + vm_flavor_name: + get_input: pd_flavor_name + port_1b_t1_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + compute_b_single_1b_user_data_format: + - RAW port_1b_t2_port_mac_requirements: - mac_count_required: is_required: false @@ -890,29 +902,17 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - vm_flavor_name: - get_input: pd_flavor_name port_1b_t1_port_value_specs: - get_attribute: - abstract_a_single_1a - a_single_1a_1a_t1_port_tenant_id port_1b_t1_port_network_role_tag: - oam - port_1b_t1_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name port_1b_t1_port_mac_requirements: - mac_count_required: is_required: false port_1b_t2_port_network: - b_single_1b_network - compute_b_single_1b_user_data_format: - - RAW port_1b_t1_port_network: - get_input: oam_net_name compute_b_single_1b_name: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml index aa6bcaf443..f6b0a50917 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml @@ -11,7 +11,12 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_1c1_t1_port_fixed_ips: + port_1c1_t1_port_exCP_naming: + type: list + required: true + entry_schema: + type: json + port_1c1_t2_port_vlan_requirements: type: list required: true entry_schema: @@ -21,21 +26,67 @@ topology_template: required: true entry_schema: type: string - port_1c1_t2_port_ip_requirements: + port_1c1_t2_port_network_role_tag: + type: list + required: true + entry_schema: + type: string + vm_flavor_name: + type: string + required: true + port_1c1_t1_port_ip_requirements: type: list required: true entry_schema: type: json - port_1c1_t1_port_mac_requirements: + vm_image_name: + type: string + required: true + compute_1c1_scalling_instance_name: + type: list + required: true + entry_schema: + type: string + port_1c1_t1_port_name: + type: list + required: true + entry_schema: + type: string + port_1c1_t1_port_network: + type: list + required: true + entry_schema: + type: string + port_1c1_t2_port_fixed_ips: type: list required: true entry_schema: type: json - port_1c1_t2_port_network_role_tag: + port_1c1_t2_port_network: type: list required: true entry_schema: type: string + port_1c1_t1_port_fixed_ips: + type: list + required: true + entry_schema: + type: json + port_1c1_t1_port_vlan_requirements: + type: list + required: true + entry_schema: + type: json + port_1c1_t2_port_ip_requirements: + type: list + required: true + entry_schema: + type: json + port_1c1_t1_port_mac_requirements: + type: list + required: true + entry_schema: + type: json index_value: type: integer description: Index value of this substitution service template runtime instance @@ -43,79 +94,107 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_1c1_t2_port_network_role: + type: list + required: true + entry_schema: + type: string + port_1c1_t2_port_order: + type: list + required: true + entry_schema: + type: integer port_1c1_t2_port_mac_requirements: type: list required: true entry_schema: type: json - vm_flavor_name: - type: string - required: true compute_1c1_scalling_instance_availability_zone: type: list required: true entry_schema: type: string - port_1c1_t1_port_ip_requirements: + port_1c1_t2_port_subnetpoolid: type: list required: true entry_schema: - type: json + type: string port_1c1_t2_port_name: type: list required: true entry_schema: type: string - vm_image_name: - type: string - required: true compute_1c1_scalling_instance_scheduler_hints: type: list required: true entry_schema: type: json - compute_1c1_scalling_instance_metadata: + port_1c1_t2_port_exCP_naming: type: list required: true entry_schema: type: json - compute_1c1_scalling_instance_name: + compute_1c1_scalling_instance_metadata: type: list required: true entry_schema: - type: string - port_1c1_t1_port_name: + type: json + port_1c1_t1_port_subnetpoolid: type: list required: true entry_schema: type: string - port_1c1_t1_port_network: + port_1c1_t1_port_network_role_tag: type: list required: true entry_schema: type: string - port_1c1_t2_port_fixed_ips: + port_1c1_t1_port_network_role: type: list required: true entry_schema: - type: json - port_1c1_t2_port_network: + type: string + port_1c1_t1_port_order: type: list required: true entry_schema: - type: string + type: integer node_templates: 1c1_scalling_instance_1c1_t1_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_1c1_t1_port_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_1c1_t1_port_vlan_requirements + - index_value ip_requirements: get_input: - port_1c1_t1_port_ip_requirements - index_value + network_role_tag: + get_input: + - port_1c1_t1_port_network_role_tag + - index_value mac_requirements: get_input: - port_1c1_t1_port_mac_requirements - index_value + order: + get_input: + - port_1c1_t1_port_order + - index_value + network_role: + get_input: + - port_1c1_t1_port_network_role + - index_value + subnetpoolid: + get_input: + - port_1c1_t1_port_subnetpoolid + - index_value fixed_ips: get_input: - port_1c1_t1_port_fixed_ips @@ -163,6 +242,14 @@ topology_template: 1c1_scalling_instance_1c1_t2_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_1c1_t2_port_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_1c1_t2_port_vlan_requirements + - index_value ip_requirements: get_input: - port_1c1_t2_port_ip_requirements @@ -175,6 +262,18 @@ topology_template: get_input: - port_1c1_t2_port_mac_requirements - index_value + order: + get_input: + - port_1c1_t2_port_order + - index_value + network_role: + get_input: + - port_1c1_t2_port_network_role + - index_value + subnetpoolid: + get_input: + - port_1c1_t2_port_subnetpoolid + - index_value fixed_ips: get_input: - port_1c1_t2_port_fixed_ips diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml index 67305b71ce..7a439484d6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml @@ -11,11 +11,72 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_1c2_t2_port_order: + type: list + required: true + entry_schema: + type: integer + compute_1c2_catalog_instance_availability_zone: + type: list + required: true + entry_schema: + type: string + port_1c2_t2_port_subnetpoolid: + type: list + required: true + entry_schema: + type: string + port_1c2_t2_port_network_role: + type: list + required: true + entry_schema: + type: string + vm_flavor_name: + type: string + required: true + port_1c2_t2_port_network_role_tag: + type: list + required: true + entry_schema: + type: string + port_1c2_t1_port_vlan_requirements: + type: list + required: true + entry_schema: + type: json + vm_image_name: + type: string + required: true + port_1c2_t2_port_exCP_naming: + type: list + required: true + entry_schema: + type: json + port_1c2_t1_port_order: + type: list + required: true + entry_schema: + type: integer + port_1c2_t1_port_subnetpoolid: + type: list + required: true + entry_schema: + type: string + port_1c2_t2_port_ip_requirements: + type: list + required: true + entry_schema: + type: json port_1c2_t1_port_mac_requirements: type: list required: true entry_schema: type: json + port_1c2_t1_port_network_role: + type: list + required: true + entry_schema: + type: string port_1c2_t2_port_network: type: list required: true @@ -28,11 +89,6 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - compute_1c2_catalog_instance_availability_zone: - type: list - required: true - entry_schema: - type: string compute_1c2_catalog_instance_metadata: type: list required: true @@ -43,9 +99,11 @@ topology_template: required: true entry_schema: type: string - vm_flavor_name: - type: string + port_1c2_t1_port_exCP_naming: + type: list required: true + entry_schema: + type: json port_1c2_t1_port_network: type: list required: true @@ -56,10 +114,7 @@ topology_template: required: true entry_schema: type: json - vm_image_name: - type: string - required: true - port_1c2_t2_port_ip_requirements: + port_1c2_t2_port_vlan_requirements: type: list required: true entry_schema: @@ -115,14 +170,38 @@ topology_template: 1c2_catalog_instance_1c2_t2_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_1c2_t2_port_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_1c2_t2_port_vlan_requirements + - index_value ip_requirements: get_input: - port_1c2_t2_port_ip_requirements - index_value + network_role_tag: + get_input: + - port_1c2_t2_port_network_role_tag + - index_value mac_requirements: get_input: - port_1c2_t2_port_mac_requirements - index_value + order: + get_input: + - port_1c2_t2_port_order + - index_value + network_role: + get_input: + - port_1c2_t2_port_network_role + - index_value + subnetpoolid: + get_input: + - port_1c2_t2_port_subnetpoolid + - index_value network: get_input: - port_1c2_t2_port_network @@ -135,6 +214,14 @@ topology_template: 1c2_catalog_instance_1c2_t1_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_1c2_t1_port_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_1c2_t1_port_vlan_requirements + - index_value ip_requirements: get_input: - port_1c2_t1_port_ip_requirements @@ -147,6 +234,18 @@ topology_template: get_input: - port_1c2_t1_port_mac_requirements - index_value + order: + get_input: + - port_1c2_t1_port_order + - index_value + network_role: + get_input: + - port_1c2_t1_port_network_role + - index_value + subnetpoolid: + get_input: + - port_1c2_t1_port_subnetpoolid + - index_value network: get_input: - port_1c2_t1_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml index 213939c88e..ab88e26fa7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml @@ -11,11 +11,72 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_1c2_t2_port_order: + type: list + required: true + entry_schema: + type: integer + compute_1c2_catalog_instance_availability_zone: + type: list + required: true + entry_schema: + type: string + port_1c2_t2_port_subnetpoolid: + type: list + required: true + entry_schema: + type: string + port_1c2_t2_port_network_role: + type: list + required: true + entry_schema: + type: string + vm_flavor_name: + type: string + required: true + port_1c2_t2_port_network_role_tag: + type: list + required: true + entry_schema: + type: string + port_1c2_t1_port_vlan_requirements: + type: list + required: true + entry_schema: + type: json + vm_image_name: + type: string + required: true + port_1c2_t2_port_exCP_naming: + type: list + required: true + entry_schema: + type: json + port_1c2_t1_port_order: + type: list + required: true + entry_schema: + type: integer + port_1c2_t1_port_subnetpoolid: + type: list + required: true + entry_schema: + type: string + port_1c2_t2_port_ip_requirements: + type: list + required: true + entry_schema: + type: json port_1c2_t1_port_mac_requirements: type: list required: true entry_schema: type: json + port_1c2_t1_port_network_role: + type: list + required: true + entry_schema: + type: string port_1c2_t2_port_network: type: list required: true @@ -28,19 +89,16 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - compute_1c2_catalog_instance_availability_zone: + compute_1c2_catalog_instance_name: type: list required: true entry_schema: type: string - compute_1c2_catalog_instance_name: + port_1c2_t1_port_exCP_naming: type: list required: true entry_schema: - type: string - vm_flavor_name: - type: string - required: true + type: json port_1c2_t1_port_network: type: list required: true @@ -51,10 +109,7 @@ topology_template: required: true entry_schema: type: json - vm_image_name: - type: string - required: true - port_1c2_t2_port_ip_requirements: + port_1c2_t2_port_vlan_requirements: type: list required: true entry_schema: @@ -106,14 +161,38 @@ topology_template: 1c2_catalog_instance_1c2_t2_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_1c2_t2_port_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_1c2_t2_port_vlan_requirements + - index_value ip_requirements: get_input: - port_1c2_t2_port_ip_requirements - index_value + network_role_tag: + get_input: + - port_1c2_t2_port_network_role_tag + - index_value mac_requirements: get_input: - port_1c2_t2_port_mac_requirements - index_value + order: + get_input: + - port_1c2_t2_port_order + - index_value + network_role: + get_input: + - port_1c2_t2_port_network_role + - index_value + subnetpoolid: + get_input: + - port_1c2_t2_port_subnetpoolid + - index_value network: get_input: - port_1c2_t2_port_network @@ -126,6 +205,14 @@ topology_template: 1c2_catalog_instance_1c2_t1_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_1c2_t1_port_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_1c2_t1_port_vlan_requirements + - index_value ip_requirements: get_input: - port_1c2_t1_port_ip_requirements @@ -138,6 +225,18 @@ topology_template: get_input: - port_1c2_t1_port_mac_requirements - index_value + order: + get_input: + - port_1c2_t1_port_order + - index_value + network_role: + get_input: + - port_1c2_t1_port_network_role + - index_value + subnetpoolid: + get_input: + - port_1c2_t1_port_subnetpoolid + - index_value network: get_input: - port_1c2_t1_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml index 409bf1d35f..c0ea9ef793 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml @@ -16,6 +16,62 @@ topology_template: required: true entry_schema: type: json + port_1a_t1_port_ip_requirements: + type: list + required: true + entry_schema: + type: json + port_1a_t2_port_network_role_tag: + type: list + required: true + entry_schema: + type: string + vm_flavor_name: + type: string + required: true + port_1a_t2_port_network_role: + type: list + required: true + entry_schema: + type: string + port_1a_t2_port_network: + type: list + required: true + entry_schema: + type: string + port_1a_t1_port_mac_requirements: + type: list + required: true + entry_schema: + type: json + port_1a_t1_port_network: + type: list + required: true + entry_schema: + type: string + port_1a_t1_port_subnetpoolid: + type: list + required: true + entry_schema: + type: string + vm_image_name: + type: string + required: true + port_1a_t2_port_ip_requirements: + type: list + required: true + entry_schema: + type: json + port_1a_t1_port_vlan_requirements: + type: list + required: true + entry_schema: + type: json + port_1a_t1_port_exCP_naming: + type: list + required: true + entry_schema: + type: json compute_a_single_1a_availability_zone: type: list required: true @@ -33,42 +89,41 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_1a_t1_port_ip_requirements: + port_1a_t1_port_network_role_tag: type: list required: true entry_schema: - type: json - port_1a_t2_port_network_role_tag: + type: string + port_1a_t1_port_network_role: type: list required: true entry_schema: type: string - vm_flavor_name: - type: string + port_1a_t1_port_order: + type: list required: true - port_1a_t2_port_network: + entry_schema: + type: integer + port_1a_t2_port_exCP_naming: type: list required: true entry_schema: - type: string - port_1a_t1_port_mac_requirements: + type: json + port_1a_t2_port_vlan_requirements: type: list required: true entry_schema: type: json - port_1a_t1_port_network: + port_1a_t2_port_subnetpoolid: type: list required: true entry_schema: type: string - vm_image_name: - type: string - required: true - port_1a_t2_port_ip_requirements: + port_1a_t2_port_order: type: list required: true entry_schema: - type: json + type: integer compute_a_single_1a_user_data_format: type: list required: true @@ -88,14 +143,38 @@ topology_template: a_single_1a_1a_t1_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_1a_t1_port_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_1a_t1_port_vlan_requirements + - index_value ip_requirements: get_input: - port_1a_t1_port_ip_requirements - index_value + network_role_tag: + get_input: + - port_1a_t1_port_network_role_tag + - index_value mac_requirements: get_input: - port_1a_t1_port_mac_requirements - index_value + order: + get_input: + - port_1a_t1_port_order + - index_value + network_role: + get_input: + - port_1a_t1_port_network_role + - index_value + subnetpoolid: + get_input: + - port_1a_t1_port_subnetpoolid + - index_value network: get_input: - port_1a_t1_port_network @@ -135,6 +214,14 @@ topology_template: a_single_1a_1a_t2_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_1a_t2_port_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_1a_t2_port_vlan_requirements + - index_value ip_requirements: get_input: - port_1a_t2_port_ip_requirements @@ -147,6 +234,18 @@ topology_template: get_input: - port_1a_t2_port_mac_requirements - index_value + order: + get_input: + - port_1a_t2_port_order + - index_value + network_role: + get_input: + - port_1a_t2_port_network_role + - index_value + subnetpoolid: + get_input: + - port_1a_t2_port_subnetpoolid + - index_value network: get_input: - port_1a_t2_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_0ServiceTemplate.yaml index 97428c699a..1b859d537f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_0ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_0ServiceTemplate.yaml @@ -11,6 +11,62 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_1b_t1_port_order: + type: list + required: true + entry_schema: + type: integer + port_1b_t1_port_network_role: + type: list + required: true + entry_schema: + type: string + port_1b_t1_port_exCP_naming: + type: list + required: true + entry_schema: + type: json + vm_flavor_name: + type: string + required: true + port_1b_t1_port_ip_requirements: + type: list + required: true + entry_schema: + type: json + vm_image_name: + type: string + required: true + port_1b_t2_port_network_role: + type: list + required: true + entry_schema: + type: string + port_1b_t2_port_order: + type: list + required: true + entry_schema: + type: integer + compute_b_single_1b_user_data_format: + type: list + required: true + entry_schema: + type: string + port_1b_t2_port_exCP_naming: + type: list + required: true + entry_schema: + type: json + port_1b_t2_port_network_role_tag: + type: list + required: true + entry_schema: + type: string + port_1b_t2_port_subnetpoolid: + type: list + required: true + entry_schema: + type: string port_1b_t2_port_mac_requirements: type: list required: true @@ -33,27 +89,31 @@ topology_template: required: true entry_schema: type: json - port_1b_t2_port_ip_requirements: + port_1b_t2_port_vlan_requirements: type: list required: true entry_schema: type: json - vm_flavor_name: - type: string - required: true - port_1b_t1_port_ip_requirements: + port_1b_t2_port_ip_requirements: type: list required: true entry_schema: type: json - vm_image_name: - type: string + port_1b_t1_port_network_role_tag: + type: list required: true + entry_schema: + type: string compute_b_single_1b_metadata: type: list required: true entry_schema: type: json + port_1b_t1_port_subnetpoolid: + type: list + required: true + entry_schema: + type: string port_1b_t1_port_mac_requirements: type: list required: true @@ -64,11 +124,11 @@ topology_template: required: true entry_schema: type: string - compute_b_single_1b_user_data_format: + port_1b_t1_port_vlan_requirements: type: list required: true entry_schema: - type: string + type: json compute_b_single_1b_name: type: list required: true @@ -105,14 +165,38 @@ topology_template: b_single_1b_1b_t1_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_1b_t1_port_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_1b_t1_port_vlan_requirements + - index_value ip_requirements: get_input: - port_1b_t1_port_ip_requirements - index_value + network_role_tag: + get_input: + - port_1b_t1_port_network_role_tag + - index_value mac_requirements: get_input: - port_1b_t1_port_mac_requirements - index_value + order: + get_input: + - port_1b_t1_port_order + - index_value + network_role: + get_input: + - port_1b_t1_port_network_role + - index_value + subnetpoolid: + get_input: + - port_1b_t1_port_subnetpoolid + - index_value network: get_attribute: - b_single_1b @@ -125,14 +209,38 @@ topology_template: b_single_1b_1b_t2_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_1b_t2_port_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_1b_t2_port_vlan_requirements + - index_value ip_requirements: get_input: - port_1b_t2_port_ip_requirements - index_value + network_role_tag: + get_input: + - port_1b_t2_port_network_role_tag + - index_value mac_requirements: get_input: - port_1b_t2_port_mac_requirements - index_value + order: + get_input: + - port_1b_t2_port_order + - index_value + network_role: + get_input: + - port_1b_t2_port_network_role + - index_value + subnetpoolid: + get_input: + - port_1b_t2_port_subnetpoolid + - index_value network: get_input: - port_1b_t2_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml index 78243244fa..1feba0fca7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml @@ -11,6 +11,62 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_1b_t1_port_order: + type: list + required: true + entry_schema: + type: integer + port_1b_t1_port_network_role: + type: list + required: true + entry_schema: + type: string + port_1b_t1_port_exCP_naming: + type: list + required: true + entry_schema: + type: json + vm_flavor_name: + type: string + required: true + port_1b_t1_port_ip_requirements: + type: list + required: true + entry_schema: + type: json + vm_image_name: + type: string + required: true + port_1b_t2_port_network_role: + type: list + required: true + entry_schema: + type: string + port_1b_t2_port_order: + type: list + required: true + entry_schema: + type: integer + compute_b_single_1b_user_data_format: + type: list + required: true + entry_schema: + type: string + port_1b_t2_port_exCP_naming: + type: list + required: true + entry_schema: + type: json + port_1b_t2_port_network_role_tag: + type: list + required: true + entry_schema: + type: string + port_1b_t2_port_subnetpoolid: + type: list + required: true + entry_schema: + type: string port_1b_t2_port_mac_requirements: type: list required: true @@ -33,14 +89,16 @@ topology_template: required: true entry_schema: type: json - port_1b_t2_port_ip_requirements: + port_1b_t2_port_vlan_requirements: type: list required: true entry_schema: type: json - vm_flavor_name: - type: string + port_1b_t2_port_ip_requirements: + type: list required: true + entry_schema: + type: json port_1b_t1_port_value_specs: type: list required: true @@ -51,14 +109,11 @@ topology_template: required: true entry_schema: type: string - port_1b_t1_port_ip_requirements: + port_1b_t1_port_subnetpoolid: type: list required: true entry_schema: - type: json - vm_image_name: - type: string - required: true + type: string port_1b_t1_port_mac_requirements: type: list required: true @@ -69,11 +124,11 @@ topology_template: required: true entry_schema: type: string - compute_b_single_1b_user_data_format: + port_1b_t1_port_vlan_requirements: type: list required: true entry_schema: - type: string + type: json port_1b_t1_port_network: type: list required: true @@ -115,6 +170,14 @@ topology_template: get_input: - port_1b_t1_port_value_specs - index_value + exCP_naming: + get_input: + - port_1b_t1_port_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_1b_t1_port_vlan_requirements + - index_value ip_requirements: get_input: - port_1b_t1_port_ip_requirements @@ -127,6 +190,18 @@ topology_template: get_input: - port_1b_t1_port_mac_requirements - index_value + order: + get_input: + - port_1b_t1_port_order + - index_value + network_role: + get_input: + - port_1b_t1_port_network_role + - index_value + subnetpoolid: + get_input: + - port_1b_t1_port_subnetpoolid + - index_value network: get_input: - port_1b_t1_port_network @@ -139,14 +214,38 @@ topology_template: b_single_1b_1b_t2_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_1b_t2_port_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_1b_t2_port_vlan_requirements + - index_value ip_requirements: get_input: - port_1b_t2_port_ip_requirements - index_value + network_role_tag: + get_input: + - port_1b_t2_port_network_role_tag + - index_value mac_requirements: get_input: - port_1b_t2_port_mac_requirements - index_value + order: + get_input: + - port_1b_t2_port_order + - index_value + network_role: + get_input: + - port_1b_t2_port_network_role + - index_value + subnetpoolid: + get_input: + - port_1b_t2_port_subnetpoolid + - index_value network: get_input: - port_1b_t2_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml index d6dd992034..a8e64880b2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -11,32 +11,90 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - server_group: + port_pcm_port_0_network_role: + type: list + required: true + entry_schema: + type: string + availabilityzone_name: + label: availabilityzone name hidden: false immutable: false type: string - connectivityChk: + description: availabilityzone name + port_pcm_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: json + pcm_image_name: + label: image name hidden: false immutable: false - type: json - availabilityzone_name: - label: availabilityzone name + type: string + description: PCRF CM image name + port_pcm_port_0_order: + type: list + required: true + entry_schema: + type: integer + port_pcm_port_0_subnetpoolid: + type: list + required: true + entry_schema: + type: string + port_pcm_port_1_subnetpoolid: + type: list + required: true + entry_schema: + type: string + pcm_server_name: + label: PCRF CM server name hidden: false immutable: false type: string - description: availabilityzone name - oam_net_gw: - label: CPS network gateway + description: PCRF CM server name + cps_net_mask: + label: CPS network mask hidden: false immutable: false type: string - description: CPS network gateway - pcm_image_name: - label: image name + description: CPS network mask + port_pcm_port_1_exCP_naming: + type: list + required: true + entry_schema: + type: json + port_pcm_port_0_exCP_naming: + type: list + required: true + entry_schema: + type: json + oam_net_name: + label: OAM network name hidden: false immutable: false type: string - description: PCRF CM image name + description: OAM network name + port_pcm_port_1_network_role: + type: list + required: true + entry_schema: + type: string + server_group: + hidden: false + immutable: false + type: string + connectivityChk: + hidden: false + immutable: false + type: json + oam_net_gw: + label: CPS network gateway + hidden: false + immutable: false + type: string + description: CPS network gateway security_group_name: label: security group name hidden: false @@ -49,6 +107,11 @@ topology_template: immutable: false type: string description: CPS network ip + port_pcm_port_1_vlan_requirements: + type: list + required: true + entry_schema: + type: json pcm_flavor_name: label: PCRF CM flavor name hidden: false @@ -61,24 +124,12 @@ topology_template: immutable: false type: string description: CPS Cluman Cinder Volume - pcm_server_name: - label: PCRF CM server name - hidden: false - immutable: false - type: string - description: PCRF CM server name cps_net_name: label: CPS network name hidden: false immutable: false type: string description: CPS network name - cps_net_mask: - label: CPS network mask - hidden: false - immutable: false - type: string - description: CPS network mask oam_net_ip: label: OAM network ip hidden: false @@ -91,12 +142,11 @@ topology_template: immutable: false type: string description: CPS network mask - oam_net_name: - label: OAM network name - hidden: false - immutable: false - type: string - description: OAM network name + port_pcm_port_1_order: + type: list + required: true + entry_schema: + type: integer node_templates: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port @@ -109,15 +159,35 @@ topology_template: is_required: false security_groups: - get_input: security_group_name + network_role: + get_input: + - port_pcm_port_1_network_role + - index_value fixed_ips: - ip_address: get_input: oam_net_ip + subnetpoolid: + get_input: + - port_pcm_port_1_subnetpoolid + - index_value mac_requirements: mac_count_required: is_required: false + exCP_naming: + get_input: + - port_pcm_port_1_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_pcm_port_1_vlan_requirements + - index_value network_role_tag: oam network: get_input: oam_net_name + order: + get_input: + - port_pcm_port_1_order + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -150,15 +220,35 @@ topology_template: is_required: false security_groups: - get_input: security_group_name + network_role: + get_input: + - port_pcm_port_0_network_role + - index_value fixed_ips: - ip_address: get_input: cps_net_ip + subnetpoolid: + get_input: + - port_pcm_port_0_subnetpoolid + - index_value mac_requirements: mac_count_required: is_required: false + exCP_naming: + get_input: + - port_pcm_port_0_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_pcm_port_0_vlan_requirements + - index_value network_role_tag: cps network: get_input: cps_net_name + order: + get_input: + - port_pcm_port_0_order + - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable |