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/computeWithSamePortTypeNodeConnectedOut/out | |
parent | 7d92498efd0ea61097b241287c004965d46b2c12 (diff) |
[sdc] - latest code changes
Change-Id: I861387094b000367218bb417624fe50d3c37f70e
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out')
3 files changed, 31 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/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 1806971f92..2d2089d7be 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 @@ -125,17 +125,15 @@ node_types: entry_schema: type: integer port_pd01_port_0_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_pd01_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -147,17 +145,15 @@ node_types: entry_schema: type: string port_pd01_port_1_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements requirements: - dependency_pd_server: capability: tosca.capabilities.Node 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 40d0227141..4fd079f393 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 @@ -109,11 +109,11 @@ topology_template: port_pd01_port_0_network: - packet_mirror_network port_pd01_port_0_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_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -131,11 +131,11 @@ topology_template: compute_pd_server_user_data_format: - RAW port_pd01_port_1_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false port_pd01_port_1_mac_requirements: mac_count_required: is_required: false @@ -182,4 +182,4 @@ topology_template: - packet_mirror_network - pd01_volume - packet_internal_network - - 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/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 9a7f6ae224..5fc367779c 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 @@ -108,15 +108,13 @@ topology_template: entry_schema: type: integer port_pd01_port_0_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_pd01_port_1_vlan_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -126,15 +124,13 @@ topology_template: entry_schema: type: string port_pd01_port_1_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements node_templates: pd_server: type: org.openecomp.resource.vfc.nodes.heat.pd_server @@ -159,37 +155,25 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_pd01_port_1_exCP_naming - - index_value + get_input: port_pd01_port_1_exCP_naming replacement_policy: get_input: - port_pd01_port_1_replacement_policy - index_value vlan_requirements: - get_input: - - port_pd01_port_1_vlan_requirements - - index_value + get_input: port_pd01_port_1_vlan_requirements ip_requirements: 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 order: - get_input: - - port_pd01_port_1_order - - index_value + get_input: port_pd01_port_1_order network_role: - get_input: - - port_pd01_port_1_network_role - - index_value + get_input: port_pd01_port_1_network_role subnetpoolid: - get_input: - - port_pd01_port_1_subnetpoolid - - index_value + get_input: port_pd01_port_1_subnetpoolid network: get_input: - port_pd01_port_1_network @@ -203,37 +187,25 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_pd01_port_0_exCP_naming - - index_value + get_input: port_pd01_port_0_exCP_naming replacement_policy: get_input: - port_pd01_port_0_replacement_policy - index_value vlan_requirements: - get_input: - - port_pd01_port_0_vlan_requirements - - index_value + get_input: port_pd01_port_0_vlan_requirements ip_requirements: 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 order: - get_input: - - port_pd01_port_0_order - - index_value + get_input: port_pd01_port_0_order network_role: - get_input: - - port_pd01_port_0_network_role - - index_value + get_input: port_pd01_port_0_network_role subnetpoolid: - get_input: - - port_pd01_port_0_subnetpoolid - - index_value + get_input: port_pd01_port_0_subnetpoolid network: get_input: - port_pd01_port_0_network |