Added changes for vDNS Use Case

-Renamed remaining MSO classes and packages to SO and modified drl
accordingly
-Connected SO Interface to SO Simulator
-Added vDNS Control Loop junit
-Modified SOActorServiceProvider to reflect AAI class changes (POLICY-103)

Issue-ID: POLICY-102

Change-Id: Iea5d3f096c4ccfedde68e79d7593d66331127aaf
Signed-off-by: Hockla, Ali (ah999m) <ah999m@att.com>

19 files changed, 1134 insertions, 0 deletions

diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOAsyncRequestStatus.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOAsyncRequestStatus.java
new file mode 100644
index 000000000..97978c73f
--- /dev/null
+++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOAsyncRequestStatus.java
@@ -0,0 +1,63 @@
+/*-

+ * ============LICENSE_START=======================================================

+ * mso

+ * ================================================================================

+ * 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.policy.so;

+

+import java.io.Serializable;

+import java.time.LocalDateTime;

+

+import com.google.gson.annotations.SerializedName;

+

+public class SOAsyncRequestStatus implements Serializable {

+

+	/**

+	 * 

+	 */

+	private static final long serialVersionUID = -3283942659786236032L;

+	

+	@SerializedName("correlator")

+	public String correlator;

+	

+	@SerializedName("requestId")

+	public String requestId;

+	

+	@SerializedName("instanceReferences")

+	public SOInstanceReferences instanceReferences;

+

+	@SerializedName("startTime")

+	public LocalDateTime startTime;

+	

+	@SerializedName("finishTime")

+	public LocalDateTime finishTime;

+	

+	@SerializedName("requestScope")

+	public String requestScope;

+	

+	@SerializedName("requestType")

+	public String requestType;

+	

+	@SerializedName("requestStatus")

+	public SORequestStatus requestStatus;

+	

+

+	public SOAsyncRequestStatus() {

+	}

+

+}

diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOCloudConfiguration.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOCloudConfiguration.java
new file mode 100644
index 000000000..6b817075f
--- /dev/null
+++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOCloudConfiguration.java
@@ -0,0 +1,44 @@
+/*-

+ * ============LICENSE_START=======================================================

+ * mso

+ * ================================================================================

+ * 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.policy.so;

+

+import java.io.Serializable;

+

+

+import com.google.gson.annotations.SerializedName;

+

+public class SOCloudConfiguration implements Serializable {

+

+	/**

+	 * 

+	 */

+	private static final long serialVersionUID = -3283942659786236032L;

+	

+	@SerializedName("lcpCloudRegionId")

+	public String lcpCloudRegionId;

+	

+	@SerializedName("tenantId")

+	public String tenantId;

+

+	public SOCloudConfiguration() {

+	}

+

+}

diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOInstanceReferences.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOInstanceReferences.java
new file mode 100644
index 000000000..97abd3950
--- /dev/null
+++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOInstanceReferences.java
@@ -0,0 +1,44 @@
+/*-

+ * ============LICENSE_START=======================================================

+ * mso

+ * ================================================================================

+ * 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.policy.so;

+

+import java.io.Serializable;

+

+

+import com.google.gson.annotations.SerializedName;

+

+public class SOInstanceReferences implements Serializable {

+

+	/**

+	 * 

+	 */

+	private static final long serialVersionUID = -3283942659786236032L;

+	

+	@SerializedName("requestId")

+	public String requestId;

+	

+	@SerializedName("instanceId")

+	public String instanceId;

+	

+	public SOInstanceReferences() {

+	}

+

+}

diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOManager.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOManager.java
new file mode 100644
index 000000000..86ade6db7
--- /dev/null
+++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOManager.java
@@ -0,0 +1,168 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * mso
+ * ================================================================================
+ * 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.policy.so;
+
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.onap.policy.so.util.Serialization;
+import org.onap.policy.rest.RESTManager;
+import org.onap.policy.rest.RESTManager.Pair;
+import org.drools.core.WorkingMemory;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonSyntaxException;
+
+public final class SOManager {
+
+	private static final Logger logger = LoggerFactory.getLogger(SOManager.class);
+	private static ExecutorService executors = Executors.newCachedThreadPool();
+		
+	public static SOResponse createModuleInstance(String url, String urlBase, String username, String password, SORequest request) {
+		
+		//
+		// Call REST
+		//
+		Map<String, String> headers = new HashMap<String, String>();
+		//headers.put("X-FromAppId", "POLICY");
+		//headers.put("X-TransactionId", requestID.toString());
+		headers.put("Accept", "application/json");
+		
+		//
+		// 201 - CREATED - you are done just return 
+		//
+		
+		Pair<Integer, String> httpDetails = RESTManager.post(url, username, password, headers, "application/json", Serialization.gsonPretty.toJson(request));
+		
+		if (httpDetails == null) {
+			return null;
+		}
+		
+		if (httpDetails.a == 202) {
+			try {
+				SOResponse response = Serialization.gsonPretty.fromJson(httpDetails.b, SOResponse.class);
+				
+				String body = Serialization.gsonPretty.toJson(response);
+				logger.debug("***** Response to post:");
+				logger.debug(body);
+				
+				String requestId = response.requestReferences.requestId;
+				int attemptsLeft = 20;
+				
+				//String getUrl = "/orchestrationRequests/v2/"+requestId;
+				String urlGet = urlBase + "/orchestrationRequests/v2/"+requestId;
+				SOResponse responseGet = null;
+				
+				while(attemptsLeft-- > 0){
+					
+					Pair<Integer, String> httpDetailsGet = RESTManager.get(urlGet, username, password, headers);
+					responseGet = Serialization.gsonPretty.fromJson(httpDetailsGet.b, SOResponse.class);
+					body = Serialization.gsonPretty.toJson(responseGet);
+					logger.debug("***** Response to get:");
+					logger.debug(body);
+					
+					if(httpDetailsGet.a == 200){
+						if(responseGet.request.requestStatus.requestState.equalsIgnoreCase("COMPLETE") || 
+								responseGet.request.requestStatus.requestState.equalsIgnoreCase("FAILED")){
+							logger.debug("***** ########  VF Module Creation "+responseGet.request.requestStatus.requestState);
+							return responseGet;
+						}
+					}
+					Thread.sleep(20000);
+				}
+
+				if (responseGet != null
+				 && responseGet.request != null
+				 &&	responseGet.request.requestStatus != null
+				 && responseGet.request.requestStatus.requestState != null) {
+					logger.warn("***** ########  VF Module Creation timeout. Status: ( {})", responseGet.request.requestStatus.requestState);
+				}
+
+				return responseGet;
+			} catch (JsonSyntaxException e) {
+				logger.error("Failed to deserialize into SOResponse: ", e);
+			} catch (InterruptedException e) {
+				logger.error("Interrupted exception: ", e);
+			}
+		}
+		
+		
+		
+		
+		return null;
+	}
+
+	/**
+	 * 
+	 * @param wm
+	 * @param url
+	 * @param urlBase
+	 * @param username
+	 * @param password
+	 * @param request
+	 * 
+	 * This method makes an asynchronous Rest call to MSO and inserts the response into the Drools working memory
+	 */
+	  public void asyncSORestCall(WorkingMemory wm, String serviceInstanceId, String vnfInstanceId, SORequest request) {
+		  executors.submit(new Runnable()
+		  	{
+			  @Override
+			  	public void run()
+			  {
+			  	String serverRoot = "http://localhost:6667"; // TODO
+			  	String username = "username"; // TODO
+			  	String password = "password"; // TODO
+				String url = serverRoot + "/serviceInstances/v2/" + serviceInstanceId + "/vnfs/" + vnfInstanceId + "/vfModulesHTTPS/1.1";
+				
+				String auth = username + ":" + password;
+				
+				Map<String, String> headers = new HashMap<String, String>();
+				byte[] encodedBytes = Base64.getEncoder().encode(auth.getBytes());
+				headers.put("Accept", "application/json");
+				headers.put("Authorization", "Basic " + new String(encodedBytes));
+				
+				Gson gsonPretty = new GsonBuilder().disableHtmlEscaping()
+						.setPrettyPrinting()
+						.create();
+
+				String msoJson = gsonPretty.toJson(request);
+				
+				SOResponse mso = new SOResponse();
+				Pair<Integer, String> httpResponse = RESTManager.post(url, "policy", "policy", headers, "application/json", msoJson);
+				if (httpResponse != null) {
+					Gson gson = new Gson();
+					mso = gson.fromJson(httpResponse.b, SOResponse.class);
+					mso.httpResponseCode = httpResponse.a;
+				}
+
+				wm.insert(mso);
+				logger.info("SOResponse inserted " + gsonPretty.toJson(mso));
+			  }
+		  	});
+	  }
+
+}
diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOModelInfo.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOModelInfo.java
new file mode 100644
index 000000000..94070ba9a
--- /dev/null
+++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOModelInfo.java
@@ -0,0 +1,59 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * mso
+ * ================================================================================
+ * 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.policy.so;
+
+import java.io.Serializable;
+
+
+import com.google.gson.annotations.SerializedName;
+
+public class SOModelInfo implements Serializable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -3283942659786236032L;
+	
+	@SerializedName("modelType")
+	public String modelType;
+	
+	@SerializedName("modelInvariantId")
+	public String modelInvariantId;
+	
+	@SerializedName("modelNameVersionId")
+	public String modelNameVersionId;
+	
+	@SerializedName("modelName")
+	public String modelName;
+	
+	@SerializedName("modelVersion")
+	public String modelVersion;
+
+	@SerializedName("modelCustomizationName")
+	public String modelCustomizationName;
+
+	@SerializedName("modelCustomizationId")
+	public String modelCustomizationId;
+
+	public SOModelInfo() {
+	}
+
+}
diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOPolicyException.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOPolicyException.java
new file mode 100644
index 000000000..150733963
--- /dev/null
+++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOPolicyException.java
@@ -0,0 +1,43 @@
+/*-

+ * ============LICENSE_START=======================================================

+ * mso

+ * ================================================================================

+ * 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.policy.so;

+

+import java.io.Serializable;

+

+import com.google.gson.annotations.SerializedName;

+

+public class SOPolicyException implements Serializable {

+

+	/**

+	 * 

+	 */

