added openpojo tests for service instance beans

Change-Id: I97db02310eace781b41b1463239a519a7a167a12
Issue-ID: SO-513
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

20 files changed, 724 insertions, 622 deletions

diff --git a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/ExceptionType.java b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/ExceptionType.java
index d7dcea381c..84518cf160 100644
--- a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/ExceptionType.java
+++ b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/ExceptionType.java
@@ -35,6 +35,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 
 /**
@@ -152,5 +153,15 @@ public class ExceptionType {
         }
         return this.variables;
     }
+    
+    public void setVariables(List<String> variables) {
+    	this.variables = variables;
+    }
+
+	@Override
+	public String toString() {
+		return new ToStringBuilder(this).append("messageId", messageId).append("text", text)
+				.append("variables", variables).toString();
+	}
 
 }
diff --git a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/GetOrchestrationListResponse.java b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/GetOrchestrationListResponse.java
index 5cee0fa237..adb1d38464 100644
--- a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/GetOrchestrationListResponse.java
+++ b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/GetOrchestrationListResponse.java
@@ -24,6 +24,7 @@ import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 @JsonInclude(Include.NON_DEFAULT)
 public class GetOrchestrationListResponse {
@@ -38,4 +39,9 @@ public class GetOrchestrationListResponse {
 		this.requestList = requestList;
 	}
 
+	@Override
+	public String toString() {
+		return new ToStringBuilder(this).append("requestList", requestList).toString();
+	}
+
 }
diff --git a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/GetOrchestrationResponse.java b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/GetOrchestrationResponse.java
index 54b1b3be61..8d57d57513 100644
--- a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/GetOrchestrationResponse.java
+++ b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/GetOrchestrationResponse.java
@@ -22,6 +22,8 @@ package org.openecomp.mso.serviceinstancebeans;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 @JsonInclude(Include.NON_DEFAULT)
 public class GetOrchestrationResponse {
@@ -36,5 +38,10 @@ public class GetOrchestrationResponse {
 		this.request = request;
 	}
 
+	@Override
+	public String toString() {
+		return new ToStringBuilder(this).append("request", request).toString();
+	}
+
 
 }
diff --git a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/InstanceDirection.java b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/InstanceDirection.java
index 3334db7d25..b49825ee60 100644
--- a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/InstanceDirection.java
+++ b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/InstanceDirection.java
@@ -18,18 +18,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.serviceinstancebeans;

-

-public enum InstanceDirection {

-

-    source,

-    destination;

-

-    public String value() {

-        return name();

-    }

-

-    public static InstanceDirection fromValue(String v) {

-        return valueOf(v);

-    }

-}

+package org.openecomp.mso.serviceinstancebeans;
+
+public enum InstanceDirection {
+
+    source,
+    destination;
+
+    public String value() {
+        return name();
+    }
+
+    public static InstanceDirection fromValue(String v) {
+        return valueOf(v);
+    }
+}
diff --git a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/InstanceReferences.java b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/InstanceReferences.java
index c4421886ba..17f09556c3 100644
--- a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/InstanceReferences.java
+++ b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/InstanceReferences.java
@@ -20,6 +20,8 @@
 
 package org.openecomp.mso.serviceinstancebeans;
 
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 
@@ -107,4 +109,15 @@ public class InstanceReferences {
 	public void setRequestorId(String requestorId) {
 		this.requestorId = requestorId;
 	}
+	@Override
+	public String toString() {
+		return new ToStringBuilder(this).append("serviceInstanceId", serviceInstanceId)
+				.append("serviceInstanceName", serviceInstanceName).append("vnfInstanceId", vnfInstanceId)
+				.append("vnfInstanceName", vnfInstanceName).append("vfModuleInstanceId", vfModuleInstanceId)
+				.append("vfModuleInstanceName", vfModuleInstanceName)
+				.append("volumeGroupInstanceId", volumeGroupInstanceId)
+				.append("volumeGroupInstanceName", volumeGroupInstanceName)
+				.append("networkInstanceId", networkInstanceId).append("networkInstanceName", networkInstanceName)
+				.append("requestorId", requestorId).toString();
+	}
 }
diff --git a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/LineOfBusiness.java b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/LineOfBusiness.java
index 818d5e0acc..ce46291da6 100644
--- a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/LineOfBusiness.java
+++ b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/LineOfBusiness.java
@@ -26,6 +26,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 @JsonRootName(value = "lineOfBusiness")
 @JsonInclude(Include.NON_DEFAULT)
@@ -41,4 +42,8 @@ public class LineOfBusiness implements Serializable {
 	public void setLineOfBusinessName(String value){
 		this.lineOfBusinessName = value;
 	}
+	@Override
+	public String toString() {
+		return new ToStringBuilder(this).append("lineOfBusinessName", lineOfBusinessName).toString();
+	}
 }
diff --git a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/ModelType.java b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/ModelType.java
index c7e6615130..1080c57976 100644
--- a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/ModelType.java
+++ b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/ModelType.java
@@ -21,7 +21,7 @@
 package org.openecomp.mso.serviceinstancebeans;
 
 /*
- * Enum for Model Type values returned by API Handler to BPMN

+ * Enum for Model Type values returned by API Handler to BPMN
 */
 public enum ModelType {
 	service,
diff --git a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/Platform.java b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/Platform.java
index 37841e0ea4..a7a34cc39b 100644
--- a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/Platform.java
+++ b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/Platform.java
@@ -26,6 +26,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 @JsonInclude(Include.NON_DEFAULT)
 @JsonRootName(value = "platform")
@@ -41,4 +42,8 @@ public class Platform implements Serializable {
 	public void setPlatformName(String value){
 		this.platformName = value;
 	}
+	@Override
+	public String toString() {
+		return new ToStringBuilder(this).append("platformName", platformName).toString();
+	}
 }
diff --git a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/PolicyException.java b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/PolicyException.java
index 0afd600f6d..dfa23f6490 100644
--- a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/PolicyException.java
+++ b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/PolicyException.java
@@ -1,59 +1,59 @@
-/*-

- * ============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=========================================================

- */

-

-//

-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 

-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 

-// Any modifications to this file will be lost upon recompilation of the source schema. 

-// Generated on: 2016.03.30 at 02:48:23 PM CDT 

-//

-

-

-package org.openecomp.mso.serviceinstancebeans;

-

-import javax.xml.bind.annotation.XmlAccessType;

-import javax.xml.bind.annotation.XmlAccessorType;

-import javax.xml.bind.annotation.XmlType;

-

-

-/**

- * <p>Java class for policyException complex type.

- * 

- * <p>The following schema fragment specifies the expected content contained within this class.

- * 

- * <pre>

- * &lt;complexType name="policyException">

- *   &lt;complexContent>

- *     &lt;extension base="{http://org.openecomp/mso/request/types/v1}exceptionType">

- *     &lt;/extension>

- *   &lt;/complexContent>

- * &lt;/complexType>

- * </pre>

- * 

- * 

- */

-@XmlAccessorType(XmlAccessType.FIELD)

-@XmlType(name = "policyException")

-public class PolicyException

-    extends ExceptionType

-{

-

-

-}

+/*-
+ * ============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=========================================================
+ */
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2016.03.30 at 02:48:23 PM CDT 
+//
+
+
+package org.openecomp.mso.serviceinstancebeans;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for policyException complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="policyException">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://org.openecomp/mso/request/types/v1}exceptionType">
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "policyException")
+public class PolicyException
+    extends ExceptionType
+{
+
+
+}
diff --git a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/Project.java b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/Project.java
index d073616b1c..b7e80162ff 100644
--- a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/Project.java
+++ b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/Project.java
@@ -26,6 +26,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 @JsonRootName(value = "project")
 @JsonInclude(Include.NON_DEFAULT)
