diff options
author | Tal Gitelman <tg851x@intl.att.com> | 2017-07-03 20:16:55 +0300 |
---|---|---|
committer | Tal Gitelman <tg851x@intl.att.com> | 2017-07-03 20:16:55 +0300 |
commit | 153a35821f0d25ce23cca467b76c5a7c5092c744 (patch) | |
tree | 0c66c4d1310019479e446ea3a4c26faffb0aa33f /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut | |
parent | ffdda7d685029d6a88ac82ac637e43bba96423cb (diff) |
[sdc] - last merges before moving to LF
Change-Id: I0df3ec795f0de84229ea4bb4806ec8f959243557
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, 17 insertions, 51 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 754b59c1a7..5278a654c0 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 @@ -25,17 +25,13 @@ node_types: entry_schema: 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 + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_1_ip_requirements: type: list required: true @@ -63,11 +59,9 @@ node_types: entry_schema: type: string port_pd01_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer vm_flavor_name: type: string required: true @@ -77,17 +71,13 @@ node_types: required: true status: SUPPORTED port_pd01_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pd01_port_1_vlan_requirements: type: list required: true @@ -99,11 +89,9 @@ node_types: required: true status: SUPPORTED port_pd01_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_image_name: type: string required: true @@ -113,11 +101,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_vlan_requirements: type: list required: true @@ -125,11 +111,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_1_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/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 489dcbaa7e..07ce00a6e0 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 @@ -87,8 +87,6 @@ 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: @@ -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 17c2a7bed2..72b3354e04 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 @@ -25,15 +25,11 @@ topology_template: entry_schema: 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 + type: string required: true - entry_schema: - type: string port_pd01_port_1_ip_requirements: type: list required: true @@ -57,10 +53,8 @@ topology_template: entry_schema: type: string port_pd01_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer vm_flavor_name: type: string required: true @@ -68,15 +62,11 @@ topology_template: type: org.openecomp.datatypes.Naming required: true port_pd01_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pd01_port_1_vlan_requirements: type: list required: true @@ -86,10 +76,8 @@ topology_template: type: org.openecomp.datatypes.network.MacRequirements required: true port_pd01_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string vm_image_name: type: string required: true @@ -97,20 +85,16 @@ topology_template: type: org.openecomp.datatypes.Naming required: true 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 entry_schema: type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_1_network: type: list required: true |