diff options
| author |   andre.schmid <andre.schmid@est.tech> | 2021-08-27 15:07:43 +0100 |
|---|---|---|
| committer |   Michael Morris <michael.morris@est.tech> | 2021-08-30 14:17:08 +0000 |
| commit | a1cdcda28701f603cf95f591ba447bd723273622 (patch) | |
| tree | 3d9d36dbbfa5aca12bdeb3cfcddae04ee2cd34a3 /catalog-be/src/test/java | |
| parent | 37d9a984c45a2a3389b70fca38513fd4bd821e28 (diff) | |
Include custom data types from VSP in csar imports
When a model with custom data types is created, the data types
are now being added as part of the default model imports files.
When a CSAR is generated from a Service Template that is
associated to a derived model, the default imports from the
parent model are also included in the package.
Change-Id: I027d25d7237989a40085edec7fdd399ac09c4db1
Issue-ID: SDC-3692
Signed-off-by: andre.schmid <andre.schmid@est.tech>
Diffstat (limited to 'catalog-be/src/test/java')
2 files changed, 2 insertions, 2 deletions
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ModelBusinessLogicTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ModelBusinessLogicTest.java index 5e9d4e7f5d..cbb0de8715 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ModelBusinessLogicTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ModelBusinessLogicTest.java @@ -89,7 +89,7 @@ class ModelBusinessLogicTest { assertThat(result).isNotNull(); assertThat(result.getName()).isEqualTo(model.getName()); - verify(dataTypeImportManager).createDataTypes(dataTypes, model.getName(), false); + verify(dataTypeImportManager).createDataTypes(dataTypes, model.getName(), true); } @Test diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/InterfacesOperationsConverterTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/InterfacesOperationsConverterTest.java index 074d70bfe0..d20f1c0600 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/InterfacesOperationsConverterTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/InterfacesOperationsConverterTest.java @@ -237,7 +237,7 @@ class InterfacesOperationsConverterTest { .getInterfacesMap(component, null, component.getInterfaces(), null, false, true); ToscaNodeType nodeType = new ToscaNodeType(); nodeType.setInterfaces(interfacesMap); - ToscaExportHandler handler = new ToscaExportHandler(); + ToscaExportHandler handler = new ToscaExportHandler(null, null, null, null, null, null, null, null, null, null, null, null); ToscaTemplate template = new ToscaTemplate(NODE_TYPE_NAME); Map<String, ToscaNodeType> nodeTypes = new HashMap<>(); nodeTypes.put(NODE_TYPE_NAME, nodeType); |