diff options
author | Michael Lando <ml636r@att.com> | 2017-06-17 22:40:44 +0300 |
---|---|---|
committer | Michael Lando <ml636r@att.com> | 2017-06-18 07:20:49 +0300 |
commit | 4d97d5fac309ce0d66938e5ccd0349e2660d4e23 (patch) | |
tree | 3f921054f997d1962fa6f9db9a0119e31a851eea /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution | |
parent | 89786d31f266a205857cae0177904c249ac6a512 (diff) |
[sdc] update code of sdc
Change-Id: If9f37c80b659cb67b34d18e6c019defecca58b9a
Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution')
80 files changed, 806 insertions, 1735 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml index b003fc2638..aedcf16033 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -29,11 +29,9 @@ node_types: entry_schema: type: string port_pd02_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_pd01_port_exCP_naming: type: list required: true @@ -57,17 +55,13 @@ node_types: entry_schema: type: string port_pd02_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_pd02_port_vlan_requirements: type: list required: true @@ -83,7 +77,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true @@ -125,13 +119,11 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -563,4 +555,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml index 19b518f0ad..c2b97507e7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml @@ -431,14 +431,13 @@ topology_template: - pd_server_names - 0 port_pd02_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_network_role_tag: - - oam + port_pd02_port_network_role_tag: oam port_pd01_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false vm_image_name: get_input: pd_image_name @@ -456,8 +455,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam port_pd02_port_network: - get_input: oam_net_name compute_pd_server_user_data_format: @@ -477,4 +475,4 @@ topology_template: heat_file: ../Artifacts/hot-mog-0108-bs1271.yml description: heat template that creates MOG stack members: - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml index 6d0690a78d..8a9b737df1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml @@ -29,10 +29,8 @@ topology_template: entry_schema: type: string port_pd02_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_pd01_port_exCP_naming: type: list required: true @@ -52,15 +50,11 @@ topology_template: entry_schema: type: string port_pd02_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_pd02_port_vlan_requirements: type: list required: true @@ -73,7 +67,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true @@ -108,12 +102,10 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -161,17 +153,11 @@ topology_template: - port_pd01_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_ip_requirements - - index_value + get_input: port_pd01_port_ip_requirements network_role_tag: - get_input: - - port_pd01_port_network_role_tag - - index_value + get_input: port_pd01_port_network_role_tag mac_requirements: - get_input: - - port_pd01_port_mac_requirements - - index_value + get_input: port_pd01_port_mac_requirements order: get_input: - port_pd01_port_order @@ -205,17 +191,11 @@ topology_template: - port_pd02_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd02_port_ip_requirements - - index_value + get_input: port_pd02_port_ip_requirements network_role_tag: - get_input: - - port_pd02_port_network_role_tag - - index_value + get_input: port_pd02_port_network_role_tag mac_requirements: - get_input: - - port_pd02_port_mac_requirements - - index_value + get_input: port_pd02_port_mac_requirements order: get_input: - port_pd02_port_order @@ -447,4 +427,4 @@ topology_template: - dependency dependency_pd_server_pd02_port: - pd_server_pd02_port - - 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/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml index cad5199137..8164a9303c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -9,11 +9,9 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_port_network: type: list required: true @@ -73,7 +71,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_port_network_role: type: list required: true @@ -449,4 +447,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml index 6b57e2663d..7a2ad64f4e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml @@ -56,7 +56,7 @@ topology_template: - substitutable properties: port_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false port_port_network: - get_input: port_name @@ -129,4 +129,4 @@ topology_template: name: def affinity: host targets: - - BE_Affinity_group
\ No newline at end of file + - BE_Affinity_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml index 77117043d6..a6072f527f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml @@ -12,10 +12,8 @@ node_types: topology_template: inputs: port_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_port_network: type: list required: true @@ -65,7 +63,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_port_network_role: type: list required: true @@ -116,17 +114,13 @@ topology_template: - port_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_port_ip_requirements - - index_value + get_input: port_port_ip_requirements network_role_tag: get_input: - port_port_network_role_tag - index_value mac_requirements: - get_input: - - port_port_mac_requirements - - index_value + get_input: port_port_mac_requirements order: get_input: - port_port_order @@ -346,4 +340,4 @@ topology_template: - dependency local_storage_smp: - smp - - local_storage
\ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 2adc34400a..86039d69b7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -37,17 +37,13 @@ node_types: entry_schema: type: json port_pd02_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json vm_image_name: type: string required: true @@ -63,7 +59,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd02_port_network_role: type: list required: true @@ -91,11 +87,9 @@ node_types: constraints: - greater_or_equal: 0 port_pd02_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_pd01_port_exCP_naming: type: list required: true @@ -161,13 +155,11 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd02_port_network: type: list required: true @@ -587,4 +579,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml index 751466605b..fcaff2cb29 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml @@ -108,10 +108,9 @@ topology_template: get_input: pd_flavor_name port_pd01_port_security_groups: - - jsa_security_group - port_pd02_port_network_role_tag: - - oam + port_pd02_port_network_role_tag: oam port_pd01_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false vm_image_name: get_input: pd_image_name @@ -126,7 +125,7 @@ topology_template: compute_pd_server_user_data_format: - RAW port_pd02_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false port_pd02_port_security_groups: - - jsa_security_group @@ -138,8 +137,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam port_pd02_port_network: - get_input: oam_net_name service_template_filter: @@ -159,4 +157,4 @@ topology_template: members: - resources_with_dependOn - jsa_security_group - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml index 159644651b..d543e555cd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml @@ -35,15 +35,11 @@ topology_template: entry_schema: type: json port_pd02_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json vm_image_name: type: string required: true @@ -56,7 +52,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd02_port_network_role: type: list required: true @@ -80,10 +76,8 @@ topology_template: constraints: - greater_or_equal: 0 port_pd02_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_pd01_port_exCP_naming: type: list required: true @@ -138,12 +132,10 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd02_port_network: type: list required: true @@ -189,17 +181,11 @@ topology_template: - port_pd01_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_ip_requirements - - index_value + get_input: port_pd01_port_ip_requirements network_role_tag: - get_input: - - port_pd01_port_network_role_tag - - index_value + get_input: port_pd01_port_network_role_tag mac_requirements: - get_input: - - port_pd01_port_mac_requirements - - index_value + get_input: port_pd01_port_mac_requirements order: get_input: - port_pd01_port_order @@ -241,17 +227,11 @@ topology_template: - port_pd02_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd02_port_ip_requirements - - index_value + get_input: port_pd02_port_ip_requirements network_role_tag: - get_input: - - port_pd02_port_network_role_tag - - index_value + get_input: port_pd02_port_network_role_tag mac_requirements: - get_input: - - port_pd02_port_mac_requirements - - index_value + get_input: port_pd02_port_mac_requirements order: get_input: - port_pd02_port_order @@ -483,4 +463,4 @@ topology_template: - dependency dependency_pd_server_pd02_port: - pd_server_pd02_port - - 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/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index d18921cdfa..0cac11e849 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -37,11 +37,9 @@ node_types: entry_schema: type: string port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json vm_image_name: type: string required: true @@ -57,7 +55,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd02_port_network_role: type: list required: true @@ -85,11 +83,9 @@ node_types: constraints: - greater_or_equal: 0 port_pd02_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_pd01_port_exCP_naming: type: list required: true @@ -149,7 +145,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: type: list required: true @@ -575,4 +571,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml index 1e714f26c2..243892f9ff 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml @@ -103,7 +103,7 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name port_pd01_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false vm_image_name: get_input: pd_image_name @@ -118,7 +118,7 @@ topology_template: compute_pd_server_user_data_format: - RAW port_pd02_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false port_pd01_port_network: - packet_mirror_network @@ -170,4 +170,4 @@ topology_template: members: - packet_mirror_network - pd01_volume - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml index 64104dc20f..b8464a4c6a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml @@ -35,10 +35,8 @@ topology_template: entry_schema: type: string port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json vm_image_name: type: string required: true @@ -51,7 +49,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd02_port_network_role: type: list required: true @@ -75,10 +73,8 @@ topology_template: constraints: - greater_or_equal: 0 port_pd02_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_pd01_port_exCP_naming: type: list required: true @@ -128,7 +124,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: type: list required: true @@ -175,17 +171,13 @@ topology_template: - port_pd01_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_ip_requirements - - index_value + get_input: port_pd01_port_ip_requirements network_role_tag: get_input: - port_pd01_port_network_role_tag - index_value mac_requirements: - get_input: - - port_pd01_port_mac_requirements - - index_value + get_input: port_pd01_port_mac_requirements order: get_input: - port_pd01_port_order @@ -223,17 +215,13 @@ topology_template: - port_pd02_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd02_port_ip_requirements - - index_value + get_input: port_pd02_port_ip_requirements network_role_tag: get_input: - port_pd02_port_network_role_tag - index_value mac_requirements: - get_input: - - port_pd02_port_mac_requirements - - index_value + get_input: port_pd02_port_mac_requirements order: get_input: - port_pd02_port_order @@ -465,4 +453,4 @@ topology_template: - dependency dependency_pd_server_pd02_port: - pd_server_pd02_port - - 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/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index b956d579e3..fd982f3413 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -9,11 +9,9 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_pd01_port_0_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_pd01_port_0_network: type: list required: true @@ -25,7 +23,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_1_security_groups: type: list required: true @@ -83,11 +81,9 @@ node_types: required: true status: SUPPORTED port_pd01_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_subnetpoolid: type: list required: true @@ -107,17 +103,15 @@ node_types: entry_schema: type: string port_pd01_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -145,11 +139,9 @@ node_types: entry_schema: type: json port_pd01_port_1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_pd01_port_1_replacement_policy: type: list required: true @@ -587,4 +579,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml index 7c295f9e48..ca2f05268e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml @@ -97,7 +97,7 @@ topology_template: - substitutable properties: port_pd01_port_0_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false port_pd01_port_0_network: - get_input: oam_net_name @@ -121,14 +121,12 @@ topology_template: get_input: pd_flavor_name vm_image_name: get_input: pd_image_name - port_pd01_port_1_network_role_tag: - - oam + port_pd01_port_1_network_role_tag: oam port_pd01_port_1_network: - get_input: oam_net_name compute_pd_server_user_data_format: - RAW - port_pd01_port_0_network_role_tag: - - oam + port_pd01_port_0_network_role_tag: oam port_pd01_port_1_ip_requirements: - - ip_version: 4 ip_count_required: @@ -136,7 +134,7 @@ topology_template: floating_ip_count_required: is_required: false port_pd01_port_1_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false port_pd01_port_1_replacement_policy: - AUTO @@ -159,4 +157,4 @@ topology_template: members: - resources_with_dependOn - jsa_security_group - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml index 75533f5049..01c3a9bcd7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml @@ -12,10 +12,8 @@ node_types: topology_template: inputs: port_pd01_port_0_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_pd01_port_0_network: type: list required: true @@ -25,7 +23,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_1_security_groups: type: list required: true @@ -73,10 +71,8 @@ topology_template: type: string required: true port_pd01_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_subnetpoolid: type: list required: true @@ -93,15 +89,13 @@ topology_template: entry_schema: type: string port_pd01_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_1_ip_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -125,10 +119,8 @@ topology_template: entry_schema: type: json port_pd01_port_1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_pd01_port_1_replacement_policy: type: list required: true @@ -189,17 +181,11 @@ topology_template: - port_pd01_port_1_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_1_ip_requirements - - index_value + get_input: port_pd01_port_1_ip_requirements network_role_tag: - get_input: - - port_pd01_port_1_network_role_tag - - index_value + get_input: port_pd01_port_1_network_role_tag mac_requirements: - get_input: - - port_pd01_port_1_mac_requirements - - index_value + get_input: port_pd01_port_1_mac_requirements order: get_input: - port_pd01_port_1_order @@ -241,17 +227,11 @@ topology_template: - port_pd01_port_0_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_0_ip_requirements - - index_value + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: - - port_pd01_port_0_network_role_tag - - index_value + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: - - port_pd01_port_0_mac_requirements - - index_value + get_input: port_pd01_port_0_mac_requirements order: get_input: - port_pd01_port_0_order @@ -483,4 +463,4 @@ topology_template: - link link_pd_server_pd01_port_1: - pd_server_pd01_port_1 - - link
\ No newline at end of file + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index dc1dc15aaa..1806971f92 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -9,11 +9,9 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_pd01_port_0_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_pd01_port_0_network: type: list required: true @@ -25,7 +23,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role: type: list required: true @@ -111,7 +109,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -139,11 +137,9 @@ node_types: entry_schema: type: json port_pd01_port_1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_pd01_port_1_replacement_policy: type: list required: true @@ -575,4 +571,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml index 17966e0c2f..40d0227141 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml @@ -104,7 +104,7 @@ topology_template: - substitutable properties: port_pd01_port_0_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false port_pd01_port_0_network: - packet_mirror_network @@ -137,7 +137,7 @@ topology_template: floating_ip_count_required: is_required: false port_pd01_port_1_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false port_pd01_port_1_replacement_policy: - AUTO @@ -182,4 +182,4 @@ topology_template: - packet_mirror_network - pd01_volume - packet_internal_network - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml index 560f18e726..9a7f6ae224 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml @@ -12,10 +12,8 @@ node_types: topology_template: inputs: port_pd01_port_0_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_pd01_port_0_network: type: list required: true @@ -25,7 +23,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role: type: list required: true @@ -96,7 +94,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -120,10 +118,8 @@ topology_template: entry_schema: type: json port_pd01_port_1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_pd01_port_1_replacement_policy: type: list required: true @@ -175,17 +171,13 @@ topology_template: - port_pd01_port_1_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_1_ip_requirements - - index_value + get_input: port_pd01_port_1_ip_requirements network_role_tag: get_input: - port_pd01_port_1_network_role_tag - index_value mac_requirements: - get_input: - - port_pd01_port_1_mac_requirements - - index_value + get_input: port_pd01_port_1_mac_requirements order: get_input: - port_pd01_port_1_order @@ -223,17 +215,13 @@ topology_template: - port_pd01_port_0_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_0_ip_requirements - - index_value + get_input: port_pd01_port_0_ip_requirements network_role_tag: get_input: - port_pd01_port_0_network_role_tag - index_value mac_requirements: - get_input: - - port_pd01_port_0_mac_requirements - - index_value + get_input: port_pd01_port_0_mac_requirements order: get_input: - port_pd01_port_0_order @@ -465,4 +453,4 @@ topology_template: - link link_pd_server_pd01_port_1: - pd_server_pd01_port_1 - - link
\ No newline at end of file + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml index 857c88bd2e..4ecc127055 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -29,11 +29,9 @@ node_types: entry_schema: type: string port_pd02_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_pd01_port_exCP_naming: type: list required: true @@ -57,17 +55,13 @@ node_types: entry_schema: type: string port_pd02_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_pd02_port_vlan_requirements: type: list required: true @@ -83,7 +77,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true @@ -125,13 +119,11 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -1147,4 +1139,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml index 01a5711243..726b8dd8ae 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml @@ -442,14 +442,13 @@ topology_template: - pd_server_names - 0 port_pd02_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_network_role_tag: - - oam + port_pd02_port_network_role_tag: oam port_pd01_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false vm_image_name: get_input: pd_image_name @@ -467,8 +466,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam port_pd02_port_network: - get_input: oam_net_name compute_pd_server_user_data_format: @@ -489,4 +487,4 @@ topology_template: description: heat template that creates MOG stack members: - abstract_pd_server - - abstract_pcm_server_0
\ No newline at end of file + - abstract_pcm_server_0 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml index 6d0690a78d..8a9b737df1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml @@ -29,10 +29,8 @@ topology_template: entry_schema: type: string port_pd02_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_pd01_port_exCP_naming: type: list required: true @@ -52,15 +50,11 @@ topology_template: entry_schema: type: string port_pd02_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_pd02_port_vlan_requirements: type: list required: true @@ -73,7 +67,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true @@ -108,12 +102,10 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -161,17 +153,11 @@ topology_template: - port_pd01_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_ip_requirements - - index_value + get_input: port_pd01_port_ip_requirements network_role_tag: - get_input: - - port_pd01_port_network_role_tag - - index_value + get_input: port_pd01_port_network_role_tag mac_requirements: - get_input: - - port_pd01_port_mac_requirements - - index_value + get_input: port_pd01_port_mac_requirements order: get_input: - port_pd01_port_order @@ -205,17 +191,11 @@ topology_template: - port_pd02_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd02_port_ip_requirements - - index_value + get_input: port_pd02_port_ip_requirements network_role_tag: - get_input: - - port_pd02_port_network_role_tag - - index_value + get_input: port_pd02_port_network_role_tag mac_requirements: - get_input: - - port_pd02_port_mac_requirements - - index_value + get_input: port_pd02_port_mac_requirements order: get_input: - port_pd02_port_order @@ -447,4 +427,4 @@ topology_template: - dependency dependency_pd_server_pd02_port: - pd_server_pd02_port - - 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/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml index a308e85feb..c27751b41b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -9,11 +9,9 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_pd01_port_0_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_pd01_port_0_network: type: list required: true @@ -25,13 +23,11 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_network_role: type: list required: true @@ -43,7 +39,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -99,11 +95,9 @@ node_types: entry_schema: type: json port_pd01_port_1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_pd01_port_1_subnetpoolid: type: list required: true @@ -121,11 +115,9 @@ node_types: entry_schema: type: json port_pd01_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_vlan_requirements: type: list required: true @@ -563,4 +555,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml index ad9cf3e5d2..980f2107e1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml @@ -425,7 +425,7 @@ topology_template: - substitutable properties: port_pd01_port_0_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false port_pd01_port_0_network: - get_input: oam_net_name @@ -435,8 +435,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_0_network_role_tag: - - oam + port_pd01_port_0_network_role_tag: oam port_pd01_port_1_ip_requirements: - - ip_version: 4 ip_count_required: @@ -452,12 +451,11 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name port_pd01_port_1_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_1_network_role_tag: - - oam + port_pd01_port_1_network_role_tag: oam port_pd01_port_1_network: - get_input: oam_net_name compute_pd_server_user_data_format: @@ -477,4 +475,4 @@ topology_template: heat_file: ../Artifacts/hot-mog-0108-bs1271.yml description: heat template that creates MOG stack members: - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml index e2edfa3db1..33fae62c6d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml @@ -12,10 +12,8 @@ node_types: topology_template: inputs: port_pd01_port_0_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_pd01_port_0_network: type: list required: true @@ -25,12 +23,10 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_network_role: type: list required: true @@ -40,7 +36,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -87,10 +83,8 @@ topology_template: entry_schema: type: json port_pd01_port_1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_pd01_port_1_subnetpoolid: type: list required: true @@ -105,10 +99,8 @@ topology_template: entry_schema: type: json port_pd01_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_vlan_requirements: type: list required: true @@ -161,17 +153,11 @@ topology_template: - port_pd01_port_1_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_1_ip_requirements - - index_value + get_input: port_pd01_port_1_ip_requirements network_role_tag: - get_input: - - port_pd01_port_1_network_role_tag - - index_value + get_input: port_pd01_port_1_network_role_tag mac_requirements: - get_input: - - port_pd01_port_1_mac_requirements - - index_value + get_input: port_pd01_port_1_mac_requirements order: get_input: - port_pd01_port_1_order @@ -205,17 +191,11 @@ topology_template: - port_pd01_port_0_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_0_ip_requirements - - index_value + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: - - port_pd01_port_0_network_role_tag - - index_value + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: - - port_pd01_port_0_mac_requirements - - index_value + get_input: port_pd01_port_0_mac_requirements order: get_input: - port_pd01_port_0_order @@ -447,4 +427,4 @@ topology_template: - link link_pd_server_pd01_port_1: - pd_server_pd01_port_1 - - link
\ No newline at end of file + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index f6428554bf..dc48e66ff7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -29,11 +29,9 @@ node_types: entry_schema: type: string port_pd02_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_pd01_port_exCP_naming: type: list required: true @@ -57,17 +55,13 @@ node_types: entry_schema: type: string port_pd02_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_pd02_port_vlan_requirements: type: list required: true @@ -83,7 +77,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true @@ -125,13 +119,11 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -579,4 +571,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml index 46dda5fff5..5fa9460fbd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml @@ -431,14 +431,13 @@ topology_template: - pd_server_names - 0 port_pd02_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_network_role_tag: - - oam + port_pd02_port_network_role_tag: oam port_pd01_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false vm_image_name: get_input: pd_image_name @@ -456,8 +455,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam port_pd02_port_network: - get_input: oam_net_name compute_pd_server_user_data_format: @@ -496,4 +494,4 @@ topology_template: value: get_attribute: - abstract_pd_server - - pd_server_accessIPv4
\ No newline at end of file + - pd_server_accessIPv4 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml index bd885f9dbe..2d942566d5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml @@ -29,10 +29,8 @@ topology_template: entry_schema: type: string port_pd02_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_pd01_port_exCP_naming: type: list required: true @@ -52,15 +50,11 @@ topology_template: entry_schema: type: string port_pd02_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_pd02_port_vlan_requirements: type: list required: true @@ -73,7 +67,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true @@ -108,12 +102,10 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -161,17 +153,11 @@ topology_template: - port_pd01_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_ip_requirements - - index_value + get_input: port_pd01_port_ip_requirements network_role_tag: - get_input: - - port_pd01_port_network_role_tag - - index_value + get_input: port_pd01_port_network_role_tag mac_requirements: - get_input: - - port_pd01_port_mac_requirements - - index_value + get_input: port_pd01_port_mac_requirements order: get_input: - port_pd01_port_order @@ -205,17 +191,11 @@ topology_template: - port_pd02_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd02_port_ip_requirements - - index_value + get_input: port_pd02_port_ip_requirements network_role_tag: - get_input: - - port_pd02_port_network_role_tag - - index_value + get_input: port_pd02_port_network_role_tag mac_requirements: - get_input: - - port_pd02_port_mac_requirements - - index_value + get_input: port_pd02_port_mac_requirements order: get_input: - port_pd02_port_order @@ -472,4 +452,4 @@ topology_template: - dependency dependency_pd_server_pd02_port: - pd_server_pd02_port - - 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/singleSubstitution/generalVf/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/GlobalSubstitutionTypesServiceTemplate.yaml index d53617ed8d..0b1b45b112 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -9,11 +9,9 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_FSB_OAM_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB2_Internal2_network_role_tag: type: list required: true @@ -53,13 +51,13 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB2_Internal1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB2_Internal1_network_role: type: list required: true @@ -79,11 +77,9 @@ node_types: entry_schema: type: string port_FSB2_Internal1_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB2_Internal1_vlan_requirements: type: list required: true @@ -109,11 +105,9 @@ node_types: entry_schema: type: string port_FSB2_Internal2_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB_OAM_subnetpoolid: type: list required: true @@ -121,23 +115,19 @@ node_types: entry_schema: type: string port_FSB2_Internal2_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_FSB_OAM_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_FSB2_Internal2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -187,13 +177,11 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_FSB2_Internal1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_FSB2_Internal2_order: type: list required: true @@ -714,29 +702,25 @@ node_types: entry_schema: type: json port_VLC_OAM_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_VLC_GTP_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC2_Internal2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC_SCTP_A_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -746,13 +730,13 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC_SCTP_A_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_VLC2_Internal1_network_role_tag: type: list required: true @@ -760,11 +744,9 @@ node_types: entry_schema: type: string port_VLC2_Internal2_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_VLC_GTP_network_role_tag: type: list required: true @@ -776,23 +758,17 @@ node_types: required: true status: SUPPORTED port_VLC2_Internal1_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_VLC2_Internal2_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_VLC2_Internal1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_VLC_SCTP_B_network: type: list required: true @@ -810,7 +786,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC_GTP_order: type: list required: true @@ -840,7 +816,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_VLC_OAM_network: type: list required: true @@ -894,13 +870,13 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC_OAM_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_VLC2_Internal1_order: type: list required: true @@ -918,7 +894,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC2_Internal2_vlan_requirements: type: list required: true @@ -992,7 +968,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_VLC_GTP_network_role: type: list required: true @@ -1012,11 +988,9 @@ node_types: entry_schema: type: integer port_VLC_GTP_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_VLC2_Internal1_network: type: list required: true @@ -1036,11 +1010,9 @@ node_types: entry_schema: type: json port_VLC_OAM_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_VLC2_Internal1_vlan_requirements: type: list required: true @@ -1054,11 +1026,9 @@ node_types: entry_schema: type: string port_VLC_SCTP_B_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_VLC2_Internal2_exCP_naming: type: list required: true @@ -1853,11 +1823,9 @@ node_types: entry_schema: type: string port_NCB1_Internal2_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json vm_image_name: type: string required: true @@ -1873,7 +1841,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_NCB1_Internal1_exCP_naming: type: list required: true @@ -1899,11 +1867,9 @@ node_types: entry_schema: type: string port_NCB1_Internal2_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -1913,11 +1879,9 @@ node_types: constraints: - greater_or_equal: 0 port_NCB1_Internal1_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_NCB1_Internal1_order: type: list required: true @@ -1935,7 +1899,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_NCB1_Internal1_vlan_requirements: type: list required: true @@ -1943,11 +1907,9 @@ node_types: entry_schema: type: json port_NCB1_Internal1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_NCB1_Internal1_network: type: list required: true @@ -2400,17 +2362,13 @@ node_types: required: true status: SUPPORTED port_NCB2_Internal2_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_NCB2_Internal1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json vm_image_name: type: string required: true @@ -2464,7 +2422,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_NCB2_Internal2_network_role_tag: type: list required: true @@ -2484,17 +2442,13 @@ node_types: entry_schema: type: json port_NCB2_Internal1_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_NCB2_Internal2_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_NCB2_Internal1_subnetpoolid: type: list required: true @@ -2536,7 +2490,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements requirements: - dependency_NCB2: capability: tosca.capabilities.Node @@ -2987,7 +2941,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true @@ -3023,23 +2977,19 @@ node_types: entry_schema: type: string port_GPB2_Internal2_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_GPB2_Internal2_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_GPB2_Internal1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_GPB2_Internal2_network_role: type: list required: true @@ -3073,11 +3023,9 @@ node_types: entry_schema: type: integer port_GPB2_Internal1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_GPB2_Internal1_exCP_naming: type: list required: true @@ -3091,11 +3039,9 @@ node_types: entry_schema: type: string port_GPB2_Internal1_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_GPB2_Internal2_network: type: list required: true @@ -3520,11 +3466,9 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_VLC1_Internal2_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_VLC_GTP_exCP_naming: type: list required: true @@ -3532,23 +3476,19 @@ node_types: entry_schema: type: json port_VLC_OAM_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_VLC1_Internal1_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_VLC_GTP_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC1_Internal2_exCP_naming: type: list required: true @@ -3562,11 +3502,9 @@ node_types: entry_schema: type: string port_VLC_SCTP_A_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -3582,13 +3520,13 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC_SCTP_A_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_VLC1_Internal2_network_role_tag: type: list required: true @@ -3642,11 +3580,9 @@ node_types: entry_schema: type: json port_VLC1_Internal1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_VLC1_Internal1_vlan_requirements: type: list required: true @@ -3676,7 +3612,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_VLC_OAM_network: type: list required: true @@ -3694,7 +3630,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC1_Internal1_network: type: list required: true @@ -3748,19 +3684,19 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC1_Internal1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC_OAM_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_VLC1_Internal2_vlan_requirements: type: list required: true @@ -3790,7 +3726,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC_SCTP_A_subnetpoolid: type: list required: true @@ -3830,11 +3766,9 @@ node_types: constraints: - greater_or_equal: 0 port_VLC1_Internal2_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_VLC_SCTP_B_subnetpoolid: type: list required: true @@ -3846,7 +3780,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_VLC_GTP_network_role: type: list required: true @@ -3860,17 +3794,13 @@ node_types: entry_schema: type: string port_VLC_GTP_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_VLC_OAM_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_VLC1_Internal1_exCP_naming: type: list required: true @@ -3878,11 +3808,9 @@ node_types: entry_schema: type: json port_VLC_SCTP_B_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_VLC_SCTP_B_order: type: list required: true @@ -4637,17 +4565,13 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_FSB1_Internal1_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB_OAM_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB1_Internal2_network: type: list required: true @@ -4671,17 +4595,15 @@ node_types: entry_schema: type: json port_FSB1_Internal2_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_FSB_OAM_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal1_subnetpoolid: type: list required: true @@ -4695,11 +4617,9 @@ node_types: entry_schema: type: string port_FSB1_Internal1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_FSB_OAM_network_role: type: list required: true @@ -4711,7 +4631,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal1_order: type: list required: true @@ -4743,11 +4663,9 @@ node_types: entry_schema: type: string port_FSB_OAM_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json compute_FSB1_availability_zone: type: list required: true @@ -4787,17 +4705,15 @@ node_types: entry_schema: type: string port_FSB1_Internal2_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_FSB1_Internal2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal2_order: type: list required: true @@ -4809,7 +4725,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_FSB1_Internal1_exCP_naming: type: list required: true @@ -5358,11 +5274,9 @@ node_types: required: true status: SUPPORTED port_GPB1_Internal2_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_GPB1_Internal1_order: type: list required: true @@ -5386,11 +5300,9 @@ node_types: entry_schema: type: json port_GPB1_Internal1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json compute_GPB1_availability_zone: type: list required: true @@ -5408,7 +5320,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_GPB1_Internal2_vlan_requirements: type: list required: true @@ -5442,17 +5354,13 @@ node_types: entry_schema: type: string port_GPB1_Internal2_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_GPB1_Internal1_mac_address: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_GPB1_Internal1_subnetpoolid: type: list required: true @@ -5476,7 +5384,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_GPB1_Internal2_order: type: list required: true @@ -5896,4 +5804,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/MainServiceTemplate.yaml index 8ae59dca18..25470e4630 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/MainServiceTemplate.yaml @@ -627,8 +627,7 @@ topology_template: directives: - substitutable properties: - port_VLC_OAM_network_role_tag: - - oam + port_VLC_OAM_network_role_tag: oam port_VLC_GTP_ip_requirements: - - ip_version: 4 ip_count_required: @@ -642,7 +641,7 @@ topology_template: floating_ip_count_required: is_required: false port_VLC_SCTP_A_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false vm_flavor_name: get_input: vlc-flavor @@ -656,16 +655,16 @@ topology_template: - - ip_address: get_input: vlc2-sctp-a-ip port_VLC2_Internal2_mac_address: - - get_input: vlc2-Internal2-mac + get_input: vlc2-Internal1-mac vm_image_name: get_input: pxe-image port_VLC2_Internal1_mac_address: - - get_input: vlc2-Internal1-mac + get_input: vlc2-Internal1-mac port_VLC2_Internal2_mac_requirements: - - mac_count_required: + mac_count_required: is_required: true port_VLC2_Internal1_mac_requirements: - - mac_count_required: + mac_count_required: is_required: true port_VLC_SCTP_B_network: - epc-sctp-b-net @@ -707,17 +706,17 @@ topology_template: - - ip_address: get_input: vlc2-sctp-b-ip port_VLC_GTP_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false port_VLC2_Internal1_network: - Internal1-net compute_VLC2_availability_zone: - get_input: vlc_zone port_VLC_OAM_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false port_VLC_SCTP_B_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false service_template_filter: substitute_service_template: Nested_VLC2ServiceTemplate.yaml @@ -754,11 +753,10 @@ topology_template: - substitutable properties: port_VLC1_Internal2_mac_address: - - get_input: vlc1-Internal2-mac - port_VLC_OAM_network_role_tag: - - oam + get_input: vlc1-Internal1-mac + port_VLC_OAM_network_role_tag: oam port_VLC1_Internal1_mac_address: - - get_input: vlc1-Internal1-mac + get_input: vlc1-Internal1-mac port_VLC_GTP_ip_requirements: - - ip_version: 4 ip_count_required: @@ -766,7 +764,7 @@ topology_template: floating_ip_count_required: is_required: false port_VLC_SCTP_A_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false vm_flavor_name: get_input: vlc-flavor @@ -788,7 +786,7 @@ topology_template: port_VLC_GTP_network: - epc-gtp-net port_VLC1_Internal1_mac_requirements: - - mac_count_required: + mac_count_required: is_required: true port_VLC_GTP_fixed_ips: - - ip_address: @@ -831,19 +829,19 @@ topology_template: compute_VLC1_availability_zone: - get_input: vlc_zone port_VLC1_Internal2_mac_requirements: - - mac_count_required: + mac_count_required: is_required: true port_VLC_SCTP_B_fixed_ips: - - ip_address: get_input: vlc1-sctp-b-ip port_VLC_GTP_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false port_VLC_OAM_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false port_VLC_SCTP_B_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false service_template_filter: substitute_service_template: Nested_VLC1ServiceTemplate.yaml @@ -905,11 +903,11 @@ topology_template: vm_flavor_name: get_input: gpb-flavor port_GPB1_Internal2_mac_address: - - get_input: gpb1-Internal2-mac + get_input: gpb1-Internal1-mac vm_image_name: get_input: pxe-image port_GPB1_Internal1_mac_requirements: - - mac_count_required: + mac_count_required: is_required: true compute_GPB1_availability_zone: - get_input: gpb_zone @@ -924,10 +922,10 @@ topology_template: port_GPB1_Internal1_network: - Internal1-net port_GPB1_Internal2_mac_requirements: - - mac_count_required: + mac_count_required: is_required: true port_GPB1_Internal1_mac_address: - - get_input: gpb1-Internal1-mac + get_input: gpb1-Internal1-mac port_GPB1_Internal1_ip_requirements: - - ip_version: 4 ip_count_required: @@ -971,9 +969,9 @@ topology_template: compute_GPB2_name: - get_input: gpb2-name port_GPB2_Internal2_mac_address: - - get_input: gpb2-Internal2-mac + get_input: gpb2-Internal1-mac port_GPB2_Internal2_mac_requirements: - - mac_count_required: + mac_count_required: is_required: true port_GPB2_Internal1_ip_requirements: - - ip_version: 4 @@ -984,10 +982,10 @@ topology_template: compute_GPB2_availability_zone: - get_input: gpb_zone port_GPB2_Internal1_mac_requirements: - - mac_count_required: + mac_count_required: is_required: true port_GPB2_Internal1_mac_address: - - get_input: gpb2-Internal1-mac + get_input: gpb2-Internal1-mac port_GPB2_Internal2_network: - Internal2-net service_template_filter: @@ -1056,7 +1054,7 @@ topology_template: compute_NCB1_name: - get_input: ncb1-name port_NCB1_Internal2_mac_requirements: - - mac_count_required: + mac_count_required: is_required: true vm_image_name: get_input: pxe-image @@ -1067,9 +1065,9 @@ topology_template: floating_ip_count_required: is_required: false port_NCB1_Internal2_mac_address: - - get_input: ncb1-Internal2-mac + get_input: ncb1-Internal1-mac port_NCB1_Internal1_mac_address: - - get_input: ncb1-Internal1-mac + get_input: ncb1-Internal1-mac port_NCB1_Internal1_ip_requirements: - - ip_version: 4 ip_count_required: @@ -1077,7 +1075,7 @@ topology_template: floating_ip_count_required: is_required: false port_NCB1_Internal1_mac_requirements: - - mac_count_required: + mac_count_required: is_required: true port_NCB1_Internal1_network: - Internal1-net @@ -1112,10 +1110,10 @@ topology_template: vm_flavor_name: get_input: ncb-flavor port_NCB2_Internal2_mac_requirements: - - mac_count_required: + mac_count_required: is_required: true port_NCB2_Internal1_mac_requirements: - - mac_count_required: + mac_count_required: is_required: true vm_image_name: get_input: pxe-image @@ -1130,9 +1128,9 @@ topology_template: port_NCB2_Internal2_network: - Internal2-net port_NCB2_Internal1_mac_address: - - get_input: ncb2-Internal1-mac + get_input: ncb2-Internal1-mac port_NCB2_Internal2_mac_address: - - get_input: ncb2-Internal2-mac + get_input: ncb2-Internal1-mac compute_NCB2_name: - get_input: ncb2-name port_NCB2_Internal1_ip_requirements: @@ -1182,9 +1180,8 @@ topology_template: - substitutable properties: port_FSB1_Internal1_mac_address: - - get_input: fsb1-Internal1-mac - port_FSB_OAM_network_role_tag: - - oam + get_input: fsb1-Internal1-mac + port_FSB_OAM_network_role_tag: oam port_FSB1_Internal2_network: - Internal2-net port_FSB1_Internal1_network: @@ -1192,7 +1189,7 @@ topology_template: vm_flavor_name: get_input: fsb1-flavor port_FSB1_Internal2_mac_address: - - get_input: fsb1-Internal2-mac + get_input: fsb1-Internal1-mac port_FSB_OAM_ip_requirements: - - ip_version: 4 ip_count_required: @@ -1200,7 +1197,7 @@ topology_template: floating_ip_count_required: is_required: false port_FSB1_Internal1_mac_requirements: - - mac_count_required: + mac_count_required: is_required: true port_FSB1_Internal1_ip_requirements: - - ip_version: 4 @@ -1211,12 +1208,12 @@ topology_template: port_FSB_OAM_network: - get_input: oam_net_id port_FSB_OAM_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false compute_FSB1_availability_zone: - get_input: fsb_zone port_FSB1_Internal2_mac_requirements: - - mac_count_required: + mac_count_required: is_required: true port_FSB1_Internal2_ip_requirements: - - ip_version: 4 @@ -1251,8 +1248,7 @@ topology_template: directives: - substitutable properties: - port_FSB_OAM_network_role_tag: - - oam + port_FSB_OAM_network_role_tag: oam vm_flavor_name: get_input: fsb2-flavor compute_FSB2_availability_zone: @@ -1272,18 +1268,18 @@ topology_template: compute_FSB2_name: - get_input: fsb2-name port_FSB2_Internal1_mac_address: - - get_input: fsb2-Internal1-mac + get_input: fsb2-Internal1-mac port_FSB_OAM_network: - get_input: oam_net_id port_FSB2_Internal1_network: - Internal1-net port_FSB2_Internal2_mac_address: - - get_input: fsb2-Internal2-mac + get_input: fsb2-Internal1-mac port_FSB2_Internal2_mac_requirements: - - mac_count_required: + mac_count_required: is_required: true port_FSB_OAM_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false port_FSB2_Internal2_ip_requirements: - - ip_version: 4 @@ -1297,7 +1293,7 @@ topology_template: - - ip_address: get_input: fsb2-oam-ip port_FSB2_Internal1_mac_requirements: - - mac_count_required: + mac_count_required: is_required: true service_template_filter: substitute_service_template: Nested_FSB2ServiceTemplate.yaml diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB1ServiceTemplate.yaml index 42ba1a647f..a9acfcc5c3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB1ServiceTemplate.yaml @@ -12,15 +12,11 @@ node_types: topology_template: inputs: port_FSB1_Internal1_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_FSB_OAM_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_FSB1_Internal2_network: type: list required: true @@ -40,15 +36,13 @@ topology_template: entry_schema: type: json port_FSB1_Internal2_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_FSB_OAM_ip_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal1_subnetpoolid: type: list required: true @@ -60,10 +54,8 @@ topology_template: entry_schema: type: string port_FSB1_Internal1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_FSB_OAM_network_role: type: list required: true @@ -73,7 +65,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal1_order: type: list required: true @@ -100,10 +92,8 @@ topology_template: entry_schema: type: string port_FSB_OAM_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json compute_FSB1_availability_zone: type: list required: true @@ -137,15 +127,13 @@ topology_template: entry_schema: type: string port_FSB1_Internal2_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_FSB1_Internal2_ip_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB1_Internal2_order: type: list required: true @@ -155,7 +143,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_FSB1_Internal1_exCP_naming: type: list required: true @@ -194,17 +182,13 @@ topology_template: - port_FSB1_Internal2_vlan_requirements - index_value ip_requirements: - get_input: - - port_FSB1_Internal2_ip_requirements - - index_value + get_input: port_FSB1_Internal2_ip_requirements network_role_tag: get_input: - port_FSB1_Internal2_network_role_tag - index_value mac_requirements: - get_input: - - port_FSB1_Internal2_mac_requirements - - index_value + get_input: port_FSB1_Internal2_mac_requirements order: get_input: - port_FSB1_Internal2_order @@ -222,9 +206,7 @@ topology_template: - port_FSB1_Internal2_network - index_value mac_address: - get_input: - - port_FSB1_Internal2_mac_address - - index_value + get_input: port_FSB1_Internal2_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -242,17 +224,13 @@ topology_template: - port_FSB1_Internal1_vlan_requirements - index_value ip_requirements: - get_input: - - port_FSB1_Internal1_ip_requirements - - index_value + get_input: port_FSB1_Internal1_ip_requirements network_role_tag: get_input: - port_FSB1_Internal1_network_role_tag - index_value mac_requirements: - get_input: - - port_FSB1_Internal1_mac_requirements - - index_value + get_input: port_FSB1_Internal1_mac_requirements order: get_input: - port_FSB1_Internal1_order @@ -270,9 +248,7 @@ topology_template: - port_FSB1_Internal1_network - index_value mac_address: - get_input: - - port_FSB1_Internal1_mac_address - - index_value + get_input: port_FSB1_Internal1_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -290,17 +266,11 @@ topology_template: - port_FSB_OAM_vlan_requirements - index_value ip_requirements: - get_input: - - port_FSB_OAM_ip_requirements - - index_value + get_input: port_FSB_OAM_ip_requirements network_role_tag: - get_input: - - port_FSB_OAM_network_role_tag - - index_value + get_input: port_FSB_OAM_network_role_tag mac_requirements: - get_input: - - port_FSB_OAM_mac_requirements - - index_value + get_input: port_FSB_OAM_mac_requirements order: get_input: - port_FSB_OAM_order @@ -314,9 +284,7 @@ topology_template: - port_FSB_OAM_subnetpoolid - index_value fixed_ips: - get_input: - - port_FSB_OAM_fixed_ips - - index_value + get_input: port_FSB_OAM_fixed_ips network: get_input: - port_FSB_OAM_network @@ -588,4 +556,4 @@ topology_template: - dependency link_FSB1_FSB_OAM: - FSB1_FSB_OAM - - link
\ No newline at end of file + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB2ServiceTemplate.yaml index a71818c237..24b75d7835 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB2ServiceTemplate.yaml @@ -12,10 +12,8 @@ node_types: topology_template: inputs: port_FSB_OAM_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_FSB2_Internal2_network_role_tag: type: list required: true @@ -48,12 +46,12 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB2_Internal1_ip_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_FSB2_Internal1_network_role: type: list required: true @@ -70,10 +68,8 @@ topology_template: entry_schema: type: string port_FSB2_Internal1_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_FSB2_Internal1_vlan_requirements: type: list required: true @@ -95,30 +91,24 @@ topology_template: entry_schema: type: string port_FSB2_Internal2_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_FSB_OAM_subnetpoolid: type: list required: true entry_schema: type: string port_FSB2_Internal2_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_FSB_OAM_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_FSB2_Internal2_ip_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -160,12 +150,10 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_FSB2_Internal1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_FSB2_Internal2_order: type: list required: true @@ -194,17 +182,11 @@ topology_template: - port_FSB_OAM_vlan_requirements - index_value ip_requirements: - get_input: - - port_FSB_OAM_ip_requirements - - index_value + get_input: port_FSB_OAM_ip_requirements network_role_tag: - get_input: - - port_FSB_OAM_network_role_tag - - index_value + get_input: port_FSB_OAM_network_role_tag mac_requirements: - get_input: - - port_FSB_OAM_mac_requirements - - index_value + get_input: port_FSB_OAM_mac_requirements order: get_input: - port_FSB_OAM_order @@ -218,9 +200,7 @@ topology_template: - port_FSB_OAM_subnetpoolid - index_value fixed_ips: - get_input: - - port_FSB_OAM_fixed_ips - - index_value + get_input: port_FSB_OAM_fixed_ips network: get_input: - port_FSB_OAM_network @@ -255,17 +235,13 @@ topology_template: - port_FSB2_Internal2_vlan_requirements - index_value ip_requirements: - get_input: - - port_FSB2_Internal2_ip_requirements - - index_value + get_input: port_FSB2_Internal2_ip_requirements network_role_tag: get_input: - port_FSB2_Internal2_network_role_tag - index_value mac_requirements: - get_input: - - port_FSB2_Internal2_mac_requirements - - index_value + get_input: port_FSB2_Internal2_mac_requirements order: get_input: - port_FSB2_Internal2_order @@ -283,9 +259,7 @@ topology_template: - port_FSB2_Internal2_network - index_value mac_address: - get_input: - - port_FSB2_Internal2_mac_address - - index_value + get_input: port_FSB2_Internal2_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -303,17 +277,13 @@ topology_template: - port_FSB2_Internal1_vlan_requirements - index_value ip_requirements: - get_input: - - port_FSB2_Internal1_ip_requirements - - index_value + get_input: port_FSB2_Internal1_ip_requirements network_role_tag: get_input: - port_FSB2_Internal1_network_role_tag - index_value mac_requirements: - get_input: - - port_FSB2_Internal1_mac_requirements - - index_value + get_input: port_FSB2_Internal1_mac_requirements order: get_input: - port_FSB2_Internal1_order @@ -331,9 +301,7 @@ topology_template: - port_FSB2_Internal1_network - index_value mac_address: - get_input: - - port_FSB2_Internal1_mac_address - - index_value + get_input: port_FSB2_Internal1_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -588,4 +556,4 @@ topology_template: - local_storage link_FSB2_FSB2_Internal2: - FSB2_FSB2_Internal2 - - link
\ No newline at end of file + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_GPB1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_GPB1ServiceTemplate.yaml index 04066334b2..6b23277221 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_GPB1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_GPB1ServiceTemplate.yaml @@ -30,10 +30,8 @@ topology_template: type: string required: true port_GPB1_Internal2_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_GPB1_Internal1_order: type: list required: true @@ -53,10 +51,8 @@ topology_template: entry_schema: type: json port_GPB1_Internal1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json compute_GPB1_availability_zone: type: list required: true @@ -71,7 +67,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_GPB1_Internal2_vlan_requirements: type: list required: true @@ -100,15 +96,11 @@ topology_template: entry_schema: type: string port_GPB1_Internal2_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_GPB1_Internal1_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_GPB1_Internal1_subnetpoolid: type: list required: true @@ -128,7 +120,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_GPB1_Internal2_order: type: list required: true @@ -162,17 +154,13 @@ topology_template: - port_GPB1_Internal1_vlan_requirements - index_value ip_requirements: - get_input: - - port_GPB1_Internal1_ip_requirements - - index_value + get_input: port_GPB1_Internal1_ip_requirements network_role_tag: get_input: - port_GPB1_Internal1_network_role_tag - index_value mac_requirements: - get_input: - - port_GPB1_Internal1_mac_requirements - - index_value + get_input: port_GPB1_Internal1_mac_requirements order: get_input: - port_GPB1_Internal1_order @@ -190,9 +178,7 @@ topology_template: - port_GPB1_Internal1_network - index_value mac_address: - get_input: - - port_GPB1_Internal1_mac_address - - index_value + get_input: port_GPB1_Internal1_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -210,17 +196,13 @@ topology_template: - port_GPB1_Internal2_vlan_requirements - index_value ip_requirements: - get_input: - - port_GPB1_Internal2_ip_requirements - - index_value + get_input: port_GPB1_Internal2_ip_requirements network_role_tag: get_input: - port_GPB1_Internal2_network_role_tag - index_value mac_requirements: - get_input: - - port_GPB1_Internal2_mac_requirements - - index_value + get_input: port_GPB1_Internal2_mac_requirements order: get_input: - port_GPB1_Internal2_order @@ -238,9 +220,7 @@ topology_template: - port_GPB1_Internal2_network - index_value mac_address: - get_input: - - port_GPB1_Internal2_mac_address - - index_value + get_input: port_GPB1_Internal2_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -456,4 +436,4 @@ topology_template: - local_storage link_GPB1_GPB1_Internal1: - GPB1_GPB1_Internal1 - - link
\ No newline at end of file + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_GPB2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_GPB2ServiceTemplate.yaml index 64a239a2a5..133d43efe2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_GPB2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_GPB2ServiceTemplate.yaml @@ -38,7 +38,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true @@ -68,20 +68,16 @@ topology_template: entry_schema: type: string port_GPB2_Internal2_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_GPB2_Internal2_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_GPB2_Internal1_ip_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_GPB2_Internal2_network_role: type: list required: true @@ -110,10 +106,8 @@ topology_template: entry_schema: type: integer port_GPB2_Internal1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_GPB2_Internal1_exCP_naming: type: list required: true @@ -125,10 +119,8 @@ topology_template: entry_schema: type: string port_GPB2_Internal1_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_GPB2_Internal2_network: type: list required: true @@ -147,17 +139,13 @@ topology_template: - port_GPB2_Internal2_vlan_requirements - index_value ip_requirements: - get_input: - - port_GPB2_Internal2_ip_requirements - - index_value + get_input: port_GPB2_Internal2_ip_requirements network_role_tag: get_input: - port_GPB2_Internal2_network_role_tag - index_value mac_requirements: - get_input: - - port_GPB2_Internal2_mac_requirements - - index_value + get_input: port_GPB2_Internal2_mac_requirements order: get_input: - port_GPB2_Internal2_order @@ -175,9 +163,7 @@ topology_template: - port_GPB2_Internal2_network - index_value mac_address: - get_input: - - port_GPB2_Internal2_mac_address - - index_value + get_input: port_GPB2_Internal2_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -195,17 +181,13 @@ topology_template: - port_GPB2_Internal1_vlan_requirements - index_value ip_requirements: - get_input: - - port_GPB2_Internal1_ip_requirements - - index_value + get_input: port_GPB2_Internal1_ip_requirements network_role_tag: get_input: - port_GPB2_Internal1_network_role_tag - index_value mac_requirements: - get_input: - - port_GPB2_Internal1_mac_requirements - - index_value + get_input: port_GPB2_Internal1_mac_requirements order: get_input: - port_GPB2_Internal1_order @@ -223,9 +205,7 @@ topology_template: - port_GPB2_Internal1_network - index_value mac_address: - get_input: - - port_GPB2_Internal1_mac_address - - index_value + get_input: port_GPB2_Internal1_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -456,4 +436,4 @@ topology_template: - dependency dependency_GPB2_GPB2_Internal1: - GPB2_GPB2_Internal1 - - 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/singleSubstitution/generalVf/out/Nested_NCB1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB1ServiceTemplate.yaml index c41603b6bd..2da2afc1ba 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB1ServiceTemplate.yaml @@ -35,10 +35,8 @@ topology_template: entry_schema: type: string port_NCB1_Internal2_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json vm_image_name: type: string required: true @@ -51,7 +49,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_NCB1_Internal1_exCP_naming: type: list required: true @@ -73,10 +71,8 @@ topology_template: entry_schema: type: string port_NCB1_Internal2_mac_address: - type: list + type: string required: true - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -85,10 +81,8 @@ topology_template: constraints: - greater_or_equal: 0 port_NCB1_Internal1_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_NCB1_Internal1_order: type: list required: true @@ -103,17 +97,15 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_NCB1_Internal1_vlan_requirements: type: list required: true entry_schema: type: json port_NCB1_Internal1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_NCB1_Internal1_network: type: list required: true @@ -162,17 +154,13 @@ topology_template: - port_NCB1_Internal1_vlan_requirements - index_value ip_requirements: - get_input: - - port_NCB1_Internal1_ip_requirements - - index_value + get_input: port_NCB1_Internal1_ip_requirements network_role_tag: get_input: - port_NCB1_Internal1_network_role_tag - index_value mac_requirements: - get_input: - - port_NCB1_Internal1_mac_requirements - - index_value + get_input: port_NCB1_Internal1_mac_requirements order: get_input: - port_NCB1_Internal1_order @@ -190,9 +178,7 @@ topology_template: - port_NCB1_Internal1_network - index_value mac_address: - get_input: - - port_NCB1_Internal1_mac_address - - index_value + get_input: port_NCB1_Internal1_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -210,17 +196,13 @@ topology_template: - port_NCB1_Internal2_vlan_requirements - index_value ip_requirements: - get_input: - - port_NCB1_Internal2_ip_requirements - - index_value + get_input: port_NCB1_Internal2_ip_requirements network_role_tag: get_input: - port_NCB1_Internal2_network_role_tag - index_value mac_requirements: - get_input: - - port_NCB1_Internal2_mac_requirements - - index_value + get_input: port_NCB1_Internal2_mac_requirements order: get_input: - port_NCB1_Internal2_order @@ -238,9 +220,7 @@ topology_template: - port_NCB1_Internal2_network - index_value mac_address: - get_input: - - port_NCB1_Internal2_mac_address - - index_value + get_input: port_NCB1_Internal2_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -456,4 +436,4 @@ topology_template: - dependency dependency_NCB1_NCB1_Internal2: - NCB1_NCB1_Internal2 - - 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/singleSubstitution/generalVf/out/Nested_NCB2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB2ServiceTemplate.yaml index 3ff3a61c8e..bdc13693f5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB2ServiceTemplate.yaml @@ -20,15 +20,11 @@ topology_template: type: string required: true port_NCB2_Internal2_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_NCB2_Internal1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json vm_image_name: type: string required: true @@ -73,7 +69,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_NCB2_Internal2_network_role_tag: type: list required: true @@ -90,15 +86,11 @@ topology_template: entry_schema: type: json port_NCB2_Internal1_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_NCB2_Internal2_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_NCB2_Internal1_subnetpoolid: type: list required: true @@ -133,7 +125,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements node_templates: NCB2: type: org.openecomp.resource.vfc.nodes.heat.NCB2 @@ -162,17 +154,13 @@ topology_template: - port_NCB2_Internal1_vlan_requirements - index_value ip_requirements: - get_input: - - port_NCB2_Internal1_ip_requirements - - index_value + get_input: port_NCB2_Internal1_ip_requirements network_role_tag: get_input: - port_NCB2_Internal1_network_role_tag - index_value mac_requirements: - get_input: - - port_NCB2_Internal1_mac_requirements - - index_value + get_input: port_NCB2_Internal1_mac_requirements order: get_input: - port_NCB2_Internal1_order @@ -190,9 +178,7 @@ topology_template: - port_NCB2_Internal1_network - index_value mac_address: - get_input: - - port_NCB2_Internal1_mac_address - - index_value + get_input: port_NCB2_Internal1_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -210,17 +196,13 @@ topology_template: - port_NCB2_Internal2_vlan_requirements - index_value ip_requirements: - get_input: - - port_NCB2_Internal2_ip_requirements - - index_value + get_input: port_NCB2_Internal2_ip_requirements network_role_tag: get_input: - port_NCB2_Internal2_network_role_tag - index_value mac_requirements: - get_input: - - port_NCB2_Internal2_mac_requirements - - index_value + get_input: port_NCB2_Internal2_mac_requirements order: get_input: - port_NCB2_Internal2_order @@ -238,9 +220,7 @@ topology_template: - port_NCB2_Internal2_network - index_value mac_address: - get_input: - - port_NCB2_Internal2_mac_address - - index_value + get_input: port_NCB2_Internal2_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -456,4 +436,4 @@ topology_template: - link dependency_NCB2: - NCB2 - - 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/singleSubstitution/generalVf/out/Nested_VLC1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_VLC1ServiceTemplate.yaml index d1f52d6035..9f5a49cea9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_VLC1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_VLC1ServiceTemplate.yaml @@ -12,30 +12,24 @@ node_types: topology_template: inputs: port_VLC1_Internal2_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_VLC_GTP_exCP_naming: type: list required: true entry_schema: type: json port_VLC_OAM_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_VLC1_Internal1_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_VLC_GTP_ip_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC1_Internal2_exCP_naming: type: list required: true @@ -47,10 +41,8 @@ topology_template: entry_schema: type: string port_VLC_SCTP_A_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -63,12 +55,12 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC_SCTP_A_fixed_ips: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_VLC1_Internal2_network_role_tag: type: list required: true @@ -113,10 +105,8 @@ topology_template: entry_schema: type: json port_VLC1_Internal1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_VLC1_Internal1_vlan_requirements: type: list required: true @@ -141,7 +131,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_VLC_OAM_network: type: list required: true @@ -156,7 +146,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC1_Internal1_network: type: list required: true @@ -201,17 +191,17 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC1_Internal1_ip_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC_OAM_fixed_ips: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_VLC1_Internal2_vlan_requirements: type: list required: true @@ -236,7 +226,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC_SCTP_A_subnetpoolid: type: list required: true @@ -270,10 +260,8 @@ topology_template: constraints: - greater_or_equal: 0 port_VLC1_Internal2_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_VLC_SCTP_B_subnetpoolid: type: list required: true @@ -283,7 +271,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_VLC_GTP_network_role: type: list required: true @@ -295,25 +283,19 @@ topology_template: entry_schema: type: string port_VLC_GTP_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_VLC_OAM_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_VLC1_Internal1_exCP_naming: type: list required: true entry_schema: type: json port_VLC_SCTP_B_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_VLC_SCTP_B_order: type: list required: true @@ -347,17 +329,13 @@ topology_template: - port_VLC_SCTP_B_vlan_requirements - index_value ip_requirements: - get_input: - - port_VLC_SCTP_B_ip_requirements - - index_value + get_input: port_VLC_SCTP_B_ip_requirements network_role_tag: get_input: - port_VLC_SCTP_B_network_role_tag - index_value mac_requirements: - get_input: - - port_VLC_SCTP_B_mac_requirements - - index_value + get_input: port_VLC_SCTP_B_mac_requirements order: get_input: - port_VLC_SCTP_B_order @@ -371,9 +349,7 @@ topology_template: - port_VLC_SCTP_B_subnetpoolid - index_value fixed_ips: - get_input: - - port_VLC_SCTP_B_fixed_ips - - index_value + get_input: port_VLC_SCTP_B_fixed_ips network: get_input: - port_VLC_SCTP_B_network @@ -395,17 +371,13 @@ topology_template: - port_VLC1_Internal2_vlan_requirements - index_value ip_requirements: - get_input: - - port_VLC1_Internal2_ip_requirements - - index_value + get_input: port_VLC1_Internal2_ip_requirements network_role_tag: get_input: - port_VLC1_Internal2_network_role_tag - index_value mac_requirements: - get_input: - - port_VLC1_Internal2_mac_requirements - - index_value + get_input: port_VLC1_Internal2_mac_requirements order: get_input: - port_VLC1_Internal2_order @@ -423,9 +395,7 @@ topology_template: - port_VLC1_Internal2_network - index_value mac_address: - get_input: - - port_VLC1_Internal2_mac_address - - index_value + get_input: port_VLC1_Internal2_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -443,17 +413,13 @@ topology_template: - port_VLC1_Internal1_vlan_requirements - index_value ip_requirements: - get_input: - - port_VLC1_Internal1_ip_requirements - - index_value + get_input: port_VLC1_Internal1_ip_requirements network_role_tag: get_input: - port_VLC1_Internal1_network_role_tag - index_value mac_requirements: - get_input: - - port_VLC1_Internal1_mac_requirements - - index_value + get_input: port_VLC1_Internal1_mac_requirements order: get_input: - port_VLC1_Internal1_order @@ -471,9 +437,7 @@ topology_template: - port_VLC1_Internal1_network - index_value mac_address: - get_input: - - port_VLC1_Internal1_mac_address - - index_value + get_input: port_VLC1_Internal1_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -491,17 +455,11 @@ topology_template: - port_VLC_OAM_vlan_requirements - index_value ip_requirements: - get_input: - - port_VLC_OAM_ip_requirements - - index_value + get_input: port_VLC_OAM_ip_requirements network_role_tag: - get_input: - - port_VLC_OAM_network_role_tag - - index_value + get_input: port_VLC_OAM_network_role_tag mac_requirements: - get_input: - - port_VLC_OAM_mac_requirements - - index_value + get_input: port_VLC_OAM_mac_requirements order: get_input: - port_VLC_OAM_order @@ -515,9 +473,7 @@ topology_template: - port_VLC_OAM_subnetpoolid - index_value fixed_ips: - get_input: - - port_VLC_OAM_fixed_ips - - index_value + get_input: port_VLC_OAM_fixed_ips network: get_input: - port_VLC_OAM_network @@ -539,17 +495,13 @@ topology_template: - port_VLC_SCTP_A_vlan_requirements - index_value ip_requirements: - get_input: - - port_VLC_SCTP_A_ip_requirements - - index_value + get_input: port_VLC_SCTP_A_ip_requirements network_role_tag: get_input: - port_VLC_SCTP_A_network_role_tag - index_value mac_requirements: - get_input: - - port_VLC_SCTP_A_mac_requirements - - index_value + get_input: port_VLC_SCTP_A_mac_requirements order: get_input: - port_VLC_SCTP_A_order @@ -563,9 +515,7 @@ topology_template: - port_VLC_SCTP_A_subnetpoolid - index_value fixed_ips: - get_input: - - port_VLC_SCTP_A_fixed_ips - - index_value + get_input: port_VLC_SCTP_A_fixed_ips network: get_input: - port_VLC_SCTP_A_network @@ -602,17 +552,13 @@ topology_template: - port_VLC_GTP_vlan_requirements - index_value ip_requirements: - get_input: - - port_VLC_GTP_ip_requirements - - index_value + get_input: port_VLC_GTP_ip_requirements network_role_tag: get_input: - port_VLC_GTP_network_role_tag - index_value mac_requirements: - get_input: - - port_VLC_GTP_mac_requirements - - index_value + get_input: port_VLC_GTP_mac_requirements order: get_input: - port_VLC_GTP_order @@ -626,9 +572,7 @@ topology_template: - port_VLC_GTP_subnetpoolid - index_value fixed_ips: - get_input: - - port_VLC_GTP_fixed_ips - - index_value + get_input: port_VLC_GTP_fixed_ips network: get_input: - port_VLC_GTP_network @@ -1004,4 +948,4 @@ topology_template: - dependency dependency_VLC1_VLC_SCTP_A: - VLC1_VLC_SCTP_A - - 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/singleSubstitution/generalVf/out/Nested_VLC2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_VLC2ServiceTemplate.yaml index 75b8246a49..0254ce3d48 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_VLC2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_VLC2ServiceTemplate.yaml @@ -17,25 +17,21 @@ topology_template: entry_schema: type: json port_VLC_OAM_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_VLC_GTP_ip_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC2_Internal2_ip_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC_SCTP_A_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -43,22 +39,20 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC_SCTP_A_fixed_ips: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_VLC2_Internal1_network_role_tag: type: list required: true entry_schema: type: string port_VLC2_Internal2_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_VLC_GTP_network_role_tag: type: list required: true @@ -68,20 +62,14 @@ topology_template: type: string required: true port_VLC2_Internal1_mac_address: - type: list + type: string required: true - entry_schema: - type: string port_VLC2_Internal2_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_VLC2_Internal1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_VLC_SCTP_B_network: type: list required: true @@ -96,7 +84,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC_GTP_order: type: list required: true @@ -121,7 +109,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_VLC_OAM_network: type: list required: true @@ -166,12 +154,12 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC_OAM_fixed_ips: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_VLC2_Internal1_order: type: list required: true @@ -186,7 +174,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_VLC2_Internal2_vlan_requirements: type: list required: true @@ -248,7 +236,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_VLC_GTP_network_role: type: list required: true @@ -265,10 +253,8 @@ topology_template: entry_schema: type: integer port_VLC_GTP_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_VLC2_Internal1_network: type: list required: true @@ -285,10 +271,8 @@ topology_template: entry_schema: type: json port_VLC_OAM_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_VLC2_Internal1_vlan_requirements: type: list required: true @@ -300,10 +284,8 @@ topology_template: entry_schema: type: string port_VLC_SCTP_B_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_VLC2_Internal2_exCP_naming: type: list required: true @@ -347,17 +329,13 @@ topology_template: - port_VLC2_Internal2_vlan_requirements - index_value ip_requirements: - get_input: - - port_VLC2_Internal2_ip_requirements - - index_value + get_input: port_VLC2_Internal2_ip_requirements network_role_tag: get_input: - port_VLC2_Internal2_network_role_tag - index_value mac_requirements: - get_input: - - port_VLC2_Internal2_mac_requirements - - index_value + get_input: port_VLC2_Internal2_mac_requirements order: get_input: - port_VLC2_Internal2_order @@ -375,9 +353,7 @@ topology_template: - port_VLC2_Internal2_network - index_value mac_address: - get_input: - - port_VLC2_Internal2_mac_address - - index_value + get_input: port_VLC2_Internal2_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -395,17 +371,11 @@ topology_template: - port_VLC_OAM_vlan_requirements - index_value ip_requirements: - get_input: - - port_VLC_OAM_ip_requirements - - index_value + get_input: port_VLC_OAM_ip_requirements network_role_tag: - get_input: - - port_VLC_OAM_network_role_tag - - index_value + get_input: port_VLC_OAM_network_role_tag mac_requirements: - get_input: - - port_VLC_OAM_mac_requirements - - index_value + get_input: port_VLC_OAM_mac_requirements order: get_input: - port_VLC_OAM_order @@ -419,9 +389,7 @@ topology_template: - port_VLC_OAM_subnetpoolid - index_value fixed_ips: - get_input: - - port_VLC_OAM_fixed_ips - - index_value + get_input: port_VLC_OAM_fixed_ips network: get_input: - port_VLC_OAM_network @@ -443,17 +411,13 @@ topology_template: - port_VLC2_Internal1_vlan_requirements - index_value ip_requirements: - get_input: - - port_VLC2_Internal1_ip_requirements - - index_value + get_input: port_VLC2_Internal1_ip_requirements network_role_tag: get_input: - port_VLC2_Internal1_network_role_tag - index_value mac_requirements: - get_input: - - port_VLC2_Internal1_mac_requirements - - index_value + get_input: port_VLC2_Internal1_mac_requirements order: get_input: - port_VLC2_Internal1_order @@ -471,9 +435,7 @@ topology_template: - port_VLC2_Internal1_network - index_value mac_address: - get_input: - - port_VLC2_Internal1_mac_address - - index_value + get_input: port_VLC2_Internal1_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -491,17 +453,13 @@ topology_template: - port_VLC_SCTP_A_vlan_requirements - index_value ip_requirements: - get_input: - - port_VLC_SCTP_A_ip_requirements - - index_value + get_input: port_VLC_SCTP_A_ip_requirements network_role_tag: get_input: - port_VLC_SCTP_A_network_role_tag - index_value mac_requirements: - get_input: - - port_VLC_SCTP_A_mac_requirements - - index_value + get_input: port_VLC_SCTP_A_mac_requirements order: get_input: - port_VLC_SCTP_A_order @@ -515,9 +473,7 @@ topology_template: - port_VLC_SCTP_A_subnetpoolid - index_value fixed_ips: - get_input: - - port_VLC_SCTP_A_fixed_ips - - index_value + get_input: port_VLC_SCTP_A_fixed_ips network: get_input: - port_VLC_SCTP_A_network @@ -539,17 +495,13 @@ topology_template: - port_VLC_SCTP_B_vlan_requirements - index_value ip_requirements: - get_input: - - port_VLC_SCTP_B_ip_requirements - - index_value + get_input: port_VLC_SCTP_B_ip_requirements network_role_tag: get_input: - port_VLC_SCTP_B_network_role_tag - index_value mac_requirements: - get_input: - - port_VLC_SCTP_B_mac_requirements - - index_value + get_input: port_VLC_SCTP_B_mac_requirements order: get_input: - port_VLC_SCTP_B_order @@ -563,9 +515,7 @@ topology_template: - port_VLC_SCTP_B_subnetpoolid - index_value fixed_ips: - get_input: - - port_VLC_SCTP_B_fixed_ips - - index_value + get_input: port_VLC_SCTP_B_fixed_ips network: get_input: - port_VLC_SCTP_B_network @@ -587,17 +537,13 @@ topology_template: - port_VLC_GTP_vlan_requirements - index_value ip_requirements: - get_input: - - port_VLC_GTP_ip_requirements - - index_value + get_input: port_VLC_GTP_ip_requirements network_role_tag: get_input: - port_VLC_GTP_network_role_tag - index_value mac_requirements: - get_input: - - port_VLC_GTP_mac_requirements - - index_value + get_input: port_VLC_GTP_mac_requirements order: get_input: - port_VLC_GTP_order @@ -611,9 +557,7 @@ topology_template: - port_VLC_GTP_subnetpoolid - index_value fixed_ips: - get_input: - - port_VLC_GTP_fixed_ips - - index_value + get_input: port_VLC_GTP_fixed_ips network: get_input: - port_VLC_GTP_network @@ -1004,4 +948,4 @@ topology_template: - dependency dependency_VLC2_VLC_GTP: - VLC2_VLC_GTP - - 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/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index b9579e65a7..297b162827 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -29,11 +29,9 @@ node_types: entry_schema: type: string port_pd02_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_pd01_port_exCP_naming: type: list required: true @@ -57,17 +55,13 @@ node_types: entry_schema: type: string port_pd02_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_pd02_port_vlan_requirements: type: list required: true @@ -83,7 +77,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true @@ -125,13 +119,11 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -574,4 +566,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml index 02d93a5611..796c3392ce 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml @@ -431,14 +431,13 @@ topology_template: - pd_server_names - 0 port_pd02_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_network_role_tag: - - oam + port_pd02_port_network_role_tag: oam port_pd01_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false vm_image_name: get_input: pd_image_name @@ -456,8 +455,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam port_pd02_port_network: - get_input: oam_net_name compute_pd_server_user_data_format: @@ -493,4 +491,4 @@ topology_template: members: - network_policy_port - network_policy_server - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml index 3dce505771..084a479348 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml @@ -29,10 +29,8 @@ topology_template: entry_schema: type: string port_pd02_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_pd01_port_exCP_naming: type: list required: true @@ -52,15 +50,11 @@ topology_template: entry_schema: type: string port_pd02_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_pd02_port_vlan_requirements: type: list required: true @@ -73,7 +67,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true @@ -108,12 +102,10 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -161,17 +153,11 @@ topology_template: - port_pd01_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_ip_requirements - - index_value + get_input: port_pd01_port_ip_requirements network_role_tag: - get_input: - - port_pd01_port_network_role_tag - - index_value + get_input: port_pd01_port_network_role_tag mac_requirements: - get_input: - - port_pd01_port_mac_requirements - - index_value + get_input: port_pd01_port_mac_requirements order: get_input: - port_pd01_port_order @@ -205,17 +191,11 @@ topology_template: - port_pd02_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd02_port_ip_requirements - - index_value + get_input: port_pd02_port_ip_requirements network_role_tag: - get_input: - - port_pd02_port_network_role_tag - - index_value + get_input: port_pd02_port_network_role_tag mac_requirements: - get_input: - - port_pd02_port_mac_requirements - - index_value + get_input: port_pd02_port_mac_requirements order: get_input: - port_pd02_port_order @@ -464,4 +444,4 @@ topology_template: - dependency dependency_pd_server_pd02_port: - pd_server_pd02_port - - 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/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index b003fc2638..e4d6d6d745 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -29,11 +29,9 @@ node_types: entry_schema: type: string port_pd02_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_pd01_port_exCP_naming: type: list required: true @@ -57,17 +55,13 @@ node_types: entry_schema: type: string port_pd02_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_pd02_port_vlan_requirements: type: list required: true @@ -83,7 +77,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true @@ -125,7 +119,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: type: list required: true @@ -563,4 +557,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml index 4c725c039e..80eb5907a0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml @@ -431,16 +431,15 @@ topology_template: - pd_server_names - 0 port_pd02_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false vm_flavor_name: get_attribute: - network_policy_server - name - port_pd02_port_network_role_tag: - - oam + port_pd02_port_network_role_tag: oam port_pd01_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false vm_image_name: get_input: pd_image_name @@ -485,4 +484,4 @@ topology_template: description: heat template that creates MOG stack members: - network_policy_server - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml index 6d0690a78d..e1bd0ef66c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml @@ -29,10 +29,8 @@ topology_template: entry_schema: type: string port_pd02_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_pd01_port_exCP_naming: type: list required: true @@ -52,15 +50,11 @@ topology_template: entry_schema: type: string port_pd02_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_pd02_port_vlan_requirements: type: list required: true @@ -73,7 +67,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true @@ -108,7 +102,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: type: list required: true @@ -161,17 +155,13 @@ topology_template: - port_pd01_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_ip_requirements - - index_value + get_input: port_pd01_port_ip_requirements network_role_tag: get_input: - port_pd01_port_network_role_tag - index_value mac_requirements: - get_input: - - port_pd01_port_mac_requirements - - index_value + get_input: port_pd01_port_mac_requirements order: get_input: - port_pd01_port_order @@ -205,17 +195,11 @@ topology_template: - port_pd02_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd02_port_ip_requirements - - index_value + get_input: port_pd02_port_ip_requirements network_role_tag: - get_input: - - port_pd02_port_network_role_tag - - index_value + get_input: port_pd02_port_network_role_tag mac_requirements: - get_input: - - port_pd02_port_mac_requirements - - index_value + get_input: port_pd02_port_mac_requirements order: get_input: - port_pd02_port_order @@ -447,4 +431,4 @@ topology_template: - dependency dependency_pd_server_pd02_port: - pd_server_pd02_port - - 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/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index a308e85feb..528c65042d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -9,11 +9,9 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_pd01_port_0_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_pd01_port_0_network: type: list required: true @@ -25,7 +23,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role_tag: type: list required: true @@ -43,7 +41,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -99,11 +97,9 @@ node_types: entry_schema: type: json port_pd01_port_1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_pd01_port_1_subnetpoolid: type: list required: true @@ -121,11 +117,9 @@ node_types: entry_schema: type: json port_pd01_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_vlan_requirements: type: list required: true @@ -563,4 +557,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml index c2acb1bbd2..279f92ea87 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml @@ -54,7 +54,7 @@ topology_template: - substitutable properties: port_pd01_port_0_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false port_pd01_port_0_network: - get_attribute: @@ -83,12 +83,10 @@ topology_template: - network_policy_server - name port_pd01_port_1_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_1_network_role_tag: - - oam port_pd01_port_1_network: - get_input: oam_net_name compute_pd_server_user_data_format: @@ -114,4 +112,4 @@ topology_template: description: heat template that creates MOG stack members: - network_policy_server - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml index e2edfa3db1..2ec558101d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml @@ -12,10 +12,8 @@ node_types: topology_template: inputs: port_pd01_port_0_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_pd01_port_0_network: type: list required: true @@ -25,7 +23,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role_tag: type: list required: true @@ -40,7 +38,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -87,10 +85,8 @@ topology_template: entry_schema: type: json port_pd01_port_1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_pd01_port_1_subnetpoolid: type: list required: true @@ -105,10 +101,8 @@ topology_template: entry_schema: type: json port_pd01_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_vlan_requirements: type: list required: true @@ -161,17 +155,11 @@ topology_template: - port_pd01_port_1_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_1_ip_requirements - - index_value + get_input: port_pd01_port_1_ip_requirements network_role_tag: - get_input: - - port_pd01_port_1_network_role_tag - - index_value + get_input: port_pd01_port_1_network_role_tag mac_requirements: - get_input: - - port_pd01_port_1_mac_requirements - - index_value + get_input: port_pd01_port_1_mac_requirements order: get_input: - port_pd01_port_1_order @@ -205,17 +193,13 @@ topology_template: - port_pd01_port_0_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_0_ip_requirements - - index_value + get_input: port_pd01_port_0_ip_requirements network_role_tag: get_input: - port_pd01_port_0_network_role_tag - index_value mac_requirements: - get_input: - - port_pd01_port_0_mac_requirements - - index_value + get_input: port_pd01_port_0_mac_requirements order: get_input: - port_pd01_port_0_order @@ -447,4 +431,4 @@ topology_template: - link link_pd_server_pd01_port_1: - pd_server_pd01_port_1 - - link
\ No newline at end of file + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index c9e53c828b..594705df40 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -9,11 +9,9 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_pd01_port_0_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_pd01_port_0_network: type: list required: true @@ -25,13 +23,11 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_network_role: type: list required: true @@ -43,7 +39,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -99,11 +95,9 @@ node_types: entry_schema: type: json port_pd01_port_1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_pd01_port_1_subnetpoolid: type: list required: true @@ -121,11 +115,9 @@ node_types: entry_schema: type: json port_pd01_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_vlan_requirements: type: list required: true @@ -579,4 +571,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml index ef0c096cb3..addfbc7d6b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml @@ -425,7 +425,7 @@ topology_template: - substitutable properties: port_pd01_port_0_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false port_pd01_port_0_network: - get_input: oam_net_name @@ -435,8 +435,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_0_network_role_tag: - - oam + port_pd01_port_0_network_role_tag: oam port_pd01_port_1_ip_requirements: - - ip_version: 4 ip_count_required: @@ -452,12 +451,11 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name port_pd01_port_1_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_1_network_role_tag: - - oam + port_pd01_port_1_network_role_tag: oam port_pd01_port_1_network: - get_input: oam_net_name compute_pd_server_user_data_format: @@ -501,4 +499,4 @@ topology_template: - network_policy_port0 - network_policy_server - network_policy_port1 - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml index 9103bf7fa2..6537ee755c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml @@ -12,10 +12,8 @@ node_types: topology_template: inputs: port_pd01_port_0_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_pd01_port_0_network: type: list required: true @@ -25,12 +23,10 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_network_role: type: list required: true @@ -40,7 +36,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -87,10 +83,8 @@ topology_template: entry_schema: type: json port_pd01_port_1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_pd01_port_1_subnetpoolid: type: list required: true @@ -105,10 +99,8 @@ topology_template: entry_schema: type: json port_pd01_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_vlan_requirements: type: list required: true @@ -161,17 +153,11 @@ topology_template: - port_pd01_port_1_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_1_ip_requirements - - index_value + get_input: port_pd01_port_1_ip_requirements network_role_tag: - get_input: - - port_pd01_port_1_network_role_tag - - index_value + get_input: port_pd01_port_1_network_role_tag mac_requirements: - get_input: - - port_pd01_port_1_mac_requirements - - index_value + get_input: port_pd01_port_1_mac_requirements order: get_input: - port_pd01_port_1_order @@ -205,17 +191,11 @@ topology_template: - port_pd01_port_0_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_0_ip_requirements - - index_value + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: - - port_pd01_port_0_network_role_tag - - index_value + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: - - port_pd01_port_0_mac_requirements - - index_value + get_input: port_pd01_port_0_mac_requirements order: get_input: - port_pd01_port_0_order @@ -472,4 +452,4 @@ topology_template: - link link_pd_server_pd01_port_1: - pd_server_pd01_port_1 - - link
\ No newline at end of file + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 2ad9165c79..763525ab0d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -9,11 +9,9 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_pd01_port_0_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_pd01_port_0_network: type: list required: true @@ -25,13 +23,11 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_network_role: type: list required: true @@ -43,7 +39,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -99,11 +95,9 @@ node_types: entry_schema: type: json port_pd01_port_1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_pd01_port_1_subnetpoolid: type: list required: true @@ -121,11 +115,9 @@ node_types: entry_schema: type: json port_pd01_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_vlan_requirements: type: list required: true @@ -579,4 +571,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml index 0f0b1490e8..32c1e33f45 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml @@ -425,7 +425,7 @@ topology_template: - substitutable properties: port_pd01_port_0_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false port_pd01_port_0_network: - get_input: oam_net_name @@ -435,8 +435,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_0_network_role_tag: - - oam + port_pd01_port_0_network_role_tag: oam port_pd01_port_1_ip_requirements: - - ip_version: 4 ip_count_required: @@ -452,12 +451,11 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name port_pd01_port_1_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_1_network_role_tag: - - oam + port_pd01_port_1_network_role_tag: oam port_pd01_port_1_network: - get_input: oam_net_name compute_pd_server_user_data_format: @@ -496,4 +494,4 @@ topology_template: value: get_attribute: - abstract_pd_server - - pd_server_accessIPv4
\ No newline at end of file + - pd_server_accessIPv4 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml index 0554f63c37..34a617f04d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml @@ -12,10 +12,8 @@ node_types: topology_template: inputs: port_pd01_port_0_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_pd01_port_0_network: type: list required: true @@ -25,12 +23,10 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_network_role: type: list required: true @@ -40,7 +36,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -87,10 +83,8 @@ topology_template: entry_schema: type: json port_pd01_port_1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_pd01_port_1_subnetpoolid: type: list required: true @@ -105,10 +99,8 @@ topology_template: entry_schema: type: json port_pd01_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_vlan_requirements: type: list required: true @@ -161,17 +153,11 @@ topology_template: - port_pd01_port_1_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_1_ip_requirements - - index_value + get_input: port_pd01_port_1_ip_requirements network_role_tag: - get_input: - - port_pd01_port_1_network_role_tag - - index_value + get_input: port_pd01_port_1_network_role_tag mac_requirements: - get_input: - - port_pd01_port_1_mac_requirements - - index_value + get_input: port_pd01_port_1_mac_requirements order: get_input: - port_pd01_port_1_order @@ -205,17 +191,11 @@ topology_template: - port_pd01_port_0_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_0_ip_requirements - - index_value + get_input: port_pd01_port_0_ip_requirements network_role_tag: - get_input: - - port_pd01_port_0_network_role_tag - - index_value + get_input: port_pd01_port_0_network_role_tag mac_requirements: - get_input: - - port_pd01_port_0_mac_requirements - - index_value + get_input: port_pd01_port_0_mac_requirements order: get_input: - port_pd01_port_0_order @@ -472,4 +452,4 @@ topology_template: - link link_pd_server_pd01_port_1: - pd_server_pd01_port_1 - - link
\ No newline at end of file + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml index 7d05b9ccc7..5d5327b6b4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -51,11 +51,9 @@ node_types: entry_schema: type: json port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json vm_image_name: type: string required: true @@ -65,7 +63,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true @@ -91,11 +89,9 @@ node_types: entry_schema: type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -483,11 +479,9 @@ node_types: entry_schema: type: json port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json compute_oam_server_availability_zone: type: list required: true @@ -503,7 +497,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true @@ -541,11 +535,9 @@ node_types: entry_schema: type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -952,11 +944,9 @@ node_types: entry_schema: type: json port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json vm_image_name: type: string required: true @@ -966,7 +956,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true @@ -1349,4 +1339,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml index 21a0a374de..49797c2e91 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml @@ -217,7 +217,7 @@ topology_template: port_pd01_port_security_groups: - - jsa_security_group port_pd01_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false vm_image_name: get_input: pd_image_name @@ -229,8 +229,7 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -268,7 +267,7 @@ topology_template: port_pd01_port_security_groups: - - jsa_security_group port_pd01_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false vm_image_name: get_input: pd_image_name @@ -307,7 +306,7 @@ topology_template: port_pd01_port_security_groups: - - jsa_security_group port_pd01_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false compute_oam_server_availability_zone: - get_input: availabilityzone_name @@ -327,8 +326,7 @@ topology_template: - get_input: - oam_server_names - 0 - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam compute_oam_server_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -471,4 +469,4 @@ topology_template: name: def affinity: host targets: - - BE_Affinity_group
\ No newline at end of file + - BE_Affinity_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml index 4e1b24e7f0..7ae3192757 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml @@ -32,10 +32,8 @@ topology_template: entry_schema: type: json port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json compute_oam_server_availability_zone: type: list required: true @@ -48,7 +46,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true @@ -80,10 +78,8 @@ topology_template: entry_schema: type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -111,17 +107,11 @@ topology_template: - port_pd01_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_ip_requirements - - index_value + get_input: port_pd01_port_ip_requirements network_role_tag: - get_input: - - port_pd01_port_network_role_tag - - index_value + get_input: port_pd01_port_network_role_tag mac_requirements: - get_input: - - port_pd01_port_mac_requirements - - index_value + get_input: port_pd01_port_mac_requirements order: get_input: - port_pd01_port_order @@ -346,4 +336,4 @@ topology_template: - local_storage dependency_oam_server: - oam_server - - 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/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml index 1356fb8878..835f63e7c4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml @@ -47,10 +47,8 @@ topology_template: entry_schema: type: json port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json vm_image_name: type: string required: true @@ -58,7 +56,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true @@ -80,10 +78,8 @@ topology_template: entry_schema: type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -134,17 +130,11 @@ topology_template: - port_pd01_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_ip_requirements - - index_value + get_input: port_pd01_port_ip_requirements network_role_tag: - get_input: - - port_pd01_port_network_role_tag - - index_value + get_input: port_pd01_port_network_role_tag mac_requirements: - get_input: - - port_pd01_port_mac_requirements - - index_value + get_input: port_pd01_port_mac_requirements order: get_input: - port_pd01_port_order @@ -354,4 +344,4 @@ topology_template: - dependency dependency_pd_server: - pd_server - - 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/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml index f408bad2cc..4c822803dc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml @@ -52,10 +52,8 @@ topology_template: entry_schema: type: json port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json vm_image_name: type: string required: true @@ -63,7 +61,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true @@ -111,17 +109,13 @@ topology_template: - port_pd01_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_ip_requirements - - index_value + get_input: port_pd01_port_ip_requirements network_role_tag: get_input: - port_pd01_port_network_role_tag - index_value mac_requirements: - get_input: - - port_pd01_port_mac_requirements - - index_value + get_input: port_pd01_port_mac_requirements order: get_input: - port_pd01_port_order @@ -354,4 +348,4 @@ topology_template: - link local_storage_ps_server: - ps_server - - local_storage
\ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml index 85ccd9d77a..5b3ab356a3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -39,11 +39,9 @@ node_types: required: true status: SUPPORTED port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json vm_image_name: type: string required: true @@ -53,7 +51,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true @@ -79,11 +77,9 @@ node_types: entry_schema: type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -454,11 +450,9 @@ node_types: required: true status: SUPPORTED port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json compute_oam_server_availability_zone: type: list required: true @@ -474,7 +468,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true @@ -512,11 +506,9 @@ node_types: entry_schema: type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -899,11 +891,9 @@ node_types: required: true status: SUPPORTED port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json vm_image_name: type: string required: true @@ -913,7 +903,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true @@ -1285,4 +1275,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml index 4a0ccad45d..f008605a65 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml @@ -186,7 +186,7 @@ topology_template: - network_policy_server - name port_pd01_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false vm_image_name: get_input: pd_image_name @@ -198,8 +198,7 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -228,7 +227,7 @@ topology_template: - network_policy_server - name port_pd01_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false vm_image_name: get_input: pd_image_name @@ -260,7 +259,7 @@ topology_template: - network_policy_server - name port_pd01_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false compute_oam_server_availability_zone: - get_input: availabilityzone_name @@ -280,8 +279,7 @@ topology_template: - get_input: - oam_server_names - 0 - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam service_template_filter: substitute_service_template: Nested_oam_serverServiceTemplate.yaml count: 1 @@ -305,4 +303,4 @@ topology_template: - network_policy_server - abstract_pd_server - abstract_ps_server - - abstract_oam_server
\ No newline at end of file + - abstract_oam_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml index 9a034c3803..e968397cb1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml @@ -27,10 +27,8 @@ topology_template: type: string required: true port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json compute_oam_server_availability_zone: type: list required: true @@ -43,7 +41,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true @@ -75,10 +73,8 @@ topology_template: entry_schema: type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -97,17 +93,11 @@ topology_template: - port_pd01_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_ip_requirements - - index_value + get_input: port_pd01_port_ip_requirements network_role_tag: - get_input: - - port_pd01_port_network_role_tag - - index_value + get_input: port_pd01_port_network_role_tag mac_requirements: - get_input: - - port_pd01_port_mac_requirements - - index_value + get_input: port_pd01_port_mac_requirements order: get_input: - port_pd01_port_order @@ -319,4 +309,4 @@ topology_template: - local_storage dependency_oam_server: - oam_server - - 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/singleSubstitution/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml index dd358a5dd2..68fcd79ffa 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml @@ -37,10 +37,8 @@ topology_template: type: string required: true port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json vm_image_name: type: string required: true @@ -48,7 +46,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true @@ -70,10 +68,8 @@ topology_template: entry_schema: type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -116,17 +112,11 @@ topology_template: - port_pd01_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_ip_requirements - - index_value + get_input: port_pd01_port_ip_requirements network_role_tag: - get_input: - - port_pd01_port_network_role_tag - - index_value + get_input: port_pd01_port_network_role_tag mac_requirements: - get_input: - - port_pd01_port_mac_requirements - - index_value + get_input: port_pd01_port_mac_requirements order: get_input: - port_pd01_port_order @@ -319,4 +309,4 @@ topology_template: - dependency dependency_pd_server: - pd_server - - 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/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml index 8ccfbad0a7..8e8880a7e6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml @@ -42,10 +42,8 @@ topology_template: type: string required: true port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json vm_image_name: type: string required: true @@ -53,7 +51,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true @@ -97,17 +95,13 @@ topology_template: - port_pd01_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_ip_requirements - - index_value + get_input: port_pd01_port_ip_requirements network_role_tag: get_input: - port_pd01_port_network_role_tag - index_value mac_requirements: - get_input: - - port_pd01_port_mac_requirements - - index_value + get_input: port_pd01_port_mac_requirements order: get_input: - port_pd01_port_order @@ -319,4 +313,4 @@ topology_template: - link local_storage_ps_server: - ps_server - - local_storage
\ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml index 13e08cc899..3b35623f81 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -39,11 +39,9 @@ node_types: required: true status: SUPPORTED port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json vm_image_name: type: string required: true @@ -53,7 +51,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_order: type: list required: true @@ -460,11 +458,9 @@ node_types: required: true status: SUPPORTED port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json vm_image_name: type: string required: true @@ -474,7 +470,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_order: type: list required: true @@ -881,11 +877,9 @@ node_types: required: true status: SUPPORTED port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json vm_image_name: type: string required: true @@ -895,7 +889,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true @@ -921,11 +915,9 @@ node_types: entry_schema: type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -1273,4 +1265,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml index 6eec7d894d..958eac629f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml @@ -199,7 +199,7 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name port_pd01_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false vm_image_name: get_input: pd_image_name @@ -211,8 +211,7 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -242,7 +241,7 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name port_pd01_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false vm_image_name: get_input: pd_image_name @@ -276,7 +275,7 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name port_pd01_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false vm_image_name: get_input: pd_image_name @@ -307,4 +306,4 @@ topology_template: - network_policy_server - abstract_pd_server_0 - abstract_pd_server_1 - - abstract_pd_server_2
\ No newline at end of file + - abstract_pd_server_2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_0ServiceTemplate.yaml index 2ca7b3c25f..19f4b83534 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_0ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_0ServiceTemplate.yaml @@ -37,10 +37,8 @@ topology_template: type: string required: true port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json vm_image_name: type: string required: true @@ -48,7 +46,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_order: type: list required: true @@ -111,17 +109,13 @@ topology_template: - port_pd01_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_ip_requirements - - index_value + get_input: port_pd01_port_ip_requirements network_role_tag: get_input: - port_pd01_port_network_role_tag - index_value mac_requirements: - get_input: - - port_pd01_port_mac_requirements - - index_value + get_input: port_pd01_port_mac_requirements order: get_input: - port_pd01_port_order @@ -314,4 +308,4 @@ topology_template: - dependency dependency_pd_server: - pd_server - - 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/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml index 445fc6df88..a20167c3f7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml @@ -37,10 +37,8 @@ topology_template: type: string required: true port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json vm_image_name: type: string required: true @@ -48,7 +46,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_order: type: list required: true @@ -111,17 +109,13 @@ topology_template: - port_pd01_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_ip_requirements - - index_value + get_input: port_pd01_port_ip_requirements network_role_tag: get_input: - port_pd01_port_network_role_tag - index_value mac_requirements: - get_input: - - port_pd01_port_mac_requirements - - index_value + get_input: port_pd01_port_mac_requirements order: get_input: - port_pd01_port_order @@ -314,4 +308,4 @@ topology_template: - dependency dependency_pd_server: - pd_server - - 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/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml index 08e5895c0e..12a7a03815 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml @@ -37,10 +37,8 @@ topology_template: type: string required: true port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json vm_image_name: type: string required: true @@ -48,7 +46,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true @@ -70,10 +68,8 @@ topology_template: entry_schema: type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -116,17 +112,11 @@ topology_template: - port_pd01_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_ip_requirements - - index_value + get_input: port_pd01_port_ip_requirements network_role_tag: - get_input: - - port_pd01_port_network_role_tag - - index_value + get_input: port_pd01_port_network_role_tag mac_requirements: - get_input: - - port_pd01_port_mac_requirements - - index_value + get_input: port_pd01_port_mac_requirements order: get_input: - port_pd01_port_order @@ -319,4 +309,4 @@ topology_template: - dependency dependency_pd_server: - pd_server - - 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/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index c5923cc46b..72d15b3a03 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -39,11 +39,9 @@ node_types: required: true status: SUPPORTED port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json vm_image_name: type: string required: true @@ -53,7 +51,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true @@ -79,11 +77,9 @@ node_types: entry_schema: type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -466,11 +462,9 @@ node_types: required: true status: SUPPORTED port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json vm_image_name: type: string required: true @@ -480,7 +474,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true @@ -911,23 +905,19 @@ node_types: required: true status: SUPPORTED port_pd01_port_2_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_3_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_3_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_pd01_port_3_network: type: list required: true @@ -969,11 +959,9 @@ node_types: entry_schema: type: json port_pd01_port_2_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_pd01_port_2_exCP_naming: type: list required: true @@ -981,11 +969,9 @@ node_types: entry_schema: type: json port_pd01_port_3_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_pd_server_user_data_format: type: list required: true @@ -997,7 +983,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_3_exCP_naming: type: list required: true @@ -1417,4 +1403,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml index 873c04ebec..bd48f71527 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml @@ -185,8 +185,7 @@ topology_template: get_attribute: - network_policy_server - name - port_pd01_port_2_network_role_tag: - - oam + port_pd01_port_2_network_role_tag: oam port_pd01_port_3_ip_requirements: - - ip_version: 4 ip_count_required: @@ -194,7 +193,7 @@ topology_template: floating_ip_count_required: is_required: false port_pd01_port_3_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false port_pd01_port_3_network: - get_input: oam_net_name @@ -203,10 +202,9 @@ topology_template: port_pd01_port_2_network: - get_input: oam_net_name port_pd01_port_2_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false - port_pd01_port_3_network_role_tag: - - oam + port_pd01_port_3_network_role_tag: oam compute_pd_server_user_data_format: - RAW port_pd01_port_2_ip_requirements: @@ -244,7 +242,7 @@ topology_template: - network_policy_server - name port_pd01_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false vm_image_name: get_input: pd_image_name @@ -256,8 +254,7 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -284,7 +281,7 @@ topology_template: - network_policy_server - name port_pd01_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false vm_image_name: get_input: pd_image_name @@ -318,4 +315,4 @@ topology_template: - network_policy_server - abstract_pd_server_0 - abstract_pd_server_1 - - abstract_pd_server_2
\ No newline at end of file + - abstract_pd_server_2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_0ServiceTemplate.yaml index 6a96d70747..e3df4382db 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_0ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_0ServiceTemplate.yaml @@ -37,10 +37,8 @@ topology_template: type: string required: true port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json vm_image_name: type: string required: true @@ -48,7 +46,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true @@ -70,10 +68,8 @@ topology_template: entry_schema: type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -116,17 +112,11 @@ topology_template: - port_pd01_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_ip_requirements - - index_value + get_input: port_pd01_port_ip_requirements network_role_tag: - get_input: - - port_pd01_port_network_role_tag - - index_value + get_input: port_pd01_port_network_role_tag mac_requirements: - get_input: - - port_pd01_port_mac_requirements - - index_value + get_input: port_pd01_port_mac_requirements order: get_input: - port_pd01_port_order @@ -319,4 +309,4 @@ topology_template: - dependency dependency_pd_server: - pd_server - - 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/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml index 1efd8dcca0..d4f7949e6f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml @@ -37,10 +37,8 @@ topology_template: type: string required: true port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json vm_image_name: type: string required: true @@ -48,7 +46,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true @@ -116,17 +114,13 @@ topology_template: - port_pd01_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_ip_requirements - - index_value + get_input: port_pd01_port_ip_requirements network_role_tag: get_input: - port_pd01_port_network_role_tag - index_value mac_requirements: - get_input: - - port_pd01_port_mac_requirements - - index_value + get_input: port_pd01_port_mac_requirements order: get_input: - port_pd01_port_order @@ -319,4 +313,4 @@ topology_template: - dependency dependency_pd_server: - pd_server - - 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/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml index fd95fdc3fe..4d99432a64 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml @@ -52,20 +52,16 @@ topology_template: type: string required: true port_pd01_port_2_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_3_ip_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_3_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_pd01_port_3_network: type: list required: true @@ -100,20 +96,16 @@ topology_template: entry_schema: type: json port_pd01_port_2_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_pd01_port_2_exCP_naming: type: list required: true entry_schema: type: json port_pd01_port_3_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string compute_pd_server_user_data_format: type: list required: true @@ -123,7 +115,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_3_exCP_naming: type: list required: true @@ -161,17 +153,11 @@ topology_template: - port_pd01_port_2_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_2_ip_requirements - - index_value + get_input: port_pd01_port_2_ip_requirements network_role_tag: - get_input: - - port_pd01_port_2_network_role_tag - - index_value + get_input: port_pd01_port_2_network_role_tag mac_requirements: - get_input: - - port_pd01_port_2_mac_requirements - - index_value + get_input: port_pd01_port_2_mac_requirements order: get_input: - port_pd01_port_2_order @@ -205,17 +191,11 @@ topology_template: - port_pd01_port_3_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_3_ip_requirements - - index_value + get_input: port_pd01_port_3_ip_requirements network_role_tag: - get_input: - - port_pd01_port_3_network_role_tag - - index_value + get_input: port_pd01_port_3_network_role_tag mac_requirements: - get_input: - - port_pd01_port_3_mac_requirements - - index_value + get_input: port_pd01_port_3_mac_requirements order: get_input: - port_pd01_port_3_order @@ -447,4 +427,4 @@ topology_template: - dependency dependency_pd_server_pd01_port_3: - pd_server_pd01_port_3 - - 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/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml index fb56d43c41..71931abcb3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -39,11 +39,9 @@ node_types: required: true status: SUPPORTED port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json vm_image_name: type: string required: true @@ -53,7 +51,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true @@ -79,11 +77,9 @@ node_types: entry_schema: type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -500,11 +496,9 @@ node_types: entry_schema: type: string port_ps01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_ps01_port_network: type: list required: true @@ -516,13 +510,11 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_ps01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_ps01_port_exCP_naming: type: list required: true @@ -870,4 +862,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml index f8c0769307..a665ceda97 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml @@ -364,7 +364,7 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name port_pd01_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false vm_image_name: get_attribute: @@ -378,8 +378,7 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -410,7 +409,7 @@ topology_template: - abstract_pd_server - pd_server_accessIPv4 port_ps01_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false port_ps01_port_network: - get_input: oam_net_name @@ -420,8 +419,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_ps01_port_network_role_tag: - - oam + port_ps01_port_network_role_tag: oam service_template_filter: substitute_service_template: Nested_ps_serverServiceTemplate.yaml count: 1 @@ -438,4 +436,4 @@ topology_template: description: heat template that creates MOG stack members: - abstract_pd_server - - abstract_ps_server
\ No newline at end of file + - abstract_ps_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml index ad0a81d4dc..85cf7bf76d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml @@ -37,10 +37,8 @@ topology_template: type: string required: true port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json vm_image_name: type: string required: true @@ -48,7 +46,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true @@ -70,10 +68,8 @@ topology_template: entry_schema: type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -116,17 +112,11 @@ topology_template: - port_pd01_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_ip_requirements - - index_value + get_input: port_pd01_port_ip_requirements network_role_tag: - get_input: - - port_pd01_port_network_role_tag - - index_value + get_input: port_pd01_port_network_role_tag mac_requirements: - get_input: - - port_pd01_port_mac_requirements - - index_value + get_input: port_pd01_port_mac_requirements order: get_input: - port_pd01_port_order @@ -328,4 +318,4 @@ topology_template: - dependency dependency_pd_server: - pd_server - - 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/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml index d92309c5c3..73a128e0ef 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml @@ -60,10 +60,8 @@ topology_template: entry_schema: type: string port_ps01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_ps01_port_network: type: list required: true @@ -73,12 +71,10 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_ps01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_ps01_port_exCP_naming: type: list required: true @@ -116,17 +112,11 @@ topology_template: - port_ps01_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_ps01_port_ip_requirements - - index_value + get_input: port_ps01_port_ip_requirements network_role_tag: - get_input: - - port_ps01_port_network_role_tag - - index_value + get_input: port_ps01_port_network_role_tag mac_requirements: - get_input: - - port_ps01_port_mac_requirements - - index_value + get_input: port_ps01_port_mac_requirements order: get_input: - port_ps01_port_order @@ -328,4 +318,4 @@ topology_template: - dependency local_storage_ps_server: - ps_server - - local_storage
\ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml index 2ef83fec70..5c437f9a9d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -39,11 +39,9 @@ node_types: required: true status: SUPPORTED port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json vm_image_name: type: string required: true @@ -53,7 +51,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true @@ -79,11 +77,9 @@ node_types: entry_schema: type: string port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -494,11 +490,9 @@ node_types: entry_schema: type: string port_ps01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_ps01_port_network: type: list required: true @@ -510,13 +504,11 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_ps01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_ps01_port_exCP_naming: type: list required: true @@ -858,4 +850,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml index 645929f408..863f4288ea 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml @@ -364,7 +364,7 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name port_pd01_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false vm_image_name: get_input: pd_image_name @@ -376,8 +376,7 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -406,7 +405,7 @@ topology_template: vm_image_name: get_input: pd_image_name port_ps01_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false port_ps01_port_network: - get_input: oam_net_name @@ -416,8 +415,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_ps01_port_network_role_tag: - - oam + port_ps01_port_network_role_tag: oam service_template_filter: substitute_service_template: Nested_ps_serverServiceTemplate.yaml count: 1 @@ -434,4 +432,4 @@ topology_template: description: heat template that creates MOG stack members: - abstract_pd_server - - abstract_ps_server
\ No newline at end of file + - abstract_ps_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml index dd358a5dd2..68fcd79ffa 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml @@ -37,10 +37,8 @@ topology_template: type: string required: true port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json vm_image_name: type: string required: true @@ -48,7 +46,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true @@ -70,10 +68,8 @@ topology_template: entry_schema: type: string port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -116,17 +112,11 @@ topology_template: - port_pd01_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_ip_requirements - - index_value + get_input: port_pd01_port_ip_requirements network_role_tag: - get_input: - - port_pd01_port_network_role_tag - - index_value + get_input: port_pd01_port_network_role_tag mac_requirements: - get_input: - - port_pd01_port_mac_requirements - - index_value + get_input: port_pd01_port_mac_requirements order: get_input: - port_pd01_port_order @@ -319,4 +309,4 @@ topology_template: - dependency dependency_pd_server: - pd_server - - 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/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml index c16b51c98d..a447cf0714 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml @@ -60,10 +60,8 @@ topology_template: entry_schema: type: string port_ps01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_ps01_port_network: type: list required: true @@ -73,12 +71,10 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_ps01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_ps01_port_exCP_naming: type: list required: true @@ -116,17 +112,11 @@ topology_template: - port_ps01_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_ps01_port_ip_requirements - - index_value + get_input: port_ps01_port_ip_requirements network_role_tag: - get_input: - - port_ps01_port_network_role_tag - - index_value + get_input: port_ps01_port_network_role_tag mac_requirements: - get_input: - - port_ps01_port_mac_requirements - - index_value + get_input: port_ps01_port_mac_requirements order: get_input: - port_ps01_port_order @@ -319,4 +309,4 @@ topology_template: - dependency local_storage_ps_server: - ps_server - - local_storage
\ No newline at end of file + - local_storage |