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 --- .../out/GlobalSubstitutionTypesServiceTemplate.yaml | 8 +++----- .../out/MainServiceTemplate.yaml | 6 ++---- .../out/Nested_pd_serverServiceTemplate.yaml | 16 +++++----------- 3 files changed, 10 insertions(+), 20 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 71c1bf5986..0dbf5691be 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -45,11 +45,9 @@ node_types: required: true status: SUPPORTED port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: json vm_image_name: type: string required: true @@ -59,7 +57,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 @@ -443,4 +441,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/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml index a5a1489254..0cf1c532c8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml @@ -71,9 +71,7 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name port_pd01_port_mac_requirements: - - mac_count_required: - is_required: false - - mac_count_required: + mac_count_required: is_required: false vm_image_name: get_input: pd_image_name @@ -122,4 +120,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/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml index a4bb6fb890..dc62943dee 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml @@ -42,10 +42,8 @@ topology_template: type: string required: true port_pd01_port_mac_requirements: - type: list + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: json vm_image_name: type: string required: true @@ -53,7 +51,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 @@ -134,17 +132,13 @@ 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 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 @@ -337,4 +331,4 @@ topology_template: - dependency dependency_pd_server: - pd_server - - dependency \ No newline at end of file + - dependency -- cgit 1.2.3-korg