diff options
author | 2017-07-03 20:16:55 +0300 | |
---|---|---|
committer | 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/nestedSingleCompute/diffNestedFilesWithSameComputeType/out | |
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/nestedSingleCompute/diffNestedFilesWithSameComputeType/out')
3 files changed, 32 insertions, 96 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 977b81a5e5..92ea0fa5e7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -9,17 +9,13 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_pcm_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string availabilityzone_name: type: string description: availabilityzone name @@ -37,29 +33,21 @@ node_types: required: true status: SUPPORTED port_pcm_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string pcm_server_name: type: string description: PCRF CM server name @@ -84,11 +72,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -156,11 +142,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer attributes: server_pcm_id: type: string @@ -584,17 +568,13 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_pcm_port_0_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string availabilityzone_name: type: string description: availabilityzone name @@ -612,29 +592,21 @@ node_types: required: true status: SUPPORTED port_pcm_port_0_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string pcm_server_name: type: string description: PCRF CM server name @@ -659,11 +631,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -731,11 +701,9 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer attributes: server_pcm_id: type: string diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml index 7203c34545..6ca8ae790c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -12,15 +12,11 @@ node_types: topology_template: inputs: port_pcm_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string availabilityzone_name: label: availabilityzone name hidden: false @@ -39,25 +35,17 @@ topology_template: type: string description: PCRF CM image name port_pcm_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string pcm_server_name: label: PCRF CM server name hidden: false @@ -83,10 +71,8 @@ topology_template: type: string description: OAM network name port_pcm_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -157,10 +143,8 @@ topology_template: type: string description: CPS network mask port_pcm_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer node_templates: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml index 2cf7197844..aaf4005f55 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml @@ -12,15 +12,11 @@ node_types: topology_template: inputs: port_pcm_port_0_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string availabilityzone_name: label: availabilityzone name hidden: false @@ -39,25 +35,17 @@ topology_template: type: string description: PCRF CM image name port_pcm_port_0_order: - type: list + type: integer required: true - entry_schema: - type: integer port_pcm_port_0_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_1_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string pcm_server_name: label: PCRF CM server name hidden: false @@ -83,10 +71,8 @@ topology_template: type: string description: OAM network name port_pcm_port_1_network_role: - type: list + type: string required: true - entry_schema: - type: string port_pcm_port_0_ip_requirements: type: list required: true @@ -157,10 +143,8 @@ topology_template: type: string description: CPS network mask port_pcm_port_1_order: - type: list + type: integer required: true - entry_schema: - type: integer node_templates: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port |