1 files changed, 63 insertions, 27 deletions

diff --git a/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyExecutionRequest.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyExecutionRequest.java
index d787fec..c333faf 100644
--- a/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyExecutionRequest.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyExecutionRequest.java
@@ -2,7 +2,7 @@
  * =============LICENSE_START=========================================================
  *
  * =================================================================================
- *  Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+ *  Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -26,42 +26,78 @@ import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-/**
- * Model for message POST-ed to controller to create a Cloudify Execution:
- * 
- * <pre>
- * {
-	"deployment_id" : "deployment-id",	 
-	"workflow_name" : "workflow-name",
-    "allow_custom_parameter" : "true|false",
-    "force" : "true|false",
-    "parameters":
-       {
-           
-       }
-  }
- * </pre>
- */
-public final class CloudifyExecutionRequest extends ECTransportModel {
+public class CloudifyExecutionRequest extends ECTransportModel {
 
 	/** A unique identifier for the deployment. */
-	public final String deployment_id;
+	public String deployment_id;
 	/** A unique identifier for the workflow */
-	public final String workflow_name;
-	public final Boolean allow_custom_parameter;
-	public final Boolean force;
+	public String workflow_id;
+	public Boolean allow_custom_parameters;
+	public Boolean force;
+	public String tenant;
 	/** Parameters: retrieve using the GET /deployments */
-	public final Map<String, Object> parameters;
+	public Map<String, Object> parameters;
+	
+	public String getDeployment_id() {
+		return deployment_id;
+	}
+
+	public String getWorkflow_id() {
+		return workflow_id;
+	}
+
+	public Boolean getAllow_custom_parameters() {
+		return allow_custom_parameters;
+	}
+
+	public Boolean getForce() {
+		return force;
+	}
+
+	public String getTenant() {
+		return tenant;
+	}
+
+	public Map<String, Object> getParameters() {
+		return parameters;
+	}
+
+	public void setDeployment_id(String deployment_id) {
+		this.deployment_id = deployment_id;
+	}
+
+	public void setWorkflow_id(String workflow_id) {
+		this.workflow_id = workflow_id;
+	}
+
+	public void setAllow_custom_parameters(Boolean allow_custom_parameters) {
+		this.allow_custom_parameters = allow_custom_parameters;
+	}
+
+	public void setForce(Boolean force) {
+		this.force = force;
+	}
+
+	public void setTenant(String tenant) {
+		this.tenant = tenant;
+	}
+
+	public void setParameters(Map<String, Object> parameters) {
+		this.parameters = parameters;
+	}
 
 	@JsonCreator
 	public CloudifyExecutionRequest(@JsonProperty("deployment_id") String deployment_id,
-			@JsonProperty("workflow_name") String workflow_name,
-			@JsonProperty("allow_custom_parameter") Boolean allowCustomParameter, @JsonProperty("force") Boolean force,
+			@JsonProperty("workflow_id") String workflow_id,
+			@JsonProperty("allow_custom_parameters") Boolean allowCustomParameters, 
+			@JsonProperty("force") Boolean force,
+			@JsonProperty("tenant") String tenant,
 			@JsonProperty("parameters") Map<String, Object> parameters) {
 		this.deployment_id = deployment_id;
-		this.workflow_name = workflow_name;
-		this.allow_custom_parameter = allowCustomParameter;
+		this.workflow_id = workflow_id;
+		this.allow_custom_parameters = allowCustomParameters;
 		this.force = force;
+		this.tenant = tenant;
 		this.parameters = parameters;
 	}