From 43187c8495b88589f3187e110cf8d592a091c37f Mon Sep 17 00:00:00 2001 From: shiria Date: Mon, 19 Mar 2018 15:23:23 +0200 Subject: Update FlatEntity in TOSCA Add support of dataType entity flat hierarchy in TOSCA Fix existing nodeType entity flat hierarchy in TOSCA Change-Id: I52cd188c595a263c70c2067fd1aac9752f7e24a4 Issue-ID: SDC-1147 Signed-off-by: shiria --- .../GlobalSubstitutionTypesServiceTemplate.yaml | 10 +++++----- .../module_1_perimeta_swmu_b_childServiceTemplate.yaml | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 08611c0498..29a1ada429 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -2021,13 +2021,13 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_perimeta_ssc_b_mgmt_0_port: - type: tosca.capabilities.Attachment + feature_perimeta_ssc_b_mgmt_0_port: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_perimeta_ssc_b_mgmt_0_port: - type: tosca.capabilities.Node + attachment_perimeta_ssc_b_mgmt_0_port: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -3706,4 +3706,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/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_b_childServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_b_childServiceTemplate.yaml index 20b80029a6..2eb36bf664 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_b_childServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/module_1_perimeta_swmu_b_childServiceTemplate.yaml @@ -860,12 +860,12 @@ topology_template: disk.device.write.requests.rate_perimeta_ssc_b_server_0: - perimeta_ssc_b_server_0 - disk.device.write.requests.rate - attachment_perimeta_ssc_b_mgmt_0_port: - - perimeta_ssc_b_mgmt_0_port - - attachment feature_perimeta_ssc_b_mgmt_0_port: - perimeta_ssc_b_mgmt_0_port - feature + attachment_perimeta_ssc_b_mgmt_0_port: + - perimeta_ssc_b_mgmt_0_port + - attachment network.incoming.bytes.rate_perimeta_ssc_b_mgmt_0_port: - perimeta_ssc_b_mgmt_0_port - network.incoming.bytes.rate @@ -923,4 +923,4 @@ topology_template: - dependency link_perimeta_ssc_b_ha_0_port: - perimeta_ssc_b_ha_0_port - - link \ No newline at end of file + - link -- cgit 1.2.3-korg