@@ -42,4 +43,9 @@ public class Project implements Serializable {
 	public void setProjectName(String value) {
 		this.projectName = value;
 	}
+
+	@Override
+	public String toString() {
+		return new ToStringBuilder(this).append("projectName", projectName).toString();
+	}
 }
diff --git a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/RelatedInstance.java b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/RelatedInstance.java
index 8e4dbd0c87..60e7d9b69a 100644
--- a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/RelatedInstance.java
+++ b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/RelatedInstance.java
@@ -26,6 +26,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 @JsonRootName(value = "relatedInstance")
 @JsonInclude(Include.NON_DEFAULT)
@@ -67,4 +68,9 @@ public class RelatedInstance implements Serializable {
 	public void setInstanceDirection(InstanceDirection instanceDirection) {
 		this.instanceDirection = instanceDirection;
 	}
+	@Override
+	public String toString() {
+		return new ToStringBuilder(this).append("instanceName", instanceName).append("instanceId", instanceId)
+				.append("modelInfo", modelInfo).append("instanceDirection", instanceDirection).toString();
+	}
 }
diff --git a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/Request.java b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/Request.java
index ef9020d889..0671089d99 100644
--- a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/Request.java
+++ b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/Request.java
@@ -22,6 +22,7 @@ package org.openecomp.mso.serviceinstancebeans;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 //@JsonRootName(value = "request")
 @JsonInclude(Include.NON_DEFAULT)
