diff options
author | 2017-06-22 18:23:07 +0300 | |
---|---|---|
committer | 2017-06-22 18:23:07 +0300 | |
commit | 68ccc45de18f41cddb79de33a245bceb3b063ffb (patch) | |
tree | d80619a8539a8a03f68304c23eef7e3790ca63c6 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out | |
parent | 7d92498efd0ea61097b241287c004965d46b2c12 (diff) |
[sdc] - latest code changes
Change-Id: I861387094b000367218bb417624fe50d3c37f70e
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out')
10 files changed, 429 insertions, 564 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml index 801b398414..958930407c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -928,52 +928,28 @@ node_types: status: SUPPORTED entry_schema: type: string - server_group: - type: string + port_pcm_port_1_network_role_tag: + 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 - required: true - status: SUPPORTED port_pcm_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements pcm_image_name: type: string description: PCRF CM image name required: true status: SUPPORTED - security_group_name: - type: string - description: the name of security group - required: true - status: SUPPORTED - cps_net_ip: - type: string - 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 - required: true - status: SUPPORTED port_pcm_port_0_order: type: list required: true @@ -992,65 +968,117 @@ node_types: status: SUPPORTED entry_schema: type: string - pcm_vol: - type: string - description: CPS Cluman Cinder Volume + port_pcm_port_0_network_role_tag: + 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_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: + port_pcm_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pcm_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + oam_net_name: type: string - description: OAM network ip + description: OAM network name required: true status: SUPPORTED - oam_net_mask: + port_pcm_port_1_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + server_group: type: string - description: CPS network mask required: true status: SUPPORTED - port_pcm_port_1_exCP_naming: + port_pcm_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - port_pcm_port_0_exCP_naming: + type: org.openecomp.datatypes.network.IpRequirements + oam_net_gw: + type: string + description: CPS network gateway + required: true + status: SUPPORTED + security_group_name: + type: string + description: the name of security group + required: true + status: SUPPORTED + cps_net_ip: + type: string + description: CPS network ip + required: true + status: SUPPORTED + port_pcm_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pcm_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - oam_net_name: + type: org.openecomp.datatypes.network.VlanRequirements + pcm_flavor_name: type: string - description: OAM network name + description: flavor name of PCRF CM instance required: true status: SUPPORTED - port_pcm_port_1_order: + pcm_vol: + type: string + description: CPS Cluman Cinder Volume + required: true + status: SUPPORTED + port_pcm_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: integer - port_pcm_port_1_network_role: + type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + cps_net_name: + type: string + description: CPS network name + required: true + status: SUPPORTED + oam_net_ip: + type: string + description: OAM network ip + required: true + status: SUPPORTED + oam_net_mask: + type: string + description: CPS network mask + required: true + status: SUPPORTED + port_pcm_port_1_order: type: list required: true status: SUPPORTED entry_schema: - type: string + type: integer attributes: server_pcm_id: type: string @@ -1474,17 +1502,15 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_1c1_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1c1_t2_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_1c1_scalling_instance_user_data_format: type: list required: true @@ -1492,9 +1518,11 @@ node_types: entry_schema: type: string port_1c1_t2_port_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string vm_flavor_name: type: string required: true @@ -1550,7 +1578,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1c1_t2_port_ip_requirements: type: list required: true @@ -1610,11 +1638,9 @@ node_types: entry_schema: type: json port_1c1_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1c1_t1_port_subnetpoolid: type: list required: true @@ -2074,9 +2100,11 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1a_t2_port_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string vm_flavor_name: type: string required: true @@ -2124,13 +2152,11 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1a_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json compute_a_single_1a_availability_zone: type: list required: true @@ -2170,17 +2196,15 @@ node_types: entry_schema: type: integer port_1a_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1a_t2_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1a_t2_port_subnetpoolid: type: list required: true @@ -2650,11 +2674,9 @@ node_types: entry_schema: type: string port_1b_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -2688,11 +2710,9 @@ node_types: entry_schema: type: string port_1b_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1b_t2_port_network_role_tag: type: list required: true @@ -2734,7 +2754,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t2_port_ip_requirements: type: list required: true @@ -2742,9 +2762,11 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1b_t1_port_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string port_1b_t1_port_subnetpoolid: type: list required: true @@ -2766,7 +2788,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t1_port_network: type: list required: true @@ -3246,17 +3268,15 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED port_1c2_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1c2_t1_port_order: type: list required: true @@ -3306,11 +3326,9 @@ node_types: entry_schema: type: string port_1c2_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1c2_t1_port_network: type: list required: true @@ -3326,7 +3344,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_1c2_catalog_instance_user_data_format: type: list required: true @@ -3334,9 +3352,11 @@ node_types: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -3816,17 +3836,15 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED port_1c2_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1c2_t1_port_order: type: list required: true @@ -3876,11 +3894,9 @@ node_types: entry_schema: type: string port_1c2_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_1c2_t1_port_network: type: list required: true @@ -3896,7 +3912,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_1c2_catalog_instance_user_data_format: type: list required: true @@ -3904,9 +3920,11 @@ node_types: entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -4382,7 +4400,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t2_port_ip_requirements: type: list required: true @@ -4396,11 +4414,9 @@ node_types: entry_schema: type: string port_1b_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -4454,7 +4470,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_b_single_1b_user_data_format: type: list required: true @@ -4462,11 +4478,9 @@ node_types: entry_schema: type: string port_1b_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json compute_b_single_1b_name: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml index 957f77e8d9..2b3b7f6275 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml @@ -88,14 +88,34 @@ topology_template: directives: - substitutable properties: - pcm_flavor_name: - get_input: pcm_flavor_name - service_template_filter: - substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml server_group: BE_Affinity_group + port_pcm_port_1_network_role_tag: oam + port_pcm_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false pcm_image_name: get_input: pcm_image_name security_group_name: jsa_security_group + port_pcm_port_1_mac_requirements: + mac_count_required: + is_required: false + pcm_flavor_name: + get_input: pcm_flavor_name + service_template_filter: + substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml + port_pcm_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_pcm_port_0_network_role_tag: cps + port_pcm_port_0_mac_requirements: + mac_count_required: + is_required: false pcm_server_name: get_input: - pcm_server_names @@ -114,20 +134,16 @@ topology_template: compute_1c1_scalling_instance_user_data_format: - RAW2 - RAW1 - port_1c1_t2_port_network_role_tag: ppds + port_1c1_t2_port_network_role_tag: + - ppds vm_flavor_name: get_input: pd_flavor_name port_1c1_t1_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false vm_image_name: get_input: pd_image_name compute_1c1_scalling_instance_name: @@ -142,39 +158,24 @@ topology_template: - 1c1_t1_port_0 port_1c1_t1_port_network: - 1c1_scalling_instance_network - - 1c1_scalling_instance_network port_1c1_t2_port_fixed_ips: - - - ip_address: - get_input: - - myIPs - - 1 - - - ip_address: - get_input: - - myIPs - - 1 + - ip_address: + get_input: + - myIPs + - 1 port_1c1_t2_port_network: - get_input: ppds_net_name - - get_input: ppds_net_name port_1c1_t1_port_fixed_ips: - - - ip_address: - get_input: - - myIPs - - 1 - - - ip_address: - get_input: - - myIPs - - 1 + - ip_address: + get_input: + - myIPs + - 1 port_1c1_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false port_1c1_t1_port_mac_requirements: mac_count_required: is_required: false @@ -216,19 +217,19 @@ topology_template: compute_b_single_1b_scheduler_hints: - group: BE_Affinity_group port_1b_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + 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 + - 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: @@ -272,11 +273,11 @@ topology_template: 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 + - 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 @@ -293,13 +294,14 @@ topology_template: is_required: false compute_1c2_catalog_instance_user_data_format: - RAW1 - port_1c2_t1_port_network_role_tag: oam + port_1c2_t1_port_network_role_tag: + - oam port_1c2_t1_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_1c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -327,11 +329,11 @@ topology_template: 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 + - 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 @@ -350,13 +352,14 @@ topology_template: - get_attribute: - abstract_1c2_catalog_instance_0 - 1c2_catalog_instance_instance_name - port_1c2_t1_port_network_role_tag: oam + port_1c2_t1_port_network_role_tag: + - oam port_1c2_t1_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_1c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -502,12 +505,13 @@ topology_template: - substitutable properties: port_1a_t1_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_1a_t2_port_network_role_tag: ppds + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_1a_t2_port_network_role_tag: + - ppds vm_flavor_name: get_input: pd_flavor_name port_1a_t2_port_network: @@ -520,11 +524,11 @@ topology_template: vm_image_name: get_input: pd_image_name port_1a_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + 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: @@ -687,11 +691,11 @@ topology_template: 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 + - 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: @@ -704,12 +708,13 @@ topology_template: compute_b_single_1b_scheduler_hints: - group: BE_Affinity_group port_1b_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_1b_t1_port_network_role_tag: oam + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_1b_t1_port_network_role_tag: + - oam port_1b_t1_port_mac_requirements: mac_count_required: is_required: false @@ -844,4 +849,4 @@ topology_template: name: def affinity: host targets: - - BE_Affinity_group + - BE_Affinity_group
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml index 161490e425..fae0d4871a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml @@ -12,23 +12,23 @@ node_types: topology_template: inputs: port_1c1_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1c1_t2_port_vlan_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_1c1_scalling_instance_user_data_format: type: list required: true entry_schema: type: string port_1c1_t2_port_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string vm_flavor_name: type: string required: true @@ -74,7 +74,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1c1_t2_port_ip_requirements: type: list required: true @@ -124,10 +124,8 @@ topology_template: entry_schema: type: json port_1c1_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1c1_t1_port_subnetpoolid: type: list required: true @@ -153,33 +151,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1c1_t1_port_exCP_naming - - index_value + get_input: port_1c1_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1c1_t1_port_vlan_requirements - - index_value + get_input: port_1c1_t1_port_vlan_requirements ip_requirements: get_input: port_1c1_t1_port_ip_requirements network_role_tag: - get_input: - - port_1c1_t1_port_network_role_tag - - index_value + get_input: port_1c1_t1_port_network_role_tag mac_requirements: get_input: port_1c1_t1_port_mac_requirements order: - get_input: - - port_1c1_t1_port_order - - index_value + get_input: port_1c1_t1_port_order network_role: - get_input: - - port_1c1_t1_port_network_role - - index_value + get_input: port_1c1_t1_port_network_role subnetpoolid: - get_input: - - port_1c1_t1_port_subnetpoolid - - index_value + get_input: port_1c1_t1_port_subnetpoolid fixed_ips: get_input: port_1c1_t1_port_fixed_ips name: @@ -222,13 +208,9 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1c1_t2_port_exCP_naming - - index_value + get_input: port_1c1_t2_port_exCP_naming vlan_requirements: - get_input: - - port_1c1_t2_port_vlan_requirements - - index_value + get_input: port_1c1_t2_port_vlan_requirements ip_requirements: get_input: port_1c1_t2_port_ip_requirements network_role_tag: @@ -236,17 +218,11 @@ topology_template: mac_requirements: get_input: port_1c1_t2_port_mac_requirements order: - get_input: - - port_1c1_t2_port_order - - index_value + get_input: port_1c1_t2_port_order network_role: - get_input: - - port_1c1_t2_port_network_role - - index_value + get_input: port_1c1_t2_port_network_role subnetpoolid: - get_input: - - port_1c1_t2_port_subnetpoolid - - index_value + get_input: port_1c1_t2_port_subnetpoolid fixed_ips: get_input: port_1c1_t2_port_fixed_ips name: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/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/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml index 01a6ef2c9a..fd0276496e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/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/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml @@ -43,15 +43,13 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true port_1c2_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1c2_t1_port_order: type: list required: true @@ -93,10 +91,8 @@ topology_template: entry_schema: type: string port_1c2_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1c2_t1_port_network: type: list required: true @@ -109,15 +105,17 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_1c2_catalog_instance_user_data_format: type: list required: true entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -156,33 +154,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1c2_t2_port_exCP_naming - - index_value + get_input: port_1c2_t2_port_exCP_naming vlan_requirements: - get_input: - - port_1c2_t2_port_vlan_requirements - - index_value + get_input: port_1c2_t2_port_vlan_requirements ip_requirements: get_input: port_1c2_t2_port_ip_requirements network_role_tag: - get_input: - - port_1c2_t2_port_network_role_tag - - index_value + get_input: port_1c2_t2_port_network_role_tag mac_requirements: get_input: port_1c2_t2_port_mac_requirements order: - get_input: - - port_1c2_t2_port_order - - index_value + get_input: port_1c2_t2_port_order network_role: - get_input: - - port_1c2_t2_port_network_role - - index_value + get_input: port_1c2_t2_port_network_role subnetpoolid: - get_input: - - port_1c2_t2_port_subnetpoolid - - index_value + get_input: port_1c2_t2_port_subnetpoolid network: get_input: - port_1c2_t2_port_network @@ -196,13 +182,9 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1c2_t1_port_exCP_naming - - index_value + get_input: port_1c2_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1c2_t1_port_vlan_requirements - - index_value + get_input: port_1c2_t1_port_vlan_requirements ip_requirements: get_input: port_1c2_t1_port_ip_requirements network_role_tag: @@ -210,17 +192,11 @@ topology_template: mac_requirements: get_input: port_1c2_t1_port_mac_requirements order: - get_input: - - port_1c2_t1_port_order - - index_value + get_input: port_1c2_t1_port_order network_role: - get_input: - - port_1c2_t1_port_network_role - - index_value + get_input: port_1c2_t1_port_network_role subnetpoolid: - get_input: - - port_1c2_t1_port_subnetpoolid - - index_value + get_input: port_1c2_t1_port_subnetpoolid 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/oneAppearancePerPattern/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/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml index 5a7b354ee6..22a98f80ad 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/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/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml @@ -43,15 +43,13 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true port_1c2_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1c2_t1_port_order: type: list required: true @@ -93,10 +91,8 @@ topology_template: entry_schema: type: string port_1c2_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1c2_t1_port_network: type: list required: true @@ -109,15 +105,17 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_1c2_catalog_instance_user_data_format: type: list required: true entry_schema: type: string port_1c2_t1_port_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string port_1c2_t1_port_ip_requirements: type: list required: true @@ -156,33 +154,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1c2_t2_port_exCP_naming - - index_value + get_input: port_1c2_t2_port_exCP_naming vlan_requirements: - get_input: - - port_1c2_t2_port_vlan_requirements - - index_value + get_input: port_1c2_t2_port_vlan_requirements ip_requirements: get_input: port_1c2_t2_port_ip_requirements network_role_tag: - get_input: - - port_1c2_t2_port_network_role_tag - - index_value + get_input: port_1c2_t2_port_network_role_tag mac_requirements: get_input: port_1c2_t2_port_mac_requirements order: - get_input: - - port_1c2_t2_port_order - - index_value + get_input: port_1c2_t2_port_order network_role: - get_input: - - port_1c2_t2_port_network_role - - index_value + get_input: port_1c2_t2_port_network_role subnetpoolid: - get_input: - - port_1c2_t2_port_subnetpoolid - - index_value + get_input: port_1c2_t2_port_subnetpoolid network: get_input: - port_1c2_t2_port_network @@ -196,13 +182,9 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1c2_t1_port_exCP_naming - - index_value + get_input: port_1c2_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1c2_t1_port_vlan_requirements - - index_value + get_input: port_1c2_t1_port_vlan_requirements ip_requirements: get_input: port_1c2_t1_port_ip_requirements network_role_tag: @@ -210,17 +192,11 @@ topology_template: mac_requirements: get_input: port_1c2_t1_port_mac_requirements order: - get_input: - - port_1c2_t1_port_order - - index_value + get_input: port_1c2_t1_port_order network_role: - get_input: - - port_1c2_t1_port_network_role - - index_value + get_input: port_1c2_t1_port_network_role subnetpoolid: - get_input: - - port_1c2_t1_port_subnetpoolid - - index_value + get_input: port_1c2_t1_port_subnetpoolid 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/oneAppearancePerPattern/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/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml index 17f4474844..595d5d01a0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/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/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml @@ -17,8 +17,10 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1a_t2_port_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string vm_flavor_name: type: string required: true @@ -57,12 +59,10 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1a_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json compute_a_single_1a_availability_zone: type: list required: true @@ -96,15 +96,13 @@ topology_template: entry_schema: type: integer port_1a_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1a_t2_port_vlan_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1a_t2_port_subnetpoolid: type: list required: true @@ -133,33 +131,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1a_t1_port_exCP_naming - - index_value + get_input: port_1a_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1a_t1_port_vlan_requirements - - index_value + get_input: port_1a_t1_port_vlan_requirements ip_requirements: get_input: port_1a_t1_port_ip_requirements network_role_tag: - get_input: - - port_1a_t1_port_network_role_tag - - index_value + get_input: port_1a_t1_port_network_role_tag mac_requirements: get_input: port_1a_t1_port_mac_requirements order: - get_input: - - port_1a_t1_port_order - - index_value + get_input: port_1a_t1_port_order network_role: - get_input: - - port_1a_t1_port_network_role - - index_value + get_input: port_1a_t1_port_network_role subnetpoolid: - get_input: - - port_1a_t1_port_subnetpoolid - - index_value + get_input: port_1a_t1_port_subnetpoolid network: get_input: - port_1a_t1_port_network @@ -196,13 +182,9 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1a_t2_port_exCP_naming - - index_value + get_input: port_1a_t2_port_exCP_naming vlan_requirements: - get_input: - - port_1a_t2_port_vlan_requirements - - index_value + get_input: port_1a_t2_port_vlan_requirements ip_requirements: get_input: port_1a_t2_port_ip_requirements network_role_tag: @@ -210,17 +192,11 @@ topology_template: mac_requirements: get_input: port_1a_t2_port_mac_requirements order: - get_input: - - port_1a_t2_port_order - - index_value + get_input: port_1a_t2_port_order network_role: - get_input: - - port_1a_t2_port_network_role - - index_value + get_input: port_1a_t2_port_network_role subnetpoolid: - get_input: - - port_1a_t2_port_subnetpoolid - - index_value + get_input: port_1a_t2_port_subnetpoolid 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/oneAppearancePerPattern/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/oneAppearancePerPattern/out/Nested_b_single_1b_0ServiceTemplate.yaml index f167185618..28a98f316f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/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/oneAppearancePerPattern/out/Nested_b_single_1b_0ServiceTemplate.yaml @@ -40,7 +40,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t2_port_ip_requirements: type: list required: true @@ -52,10 +52,8 @@ topology_template: entry_schema: type: string port_1b_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -99,17 +97,15 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_b_single_1b_user_data_format: type: list required: true entry_schema: type: string port_1b_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json compute_b_single_1b_name: type: list required: true @@ -153,33 +149,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1b_t1_port_exCP_naming - - index_value + get_input: port_1b_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1b_t1_port_vlan_requirements - - index_value + get_input: port_1b_t1_port_vlan_requirements ip_requirements: get_input: port_1b_t1_port_ip_requirements network_role_tag: - get_input: - - port_1b_t1_port_network_role_tag - - index_value + get_input: port_1b_t1_port_network_role_tag mac_requirements: get_input: port_1b_t1_port_mac_requirements order: - get_input: - - port_1b_t1_port_order - - index_value + get_input: port_1b_t1_port_order network_role: - get_input: - - port_1b_t1_port_network_role - - index_value + get_input: port_1b_t1_port_network_role subnetpoolid: - get_input: - - port_1b_t1_port_subnetpoolid - - index_value + get_input: port_1b_t1_port_subnetpoolid network: get_attribute: - b_single_1b @@ -193,33 +177,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1b_t2_port_exCP_naming - - index_value + get_input: port_1b_t2_port_exCP_naming vlan_requirements: - get_input: - - port_1b_t2_port_vlan_requirements - - index_value + get_input: port_1b_t2_port_vlan_requirements ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: - get_input: - - port_1b_t2_port_network_role_tag - - index_value + get_input: port_1b_t2_port_network_role_tag mac_requirements: get_input: port_1b_t2_port_mac_requirements order: - get_input: - - port_1b_t2_port_order - - index_value + get_input: port_1b_t2_port_order network_role: - get_input: - - port_1b_t2_port_network_role - - index_value + get_input: port_1b_t2_port_network_role subnetpoolid: - get_input: - - port_1b_t2_port_subnetpoolid - - index_value + get_input: port_1b_t2_port_subnetpoolid 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/oneAppearancePerPattern/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/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml index 33830f7a38..35b6ab9b4a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/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/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml @@ -22,10 +22,8 @@ topology_template: entry_schema: type: string port_1b_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -53,10 +51,8 @@ topology_template: entry_schema: type: string port_1b_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_1b_t2_port_network_role_tag: type: list required: true @@ -91,15 +87,17 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t2_port_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_1b_t1_port_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string port_1b_t1_port_subnetpoolid: type: list required: true @@ -117,7 +115,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t1_port_network: type: list required: true @@ -156,13 +154,9 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1b_t1_port_exCP_naming - - index_value + get_input: port_1b_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1b_t1_port_vlan_requirements - - index_value + get_input: port_1b_t1_port_vlan_requirements ip_requirements: get_input: port_1b_t1_port_ip_requirements network_role_tag: @@ -170,17 +164,11 @@ topology_template: mac_requirements: get_input: port_1b_t1_port_mac_requirements order: - get_input: - - port_1b_t1_port_order - - index_value + get_input: port_1b_t1_port_order network_role: - get_input: - - port_1b_t1_port_network_role - - index_value + get_input: port_1b_t1_port_network_role subnetpoolid: - get_input: - - port_1b_t1_port_subnetpoolid - - index_value + get_input: port_1b_t1_port_subnetpoolid network: get_input: - port_1b_t1_port_network @@ -194,33 +182,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1b_t2_port_exCP_naming - - index_value + get_input: port_1b_t2_port_exCP_naming vlan_requirements: - get_input: - - port_1b_t2_port_vlan_requirements - - index_value + get_input: port_1b_t2_port_vlan_requirements ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: - get_input: - - port_1b_t2_port_network_role_tag - - index_value + get_input: port_1b_t2_port_network_role_tag mac_requirements: get_input: port_1b_t2_port_mac_requirements order: - get_input: - - port_1b_t2_port_order - - index_value + get_input: port_1b_t2_port_order network_role: - get_input: - - port_1b_t2_port_network_role - - index_value + get_input: port_1b_t2_port_network_role subnetpoolid: - get_input: - - port_1b_t2_port_subnetpoolid - - index_value + get_input: port_1b_t2_port_subnetpoolid 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/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml index 8d8e5cc5cb..587ee1d4a6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml @@ -668,4 +668,4 @@ topology_template: - dependency dependency_pcm_port_2: - pcm_port_2 - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/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/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml index caa366f570..973ca85b4d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/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/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -16,33 +16,92 @@ topology_template: required: true entry_schema: type: string - server_group: - hidden: false - immutable: false - type: string + port_pcm_port_1_network_role_tag: + type: list + required: true + entry_schema: + type: string availabilityzone_name: label: availabilityzone name hidden: false immutable: false type: string description: availabilityzone name - oam_net_gw: - label: CPS network gateway - hidden: false - immutable: false - type: string - description: CPS network gateway port_pcm_port_0_vlan_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements pcm_image_name: label: image name hidden: false immutable: false 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 + port_pcm_port_0_network_role_tag: + type: list + required: true + entry_schema: + type: string + pcm_server_name: + label: PCRF CM server name + hidden: false + immutable: false + type: string + description: PCRF CM server name + cps_net_mask: + label: CPS network mask + hidden: false + immutable: false + type: string + description: CPS network mask + port_pcm_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pcm_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + oam_net_name: + label: OAM network name + hidden: false + immutable: false + type: string + 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 + port_pcm_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + 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 @@ -55,56 +114,40 @@ topology_template: immutable: false type: string description: CPS network ip + port_pcm_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true port_pcm_port_1_vlan_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements pcm_flavor_name: label: PCRF CM flavor name hidden: false immutable: false type: string description: flavor name of PCRF CM instance - 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_vol: label: CPS Cluman Cinder Volume hidden: false 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 + port_pcm_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true 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 @@ -117,73 +160,38 @@ topology_template: immutable: false type: string 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: OAM network name port_pcm_port_1_order: type: list required: true entry_schema: type: integer - port_pcm_port_1_network_role: - type: list - required: true - entry_schema: - type: string node_templates: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + get_input: port_pcm_port_1_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: - - port_pcm_port_1_network_role - - index_value + get_input: port_pcm_port_1_network_role fixed_ips: - ip_address: get_input: oam_net_ip subnetpoolid: - get_input: - - port_pcm_port_1_subnetpoolid - - index_value + get_input: port_pcm_port_1_subnetpoolid mac_requirements: - mac_count_required: - is_required: false + get_input: port_pcm_port_1_mac_requirements exCP_naming: - get_input: - - port_pcm_port_1_exCP_naming - - index_value + get_input: port_pcm_port_1_exCP_naming vlan_requirements: - get_input: - - port_pcm_port_1_vlan_requirements - - index_value - network_role_tag: oam + get_input: port_pcm_port_1_vlan_requirements + network_role_tag: + get_input: port_pcm_port_1_network_role_tag network: get_input: oam_net_name order: - get_input: - - port_pcm_port_1_order - - index_value + get_input: port_pcm_port_1_order requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -209,42 +217,28 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + get_input: port_pcm_port_0_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: - - port_pcm_port_0_network_role - - index_value + get_input: port_pcm_port_0_network_role fixed_ips: - ip_address: get_input: cps_net_ip subnetpoolid: - get_input: - - port_pcm_port_0_subnetpoolid - - index_value + get_input: port_pcm_port_0_subnetpoolid mac_requirements: - mac_count_required: - is_required: false + get_input: port_pcm_port_0_mac_requirements exCP_naming: - get_input: - - port_pcm_port_0_exCP_naming - - index_value + get_input: port_pcm_port_0_exCP_naming vlan_requirements: - get_input: - - port_pcm_port_0_vlan_requirements - - index_value - network_role_tag: cps + get_input: port_pcm_port_0_vlan_requirements + network_role_tag: + get_input: port_pcm_port_0_network_role_tag network: get_input: cps_net_name order: - get_input: - - port_pcm_port_0_order - - index_value + get_input: port_pcm_port_0_order requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -474,4 +468,4 @@ topology_template: - dependency dependency_pcm_port_1: - pcm_port_1 - - dependency
\ No newline at end of file + - dependency |