Merge "Added canceling subsription to pnf-pnp workflow"

[so.git] / bpmn / MSOCommonBPMN / src / main / java / org / openecomp / mso / bpmn / common / recipe / BpmnRestClient.java

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 e43af18..1dc0451 100644 (file)
--- 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 {
 \r
         HttpPost post = new HttpPost(recipeUri);\r
         MsoJavaProperties props = loadMsoProperties();\r
-        RequestConfig requestConfig =\r
-                RequestConfig.custom().setSocketTimeout(recipeTimeout).setConnectTimeout(recipeTimeout).setConnectionRequestTimeout(recipeTimeout).build();\r
-        post.setConfig(requestConfig);\r
         msoLogger.debug("call the bpmn,  url:" + recipeUri);\r
         String jsonReq = wrapResourceRequest(requestId, recipeTimeout, requestAction, serviceInstanceId, serviceType, requestDetails, recipeParamXsd);\r
 \r
@@ -177,10 +174,13 @@ public class BpmnRestClient {
             BpmnParam serviceInstanceIdInput = new BpmnParam();\r
             BpmnParam serviceTypeInput = new BpmnParam();\r
             BpmnParam recipeParamsInput = new BpmnParam();\r
+            BpmnIntegerParam recipeTimeoutInput = new BpmnIntegerParam();\r
+            recipeTimeoutInput.setValue(recipeTimeout);\r
             // host.setValue(parseURL());\r
             requestIdInput.setValue(requestId);\r
             requestActionInput.setValue(requestAction);\r
             serviceInstanceIdInput.setValue(serviceInstanceId);\r
+            serviceTypeInput.setValue(serviceType);\r
             recipeParamsInput.setValue(recipeParams);\r
             resourceInput.setValue(requestDetails);\r
             recipeRequest.setHost(host);\r
@@ -189,6 +189,8 @@ public class BpmnRestClient {
             recipeRequest.setServiceInstanceId(serviceInstanceIdInput);\r
             recipeRequest.setServiceType(serviceTypeInput);\r
             recipeRequest.setRecipeParams(recipeParamsInput);\r
+            recipeRequest.setResourceInput(resourceInput);\r
+            recipeRequest.setRecipeTimeout(recipeTimeoutInput);\r
             jsonReq = recipeRequest.toString();\r
             msoLogger.debug("request body is " + jsonReq);\r
         } catch(Exception e) {\r