Certifying mechanism changing structure of csar

Issue-ID: SDC-4662
Signed-off-by: franciscovila <javier.paradela.vila@est.tech>
Change-Id: I238fe7fd60c8813f67818606f5a69fc961820e88

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactsBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactsBusinessLogic.java
index d50ae54..06b4a34 100644 (file)
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactsBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactsBusinessLogic.java
@@ -377,7 +377,7 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
                 return new ByResponseFormatComponentException(error);
             });
         } else {
-            return toscaExportUtils.exportComponent(parent).left().map(toscaRepresentation -> {
+            return toscaExportUtils.exportComponent(parent, checkIfSkipImports(parent.getModel())).left().map(toscaRepresentation -> {
                 log.debug("Tosca yaml exported for component {} ", parent.getUniqueId());
                 return toscaRepresentation.getMainYaml();
             }).right().map(toscaError -> {
@@ -387,6 +387,11 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
         }
     }
 
+    private boolean checkIfSkipImports(final String model) {
+        return null != model && !model.equalsIgnoreCase("ETSI SOL001 v2.5.1")
+            && !model.equalsIgnoreCase("AUTOMATION COMPOSITION");
+    }
+
     private Either<ArtifactDefinition, Operation> doAction(String componentId, ComponentTypeEnum componentType, ArtifactOperationInfo operation,
                                                            String artifactId, ArtifactDefinition artifactInfo, String origMd5, String originData,
                                                            String interfaceName, String operationName, AuditingActionEnum auditingAction, User user,

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CommonCsarGenerator.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CommonCsarGenerator.java
index 677be60..a0e4203 100644 (file)
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CommonCsarGenerator.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CommonCsarGenerator.java
@@ -215,8 +215,8 @@ public class CommonCsarGenerator {
         zip.putNextEntry(new ZipEntry(definitionsPath + fileName));
         zip.write(mainYaml);
         LifecycleStateEnum lifecycleState = component.getLifecycleState();
-        addServiceMf(component, zip, lifecycleState, isInCertificationRequest, fileName, mainYaml, definitionsPath);
         if (addDependencies) {
+            addServiceMf(component, zip, lifecycleState, isInCertificationRequest, fileName, mainYaml, definitionsPath);
             //US798487 - Abstraction of complex types
             if (hasToWriteComponentSubstitutionType(component)) {
                 LOGGER.debug("Component {} is complex - generating abstract type for it..", component.getName());