diff options
author | Tal Gitelman <tg851x@intl.att.com> | 2017-06-22 18:23:07 +0300 |
---|---|---|
committer | Tal Gitelman <tg851x@intl.att.com> | 2017-06-22 18:23:07 +0300 |
commit | 68ccc45de18f41cddb79de33a245bceb3b063ffb (patch) | |
tree | d80619a8539a8a03f68304c23eef7e3790ca63c6 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn | |
parent | 7d92498efd0ea61097b241287c004965d46b2c12 (diff) |
[sdc] - latest code changes
Change-Id: I861387094b000367218bb417624fe50d3c37f70e
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn')
3 files changed, 45 insertions, 63 deletions
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 86039d69b7..e945040f2d 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,9 +37,11 @@ node_types: entry_schema: type: json port_pd02_port_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -71,7 +73,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_pd_server_user_data_format: type: list required: true @@ -91,11 +93,9 @@ node_types: required: true status: SUPPORTED port_pd01_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_pd02_port_order: type: list required: true @@ -113,7 +113,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_pd02_port_security_groups: type: list required: true @@ -139,11 +139,9 @@ node_types: entry_schema: type: string port_pd02_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_pd01_port_network_role: type: list required: true @@ -157,9 +155,11 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string port_pd02_port_network: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/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 fcaff2cb29..134050d238 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,7 +108,8 @@ 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: is_required: false @@ -117,11 +118,11 @@ topology_template: port_pd02_port_replacement_policy: - AUTO port_pd01_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false compute_pd_server_user_data_format: - RAW port_pd02_port_mac_requirements: @@ -132,12 +133,13 @@ topology_template: port_pd01_port_network: - get_input: oam_net_name port_pd02_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network_role_tag: oam + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_network_role_tag: + - oam port_pd02_port_network: - get_input: oam_net_name service_template_filter: @@ -157,4 +159,4 @@ topology_template: members: - resources_with_dependOn - jsa_security_group - - abstract_pd_server + - abstract_pd_server
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/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 d543e555cd..b488a50f55 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,8 +35,10 @@ topology_template: entry_schema: type: json port_pd02_port_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -62,7 +64,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_pd_server_user_data_format: type: list required: true @@ -79,10 +81,8 @@ topology_template: type: org.openecomp.datatypes.network.MacRequirements required: true port_pd01_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_pd02_port_order: type: list required: true @@ -97,7 +97,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_pd02_port_security_groups: type: list required: true @@ -119,10 +119,8 @@ topology_template: entry_schema: type: string port_pd02_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_pd01_port_network_role: type: list required: true @@ -134,8 +132,10 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string port_pd02_port_network: type: list required: true @@ -169,17 +169,13 @@ topology_template: - port_pd01_port_security_groups - index_value exCP_naming: - get_input: - - port_pd01_port_exCP_naming - - index_value + get_input: port_pd01_port_exCP_naming replacement_policy: get_input: - port_pd01_port_replacement_policy - index_value vlan_requirements: - get_input: - - port_pd01_port_vlan_requirements - - index_value + get_input: port_pd01_port_vlan_requirements ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -187,17 +183,11 @@ topology_template: mac_requirements: get_input: port_pd01_port_mac_requirements order: - get_input: - - port_pd01_port_order - - index_value + get_input: port_pd01_port_order network_role: - get_input: - - port_pd01_port_network_role - - index_value + get_input: port_pd01_port_network_role subnetpoolid: - get_input: - - port_pd01_port_subnetpoolid - - index_value + get_input: port_pd01_port_subnetpoolid network: get_input: - port_pd01_port_network @@ -215,17 +205,13 @@ topology_template: - port_pd02_port_security_groups - index_value exCP_naming: - get_input: - - port_pd02_port_exCP_naming - - index_value + get_input: port_pd02_port_exCP_naming replacement_policy: get_input: - port_pd02_port_replacement_policy - index_value vlan_requirements: - get_input: - - port_pd02_port_vlan_requirements - - index_value + get_input: port_pd02_port_vlan_requirements ip_requirements: get_input: port_pd02_port_ip_requirements network_role_tag: @@ -233,17 +219,11 @@ topology_template: mac_requirements: get_input: port_pd02_port_mac_requirements order: - get_input: - - port_pd02_port_order - - index_value + get_input: port_pd02_port_order network_role: - get_input: - - port_pd02_port_network_role - - index_value + get_input: port_pd02_port_network_role subnetpoolid: - get_input: - - port_pd02_port_subnetpoolid - - index_value + get_input: port_pd02_port_subnetpoolid network: get_input: - port_pd02_port_network |