@@ -79,5 +80,12 @@ public class Request {
 	public void setRequestDetails(RequestDetails requestDetails) {
 		this.requestDetails = requestDetails;
 	}
+	@Override
+	public String toString() {
+		return new ToStringBuilder(this).append("requestId", requestId).append("startTime", startTime)
+				.append("requestScope", requestScope).append("requestType", requestType)
+				.append("requestDetails", requestDetails).append("instanceReferences", instanceReferences)
+				.append("requestStatus", requestStatus).toString();
+	}
 
 }
diff --git a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/RequestError.java b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/RequestError.java
index d57364ae09..efd5358073 100644
--- a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/RequestError.java
+++ b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/RequestError.java
@@ -1,118 +1,125 @@
-/*-

- * ============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=========================================================

- */

-

-//

-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 

-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 

-// Any modifications to this file will be lost upon recompilation of the source schema. 

-// Generated on: 2016.04.07 at 08:25:52 AM CDT 

-//

-

-

-package org.openecomp.mso.serviceinstancebeans;

-

-import javax.xml.bind.annotation.XmlAccessType;

-import javax.xml.bind.annotation.XmlAccessorType;

-import javax.xml.bind.annotation.XmlRootElement;

-import javax.xml.bind.annotation.XmlType;

-

-

-/**

- * <p>Java class for anonymous complex type.

- * 

- * <p>The following schema fragment specifies the expected content contained within this class.

- * 

- * <pre>

- * &lt;complexType>

- *   &lt;complexContent>

- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">

- *       &lt;sequence>

- *         &lt;choice>

- *           &lt;element name="policyException" type="{http://org.openecomp/mso/request/types/v1}policyException"/>

- *           &lt;element name="serviceException" type="{http://org.openecomp/mso/request/types/v1}serviceException"/>

- *         &lt;/choice>

- *       &lt;/sequence>

- *     &lt;/restriction>

- *   &lt;/complexContent>

- * &lt;/complexType>

- * </pre>

- * 

- * 

- */

-@XmlAccessorType(XmlAccessType.FIELD)

-@XmlType(name = "", propOrder = {

-    "policyException",

-    "serviceException"

-})

-@XmlRootElement(name = "requestError")

-public class RequestError {

-

-    protected PolicyException policyException;

-    protected ServiceException serviceException;

-

-    /**

-     * Gets the value of the policyException property.

-     * 

-     * @return

-     *     possible object is

-     *     {@link PolicyException }

-     *     

-     */

-    public PolicyException getPolicyException() {

-        return policyException;

-    }

-

-    /**

-     * Sets the value of the policyException property.

-     * 

-     * @param value

-     *     allowed object is

-     *     {@link PolicyException }

-     *     

-     */

-    public void setPolicyException(PolicyException value) {

-        this.policyException = value;

-    }

-

-    /**

-     * Gets the value of the serviceException property.

-     * 

-     * @return

-     *     possible object is

-     *     {@link ServiceException }

-     *     

-     */

-    public ServiceException getServiceException() {

-        return serviceException;

-    }

-

-    /**

-     * Sets the value of the serviceException property.

-     * 

-     * @param value

-     *     allowed object is

-     *     {@link ServiceException }

-     *     

-     */

-    public void setServiceException(ServiceException value) {

-        this.serviceException = value;

-    }

-

-}

