aboutsummaryrefslogtreecommitdiffstats
path: root/bpmn/MSOCommonBPMN/src/main/java
diff options
context:
space:
mode:
authorc00149107 <chenchuanyu@huawei.com>2018-04-25 17:19:13 +0800
committerc00149107 <chenchuanyu@huawei.com>2018-04-25 17:19:13 +0800
commitb86a86fb01e9bb5c44098007a2e158d5b4fa17f0 (patch)
tree95d6c7f2d6be0effe456b570ef140273e2c93b88 /bpmn/MSOCommonBPMN/src/main/java
parent46fb3092fe5bb518f220a6b38650d08cb4fda20d (diff)
Set Resource Recipe Time Out Val
Set Resource Recipe Time Out Val Change-Id: I7f304465c71837ee37e5fa99a48ca14d97d8f91f Issue-ID: SO-587 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
Diffstat (limited to 'bpmn/MSOCommonBPMN/src/main/java')
-rw-r--r--bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/BpmnRestClient.java9
-rw-r--r--bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/ResourceRecipeRequest.java18
2 files changed, 15 insertions, 12 deletions
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 1dc0451213..6a17d600cb 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
@@ -58,13 +58,16 @@ public class BpmnRestClient {
public static final String CAMUNDA_AUTH = "camundaAuth";
- private final static String MSO_PROP_APIHANDLER_INFRA = "MSO_PROP_APIHANDLER_INFRA";
+ private static final String MSO_PROP_APIHANDLER_INFRA = "MSO_PROP_APIHANDLER_INFRA";
private static MsoPropertiesFactory msoPropertiesFactory = new MsoPropertiesFactory();
private static MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
private static boolean noProperties = true;
+
+ //because for NS it will take a long time the time out of the resouce will be 2 hours.
+ private static final String DEFAULT_TIME_OUT = "7200";
public synchronized static MsoJavaProperties loadMsoProperties() {
MsoJavaProperties msoProperties;
@@ -174,8 +177,8 @@ public class BpmnRestClient {
BpmnParam serviceInstanceIdInput = new BpmnParam();
BpmnParam serviceTypeInput = new BpmnParam();
BpmnParam recipeParamsInput = new BpmnParam();
- BpmnIntegerParam recipeTimeoutInput = new BpmnIntegerParam();
- recipeTimeoutInput.setValue(recipeTimeout);
+ BpmnParam recipeTimeoutInput = new BpmnParam();
+ recipeTimeoutInput.setValue(DEFAULT_TIME_OUT);
// host.setValue(parseURL());
requestIdInput.setValue(requestId);
requestActionInput.setValue(requestAction);
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/ResourceRecipeRequest.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/ResourceRecipeRequest.java
index a1809fe754..ec60619dc6 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/ResourceRecipeRequest.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/ResourceRecipeRequest.java
@@ -45,7 +45,7 @@ public class ResourceRecipeRequest {
@JsonProperty("host")
private BpmnParam host;
- @JsonProperty("requestId")
+ @JsonProperty("mso-request-id")
private BpmnParam requestId;
@JsonProperty("requestAction")
@@ -60,8 +60,8 @@ public class ResourceRecipeRequest {
@JsonProperty("recipeParams")
private BpmnParam recipeParams;
- @JsonProperty("recipeTimeout")
- private BpmnIntegerParam recipeTimeout;
+ @JsonProperty("mso-service-request-timeout")
+ private BpmnParam recipeTimeout;
@JsonProperty("resourceInput")
public BpmnParam getResourceInput() {
@@ -83,12 +83,12 @@ public class ResourceRecipeRequest {
this.host = host;
}
- @JsonProperty("requestId")
+ @JsonProperty("mso-request-id")
public BpmnParam getRequestId() {
return requestId;
}
- @JsonProperty("requestId")
+ @JsonProperty("mso-request-id")
public void setRequestId(BpmnParam requestId) {
this.requestId = requestId;
}
@@ -133,13 +133,13 @@ public class ResourceRecipeRequest {
this.recipeParams = recipeParams;
}
- @JsonProperty("recipeTimeout")
- public BpmnIntegerParam getRecipeTimeout() {
+ @JsonProperty("mso-service-request-timeout")
+ public BpmnParam getRecipeTimeout() {
return recipeTimeout;
}
- @JsonProperty("recipeTimeout")
- public void setRecipeTimeout(BpmnIntegerParam recipeTimeout) {
+ @JsonProperty("mso-service-request-timeout")
+ public void setRecipeTimeout(BpmnParam recipeTimeout) {
this.recipeTimeout = recipeTimeout;
}