+	private static final long serialVersionUID = -3283942659786236032L;

+	

+	@SerializedName("messageId")

+	public String messageId;	

+	

+	@SerializedName("text")

+	public String text;

+	

+	public SOPolicyException() {

+	}

+

+}

diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORelatedInstance.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORelatedInstance.java
new file mode 100644
index 000000000..ac737307c
--- /dev/null
+++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORelatedInstance.java
@@ -0,0 +1,49 @@
+/*-

+ * ============LICENSE_START=======================================================

+ * mso

+ * ================================================================================

+ * 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.policy.so;

+

+import java.io.Serializable;

+

+

+

+import com.google.gson.annotations.SerializedName;

+

+public class SORelatedInstance implements Serializable {

+

+	/**

+	 * 

+	 */

+	private static final long serialVersionUID = -3283942659786236032L;

+	

+	@SerializedName("instanceId")

+	public String instanceId;

+	

+	@SerializedName("instanceName")

+	public String instanceName;

+	

+	@SerializedName("modelInfo")

+	public SOModelInfo modelInfo;

+	

+	

+	public SORelatedInstance() {

+	}

+

+}

diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORelatedInstanceListElement.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORelatedInstanceListElement.java
new file mode 100644
index 000000000..c4b85ab52
--- /dev/null
+++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORelatedInstanceListElement.java
@@ -0,0 +1,42 @@
+/*-

+ * ============LICENSE_START=======================================================

+ * mso

+ * ================================================================================

+ * 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.policy.so;

+

+import java.io.Serializable;

+

+

+import com.google.gson.annotations.SerializedName;

+

+public class SORelatedInstanceListElement implements Serializable {

+

+	/**

+	 * 

+	 */

+	private static final long serialVersionUID = -3283942659786236032L;

+	

+	@SerializedName("relatedInstance")

+	public SORelatedInstance relatedInstance;

+	

+	

+	public SORelatedInstanceListElement() {

+	}

+

+}

diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequest.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequest.java
new file mode 100644
index 000000000..3e90ff345
--- /dev/null
+++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequest.java
@@ -0,0 +1,61 @@
+/*-

+ * ============LICENSE_START=======================================================

+ * mso

+ * ================================================================================

+ * 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.policy.so;

+

+import java.io.Serializable;

+import java.time.LocalDateTime;

+import java.util.UUID;

+

+import com.google.gson.annotations.SerializedName;

+

+public class SORequest implements Serializable {

+

+	/**

+	 * 

+	 */

+	private static final long serialVersionUID = -3283942659786236032L;

+	

+	@SerializedName("requestId")

+	public UUID requestId;

+	

+	@SerializedName("startTime")

+	//public LocalDateTime startTime;

+	public String startTime;

+	

+	@SerializedName("finishTime")

+	public LocalDateTime finishTime;

+	

+	@SerializedName("requestScope")

+	public String requestScope;

+	

+	@SerializedName("requestType")

+	public String requestType;

+	

+	@SerializedName("requestDetails")

+	public SORequestDetails requestDetails;

+	

+	@SerializedName("requestStatus")

+	public SORequestStatus requestStatus;

+

+	public SORequest() {

+	}

+

+}

diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestDetails.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestDetails.java
new file mode 100644
index 000000000..ab4afc16c
--- /dev/null
+++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestDetails.java
@@ -0,0 +1,124 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * mso
+ * ================================================================================
+ * 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.policy.so;
+
+import java.io.Serializable;
+import java.util.LinkedList;
+import java.util.List;
+
+import com.google.gson.annotations.SerializedName;
+
+public class SORequestDetails implements Serializable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -3283942659786236032L;
+	
+	@SerializedName("modelInfo")
+	public SOModelInfo modelInfo;
+	
+	@SerializedName("cloudConfiguration")
+	public SOCloudConfiguration cloudConfiguration;
+	
+	@SerializedName("requestInfo")
+	public SORequestInfo requestInfo;
+	
+	@SerializedName("subscriberInfo")
+	public SOSubscriberInfo subscriberInfo;
+	
+	@SerializedName("relatedInstanceList")
+	public List<SORelatedInstanceListElement> relatedInstanceList= new LinkedList<SORelatedInstanceListElement>();	
+	
+	@SerializedName("requestParameters")
+	public SORequestParameters requestParameters;
+
+	public SORequestDetails() {
+		
+	}
+
+	public SORequestDetails(SORequestDetails soRequestDetails) {
+		this.modelInfo = soRequestDetails.modelInfo;
+		this.cloudConfiguration = soRequestDetails.cloudConfiguration;
+		this.requestInfo = soRequestDetails.requestInfo;
+		this.relatedInstanceList = soRequestDetails.relatedInstanceList;
+		this.requestParameters = soRequestDetails.requestParameters;
+	}
+
+	@Override
+	public String toString() {
+		return "SORequestDetails [modelInfo=" + modelInfo
+				+ ", cloudConfiguration=" + cloudConfiguration
+				+ ", requestInfo=" + requestInfo + ", relatedInstanceList="
+				+ relatedInstanceList + ", requestParameters="
+				+ requestParameters + "]";
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((cloudConfiguration == null) ? 0 : cloudConfiguration.hashCode());
+		result = prime * result + ((modelInfo == null) ? 0 : modelInfo.hashCode());
+		result = prime * result + ((relatedInstanceList == null) ? 0 : relatedInstanceList.hashCode());
+		result = prime * result + ((requestInfo == null) ? 0 : requestInfo.hashCode());
+		result = prime * result + ((requestParameters == null) ? 0 : requestParameters.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		SORequestDetails other = (SORequestDetails) obj;
+		if (cloudConfiguration == null) {
+			if (other.cloudConfiguration != null)
+				return false;
+		} else if (!cloudConfiguration.equals(other.cloudConfiguration))
+			return false;
+		if (modelInfo == null) {
+			if (other.modelInfo != null)
+				return false;
+		} else if (!modelInfo.equals(other.modelInfo))
+			return false;
+		if (relatedInstanceList == null) {
+			if (other.relatedInstanceList != null)
+				return false;
+		} else if (!relatedInstanceList.equals(other.relatedInstanceList))
+			return false;
+		if (requestInfo == null) {
+			if (other.requestInfo != null)
+				return false;
+		} else if (!requestInfo.equals(other.requestInfo))
+			return false;
+		if (requestParameters == null) {
+			if (other.requestParameters != null)
+				return false;
+		} else if (!requestParameters.equals(other.requestParameters))
+			return false;
+		return true;
+	}
+	
+}
diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestError.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestError.java
new file mode 100644
index 000000000..d49897c72
--- /dev/null
+++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestError.java
@@ -0,0 +1,59 @@
+/*-

+ * ============LICENSE_START=======================================================

+ * mso

+ * ================================================================================

+ * 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.policy.so;

+

+import java.io.Serializable;

+

+import com.google.gson.annotations.SerializedName;

+

+public class SORequestError implements Serializable {

+

+	/**

+	 * 

+	 */

