diff options
author | 2017-06-22 18:23:07 +0300 | |
---|---|---|
committer | 2017-06-22 18:23:07 +0300 | |
commit | 68ccc45de18f41cddb79de33a245bceb3b063ffb (patch) | |
tree | d80619a8539a8a03f68304c23eef7e3790ca63c6 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut | |
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/oneComputeSamePortTypesAndGetAttOut')
3 files changed, 38 insertions, 62 deletions
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 528c65042d..754b59c1a7 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 @@ -73,11 +73,9 @@ node_types: required: true status: SUPPORTED 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_network_role: type: list required: true @@ -95,7 +93,7 @@ node_types: 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 @@ -111,21 +109,21 @@ node_types: required: true status: SUPPORTED port_pd01_port_1_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_pd01_port_1_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_0_subnetpoolid: 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/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 279f92ea87..489dcbaa7e 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 @@ -61,17 +61,17 @@ topology_template: - network_policy_server - name 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 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 compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -87,6 +87,8 @@ topology_template: 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: @@ -112,4 +114,4 @@ topology_template: description: heat template that creates MOG stack members: - network_policy_server - - 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/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 2ec558101d..17c2a7bed2 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 @@ -65,10 +65,8 @@ topology_template: type: string required: true port_pd01_port_0_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_pd01_port_1_network_role: type: list required: true @@ -83,7 +81,7 @@ topology_template: 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 @@ -96,18 +94,18 @@ topology_template: type: string required: true port_pd01_port_1_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_pd01_port_1_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string port_pd01_port_0_vlan_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_0_subnetpoolid: type: list required: true @@ -147,13 +145,9 @@ 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 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: @@ -161,17 +155,11 @@ topology_template: 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 @@ -185,33 +173,21 @@ 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 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 |