1 files changed, 31 insertions, 18 deletions

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ServiceInstances.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ServiceInstances.java
index 0cd5d8dcb7..676dca101b 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ServiceInstances.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ServiceInstances.java
@@ -692,7 +692,7 @@ public class ServiceInstances {
 		
 		sir = convertJsonToServiceInstanceRequest(requestJSON, action, startTime, sir, msoRequest, requestId, requestUri);
 		String requestScope = deriveRequestScope(action, sir, requestUri);
-		InfraActiveRequests currentActiveReq =  msoRequest.createRequestObject (sir,  action, requestId, Status.PENDING, requestJSON, requestScope);
+		InfraActiveRequests currentActiveReq =  msoRequest.createRequestObject (sir,  action, requestId, Status.IN_PROGRESS, requestJSON, requestScope);
 		if(sir.getRequestDetails().getRequestParameters() != null){
 			aLaCarte = sir.getRequestDetails().getRequestParameters().getALaCarte();
 		}
@@ -705,7 +705,6 @@ public class ServiceInstances {
 		String vnfType = msoRequest.getVnfType(sir,requestScope,action,requestVersion);
 		String networkType = msoRequest.getNetworkType(sir,requestScope);
 		String sdcServiceModelVersion = msoRequest.getSDCServiceModelVersion(sir);
-		String serviceInstanceType = msoRequest.getServiceInstanceType(sir,requestScope);
 		String vfModuleType = msoRequest.getVfModuleType(sir,requestScope,action,requestVersion);
 		
 		if(requestScope.equalsIgnoreCase(ModelType.vnf.name()) && vnfType != null){
@@ -732,7 +731,7 @@ public class ServiceInstances {
 		Boolean isBaseVfModule = false;
 
         RecipeLookupResult recipeLookupResult = getServiceInstanceOrchestrationURI(sir, action, alaCarteFlag, currentActiveReq);
-								
+        String serviceInstanceType = getServiceType(requestScope, sir, alaCarteFlag);						
 			ModelType modelType;
 			ModelInfo modelInfo =  sir.getRequestDetails().getModelInfo();
 			if (action == Action.applyUpdatedConfig || action == Action.inPlaceSoftwareUpdate) {
@@ -820,7 +819,7 @@ public class ServiceInstances {
                     .errorInfo(errorLoggerInfo).build();
         }
 		
-		if(!requestScope.equalsIgnoreCase(ModelType.service.name())){
+		if(!requestScope.equalsIgnoreCase(ModelType.service.name()) && action != Action.recreateInstance){
 			aLaCarte = true;
 		}else if(aLaCarte == null){
 			aLaCarte = false;
@@ -864,7 +863,7 @@ public class ServiceInstances {
 		sir.setInstanceGroupId(instanceGroupId);
 	
 		String requestScope = ModelType.instanceGroup.toString();
-		InfraActiveRequests currentActiveReq =  msoRequest.createRequestObject (sir,  action, requestId, Status.PENDING, null, requestScope);
+		InfraActiveRequests currentActiveReq =  msoRequest.createRequestObject (sir,  action, requestId, Status.IN_PROGRESS, null, requestScope);
 		setInstanceId(currentActiveReq, requestScope, null, instanceIdMap);
 		try {
 			validateHeaders(requestContext);
@@ -1018,19 +1017,7 @@ public class ServiceInstances {
 			                    .errorInfo(errorLoggerInfo).build();
 					updateStatus(currentActiveReq, Status.FAILED, validateException.getMessage());
 					throw validateException;
-				}
-			
-				currentActiveReq.setRequestStatus(Status.IN_PROGRESS.name());
-				setInstanceId(currentActiveReq, requestScope, jsonResponse.getRequestReferences().getInstanceId(), new HashMap<>());
-				
-				try{
-					infraActiveRequestsClient.save(currentActiveReq);
-				}catch(Exception e){
-					ErrorLoggerInfo errorLoggerInfo = new ErrorLoggerInfo.Builder(MessageEnum.APIH_DB_ACCESS_EXC, MsoLogger.ErrorCode.DataError).errorSource(Constants.MSO_PROP_APIHANDLER_INFRA).build();
-		            throw new RequestDbFailureException.Builder(SAVE_TO_DB, e.toString(), HttpStatus.SC_INTERNAL_SERVER_ERROR, ErrorNumbers.SVC_DETAILED_SERVICE_ERROR).cause(e)
-		                    .errorInfo(errorLoggerInfo).build();
-				}
-				
+				}	
 				return builder.buildResponse(HttpStatus.SC_ACCEPTED, requestClientParameter.getRequestId(), jsonResponse, requestClientParameter.getApiVersion());
 			} 
 		}
@@ -1869,4 +1856,30 @@ public class ServiceInstances {
 			}
 		}
 	}
+	protected String getServiceType(String requestScope, ServiceInstancesRequest sir, Boolean aLaCarteFlag){
+		String serviceType = null;
+		if(requestScope.equalsIgnoreCase(ModelType.service.toString())){
+			String defaultServiceModelName = getDefaultModel(sir);
+			org.onap.so.db.catalog.beans.Service serviceRecord;
+			if(aLaCarteFlag){
+				 serviceRecord = catalogDbClient.getFirstByModelNameOrderByModelVersionDesc(defaultServiceModelName);
+				 if(serviceRecord != null){
+					 serviceType = serviceRecord.getServiceType();
+				 }
+			}else{
+				serviceRecord = catalogDbClient.getServiceByID(sir.getRequestDetails().getModelInfo().getModelVersionId());
+				if(serviceRecord != null){
+					 serviceType = serviceRecord.getServiceType();
+				 }else{
+					 serviceRecord = catalogDbClient.getFirstByModelNameOrderByModelVersionDesc(defaultServiceModelName);
+					 if(serviceRecord != null){
+						 serviceType = serviceRecord.getServiceType();
+					 }
+				 }
+			}
+		}else{
+			serviceType = msoRequest.getServiceInstanceType(sir, requestScope);
+		}
+		return serviceType;
+	}
 }