Merge "Added ConfigurationScaleOutBB, tasks, and tests"

3 files changed, 124 insertions, 0 deletions

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/beans/ConfigScaleOutPayload.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/beans/ConfigScaleOutPayload.java
new file mode 100644
index 0000000000..9035f4d506
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/beans/ConfigScaleOutPayload.java
@@ -0,0 +1,58 @@
+/* ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.bpmn.appc.payload.beans;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class ConfigScaleOutPayload {
+
+	@JsonProperty("request-parameters")
+	private RequestParametersConfigScaleOut requestParameters;
+	@JsonProperty("configuration-parameters")
+	private Map<String, String> configurationParameters = new HashMap<>();
+
+	public RequestParametersConfigScaleOut getRequestParameters() {
+		return requestParameters;
+	}
+	
+	public void setRequestParameters(RequestParametersConfigScaleOut requestParameters) {
+		this.requestParameters = requestParameters;
+	}
+	
+	public Map<String, String> getConfigurationParameters() {
+		return configurationParameters;
+	}
+
+	public void setConfigurationParameters(Map<String, String> configurationParameters) {
+		this.configurationParameters = configurationParameters;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("ConfigScaleOutPayload{");
+		sb.append("requestParameters=").append(requestParameters);
+		sb.append(", configurationParameters='").append(configurationParameters);
+		sb.append('}');
+		return sb.toString();
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/beans/RequestParametersConfigScaleOut.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/beans/RequestParametersConfigScaleOut.java
new file mode 100644
index 0000000000..0333fd7a78
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/appc/payload/beans/RequestParametersConfigScaleOut.java
@@ -0,0 +1,55 @@
+/* ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.bpmn.appc.payload.beans;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class RequestParametersConfigScaleOut {
+
+	@JsonProperty("vnf-host-ip-address")
+	private String vnfHostIpAddress;
+	@JsonProperty("vf-module-id")
+	private String vfModuleId;
+
+	public String getVnfHostIpAddress() {
+		return vnfHostIpAddress;
+	}
+
+	public void setVnfHostIpAddress(String vnfHostIpAddress) {
+		this.vnfHostIpAddress = vnfHostIpAddress;
+	}
+
+	public String getVfModuleId() {
+		return vfModuleId;
+	}
+
+	public void setVfModuleId(String vfModuleId) {
+		this.vfModuleId = vfModuleId;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder sb = new StringBuilder("RequestParametersConfigScaleOut{");
+		sb.append("vnf-host-ip-address=").append(vnfHostIpAddress);
+		sb.append(", vf-module-id='").append(vfModuleId);
+		sb.append('}');
+		return sb.toString();
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/generalobjects/RequestContext.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/generalobjects/RequestContext.java
index 7715651b68..d37c8d13f3 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/generalobjects/RequestContext.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/generalobjects/RequestContext.java
@@ -21,7 +21,10 @@
 package org.onap.so.bpmn.servicedecomposition.generalobjects;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
@@ -51,6 +54,8 @@ public class RequestContext implements Serializable{
 	private String msoRequestId;
 	@JsonProperty("requestParameters")
 	private RequestParameters requestParameters;
+	@JsonProperty("configurationParameters")
+	private List<Map<String, String>> configurationParameters = new ArrayList<>();
 	
 	public String getServiceURI() {
 		return serviceURI;
@@ -112,4 +117,10 @@ public class RequestContext implements Serializable{
 	public void setRequestParameters(RequestParameters requestParameters) {
 		this.requestParameters = requestParameters;
 	}
+	public List<Map<String, String>> getConfigurationParameters() {
+		return configurationParameters;
+	}
+	public void setConfigurationParameters(List<Map<String, String>> configurationParameters) {
+		this.configurationParameters = configurationParameters;
+	}
 }