From b3d4898d9e8452ea0b8d848c048e712d43b8d9a3 Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Sun, 11 Jun 2017 14:22:02 +0300 Subject: [SDC-29] rebase continue work to align source Change-Id: I218f1c5ee23fb2c8314f1c70921d3ad8682c10f4 Signed-off-by: Michael Lando --- .../GlobalSubstitutionTypesServiceTemplate.yaml | 1120 +++++++++++++++++--- .../out/MainServiceTemplate.yaml | 280 ++--- ...sted_1c11_scalling_instanceServiceTemplate.yaml | 76 +- ...sted_1c12_scalling_instanceServiceTemplate.yaml | 72 +- ...sted_1c2_catalog_instance_0ServiceTemplate.yaml | 121 ++- ...sted_1c2_catalog_instance_1ServiceTemplate.yaml | 119 ++- ...sted_1c2_catalog_instance_2ServiceTemplate.yaml | 119 ++- ...sted_1c2_catalog_instance_3ServiceTemplate.yaml | 119 ++- .../out/Nested_a_single_1aServiceTemplate.yaml | 127 ++- .../out/Nested_a_single_2aServiceTemplate.yaml | 74 +- .../out/Nested_b_single_1b_0ServiceTemplate.yaml | 119 ++- .../out/Nested_b_single_1b_1ServiceTemplate.yaml | 126 ++- .../out/Nested_b_single_2b_0ServiceTemplate.yaml | 123 ++- .../out/Nested_b_single_2b_1ServiceTemplate.yaml | 136 ++- .../out/nested-pcm_v0.1ServiceTemplate.yaml | 150 ++- 15 files changed, 2408 insertions(+), 473 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml index 5f4738ca50..19dc9b133d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -926,6 +926,12 @@ node_types: org.openecomp.resource.abstract.nodes.1c12_scalling_instance: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_1c1_t1_port_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json compute_1c12_scalling_instance_scheduler_hints: type: list required: true @@ -944,10 +950,12 @@ node_types: status: SUPPORTED entry_schema: type: string - vm_image_name: - type: string + port_1c1_t1_port_vlan_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: json port_1c1_t1_port_mac_requirements: type: list required: true @@ -962,40 +970,68 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_1c1_t1_port_name: + vm_flavor_name: + type: string + required: true + status: SUPPORTED + compute_1c12_scalling_instance_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - vm_flavor_name: + port_1c1_t1_port_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + vm_image_name: type: string required: true status: SUPPORTED - compute_1c12_scalling_instance_availability_zone: + port_1c1_t1_port_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c1_t1_port_network: + port_1c1_t1_port_subnetpoolid: type: list required: true status: SUPPORTED entry_schema: type: string - compute_1c12_scalling_instance_user_data_format: + port_1c1_t1_port_network_role_tag: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c1_t1_port_ip_requirements: + port_1c1_t1_port_network_role: type: list required: true status: SUPPORTED entry_schema: - type: json + type: string + compute_1c12_scalling_instance_availability_zone: + 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_t1_port_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer attributes: 1c12_scalling_instance_1c1_t1_port_tenant_id: type: list @@ -1346,16 +1382,24 @@ node_types: org.openecomp.resource.abstract.nodes.1c11_scalling_instance: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_1c1_t1_port_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json port_1c1_t1_port_fixed_ips: type: list required: true status: SUPPORTED entry_schema: type: json - vm_image_name: - type: string + port_1c1_t1_port_vlan_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: json port_1c1_t1_port_mac_requirements: type: list required: true @@ -1370,52 +1414,80 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_1c1_t1_port_name: + vm_flavor_name: + type: string + required: true + status: SUPPORTED + compute_1c11_scalling_instance_name: type: list required: true status: SUPPORTED entry_schema: type: string - compute_1c11_scalling_instance_scheduler_hints: + compute_1c11_scalling_instance_availability_zone: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + compute_1c11_scalling_instance_user_data_format: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_1c1_t1_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: json - vm_flavor_name: + vm_image_name: type: string required: true status: SUPPORTED - compute_1c11_scalling_instance_name: + port_1c1_t1_port_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c1_t1_port_network: + compute_1c11_scalling_instance_scheduler_hints: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_1c1_t1_port_subnetpoolid: type: list required: true status: SUPPORTED entry_schema: type: string - compute_1c11_scalling_instance_availability_zone: + port_1c1_t1_port_network_role_tag: type: list required: true status: SUPPORTED entry_schema: type: string - compute_1c11_scalling_instance_user_data_format: + port_1c1_t1_port_network_role: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c1_t1_port_ip_requirements: + port_1c1_t1_port_network: type: list required: true status: SUPPORTED entry_schema: - type: json + type: string + port_1c1_t1_port_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer attributes: 1c11_scalling_instance_instance_name: type: list @@ -1766,29 +1838,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 @@ -1799,6 +1934,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 @@ -1809,21 +1950,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 @@ -1834,11 +1965,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 @@ -2261,22 +2393,18 @@ node_types: org.openecomp.resource.abstract.nodes.a_single_2a: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - compute_a_single_2a_name: + compute_a_single_2a_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - compute_a_single_2a_user_data_format: + port_1a_t1_port_exCP_naming: type: list required: true status: SUPPORTED entry_schema: - type: string - vm_image_name: - type: string - required: true - status: SUPPORTED + type: json index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2291,12 +2419,30 @@ node_types: status: SUPPORTED entry_schema: type: json + port_1a_t1_port_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_1a_t1_port_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string compute_a_single_2a_scheduler_hints: type: list required: true status: SUPPORTED entry_schema: type: json + port_1a_t1_port_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer compute_a_single_2a_availability_zone: type: list required: true @@ -2307,24 +2453,46 @@ node_types: type: string required: true status: SUPPORTED - compute_a_single_2a_metadata: + port_1a_t1_port_mac_requirements: type: list required: true status: SUPPORTED entry_schema: type: json - port_1a_t1_port_mac_requirements: + port_1a_t1_port_network: type: list required: true status: SUPPORTED entry_schema: - type: json - port_1a_t1_port_network: + type: string + port_1a_t1_port_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + compute_a_single_2a_name: type: list required: true status: SUPPORTED entry_schema: type: string + vm_image_name: + type: string + required: true + status: SUPPORTED + port_1a_t1_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + compute_a_single_2a_metadata: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json attributes: a_single_2a_instance_name: type: list @@ -2670,33 +2838,25 @@ node_types: org.openecomp.resource.abstract.nodes.1c2_catalog_instance_2: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_1c2_t1_port_mac_requirements: + port_1c2_t2_port_order: type: list required: true status: SUPPORTED entry_schema: - type: json - port_1c2_t2_port_network: + type: integer + compute_1c2_catalog_instance_availability_zone: type: list required: true 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_1c2_catalog_instance_availability_zone: + port_1c2_t2_port_subnetpoolid: type: list required: true status: SUPPORTED entry_schema: type: string - compute_1c2_catalog_instance_name: + port_1c2_t2_port_network_role: type: list required: true status: SUPPORTED @@ -2706,13 +2866,13 @@ node_types: type: string required: true status: SUPPORTED - port_1c2_t1_port_network: + port_1c2_t2_port_network_role_tag: type: list required: true status: SUPPORTED entry_schema: type: string - port_1c2_t2_port_mac_requirements: + port_1c2_t1_port_vlan_requirements: type: list required: true status: SUPPORTED @@ -2722,12 +2882,86 @@ node_types: 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 + 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_1c2_catalog_instance_name: + type: list + required: true + status: SUPPORTED + entry_schema: + 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 + status: SUPPORTED + entry_schema: + type: string + port_1c2_t2_port_mac_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_1c2_t2_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json compute_1c2_catalog_instance_user_data_format: type: list required: true @@ -3181,6 +3415,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 @@ -3201,50 +3503,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 @@ -3691,12 +3991,86 @@ node_types: org.openecomp.resource.abstract.nodes.1c2_catalog_instance_3: 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 @@ -3711,22 +4085,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 @@ -3739,11 +4109,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 @@ -4201,6 +4567,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 @@ -4227,32 +4661,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 @@ -4265,12 +4703,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 @@ -4705,12 +5143,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 @@ -4725,12 +5237,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 @@ -4743,10 +5249,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 @@ -4759,11 +5267,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 @@ -5221,12 +5725,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 @@ -5241,22 +5819,18 @@ 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_name: type: list required: true status: SUPPORTED entry_schema: - type: string - vm_flavor_name: - type: string + 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 @@ -5269,11 +5843,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 @@ -5726,6 +6296,80 @@ node_types: org.openecomp.resource.abstract.nodes.b_single_2b_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 + compute_b_single_2b_metadata: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + 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 + compute_b_single_2b_scheduler_hints: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + 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 + 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 compute_b_single_2b_availability_zone: type: list required: true @@ -5746,6 +6390,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_1b_t2_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json port_1b_t2_port_ip_requirements: type: list required: true @@ -5758,50 +6408,42 @@ node_types: status: SUPPORTED entry_schema: type: string - vm_flavor_name: - type: string - required: true - status: SUPPORTED compute_b_single_2b_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - compute_b_single_2b_metadata: + port_1b_t1_port_network_role_tag: type: list required: true status: SUPPORTED entry_schema: - type: json - port_1b_t1_port_ip_requirements: + type: string + 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 status: SUPPORTED entry_schema: type: json - compute_b_single_2b_scheduler_hints: + port_1b_t2_port_network: type: list required: true status: SUPPORTED entry_schema: - type: json - port_1b_t2_port_network: + type: string + port_1b_t1_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: json attributes: b_single_2b_instance_name: type: list @@ -6225,6 +6867,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 @@ -6251,16 +6961,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 @@ -6273,16 +6985,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 @@ -6295,12 +7003,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 @@ -6741,6 +7449,74 @@ node_types: org.openecomp.resource.abstract.nodes.b_single_2b_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 + compute_b_single_2b_scheduler_hints: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + 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 + 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 compute_b_single_2b_availability_zone: type: list required: true @@ -6761,6 +7537,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_1b_t2_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json port_1b_t2_port_ip_requirements: type: list required: true @@ -6773,10 +7555,6 @@ node_types: status: SUPPORTED entry_schema: type: string - vm_flavor_name: - type: string - required: true - status: SUPPORTED port_1b_t1_port_value_specs: type: list required: true @@ -6795,34 +7573,30 @@ 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 status: SUPPORTED entry_schema: type: json - compute_b_single_2b_scheduler_hints: + port_1b_t2_port_network: type: list required: true status: SUPPORTED entry_schema: - type: json - port_1b_t2_port_network: + type: string + 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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml index 4c81d27afc..d61ea01cc8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml @@ -284,32 +284,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 - 3 - 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_1 @@ -342,32 +342,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 @@ -400,13 +400,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_2: get_attribute: @@ -480,21 +490,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: @@ -525,32 +525,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: - RAW1 port_1c2_t1_port_network_role_tag: @@ -708,10 +708,6 @@ topology_template: get_attribute: - abstract_1c2_catalog_instance_1 - 1c2_catalog_instance_instance_name - 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: @@ -737,6 +733,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: @@ -860,6 +860,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_2b_scheduler_hints: + - group: BE_Affinity_group compute_b_single_2b_availability_zone: - get_input: availabilityzone_name port_1b_t2_port_mac_requirements: @@ -875,8 +887,6 @@ topology_template: - get_input: - b_single_2b_names - 1 - vm_flavor_name: - get_input: pd_flavor_name port_1b_t1_port_value_specs: - get_attribute: - abstract_a_single_1a @@ -885,19 +895,9 @@ topology_template: - RAW 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 - compute_b_single_2b_scheduler_hints: - - group: BE_Affinity_group port_1b_t2_port_network: - b_single_1b_network_2 port_1b_t1_port_network: @@ -1025,19 +1025,11 @@ topology_template: get_input: - myIPs - 1 - vm_image_name: - get_input: pd_image_name port_1c1_t1_port_mac_requirements: - mac_count_required: is_required: false - mac_count_required: is_required: false - port_1c1_t1_port_name: - - 1c1_t1_port_01 - - 1c1_t1_port_02 - compute_1c11_scalling_instance_scheduler_hints: - - group: BE_Affinity_group - - group: BE_Affinity_group vm_flavor_name: get_input: pd_flavor_name compute_1c11_scalling_instance_name: @@ -1047,9 +1039,6 @@ topology_template: - get_input: - 1c11_scalling_instance_names - 2 - port_1c1_t1_port_network: - - 1c1_scalling_instance_network - - 1c1_scalling_instance_network compute_1c11_scalling_instance_availability_zone: - get_input: availabilityzone_name - get_input: availabilityzone_name @@ -1067,6 +1056,17 @@ topology_template: is_required: true floating_ip_count_required: is_required: false + vm_image_name: + get_input: pd_image_name + port_1c1_t1_port_name: + - 1c1_t1_port_01 + - 1c1_t1_port_02 + compute_1c11_scalling_instance_scheduler_hints: + - group: BE_Affinity_group + - group: BE_Affinity_group + port_1c1_t1_port_network: + - 1c1_scalling_instance_network + - 1c1_scalling_instance_network service_template_filter: substitute_service_template: Nested_1c11_scalling_instanceServiceTemplate.yaml count: 2 @@ -1085,25 +1085,8 @@ topology_template: directives: - substitutable properties: - compute_b_single_2b_availability_zone: - - get_input: availabilityzone_name - port_1b_t2_port_mac_requirements: - - mac_count_required: - is_required: false - port_1b_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - compute_b_single_2b_name: - - get_input: - - b_single_2b_names - - 0 vm_flavor_name: get_input: pd_flavor_name - compute_b_single_2b_user_data_format: - - RAW compute_b_single_2b_metadata: - connectivityTo4PNested_2: get_attribute: @@ -1177,11 +1160,28 @@ topology_template: is_required: false vm_image_name: get_input: pd_image_name + compute_b_single_2b_scheduler_hints: + - group: BE_Affinity_group + compute_b_single_2b_availability_zone: + - get_input: availabilityzone_name + port_1b_t2_port_mac_requirements: + - mac_count_required: + is_required: false + port_1b_t2_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + compute_b_single_2b_name: + - get_input: + - b_single_2b_names + - 0 + compute_b_single_2b_user_data_format: + - RAW port_1b_t1_port_mac_requirements: - mac_count_required: is_required: false - compute_b_single_2b_scheduler_hints: - - group: BE_Affinity_group port_1b_t2_port_network: - b_single_1b_network_2 service_template_filter: @@ -1231,24 +1231,13 @@ topology_template: - get_input: - 1c12_scalling_instance_names - 2 - vm_image_name: - get_input: pd_image_name port_1c1_t1_port_mac_requirements: - mac_count_required: is_required: false - mac_count_required: is_required: false - port_1c1_t1_port_name: - - 1c1_t1_port_11 - - 1c1_t1_port_12 vm_flavor_name: get_input: pd_flavor_name - compute_1c12_scalling_instance_availability_zone: - - get_input: availabilityzone_name - - get_input: availabilityzone_name - port_1c1_t1_port_network: - - 1c1_scalling_instance_network - - 1c1_scalling_instance_network compute_1c12_scalling_instance_user_data_format: - RAW1 - RAW1 @@ -1263,6 +1252,17 @@ topology_template: is_required: true floating_ip_count_required: is_required: false + vm_image_name: + get_input: pd_image_name + port_1c1_t1_port_name: + - 1c1_t1_port_11 + - 1c1_t1_port_12 + compute_1c12_scalling_instance_availability_zone: + - get_input: availabilityzone_name + - get_input: availabilityzone_name + port_1c1_t1_port_network: + - 1c1_scalling_instance_network + - 1c1_scalling_instance_network service_template_filter: substitute_service_template: Nested_1c12_scalling_instanceServiceTemplate.yaml count: 2 @@ -1411,14 +1411,8 @@ topology_template: directives: - substitutable properties: - compute_a_single_2a_name: - - get_input: - - a_single_2a_names - - 0 compute_a_single_2a_user_data_format: - RAW - vm_image_name: - get_input: pd_image_name port_1a_t1_port_ip_requirements: - - ip_version: 4 ip_count_required: @@ -1431,6 +1425,17 @@ topology_template: - get_input: availabilityzone_name vm_flavor_name: get_input: pd_flavor_name + port_1a_t1_port_mac_requirements: + - mac_count_required: + is_required: false + port_1a_t1_port_network: + - a_single_1a_network + compute_a_single_2a_name: + - get_input: + - a_single_2a_names + - 0 + vm_image_name: + get_input: pd_image_name compute_a_single_2a_metadata: - connectivityTo4PNested_2: get_attribute: @@ -1495,11 +1500,6 @@ topology_template: get_attribute: - abstract_1c2_catalog_instance_1 - 1c2_catalog_instance_instance_name - port_1a_t1_port_mac_requirements: - - mac_count_required: - is_required: false - port_1a_t1_port_network: - - a_single_1a_network service_template_filter: substitute_service_template: Nested_a_single_2aServiceTemplate.yaml count: 1 @@ -1518,6 +1518,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 @@ -1531,29 +1543,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_1 - compute_b_single_1b_user_data_format: - - RAW port_1b_t1_port_network: - get_input: oam_net_name compute_b_single_1b_name: @@ -1762,6 +1762,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 @@ -1775,16 +1787,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_2: get_attribute: @@ -1855,8 +1857,6 @@ topology_template: is_required: false port_1b_t2_port_network: - b_single_1b_network_1 - compute_b_single_1b_user_data_format: - - RAW compute_b_single_1b_name: - get_input: - b_single_1b_names diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml index 610b8d7a56..a249ecf5cc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml @@ -11,14 +11,21 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_1c1_t1_port_exCP_naming: + type: list + required: true + entry_schema: + type: json port_1c1_t1_port_fixed_ips: type: list required: true entry_schema: type: json - vm_image_name: - type: string + port_1c1_t1_port_vlan_requirements: + type: list required: true + entry_schema: + type: json port_1c1_t1_port_mac_requirements: type: list required: true @@ -31,44 +38,67 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_1c1_t1_port_name: + vm_flavor_name: + type: string + required: true + compute_1c11_scalling_instance_name: type: list required: true entry_schema: type: string - compute_1c11_scalling_instance_scheduler_hints: + compute_1c11_scalling_instance_availability_zone: + type: list + required: true + entry_schema: + type: string + compute_1c11_scalling_instance_user_data_format: + type: list + required: true + entry_schema: + type: string + port_1c1_t1_port_ip_requirements: type: list required: true entry_schema: type: json - vm_flavor_name: + vm_image_name: type: string required: true - compute_1c11_scalling_instance_name: + port_1c1_t1_port_name: type: list required: true entry_schema: type: string - port_1c1_t1_port_network: + compute_1c11_scalling_instance_scheduler_hints: + type: list + required: true + entry_schema: + type: json + port_1c1_t1_port_subnetpoolid: type: list required: true entry_schema: type: string - compute_1c11_scalling_instance_availability_zone: + port_1c1_t1_port_network_role_tag: type: list required: true entry_schema: type: string - compute_1c11_scalling_instance_user_data_format: + port_1c1_t1_port_network_role: type: list required: true entry_schema: type: string - port_1c1_t1_port_ip_requirements: + port_1c1_t1_port_network: type: list required: true entry_schema: - type: json + type: string + port_1c1_t1_port_order: + type: list + required: true + entry_schema: + type: integer node_templates: 1c11_scalling_instance: type: org.openecomp.resource.vfc.nodes.heat.1c11_scalling_instance @@ -96,14 +126,38 @@ topology_template: 1c11_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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml index 09698482d3..90c0f22132 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_1c1_t1_port_exCP_naming: + type: list + required: true + entry_schema: + type: json compute_1c12_scalling_instance_scheduler_hints: type: list required: true @@ -26,9 +31,11 @@ topology_template: required: true entry_schema: type: string - vm_image_name: - type: string + port_1c1_t1_port_vlan_requirements: + type: list required: true + entry_schema: + type: json port_1c1_t1_port_mac_requirements: type: list required: true @@ -41,46 +48,93 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_1c1_t1_port_name: + vm_flavor_name: + type: string + required: true + compute_1c12_scalling_instance_user_data_format: type: list required: true entry_schema: type: string - vm_flavor_name: + port_1c1_t1_port_ip_requirements: + type: list + required: true + entry_schema: + type: json + vm_image_name: type: string required: true - compute_1c12_scalling_instance_availability_zone: + port_1c1_t1_port_name: type: list required: true entry_schema: type: string - port_1c1_t1_port_network: + port_1c1_t1_port_subnetpoolid: type: list required: true entry_schema: type: string - compute_1c12_scalling_instance_user_data_format: + port_1c1_t1_port_network_role_tag: type: list required: true entry_schema: type: string - port_1c1_t1_port_ip_requirements: + port_1c1_t1_port_network_role: type: list required: true entry_schema: - type: json + type: string + compute_1c12_scalling_instance_availability_zone: + type: list + required: true + entry_schema: + type: string + port_1c1_t1_port_network: + type: list + required: true + entry_schema: + type: string + port_1c1_t1_port_order: + type: list + required: true + entry_schema: + type: integer node_templates: 1c12_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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/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/twoAppearancePerPatternWithConnectivities/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/twoAppearancePerPatternWithConnectivities/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/twoAppearancePerPatternWithConnectivities/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/twoAppearancePerPatternWithConnectivities/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/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml index 278dffc4ff..e384bc3dc4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/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/twoAppearancePerPatternWithConnectivities/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/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_2ServiceTemplate.yaml index edff50ac2e..1ff0c9b441 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_2ServiceTemplate.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/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_3ServiceTemplate.yaml index 5d93924142..ea49f9743e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_3ServiceTemplate.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/twoAppearancePerPatternWithConnectivities/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/twoAppearancePerPatternWithConnectivities/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/twoAppearancePerPatternWithConnectivities/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/twoAppearancePerPatternWithConnectivities/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/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml index cfd54f1688..800932c2ed 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml @@ -11,19 +11,16 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - compute_a_single_2a_name: + compute_a_single_2a_user_data_format: type: list required: true entry_schema: type: string - compute_a_single_2a_user_data_format: + port_1a_t1_port_exCP_naming: type: list required: true entry_schema: - type: string - vm_image_name: - type: string - required: true + type: json index_value: type: integer description: Index value of this substitution service template runtime instance @@ -36,11 +33,26 @@ topology_template: required: true entry_schema: type: json + port_1a_t1_port_network_role_tag: + type: list + required: true + entry_schema: + type: string + port_1a_t1_port_network_role: + type: list + required: true + entry_schema: + type: string compute_a_single_2a_scheduler_hints: type: list required: true entry_schema: type: json + port_1a_t1_port_order: + type: list + required: true + entry_schema: + type: integer compute_a_single_2a_availability_zone: type: list required: true @@ -49,21 +61,39 @@ topology_template: vm_flavor_name: type: string required: true - compute_a_single_2a_metadata: + port_1a_t1_port_mac_requirements: type: list required: true entry_schema: type: json - port_1a_t1_port_mac_requirements: + port_1a_t1_port_network: type: list required: true entry_schema: - type: json - port_1a_t1_port_network: + type: string + port_1a_t1_port_subnetpoolid: type: list required: true entry_schema: type: string + compute_a_single_2a_name: + type: list + required: true + entry_schema: + type: string + vm_image_name: + type: string + required: true + port_1a_t1_port_vlan_requirements: + type: list + required: true + entry_schema: + type: json + compute_a_single_2a_metadata: + type: list + required: true + entry_schema: + type: json node_templates: a_single_2a: type: org.openecomp.resource.vfc.nodes.heat.a_single_2a @@ -95,14 +125,38 @@ topology_template: a_single_2a_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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/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/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_0ServiceTemplate.yaml index b274d6c05d..d7831802db 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/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/twoAppearancePerPatternWithConnectivities/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,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/twoAppearancePerPatternWithConnectivities/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/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml index 36ead5cbaf..b80c2db770 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/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/twoAppearancePerPatternWithConnectivities/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,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/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_0ServiceTemplate.yaml index 8fb57944db..5ce31a4d71 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_0ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_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 + compute_b_single_2b_scheduler_hints: + type: list + required: true + entry_schema: + type: json + 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 + 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 compute_b_single_2b_availability_zone: type: list required: true @@ -28,6 +84,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_1b_t2_port_vlan_requirements: + type: list + required: true + entry_schema: + type: json port_1b_t2_port_ip_requirements: type: list required: true @@ -38,9 +99,6 @@ topology_template: required: true entry_schema: type: string - vm_flavor_name: - type: string - required: true port_1b_t1_port_value_specs: type: list required: true @@ -56,29 +114,26 @@ 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 entry_schema: type: json - compute_b_single_2b_scheduler_hints: + port_1b_t2_port_network: type: list required: true entry_schema: - type: json - port_1b_t2_port_network: + type: string + 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_2b_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/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml index f867345250..a8680d8869 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml @@ -11,6 +11,67 @@ 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 + compute_b_single_2b_metadata: + type: list + required: true + entry_schema: + type: json + port_1b_t1_port_ip_requirements: + type: list + required: true + entry_schema: + type: json + vm_image_name: + type: string + required: true + compute_b_single_2b_scheduler_hints: + type: list + required: true + entry_schema: + type: json + 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 + 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 compute_b_single_2b_availability_zone: type: list required: true @@ -28,6 +89,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_1b_t2_port_vlan_requirements: + type: list + required: true + entry_schema: + type: json port_1b_t2_port_ip_requirements: type: list required: true @@ -38,42 +104,36 @@ topology_template: required: true entry_schema: type: string - vm_flavor_name: - type: string - required: true compute_b_single_2b_user_data_format: type: list required: true entry_schema: type: string - compute_b_single_2b_metadata: + port_1b_t1_port_network_role_tag: type: list required: true entry_schema: - type: json - port_1b_t1_port_ip_requirements: + type: string + 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 entry_schema: type: json - compute_b_single_2b_scheduler_hints: + port_1b_t2_port_network: type: list required: true entry_schema: - type: json - port_1b_t2_port_network: + type: string + port_1b_t1_port_vlan_requirements: type: list required: true entry_schema: - type: string + type: json node_templates: b_single_2b: type: org.openecomp.resource.vfc.nodes.heat.b_single_2b @@ -105,14 +165,38 @@ topology_template: b_single_2b_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_2b @@ -125,14 +209,38 @@ topology_template: b_single_2b_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/twoAppearancePerPatternWithConnectivities/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/twoAppearancePerPatternWithConnectivities/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/twoAppearancePerPatternWithConnectivities/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/twoAppearancePerPatternWithConnectivities/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 -- cgit 1.2.3-korg