Fix additional types import file generation 15/123715/1
authorandre.schmid <andre.schmid@est.tech>
Tue, 31 Aug 2021 09:04:26 +0000 (10:04 +0100)
committerandre.schmid <andre.schmid@est.tech>
Tue, 31 Aug 2021 09:20:06 +0000 (10:20 +0100)
commit38c6faa738abe6e0acdd24df2364d725d36fca40
tree3412c0ee222d60bbc98a997390dbae19d55e3fc9
parenta1cdcda28701f603cf95f591ba447bd723273622
Fix additional types import file generation

The additional_type_definitions.yaml is missing types entries and
header.
Also, the solution is not considering the types entries, i.e.
'data_types:', 'policy_types:', etc., when replacing types and
generating the new file, which renders the solution broken.
This change aims to fix the related problems.

Change-Id: I412683b49966c09dd067ecbf8a1d778155b23fa6
Issue-ID: SDC-3703
Signed-off-by: andre.schmid <andre.schmid@est.tech>
22 files changed:
catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CapabilityTypeImportManager.java
catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CommonImportManager.java
catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/DataTypeImportManager.java
catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/GroupTypeImportManager.java
catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InterfaceLifecycleTypeImportManager.java
catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/PolicyTypeImportManager.java
catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/RelationshipTypeImportManager.java
catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/CommonImportManagerTest.java
catalog-dao/src/main/java/org/openecomp/sdc/be/dao/cassandra/ToscaModelImportCassandraDao.java
catalog-dao/src/test/java/org/openecomp/sdc/be/dao/cassandra/ToscaModelImportCassandraDaoTest.java
catalog-model/src/main/java/org/openecomp/sdc/be/model/normatives/ElementTypeEnum.java [new file with mode: 0644]
catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/ModelOperation.java
catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ModelOperationTest.java
catalog-model/src/test/resources/modelOperation/expected-additional_types-1.yaml [new file with mode: 0644]
catalog-model/src/test/resources/modelOperation/expected-additional_types-2.yaml [new file with mode: 0644]
catalog-model/src/test/resources/modelOperation/expected-import-1.yaml [new file with mode: 0644]
catalog-model/src/test/resources/modelOperation/expected-import-2.yaml [new file with mode: 0644]
catalog-model/src/test/resources/modelOperation/input-data_types.yaml [new file with mode: 0644]
catalog-model/src/test/resources/modelOperation/original-additional_types-1.yaml [new file with mode: 0644]
catalog-model/src/test/resources/modelOperation/original-import-1.yaml [new file with mode: 0644]
catalog-model/src/test/resources/modelOperation/original-import-2.yaml [new file with mode: 0644]
common-be/src/main/java/org/openecomp/sdc/be/data/model/ToscaImportByModel.java