diff options
author | Michael Lando <ml636r@att.com> | 2017-06-17 22:40:44 +0300 |
---|---|---|
committer | Michael Lando <ml636r@att.com> | 2017-06-18 07:20:49 +0300 |
commit | 4d97d5fac309ce0d66938e5ccd0349e2660d4e23 (patch) | |
tree | 3f921054f997d1962fa6f9db9a0119e31a851eea /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out | |
parent | 89786d31f266a205857cae0177904c249ac6a512 (diff) |
[sdc] update code of sdc
Change-Id: If9f37c80b659cb67b34d18e6c019defecca58b9a
Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out')
3 files changed, 25 insertions, 55 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index b956d579e3..fd982f3413 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -9,11 +9,9 @@ node_types: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: port_pd01_port_0_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_pd01_port_0_network: type: list required: true @@ -25,7 +23,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_1_security_groups: type: list required: true @@ -83,11 +81,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_subnetpoolid: type: list required: true @@ -107,17 +103,15 @@ node_types: entry_schema: type: string port_pd01_port_0_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -145,11 +139,9 @@ node_types: entry_schema: type: json port_pd01_port_1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_pd01_port_1_replacement_policy: type: list required: true @@ -587,4 +579,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/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml index 7c295f9e48..ca2f05268e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml @@ -97,7 +97,7 @@ topology_template: - substitutable properties: port_pd01_port_0_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false port_pd01_port_0_network: - get_input: oam_net_name @@ -121,14 +121,12 @@ topology_template: get_input: pd_flavor_name vm_image_name: get_input: pd_image_name - port_pd01_port_1_network_role_tag: - - oam + port_pd01_port_1_network_role_tag: oam port_pd01_port_1_network: - get_input: oam_net_name compute_pd_server_user_data_format: - RAW - port_pd01_port_0_network_role_tag: - - oam + port_pd01_port_0_network_role_tag: oam port_pd01_port_1_ip_requirements: - - ip_version: 4 ip_count_required: @@ -136,7 +134,7 @@ topology_template: floating_ip_count_required: is_required: false port_pd01_port_1_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false port_pd01_port_1_replacement_policy: - AUTO @@ -159,4 +157,4 @@ topology_template: members: - resources_with_dependOn - jsa_security_group - - 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/computeWithSamePortTypeNodeConnectedIn/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/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml index 75533f5049..01c3a9bcd7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/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/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml @@ -12,10 +12,8 @@ node_types: topology_template: inputs: port_pd01_port_0_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_pd01_port_0_network: type: list required: true @@ -25,7 +23,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_1_security_groups: type: list required: true @@ -73,10 +71,8 @@ topology_template: type: string required: true port_pd01_port_1_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_0_subnetpoolid: type: list required: true @@ -93,15 +89,13 @@ topology_template: entry_schema: type: string port_pd01_port_0_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_1_ip_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -125,10 +119,8 @@ topology_template: entry_schema: type: json port_pd01_port_1_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_pd01_port_1_replacement_policy: type: list required: true @@ -189,17 +181,11 @@ topology_template: - port_pd01_port_1_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_1_ip_requirements - - index_value + 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 - - index_value + get_input: port_pd01_port_1_mac_requirements order: get_input: - port_pd01_port_1_order @@ -241,17 +227,11 @@ topology_template: - port_pd01_port_0_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_0_ip_requirements - - index_value + 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 - - index_value + get_input: port_pd01_port_0_mac_requirements order: get_input: - port_pd01_port_0_order @@ -483,4 +463,4 @@ topology_template: - link link_pd_server_pd01_port_1: - pd_server_pd01_port_1 - - link
\ No newline at end of file + - link |