1 files changed, 46 insertions, 18 deletions

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/StartCertificationTransition.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/StartCertificationTransition.java
index 918140b0af..8a80e0bb64 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/StartCertificationTransition.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/StartCertificationTransition.java
@@ -22,15 +22,23 @@ package org.openecomp.sdc.be.components.lifecycle;
 
 import java.util.Arrays;
 
+import org.openecomp.sdc.be.components.impl.ArtifactsBusinessLogic;
 import org.openecomp.sdc.be.components.impl.ComponentBusinessLogic;
+import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.LifeCycleTransitionEnum;
 import org.openecomp.sdc.be.model.LifecycleStateEnum;
 import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElement;
+import org.openecomp.sdc.be.model.jsontitan.operations.ToscaElementLifecycleOperation;
+import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
+import org.openecomp.sdc.be.model.jsontitan.utils.ModelConverter;
 import org.openecomp.sdc.be.model.operations.api.ILifecycleOperation;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
@@ -45,14 +53,18 @@ public class StartCertificationTransition extends LifeCycleTransition {
 
 	private static Logger log = LoggerFactory.getLogger(StartCertificationTransition.class.getName());
 
-	public StartCertificationTransition(ComponentsUtils componentUtils, ILifecycleOperation lifecycleOperation) {
-		super(componentUtils, lifecycleOperation);
+	public StartCertificationTransition(ComponentsUtils componentUtils, ToscaElementLifecycleOperation lifecycleOperation, ToscaOperationFacade toscaOperationFacade, TitanDao titanDao) {
+		super(componentUtils, lifecycleOperation, toscaOperationFacade,  titanDao);
 
 		// authorized roles
 		Role[] rsrcServiceStartCertificationRoles = { Role.ADMIN, Role.TESTER };
 		addAuthorizedRoles(ComponentTypeEnum.RESOURCE, Arrays.asList(rsrcServiceStartCertificationRoles));
 		addAuthorizedRoles(ComponentTypeEnum.SERVICE, Arrays.asList(rsrcServiceStartCertificationRoles));
 		// TODO to be later defined for product
+		
+		//additional authorized roles for resource type
+		Role[] resourceRoles = { Role.DESIGNER};
+		addResouceAuthorizedRoles(ResourceTypeEnum.VFCMT, Arrays.asList(resourceRoles));
 	}
 
 	@Override
@@ -69,22 +81,38 @@ public class StartCertificationTransition extends LifeCycleTransition {
 	public Either<? extends Component, ResponseFormat> changeState(ComponentTypeEnum componentType, Component component, ComponentBusinessLogic componentBl, User modifier, User owner, boolean shouldLock, boolean inTransaction) {
 
 		log.debug("start performing certification test for resource {}", component.getUniqueId());
-
-		NodeTypeEnum nodeType = (componentType.equals(ComponentTypeEnum.SERVICE)) ? NodeTypeEnum.Service : NodeTypeEnum.Resource;
-		Either<? extends Component, StorageOperationStatus> stateChangeResult = lifeCycleOperation.startComponentCertification(nodeType, component, modifier, owner, inTransaction);
-		if (stateChangeResult.isRight()) {
-			log.debug("start certification failed on graph");
-			StorageOperationStatus response = stateChangeResult.right().value();
-			ActionStatus actionStatus = componentUtils.convertFromStorageResponse(response);
-
-			if (response.equals(StorageOperationStatus.ENTITY_ALREADY_EXISTS)) {
-				actionStatus = ActionStatus.COMPONENT_VERSION_ALREADY_EXIST;
+		Either<? extends Component, ResponseFormat> result = null;
+		try{
+			Either<ToscaElement, StorageOperationStatus> stateChangeResult = lifeCycleOperation.startCertificationToscaElement(component.getUniqueId(), modifier.getUserId(), owner.getUserId());
+			if (stateChangeResult.isRight()) {
+				log.debug("start certification failed on graph");
+				StorageOperationStatus response = stateChangeResult.right().value();
+				ActionStatus actionStatus = componentUtils.convertFromStorageResponse(response);
+	
+				if (response.equals(StorageOperationStatus.ENTITY_ALREADY_EXISTS)) {
+					actionStatus = ActionStatus.COMPONENT_VERSION_ALREADY_EXIST;
+				}
+				ResponseFormat responseFormat = componentUtils.getResponseFormatByComponent(actionStatus, component, componentType);
+				result =  Either.right(responseFormat);
+			}
+			else {
+				result =  Either.left(ModelConverter.convertFromToscaElement(stateChangeResult.left().value()));
+			}
+		} finally {
+			if (result == null || result.isRight()) {
+				BeEcompErrorManager.getInstance().logBeDaoSystemError("Change LifecycleState");
+				if (inTransaction == false) {
+					log.debug("operation failed. do rollback");
+					titanDao.rollback();
+				}
+			} else {
+				if (inTransaction == false) {
+					log.debug("operation success. do commit");
+					titanDao.commit();
+				}
 			}
-			ResponseFormat responseFormat = componentUtils.getResponseFormatByComponent(actionStatus, component, componentType);
-			return Either.right(responseFormat);
 		}
-
-		return Either.left(stateChangeResult.left().value());
+		return result;
 	}
 
 	@Override
@@ -93,11 +121,11 @@ public class StartCertificationTransition extends LifeCycleTransition {
 		log.debug("validate before start certification test. resource name={}, oldState={}, owner userId={}", componentName, oldState, owner.getUserId());
 
 		// validate user
-		Either<Boolean, ResponseFormat> userValidationResponse = userRoleValidation(modifier, componentType, lifecycleChangeInfo);
+		Either<Boolean, ResponseFormat> userValidationResponse = userRoleValidation(modifier,component, componentType, lifecycleChangeInfo);
 		if (userValidationResponse.isRight()) {
 			return userValidationResponse;
 		}
-
+		
 		if (oldState.equals(LifecycleStateEnum.NOT_CERTIFIED_CHECKIN) || oldState.equals(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT)) {
 			ResponseFormat error = componentUtils.getResponseFormat(ActionStatus.COMPONENT_NOT_READY_FOR_CERTIFICATION, componentName, componentType.name().toLowerCase());
 			return Either.right(error);