Raised JUnit coverage for tosca package

Raised JUnit coverage for package: sdc.be.tosca

Change-Id: Ib372b546b7ab19f1b1642d93ff58d7773d7a2d14
Issue-ID: SDC-1333
Signed-off-by: Idan Amit <ia096e@intl.att.com>

2 files changed, 1665 insertions, 1529 deletions

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CsarUtils.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CsarUtils.java
index 2cf7319633..19565ed020 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CsarUtils.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CsarUtils.java
@@ -101,7 +101,6 @@ import com.google.gson.Gson;
 
 import fj.data.Either;
 
-
 /**
  * @author tg851x
  *
@@ -109,1531 +108,1668 @@ import fj.data.Either;
 @org.springframework.stereotype.Component("csar-utils")
 public class CsarUtils {
 
-    private static final Logger log = LoggerFactory.getLogger(CsarUtils.class);
-
-    @Autowired
-    private SdcSchemaFilesCassandraDao sdcSchemaFilesCassandraDao;
-    @Autowired
-    private ArtifactCassandraDao artifactCassandraDao;
-    @Autowired
-    private ComponentsUtils componentsUtils;
-    @Autowired
-    private ToscaExportHandler toscaExportUtils;
-    @Autowired
-    private ArtifactsBusinessLogic artifactsBusinessLogic;
-    @Autowired
-    protected ToscaOperationFacade toscaOperationFacade;
-
-
-    @javax.annotation.Resource
-    private ServiceBusinessLogic serviceBusinessLogic;
-
-    private Gson gson = new Gson();
-
-    public static final String CONFORMANCE_LEVEL = ConfigurationManager.getConfigurationManager().getConfiguration().getToscaConformanceLevel();
-    public static final String SDC_VERSION = ExternalConfiguration.getAppVersion();
-
-    public static final Pattern UUID_NORMATIVE_NEW_VERSION = Pattern.compile("^\\d{1,}.0");
-    public static final String ARTIFACTS_PATH = "Artifacts/";
-    public static final String RESOURCES_PATH = "Resources/";
-    public static final String INFORMATIONAL_ARTIFACTS = "Informational/";
-    public static final String DEPLOYMENT_ARTIFACTS = "Deployment/";
-    public static final String WORKFLOW_ARTIFACT_DIR = "Workflows"+File.separator+"BPMN"+File.separator;
-    public static final String DEPLOYMENT_ARTIFACTS_DIR = "Deployment"+File.separator;
-
-    public static final String DEFINITIONS_PATH = "Definitions/";
-    private static final String CSAR_META_VERSION = "1.0";
-    private static final String CSAR_META_PATH_FILE_NAME = "csar.meta";
-    private static final String TOSCA_META_PATH_FILE_NAME = "TOSCA-Metadata/TOSCA.meta";
-    private static final String TOSCA_META_VERSION = "1.0";
-    private static final String CSAR_VERSION = "1.1";
-    public static final String ARTIFACTS = "Artifacts";
-    public static final String DEFINITION = "Definitions";
-    public static final String DEL_PATTERN = "([/\\\\]+)";
-    private static String versionFirstThreeOctates;
-
-    public static final String VFC_NODE_TYPE_ARTIFACTS_PATH_PATTERN = ARTIFACTS + DEL_PATTERN +
-                                                                              ImportUtils.Constants.USER_DEFINED_RESOURCE_NAMESPACE_PREFIX +
-                                                                              "([\\d\\w\\_\\-\\.\\s]+)" + DEL_PATTERN +
-                                                                              "([\\d\\w\\_\\-\\.\\s]+)" + DEL_PATTERN +
-                                                                              "([\\d\\w\\_\\-\\.\\s]+)" + DEL_PATTERN +
-                                                                              "([\\d\\w\\_\\-\\.\\s]+)";
-
-    public static final String VF_NODE_TYPE_ARTIFACTS_PATH_PATTERN = ARTIFACTS + DEL_PATTERN+
-                                                                             // Artifact Group (i.e Deployment/Informational)
-                                                                             "([\\w\\_\\-\\.\\s]+)" + DEL_PATTERN +
-                                                                             // Artifact Type
-                                                                             "([\\w\\_\\-\\.\\s]+)"  + DEL_PATTERN +
-                                                                             // Artifact Any File Name
-                                                                             ".+";
-    public static final String VALID_ENGLISH_ARTIFACT_NAME = "([\\w\\_\\-\\.\\s]+)";
-    public static final String SERVICE_TEMPLATE_PATH_PATTERN = DEFINITION + DEL_PATTERN+
-                                                                       // Service Template File Name
-                                                                       "([\\w\\_\\-\\.\\s]+)";
-
-    public static final String ARTIFACT_CREATED_FROM_CSAR = "Artifact created from csar";
-
-    public CsarUtils() {
-        if(SDC_VERSION != null && !SDC_VERSION.isEmpty()){
-            Matcher matcher = Pattern.compile("(?!\\.)(\\d+(\\.\\d+)+)(?![\\d\\.])").matcher(SDC_VERSION);
-            matcher.find();
-            versionFirstThreeOctates = matcher.group(0);
-        } else {
-            versionFirstThreeOctates = "";
-        }
-    }
-
-    /**
-     *
-     * @param component
-     * @param getFromCS
-     * @param isInCertificationRequest
-     * @return
-     */
-    public Either<byte[], ResponseFormat> createCsar(Component component, boolean getFromCS, boolean isInCertificationRequest) {
-        return createCsar(component, getFromCS, isInCertificationRequest, false);
-    }
-
-    private Either<byte[], ResponseFormat> createCsar(Component component, boolean getFromCS, boolean isInCertificationRequest, boolean mockGenerator) {
-        final String createdBy = component.getCreatorFullName();
-
-        String fileName;
-        Map<String, ArtifactDefinition> toscaArtifacts = component.getToscaArtifacts();
-        ArtifactDefinition artifactDefinition = toscaArtifacts.get(ToscaExportHandler.ASSET_TOSCA_TEMPLATE);
-        fileName = artifactDefinition.getArtifactName();
-
-        String toscaConformanceLevel = ConfigurationManager.getConfigurationManager().getConfiguration().getToscaConformanceLevel();
-        String csarBlock0 = createCsarBlock0(CSAR_META_VERSION, toscaConformanceLevel);
-        byte[] csarBlock0Byte = csarBlock0.getBytes();
-
-        final String toscaBlock0 = createToscaBlock0(TOSCA_META_VERSION, CSAR_VERSION, createdBy, fileName);
-        byte[] toscaBlock0Byte = toscaBlock0.getBytes();
-
-        Either<byte[], ResponseFormat> generateCsarZipResponse = generateCsarZip(csarBlock0Byte, toscaBlock0Byte, component, getFromCS, isInCertificationRequest, mockGenerator);
-
-        if (generateCsarZipResponse.isRight()) {
-            return Either.right(generateCsarZipResponse.right().value());
-        }
-
-        return Either.left(generateCsarZipResponse.left().value());
-    }
-
-    private Either<byte[], ResponseFormat> generateCsarZip(byte[] csarBlock0Byte, byte[] toscaBlock0Byte, Component component, boolean getFromCS, boolean isInCertificationRequest, boolean mockGenerator) {
-        try (
-                ByteArrayOutputStream out = new ByteArrayOutputStream();
-                ZipOutputStream zip = new ZipOutputStream(out);
-        ){
-            zip.putNextEntry(new ZipEntry(CSAR_META_PATH_FILE_NAME));
-            zip.write(csarBlock0Byte);
-            zip.putNextEntry(new ZipEntry(TOSCA_META_PATH_FILE_NAME));
-            zip.write(toscaBlock0Byte);
-            Either<ZipOutputStream, ResponseFormat> populateZip = populateZip(component, getFromCS, zip, isInCertificationRequest, mockGenerator);
-            if (populateZip.isRight()) {
-                log.debug("Failed to populate CSAR zip file {}", populateZip.right().value());
-                return Either.right(populateZip.right().value());
-            }
-
-            zip.finish();
-            byte[] byteArray = out.toByteArray();
-
-            return Either.left(byteArray);
-        } catch (IOException e) {
-            log.debug("Failed with IOexception to create CSAR zip for component {}", component.getUniqueId(), e);
-
-            ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR);
-            return Either.right(responseFormat);
-        }
-    }
-
-    private Either<ZipOutputStream, ResponseFormat> populateZip(Component component, boolean getFromCS, ZipOutputStream zip, boolean isInCertificationRequest, boolean mockGenerator) throws IOException {
-
-        LifecycleStateEnum lifecycleState = component.getLifecycleState();
-        String componentYaml;
-        Either<ToscaRepresentation, ToscaError> exportComponent;
-        byte[] mainYaml;
-        // <file name, cassandraId, component>
-        List<Triple<String, String, Component>> dependencies = null;
-        List<ImmutablePair<Component, byte[]>> generatorInputs = new LinkedList<>();
-
-        Map<String, ArtifactDefinition> toscaArtifacts = component.getToscaArtifacts();
-        ArtifactDefinition artifactDefinition = toscaArtifacts.get(ToscaExportHandler.ASSET_TOSCA_TEMPLATE);
-        String fileName = artifactDefinition.getArtifactName();
-
-        if (getFromCS || !(lifecycleState == LifecycleStateEnum.NOT_CERTIFIED_CHECKIN || lifecycleState == LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT)) {
-            String cassandraId = artifactDefinition.getEsId();
-            Either<byte[], ActionStatus> fromCassandra = getFromCassandra(cassandraId);
-            if (fromCassandra.isRight()) {
-                log.debug("ArtifactName {}, unique ID {}", artifactDefinition.getArtifactName(), artifactDefinition.getUniqueId());
-                ResponseFormat responseFormat = componentsUtils.getResponseFormat(fromCassandra.right().value());
-                return Either.right(responseFormat);
-            }
-            mainYaml = fromCassandra.left().value();
-
-        } else {
-            exportComponent = toscaExportUtils.exportComponent(component);
-            if (exportComponent.isRight()) {
-                log.debug("exportComponent failed", exportComponent.right().value());
-                ActionStatus convertedFromToscaError = componentsUtils.convertFromToscaError(exportComponent.right().value());
-                ResponseFormat responseFormat = componentsUtils.getResponseFormat(convertedFromToscaError);
-                return Either.right(responseFormat);
-            }
-            ToscaRepresentation exportResult = exportComponent.left().value();
-            componentYaml = exportResult.getMainYaml();
-            mainYaml = componentYaml.getBytes();
-            dependencies = exportResult.getDependencies();
-        }
-
-        zip.putNextEntry(new ZipEntry(DEFINITIONS_PATH + fileName));
-        zip.write(mainYaml);
-        //US798487 - Abstraction of complex types
-        if (!ModelConverter.isAtomicComponent(component)){
-            log.debug("Component {} is complex - generating abstract type for it..", component.getName());
-            writeComponentInterface(component, zip, fileName);
-        }
-
-        generatorInputs.add(new ImmutablePair<Component, byte[]>(component, mainYaml));
-
-        if (dependencies == null) {
-            Either<ToscaTemplate, ToscaError> dependenciesRes = toscaExportUtils.getDependencies(component);
-            if (dependenciesRes.isRight()) {
-                log.debug("Failed to retrieve dependencies for component {}, error {}", component.getUniqueId(),
-                        dependenciesRes.right().value());
-                ActionStatus convertFromToscaError = componentsUtils.convertFromToscaError(dependenciesRes.right().value());
-                ResponseFormat responseFormat = componentsUtils.getResponseFormat(convertFromToscaError);
-                return Either.right(responseFormat);
-            }
-            dependencies = dependenciesRes.left().value().getDependencies();
-        }
-
-        //UID <cassandraId,filename,component>
-        Map<String, ImmutableTriple<String,String, Component>> innerComponentsCache = new HashMap<>();
-
-        if (dependencies != null && !dependencies.isEmpty()) {
-            for (Triple<String, String, Component> d : dependencies) {
-                String cassandraId = d.getMiddle();
-                Component childComponent = d.getRight();
-                Either<byte[], ActionStatus> entryData = getEntryData(cassandraId, childComponent);
-
-                if (entryData.isRight()) {
-                    ResponseFormat responseFormat = componentsUtils.getResponseFormat(entryData.right().value());
-                    return Either.right(responseFormat);
-                }
-
-                //fill innerComponentsCache
-                fileName = d.getLeft();
-                addComponentToCache(innerComponentsCache, cassandraId, fileName, childComponent);
-                addInnerComponentsToCache(innerComponentsCache, childComponent);
-
-                byte[] content = entryData.left().value();
-                generatorInputs.add(new ImmutablePair<Component, byte[]>(childComponent, content));
-            }
-
-            //add inner components to CSAR
-            for (Entry<String, ImmutableTriple<String, String, Component>> innerComponentTripleEntry : innerComponentsCache.entrySet()) {
-
-                ImmutableTriple<String, String, Component> innerComponentTriple = innerComponentTripleEntry.getValue();
-
-                Component innerComponent = innerComponentTriple.getRight();
-                String icFileName = innerComponentTriple.getMiddle();
-
-                // add component to zip
-                Either<byte[], ActionStatus> entryData = getEntryData(innerComponentTriple.getLeft(), innerComponent);
-                if (entryData.isRight()) {
-                    ResponseFormat responseFormat = componentsUtils.getResponseFormat(entryData.right().value());
-                    log.debug("Failed adding to zip component {}, error {}", innerComponentTriple.getLeft(),
-                            entryData.right().value());
-                    return Either.right(responseFormat);
-                }
-                byte[] content = entryData.left().value();
-                zip.putNextEntry(new ZipEntry(DEFINITIONS_PATH + icFileName));
-                zip.write(content);
-
-                // add component interface to zip
-                if (!ModelConverter.isAtomicComponent(innerComponent)) {
-                    writeComponentInterface(innerComponent, zip, icFileName);
-                }
-            }
-        }
-
-        //retrieve SDC.zip from Cassandra
-        Either<byte[], ResponseFormat> latestSchemaFilesFromCassandra = getLatestSchemaFilesFromCassandra();
-
-        if(latestSchemaFilesFromCassandra.isRight()){
-            log.error("Error retrieving SDC Schema files from cassandra" );
-            return Either.right(latestSchemaFilesFromCassandra.right().value());
-        }
-
-        //add files from retireved SDC.zip to Definitions folder in CSAR
-        Either<ZipOutputStream, ResponseFormat> addSchemaFilesFromCassandra = addSchemaFilesFromCassandra(zip, latestSchemaFilesFromCassandra.left().value());
-
-        if(addSchemaFilesFromCassandra.isRight()){
-            return addSchemaFilesFromCassandra;
-        }
-
-        // Artifact Generation
-        if (component.getComponentType() == ComponentTypeEnum.SERVICE
-                    && isInCertificationRequest) {
-
-            List<ArtifactDefinition> aiiArtifactList;
-
-            Either<List<ArtifactDefinition>, ResponseFormat> handleAAIArtifacts = handleAAIArtifacts(component, mockGenerator, generatorInputs);
-
-            if (handleAAIArtifacts.isLeft()) {
-                aiiArtifactList = handleAAIArtifacts.left().value();
-            } else {
-                log.debug("AAI Artifacts handling failed");
-                return Either.right(handleAAIArtifacts.right().value());
-            }
-
-            if (isInCertificationRequest) {
-                Either<ActionStatus, ResponseFormat> handleAllAAIArtifactsInDataModel = handleAllAAIArtifactsInDataModel(
-                        component, aiiArtifactList, false, true);
-
-                if (handleAllAAIArtifactsInDataModel.isRight()) {
-                    log.debug("AAI Artifacts handling (create, update, delete) failed");
-                    return Either.right(handleAllAAIArtifactsInDataModel.right().value());
-                }
-            }
-
-        }
-
-        Either<CsarDefinition, ResponseFormat> collectedComponentCsarDefinition = collectComponentCsarDefinition(component);
-
-        if (collectedComponentCsarDefinition.isRight()) {
-            return Either.right(collectedComponentCsarDefinition.right().value());
-        }
-
-        return writeAllFilesToCsar(component, collectedComponentCsarDefinition.left().value(), zip, isInCertificationRequest);
-    }
-
-    private Either<ZipOutputStream, ResponseFormat> addSchemaFilesFromCassandra(ZipOutputStream zip, byte[] schemaFileZip){
-
-        final int initSize = 2048;
-
-        log.debug("Starting copy from Schema file zip to CSAR zip");
-
-        try (ZipInputStream zipStream = new ZipInputStream(new ByteArrayInputStream(schemaFileZip));
-             ByteArrayOutputStream out = new ByteArrayOutputStream();
-             BufferedOutputStream bos = new BufferedOutputStream(out, initSize);) {
-
-            ZipEntry entry = null;
-
-            while ((entry = zipStream.getNextEntry()) != null) {
-
-                String entryName = entry.getName();
-                int readSize = initSize;
-                byte[] entryData = new byte[initSize];
-
-                while ((readSize = zipStream.read(entryData, 0, readSize)) != -1) {
-                    bos.write(entryData, 0, readSize);
-                }
-
-                bos.flush();
-                out.flush();
-                zip.putNextEntry(new ZipEntry(DEFINITIONS_PATH + entryName));
-                zip.write(out.toByteArray());
-                zip.flush();
-                out.reset();
-            }
-        } catch (IOException e) {
-            log.error("Error while writing the SDC schema file to the CSAR {}", e);
-            return Either.right(componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR));
-        }
-
-        log.debug("Finished coppy from Schema file zip to CSAR zip");
-
-        return Either.left(zip);
-    }
-
-
-    private void addInnerComponentsToCache(Map<String, ImmutableTriple<String, String, Component>> componentCache,
-            Component childComponent) {
-
-        List<ComponentInstance> instances = childComponent.getComponentInstances();
-
-        if(instances != null) {
-            instances.forEach(ci -> {
-                ImmutableTriple<String, String, Component> componentRecord = componentCache.get(ci.getComponentUid());
-                if (componentRecord == null) {
-                    // all resource must be only once!
-                    Either<Resource, StorageOperationStatus> resource = toscaOperationFacade.getToscaElement(ci.getComponentUid());
-                    if (resource.isRight()) {
-                        log.debug("Failed to fetch resource with id {} for instance {}");
-                    }
-                    Component componentRI = resource.left().value();
-
-                    Map<String, ArtifactDefinition> childToscaArtifacts = componentRI.getToscaArtifacts();
-                    ArtifactDefinition childArtifactDefinition = childToscaArtifacts.get(ToscaExportHandler.ASSET_TOSCA_TEMPLATE);
-                    if (childArtifactDefinition != null) {
-                        //add to cache
-                        addComponentToCache(componentCache, childArtifactDefinition.getEsId(), childArtifactDefinition.getArtifactName(), componentRI);
-                    }
-
-                    //if not atomic - insert inner components as well
-                    if(!ModelConverter.isAtomicComponent(componentRI)) {
-                        addInnerComponentsToCache(componentCache, componentRI);
-                    }
-                }
-            });
-        }
-    }
-
-    private void addComponentToCache(Map<String, ImmutableTriple<String, String, Component>> componentCache,
-            String id, String fileName, Component component) {
-
-        ImmutableTriple<String, String, Component> cachedComponent = componentCache.get(component.getInvariantUUID());
-        if (cachedComponent == null || CommonBeUtils.compareAsdcComponentVersions(component.getVersion(), cachedComponent.getRight().getVersion())) {
-            componentCache.put(component.getInvariantUUID(),
-                    new ImmutableTriple<String, String, Component>(id, fileName, component));
-
-            if(cachedComponent != null) {
-                //overwriting component with newer version
-                log.warn("Overwriting component invariantID {} of version {} with a newer version {}", id, cachedComponent.getRight().getVersion(), component.getVersion());
-            }
-        }
-    }
-
-    private Either<ZipOutputStream, ResponseFormat> writeComponentInterface(Component component, ZipOutputStream zip, String fileName) {
-        try {
-            Either<ToscaRepresentation, ToscaError> componentInterface = toscaExportUtils.exportComponentInterface(component);
-            ToscaRepresentation componentInterfaceYaml = componentInterface.left().value();
-            String mainYaml = componentInterfaceYaml.getMainYaml();
-            String interfaceFileName = DEFINITIONS_PATH + ToscaExportHandler.getInterfaceFilename(fileName);
-
-            zip.putNextEntry(new ZipEntry(interfaceFileName));
-            zip.write(mainYaml.getBytes());
-
-        } catch (Exception e) {
-            log.error("#writeComponentInterface - zip writing failed with error: ", e);
-            return Either.right(componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR));
-        }
-
-        return Either.left(zip);
-    }
-
-    private Either<List<ArtifactDefinition>, ResponseFormat> handleAAIArtifacts(Component component, boolean mockGenerator, List<ImmutablePair<Component, byte[]>> generatorInputs) {
-
-        ComponentTypeEnum componentType = component.getComponentType();
-        List<Artifact> generatedArtifacts;
-        List<ArtifactDefinition> aaiArtifacts = new LinkedList<>();
-
-        if (componentType == ComponentTypeEnum.SERVICE && !generatorInputs.isEmpty()) {
-            List<Artifact> convertedGeneratorInputs = convertToGeneratorArtifactsInput(generatorInputs);
-
-            Either<List<Artifact>, String> generatorResponse;
-
-            if (mockGenerator) {
-                generatorResponse = artifactGenerator(convertedGeneratorInputs, ArtifactType.OTHER, component);
-            } else {
-                generatorResponse = artifactGenerator(convertedGeneratorInputs, ArtifactType.AAI, component);
-            }
-
-            if (generatorResponse.isRight()) {
-                ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.AAI_ARTIFACT_GENERATION_FAILED, component.getComponentType().getValue(), component.getName(), generatorResponse.right().value());
-                return Either.right(responseFormat);
-            }
-
-            generatedArtifacts = generatorResponse.left().value();
-
-            aaiArtifacts = convertToArtifactDefinitionFromArtifactGeneratedData(generatedArtifacts);
-
-        }
-
-        return Either.left(aaiArtifacts);
-    }
-
-    private Either<ActionStatus, ResponseFormat> handleAllAAIArtifactsInDataModel(Component component, List<ArtifactDefinition> artifactsFromAAI, boolean shouldLock, boolean inTransaction) {
-
-        Either<ActionStatus, ResponseFormat> handleAAIArtifactsResponse;
-        User lastComponentUpdater;
-
-        List<ArtifactDefinition> aaiArtifatcsToCreate = getAAIArtifatcsForCreate(artifactsFromAAI, component);
-        List<ArtifactDefinition> aaiArtifatcsToDelete = getAAIArtifatcsForDelete(artifactsFromAAI, component);
-        List<ArtifactDefinition> aaiArtifatcsToUpdate = getAAIArtifatcsForUpdate(artifactsFromAAI, component);
-
-        String lastUpdaterUserId = component.getLastUpdaterUserId();
-        Either<User, ResponseFormat> validateUserExists = artifactsBusinessLogic.validateUserExists(lastUpdaterUserId, "CSAR creation util", true);
-
-        if (validateUserExists.isRight()) {
-            ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.AAI_ARTIFACT_GENERATION_FAILED, component.getComponentType().getValue(), component.getName(), "User not found");
-            return Either.right(responseFormat);
-        }
-
-        lastComponentUpdater = validateUserExists.left().value();
-
-        handleAAIArtifactsResponse = handleAAIArtifactsInDataModelByOperationType(component, aaiArtifatcsToDelete, artifactsBusinessLogic.new ArtifactOperationInfo(false, false, ArtifactOperationEnum.DELETE), lastComponentUpdater, shouldLock,
-                inTransaction);
-
-        if (handleAAIArtifactsResponse.isRight()) {
-            return handleAAIArtifactsResponse;
-        }
-
-        handleAAIArtifactsResponse = handleAAIArtifactsInDataModelByOperationType(component, aaiArtifatcsToCreate, artifactsBusinessLogic.new ArtifactOperationInfo(false, false, ArtifactOperationEnum.CREATE), lastComponentUpdater, shouldLock,
-                inTransaction);
-
-        if (handleAAIArtifactsResponse.isRight()) {
-            return handleAAIArtifactsResponse;
-        }
-
-        return handleAAIArtifactsInDataModelByOperationType(component, aaiArtifatcsToUpdate, artifactsBusinessLogic.new ArtifactOperationInfo(false, false, ArtifactOperationEnum.UPDATE), lastComponentUpdater, shouldLock, inTransaction);
-    }
-
-    private List<ArtifactDefinition> getAAIArtifatcsForUpdate(List<ArtifactDefinition> artifactsFromAAI, Component component) {
-
-        Set<String> componetDeploymentArtifactLables = component.getDeploymentArtifacts().keySet();
-        Set<String> componetInformationalArtifactLables = component.getArtifacts().keySet();
-
-        return artifactsFromAAI.stream()
-                               .filter(e -> componetDeploymentArtifactLables.contains(e.getArtifactLabel()) || componetInformationalArtifactLables.contains(e.getArtifactLabel()))
-                               .filter(e -> checkAaiForUpdate(component, e))
-                               .collect(Collectors.toList());
-    }
-
-    private boolean checkAaiForUpdate(Component component, ArtifactDefinition artifactDefinition) {
-        ArtifactDefinition artifactDefinitionComp = component.getDeploymentArtifacts().get(artifactDefinition.getArtifactLabel());
-
-        if (artifactDefinitionComp == null) {
-            log.warn("Failed to get {} artifact", artifactDefinition.getArtifactLabel());
-            return false;
-        }
-
-        // Old Artifacts before the generated flag introduction if contains "aai" ignore case prefix updated
-        if (artifactDefinitionComp.getGenerated() == null) {
-            if (artifactDefinitionComp.getArtifactLabel().toLowerCase().startsWith("aai")) {
-                return true;
-            } else {
-                log.warn("The artifact {} flag is null but AAI prefix is abssent Not updated", artifactDefinition.getArtifactLabel());
-            }
-        } else {
-            if (artifactDefinition.getGenerated()) {
-                return true;
-            } else {
-                log.warn("Generated artifact {} was already uploaded manually", artifactDefinition.getArtifactLabel());
-            }
-        }
-        return false;
-    }
-
-    private List<ArtifactDefinition> getAAIArtifatcsForDelete(List<ArtifactDefinition> artifactsFromAAI, Component component) {
-
-        Set<String> aaiLabels = artifactsFromAAI.stream()
-                                                .map(ArtifactDefinition::getArtifactLabel)
-                                                .collect(Collectors.toSet());
-
-        List<ArtifactDefinition> artifactsForDeleteDeployment = component.getDeploymentArtifacts().values().stream()
-                                                                         // Filter Out Artifacts that are not contained in artifacts returned
-                                                                         // from AAI API
-                                                                         .filter(e -> !aaiLabels.contains(e.getArtifactLabel()))
-                                                                         .collect(Collectors.toList());
-
-        List<ArtifactDefinition> artifactsForDeleteInformational = component.getArtifacts().values().stream()
-                                                                            // Filter Out Artifacts that are not contained in artifacts returned
-                                                                            // from AAI API
-                                                                            .filter(e -> !aaiLabels.contains(e.getArtifactLabel()))
-                                                                            .collect(Collectors.toList());
-
-        artifactsForDeleteDeployment.addAll(artifactsForDeleteInformational);
-
-        return artifactsForDeleteDeployment.stream()
-                                           .filter(e -> (e.getGenerated() != null && e.getGenerated().equals(Boolean.TRUE)) || (e.getGenerated() == null && e.getArtifactLabel().toLowerCase().startsWith("aai")))
-                                           .collect(Collectors.toList());
-    }
-
-    private List<ArtifactDefinition> getAAIArtifatcsForCreate(List<ArtifactDefinition> artifactsFromAAI, Component component) {
-
-        Set<String> componentDeploymentLabels = component.getDeploymentArtifacts().keySet();
-        Set<String> componentInfoLabels = component.getArtifacts().keySet();
-
-        // If the artifact label does not exist in the service -
-        // store the artifact (generate uuid and version, "generated" flag is TRUE)
-        return artifactsFromAAI.stream()
-                               .filter(e -> !componentDeploymentLabels.contains(e.getArtifactLabel()) && !componentInfoLabels.contains(e.getArtifactLabel()))
-                               .collect(Collectors.toList());
-    }
-
-    private Either<ActionStatus, ResponseFormat> handleAAIArtifactsInDataModelByOperationType(Component component, List<ArtifactDefinition> generatedArtifactsDefinitions, ArtifactOperationInfo operationType, User user, boolean shouldLock,
-            boolean inTransaction) {
-
-        String componentUniqueId = component.getUniqueId();
-        ComponentTypeEnum componentType = component.getComponentType();
-
-        for (ArtifactDefinition artDef : generatedArtifactsDefinitions) {
-            String data = gson.toJson(artDef);
-            String dataMD5 = GeneralUtility.calculateMD5Base64EncodedByString(data);
-            String artifactUniqueId = null;
-
-            if ((operationType.getArtifactOperationEnum() == ArtifactOperationEnum.UPDATE) || (operationType.getArtifactOperationEnum() == ArtifactOperationEnum.DELETE)) {
-                String artifactLabel = artDef.getArtifactLabel();
-                ArtifactDefinition artifactDefinition = component.getDeploymentArtifacts().get(artifactLabel);
-                if (artifactDefinition != null) {
-                    artifactUniqueId = artifactDefinition.getUniqueId();
-                }
-            }
-
-            Either<Either<ArtifactDefinition, Operation>, ResponseFormat> validateAndHandleArtifact = artifactsBusinessLogic.validateAndHandleArtifact(componentUniqueId, componentType, operationType, artifactUniqueId, artDef, dataMD5, data, null,
-                    null, user, component, shouldLock, inTransaction, false);
-
-            if (validateAndHandleArtifact.isRight()) {
-                if (ArtifactOperationEnum.isCreateOrLink(operationType.getArtifactOperationEnum()) || ArtifactOperationEnum.UPDATE == operationType.getArtifactOperationEnum()) {
-                    ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.AAI_ARTIFACT_GENERATION_FAILED, componentType.getValue(), component.getName(), validateAndHandleArtifact.right().value().toString());
-
-                    Either.right(responseFormat);
-                } else {
-                    log.warn("Generated artifact {} could not be deleted", artDef.getArtifactLabel());
-                }
-            }
-        }
-
-        return Either.left(ActionStatus.OK);
-    }
-
-    private List<ArtifactDefinition> convertToArtifactDefinitionFromArtifactGeneratedData(List<Artifact> generatorOutput) {
-        List<ArtifactDefinition> artifactDefList = new LinkedList<>();
-
-        for (Artifact artifact : generatorOutput) {
-            ArtifactDefinition newEntry = new ArtifactDefinition();
-            newEntry.setArtifactName(artifact.getName());
-            newEntry.setArtifactType(artifact.getType());
-            newEntry.setArtifactGroupType(ArtifactGroupTypeEnum.findType(artifact.getGroupType()));
-            newEntry.setDescription(artifact.getDescription());
-
-            // Normalizing the artifact label to match those stored in DB
-            String normalizeArtifactLabel = ValidationUtils.normalizeArtifactLabel(artifact.getLabel());
-            newEntry.setArtifactLabel(normalizeArtifactLabel);
-            newEntry.setPayload(Base64.decodeBase64(artifact.getPayload()));
-            newEntry.setArtifactChecksum(artifact.getChecksum());
-            // Flag that set to true in case that the artifact is generated by AI&I generator
-            newEntry.setGenerated(Boolean.TRUE);
-
-            artifactDefList.add(newEntry);
-        }
-
-        return artifactDefList;
-    }
-
-    // List<ImmutablePair<Component, byte[] artifactBytes>>
-    // artifact stored by label
-    private List<Artifact> convertToGeneratorArtifactsInput(List<ImmutablePair<Component, byte[]>> inputs) {
-        List<Artifact> listOfArtifactsInput = new LinkedList<>();
-        for (ImmutablePair<Component, byte[]> triple : inputs) {
-            Component component = triple.getLeft();
-
-            Map<String, ArtifactDefinition> toscaArtifacts = component.getToscaArtifacts();
-            ArtifactDefinition artifactDefinition = toscaArtifacts.get(ToscaExportHandler.ASSET_TOSCA_TEMPLATE);
-
-            String artifactName = artifactDefinition.getArtifactName();
-            String artifactType = artifactDefinition.getArtifactType();
-            String artifactGroupType = artifactDefinition.getArtifactGroupType().getType();
-            String artifactDescription = artifactDefinition.getDescription();
-            String artifactLabel = artifactDefinition.getArtifactLabel();
-            byte[] right = triple.getRight();
-            // The md5 calculated on the uncoded data
-            String md5Hex = DigestUtils.md5Hex(right);
-            byte[] payload = Base64.encodeBase64(right);
-            String artifactVersion = artifactDefinition.getArtifactVersion();
-
-            Artifact convertedArtifact = new Artifact(artifactType, artifactGroupType, md5Hex, payload);
-            convertedArtifact.setName(artifactName);
-            convertedArtifact.setDescription(artifactDescription);
-            convertedArtifact.setLabel(artifactLabel);
-            convertedArtifact.setVersion(artifactVersion);
-
-            listOfArtifactsInput.add(convertedArtifact);
-        }
-
-        return listOfArtifactsInput;
-    }
-
-    private Either<byte[], ActionStatus> getEntryData(String cassandraId, Component childComponent) {
-        byte[] content;
-        if (cassandraId == null || cassandraId.isEmpty()) {
-            Either<ToscaRepresentation, ToscaError> exportRes = toscaExportUtils.exportComponent(childComponent);
-            if (exportRes.isRight()) {
-                log.debug("Failed to export tosca template for child component {} error {}", childComponent.getUniqueId(), exportRes.right().value());
-                return Either.right(componentsUtils.convertFromToscaError(exportRes.right().value()));
-            }
-            content = exportRes.left().value().getMainYaml().getBytes();
-        } else {
-            Either<byte[], ActionStatus> fromCassandra = getFromCassandra(cassandraId);
-            if (fromCassandra.isRight()) {
-                return Either.right(fromCassandra.right().value());
-            } else {
-                content = fromCassandra.left().value();
-            }
-        }
-        return Either.left(content);
-    }
-
-    private Either<byte[], ResponseFormat> getLatestSchemaFilesFromCassandra() {
-        Either<List<SdcSchemaFilesData>, CassandraOperationStatus> specificSchemaFiles = sdcSchemaFilesCassandraDao.getSpecificSchemaFiles(versionFirstThreeOctates, CONFORMANCE_LEVEL);
-
-        if(specificSchemaFiles.isRight()){
-            log.debug("Failed to get the schema files SDC-Version: {} Conformance-Level {}", versionFirstThreeOctates, CONFORMANCE_LEVEL);
-            StorageOperationStatus storageStatus = DaoStatusConverter.convertCassandraStatusToStorageStatus(specificSchemaFiles.right().value());
-            ActionStatus convertedFromStorageResponse = componentsUtils.convertFromStorageResponse(storageStatus);
-            return Either.right(componentsUtils.getResponseFormat(convertedFromStorageResponse));
-        }
-
-        List<SdcSchemaFilesData> listOfSchemas = specificSchemaFiles.left().value();
-
-        if(listOfSchemas.isEmpty()){
-            log.debug("Failed to get the schema files SDC-Version: {} Conformance-Level {}", versionFirstThreeOctates, CONFORMANCE_LEVEL);
-            return Either.right(componentsUtils.getResponseFormat(ActionStatus.TOSCA_SCHEMA_FILES_NOT_FOUND, versionFirstThreeOctates, CONFORMANCE_LEVEL));
-        }
-
-        SdcSchemaFilesData schemaFile = listOfSchemas.iterator().next();
-
-        return Either.left(schemaFile.getPayloadAsArray());
-    }
-
-    private Either<byte[], ActionStatus> getFromCassandra(String cassandraId) {
-        Either<ESArtifactData, CassandraOperationStatus> artifactResponse = artifactCassandraDao.getArtifact(cassandraId);
-
-        if (artifactResponse.isRight()) {
-            log.debug("Failed to fetch artifact from Cassandra by id {} error {} ", cassandraId, artifactResponse.right().value());
-
-            StorageOperationStatus storageStatus = DaoStatusConverter.convertCassandraStatusToStorageStatus(artifactResponse.right().value());
-            ActionStatus convertedFromStorageResponse = componentsUtils.convertFromStorageResponse(storageStatus);
-            return Either.right(convertedFromStorageResponse);
-        }
-        ESArtifactData artifactData = artifactResponse.left().value();
-        return Either.left(artifactData.getDataAsArray());
-    }
-
-    private String createCsarBlock0(String metaFileVersion, String toscaConformanceLevel) {
-        final String BLOCK_0_TEMPLATE =
-                "SDC-TOSCA-Meta-File-Version: %s\nSDC-TOSCA-Definitions-Version: %s\n";
-        String readyBlock = String.format(BLOCK_0_TEMPLATE, metaFileVersion, toscaConformanceLevel);
-        return readyBlock;
-    }
-
-    private String createToscaBlock0(String metaFileVersion, String csarVersion, String createdBy, String entryDef) {
-        final String block0template = "TOSCA-Meta-File-Version: %s\nCSAR-Version: %s\nCreated-By: %s\nEntry-Definitions: Definitions/%s\n\nName: csar.meta\nContent-Type: text/plain\n";
-        return String.format(block0template, metaFileVersion, csarVersion, createdBy, entryDef);
-    }
-
-    private Either<List<Artifact>, String> artifactGenerator(List<Artifact> artifactList, ArtifactType type, Component component) {
-
-        ArtifactGenerationServiceImpl artifactGenerationServiceImpl = new ArtifactGenerationServiceImpl();
-        ArtifactTypes artifactTypes = new ArtifactTypes();
-        List<ArtifactType> artifactTypesList = new LinkedList<>();
-        ArtifactType otherType;
-
-        if (type == null) {
-            otherType = ArtifactType.OTHER;
-        } else {
-            otherType = type;
-        }
-
-        artifactTypesList.add(otherType);
-        artifactTypes.setArtifactTypes(artifactTypesList);
-
-        String configJson = gson.toJson(artifactTypes);
-        Map<String, String> additionalParams = new HashMap<>();
-        String version;
-
-        if (UUID_NORMATIVE_NEW_VERSION.matcher(component.getVersion()).matches() ) {
-            version = component.getVersion();
-        } else {
-            String[] versionParts = component.getVersion().split(ToscaElementLifecycleOperation.VERSION_DELIMETER_REGEXP);
-            Integer majorVersion = Integer.parseInt(versionParts[0]);
-
-            version = (majorVersion + 1) + ToscaElementLifecycleOperation.VERSION_DELIMETER + "0";
-        }
-
-        additionalParams.put(AdditionalParams.ServiceVersion.getName(), version);
-        GenerationData generatedArtifacts = artifactGenerationServiceImpl.generateArtifact(artifactList, configJson, additionalParams);
-
-        Map<String, List<String>> errorData = generatedArtifacts.getErrorData();
-
-        if (!errorData.isEmpty()) {
-            Set<String> keySet = errorData.keySet();
-            StringBuilder error = new StringBuilder();
-
-            for (String key : keySet) {
-                List<String> errorList = errorData.get(key);
-                log.debug("The Artifact Generator Failed - {} with following: {}", key, errorList);
-                error.append(key + errorList);
-            }
-
-            return Either.right(error.toString());
-        }
-
-        return Either.left(generatedArtifacts.getResultData());
-    }
-
-    /**
-     * Extracts artifacts of VFCs from CSAR
-     *
-     * @param csar
-     * @return Map of <String, List<ArtifactDefinition>> the contains Lists of artifacts according vfcToscaNamespace
-     */
-    public static Map<String, List<ArtifactDefinition>> extractVfcsArtifactsFromCsar(Map<String, byte[]> csar) {
-
-        Map<String, List<ArtifactDefinition>> artifacts = new HashMap<>();
-        if (csar != null) {
-            log.debug("************* Going to extract VFCs artifacts from Csar. ");
-            Map<String, Set<List<String>>> collectedWarningMessages = new HashMap<>();
-            csar.entrySet().stream()
-                // filter CSAR entry by node type artifact path
-                .filter(e -> Pattern.compile(VFC_NODE_TYPE_ARTIFACTS_PATH_PATTERN).matcher(e.getKey()).matches())
-                // extract ArtifactDefinition from CSAR entry for each entry with matching artifact path
-                .forEach(e -> addExtractedVfcArtifact(extractVfcArtifact(e, collectedWarningMessages), artifacts));
-            // add counter suffix to artifact labels
-            handleWarningMessages(collectedWarningMessages);
-
-        }
-        return artifacts;
-    }
-
-    /**
-     * Print warnings to log
-     *
-     * @param collectedWarningMessages
-     */
-    public static void handleWarningMessages(Map<String, Set<List<String>>> collectedWarningMessages) {
-        collectedWarningMessages.entrySet().stream()
-                                // for each vfc
-                                .forEach(e -> e.getValue().stream()
-                                               // add each warning message to log
-                                               .forEach(args -> log.warn(e.getKey(), args.toArray())));
-
-    }
-
-    private static void addExtractedVfcArtifact(ImmutablePair<String, ArtifactDefinition> extractedVfcArtifact, Map<String, List<ArtifactDefinition>> artifacts) {
-        if (extractedVfcArtifact != null) {
-            List<ArtifactDefinition> currArtifactsList;
-            String vfcToscaNamespace = extractedVfcArtifact.getKey();
-            if (artifacts.containsKey(vfcToscaNamespace)) {
-                currArtifactsList = artifacts.get(vfcToscaNamespace);
-            } else {
-                currArtifactsList = new ArrayList<>();
-                artifacts.put(vfcToscaNamespace, currArtifactsList);
-            }
-            currArtifactsList.add(extractedVfcArtifact.getValue());
-        }
-    }
-
-    private static ImmutablePair<String, ArtifactDefinition> extractVfcArtifact(Entry<String, byte[]> entry, Map<String, Set<List<String>>> collectedWarningMessages) {
-        ArtifactDefinition artifact;
-        String[] parsedCsarArtifactPath = entry.getKey().split("/");
-        Either<ArtifactGroupTypeEnum, Boolean> eitherArtifactGroupType = detectArtifactGroupType(parsedCsarArtifactPath[2].toUpperCase(), collectedWarningMessages);
-        if (eitherArtifactGroupType.isLeft()) {
-            artifact = buildArtifactDefinitionFromCsarArtifactPath(entry, collectedWarningMessages, parsedCsarArtifactPath, eitherArtifactGroupType.left().value());
-        } else {
-            return null;
-        }
-        return new ImmutablePair<>(parsedCsarArtifactPath[1], artifact);
-    }
-
-    private static Either<ArtifactGroupTypeEnum, Boolean> detectArtifactGroupType(String groupType, Map<String, Set<List<String>>> collectedWarningMessages) {
-        Either<ArtifactGroupTypeEnum, Boolean> result;
-        try {
-            ArtifactGroupTypeEnum artifactGroupType = ArtifactGroupTypeEnum.findType(groupType.toUpperCase());
-            if (artifactGroupType == null || (artifactGroupType != ArtifactGroupTypeEnum.INFORMATIONAL && artifactGroupType != ArtifactGroupTypeEnum.DEPLOYMENT)) {
-                String warningMessage = "Warning - unrecognized artifact group type {} was received.";
-                List<String> messageArguments = new ArrayList<>();
-                messageArguments.add(groupType);
-                if (!collectedWarningMessages.containsKey(warningMessage)) {
-                    Set<List<String>> messageArgumentLists = new HashSet<>();
-                    messageArgumentLists.add(messageArguments);
-                    collectedWarningMessages.put(warningMessage, messageArgumentLists);
-                } else {
-                    collectedWarningMessages.get(warningMessage).add(messageArguments);
-                }
-
-                result = Either.right(false);
-            } else {
-
-                result = Either.left(artifactGroupType);
-            }
-        } catch (Exception e) {
-            log.debug("detectArtifactGroupType failed with exception", e);
-            result = Either.right(false);
-        }
-        return result;
-    }
-
-    private static ArtifactDefinition buildArtifactDefinitionFromCsarArtifactPath(Entry<String, byte[]> entry, Map<String, Set<List<String>>> collectedWarningMessages, String[] parsedCsarArtifactPath, ArtifactGroupTypeEnum artifactGroupType) {
-        ArtifactDefinition artifact;
-        artifact = new ArtifactDefinition();
-        artifact.setArtifactGroupType(artifactGroupType);
-        artifact.setArtifactType(detectArtifactTypeVFC(artifactGroupType, parsedCsarArtifactPath[3], parsedCsarArtifactPath[1], collectedWarningMessages));
-        artifact.setArtifactName(ValidationUtils.normalizeFileName(parsedCsarArtifactPath[parsedCsarArtifactPath.length - 1]));
-        artifact.setPayloadData(Base64.encodeBase64String(entry.getValue()));
-        artifact.setArtifactDisplayName(artifact.getArtifactName().lastIndexOf('.') > 0 ? artifact.getArtifactName().substring(0, artifact.getArtifactName().lastIndexOf('.')) : artifact.getArtifactName());
-        artifact.setArtifactLabel(ValidationUtils.normalizeArtifactLabel(artifact.getArtifactName()));
-        artifact.setDescription(ARTIFACT_CREATED_FROM_CSAR);
-        artifact.setIsFromCsar(true);
-        artifact.setArtifactChecksum(GeneralUtility.calculateMD5Base64EncodedByByteArray(entry.getValue()));
-        return artifact;
-    }
-
-    public static final class NonMetaArtifactInfo {
-        private final String path;
-        private final String artifactName;
-        private final String displayName;
-        private final String artifactLabel;
-        private final ArtifactTypeEnum artifactType;
-        private final ArtifactGroupTypeEnum artifactGroupType;
-        private String payloadData;
-        private String artifactChecksum;
-        private String artifactUniqueId;
-        private final boolean isFromCsar;
-
-        public NonMetaArtifactInfo(String artifactName, String path, ArtifactTypeEnum artifactType, ArtifactGroupTypeEnum artifactGroupType, byte[] payloadData, String artifactUniqueId, boolean isFromCsar) {
-            super();
-            this.path = path;
-            this.isFromCsar = isFromCsar;
-            this.artifactName = ValidationUtils.normalizeFileName(artifactName);
-            this.artifactType = artifactType;
-            this.artifactGroupType = artifactGroupType;
-            final int pointIndex = artifactName.lastIndexOf('.');
-            if (pointIndex > 0) {
-                displayName = artifactName.substring(0, pointIndex);
-            } else {
-                displayName = artifactName;
-            }
-            this.artifactLabel = ValidationUtils.normalizeArtifactLabel(artifactName);
-            if (payloadData != null) {
-                this.payloadData = Base64.encodeBase64String(payloadData);
-                this.artifactChecksum = GeneralUtility.calculateMD5Base64EncodedByByteArray(payloadData);
-            }
-            this.artifactUniqueId = artifactUniqueId;
-        }
-
-        public String getPath() {
-            return path;
-        }
-
-        public String getArtifactName() {
-            return artifactName;
-        }
-
-        public ArtifactTypeEnum getArtifactType() {
-            return artifactType;
-        }
-
-        public String getDisplayName() {
-            return displayName;
-        }
-
-        public ArtifactGroupTypeEnum getArtifactGroupType() {
-            return artifactGroupType;
-        }
-
-        public String getArtifactLabel() {
-            return artifactLabel;
-        }
-
-        public boolean isFromCsar(){
-            return isFromCsar;
-        }
-
-        public String getPayloadData() {
-            return payloadData;
-        }
-
-        public String getArtifactChecksum() {
-            return artifactChecksum;
-        }
-
-        public String getArtifactUniqueId() {
-            return artifactUniqueId;
-        }
-
-        public void setArtifactUniqueId(String artifactUniqueId) {
-            this.artifactUniqueId = artifactUniqueId;
-        }
-
-    }
-
-    /**
-     * This method checks the artifact GroupType & Artifact Type. <br>
-     * if there is any problem warning messages are added to collectedWarningMessages
-     *
-     * @param artifactPath
-     * @param collectedWarningMessages
-     * @return
-     */
-    public static Either<NonMetaArtifactInfo, Boolean> validateNonMetaArtifact(String artifactPath, byte[] payloadData, Map<String, Set<List<String>>> collectedWarningMessages) {
-        Either<NonMetaArtifactInfo, Boolean> ret;
-        try {
-            String[] parsedArtifactPath = artifactPath.split("/");
-            // Validate Artifact Group Type
-            Either<ArtifactGroupTypeEnum, Boolean> eitherGroupType = detectArtifactGroupType(parsedArtifactPath[1], collectedWarningMessages);
-            if (eitherGroupType.isLeft()) {
-                final ArtifactGroupTypeEnum groupTypeEnum = eitherGroupType.left().value();
-
-                // Validate Artifact Type
-                String artifactType = parsedArtifactPath[2];
-                artifactType = detectArtifactTypeVF(groupTypeEnum, artifactType, collectedWarningMessages);
-
-                String artifactFileNameType = parsedArtifactPath[3];
-                ret = Either.left(new NonMetaArtifactInfo(artifactFileNameType, artifactPath, ArtifactTypeEnum.findType(artifactType), groupTypeEnum, payloadData, null, true));
-
-            } else {
-                ret = Either.right(eitherGroupType.right().value());
-            }
-        } catch (Exception e) {
-            log.debug("detectArtifactGroupType failed with exception", e);
-            ret = Either.right(false);
-        }
-        return ret;
-
-    }
-
-    private static String detectArtifactTypeVFC(ArtifactGroupTypeEnum artifactGroupType, String receivedTypeName, String parentVfName, Map<String, Set<List<String>>> collectedWarningMessages) {
-        String warningMessage = "Warning - artifact type {} that was provided for VFC {} is not recognized.";
-        return detectArtifactType(artifactGroupType, receivedTypeName, warningMessage, collectedWarningMessages, parentVfName);
-    }
-
-    private static String detectArtifactTypeVF(ArtifactGroupTypeEnum artifactGroupType, String receivedTypeName, Map<String, Set<List<String>>> collectedWarningMessages) {
-        String warningMessage = "Warning - artifact type {} that was provided for VF is not recognized.";
-        return detectArtifactType(artifactGroupType, receivedTypeName, warningMessage, collectedWarningMessages);
-    }
-
-    private static String detectArtifactType(ArtifactGroupTypeEnum artifactGroupType, String receivedTypeName, String warningMessage, Map<String, Set<List<String>>> collectedWarningMessages, String... arguments) {
-
-        ArtifactTypeEnum artifactType = ArtifactTypeEnum.findType(receivedTypeName);
-        Map<String, ArtifactTypeConfig> resourceValidTypeArtifacts = null;
-
-        if(artifactGroupType != null){
-            switch (artifactGroupType) {
-                case INFORMATIONAL:
-                    resourceValidTypeArtifacts = ConfigurationManager.getConfigurationManager().getConfiguration()
-                                                                     .getResourceInformationalArtifacts();
-                    break;
-                case DEPLOYMENT:
-                    resourceValidTypeArtifacts = ConfigurationManager.getConfigurationManager().getConfiguration()
-                                                                     .getResourceDeploymentArtifacts();
-                    break;
-                default:
-                    break;
-            }
-        }
-
-        Set<String> validArtifactTypes = null;
-        if(resourceValidTypeArtifacts != null){
-            validArtifactTypes = resourceValidTypeArtifacts.keySet();
-        }
-
-        if (validArtifactTypes == null || artifactType == null || !validArtifactTypes.contains(artifactType.getType())) {
-            List<String> messageArguments = new ArrayList<>();
-            messageArguments.add(receivedTypeName);
-            messageArguments.addAll(Arrays.asList(arguments));
-            if (!collectedWarningMessages.containsKey(warningMessage)) {
-                Set<List<String>> messageArgumentLists = new HashSet<>();
-                messageArgumentLists.add(messageArguments);
-                collectedWarningMessages.put(warningMessage, messageArgumentLists);
-            } else {
-                collectedWarningMessages.get(warningMessage).add(messageArguments);
-            }
-        }
-
-        return artifactType == null ? ArtifactTypeEnum.OTHER.getType() : artifactType.getType();
-    }
-
-    private Either<ZipOutputStream, ResponseFormat> writeAllFilesToCsar(Component mainComponent, CsarDefinition csarDefinition, ZipOutputStream zipstream, boolean isInCertificationRequest) throws IOException{
-        ComponentArtifacts componentArtifacts = csarDefinition.getComponentArtifacts();
-
-        Either<ZipOutputStream, ResponseFormat> writeComponentArtifactsToSpecifiedPath = writeComponentArtifactsToSpecifiedPath(mainComponent, componentArtifacts, zipstream, ARTIFACTS_PATH, isInCertificationRequest);
-
-        if(writeComponentArtifactsToSpecifiedPath.isRight()){
-            return Either.right(writeComponentArtifactsToSpecifiedPath.right().value());
-        }
-
-        ComponentTypeArtifacts mainTypeAndCIArtifacts = componentArtifacts.getMainTypeAndCIArtifacts();
-        writeComponentArtifactsToSpecifiedPath = writeArtifactsInfoToSpecifiedtPath(mainComponent, mainTypeAndCIArtifacts.getComponentArtifacts(), zipstream, ARTIFACTS_PATH, isInCertificationRequest);
-
-        if(writeComponentArtifactsToSpecifiedPath.isRight()){
-            return Either.right(writeComponentArtifactsToSpecifiedPath.right().value());
-        }
-
-        Map<String, ArtifactsInfo> componentInstancesArtifacts = mainTypeAndCIArtifacts.getComponentInstancesArtifacts();
-        Set<String> keySet = componentInstancesArtifacts.keySet();
-
-        String currentPath = ARTIFACTS_PATH + RESOURCES_PATH;
-        for (String keyAssetName : keySet) {
-            ArtifactsInfo artifactsInfo = componentInstancesArtifacts.get(keyAssetName);
-            String pathWithAssetName = currentPath + keyAssetName + "/";
-            writeComponentArtifactsToSpecifiedPath = writeArtifactsInfoToSpecifiedtPath(mainComponent, artifactsInfo, zipstream, pathWithAssetName, isInCertificationRequest);
-
-            if(writeComponentArtifactsToSpecifiedPath.isRight()){
-                return Either.right(writeComponentArtifactsToSpecifiedPath.right().value());
-            }
-        }
-        writeComponentArtifactsToSpecifiedPath = writeOperationsArtifactsToCsar(mainComponent, zipstream);
-
-        if (writeComponentArtifactsToSpecifiedPath.isRight()) {
-            return Either.right(writeComponentArtifactsToSpecifiedPath.right().value());
-        }
-        return Either.left(zipstream);
-    }
-
-    private Either<ZipOutputStream, ResponseFormat> writeOperationsArtifactsToCsar(Component component,
-            ZipOutputStream zipstream) {
-        if (component instanceof Service ) {
-            return Either.left(zipstream);
-        }
-        if (Objects.isNull(((Resource) component).getInterfaces())) {
-            log.debug("Component Name {}- no interfaces found", component.getNormalizedName());
-            return Either.left(zipstream);
-        }
-        final Map<String, InterfaceDefinition> interfaces = ((Resource) component).getInterfaces();
-
-        for (Map.Entry<String, InterfaceDefinition> interfaceEntry : interfaces.entrySet()) {
-            for (OperationDataDefinition operation : interfaceEntry.getValue().getOperations().values()) {
-                try {
-                    if (Objects.isNull(operation.getImplementation())) {
-                        log.debug("Component Name {}, Interface Id {}, Operation Name {} - no Operation Implementation found",
-                                component.getNormalizedName(), interfaceEntry.getValue().getUniqueId(),
-                                operation.getName());
-                        continue;
-                    }
-                    if (Objects.isNull(operation.getImplementation().getArtifactName())) {
-                        log.debug("Component Name {}, Interface Id {}, Operation Name {} - no artifact found",
-                                component.getNormalizedName(), interfaceEntry.getValue().getUniqueId(),
-                                operation.getName());
-                        continue;
-                    }
-
-                    final String artifactUUID = operation.getImplementation().getArtifactUUID();
-
-                    final Either<byte[], ActionStatus> artifactFromCassandra = getFromCassandra(artifactUUID);
-                    final String artifactName = operation.getImplementation().getArtifactName();
-                    if (artifactFromCassandra.isRight()) {
-                        log.error("ArtifactName {}, unique ID {}", artifactName, artifactUUID);
-                        log.error("Failed to get {} payload from DB reason: {}", artifactName,
-                                artifactFromCassandra.right().value());
-                        return Either.right(componentsUtils.getResponseFormat(
-                                ActionStatus.ARTIFACT_PAYLOAD_NOT_FOUND_DURING_CSAR_CREATION, "Resource",
-                                component.getUniqueId(), artifactName, artifactUUID));
-                    }
-
-                    final byte[] payloadData = artifactFromCassandra.left().value();
-                    zipstream.putNextEntry(new ZipEntry(OperationArtifactUtil.createOperationArtifactPath(
-                            component.getNormalizedName(), interfaceEntry.getValue().getToscaResourceName(), operation)));
-                    zipstream.write(payloadData);
-
-                } catch (IOException e) {
-                    log.error("Component Name {},  Interface Name {}, Operation Name {}", component.getNormalizedName(),
-                            interfaceEntry.getKey(), operation.getName());
-                    log.error("Error while writing the operation's artifacts to the CSAR " + "{}", e);
-                    return Either.right(componentsUtils
-                                                .getResponseFormat(ActionStatus.ERROR_DURING_CSAR_CREATION, "Resource",
-                                                        component.getUniqueId()));
-                }
-            }
-        }
-        return Either.left(zipstream);
-
-    }
-
-    private Either<ZipOutputStream, ResponseFormat> writeComponentArtifactsToSpecifiedPath(Component mainComponent, ComponentArtifacts componentArtifacts, ZipOutputStream zipstream,
-            String currentPath, boolean isInCertificationRequest) throws IOException {
-        Map<String, ComponentTypeArtifacts> componentTypeArtifacts = componentArtifacts.getComponentTypeArtifacts();
-        //Keys are defined:
-        //<Inner Asset TOSCA name (e.g. VFC name)> folder name: <Inner Asset TOSCA name (e.g. VFC name)>_v<version>.
-        //E.g. "org.openecomp.resource.vf.vipr_atm_v1.0"
-        Set<String> componentTypeArtifactsKeys = componentTypeArtifacts.keySet();
-        for (String keyAssetName : componentTypeArtifactsKeys) {
-            ComponentTypeArtifacts componentInstanceArtifacts = componentTypeArtifacts.get(keyAssetName);
-            ArtifactsInfo componentArtifacts2 = componentInstanceArtifacts.getComponentArtifacts();
-            String pathWithAssetName = currentPath + keyAssetName + "/";
-            Either<ZipOutputStream, ResponseFormat> writeArtifactsInfoToSpecifiedtPath = writeArtifactsInfoToSpecifiedtPath(mainComponent, componentArtifacts2, zipstream, pathWithAssetName, isInCertificationRequest);
-
-            if(writeArtifactsInfoToSpecifiedtPath.isRight()){
-                return writeArtifactsInfoToSpecifiedtPath;
-            }
-        }
-
-        return Either.left(zipstream);
-    }
-
-    private Either<ZipOutputStream, ResponseFormat> writeArtifactsInfoToSpecifiedtPath(Component mainComponent, ArtifactsInfo currArtifactsInfo, ZipOutputStream zip, String path, boolean isInCertificationRequest) throws IOException {
-        Map<ArtifactGroupTypeEnum, Map<ArtifactTypeEnum, List<ArtifactDefinition>>> artifactsInfo = currArtifactsInfo
-                                                                                                            .getArtifactsInfo();
-        Set<ArtifactGroupTypeEnum> groupTypeEnumKeySet = artifactsInfo.keySet();
-
-        for (ArtifactGroupTypeEnum artifactGroupTypeEnum : groupTypeEnumKeySet) {
-            String groupTypeFolder = path + WordUtils.capitalizeFully(artifactGroupTypeEnum.getType()) + "/";
-
-            Map<ArtifactTypeEnum, List<ArtifactDefinition>> artifactTypesMap = artifactsInfo.get(artifactGroupTypeEnum);
-            Set<ArtifactTypeEnum> artifactTypeEnumKeySet = artifactTypesMap.keySet();
-
-            for (ArtifactTypeEnum artifactTypeEnum : artifactTypeEnumKeySet) {
-                List<ArtifactDefinition> artifactDefinitionList = artifactTypesMap.get(artifactTypeEnum);
-                String artifactTypeFolder = groupTypeFolder + artifactTypeEnum.toString() + "/";
-
-                Either<ZipOutputStream, ResponseFormat> writeArtifactDefinition = writeArtifactDefinition(mainComponent, zip, artifactDefinitionList, artifactTypeFolder, isInCertificationRequest);
-
-                if(writeArtifactDefinition.isRight()){
-                    return writeArtifactDefinition;
-                }
-            }
-        }
-
-        return Either.left(zip);
-    }
-
-    private Either<ZipOutputStream, ResponseFormat> writeArtifactDefinition(Component mainComponent, ZipOutputStream zip, List<ArtifactDefinition> artifactDefinitionList,
-            String artifactPathAndFolder, boolean isInCertificationRequest) throws IOException {
-
-        ComponentTypeEnum componentType = mainComponent.getComponentType();
-        String heatEnvType = ArtifactTypeEnum.HEAT_ENV.getType();
-
-        for (ArtifactDefinition artifactDefinition : artifactDefinitionList) {
-            if (!isInCertificationRequest && componentType == ComponentTypeEnum.SERVICE
-                        && artifactDefinition.getArtifactType().equals(heatEnvType) ||
-                        //this is placeholder
-                        (artifactDefinition.getEsId() == null && artifactDefinition.getMandatory())){
-                continue;
-            }
-
-            byte[] payloadData = artifactDefinition.getPayloadData();
-            String artifactFileName = artifactDefinition.getArtifactName();
-
-            if (payloadData == null) {
-                Either<byte[], ActionStatus> fromCassandra = getFromCassandra(artifactDefinition.getEsId());
-
-                if (fromCassandra.isRight()) {
-                    log.debug("ArtifactName {}, unique ID {}", artifactDefinition.getArtifactName(), artifactDefinition.getUniqueId());
-                    log.debug("Failed to get {} payload from DB reason: {}", artifactFileName, fromCassandra.right().value());
-                    continue;
-                }
-                payloadData = fromCassandra.left().value();
-            }
-            zip.putNextEntry(new ZipEntry(artifactPathAndFolder + artifactFileName));
-            zip.write(payloadData);
-        }
-
-        return Either.left(zip);
-    }
-
-    /************************************ Artifacts Structure ******************************************************************/
-    /**
-     * The artifacts Definition saved by their structure
-     */
-    private class ArtifactsInfo {
-        //Key is the type of artifacts(Informational/Deployment)
-        //Value is a map between an artifact type and a list of all artifacts of this type
-        private Map<ArtifactGroupTypeEnum, Map<ArtifactTypeEnum, List<ArtifactDefinition>>> artifactsInfoField;
-
-        public ArtifactsInfo() {
-            this.artifactsInfoField = new EnumMap<>(ArtifactGroupTypeEnum.class);
-        }
-
-        public Map<ArtifactGroupTypeEnum, Map<ArtifactTypeEnum, List<ArtifactDefinition>>> getArtifactsInfo() {
-            return artifactsInfoField;
-        }
-
-        public List<ArtifactDefinition> getFlatArtifactsListByType(ArtifactTypeEnum artifactType){
-            List<ArtifactDefinition> artifacts = new ArrayList<>();
-            for (List<ArtifactDefinition> artifactsByType:artifactsInfoField.get(artifactType).values()){
-                artifacts.addAll(artifactsByType);
-            }
-            return artifacts;
-        }
-
-        public void addArtifactsToGroup(ArtifactGroupTypeEnum artifactGroup,Map<ArtifactTypeEnum, List<ArtifactDefinition>> artifactsDefinition){
-            artifactsInfoField.put(artifactGroup, artifactsDefinition);
-        }
-
-        public boolean isEmpty() {
-            return artifactsInfoField.isEmpty();
-        }
-
-    }
-
-    /**
-     * The artifacts of the component and of all its composed instances
-     *
-     */
-    private class ComponentTypeArtifacts {
-        private ArtifactsInfo componentArtifacts;    //component artifacts (describes the Informational Deployment folders)
-        private Map<String, ArtifactsInfo> componentInstancesArtifacts;        //artifacts of the composed instances mapped by the resourceInstance normalized name (describes the Resources folder)
-
-        public ComponentTypeArtifacts() {
-            componentArtifacts = new ArtifactsInfo();
-            componentInstancesArtifacts = new HashMap<>();
-        }
-
-        public ArtifactsInfo getComponentArtifacts() {
-            return componentArtifacts;
-        }
-        public void setComponentArtifacts(ArtifactsInfo artifactsInfo) {
-            this.componentArtifacts = artifactsInfo;
-        }
-        public Map<String, ArtifactsInfo> getComponentInstancesArtifacts() {
-            return componentInstancesArtifacts;
-        }
-        public void setComponentInstancesArtifacts(Map<String, ArtifactsInfo> componentInstancesArtifacts) {
-            this.componentInstancesArtifacts = componentInstancesArtifacts;
-        }
-
-        public void addComponentInstancesArtifacts(String normalizedName, ArtifactsInfo artifactsInfo) {
-            componentInstancesArtifacts.put(normalizedName, artifactsInfo);
-        }
-
-    }
-
-    private class ComponentArtifacts {
-        //artifacts of the component and CI's artifacts contained in it's composition (represents Informational, Deployment & Resource folders of main component)
-        private ComponentTypeArtifacts mainTypeAndCIArtifacts;
-        //artifacts of all component types mapped by their tosca name
-        private Map<String, ComponentTypeArtifacts> componentTypeArtifacts;
-
-        public ComponentArtifacts(){
-            mainTypeAndCIArtifacts = new ComponentTypeArtifacts();
-            componentTypeArtifacts = new HashMap<>();
-        }
-
-        public ComponentTypeArtifacts getMainTypeAndCIArtifacts() {
-            return mainTypeAndCIArtifacts;
-        }
-
-        public void setMainTypeAndCIArtifacts(ComponentTypeArtifacts componentInstanceArtifacts) {
-            this.mainTypeAndCIArtifacts = componentInstanceArtifacts;
-        }
-
-        public Map<String, ComponentTypeArtifacts> getComponentTypeArtifacts() {
-            return componentTypeArtifacts;
-        }
-
-        public void setComponentTypeArtifacts(Map<String, ComponentTypeArtifacts> componentTypeArtifacts) {
-            this.componentTypeArtifacts = componentTypeArtifacts;
-        }
-    }
-
-    private class CsarDefinition {
-        private ComponentArtifacts componentArtifacts;
-
-        // add list of tosca artifacts and meta describes CSAR zip root
-
-        public CsarDefinition(ComponentArtifacts componentArtifacts) {
-            this.componentArtifacts = componentArtifacts;
-        }
-
-        public ComponentArtifacts getComponentArtifacts() {
-            return componentArtifacts;
-        }
-    }
-
-    /************************************ Artifacts Structure END******************************************************************/
-
-    private Either<CsarDefinition,ResponseFormat> collectComponentCsarDefinition(Component component){
-        ComponentArtifacts componentArtifacts = new ComponentArtifacts();
-        Component updatedComponent = component;
-
-        //get service to receive the AII artifacts uploaded to the service
-        if (updatedComponent.getComponentType() == ComponentTypeEnum.SERVICE) {
-            Either<Service, StorageOperationStatus> getServiceResponse = toscaOperationFacade.getToscaElement(updatedComponent.getUniqueId());
-
-            if(getServiceResponse.isRight()){
-                ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getServiceResponse.right().value());
-                return Either.right(componentsUtils.getResponseFormat(actionStatus));
-            }
-
-            updatedComponent = getServiceResponse.left().value();
-        }
-
-        //find the artifacts of the main component, it would have its composed instances artifacts in a separate folder
-        ComponentTypeArtifacts componentInstanceArtifacts = new ComponentTypeArtifacts();
-        ArtifactsInfo artifactsInfo = collectComponentArtifacts(updatedComponent);
-        componentInstanceArtifacts.setComponentArtifacts(artifactsInfo);
-        componentArtifacts.setMainTypeAndCIArtifacts(componentInstanceArtifacts);
-
-        Map<String,ComponentTypeArtifacts> resourceTypeArtifacts = componentArtifacts.getComponentTypeArtifacts();    //artifacts mapped by the component type(tosca name+version)
-        //get the component instances
-        List<ComponentInstance> componentInstances = updatedComponent.getComponentInstances();
-        if (componentInstances!=null){
-            for (ComponentInstance componentInstance:componentInstances){
-                //call recursive to find artifacts for all the path
-                Either<Boolean, ResponseFormat> collectComponentInstanceArtifacts = collectComponentInstanceArtifacts(
-                        updatedComponent, componentInstance, resourceTypeArtifacts, componentInstanceArtifacts);
-                if (collectComponentInstanceArtifacts.isRight()){
-                    return Either.right(collectComponentInstanceArtifacts.right().value());
-                }
-            }
-        }
-
-        if(log.isDebugEnabled()){
-            printResult(componentArtifacts,updatedComponent.getName());
-        }
-
-        return Either.left(new CsarDefinition(componentArtifacts));
-    }
-
-    private void printResult(ComponentArtifacts componentArtifacts, String name) {
-        StringBuilder result = new StringBuilder();
-        result.append("Artifacts of main component " + name + "\n");
-        ComponentTypeArtifacts componentInstanceArtifacts = componentArtifacts.getMainTypeAndCIArtifacts();
-        printArtifacts(componentInstanceArtifacts);
-        result.append("Type Artifacts\n");
-        for (Map.Entry<String, ComponentTypeArtifacts> typeArtifacts:componentArtifacts.getComponentTypeArtifacts().entrySet()){
-            result.append("Folder " + typeArtifacts.getKey() + "\n");
-            result.append(printArtifacts(typeArtifacts.getValue()));
-        }
-
-        if(log.isDebugEnabled()){
-            log.debug(result.toString());
-        }
-    }
-
-    private String printArtifacts(ComponentTypeArtifacts componentInstanceArtifacts) {
-        StringBuilder result = new StringBuilder();
-        ArtifactsInfo artifactsInfo = componentInstanceArtifacts.getComponentArtifacts();
-        Map<ArtifactGroupTypeEnum, Map<ArtifactTypeEnum, List<ArtifactDefinition>>> componetArtifacts = artifactsInfo.getArtifactsInfo();
-        printArtifacts(componetArtifacts);
-        result = result.append("Resources\n");
-        for (Map.Entry<String, ArtifactsInfo> resourceInstance:componentInstanceArtifacts.getComponentInstancesArtifacts().entrySet()){
-            result.append("Folder" + resourceInstance.getKey() + "\n");
-            result.append(printArtifacts(resourceInstance.getValue().getArtifactsInfo()));
-        }
-
-        return result.toString();
-    }
-
-    private String  printArtifacts(Map<ArtifactGroupTypeEnum, Map<ArtifactTypeEnum, List<ArtifactDefinition>>> componetArtifacts) {
-        StringBuilder result = new StringBuilder();
-        for (Map.Entry<ArtifactGroupTypeEnum, Map<ArtifactTypeEnum, List<ArtifactDefinition>>> artifactGroup:componetArtifacts.entrySet()){
-            result.append("    " + artifactGroup.getKey().getType());
-            for (Map.Entry<ArtifactTypeEnum, List<ArtifactDefinition>> groupArtifacts:artifactGroup.getValue().entrySet()){
-                result.append("        " + groupArtifacts.getKey().getType());
-                for (ArtifactDefinition artifact:groupArtifacts.getValue()){
-                    result.append("            " + artifact.getArtifactDisplayName());
-                }
-            }
-        }
-
-        return result.toString();
-    }
-
-    private ComponentTypeArtifacts collectComponentTypeArtifacts(Map<String, ComponentTypeArtifacts> resourcesArtifacts, ComponentInstance componentInstance,
-            Resource fetchedComponent) {
-        String toscaComponentName = componentInstance.getToscaComponentName() + "_v" + componentInstance.getComponentVersion();
-
-        ComponentTypeArtifacts componentArtifactsInfo = resourcesArtifacts.get(toscaComponentName);
-        //if there are no artifacts for this component type we need to fetch and build them
-        if (componentArtifactsInfo==null){
-            ArtifactsInfo componentArtifacts = collectComponentArtifacts(fetchedComponent);
-            componentArtifactsInfo = new ComponentTypeArtifacts();
-            if (!componentArtifacts.isEmpty()){
-                componentArtifactsInfo.setComponentArtifacts(componentArtifacts);
-                resourcesArtifacts.put(toscaComponentName, componentArtifactsInfo);
-            }
-        }
-        return componentArtifactsInfo;
-    }
-
-    private Either<Boolean, ResponseFormat> collectComponentInstanceArtifacts(Component parentComponent,ComponentInstance componentInstance,
-            Map<String, ComponentTypeArtifacts> resourcesTypeArtifacts,ComponentTypeArtifacts instanceArtifactsLocation) {
-        //1. get the component instance component
-        String componentUid = componentInstance.getComponentUid();
-        Either<Resource, StorageOperationStatus> resource = toscaOperationFacade.getToscaElement(componentUid);
-        if (resource.isRight()) {
-            log.error("Failed to fetch resource with id {} for instance {}",componentUid, parentComponent.getUUID());
-            return Either.right(componentsUtils.getResponseFormat(ActionStatus.ASSET_NOT_FOUND_DURING_CSAR_CREATION,
-                    parentComponent.getComponentType().getValue(), parentComponent.getUUID(),
-                    componentInstance.getOriginType().getComponentType().getValue(), componentUid));
-        }
-        Resource fetchedComponent = resource.left().value();
-
-        //2. fill the artifacts for the current component parent type
-        ComponentTypeArtifacts componentParentArtifacts = collectComponentTypeArtifacts(resourcesTypeArtifacts, componentInstance, fetchedComponent);
-
-        //3. find the artifacts specific to the instance
-        Map<ArtifactTypeEnum, List<ArtifactDefinition>> componentInstanceSpecificInformationalArtifacts =
-                getComponentInstanceSpecificArtifacts(componentInstance.getArtifacts(),
-                        componentParentArtifacts.getComponentArtifacts().getArtifactsInfo(), ArtifactGroupTypeEnum.INFORMATIONAL);
-        Map<ArtifactTypeEnum, List<ArtifactDefinition>> componentInstanceSpecificDeploymentArtifacts =
-                getComponentInstanceSpecificArtifacts(componentInstance.getDeploymentArtifacts(),
-                        componentParentArtifacts.getComponentArtifacts().getArtifactsInfo(), ArtifactGroupTypeEnum.DEPLOYMENT);
-
-        //4. add the instances artifacts to the component type
-        ArtifactsInfo artifactsInfo = new ArtifactsInfo();
-        if (!componentInstanceSpecificInformationalArtifacts.isEmpty()){
-            artifactsInfo.addArtifactsToGroup(ArtifactGroupTypeEnum.INFORMATIONAL, componentInstanceSpecificInformationalArtifacts);
-        }
-        if (!componentInstanceSpecificDeploymentArtifacts.isEmpty()){
-            artifactsInfo.addArtifactsToGroup(ArtifactGroupTypeEnum.DEPLOYMENT, componentInstanceSpecificDeploymentArtifacts);
-        }
-        if (!artifactsInfo.isEmpty()){
-            instanceArtifactsLocation.addComponentInstancesArtifacts(componentInstance.getNormalizedName(), artifactsInfo);
-        }
-
-        //5. do the same for all the component instances
-        List<ComponentInstance> componentInstances = fetchedComponent.getComponentInstances();
-        if (componentInstances!=null){
-            for (ComponentInstance childComponentInstance:componentInstances){
-                Either<Boolean, ResponseFormat> collectComponentInstanceArtifacts = collectComponentInstanceArtifacts(
-                        fetchedComponent, childComponentInstance, resourcesTypeArtifacts, componentParentArtifacts);
-                if (collectComponentInstanceArtifacts.isRight()){
-                    return collectComponentInstanceArtifacts;
-                }
-            }
-        }
-
-        return Either.left(true);
-    }
-
-    private Map<ArtifactTypeEnum, List<ArtifactDefinition>> getComponentInstanceSpecificArtifacts(Map<String, ArtifactDefinition> componentArtifacts,
-            Map<ArtifactGroupTypeEnum, Map<ArtifactTypeEnum, List<ArtifactDefinition>>> componentTypeArtifacts, ArtifactGroupTypeEnum artifactGroupTypeEnum) {
-        Map<ArtifactTypeEnum, List<ArtifactDefinition>> parentArtifacts = componentTypeArtifacts.get(artifactGroupTypeEnum);    //the artfiacts of the component itself and not the instance
-
-        Map<ArtifactTypeEnum, List<ArtifactDefinition>> artifactsByTypeOfComponentInstance = new EnumMap<>(ArtifactTypeEnum.class);
-        if (componentArtifacts!=null){
-            for (ArtifactDefinition artifact:componentArtifacts.values()){
-                ArtifactTypeEnum artifactType = ArtifactTypeEnum.findType(artifact.getArtifactType());
-                List<ArtifactDefinition> parentArtifactsByType = null;
-                if (parentArtifacts!=null){
-                    parentArtifactsByType = parentArtifacts.get(artifactType);
-                }
-                //the artifact is of instance
-                if (parentArtifactsByType == null || !parentArtifactsByType.contains(artifact)){
-                    List<ArtifactDefinition> typeArtifacts = artifactsByTypeOfComponentInstance.get(artifactType);
-                    if (typeArtifacts == null){
-                        typeArtifacts = new ArrayList<>();
-                        artifactsByTypeOfComponentInstance.put(artifactType, typeArtifacts);
-                    }
-                    typeArtifacts.add(artifact);
-                }
-            }
-        }
-
-        return artifactsByTypeOfComponentInstance;
-    }
-
-    private ArtifactsInfo collectComponentArtifacts(Component component) {
-        Map<String, ArtifactDefinition> informationalArtifacts = component.getArtifacts();
-        Map<ArtifactTypeEnum, List<ArtifactDefinition>> informationalArtifactsByType = collectGroupArtifacts(informationalArtifacts);
-        Map<String, ArtifactDefinition> deploymentArtifacts = component.getDeploymentArtifacts();
-        Map<ArtifactTypeEnum, List<ArtifactDefinition>> deploymentArtifactsByType = collectGroupArtifacts(deploymentArtifacts);
-        ArtifactsInfo artifactsInfo = new ArtifactsInfo();
-        if (!informationalArtifactsByType.isEmpty()){
-            artifactsInfo.addArtifactsToGroup(ArtifactGroupTypeEnum.INFORMATIONAL, informationalArtifactsByType);
-        }
-        if (!deploymentArtifactsByType.isEmpty() ){
-            artifactsInfo.addArtifactsToGroup(ArtifactGroupTypeEnum.DEPLOYMENT, deploymentArtifactsByType);
-        }
-
-        return artifactsInfo;
-    }
-
-    private Map<ArtifactTypeEnum, List<ArtifactDefinition>> collectGroupArtifacts(Map<String, ArtifactDefinition> componentArtifacts) {
-        Map<ArtifactTypeEnum, List<ArtifactDefinition>> artifactsByType = new EnumMap<>(ArtifactTypeEnum.class);
-        for (ArtifactDefinition artifact:componentArtifacts.values()){
-            if (artifact.getArtifactUUID()!=null){
-                ArtifactTypeEnum artifactType = ArtifactTypeEnum.findType(artifact.getArtifactType());
-                List<ArtifactDefinition> typeArtifacts = artifactsByType.get(artifactType);
-                if (typeArtifacts==null){
-                    typeArtifacts = new ArrayList<>();
-                    artifactsByType.put(artifactType, typeArtifacts);
-                }
-                typeArtifacts.add(artifact);
-            }
-        }
-        return artifactsByType;
-    }
+	private static final Logger log = LoggerFactory.getLogger(CsarUtils.class);
+
+	@Autowired
+	private SdcSchemaFilesCassandraDao sdcSchemaFilesCassandraDao;
+	@Autowired
+	private ArtifactCassandraDao artifactCassandraDao;
+	@Autowired
+	private ComponentsUtils componentsUtils;
+	@Autowired
+	private ToscaExportHandler toscaExportUtils;
+	@Autowired
+	private ArtifactsBusinessLogic artifactsBusinessLogic;
+	@Autowired
+	protected ToscaOperationFacade toscaOperationFacade;
+
+	@javax.annotation.Resource
+	private ServiceBusinessLogic serviceBusinessLogic;
+
+	private Gson gson = new Gson();
+
+	private String CONFORMANCE_LEVEL;
+	private String SDC_VERSION;
+
+	public static final Pattern UUID_NORMATIVE_NEW_VERSION = Pattern.compile("^\\d{1,}.0");
+	public static final String ARTIFACTS_PATH = "Artifacts/";
+	public static final String RESOURCES_PATH = "Resources/";
+	public static final String INFORMATIONAL_ARTIFACTS = "Informational/";
+	public static final String DEPLOYMENT_ARTIFACTS = "Deployment/";
+	public static final String WORKFLOW_ARTIFACT_DIR = "Workflows" + File.separator + "BPMN" + File.separator;
+	public static final String DEPLOYMENT_ARTIFACTS_DIR = "Deployment" + File.separator;
+
+	public static final String DEFINITIONS_PATH = "Definitions/";
+	private static final String CSAR_META_VERSION = "1.0";
+	private static final String CSAR_META_PATH_FILE_NAME = "csar.meta";
+	private static final String TOSCA_META_PATH_FILE_NAME = "TOSCA-Metadata/TOSCA.meta";
+	private static final String TOSCA_META_VERSION = "1.0";
+	private static final String CSAR_VERSION = "1.1";
+	public static final String ARTIFACTS = "Artifacts";
+	public static final String DEFINITION = "Definitions";
+	public static final String DEL_PATTERN = "([/\\\\]+)";
+	private static String versionFirstThreeOctates;
+
+	public static final String VFC_NODE_TYPE_ARTIFACTS_PATH_PATTERN = ARTIFACTS + DEL_PATTERN
+			+ ImportUtils.Constants.USER_DEFINED_RESOURCE_NAMESPACE_PREFIX + "([\\d\\w\\_\\-\\.\\s]+)" + DEL_PATTERN
+			+ "([\\d\\w\\_\\-\\.\\s]+)" + DEL_PATTERN + "([\\d\\w\\_\\-\\.\\s]+)" + DEL_PATTERN
+			+ "([\\d\\w\\_\\-\\.\\s]+)";
+
+	public static final String VF_NODE_TYPE_ARTIFACTS_PATH_PATTERN = ARTIFACTS + DEL_PATTERN +
+	// Artifact Group (i.e Deployment/Informational)
+			"([\\w\\_\\-\\.\\s]+)" + DEL_PATTERN +
+			// Artifact Type
+			"([\\w\\_\\-\\.\\s]+)" + DEL_PATTERN +
+			// Artifact Any File Name
+			".+";
+	public static final String VALID_ENGLISH_ARTIFACT_NAME = "([\\w\\_\\-\\.\\s]+)";
+	public static final String SERVICE_TEMPLATE_PATH_PATTERN = DEFINITION + DEL_PATTERN +
+	// Service Template File Name
+			"([\\w\\_\\-\\.\\s]+)";
+
+	public static final String ARTIFACT_CREATED_FROM_CSAR = "Artifact created from csar";
+
+	public CsarUtils() {
+		this.CONFORMANCE_LEVEL = ConfigurationManager.getConfigurationManager().getConfiguration()
+				.getToscaConformanceLevel();
+		this.SDC_VERSION = ExternalConfiguration.getAppVersion();
+		if (SDC_VERSION != null && !SDC_VERSION.isEmpty()) {
+			Matcher matcher = Pattern.compile("(?!\\.)(\\d+(\\.\\d+)+)(?![\\d\\.])").matcher(SDC_VERSION);
+			matcher.find();
+			versionFirstThreeOctates = matcher.group(0);
+		} else {
+			versionFirstThreeOctates = "";
+		}
+	}
+
+	/**
+	 *
+	 * @param component
+	 * @param getFromCS
+	 * @param isInCertificationRequest
+	 * @return
+	 */
+	public Either<byte[], ResponseFormat> createCsar(Component component, boolean getFromCS,
+			boolean isInCertificationRequest) {
+		return createCsar(component, getFromCS, isInCertificationRequest, false);
+	}
+
+	private Either<byte[], ResponseFormat> createCsar(Component component, boolean getFromCS,
+			boolean isInCertificationRequest, boolean mockGenerator) {
+		final String createdBy = component.getCreatorFullName();
+
+		String fileName;
+		Map<String, ArtifactDefinition> toscaArtifacts = component.getToscaArtifacts();
+		ArtifactDefinition artifactDefinition = toscaArtifacts.get(ToscaExportHandler.ASSET_TOSCA_TEMPLATE);
+		fileName = artifactDefinition.getArtifactName();
+
+		String toscaConformanceLevel = ConfigurationManager.getConfigurationManager().getConfiguration()
+				.getToscaConformanceLevel();
+		String csarBlock0 = createCsarBlock0(CSAR_META_VERSION, toscaConformanceLevel);
+		byte[] csarBlock0Byte = csarBlock0.getBytes();
+
+		final String toscaBlock0 = createToscaBlock0(TOSCA_META_VERSION, CSAR_VERSION, createdBy, fileName);
+		byte[] toscaBlock0Byte = toscaBlock0.getBytes();
+
+		Either<byte[], ResponseFormat> generateCsarZipResponse = generateCsarZip(csarBlock0Byte, toscaBlock0Byte,
+				component, getFromCS, isInCertificationRequest, mockGenerator);
+
+		if (generateCsarZipResponse.isRight()) {
+			return Either.right(generateCsarZipResponse.right().value());
+		}
+
+		return Either.left(generateCsarZipResponse.left().value());
+	}
+
+	private Either<byte[], ResponseFormat> generateCsarZip(byte[] csarBlock0Byte, byte[] toscaBlock0Byte,
+			Component component, boolean getFromCS, boolean isInCertificationRequest, boolean mockGenerator) {
+		try (ByteArrayOutputStream out = new ByteArrayOutputStream(); ZipOutputStream zip = new ZipOutputStream(out);) {
+			zip.putNextEntry(new ZipEntry(CSAR_META_PATH_FILE_NAME));
+			zip.write(csarBlock0Byte);
+			zip.putNextEntry(new ZipEntry(TOSCA_META_PATH_FILE_NAME));
+			zip.write(toscaBlock0Byte);
+			Either<ZipOutputStream, ResponseFormat> populateZip = populateZip(component, getFromCS, zip,
+					isInCertificationRequest, mockGenerator);
+			if (populateZip.isRight()) {
+				log.debug("Failed to populate CSAR zip file {}", populateZip.right().value());
+				return Either.right(populateZip.right().value());
+			}
+
+			zip.finish();
+			byte[] byteArray = out.toByteArray();
+
+			return Either.left(byteArray);
+		} catch (IOException | NullPointerException e) {
+			log.debug("Failed with IOexception to create CSAR zip for component {}", component.getUniqueId(), e);
+
+			ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR);
+			return Either.right(responseFormat);
+		}
+	}
+
+	private Either<ZipOutputStream, ResponseFormat> populateZip(Component component, boolean getFromCS,
+			ZipOutputStream zip, boolean isInCertificationRequest, boolean mockGenerator) throws IOException {
+
+		LifecycleStateEnum lifecycleState = component.getLifecycleState();
+		String componentYaml;
+		Either<ToscaRepresentation, ToscaError> exportComponent;
+		byte[] mainYaml;
+		// <file name, cassandraId, component>
+		List<Triple<String, String, Component>> dependencies = null;
+		List<ImmutablePair<Component, byte[]>> generatorInputs = new LinkedList<>();
+
+		Map<String, ArtifactDefinition> toscaArtifacts = component.getToscaArtifacts();
+		ArtifactDefinition artifactDefinition = toscaArtifacts.get(ToscaExportHandler.ASSET_TOSCA_TEMPLATE);
+		String fileName = artifactDefinition.getArtifactName();
+
+		if (getFromCS || !(lifecycleState == LifecycleStateEnum.NOT_CERTIFIED_CHECKIN
+				|| lifecycleState == LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT)) {
+			String cassandraId = artifactDefinition.getEsId();
+			Either<byte[], ActionStatus> fromCassandra = getFromCassandra(cassandraId);
+			if (fromCassandra.isRight()) {
+				log.debug("ArtifactName {}, unique ID {}", artifactDefinition.getArtifactName(),
+						artifactDefinition.getUniqueId());
+				ResponseFormat responseFormat = componentsUtils.getResponseFormat(fromCassandra.right().value());
+				return Either.right(responseFormat);
+			}
+			mainYaml = fromCassandra.left().value();
+
+		} else {
+			exportComponent = toscaExportUtils.exportComponent(component);
+			if (exportComponent.isRight()) {
+				log.debug("exportComponent failed", exportComponent.right().value());
+				ActionStatus convertedFromToscaError = componentsUtils
+						.convertFromToscaError(exportComponent.right().value());
+				ResponseFormat responseFormat = componentsUtils.getResponseFormat(convertedFromToscaError);
+				return Either.right(responseFormat);
+			}
+			ToscaRepresentation exportResult = exportComponent.left().value();
+			componentYaml = exportResult.getMainYaml();
+			mainYaml = componentYaml.getBytes();
+			dependencies = exportResult.getDependencies();
+		}
+
+		zip.putNextEntry(new ZipEntry(DEFINITIONS_PATH + fileName));
+		zip.write(mainYaml);
+		// US798487 - Abstraction of complex types
+		if (!ModelConverter.isAtomicComponent(component)) {
+			log.debug("Component {} is complex - generating abstract type for it..", component.getName());
+			writeComponentInterface(component, zip, fileName);
+		}
+
+		generatorInputs.add(new ImmutablePair<Component, byte[]>(component, mainYaml));
+
+		if (dependencies == null) {
+			Either<ToscaTemplate, ToscaError> dependenciesRes = toscaExportUtils.getDependencies(component);
+			if (dependenciesRes.isRight()) {
+				log.debug("Failed to retrieve dependencies for component {}, error {}", component.getUniqueId(),
+						dependenciesRes.right().value());
+				ActionStatus convertFromToscaError = componentsUtils
+						.convertFromToscaError(dependenciesRes.right().value());
+				ResponseFormat responseFormat = componentsUtils.getResponseFormat(convertFromToscaError);
+				return Either.right(responseFormat);
+			}
+			dependencies = dependenciesRes.left().value().getDependencies();
+		}
+
+		// UID <cassandraId,filename,component>
+		Map<String, ImmutableTriple<String, String, Component>> innerComponentsCache = new HashMap<>();
+
+		if (dependencies != null && !dependencies.isEmpty()) {
+			for (Triple<String, String, Component> d : dependencies) {
+				String cassandraId = d.getMiddle();
+				Component childComponent = d.getRight();
+				Either<byte[], ActionStatus> entryData = getEntryData(cassandraId, childComponent);
+
+				if (entryData.isRight()) {
+					ResponseFormat responseFormat = componentsUtils.getResponseFormat(entryData.right().value());
+					return Either.right(responseFormat);
+				}
+
+				// fill innerComponentsCache
+				fileName = d.getLeft();
+				addComponentToCache(innerComponentsCache, cassandraId, fileName, childComponent);
+				addInnerComponentsToCache(innerComponentsCache, childComponent);
+
+				byte[] content = entryData.left().value();
+				generatorInputs.add(new ImmutablePair<Component, byte[]>(childComponent, content));
+			}
+
+			// add inner components to CSAR
+			for (Entry<String, ImmutableTriple<String, String, Component>> innerComponentTripleEntry : innerComponentsCache
+					.entrySet()) {
+
+				ImmutableTriple<String, String, Component> innerComponentTriple = innerComponentTripleEntry.getValue();
+
+				Component innerComponent = innerComponentTriple.getRight();
+				String icFileName = innerComponentTriple.getMiddle();
+
+				// add component to zip
+				Either<byte[], ActionStatus> entryData = getEntryData(innerComponentTriple.getLeft(), innerComponent);
+				if (entryData.isRight()) {
+					ResponseFormat responseFormat = componentsUtils.getResponseFormat(entryData.right().value());
+					log.debug("Failed adding to zip component {}, error {}", innerComponentTriple.getLeft(),
+							entryData.right().value());
+					return Either.right(responseFormat);
+				}
+				byte[] content = entryData.left().value();
+				zip.putNextEntry(new ZipEntry(DEFINITIONS_PATH + icFileName));
+				zip.write(content);
+
+				// add component interface to zip
+				if (!ModelConverter.isAtomicComponent(innerComponent)) {
+					writeComponentInterface(innerComponent, zip, icFileName);
+				}
+			}
+		}
+
+		// retrieve SDC.zip from Cassandra
+		Either<byte[], ResponseFormat> latestSchemaFilesFromCassandra = getLatestSchemaFilesFromCassandra();
+
+		if (latestSchemaFilesFromCassandra.isRight()) {
+			log.error("Error retrieving SDC Schema files from cassandra");
+			return Either.right(latestSchemaFilesFromCassandra.right().value());
+		}
+
+		// add files from retireved SDC.zip to Definitions folder in CSAR
+		Either<ZipOutputStream, ResponseFormat> addSchemaFilesFromCassandra = addSchemaFilesFromCassandra(zip,
+				latestSchemaFilesFromCassandra.left().value());
+
+		if (addSchemaFilesFromCassandra.isRight()) {
+			return addSchemaFilesFromCassandra;
+		}
+
+		// Artifact Generation
+		if (component.getComponentType() == ComponentTypeEnum.SERVICE && isInCertificationRequest) {
+
+			List<ArtifactDefinition> aiiArtifactList;
+
+			Either<List<ArtifactDefinition>, ResponseFormat> handleAAIArtifacts = handleAAIArtifacts(component,
+					mockGenerator, generatorInputs);
+
+			if (handleAAIArtifacts.isLeft()) {
+				aiiArtifactList = handleAAIArtifacts.left().value();
+			} else {
+				log.debug("AAI Artifacts handling failed");
+				return Either.right(handleAAIArtifacts.right().value());
+			}
+
+			if (isInCertificationRequest) {
+				Either<ActionStatus, ResponseFormat> handleAllAAIArtifactsInDataModel = handleAllAAIArtifactsInDataModel(
+						component, aiiArtifactList, false, true);
+
+				if (handleAllAAIArtifactsInDataModel.isRight()) {
+					log.debug("AAI Artifacts handling (create, update, delete) failed");
+					return Either.right(handleAllAAIArtifactsInDataModel.right().value());
+				}
+			}
+
+		}
+
+		Either<CsarDefinition, ResponseFormat> collectedComponentCsarDefinition = collectComponentCsarDefinition(
+				component);
+
+		if (collectedComponentCsarDefinition.isRight()) {
+			return Either.right(collectedComponentCsarDefinition.right().value());
+		}
+
+		return writeAllFilesToCsar(component, collectedComponentCsarDefinition.left().value(), zip,
+				isInCertificationRequest);
+	}
+
+	private Either<ZipOutputStream, ResponseFormat> addSchemaFilesFromCassandra(ZipOutputStream zip,
+			byte[] schemaFileZip) {
+
+		final int initSize = 2048;
+
+		log.debug("Starting copy from Schema file zip to CSAR zip");
+
+		try (ZipInputStream zipStream = new ZipInputStream(new ByteArrayInputStream(schemaFileZip));
+				ByteArrayOutputStream out = new ByteArrayOutputStream();
+				BufferedOutputStream bos = new BufferedOutputStream(out, initSize);) {
+
+			ZipEntry entry = null;
+
+			while ((entry = zipStream.getNextEntry()) != null) {
+
+				String entryName = entry.getName();
+				int readSize = initSize;
+				byte[] entryData = new byte[initSize];
+
+				while ((readSize = zipStream.read(entryData, 0, readSize)) != -1) {
+					bos.write(entryData, 0, readSize);
+				}
+
+				bos.flush();
+				out.flush();
+				zip.putNextEntry(new ZipEntry(DEFINITIONS_PATH + entryName));
+				zip.write(out.toByteArray());
+				zip.flush();
+				out.reset();
+			}
+		} catch (IOException | NullPointerException e) {
+			log.error("Error while writing the SDC schema file to the CSAR {}", e);
+			return Either.right(componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR));
+		}
+
+		log.debug("Finished coppy from Schema file zip to CSAR zip");
+
+		return Either.left(zip);
+	}
+
+	private void addInnerComponentsToCache(Map<String, ImmutableTriple<String, String, Component>> componentCache,
+			Component childComponent) {
+
+		List<ComponentInstance> instances = childComponent.getComponentInstances();
+
+		if (instances != null) {
+			instances.forEach(ci -> {
+				ImmutableTriple<String, String, Component> componentRecord = componentCache.get(ci.getComponentUid());
+				if (componentRecord == null) {
+					// all resource must be only once!
+					Either<Resource, StorageOperationStatus> resource = toscaOperationFacade
+							.getToscaElement(ci.getComponentUid());
+					if (resource == null || resource.isRight()) {
+						log.debug("Failed to fetch resource with id {} for instance {}");
+					} else {
+						Component componentRI = resource.left().value();
+
+						Map<String, ArtifactDefinition> childToscaArtifacts = componentRI.getToscaArtifacts();
+						ArtifactDefinition childArtifactDefinition = childToscaArtifacts
+								.get(ToscaExportHandler.ASSET_TOSCA_TEMPLATE);
+						if (childArtifactDefinition != null) {
+							// add to cache
+							addComponentToCache(componentCache, childArtifactDefinition.getEsId(),
+									childArtifactDefinition.getArtifactName(), componentRI);
+						}
+
+						// if not atomic - insert inner components as well
+						if (!ModelConverter.isAtomicComponent(componentRI)) {
+							addInnerComponentsToCache(componentCache, componentRI);
+						}
+					}
+				}
+			});
+		}
+	}
+
+	private void addComponentToCache(Map<String, ImmutableTriple<String, String, Component>> componentCache, String id,
+			String fileName, Component component) {
+
+		ImmutableTriple<String, String, Component> cachedComponent = componentCache.get(component.getInvariantUUID());
+		if (cachedComponent == null || CommonBeUtils.compareAsdcComponentVersions(component.getVersion(),
+				cachedComponent.getRight().getVersion())) {
+			componentCache.put(component.getInvariantUUID(),
+					new ImmutableTriple<String, String, Component>(id, fileName, component));
+
+			if (cachedComponent != null) {
+				// overwriting component with newer version
+				log.warn("Overwriting component invariantID {} of version {} with a newer version {}", id,
+						cachedComponent.getRight().getVersion(), component.getVersion());
+			}
+		}
+	}
+
+	private Either<ZipOutputStream, ResponseFormat> writeComponentInterface(Component component, ZipOutputStream zip,
+			String fileName) {
+		try {
+			Either<ToscaRepresentation, ToscaError> componentInterface = toscaExportUtils
+					.exportComponentInterface(component);
+			ToscaRepresentation componentInterfaceYaml = componentInterface.left().value();
+			String mainYaml = componentInterfaceYaml.getMainYaml();
+			String interfaceFileName = DEFINITIONS_PATH + ToscaExportHandler.getInterfaceFilename(fileName);
+
+			zip.putNextEntry(new ZipEntry(interfaceFileName));
+			zip.write(mainYaml.getBytes());
+
+		} catch (Exception e) {
+			log.error("#writeComponentInterface - zip writing failed with error: ", e);
+			return Either.right(componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR));
+		}
+
+		return Either.left(zip);
+	}
+
+	private Either<List<ArtifactDefinition>, ResponseFormat> handleAAIArtifacts(Component component,
+			boolean mockGenerator, List<ImmutablePair<Component, byte[]>> generatorInputs) {
+
+		ComponentTypeEnum componentType = component.getComponentType();
+		List<Artifact> generatedArtifacts;
+		List<ArtifactDefinition> aaiArtifacts = new LinkedList<>();
+
+		if (componentType == ComponentTypeEnum.SERVICE && !generatorInputs.isEmpty()) {
+			List<Artifact> convertedGeneratorInputs = convertToGeneratorArtifactsInput(generatorInputs);
+
+			Either<List<Artifact>, String> generatorResponse;
+
+			if (mockGenerator) {
+				generatorResponse = artifactGenerator(convertedGeneratorInputs, ArtifactType.OTHER, component);
+			} else {
+				generatorResponse = artifactGenerator(convertedGeneratorInputs, ArtifactType.AAI, component);
+			}
+
+			if (generatorResponse.isRight()) {
+				ResponseFormat responseFormat = componentsUtils.getResponseFormat(
+						ActionStatus.AAI_ARTIFACT_GENERATION_FAILED, component.getComponentType().getValue(),
+						component.getName(), generatorResponse.right().value());
+				return Either.right(responseFormat);
+			}
+
+			generatedArtifacts = generatorResponse.left().value();
+
+			aaiArtifacts = convertToArtifactDefinitionFromArtifactGeneratedData(generatedArtifacts);
+
+		}
+
+		return Either.left(aaiArtifacts);
+	}
+
+	private Either<ActionStatus, ResponseFormat> handleAllAAIArtifactsInDataModel(Component component,
+			List<ArtifactDefinition> artifactsFromAAI, boolean shouldLock, boolean inTransaction) {
+
+		Either<ActionStatus, ResponseFormat> handleAAIArtifactsResponse;
+		User lastComponentUpdater;
+
+		List<ArtifactDefinition> aaiArtifatcsToCreate = getAAIArtifatcsForCreate(artifactsFromAAI, component);
+		List<ArtifactDefinition> aaiArtifatcsToDelete = getAAIArtifatcsForDelete(artifactsFromAAI, component);
+		List<ArtifactDefinition> aaiArtifatcsToUpdate = getAAIArtifatcsForUpdate(artifactsFromAAI, component);
+
+		String lastUpdaterUserId = component.getLastUpdaterUserId();
+		Either<User, ResponseFormat> validateUserExists = artifactsBusinessLogic.validateUserExists(lastUpdaterUserId,
+				"CSAR creation util", true);
+
+		if (validateUserExists.isRight()) {
+			ResponseFormat responseFormat = componentsUtils.getResponseFormat(
+					ActionStatus.AAI_ARTIFACT_GENERATION_FAILED, component.getComponentType().getValue(),
+					component.getName(), "User not found");
+			return Either.right(responseFormat);
+		}
+
+		lastComponentUpdater = validateUserExists.left().value();
+
+		handleAAIArtifactsResponse = handleAAIArtifactsInDataModelByOperationType(component, aaiArtifatcsToDelete,
+				artifactsBusinessLogic.new ArtifactOperationInfo(false, false, ArtifactOperationEnum.DELETE),
+				lastComponentUpdater, shouldLock, inTransaction);
+
+		if (handleAAIArtifactsResponse.isRight()) {
+			return handleAAIArtifactsResponse;
+		}
+
+		handleAAIArtifactsResponse = handleAAIArtifactsInDataModelByOperationType(component, aaiArtifatcsToCreate,
+				artifactsBusinessLogic.new ArtifactOperationInfo(false, false, ArtifactOperationEnum.CREATE),
+				lastComponentUpdater, shouldLock, inTransaction);
+
+		if (handleAAIArtifactsResponse.isRight()) {
+			return handleAAIArtifactsResponse;
+		}
+
+		return handleAAIArtifactsInDataModelByOperationType(component, aaiArtifatcsToUpdate,
+				artifactsBusinessLogic.new ArtifactOperationInfo(false, false, ArtifactOperationEnum.UPDATE),
+				lastComponentUpdater, shouldLock, inTransaction);
+	}
+
+	private List<ArtifactDefinition> getAAIArtifatcsForUpdate(List<ArtifactDefinition> artifactsFromAAI,
+			Component component) {
+
+		Set<String> componetDeploymentArtifactLables = component.getDeploymentArtifacts().keySet();
+		Set<String> componetInformationalArtifactLables = component.getArtifacts().keySet();
+
+		return artifactsFromAAI.stream()
+				.filter(e -> componetDeploymentArtifactLables.contains(e.getArtifactLabel())
+						|| componetInformationalArtifactLables.contains(e.getArtifactLabel()))
+				.filter(e -> checkAaiForUpdate(component, e)).collect(Collectors.toList());
+	}
+
+	private boolean checkAaiForUpdate(Component component, ArtifactDefinition artifactDefinition) {
+		ArtifactDefinition artifactDefinitionComp = component.getDeploymentArtifacts()
+				.get(artifactDefinition.getArtifactLabel());
+
+		if (artifactDefinitionComp == null) {
+			log.warn("Failed to get {} artifact", artifactDefinition.getArtifactLabel());
+			return false;
+		}
+
+		// Old Artifacts before the generated flag introduction if contains "aai" ignore
+		// case prefix updated
+		if (artifactDefinitionComp.getGenerated() == null) {
+			if (artifactDefinitionComp.getArtifactLabel().toLowerCase().startsWith("aai")) {
+				return true;
+			} else {
+				log.warn("The artifact {} flag is null but AAI prefix is abssent Not updated",
+						artifactDefinition.getArtifactLabel());
+			}
+		} else {
+			if (artifactDefinition.getGenerated()) {
+				return true;
+			} else {
+				log.warn("Generated artifact {} was already uploaded manually", artifactDefinition.getArtifactLabel());
+			}
+		}
+		return false;
+	}
+
+	private List<ArtifactDefinition> getAAIArtifatcsForDelete(List<ArtifactDefinition> artifactsFromAAI,
+			Component component) {
+
+		Set<String> aaiLabels = artifactsFromAAI.stream().map(ArtifactDefinition::getArtifactLabel)
+				.collect(Collectors.toSet());
+
+		List<ArtifactDefinition> artifactsForDeleteDeployment = component.getDeploymentArtifacts().values().stream()
+				// Filter Out Artifacts that are not contained in artifacts returned
+				// from AAI API
+				.filter(e -> !aaiLabels.contains(e.getArtifactLabel())).collect(Collectors.toList());
+
+		List<ArtifactDefinition> artifactsForDeleteInformational = component.getArtifacts().values().stream()
+				// Filter Out Artifacts that are not contained in artifacts returned
+				// from AAI API
+				.filter(e -> !aaiLabels.contains(e.getArtifactLabel())).collect(Collectors.toList());
+
+		artifactsForDeleteDeployment.addAll(artifactsForDeleteInformational);
+
+		return artifactsForDeleteDeployment.stream()
+				.filter(e -> (e.getGenerated() != null && e.getGenerated().equals(Boolean.TRUE))
+						|| (e.getGenerated() == null && e.getArtifactLabel().toLowerCase().startsWith("aai")))
+				.collect(Collectors.toList());
+	}
+
+	private List<ArtifactDefinition> getAAIArtifatcsForCreate(List<ArtifactDefinition> artifactsFromAAI,
+			Component component) {
+
+		Set<String> componentDeploymentLabels = component.getDeploymentArtifacts().keySet();
+		Set<String> componentInfoLabels = component.getArtifacts().keySet();
+
+		// If the artifact label does not exist in the service -
+		// store the artifact (generate uuid and version, "generated" flag is TRUE)
+		return artifactsFromAAI.stream().filter(e -> !componentDeploymentLabels.contains(e.getArtifactLabel())
+				&& !componentInfoLabels.contains(e.getArtifactLabel())).collect(Collectors.toList());
+	}
+
+	private Either<ActionStatus, ResponseFormat> handleAAIArtifactsInDataModelByOperationType(Component component,
+			List<ArtifactDefinition> generatedArtifactsDefinitions, ArtifactOperationInfo operationType, User user,
+			boolean shouldLock, boolean inTransaction) {
+
+		String componentUniqueId = component.getUniqueId();
+		ComponentTypeEnum componentType = component.getComponentType();
+		Either<ActionStatus, ResponseFormat> result = Either.left(ActionStatus.OK);
+
+		for (ArtifactDefinition artDef : generatedArtifactsDefinitions) {
+			String data = gson.toJson(artDef);
+			String dataMD5 = GeneralUtility.calculateMD5Base64EncodedByString(data);
+			String artifactUniqueId = null;
+
+			if ((operationType.getArtifactOperationEnum() == ArtifactOperationEnum.UPDATE)
+					|| (operationType.getArtifactOperationEnum() == ArtifactOperationEnum.DELETE)) {
+				String artifactLabel = artDef.getArtifactLabel();
+				ArtifactDefinition artifactDefinition = component.getDeploymentArtifacts().get(artifactLabel);
+				if (artifactDefinition != null) {
+					artifactUniqueId = artifactDefinition.getUniqueId();
+				}
+			}
+
+			Either<Either<ArtifactDefinition, Operation>, ResponseFormat> validateAndHandleArtifact = artifactsBusinessLogic
+					.validateAndHandleArtifact(componentUniqueId, componentType, operationType, artifactUniqueId,
+							artDef, dataMD5, data, null, null, user, component, shouldLock, inTransaction, false);
+
+			if (validateAndHandleArtifact.isRight()) {
+				if (ArtifactOperationEnum.isCreateOrLink(operationType.getArtifactOperationEnum())
+						|| ArtifactOperationEnum.UPDATE == operationType.getArtifactOperationEnum()) {
+					ResponseFormat responseFormat = componentsUtils.getResponseFormat(
+							ActionStatus.AAI_ARTIFACT_GENERATION_FAILED, componentType.getValue(), component.getName(),
+							validateAndHandleArtifact.right().value().toString());
+
+					result = Either.right(responseFormat);
+				} else {
+					log.warn("Generated artifact {} could not be deleted", artDef.getArtifactLabel());
+				}
+			}
+		}
+
+		return result;
+	}
+
+	private List<ArtifactDefinition> convertToArtifactDefinitionFromArtifactGeneratedData(
+			List<Artifact> generatorOutput) {
+		List<ArtifactDefinition> artifactDefList = new LinkedList<>();
+
+		for (Artifact artifact : generatorOutput) {
+			ArtifactDefinition newEntry = new ArtifactDefinition();
+			newEntry.setArtifactName(artifact.getName());
+			newEntry.setArtifactType(artifact.getType());
+			newEntry.setArtifactGroupType(ArtifactGroupTypeEnum.findType(artifact.getGroupType()));
+			newEntry.setDescription(artifact.getDescription());
+
+			// Normalizing the artifact label to match those stored in DB
+			String normalizeArtifactLabel = ValidationUtils.normalizeArtifactLabel(artifact.getLabel());
+			newEntry.setArtifactLabel(normalizeArtifactLabel);
+			newEntry.setPayload(Base64.decodeBase64(artifact.getPayload()));
+			newEntry.setArtifactChecksum(artifact.getChecksum());
+			// Flag that set to true in case that the artifact is generated by AI&I
+			// generator
+			newEntry.setGenerated(Boolean.TRUE);
+
+			artifactDefList.add(newEntry);
+		}
+
+		return artifactDefList;
+	}
+
+	// List<ImmutablePair<Component, byte[] artifactBytes>>
+	// artifact stored by label
+	private List<Artifact> convertToGeneratorArtifactsInput(List<ImmutablePair<Component, byte[]>> inputs) {
+		List<Artifact> listOfArtifactsInput = new LinkedList<>();
+		for (ImmutablePair<Component, byte[]> triple : inputs) {
+			Component component = triple.getLeft();
+
+			Map<String, ArtifactDefinition> toscaArtifacts = component.getToscaArtifacts();
+			ArtifactDefinition artifactDefinition = toscaArtifacts.get(ToscaExportHandler.ASSET_TOSCA_TEMPLATE);
+
+			String artifactName = artifactDefinition.getArtifactName();
+			String artifactType = artifactDefinition.getArtifactType();
+			String artifactGroupType = artifactDefinition.getArtifactGroupType().getType();
+			String artifactDescription = artifactDefinition.getDescription();
+			String artifactLabel = artifactDefinition.getArtifactLabel();
+			byte[] right = triple.getRight();
+			// The md5 calculated on the uncoded data
+			String md5Hex = DigestUtils.md5Hex(right);
+			byte[] payload = Base64.encodeBase64(right);
+			String artifactVersion = artifactDefinition.getArtifactVersion();
+
+			Artifact convertedArtifact = new Artifact(artifactType, artifactGroupType, md5Hex, payload);
+			convertedArtifact.setName(artifactName);
+			convertedArtifact.setDescription(artifactDescription);
+			convertedArtifact.setLabel(artifactLabel);
+			convertedArtifact.setVersion(artifactVersion);
+
+			listOfArtifactsInput.add(convertedArtifact);
+		}
+
+		return listOfArtifactsInput;
+	}
+
+	private Either<byte[], ActionStatus> getEntryData(String cassandraId, Component childComponent) {
+		byte[] content;
+		if (cassandraId == null || cassandraId.isEmpty()) {
+			Either<ToscaRepresentation, ToscaError> exportRes = toscaExportUtils.exportComponent(childComponent);
+			if (exportRes.isRight()) {
+				log.debug("Failed to export tosca template for child component {} error {}",
+						childComponent.getUniqueId(), exportRes.right().value());
+				return Either.right(componentsUtils.convertFromToscaError(exportRes.right().value()));
+			}
+			content = exportRes.left().value().getMainYaml().getBytes();
+		} else {
+			Either<byte[], ActionStatus> fromCassandra = getFromCassandra(cassandraId);
+			if (fromCassandra.isRight()) {
+				return Either.right(fromCassandra.right().value());
+			} else {
+				content = fromCassandra.left().value();
+			}
+		}
+		return Either.left(content);
+	}
+
+	private Either<byte[], ResponseFormat> getLatestSchemaFilesFromCassandra() {
+		Either<List<SdcSchemaFilesData>, CassandraOperationStatus> specificSchemaFiles = sdcSchemaFilesCassandraDao
+				.getSpecificSchemaFiles(versionFirstThreeOctates, CONFORMANCE_LEVEL);
+
+		if (specificSchemaFiles.isRight()) {
+			log.debug("Failed to get the schema files SDC-Version: {} Conformance-Level {}", versionFirstThreeOctates,
+					CONFORMANCE_LEVEL);
+			StorageOperationStatus storageStatus = DaoStatusConverter
+					.convertCassandraStatusToStorageStatus(specificSchemaFiles.right().value());
+			ActionStatus convertedFromStorageResponse = componentsUtils.convertFromStorageResponse(storageStatus);
+			return Either.right(componentsUtils.getResponseFormat(convertedFromStorageResponse));
+		}
+
+		List<SdcSchemaFilesData> listOfSchemas = specificSchemaFiles.left().value();
+
+		if (listOfSchemas.isEmpty()) {
+			log.debug("Failed to get the schema files SDC-Version: {} Conformance-Level {}", versionFirstThreeOctates,
+					CONFORMANCE_LEVEL);
+			return Either.right(componentsUtils.getResponseFormat(ActionStatus.TOSCA_SCHEMA_FILES_NOT_FOUND,
+					versionFirstThreeOctates, CONFORMANCE_LEVEL));
+		}
+
+		SdcSchemaFilesData schemaFile = listOfSchemas.iterator().next();
+
+		return Either.left(schemaFile.getPayloadAsArray());
+	}
+
+	private Either<byte[], ActionStatus> getFromCassandra(String cassandraId) {
+		Either<ESArtifactData, CassandraOperationStatus> artifactResponse = artifactCassandraDao
+				.getArtifact(cassandraId);
+
+		if (artifactResponse.isRight()) {
+			log.debug("Failed to fetch artifact from Cassandra by id {} error {} ", cassandraId,
+					artifactResponse.right().value());
+
+			StorageOperationStatus storageStatus = DaoStatusConverter
+					.convertCassandraStatusToStorageStatus(artifactResponse.right().value());
+			ActionStatus convertedFromStorageResponse = componentsUtils.convertFromStorageResponse(storageStatus);
+			return Either.right(convertedFromStorageResponse);
+		}
+		ESArtifactData artifactData = artifactResponse.left().value();
+		return Either.left(artifactData.getDataAsArray());
+	}
+
+	private String createCsarBlock0(String metaFileVersion, String toscaConformanceLevel) {
+		final String BLOCK_0_TEMPLATE = "SDC-TOSCA-Meta-File-Version: %s\nSDC-TOSCA-Definitions-Version: %s\n";
+		String readyBlock = String.format(BLOCK_0_TEMPLATE, metaFileVersion, toscaConformanceLevel);
+		return readyBlock;
+	}
+
+	private String createToscaBlock0(String metaFileVersion, String csarVersion, String createdBy, String entryDef) {
+		final String block0template = "TOSCA-Meta-File-Version: %s\nCSAR-Version: %s\nCreated-By: %s\nEntry-Definitions: Definitions/%s\n\nName: csar.meta\nContent-Type: text/plain\n";
+		return String.format(block0template, metaFileVersion, csarVersion, createdBy, entryDef);
+	}
+
+	private Either<List<Artifact>, String> artifactGenerator(List<Artifact> artifactList, ArtifactType type,
+			Component component) {
+
+		ArtifactGenerationServiceImpl artifactGenerationServiceImpl = new ArtifactGenerationServiceImpl();
+		ArtifactTypes artifactTypes = new ArtifactTypes();
+		List<ArtifactType> artifactTypesList = new LinkedList<>();
+		ArtifactType otherType;
+
+		if (type == null) {
+			otherType = ArtifactType.OTHER;
+		} else {
+			otherType = type;
+		}
+
+		artifactTypesList.add(otherType);
+		artifactTypes.setArtifactTypes(artifactTypesList);
+
+		String configJson = gson.toJson(artifactTypes);
+		Map<String, String> additionalParams = new HashMap<>();
+		String version;
+
+		if (UUID_NORMATIVE_NEW_VERSION.matcher(component.getVersion()).matches()) {
+			version = component.getVersion();
+		} else {
+			String[] versionParts = component.getVersion()
+					.split(ToscaElementLifecycleOperation.VERSION_DELIMETER_REGEXP);
+			Integer majorVersion = Integer.parseInt(versionParts[0]);
+
+			version = (majorVersion + 1) + ToscaElementLifecycleOperation.VERSION_DELIMETER + "0";
+		}
+
+		additionalParams.put(AdditionalParams.ServiceVersion.getName(), version);
+		GenerationData generatedArtifacts = artifactGenerationServiceImpl.generateArtifact(artifactList, configJson,
+				additionalParams);
+
+		Map<String, List<String>> errorData = generatedArtifacts.getErrorData();
+
+		if (!errorData.isEmpty()) {
+			Set<String> keySet = errorData.keySet();
+			StringBuilder error = new StringBuilder();
+
+			for (String key : keySet) {
+				List<String> errorList = errorData.get(key);
+				log.debug("The Artifact Generator Failed - {} with following: {}", key, errorList);
+				error.append(key + errorList);
+			}
+
+			return Either.right(error.toString());
+		}
+
+		return Either.left(generatedArtifacts.getResultData());
+	}
+
+	/**
+	 * Extracts artifacts of VFCs from CSAR
+	 *
+	 * @param csar
+	 * @return Map of <String, List<ArtifactDefinition>> the contains Lists of
+	 *         artifacts according vfcToscaNamespace
+	 */
+	public static Map<String, List<ArtifactDefinition>> extractVfcsArtifactsFromCsar(Map<String, byte[]> csar) {
+
+		Map<String, List<ArtifactDefinition>> artifacts = new HashMap<>();
+		if (csar != null) {
+			log.debug("************* Going to extract VFCs artifacts from Csar. ");
+			Map<String, Set<List<String>>> collectedWarningMessages = new HashMap<>();
+			csar.entrySet().stream()
+					// filter CSAR entry by node type artifact path
+					.filter(e -> Pattern.compile(VFC_NODE_TYPE_ARTIFACTS_PATH_PATTERN).matcher(e.getKey()).matches())
+					// extract ArtifactDefinition from CSAR entry for each entry with matching
+					// artifact path
+					.forEach(e -> addExtractedVfcArtifact(extractVfcArtifact(e, collectedWarningMessages), artifacts));
+			// add counter suffix to artifact labels
+			handleWarningMessages(collectedWarningMessages);
+
+		}
+		return artifacts;
+	}
+
+	/**
+	 * Print warnings to log
+	 *
+	 * @param collectedWarningMessages
+	 */
+	public static void handleWarningMessages(Map<String, Set<List<String>>> collectedWarningMessages) {
+		collectedWarningMessages.entrySet().stream()
+				// for each vfc
+				.forEach(e -> e.getValue().stream()
+						// add each warning message to log
+						.forEach(args -> log.warn(e.getKey(), args.toArray())));
+
+	}
+
+	private static void addExtractedVfcArtifact(ImmutablePair<String, ArtifactDefinition> extractedVfcArtifact,
+			Map<String, List<ArtifactDefinition>> artifacts) {
+		if (extractedVfcArtifact != null) {
+			List<ArtifactDefinition> currArtifactsList;
+			String vfcToscaNamespace = extractedVfcArtifact.getKey();
+			if (artifacts.containsKey(vfcToscaNamespace)) {
+				currArtifactsList = artifacts.get(vfcToscaNamespace);
+			} else {
+				currArtifactsList = new ArrayList<>();
+				artifacts.put(vfcToscaNamespace, currArtifactsList);
+			}
+			currArtifactsList.add(extractedVfcArtifact.getValue());
+		}
+	}
+
+	private static ImmutablePair<String, ArtifactDefinition> extractVfcArtifact(Entry<String, byte[]> entry,
+			Map<String, Set<List<String>>> collectedWarningMessages) {
+		ArtifactDefinition artifact;
+		String[] parsedCsarArtifactPath = entry.getKey().split("/");
+		Either<ArtifactGroupTypeEnum, Boolean> eitherArtifactGroupType = detectArtifactGroupType(
+				parsedCsarArtifactPath[2].toUpperCase(), collectedWarningMessages);
+		if (eitherArtifactGroupType.isLeft()) {
+			artifact = buildArtifactDefinitionFromCsarArtifactPath(entry, collectedWarningMessages,
+					parsedCsarArtifactPath, eitherArtifactGroupType.left().value());
+		} else {
+			return null;
+		}
+		return new ImmutablePair<>(parsedCsarArtifactPath[1], artifact);
+	}
+
+	private static Either<ArtifactGroupTypeEnum, Boolean> detectArtifactGroupType(String groupType,
+			Map<String, Set<List<String>>> collectedWarningMessages) {
+		Either<ArtifactGroupTypeEnum, Boolean> result;
+		try {
+			ArtifactGroupTypeEnum artifactGroupType = ArtifactGroupTypeEnum.findType(groupType.toUpperCase());
+			if (artifactGroupType == null || (artifactGroupType != ArtifactGroupTypeEnum.INFORMATIONAL
+					&& artifactGroupType != ArtifactGroupTypeEnum.DEPLOYMENT)) {
+				String warningMessage = "Warning - unrecognized artifact group type {} was received.";
+				List<String> messageArguments = new ArrayList<>();
+				messageArguments.add(groupType);
+				if (!collectedWarningMessages.containsKey(warningMessage)) {
+					Set<List<String>> messageArgumentLists = new HashSet<>();
+					messageArgumentLists.add(messageArguments);
+					collectedWarningMessages.put(warningMessage, messageArgumentLists);
+				} else {
+					collectedWarningMessages.get(warningMessage).add(messageArguments);
+				}
+
+				result = Either.right(false);
+			} else {
+
+				result = Either.left(artifactGroupType);
+			}
+		} catch (Exception e) {
+			log.debug("detectArtifactGroupType failed with exception", e);
+			result = Either.right(false);
+		}
+		return result;
+	}
+
+	private static ArtifactDefinition buildArtifactDefinitionFromCsarArtifactPath(Entry<String, byte[]> entry,
+			Map<String, Set<List<String>>> collectedWarningMessages, String[] parsedCsarArtifactPath,
+			ArtifactGroupTypeEnum artifactGroupType) {
+		ArtifactDefinition artifact;
+		artifact = new ArtifactDefinition();
+		artifact.setArtifactGroupType(artifactGroupType);
+		artifact.setArtifactType(detectArtifactTypeVFC(artifactGroupType, parsedCsarArtifactPath[3],
+				parsedCsarArtifactPath[1], collectedWarningMessages));
+		artifact.setArtifactName(
+				ValidationUtils.normalizeFileName(parsedCsarArtifactPath[parsedCsarArtifactPath.length - 1]));
+		artifact.setPayloadData(Base64.encodeBase64String(entry.getValue()));
+		artifact.setArtifactDisplayName(artifact.getArtifactName().lastIndexOf('.') > 0
+				? artifact.getArtifactName().substring(0, artifact.getArtifactName().lastIndexOf('.'))
+				: artifact.getArtifactName());
+		artifact.setArtifactLabel(ValidationUtils.normalizeArtifactLabel(artifact.getArtifactName()));
+		artifact.setDescription(ARTIFACT_CREATED_FROM_CSAR);
+		artifact.setIsFromCsar(true);
+		artifact.setArtifactChecksum(GeneralUtility.calculateMD5Base64EncodedByByteArray(entry.getValue()));
+		return artifact;
+	}
+
+	public static final class NonMetaArtifactInfo {
+		private final String path;
+		private final String artifactName;
+		private final String displayName;
+		private final String artifactLabel;
+		private final ArtifactTypeEnum artifactType;
+		private final ArtifactGroupTypeEnum artifactGroupType;
+		private String payloadData;
+		private String artifactChecksum;
+		private String artifactUniqueId;
+		private final boolean isFromCsar;
+
+		public NonMetaArtifactInfo(String artifactName, String path, ArtifactTypeEnum artifactType,
+				ArtifactGroupTypeEnum artifactGroupType, byte[] payloadData, String artifactUniqueId,
+				boolean isFromCsar) {
+			super();
+			this.path = path;
+			this.isFromCsar = isFromCsar;
+			this.artifactName = ValidationUtils.normalizeFileName(artifactName);
+			this.artifactType = artifactType;
+			this.artifactGroupType = artifactGroupType;
+			final int pointIndex = artifactName.lastIndexOf('.');
+			if (pointIndex > 0) {
+				displayName = artifactName.substring(0, pointIndex);
+			} else {
+				displayName = artifactName;
+			}
+			this.artifactLabel = ValidationUtils.normalizeArtifactLabel(artifactName);
+			if (payloadData != null) {
+				this.payloadData = Base64.encodeBase64String(payloadData);
+				this.artifactChecksum = GeneralUtility.calculateMD5Base64EncodedByByteArray(payloadData);
+			}
+			this.artifactUniqueId = artifactUniqueId;
+		}
+
+		public String getPath() {
+			return path;
+		}
+
+		public String getArtifactName() {
+			return artifactName;
+		}
+
+		public ArtifactTypeEnum getArtifactType() {
+			return artifactType;
+		}
+
+		public String getDisplayName() {
+			return displayName;
+		}
+
+		public ArtifactGroupTypeEnum getArtifactGroupType() {
+			return artifactGroupType;
+		}
+
+		public String getArtifactLabel() {
+			return artifactLabel;
+		}
+
+		public boolean isFromCsar() {
+			return isFromCsar;
+		}
+
+		public String getPayloadData() {
+			return payloadData;
+		}
+
+		public String getArtifactChecksum() {
+			return artifactChecksum;
+		}
+
+		public String getArtifactUniqueId() {
+			return artifactUniqueId;
+		}
+
+		public void setArtifactUniqueId(String artifactUniqueId) {
+			this.artifactUniqueId = artifactUniqueId;
+		}
+
+	}
+
+	/**
+	 * This method checks the artifact GroupType & Artifact Type. <br>
+	 * if there is any problem warning messages are added to
+	 * collectedWarningMessages
+	 *
+	 * @param artifactPath
+	 * @param collectedWarningMessages
+	 * @return
+	 */
+	public static Either<NonMetaArtifactInfo, Boolean> validateNonMetaArtifact(String artifactPath, byte[] payloadData,
+			Map<String, Set<List<String>>> collectedWarningMessages) {
+		Either<NonMetaArtifactInfo, Boolean> ret;
+		try {
+			String[] parsedArtifactPath = artifactPath.split("/");
+			// Validate Artifact Group Type
+			Either<ArtifactGroupTypeEnum, Boolean> eitherGroupType = detectArtifactGroupType(parsedArtifactPath[1],
+					collectedWarningMessages);
+			if (eitherGroupType.isLeft()) {
+				final ArtifactGroupTypeEnum groupTypeEnum = eitherGroupType.left().value();
+
+				// Validate Artifact Type
+				String artifactType = parsedArtifactPath[2];
+				artifactType = detectArtifactTypeVF(groupTypeEnum, artifactType, collectedWarningMessages);
+
+				String artifactFileNameType = parsedArtifactPath[3];
+				ret = Either.left(new NonMetaArtifactInfo(artifactFileNameType, artifactPath,
+						ArtifactTypeEnum.findType(artifactType), groupTypeEnum, payloadData, null, true));
+
+			} else {
+				ret = Either.right(eitherGroupType.right().value());
+			}
+		} catch (Exception e) {
+			log.debug("detectArtifactGroupType failed with exception", e);
+			ret = Either.right(false);
+		}
+		return ret;
+
+	}
+
+	private static String detectArtifactTypeVFC(ArtifactGroupTypeEnum artifactGroupType, String receivedTypeName,
+			String parentVfName, Map<String, Set<List<String>>> collectedWarningMessages) {
+		String warningMessage = "Warning - artifact type {} that was provided for VFC {} is not recognized.";
+		return detectArtifactType(artifactGroupType, receivedTypeName, warningMessage, collectedWarningMessages,
+				parentVfName);
+	}
+
+	private static String detectArtifactTypeVF(ArtifactGroupTypeEnum artifactGroupType, String receivedTypeName,
+			Map<String, Set<List<String>>> collectedWarningMessages) {
+		String warningMessage = "Warning - artifact type {} that was provided for VF is not recognized.";
+		return detectArtifactType(artifactGroupType, receivedTypeName, warningMessage, collectedWarningMessages);
+	}
+
+	private static String detectArtifactType(ArtifactGroupTypeEnum artifactGroupType, String receivedTypeName,
+			String warningMessage, Map<String, Set<List<String>>> collectedWarningMessages, String... arguments) {
+
+		ArtifactTypeEnum artifactType = ArtifactTypeEnum.findType(receivedTypeName);
+		Map<String, ArtifactTypeConfig> resourceValidTypeArtifacts = null;
+
+		if (artifactGroupType != null) {
+			switch (artifactGroupType) {
+			case INFORMATIONAL:
+				resourceValidTypeArtifacts = ConfigurationManager.getConfigurationManager().getConfiguration()
+						.getResourceInformationalArtifacts();
+				break;
+			case DEPLOYMENT:
+				resourceValidTypeArtifacts = ConfigurationManager.getConfigurationManager().getConfiguration()
+						.getResourceDeploymentArtifacts();
+				break;
+			default:
+				break;
+			}
+		}
+
+		Set<String> validArtifactTypes = null;
+		if (resourceValidTypeArtifacts != null) {
+			validArtifactTypes = resourceValidTypeArtifacts.keySet();
+		}
+
+		if (validArtifactTypes == null || artifactType == null
+				|| !validArtifactTypes.contains(artifactType.getType())) {
+			List<String> messageArguments = new ArrayList<>();
+			messageArguments.add(receivedTypeName);
+			messageArguments.addAll(Arrays.asList(arguments));
+			if (!collectedWarningMessages.containsKey(warningMessage)) {
+				Set<List<String>> messageArgumentLists = new HashSet<>();
+				messageArgumentLists.add(messageArguments);
+				collectedWarningMessages.put(warningMessage, messageArgumentLists);
+			} else {
+				collectedWarningMessages.get(warningMessage).add(messageArguments);
+			}
+		}
+
+		return artifactType == null ? ArtifactTypeEnum.OTHER.getType() : artifactType.getType();
+	}
+
+	private Either<ZipOutputStream, ResponseFormat> writeAllFilesToCsar(Component mainComponent,
+			CsarDefinition csarDefinition, ZipOutputStream zipstream, boolean isInCertificationRequest)
+			throws IOException {
+		ComponentArtifacts componentArtifacts = csarDefinition.getComponentArtifacts();
+
+		Either<ZipOutputStream, ResponseFormat> writeComponentArtifactsToSpecifiedPath = writeComponentArtifactsToSpecifiedPath(
+				mainComponent, componentArtifacts, zipstream, ARTIFACTS_PATH, isInCertificationRequest);
+
+		if (writeComponentArtifactsToSpecifiedPath.isRight()) {
+			return Either.right(writeComponentArtifactsToSpecifiedPath.right().value());
+		}
+
+		ComponentTypeArtifacts mainTypeAndCIArtifacts = componentArtifacts.getMainTypeAndCIArtifacts();
+		writeComponentArtifactsToSpecifiedPath = writeArtifactsInfoToSpecifiedPath(mainComponent,
+				mainTypeAndCIArtifacts.getComponentArtifacts(), zipstream, ARTIFACTS_PATH, isInCertificationRequest);
+
+		if (writeComponentArtifactsToSpecifiedPath.isRight()) {
+			return Either.right(writeComponentArtifactsToSpecifiedPath.right().value());
+		}
+
+		Map<String, ArtifactsInfo> componentInstancesArtifacts = mainTypeAndCIArtifacts
+				.getComponentInstancesArtifacts();
+		Set<String> keySet = componentInstancesArtifacts.keySet();
+
+		String currentPath = ARTIFACTS_PATH + RESOURCES_PATH;
+		for (String keyAssetName : keySet) {
+			ArtifactsInfo artifactsInfo = componentInstancesArtifacts.get(keyAssetName);
+			String pathWithAssetName = currentPath + keyAssetName + "/";
+			writeComponentArtifactsToSpecifiedPath = writeArtifactsInfoToSpecifiedPath(mainComponent, artifactsInfo,
+					zipstream, pathWithAssetName, isInCertificationRequest);
+
+			if (writeComponentArtifactsToSpecifiedPath.isRight()) {
+				return Either.right(writeComponentArtifactsToSpecifiedPath.right().value());
+			}
+		}
+		writeComponentArtifactsToSpecifiedPath = writeOperationsArtifactsToCsar(mainComponent, zipstream);
+
+		if (writeComponentArtifactsToSpecifiedPath.isRight()) {
+			return Either.right(writeComponentArtifactsToSpecifiedPath.right().value());
+		}
+		return Either.left(zipstream);
+	}
+
+	private Either<ZipOutputStream, ResponseFormat> writeOperationsArtifactsToCsar(Component component,
+			ZipOutputStream zipstream) {
+		if (component instanceof Service) {
+			return Either.left(zipstream);
+		}
+		if (Objects.isNull(((Resource) component).getInterfaces())) {
+			log.debug("Component Name {}- no interfaces found", component.getNormalizedName());
+			return Either.left(zipstream);
+		}
+		final Map<String, InterfaceDefinition> interfaces = ((Resource) component).getInterfaces();
+
+		for (Map.Entry<String, InterfaceDefinition> interfaceEntry : interfaces.entrySet()) {
+			for (OperationDataDefinition operation : interfaceEntry.getValue().getOperations().values()) {
+				try {
+					if (Objects.isNull(operation.getImplementation())) {
+						log.debug(
+								"Component Name {}, Interface Id {}, Operation Name {} - no Operation Implementation found",
+								component.getNormalizedName(), interfaceEntry.getValue().getUniqueId(),
+								operation.getName());
+						continue;
+					}
+					if (Objects.isNull(operation.getImplementation().getArtifactName())) {
+						log.debug("Component Name {}, Interface Id {}, Operation Name {} - no artifact found",
+								component.getNormalizedName(), interfaceEntry.getValue().getUniqueId(),
+								operation.getName());
+						continue;
+					}
+
+					final String artifactUUID = operation.getImplementation().getArtifactUUID();
+
+					final Either<byte[], ActionStatus> artifactFromCassandra = getFromCassandra(artifactUUID);
+					final String artifactName = operation.getImplementation().getArtifactName();
+					if (artifactFromCassandra.isRight()) {
+						log.error("ArtifactName {}, unique ID {}", artifactName, artifactUUID);
+						log.error("Failed to get {} payload from DB reason: {}", artifactName,
+								artifactFromCassandra.right().value());
+						return Either.right(componentsUtils.getResponseFormat(
+								ActionStatus.ARTIFACT_PAYLOAD_NOT_FOUND_DURING_CSAR_CREATION, "Resource",
+								component.getUniqueId(), artifactName, artifactUUID));
+					}
+
+					final byte[] payloadData = artifactFromCassandra.left().value();
+					zipstream.putNextEntry(new ZipEntry(
+							OperationArtifactUtil.createOperationArtifactPath(component.getNormalizedName(),
+									interfaceEntry.getValue().getToscaResourceName(), operation)));
+					zipstream.write(payloadData);
+
+				} catch (IOException | NullPointerException e) {
+					log.error("Component Name {},  Interface Name {}, Operation Name {}", component.getNormalizedName(),
+							interfaceEntry.getKey(), operation.getName());
+					log.error("Error while writing the operation's artifacts to the CSAR " + "{}", e);
+					return Either.right(componentsUtils.getResponseFormat(ActionStatus.ERROR_DURING_CSAR_CREATION,
+							"Resource", component.getUniqueId()));
+				}
+			}
+		}
+		return Either.left(zipstream);
+
+	}
+
+	private Either<ZipOutputStream, ResponseFormat> writeComponentArtifactsToSpecifiedPath(Component mainComponent,
+			ComponentArtifacts componentArtifacts, ZipOutputStream zipstream, String currentPath,
+			boolean isInCertificationRequest) throws IOException {
+		Map<String, ComponentTypeArtifacts> componentTypeArtifacts = componentArtifacts.getComponentTypeArtifacts();
+		// Keys are defined:
+		// <Inner Asset TOSCA name (e.g. VFC name)> folder name: <Inner Asset TOSCA name
+		// (e.g. VFC name)>_v<version>.
+		// E.g. "org.openecomp.resource.vf.vipr_atm_v1.0"
+		Set<String> componentTypeArtifactsKeys = componentTypeArtifacts.keySet();
+		for (String keyAssetName : componentTypeArtifactsKeys) {
+			ComponentTypeArtifacts componentInstanceArtifacts = componentTypeArtifacts.get(keyAssetName);
+			ArtifactsInfo componentArtifacts2 = componentInstanceArtifacts.getComponentArtifacts();
+			String pathWithAssetName = currentPath + keyAssetName + "/";
+			Either<ZipOutputStream, ResponseFormat> writeArtifactsInfoToSpecifiedtPath = writeArtifactsInfoToSpecifiedPath(
+					mainComponent, componentArtifacts2, zipstream, pathWithAssetName, isInCertificationRequest);
+
+			if (writeArtifactsInfoToSpecifiedtPath.isRight()) {
+				return writeArtifactsInfoToSpecifiedtPath;
+			}
+		}
+
+		return Either.left(zipstream);
+	}
+
+	private Either<ZipOutputStream, ResponseFormat> writeArtifactsInfoToSpecifiedPath(Component mainComponent,
+			ArtifactsInfo currArtifactsInfo, ZipOutputStream zip, String path, boolean isInCertificationRequest)
+			throws IOException {
+		Map<ArtifactGroupTypeEnum, Map<ArtifactTypeEnum, List<ArtifactDefinition>>> artifactsInfo = currArtifactsInfo
+				.getArtifactsInfo();
+		Set<ArtifactGroupTypeEnum> groupTypeEnumKeySet = artifactsInfo.keySet();
+
+		for (ArtifactGroupTypeEnum artifactGroupTypeEnum : groupTypeEnumKeySet) {
+			String groupTypeFolder = path + WordUtils.capitalizeFully(artifactGroupTypeEnum.getType()) + "/";
+
+			Map<ArtifactTypeEnum, List<ArtifactDefinition>> artifactTypesMap = artifactsInfo.get(artifactGroupTypeEnum);
+			Set<ArtifactTypeEnum> artifactTypeEnumKeySet = artifactTypesMap.keySet();
+
+			for (ArtifactTypeEnum artifactTypeEnum : artifactTypeEnumKeySet) {
+				List<ArtifactDefinition> artifactDefinitionList = artifactTypesMap.get(artifactTypeEnum);
+				String artifactTypeFolder = groupTypeFolder + artifactTypeEnum.toString() + "/";
+
+				Either<ZipOutputStream, ResponseFormat> writeArtifactDefinition = writeArtifactDefinition(mainComponent,
+						zip, artifactDefinitionList, artifactTypeFolder, isInCertificationRequest);
+
+				if (writeArtifactDefinition.isRight()) {
+					return writeArtifactDefinition;
+				}
+			}
+		}
+
+		return Either.left(zip);
+	}
+
+	private Either<ZipOutputStream, ResponseFormat> writeArtifactDefinition(Component mainComponent,
+			ZipOutputStream zip, List<ArtifactDefinition> artifactDefinitionList, String artifactPathAndFolder,
+			boolean isInCertificationRequest) throws IOException {
+
+		ComponentTypeEnum componentType = mainComponent.getComponentType();
+		String heatEnvType = ArtifactTypeEnum.HEAT_ENV.getType();
+
+		for (ArtifactDefinition artifactDefinition : artifactDefinitionList) {
+			if (!isInCertificationRequest && componentType == ComponentTypeEnum.SERVICE
+					&& artifactDefinition.getArtifactType().equals(heatEnvType) ||
+			// this is placeholder
+					(artifactDefinition.getEsId() == null && artifactDefinition.getMandatory())) {
+				continue;
+			}
+
+			byte[] payloadData = artifactDefinition.getPayloadData();
+			String artifactFileName = artifactDefinition.getArtifactName();
+
+			if (payloadData == null) {
+				Either<byte[], ActionStatus> fromCassandra = getFromCassandra(artifactDefinition.getEsId());
+
+				if (fromCassandra.isRight()) {
+					log.debug("ArtifactName {}, unique ID {}", artifactDefinition.getArtifactName(),
+							artifactDefinition.getUniqueId());
+					log.debug("Failed to get {} payload from DB reason: {}", artifactFileName,
+							fromCassandra.right().value());
+					continue;
+				}
+				payloadData = fromCassandra.left().value();
+			}
+			zip.putNextEntry(new ZipEntry(artifactPathAndFolder + artifactFileName));
+			zip.write(payloadData);
+		}
+
+		return Either.left(zip);
+	}
+
+	/************************************
+	 * Artifacts Structure
+	 ******************************************************************/
+	/**
+	 * The artifacts Definition saved by their structure
+	 */
+	private class ArtifactsInfo {
+		// Key is the type of artifacts(Informational/Deployment)
+		// Value is a map between an artifact type and a list of all artifacts of this
+		// type
+		private Map<ArtifactGroupTypeEnum, Map<ArtifactTypeEnum, List<ArtifactDefinition>>> artifactsInfoField;
+
+		public ArtifactsInfo() {
+			this.artifactsInfoField = new EnumMap<>(ArtifactGroupTypeEnum.class);
+		}
+
+		public Map<ArtifactGroupTypeEnum, Map<ArtifactTypeEnum, List<ArtifactDefinition>>> getArtifactsInfo() {
+			return artifactsInfoField;
+		}
+
+		public List<ArtifactDefinition> getFlatArtifactsListByType(ArtifactTypeEnum artifactType) {
+			List<ArtifactDefinition> artifacts = new ArrayList<>();
+			for (List<ArtifactDefinition> artifactsByType : artifactsInfoField.get(artifactType).values()) {
+				artifacts.addAll(artifactsByType);
+			}
+			return artifacts;
+		}
+
+		public void addArtifactsToGroup(ArtifactGroupTypeEnum artifactGroup,
+				Map<ArtifactTypeEnum, List<ArtifactDefinition>> artifactsDefinition) {
+			artifactsInfoField.put(artifactGroup, artifactsDefinition);
+		}
+
+		public boolean isEmpty() {
+			return artifactsInfoField.isEmpty();
+		}
+
+	}
+
+	/**
+	 * The artifacts of the component and of all its composed instances
+	 *
+	 */
+	private class ComponentTypeArtifacts {
+		private ArtifactsInfo componentArtifacts; // component artifacts (describes the Informational Deployment
+													// folders)
+		private Map<String, ArtifactsInfo> componentInstancesArtifacts; // artifacts of the composed instances mapped by
+																		// the resourceInstance normalized name
+																		// (describes the Resources folder)
+
+		public ComponentTypeArtifacts() {
+			componentArtifacts = new ArtifactsInfo();
+			componentInstancesArtifacts = new HashMap<>();
+		}
+
+		public ArtifactsInfo getComponentArtifacts() {
+			return componentArtifacts;
+		}
+
+		public void setComponentArtifacts(ArtifactsInfo artifactsInfo) {
+			this.componentArtifacts = artifactsInfo;
+		}
+
+		public Map<String, ArtifactsInfo> getComponentInstancesArtifacts() {
+			return componentInstancesArtifacts;
+		}
+
+		public void setComponentInstancesArtifacts(Map<String, ArtifactsInfo> componentInstancesArtifacts) {
+			this.componentInstancesArtifacts = componentInstancesArtifacts;
+		}
+
+		public void addComponentInstancesArtifacts(String normalizedName, ArtifactsInfo artifactsInfo) {
+			componentInstancesArtifacts.put(normalizedName, artifactsInfo);
+		}
+
+	}
+
+	private class ComponentArtifacts {
+		// artifacts of the component and CI's artifacts contained in it's composition
+		// (represents Informational, Deployment & Resource folders of main component)
+		private ComponentTypeArtifacts mainTypeAndCIArtifacts;
+		// artifacts of all component types mapped by their tosca name
+		private Map<String, ComponentTypeArtifacts> componentTypeArtifacts;
+
+		public ComponentArtifacts() {
+			mainTypeAndCIArtifacts = new ComponentTypeArtifacts();
+			componentTypeArtifacts = new HashMap<>();
+		}
+
+		public ComponentTypeArtifacts getMainTypeAndCIArtifacts() {
+			return mainTypeAndCIArtifacts;
+		}
+
+		public void setMainTypeAndCIArtifacts(ComponentTypeArtifacts componentInstanceArtifacts) {
+			this.mainTypeAndCIArtifacts = componentInstanceArtifacts;
+		}
+
+		public Map<String, ComponentTypeArtifacts> getComponentTypeArtifacts() {
+			return componentTypeArtifacts;
+		}
+
+		public void setComponentTypeArtifacts(Map<String, ComponentTypeArtifacts> componentTypeArtifacts) {
+			this.componentTypeArtifacts = componentTypeArtifacts;
+		}
+	}
+
+	private class CsarDefinition {
+		private ComponentArtifacts componentArtifacts;
+
+		// add list of tosca artifacts and meta describes CSAR zip root
+
+		public CsarDefinition(ComponentArtifacts componentArtifacts) {
+			this.componentArtifacts = componentArtifacts;
+		}
+
+		public ComponentArtifacts getComponentArtifacts() {
+			return componentArtifacts;
+		}
+	}
+
+	/************************************
+	 * Artifacts Structure END
+	 ******************************************************************/
+
+	private Either<CsarDefinition, ResponseFormat> collectComponentCsarDefinition(Component component) {
+		ComponentArtifacts componentArtifacts = new ComponentArtifacts();
+		Component updatedComponent = component;
+
+		// get service to receive the AII artifacts uploaded to the service
+		if (updatedComponent.getComponentType() == ComponentTypeEnum.SERVICE) {
+			Either<Service, StorageOperationStatus> getServiceResponse = toscaOperationFacade
+					.getToscaElement(updatedComponent.getUniqueId());
+
+			if (getServiceResponse.isRight()) {
+				ActionStatus actionStatus = componentsUtils
+						.convertFromStorageResponse(getServiceResponse.right().value());
+				return Either.right(componentsUtils.getResponseFormat(actionStatus));
+			}
+
+			updatedComponent = getServiceResponse.left().value();
+		}
+
+		// find the artifacts of the main component, it would have its composed
+		// instances artifacts in a separate folder
+		ComponentTypeArtifacts componentInstanceArtifacts = new ComponentTypeArtifacts();
+		ArtifactsInfo artifactsInfo = collectComponentArtifacts(updatedComponent);
+		componentInstanceArtifacts.setComponentArtifacts(artifactsInfo);
+		componentArtifacts.setMainTypeAndCIArtifacts(componentInstanceArtifacts);
+
+		Map<String, ComponentTypeArtifacts> resourceTypeArtifacts = componentArtifacts.getComponentTypeArtifacts(); // artifacts
+																													// mapped
+																													// by
+																													// the
+																													// component
+																													// type(tosca
+																													// name+version)
+		// get the component instances
+		List<ComponentInstance> componentInstances = updatedComponent.getComponentInstances();
+		if (componentInstances != null) {
+			for (ComponentInstance componentInstance : componentInstances) {
+				// call recursive to find artifacts for all the path
+				Either<Boolean, ResponseFormat> collectComponentInstanceArtifacts = collectComponentInstanceArtifacts(
+						updatedComponent, componentInstance, resourceTypeArtifacts, componentInstanceArtifacts);
+				if (collectComponentInstanceArtifacts.isRight()) {
+					return Either.right(collectComponentInstanceArtifacts.right().value());
+				}
+			}
+		}
+
+		if (log.isDebugEnabled()) {
+			printResult(componentArtifacts, updatedComponent.getName());
+		}
+
+		return Either.left(new CsarDefinition(componentArtifacts));
+	}
+
+	private void printResult(ComponentArtifacts componentArtifacts, String name) {
+		StringBuilder result = new StringBuilder();
+		result.append("Artifacts of main component " + name + "\n");
+		ComponentTypeArtifacts componentInstanceArtifacts = componentArtifacts.getMainTypeAndCIArtifacts();
+		printArtifacts(componentInstanceArtifacts);
+		result.append("Type Artifacts\n");
+		for (Map.Entry<String, ComponentTypeArtifacts> typeArtifacts : componentArtifacts.getComponentTypeArtifacts()
+				.entrySet()) {
+			result.append("Folder " + typeArtifacts.getKey() + "\n");
+			result.append(printArtifacts(typeArtifacts.getValue()));
+		}
+
+		if (log.isDebugEnabled()) {
+			log.debug(result.toString());
+		}
+	}
+
+	private String printArtifacts(ComponentTypeArtifacts componentInstanceArtifacts) {
+		StringBuilder result = new StringBuilder();
+		ArtifactsInfo artifactsInfo = componentInstanceArtifacts.getComponentArtifacts();
+		Map<ArtifactGroupTypeEnum, Map<ArtifactTypeEnum, List<ArtifactDefinition>>> componetArtifacts = artifactsInfo
+				.getArtifactsInfo();
+		printArtifacts(componetArtifacts);
+		result = result.append("Resources\n");
+		for (Map.Entry<String, ArtifactsInfo> resourceInstance : componentInstanceArtifacts
+				.getComponentInstancesArtifacts().entrySet()) {
+			result.append("Folder" + resourceInstance.getKey() + "\n");
+			result.append(printArtifacts(resourceInstance.getValue().getArtifactsInfo()));
+		}
+
+		return result.toString();
+	}
+
+	private String printArtifacts(
+			Map<ArtifactGroupTypeEnum, Map<ArtifactTypeEnum, List<ArtifactDefinition>>> componetArtifacts) {
+		StringBuilder result = new StringBuilder();
+		for (Map.Entry<ArtifactGroupTypeEnum, Map<ArtifactTypeEnum, List<ArtifactDefinition>>> artifactGroup : componetArtifacts
+				.entrySet()) {
+			result.append("    " + artifactGroup.getKey().getType());
+			for (Map.Entry<ArtifactTypeEnum, List<ArtifactDefinition>> groupArtifacts : artifactGroup.getValue()
+					.entrySet()) {
+				result.append("        " + groupArtifacts.getKey().getType());
+				for (ArtifactDefinition artifact : groupArtifacts.getValue()) {
+					result.append("            " + artifact.getArtifactDisplayName());
+				}
+			}
+		}
+
+		return result.toString();
+	}
+
+	private ComponentTypeArtifacts collectComponentTypeArtifacts(Map<String, ComponentTypeArtifacts> resourcesArtifacts,
+			ComponentInstance componentInstance, Resource fetchedComponent) {
+		String toscaComponentName = componentInstance.getToscaComponentName() + "_v"
+				+ componentInstance.getComponentVersion();
+
+		ComponentTypeArtifacts componentArtifactsInfo = resourcesArtifacts.get(toscaComponentName);
+		// if there are no artifacts for this component type we need to fetch and build
+		// them
+		if (componentArtifactsInfo == null) {
+			ArtifactsInfo componentArtifacts = collectComponentArtifacts(fetchedComponent);
+			componentArtifactsInfo = new ComponentTypeArtifacts();
+			if (!componentArtifacts.isEmpty()) {
+				componentArtifactsInfo.setComponentArtifacts(componentArtifacts);
+				resourcesArtifacts.put(toscaComponentName, componentArtifactsInfo);
+			}
+		}
+		return componentArtifactsInfo;
+	}
+
+	private Either<Boolean, ResponseFormat> collectComponentInstanceArtifacts(Component parentComponent,
+			ComponentInstance componentInstance, Map<String, ComponentTypeArtifacts> resourcesTypeArtifacts,
+			ComponentTypeArtifacts instanceArtifactsLocation) {
+		// 1. get the component instance component
+		String componentUid = componentInstance.getComponentUid();
+		Either<Resource, StorageOperationStatus> resource = toscaOperationFacade.getToscaElement(componentUid);
+		if (resource.isRight()) {
+			log.error("Failed to fetch resource with id {} for instance {}", componentUid, parentComponent.getUUID());
+			return Either.right(componentsUtils.getResponseFormat(ActionStatus.ASSET_NOT_FOUND_DURING_CSAR_CREATION,
+					parentComponent.getComponentType().getValue(), parentComponent.getUUID(),
+					componentInstance.getOriginType().getComponentType().getValue(), componentUid));
+		}
+		Resource fetchedComponent = resource.left().value();
+
+		// 2. fill the artifacts for the current component parent type
+		ComponentTypeArtifacts componentParentArtifacts = collectComponentTypeArtifacts(resourcesTypeArtifacts,
+				componentInstance, fetchedComponent);
+
+		// 3. find the artifacts specific to the instance
+		Map<ArtifactTypeEnum, List<ArtifactDefinition>> componentInstanceSpecificInformationalArtifacts = getComponentInstanceSpecificArtifacts(
+				componentInstance.getArtifacts(), componentParentArtifacts.getComponentArtifacts().getArtifactsInfo(),
+				ArtifactGroupTypeEnum.INFORMATIONAL);
+		Map<ArtifactTypeEnum, List<ArtifactDefinition>> componentInstanceSpecificDeploymentArtifacts = getComponentInstanceSpecificArtifacts(
+				componentInstance.getDeploymentArtifacts(),
+				componentParentArtifacts.getComponentArtifacts().getArtifactsInfo(), ArtifactGroupTypeEnum.DEPLOYMENT);
+
+		// 4. add the instances artifacts to the component type
+		ArtifactsInfo artifactsInfo = new ArtifactsInfo();
+		if (!componentInstanceSpecificInformationalArtifacts.isEmpty()) {
+			artifactsInfo.addArtifactsToGroup(ArtifactGroupTypeEnum.INFORMATIONAL,
+					componentInstanceSpecificInformationalArtifacts);
+		}
+		if (!componentInstanceSpecificDeploymentArtifacts.isEmpty()) {
+			artifactsInfo.addArtifactsToGroup(ArtifactGroupTypeEnum.DEPLOYMENT,
+					componentInstanceSpecificDeploymentArtifacts);
+		}
+		if (!artifactsInfo.isEmpty()) {
+			instanceArtifactsLocation.addComponentInstancesArtifacts(componentInstance.getNormalizedName(),
+					artifactsInfo);
+		}
+
+		// 5. do the same for all the component instances
+		List<ComponentInstance> componentInstances = fetchedComponent.getComponentInstances();
+		if (componentInstances != null) {
+			for (ComponentInstance childComponentInstance : componentInstances) {
+				Either<Boolean, ResponseFormat> collectComponentInstanceArtifacts = collectComponentInstanceArtifacts(
+						fetchedComponent, childComponentInstance, resourcesTypeArtifacts, componentParentArtifacts);
+				if (collectComponentInstanceArtifacts.isRight()) {
+					return collectComponentInstanceArtifacts;
+				}
+			}
+		}
+
+		return Either.left(true);
+	}
+
+	private Map<ArtifactTypeEnum, List<ArtifactDefinition>> getComponentInstanceSpecificArtifacts(
+			Map<String, ArtifactDefinition> componentArtifacts,
+			Map<ArtifactGroupTypeEnum, Map<ArtifactTypeEnum, List<ArtifactDefinition>>> componentTypeArtifacts,
+			ArtifactGroupTypeEnum artifactGroupTypeEnum) {
+		Map<ArtifactTypeEnum, List<ArtifactDefinition>> parentArtifacts = componentTypeArtifacts
+				.get(artifactGroupTypeEnum); // the artfiacts of the component itself and not the instance
+
+		Map<ArtifactTypeEnum, List<ArtifactDefinition>> artifactsByTypeOfComponentInstance = new EnumMap<>(
+				ArtifactTypeEnum.class);
+		if (componentArtifacts != null) {
+			for (ArtifactDefinition artifact : componentArtifacts.values()) {
+				ArtifactTypeEnum artifactType = ArtifactTypeEnum.findType(artifact.getArtifactType());
+				List<ArtifactDefinition> parentArtifactsByType = null;
+				if (parentArtifacts != null) {
+					parentArtifactsByType = parentArtifacts.get(artifactType);
+				}
+				// the artifact is of instance
+				if (parentArtifactsByType == null || !parentArtifactsByType.contains(artifact)) {
+					List<ArtifactDefinition> typeArtifacts = artifactsByTypeOfComponentInstance.get(artifactType);
+					if (typeArtifacts == null) {
+						typeArtifacts = new ArrayList<>();
+						artifactsByTypeOfComponentInstance.put(artifactType, typeArtifacts);
+					}
+					typeArtifacts.add(artifact);
+				}
+			}
+		}
+
+		return artifactsByTypeOfComponentInstance;
+	}
+
+	private ArtifactsInfo collectComponentArtifacts(Component component) {
+		Map<String, ArtifactDefinition> informationalArtifacts = component.getArtifacts();
+		Map<ArtifactTypeEnum, List<ArtifactDefinition>> informationalArtifactsByType = collectGroupArtifacts(
+				informationalArtifacts);
+		Map<String, ArtifactDefinition> deploymentArtifacts = component.getDeploymentArtifacts();
+		Map<ArtifactTypeEnum, List<ArtifactDefinition>> deploymentArtifactsByType = collectGroupArtifacts(
+				deploymentArtifacts);
+		ArtifactsInfo artifactsInfo = new ArtifactsInfo();
+		if (!informationalArtifactsByType.isEmpty()) {
+			artifactsInfo.addArtifactsToGroup(ArtifactGroupTypeEnum.INFORMATIONAL, informationalArtifactsByType);
+		}
+		if (!deploymentArtifactsByType.isEmpty()) {
+			artifactsInfo.addArtifactsToGroup(ArtifactGroupTypeEnum.DEPLOYMENT, deploymentArtifactsByType);
+		}
+
+		return artifactsInfo;
+	}
+
+	private Map<ArtifactTypeEnum, List<ArtifactDefinition>> collectGroupArtifacts(
+			Map<String, ArtifactDefinition> componentArtifacts) {
+		Map<ArtifactTypeEnum, List<ArtifactDefinition>> artifactsByType = new EnumMap<>(ArtifactTypeEnum.class);
+		for (ArtifactDefinition artifact : componentArtifacts.values()) {
+			if (artifact.getArtifactUUID() != null) {
+				ArtifactTypeEnum artifactType = ArtifactTypeEnum.findType(artifact.getArtifactType());
+				List<ArtifactDefinition> typeArtifacts = artifactsByType.get(artifactType);
+				if (typeArtifacts == null) {
+					typeArtifacts = new ArrayList<>();
+					artifactsByType.put(artifactType, typeArtifacts);
+				}
+				typeArtifacts.add(artifact);
+			}
+		}
+		return artifactsByType;
+	}
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java
index 9f5ebdf7ca..8d8eac36b9 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java
@@ -680,7 +680,7 @@ public class ToscaExportHandler {
                                                                                  componentInstance, dataTypes,
                                                                                  nodeTemplate);
             if (capabilities.isRight()) {
-                convertNodeTemplatesRes = Either.right(requirements.right().value());
+                convertNodeTemplatesRes = Either.right(capabilities.right().value());
                 break;
             }
             log.debug("Component instance Capabilities converted for instance {}", instanceUniqueId);