From 95812d12606b303d378f765404a774546b66e989 Mon Sep 17 00:00:00 2001 From: c00149107 Date: Thu, 19 Oct 2017 17:46:02 +0800 Subject: Add MSB Config For Restful Call Add MSB Config For Restful Call Change-Id: I03e17ce9085d6991ecfa5a2f0a9e17e2dc2fe033 Issue-ID:SO-240 Signed-off-by: c00149107 --- .../src/main/java/org/openecomp/mso/adapters/vfc/util/RestfulUtil.java | 2 +- .../bpmn/infrastructure/scripts/CreateCustomE2EServiceInstance.groovy | 2 +- .../src/main/resources/process/CreateCustomE2EServiceInstance.bpmn | 2 +- .../src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/util/RestfulUtil.java b/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/util/RestfulUtil.java index fda95ac51f..e8718fafc2 100644 --- a/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/util/RestfulUtil.java +++ b/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/util/RestfulUtil.java @@ -62,7 +62,7 @@ public class RestfulUtil { private static final MsoAlarmLogger ALARMLOGGER = new MsoAlarmLogger(); - private static final int DEFAULT_TIME_OUT = 60; + private static final int DEFAULT_TIME_OUT = 60000; private static final MsoPropertiesFactory msoPropertiesFactory = new MsoPropertiesFactory(); diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateCustomE2EServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateCustomE2EServiceInstance.groovy index 73066b3722..ab8043498c 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateCustomE2EServiceInstance.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateCustomE2EServiceInstance.groovy @@ -140,7 +140,7 @@ public class CreateCustomE2EServiceInstance extends AbstractServiceTaskProcessor utils.log("DEBUG", "User Input Parameters map: " + userParams.toString(), isDebugEnabled) execution.setVariable("serviceInputParams", inputMap) - + execution.setVariable("URN_mso_openecomp_adapters_db_endpoint","http://mso.mso.testlab.openecomp.org:8080/dbadapters/RequestsDbAdapter") //TODO //execution.setVariable("serviceInputParams", jsonUtil.getJsonValue(siRequest, "requestDetails.requestParameters.userParams")) //execution.setVariable("failExists", true) diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateCustomE2EServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateCustomE2EServiceInstance.bpmn index 04b47b452a..5344ed0315 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateCustomE2EServiceInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateCustomE2EServiceInstance.bpmn @@ -156,7 +156,7 @@ csi.prepareInitServiceOperationStatus(execution)]]> application/soap+xml - #{BasicAuthHeaderValueDB} + Basic QlBFTENsaWVudDpwYXNzd29yZDEk ${CVFMI_updateServiceOperStatusRequest} diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn index 109cf69b92..0c839d3643 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateE2EServiceInstance.bpmn @@ -192,7 +192,7 @@ ddsi.preInitResourcesOperStatus(execution)]]> application/soap+xml - #{BasicAuthHeaderValueDB} + Basic QlBFTENsaWVudDpwYXNzd29yZDEk ${CVFMI_initResOperStatusRequest} -- cgit 1.2.3-korg