Merge "Add UT Test for resource parameters function"

[so.git] / mso-api-handlers / mso-api-handler-common / src / main / java / org / openecomp / mso / apihandler / camundabeans / CamundaVIDRequest.java

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 71fddd8..faa6691 100644 (file)
--- 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
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
+ * ONAP - SO
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -20,12 +20,12 @@
 
 package org.openecomp.mso.apihandler.camundabeans;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonRootName;
-import org.codehaus.jackson.annotate.JsonPropertyOrder;
-
 import org.openecomp.mso.apihandler.common.CommonConstants;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonRootName;
+
 /**
  * JavaBean JSON class for a "variables" which contains the JSON payload that
  * will be passed to the Camunda process
@@ -36,9 +36,10 @@ import org.openecomp.mso.apihandler.common.CommonConstants;
        CommonConstants.REQUEST_ACTION_VARIABLE, CommonConstants.SERVICE_INSTANCE_ID_VARIABLE,
        CommonConstants.VNF_ID_VARIABLE, CommonConstants.VF_MODULE_ID_VARIABLE,
        CommonConstants.VOLUME_GROUP_ID_VARIABLE, CommonConstants.NETWORK_ID_VARIABLE,
-       CommonConstants.SERVICE_TYPE_VARIABLE, CommonConstants.VNF_TYPE_VARIABLE,
-       CommonConstants.VF_MODULE_TYPE_VARIABLE, CommonConstants.NETWORK_TYPE_VARIABLE,
-       CommonConstants.CAMUNDA_SERVICE_INPUT})
+       CommonConstants.CONFIGURATION_ID_VARIABLE, CommonConstants.SERVICE_TYPE_VARIABLE, 
+       CommonConstants.VNF_TYPE_VARIABLE, CommonConstants.VF_MODULE_TYPE_VARIABLE, 
+       CommonConstants.NETWORK_TYPE_VARIABLE, CommonConstants.CAMUNDA_SERVICE_INPUT,
+       CommonConstants.CAMUNDA_SERVICE_INPUT, CommonConstants.RECIPE_PARAMS})
 @JsonRootName(CommonConstants.CAMUNDA_ROOT_INPUT)
 public class CamundaVIDRequest {
 
@@ -79,6 +80,9 @@ public class CamundaVIDRequest {
        @JsonProperty(CommonConstants.NETWORK_ID_VARIABLE)
        private CamundaInput networkId;
 
+       @JsonProperty(CommonConstants.CONFIGURATION_ID_VARIABLE)
+       private CamundaInput configurationId;
+
        @JsonProperty(CommonConstants.SERVICE_TYPE_VARIABLE)
        private CamundaInput serviceType;
 
@@ -91,6 +95,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;
@@ -210,6 +217,16 @@ public class CamundaVIDRequest {
                this.networkId = networkId;
        }
 
+       @JsonProperty(CommonConstants.CONFIGURATION_ID_VARIABLE)
+       public CamundaInput getConfigurationId() {
+               return configurationId;
+       }
+
+       @JsonProperty(CommonConstants.CONFIGURATION_ID_VARIABLE)
+       public void setConfigurationId(CamundaInput configurationId) {
+               this.configurationId = configurationId;
+       }
+
        @JsonProperty(CommonConstants.SERVICE_TYPE_VARIABLE)
        public CamundaInput getServiceType() {
                return serviceType;
@@ -250,6 +267,15 @@ public class CamundaVIDRequest {
                this.networkType = networkType;
        }
 
+       @JsonProperty(CommonConstants.RECIPE_PARAMS)
+       public CamundaInput getRecipeParams() {
+               return recipeParams;
+       }
+
+       @JsonProperty(CommonConstants.RECIPE_PARAMS)
+       public void setRecipeParams(CamundaInput recipeParams) {
+               this.recipeParams = recipeParams;
+       }
 
        @Override
        public String toString() {