+	private static final long serialVersionUID = -3283942659786236032L;

+	

+	

+	@SerializedName("policyException")

+	public SOPolicyException policyException;

+	

+	

+	@SerializedName("serviceException")

+	public SOServiceException serviceException;

+	

+	/*

+	@SerializedName("messageId")

+	public String messageId;

+	

+	@SerializedName("text")

+	public String text;

+	

+	@SerializedName("url")

+	public String url;

+

+	@SerializedName("variables")

+	public String variables;

+	*/

+

+	public SORequestError() {

+	}

+

+}

diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestInfo.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestInfo.java
new file mode 100644
index 000000000..640649800
--- /dev/null
+++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestInfo.java
@@ -0,0 +1,66 @@
+/*-

+ * ============LICENSE_START=======================================================

+ * mso

+ * ================================================================================

+ * 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.policy.so;

+

+import java.io.Serializable;

+

+

+import com.google.gson.annotations.SerializedName;

+

+public class SORequestInfo implements Serializable {

+

+	/**

+	 * 

+	 */

+	private static final long serialVersionUID = -3283942659786236032L;

+	

+	@SerializedName("instanceName")

+	public String instanceName;

+	

+	@SerializedName("source")

+	public String source;

+	

+	@SerializedName("productFamilyId")

+	public String productFamilyId;

+	

+	@SerializedName("suppressRollback")

+	public boolean suppressRollback;

+	

+	@SerializedName("billingAccountNumber")

+	public String billingAccountNumber;

+	

+	@SerializedName("callbackUrl")

+	public String callbackUrl;

+	

+	@SerializedName("correlator")

+	public String correlator;

+	

+	@SerializedName("orderNumber")

+	public String orderNumber;

+	

+	@SerializedName("orderVersion")

+	public Integer orderVersion;

+	

+

+	public SORequestInfo() {

+	}

+

+}

diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestParameters.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestParameters.java
new file mode 100644
index 000000000..c66f0979c
--- /dev/null
+++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestParameters.java
@@ -0,0 +1,47 @@
+/*-

+ * ============LICENSE_START=======================================================

+ * mso

+ * ================================================================================

+ * 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.policy.so;

+

+import java.io.Serializable;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Map;

+

+

+import com.google.gson.annotations.SerializedName;

+

+public class SORequestParameters implements Serializable {

+

+	/**

+	 * 

+	 */

+	private static final long serialVersionUID = -3283942659786236032L;

+	

+	@SerializedName("subscriptionServiceType")

+	public String subscriptionServiceType;

+	

+	@SerializedName("userParams")

+	public List<Map<String, String>> userParams = new LinkedList<Map<String, String>>();

+

+	public SORequestParameters() {

+	}

+

+}

diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestReferences.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestReferences.java
new file mode 100644
index 000000000..f3e15e1d7
--- /dev/null
+++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestReferences.java
@@ -0,0 +1,38 @@
+/*-

+ * ============LICENSE_START=======================================================

+ * mso

+ * ================================================================================

+ * 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.policy.so;

+

+import java.io.Serializable;

+

+

+import com.google.gson.annotations.SerializedName;

+

+public class SORequestReferences implements Serializable {

+

+	private static final long serialVersionUID = -3283942659786236032L;

+	

+	@SerializedName("instanceId")

+	public String instanceId;

+	

+	@SerializedName("requestId")

+	public String requestId;

+

+}

diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestStatus.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestStatus.java
new file mode 100644
index 000000000..4b57fc7ba
--- /dev/null
+++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestStatus.java
@@ -0,0 +1,51 @@
+/*-

+ * ============LICENSE_START=======================================================

+ * mso

+ * ================================================================================

+ * 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.policy.so;

+

+import java.io.Serializable;

+

+import com.google.gson.annotations.SerializedName;

+

+public class SORequestStatus implements Serializable {

+

+	/**

+	 * 

+	 */

+	private static final long serialVersionUID = -3283942659786236032L;

+	

+	@SerializedName("percentProgress")

+	public int percentProgress;

+	

+	@SerializedName("requestState")

+	public String requestState;

+	

+	@SerializedName("timestamp")

+	//public LocalDateTime timestamp;

+	public String timestamp;

+

+	@SerializedName("wasRolledBack")

+	public boolean wasRolledBack;

+	

+

+	public SORequestStatus() {

+	}

+

+}

diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOResponse.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOResponse.java
new file mode 100644
index 000000000..c5c3737b2
--- /dev/null
+++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOResponse.java
@@ -0,0 +1,49 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * mso
+ * ================================================================================
+ * 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.policy.so;
+
+import java.io.Serializable;
+
+import com.google.gson.annotations.SerializedName;
+
+public class SOResponse implements Serializable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -3283942659786236032L;
+	
+	@SerializedName("requestReferences")
+	public SORequestReferences requestReferences;
+	
+	@SerializedName("requestError")
+	public SORequestError requestError;
+	
+	@SerializedName("request")
+	public SORequest request;
+
+	public int httpResponseCode;
+	
+
+	public SOResponse() {
+	}
+
+}
diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOServiceException.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOServiceException.java
new file mode 100644
index 000000000..58999fd30
--- /dev/null
+++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOServiceException.java
@@ -0,0 +1,48 @@
+/*-

+ * ============LICENSE_START=======================================================

+ * mso

+ * ================================================================================

+ * 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.policy.so;

+

+import java.io.Serializable;

+import java.util.LinkedList;

+import java.util.List;

+

+import com.google.gson.annotations.SerializedName;

+

+public class SOServiceException implements Serializable {

+

+	/**

+	 * 

+	 */

+	private static final long serialVersionUID = -3283942659786236032L;

+	

+	@SerializedName("messageId")

+	public String messageId;	

+	

+	@SerializedName("text")

+	public String text;

+	

+	@SerializedName("variables")

+	public List<String> variables = new LinkedList<String>();

+	

+	public SOServiceException() {

+	}

+

+}

diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOSubscriberInfo.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOSubscriberInfo.java
new file mode 100644
index 000000000..745e237fe
--- /dev/null
+++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOSubscriberInfo.java
@@ -0,0 +1,47 @@
+/*-

+ * ============LICENSE_START=======================================================

+ * mso

+ * ================================================================================

+ * 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.policy.so;

+

+import java.io.Serializable;

+

+

+import com.google.gson.annotations.SerializedName;

+

+public class SOSubscriberInfo implements Serializable {

+

+	/**

+	 * 

+	 */

+	private static final long serialVersionUID = -3283942659786236032L;

+	

+	@SerializedName("globalSubscriberId")

+	public String globalSubscriberId;

+	

+	@SerializedName("subscriberCommonSiteId")

+	public String subscriberCommonSiteId;

+	

+	@SerializedName("subscriberName")

+	public String subscriberName;

+

+	public SOSubscriberInfo() {

+	}

+

+}

diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/util/Serialization.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/util/Serialization.java
new file mode 100644
index 000000000..c9d013ea6
--- /dev/null
+++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/util/Serialization.java
@@ -0,0 +1,32 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * mso
+ * ================================================================================
+ * 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.policy.so.util;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+public final class Serialization {
+	
+	final static public Gson gsonPretty = new GsonBuilder().disableHtmlEscaping()
+			.setPrettyPrinting()
+			.create();
+
+}