Add recipe params for bpmn call

Add recipe params for bpmn call, to improve recipe enhancement.

Change-Id: If9f2bff3f27ced62e814afcb918c863a527363e6
Issue-ID: SO-449
Signed-off-by: c00149107 <chenchuanyu@huawei.com>

6 files changed, 23 insertions, 10 deletions

diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaVIDRequest.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaVIDRequest.java
index fd1227ec13..a53ef22743 100644
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaVIDRequest.java
+++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaVIDRequest.java
@@ -91,6 +91,9 @@ public class CamundaVIDRequest {
 	@JsonProperty(CommonConstants.NETWORK_TYPE_VARIABLE)
 	private CamundaInput networkType;
 
+	@JsonProperty(CommonConstants.RECIPE_PARAMS)
+	private CamundaInput recipeParams;
+	
 	@JsonProperty(CommonConstants.CAMUNDA_SERVICE_INPUT)
 	public CamundaInput getServiceInput() {
 		return serviceInput;
@@ -250,8 +253,17 @@ public class CamundaVIDRequest {
 		this.networkType = networkType;
 	}
 
+	@JsonProperty(CommonConstants.RECIPE_PARAMS)
+    public CamundaInput getRecipeParams() {
+        return recipeParams;
+    }
 
-	@Override
+	@JsonProperty(CommonConstants.RECIPE_PARAMS)
+    public void setRecipeParams(CamundaInput recipeParams) {
+        this.recipeParams = recipeParams;
+    }
+
+    @Override
 	public String toString() {
 		//return "CamundaRequest [requestId=" +  + ", host="
 		//		+ host + ", schema=" + schema + ", reqid=" + reqid + ", svcid="
diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/BPELRestClient.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/BPELRestClient.java
index ddeb359071..cc68a45d19 100644
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/BPELRestClient.java
+++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/BPELRestClient.java
@@ -89,7 +89,7 @@ public class BPELRestClient extends RequestClient {
                              int recipeTimeout, String requestAction, String serviceInstanceId,
                              String vnfId, String vfModuleId, String volumeGroupId, String networkId,
                              String serviceType, String vnfType, String vfModuleType, String networkType,
-                             String requestDetails) {
+                             String requestDetails, String recipeParamXsd) {
         return null;
     }
     
diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CamundaClient.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CamundaClient.java
index b9c0725766..371d3162de 100644
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CamundaClient.java
+++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CamundaClient.java
@@ -98,13 +98,13 @@ public class CamundaClient extends RequestClient{
 			int recipeTimeout, String requestAction, String serviceInstanceId,
 			String vnfId, String vfModuleId, String volumeGroupId, String networkId,
 			String serviceType, String vnfType, String vfModuleType, String networkType,
-			String requestDetails)
+			String requestDetails, String recipeParamXsd)
 					throws ClientProtocolException, IOException{
 		HttpPost post = new HttpPost(url);
 		msoLogger.debug(CAMUNDA_URL_MESAGE + url);
 		String jsonReq = wrapVIDRequest(requestId, isBaseVfModule, recipeTimeout, requestAction,
 				serviceInstanceId, vnfId, vfModuleId, volumeGroupId, networkId,
-				serviceType, vnfType, vfModuleType, networkType, requestDetails);
+				serviceType, vnfType, vfModuleType, networkType, requestDetails, recipeParamXsd);
 
 		StringEntity input = new StringEntity(jsonReq);
 		input.setContentType(CommonConstants.CONTENT_TYPE_JSON);
@@ -178,7 +178,7 @@ public class CamundaClient extends RequestClient{
 			int recipeTimeout, String requestAction, String serviceInstanceId,
 			String vnfId, String vfModuleId, String volumeGroupId, String networkId,
 			String serviceType, String vnfType, String vfModuleType, String networkType,
-			String requestDetails){
+			String requestDetails, String recipeParams){
 		String jsonReq = null;
 		if(requestId == null){
 			requestId ="";
@@ -236,7 +236,7 @@ public class CamundaClient extends RequestClient{
 			CamundaInput vnfTypeInput = new CamundaInput();
 			CamundaInput vfModuleTypeInput = new CamundaInput();
 			CamundaInput networkTypeInput = new CamundaInput();
-
+			CamundaInput recipeParamsInput = new CamundaInput();
 			host.setValue(parseURL());
 			requestIdInput.setValue(requestId);
 			isBaseVfModuleInput.setValue(isBaseVfModule);
@@ -251,7 +251,7 @@ public class CamundaClient extends RequestClient{
 			vnfTypeInput.setValue(vnfType);
 			vfModuleTypeInput.setValue(vfModuleType);
 			networkTypeInput.setValue(networkType);
-
+			recipeParamsInput.setValue(recipeParams);
 			serviceInput.setValue(requestDetails);
 			camundaRequest.setServiceInput(serviceInput);
 			camundaRequest.setHost(host);
@@ -269,7 +269,7 @@ public class CamundaClient extends RequestClient{
 			camundaRequest.setVnfType(vnfTypeInput);
 			camundaRequest.setVfModuleType(vfModuleTypeInput);
 			camundaRequest.setNetworkType(networkTypeInput);
-
+			camundaRequest.setRecipeParams(recipeParamsInput);
 			ObjectMapper mapper = new ObjectMapper();
 			mapper.configure(SerializationConfig.Feature.WRAP_ROOT_VALUE, true);
 
diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CamundaTaskClient.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CamundaTaskClient.java
index 64193cf6c4..364169d4c1 100644
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CamundaTaskClient.java
+++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CamundaTaskClient.java
@@ -74,7 +74,7 @@ public class CamundaTaskClient extends RequestClient{
 			int recipeTimeout, String requestAction, String serviceInstanceId,

 			String vnfId, String vfModuleId, String volumeGroupId, String networkId,

 			String serviceType, String vnfType, String vfModuleType, String networkType,

-			String requestDetails)

+			String requestDetails, String recipeParamXsd)

 					throws ClientProtocolException, IOException{

 		msoLogger.debug("Method not supported");

 		return null;

diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CommonConstants.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CommonConstants.java
index 91bd226c30..cfbe892e68 100644
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CommonConstants.java
+++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/CommonConstants.java
@@ -63,6 +63,7 @@ public final class CommonConstants {
 	public static final String VF_MODULE_TYPE_VARIABLE = "vfModuleType";
 	public static final String NETWORK_TYPE_VARIABLE = "networkType";
 	public static final String REQUEST_DETAILS_VARIABLE = "requestDetails";	
+	public static final String RECIPE_PARAMS = "recipeParams";
 	
 	private CommonConstants () {
 	    // prevent creating an instance of this class
diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/RequestClient.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/RequestClient.java
index addf4e11a5..eaf8be76a3 100644
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/RequestClient.java
+++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/RequestClient.java
@@ -74,7 +74,7 @@ public abstract class RequestClient {
 			int recipeTimeout, String requestAction, String serviceInstanceId,
 			String vnfId, String vfModuleId, String volumeGroupId, String networkId,
 			String serviceType, String vnfType, String vfModuleType, String networkType,
-			String requestDetails)
+			String requestDetails, String recipeParamXsd)
 					throws ClientProtocolException, IOException;
 	
 	public abstract HttpResponse get()