X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=bpmn%2FMSOCommonBPMN%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fmso%2Fbpmn%2Fcommon%2Frecipe%2FBpmnRestClient.java;h=1dc04512134555f6af620347735b6c8677fbff73;hb=58dd35b739d5a141467866580b95e30aff03b4f2;hp=e43af18cebec2ddcea455211eb62d1b4f0e8cae4;hpb=4370cf4eefb3de99b5eff870f90637931e9759e1;p=so.git diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/BpmnRestClient.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/BpmnRestClient.java index e43af18ceb..1dc0451213 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/BpmnRestClient.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/BpmnRestClient.java @@ -115,9 +115,6 @@ public class BpmnRestClient { HttpPost post = new HttpPost(recipeUri); MsoJavaProperties props = loadMsoProperties(); - RequestConfig requestConfig = - RequestConfig.custom().setSocketTimeout(recipeTimeout).setConnectTimeout(recipeTimeout).setConnectionRequestTimeout(recipeTimeout).build(); - post.setConfig(requestConfig); msoLogger.debug("call the bpmn, url:" + recipeUri); String jsonReq = wrapResourceRequest(requestId, recipeTimeout, requestAction, serviceInstanceId, serviceType, requestDetails, recipeParamXsd); @@ -177,10 +174,13 @@ public class BpmnRestClient { BpmnParam serviceInstanceIdInput = new BpmnParam(); BpmnParam serviceTypeInput = new BpmnParam(); BpmnParam recipeParamsInput = new BpmnParam(); + BpmnIntegerParam recipeTimeoutInput = new BpmnIntegerParam(); + recipeTimeoutInput.setValue(recipeTimeout); // host.setValue(parseURL()); requestIdInput.setValue(requestId); requestActionInput.setValue(requestAction); serviceInstanceIdInput.setValue(serviceInstanceId); + serviceTypeInput.setValue(serviceType); recipeParamsInput.setValue(recipeParams); resourceInput.setValue(requestDetails); recipeRequest.setHost(host); @@ -189,6 +189,8 @@ public class BpmnRestClient { recipeRequest.setServiceInstanceId(serviceInstanceIdInput); recipeRequest.setServiceType(serviceTypeInput); recipeRequest.setRecipeParams(recipeParamsInput); + recipeRequest.setResourceInput(resourceInput); + recipeRequest.setRecipeTimeout(recipeTimeoutInput); jsonReq = recipeRequest.toString(); msoLogger.debug("request body is " + jsonReq); } catch(Exception e) {