+/*-
+ * ============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=========================================================
+ */
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2016.04.07 at 08:25:52 AM CDT 
+//
+
+
+package org.openecomp.mso.serviceinstancebeans;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;choice>
+ *           &lt;element name="policyException" type="{http://org.openecomp/mso/request/types/v1}policyException"/>
+ *           &lt;element name="serviceException" type="{http://org.openecomp/mso/request/types/v1}serviceException"/>
+ *         &lt;/choice>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "policyException",
+    "serviceException"
+})
+@XmlRootElement(name = "requestError")
+public class RequestError {
+
+    protected PolicyException policyException;
+    protected ServiceException serviceException;
+
+    /**
+     * Gets the value of the policyException property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link PolicyException }
+     *     
+     */
+    public PolicyException getPolicyException() {
+        return policyException;
+    }
+
+    /**
+     * Sets the value of the policyException property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link PolicyException }
+     *     
+     */
+    public void setPolicyException(PolicyException value) {
+        this.policyException = value;
+    }
+
+    /**
+     * Gets the value of the serviceException property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ServiceException }
+     *     
+     */
+    public ServiceException getServiceException() {
+        return serviceException;
+    }
+
+    /**
+     * Sets the value of the serviceException property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ServiceException }
+     *     
+     */
+    public void setServiceException(ServiceException value) {
+        this.serviceException = value;
+    }
+
+	@Override
+	public String toString() {
+		return new ToStringBuilder(this).append("policyException", policyException)
+				.append("serviceException", serviceException).toString();
+	}
+
+}
diff --git a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/RequestList.java b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/RequestList.java
index 05e1ab9a7a..799e2f8c60 100644
--- a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/RequestList.java
+++ b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/RequestList.java
@@ -1,38 +1,44 @@
-/*-

- * ============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.openecomp.mso.serviceinstancebeans;

-

-import java.util.List;

-

-

-public class RequestList {

-

-    protected Request request;

-

-	public Request getRequest() {

-		return request;

-	}

-

-	public void setRequest(Request request) {

-		this.request = request;

-	}

-

-}

+/*-
+ * ============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.openecomp.mso.serviceinstancebeans;
+
+import java.util.List;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+
+public class RequestList {
+
+    protected Request request;
+
+	public Request getRequest() {
+		return request;
+	}
+
+	public void setRequest(Request request) {
+		this.request = request;
+	}
+
+	@Override
+	public String toString() {
+		return new ToStringBuilder(this).append("request", request).toString();
+	}
+
+}
diff --git a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/RequestParameters.java b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/RequestParameters.java
index ba65c088eb..45ca91fb71 100644
--- a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/RequestParameters.java
+++ b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/RequestParameters.java
@@ -1,141 +1,144 @@
-/*-

- * ============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.openecomp.mso.serviceinstancebeans;

-

-import java.io.Serializable;

-import java.util.ArrayList;

-import java.util.List;

-import java.util.Map;

-

-import com.fasterxml.jackson.annotation.JsonInclude;

-import com.fasterxml.jackson.annotation.JsonInclude.Include;

-import com.fasterxml.jackson.annotation.JsonProperty;

-import com.fasterxml.jackson.annotation.JsonRootName;

-

-@JsonRootName(value = "requestParameters")

-@JsonInclude(Include.NON_DEFAULT)

-public class RequestParameters implements Serializable {

-

-	private static final long serialVersionUID = -5979049912538894930L;

-	@JsonProperty("subscriptionServiceType")

-	private String subscriptionServiceType;

-	@JsonProperty("userParams")

-	private List<Map<String, Object>> userParams = new ArrayList<>();

-	@JsonProperty("aLaCarte")

-	private Boolean aLaCarte;

-	@JsonProperty("autoBuildVfModules")

-	private Boolean autoBuildVfModules;

-	@JsonProperty("cascadeDelete")

-	private Boolean cascadeDelete;

-	@JsonProperty("usePreload")

-	private Boolean usePreload; // usePreload would always be true for Update

-	@JsonProperty("rebuildVolumeGroups")

-	private Boolean rebuildVolumeGroups;

-	@JsonProperty("payload")

-	private String payload;

-

-	public String getSubscriptionServiceType() {

-		return subscriptionServiceType;

-	}

-

-	public void setSubscriptionServiceType(String subscriptionServiceType) {

-		this.subscriptionServiceType = subscriptionServiceType;

-	}

-

-	public Boolean getALaCarte() {

-		return aLaCarte;

-	}

-

-	public void setaLaCarte(boolean aLaCarte) {

-		this.aLaCarte = aLaCarte;

-	}

-	

-	public Boolean isaLaCarte() {

-		return aLaCarte;

-	}

-

-	public List<Map<String, Object>> getUserParams() {

-		return userParams;

-	}

-

-	public void setUserParams(List<Map<String, Object>> userParams) {

-		this.userParams = userParams;

-	}

-

-	public String getUserParamValue(String name){

-		if(userParams!=null){

-			for(Map<String, Object> param:userParams){

-				if(param.get("name").equals(name)){

-					return param.get("value").toString();

-				}

-			}

-		}

-		return null;

-	}

-

-	public Boolean getAutoBuildVfModules() {

-		return autoBuildVfModules;

-	}

-

-	public void setAutoBuildVfModules(boolean autoBuildVfModules) {

-		this.autoBuildVfModules = autoBuildVfModules;

-	}

-

-	public Boolean getCascadeDelete() {

-		return cascadeDelete;

-	}

-

-	public void setCascadeDelete(boolean cascadeDelete) {

-		this.cascadeDelete = cascadeDelete;

-	}

-

-	public Boolean isUsePreload() {

-		return usePreload;

-	}

-

-	public void setUsePreload(boolean usePreload) {

-		this.usePreload = usePreload;

-	}

-	

-	public Boolean rebuildVolumeGroups() {

-		return rebuildVolumeGroups;

-	}

-

-	public void setRebuildVolumeGroups(boolean rebuildVolumeGroups) {

-		this.rebuildVolumeGroups = rebuildVolumeGroups;

-	}

-	public String getPayload(){

-		return payload;

-	}

-	public void setPayload(String value){

-		this.payload = value;

-	}

-	

-	@Override

-	public String toString() {

-		return "RequestParameters [subscriptionServiceType="

-				+ subscriptionServiceType + ", userParams=" + userParams

-				+ ", aLaCarte=" + aLaCarte + ", autoBuildVfModules="

-				+ autoBuildVfModules + ", usePreload="

-				+ usePreload + ", rebuildVolumeGroups="

-				+ rebuildVolumeGroups + ", payload=" + payload + "]";

-	}

-}

+/*-
+ * ============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.openecomp.mso.serviceinstancebeans;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+
+@JsonRootName(value = "requestParameters")
+@JsonInclude(Include.NON_DEFAULT)
+public class RequestParameters implements Serializable {
+
+	private static final long serialVersionUID = -5979049912538894930L;
+	@JsonProperty("subscriptionServiceType")
+	private String subscriptionServiceType;
+	@JsonProperty("userParams")
+	private List<Map<String, Object>> userParams = new ArrayList<>();
+	@JsonProperty("aLaCarte")
+	private Boolean aLaCarte;
+	@JsonProperty("autoBuildVfModules")
+	private Boolean autoBuildVfModules;
+	@JsonProperty("cascadeDelete")
+	private Boolean cascadeDelete;
+	@JsonProperty("usePreload")
+	private Boolean usePreload; // usePreload would always be true for Update
+	@JsonProperty("rebuildVolumeGroups")
+	private Boolean rebuildVolumeGroups;
+	@JsonProperty("payload")
+	private String payload;
+
+	public String getSubscriptionServiceType() {
+		return subscriptionServiceType;
+	}
+
+	public void setSubscriptionServiceType(String subscriptionServiceType) {
+		this.subscriptionServiceType = subscriptionServiceType;
+	}
+
+	public Boolean getALaCarte() {
+		return aLaCarte;
+	}
+
+	public void setaLaCarte(Boolean aLaCarte) {
+		this.aLaCarte = aLaCarte;
+	}
+	
+	public Boolean isaLaCarte() {
+		return aLaCarte;
+	}
+
+	public List<Map<String, Object>> getUserParams() {
+		return userParams;
+	}
+
+	public void setUserParams(List<Map<String, Object>> userParams) {
+		this.userParams = userParams;
+	}
+
+	public String getUserParamValue(String name){
+		if(userParams!=null){
+			for(Map<String, Object> param:userParams){
+				if(param.get("name").equals(name)){
+					return param.get("value").toString();
+				}
+			}
+		}
+		return null;
+	}
+
+	public Boolean getAutoBuildVfModules() {
+		return autoBuildVfModules;
+	}
+
+	public void setAutoBuildVfModules(Boolean autoBuildVfModules) {
+		this.autoBuildVfModules = autoBuildVfModules;
+	}
+
+	public Boolean getCascadeDelete() {
+		return cascadeDelete;
+	}
+
+	public void setCascadeDelete(Boolean cascadeDelete) {
+		this.cascadeDelete = cascadeDelete;
+	}
+
+	public Boolean isUsePreload() {
+		return usePreload;
+	}
+
+	public void setUsePreload(Boolean usePreload) {
+		this.usePreload = usePreload;
+	}
+	
+	public Boolean rebuildVolumeGroups() {
+		return rebuildVolumeGroups;
+	}
+
+	public Boolean isRebuildVolumeGroups() {
+		return rebuildVolumeGroups;
+	}
+	public void setRebuildVolumeGroups(Boolean rebuildVolumeGroups) {
+		this.rebuildVolumeGroups = rebuildVolumeGroups;
+	}
+	public String getPayload(){
+		return payload;
+	}
+	public void setPayload(String value){
+		this.payload = value;
+	}
+	
+	@Override
+	public String toString() {
+		return "RequestParameters [subscriptionServiceType="
+				+ subscriptionServiceType + ", userParams=" + userParams
+				+ ", aLaCarte=" + aLaCarte + ", autoBuildVfModules="
+				+ autoBuildVfModules + ", usePreload="
+				+ usePreload + ", rebuildVolumeGroups="
+				+ rebuildVolumeGroups + ", payload=" + payload + "]";
+	}
+}
diff --git a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/RequestReferences.java b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/RequestReferences.java
index b01dfd9a3b..d4d70190ff 100644
--- a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/RequestReferences.java
+++ b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/RequestReferences.java
@@ -1,43 +1,49 @@
-/*-

- * ============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.openecomp.mso.serviceinstancebeans;

-

-public class RequestReferences {

-	

-	String requestId;

-	String instanceId;

-	

-	

-	public String getRequestId() {

-		return requestId;

-	}

-	public void setRequestId(String requestId) {

-		this.requestId = requestId;

-	}

-	public String getInstanceId() {

-		return instanceId;

-	}

-	public void setInstanceId(String instanceId) {

-		this.instanceId = instanceId;

-	}

-

-

-}

+/*-
+ * ============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.openecomp.mso.serviceinstancebeans;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+public class RequestReferences {
+	
+	String requestId;
+	String instanceId;
+	
+	
+	public String getRequestId() {
+		return requestId;
+	}
+	public void setRequestId(String requestId) {
+		this.requestId = requestId;
+	}
+	public String getInstanceId() {
+		return instanceId;
+	}
+	public void setInstanceId(String instanceId) {
+		this.instanceId = instanceId;
+	}
+	@Override
+	public String toString() {
+		return new ToStringBuilder(this).append("requestId", requestId).append("instanceId", instanceId).toString();
+	}
+
+
+}
diff --git a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/RequestStatus.java b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/RequestStatus.java
index 58a9c2ca0f..d6a8fc0084 100644
--- a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/RequestStatus.java
+++ b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/RequestStatus.java
@@ -22,6 +22,7 @@ package org.openecomp.mso.serviceinstancebeans;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 @JsonInclude(Include.NON_DEFAULT)
 public class RequestStatus {
@@ -56,4 +57,9 @@ public class RequestStatus {
 	public void setFinishTime(String finishTime) {
 		this.finishTime = finishTime;
 	}
+	@Override
+	public String toString() {
+		return new ToStringBuilder(this).append("requestState", requestState).append("statusMessage", statusMessage)
+				.append("percentProgress", percentProgress).append("finishTime", finishTime).toString();
+	}
 }
diff --git a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/ServiceException.java b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/ServiceException.java
index 5eacefe8c0..0fe8b5f0cf 100644
--- a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/ServiceException.java
+++ b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/ServiceException.java
@@ -1,59 +1,59 @@
-/*-

- * ============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=========================================================

- */

