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/nestedSingleCompute/nestedWithOneCompute/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/nestedWithOneCompute/out')
4 files changed, 29 insertions, 78 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml index 83a37609e0..16dda32915 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/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 @@ -590,11 +574,9 @@ node_types: entry_schema: type: string port_compute_port_subnetpoolid: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -620,11 +602,9 @@ node_types: required: true status: SUPPORTED port_compute_port_network_role: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_image_name: type: string required: true @@ -636,11 +616,9 @@ node_types: entry_schema: type: string port_compute_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_compute_metadata: type: list required: true @@ -648,11 +626,9 @@ node_types: entry_schema: type: json port_compute_port_order: - type: list + type: integer required: true status: SUPPORTED - entry_schema: - type: integer port_compute_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -1002,4 +978,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml index 77a2573b21..f0cf923cbc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml @@ -208,8 +208,7 @@ topology_template: get_input: compute_image_name port_compute_port_network: - get_input: port_net_name - port_compute_port_network_role_tag: - - port + port_compute_port_network_role_tag: port compute_compute_metadata: - get_attribute: - abstract_pcm_server_0 @@ -240,4 +239,4 @@ topology_template: members: - packet_mirror_network - abstract_compute - - abstract_pcm_server_0
\ No newline at end of file + - abstract_pcm_server_0 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml index 0695e7dc03..7a9311c041 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml @@ -17,10 +17,8 @@ topology_template: entry_schema: type: string port_compute_port_subnetpoolid: - type: list + type: string required: true - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -42,10 +40,8 @@ topology_template: type: string required: true port_compute_port_network_role: - type: list + type: string required: true - entry_schema: - type: string vm_image_name: type: string required: true @@ -55,20 +51,16 @@ topology_template: entry_schema: type: string port_compute_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string compute_compute_metadata: type: list required: true entry_schema: type: json port_compute_port_order: - type: list + type: integer required: true - entry_schema: - type: integer port_compute_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -317,4 +309,4 @@ topology_template: - link dependency_compute: - compute - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/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/nestedWithOneCompute/out/nested-pcm_v0.1ServiceTemplate.yaml index 7da1206ebe..30417727c3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/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/nestedWithOneCompute/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 @@ -461,4 +445,4 @@ topology_template: - dependency dependency_pcm_port_1: - pcm_port_1 - - dependency
\ No newline at end of file + - dependency |