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 --- .../WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml | 8 ++++---- .../WithIndex/out/SubstitutionServiceTemplate.yaml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml index 0546cb65fd..8c748e2a2e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -334,13 +334,13 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_FSB1_FSB2_Internal: - type: tosca.capabilities.Attachment + feature_FSB1_FSB2_Internal: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_FSB1_FSB2_Internal: - type: tosca.capabilities.Node + attachment_FSB1_FSB2_Internal: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml index 3adeccc7b5..e5ebd6aa8b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml @@ -317,12 +317,12 @@ topology_template: network.outgoing.bytes_FSB1_FSB1_Internal: - FSB1_FSB1_Internal - network.outgoing.bytes - attachment_FSB1_FSB2_Internal: - - FSB1_FSB2_Internal - - attachment feature_FSB1_FSB2_Internal: - FSB1_FSB2_Internal - feature + attachment_FSB1_FSB2_Internal: + - FSB1_FSB2_Internal + - attachment network.incoming.packets_FSB1_FSB2_Internal: - FSB1_FSB2_Internal - network.incoming.packets -- cgit 1.2.3-korg