-

-//

-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 

-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 

-// Any modifications to this file will be lost upon recompilation of the source schema. 

-// Generated on: 2016.03.30 at 02:48:23 PM CDT 

-//

-

-

-package org.openecomp.mso.serviceinstancebeans;

-

-import javax.xml.bind.annotation.XmlAccessType;

-import javax.xml.bind.annotation.XmlAccessorType;

-import javax.xml.bind.annotation.XmlType;

-

-

-/**

- * <p>Java class for serviceException complex type.

- * 

- * <p>The following schema fragment specifies the expected content contained within this class.

- * 

- * <pre>

- * &lt;complexType name="serviceException">

- *   &lt;complexContent>

- *     &lt;extension base="{http://org.openecomp/mso/request/types/v1}exceptionType">

- *     &lt;/extension>

- *   &lt;/complexContent>

- * &lt;/complexType>

- * </pre>

- * 

- * 

- */

-@XmlAccessorType(XmlAccessType.FIELD)

-@XmlType(name = "serviceException")

-public class ServiceException

-    extends ExceptionType

-{

-

-

-}

+/*-
+ * ============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=========================================================
+ */
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2016.03.30 at 02:48:23 PM CDT 
+//
+
+
+package org.openecomp.mso.serviceinstancebeans;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for serviceException complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="serviceException">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://org.openecomp/mso/request/types/v1}exceptionType">
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "serviceException")
+public class ServiceException
+    extends ExceptionType
+{
+
+
+}
diff --git a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/ServiceInstancesRequest.java b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/ServiceInstancesRequest.java
index 4f8c1a0f13..a894ffca16 100644
--- a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/ServiceInstancesRequest.java
+++ b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/ServiceInstancesRequest.java
@@ -1,112 +1,112 @@
-/*-

- * ============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.openecomp.mso.serviceinstancebeans;

-

-import java.io.Serializable;

-

-import com.fasterxml.jackson.annotation.JsonProperty;

-

-public class ServiceInstancesRequest implements Serializable {

-

-	private static final long serialVersionUID = -4959169541182257787L;

-	@JsonProperty("requestDetails")

-	private RequestDetails requestDetails;

-	@JsonProperty("serviceInstanceId")

-	private String serviceInstanceId;

-	@JsonProperty("vnfInstanceId")

-	private String vnfInstanceId;

-	@JsonProperty("networkInstanceId")

-	private String networkInstanceId;

-	@JsonProperty("volumeGroupInstanceId")

-	private String volumeGroupInstanceId;

-	@JsonProperty("vfModuleInstanceId")

-	private String vfModuleInstanceId;

-	@JsonProperty("configurationId")

-	private String configurationId;

-

-	public RequestDetails getRequestDetails() {

-		return requestDetails;

-	}

-

-	public void setRequestDetails(RequestDetails requestDetails) {

-		this.requestDetails = requestDetails;

-	}

-

-	public String getServiceInstanceId() {

-		return serviceInstanceId;

-	}

-

-	public void setServiceInstanceId(String serviceInstanceId) {

-		this.serviceInstanceId = serviceInstanceId;

-	}

-

-	public String getVnfInstanceId() {

-		return vnfInstanceId;

-	}

-

-	public void setVnfInstanceId(String vnfInstanceId) {

-		this.vnfInstanceId = vnfInstanceId;

-	}

-

-	public String getNetworkInstanceId() {

-		return networkInstanceId;

-	}

-

-	public void setNetworkInstanceId(String networkInstanceId) {

-		this.networkInstanceId = networkInstanceId;

-	}

-

-	public String getVolumeGroupInstanceId() {

-		return volumeGroupInstanceId;

-	}

-

-	public void setVolumeGroupInstanceId(String volumeGroupInstanceId) {

-		this.volumeGroupInstanceId = volumeGroupInstanceId;

-	}

-

-	public String getVfModuleInstanceId() {

-		return vfModuleInstanceId;

-	}

-

-	public void setVfModuleInstanceId(String vfModuleInstanceId) {

-		this.vfModuleInstanceId = vfModuleInstanceId;

-	}

-

-	public String getConfigurationId() {

-		return configurationId;

-	}

-

-	public void setConfigurationId(String configurationId) {

-		this.configurationId = configurationId;

-	}

-

-	@Override

-	public String toString() {

-		return "ServiceInstancesRequest [requestDetails=" + requestDetails

-				+ ", serviceInstanceId=" + serviceInstanceId

-				+ ", vnfInstanceId=" + vnfInstanceId + ", networkInstanceId="

-				+ networkInstanceId + ", volumeGroupInstanceId="

-				+ volumeGroupInstanceId + ", vfModuleInstanceId="

-				+ vfModuleInstanceId + ", configurationId="

-				+ configurationId + ",]";

-	}

-

-}

+/*-
+ * ============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.openecomp.mso.serviceinstancebeans;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class ServiceInstancesRequest implements Serializable {
+
+	private static final long serialVersionUID = -4959169541182257787L;
+	@JsonProperty("requestDetails")
+	private RequestDetails requestDetails;
+	@JsonProperty("serviceInstanceId")
+	private String serviceInstanceId;
+	@JsonProperty("vnfInstanceId")
+	private String vnfInstanceId;
+	@JsonProperty("networkInstanceId")
+	private String networkInstanceId;
+	@JsonProperty("volumeGroupInstanceId")
+	private String volumeGroupInstanceId;
+	@JsonProperty("vfModuleInstanceId")
+	private String vfModuleInstanceId;
+	@JsonProperty("configurationId")
+	private String configurationId;
+
+	public RequestDetails getRequestDetails() {
+		return requestDetails;
+	}
+
+	public void setRequestDetails(RequestDetails requestDetails) {
+		this.requestDetails = requestDetails;
+	}
+
+	public String getServiceInstanceId() {
+		return serviceInstanceId;
+	}
+
+	public void setServiceInstanceId(String serviceInstanceId) {
+		this.serviceInstanceId = serviceInstanceId;
+	}
+
+	public String getVnfInstanceId() {
+		return vnfInstanceId;
+	}
+
+	public void setVnfInstanceId(String vnfInstanceId) {
+		this.vnfInstanceId = vnfInstanceId;
+	}
+
+	public String getNetworkInstanceId() {
+		return networkInstanceId;
+	}
+
+	public void setNetworkInstanceId(String networkInstanceId) {
+		this.networkInstanceId = networkInstanceId;
+	}
+
+	public String getVolumeGroupInstanceId() {
+		return volumeGroupInstanceId;
+	}
+
+	public void setVolumeGroupInstanceId(String volumeGroupInstanceId) {
+		this.volumeGroupInstanceId = volumeGroupInstanceId;
+	}
+
+	public String getVfModuleInstanceId() {
+		return vfModuleInstanceId;
+	}
+
+	public void setVfModuleInstanceId(String vfModuleInstanceId) {
+		this.vfModuleInstanceId = vfModuleInstanceId;
+	}
+
+	public String getConfigurationId() {
+		return configurationId;
+	}
+
+	public void setConfigurationId(String configurationId) {
+		this.configurationId = configurationId;
+	}
+
+	@Override
+	public String toString() {
+		return "ServiceInstancesRequest [requestDetails=" + requestDetails
+				+ ", serviceInstanceId=" + serviceInstanceId
+				+ ", vnfInstanceId=" + vnfInstanceId + ", networkInstanceId="
+				+ networkInstanceId + ", volumeGroupInstanceId="
+				+ volumeGroupInstanceId + ", vfModuleInstanceId="
+				+ vfModuleInstanceId + ", configurationId="
+				+ configurationId + ",]";
+	}
+
+}
diff --git a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/ServiceInstancesResponse.java b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/ServiceInstancesResponse.java
index 339c965ffd..614a87d009 100644
--- a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/ServiceInstancesResponse.java
+++ b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/ServiceInstancesResponse.java
@@ -1,36 +1,43 @@
-/*-

- * ============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.openecomp.mso.serviceinstancebeans;

-

-public class ServiceInstancesResponse {

-	

-	RequestReferences requestReferences;

-

-	public RequestReferences getRequestReferences() {

-		return requestReferences;

-	}

-

-	public void setRequestReferences(RequestReferences requestReferences) {

-		this.requestReferences = requestReferences;

-	}

-	

-

-}

+/*-
+ * ============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.openecomp.mso.serviceinstancebeans;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+public class ServiceInstancesResponse {
+	
+	RequestReferences requestReferences;
+
+	public RequestReferences getRequestReferences() {
+		return requestReferences;
+	}
+
+	public void setRequestReferences(RequestReferences requestReferences) {
+		this.requestReferences = requestReferences;
+	}
+
+	@Override
+	public String toString() {
+		return new ToStringBuilder(this).append("requestReferences", requestReferences).toString();
+	}
+	
+
+}