From 4d97d5fac309ce0d66938e5ccd0349e2660d4e23 Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Sat, 17 Jun 2017 22:40:44 +0300 Subject: [sdc] update code of sdc Change-Id: If9f37c80b659cb67b34d18e6c019defecca58b9a Signed-off-by: Michael Lando --- .../GlobalSubstitutionTypesServiceTemplate.yaml | 22 ++++------- .../out/MainServiceTemplate.yaml | 12 +++--- .../out/Nested_pd_serverServiceTemplate.yaml | 46 ++++++---------------- 3 files changed, 25 insertions(+), 55 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index b9579e65a7..297b162827 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -29,11 +29,9 @@ node_types: entry_schema: type: string port_pd02_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_pd01_port_exCP_naming: type: list required: true @@ -57,17 +55,13 @@ node_types: entry_schema: type: string port_pd02_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json port_pd02_port_vlan_requirements: type: list required: true @@ -83,7 +77,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true @@ -125,13 +119,11 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true status: SUPPORTED - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -574,4 +566,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/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml index 02d93a5611..796c3392ce 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml @@ -431,14 +431,13 @@ topology_template: - pd_server_names - 0 port_pd02_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_network_role_tag: - - oam + port_pd02_port_network_role_tag: oam port_pd01_port_mac_requirements: - - mac_count_required: + mac_count_required: is_required: false vm_image_name: get_input: pd_image_name @@ -456,8 +455,7 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network_role_tag: - - oam + port_pd01_port_network_role_tag: oam port_pd02_port_network: - get_input: oam_net_name compute_pd_server_user_data_format: @@ -493,4 +491,4 @@ topology_template: members: - network_policy_port - 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/oneComputeDiffPortTypesAndGetAttIn/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/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml index 3dce505771..084a479348 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/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/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml @@ -29,10 +29,8 @@ topology_template: entry_schema: type: string port_pd02_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_pd01_port_exCP_naming: type: list required: true @@ -52,15 +50,11 @@ topology_template: entry_schema: type: string port_pd02_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json port_pd02_port_vlan_requirements: type: list required: true @@ -73,7 +67,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network: type: list required: true @@ -108,12 +102,10 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: list + type: string required: true - entry_schema: - type: string port_pd01_port_vlan_requirements: type: list required: true @@ -161,17 +153,11 @@ topology_template: - port_pd01_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd01_port_ip_requirements - - index_value + get_input: port_pd01_port_ip_requirements network_role_tag: - get_input: - - port_pd01_port_network_role_tag - - index_value + get_input: port_pd01_port_network_role_tag mac_requirements: - get_input: - - port_pd01_port_mac_requirements - - index_value + get_input: port_pd01_port_mac_requirements order: get_input: - port_pd01_port_order @@ -205,17 +191,11 @@ topology_template: - port_pd02_port_vlan_requirements - index_value ip_requirements: - get_input: - - port_pd02_port_ip_requirements - - index_value + get_input: port_pd02_port_ip_requirements network_role_tag: - get_input: - - port_pd02_port_network_role_tag - - index_value + get_input: port_pd02_port_network_role_tag mac_requirements: - get_input: - - port_pd02_port_mac_requirements - - index_value + get_input: port_pd02_port_mac_requirements order: get_input: - port_pd02_port_order @@ -464,4 +444,4 @@ topology_template: - dependency dependency_pd_server_pd02_port: - pd_server_pd02_port - - dependency \ No newline at end of file + - dependency -- cgit 1.2.3-korg