[POLICY-22] Reorganizing drools-apps

Change-Id: I5f9bb3908f8d55c466dd847ae5e01a424e9ba364
Signed-off-by: Gao, Chenfei (cg287m) <chenfei.gao11@gmail.com>
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

21 files changed, 0 insertions, 1211 deletions

diff --git a/mso/pom.xml b/mso/pom.xml
deleted file mode 100644
index 98efe7b92..000000000
--- a/mso/pom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  Drools PDP Application Models
-  ================================================================================
-  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=========================================================
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>mso</artifactId>
-
-	<parent>
-		<groupId>org.openecomp.policy.drools-applications</groupId>
-		<artifactId>drools-pdp-apps</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
-	</parent>
-
-  <dependencies>
-	<dependency>
-		<groupId>junit</groupId>
-		<artifactId>junit</artifactId>
-		<version>4.12</version>
-		<scope>provided</scope>
-	</dependency>
-	<dependency>
-		<groupId>com.google.code.gson</groupId>
-		<artifactId>gson</artifactId>
-		<version>2.5</version>
-		<scope>provided</scope>
-	</dependency>
-	<dependency>
-		<groupId>org.openecomp.policy.drools-applications</groupId>
-		<artifactId>rest</artifactId>
-		<version>${project.version}</version>
-	</dependency>
-  </dependencies>
-</project>
diff --git a/mso/src/main/java/org/openecomp/policy/mso/MSOAsyncRequestStatus.java b/mso/src/main/java/org/openecomp/policy/mso/MSOAsyncRequestStatus.java
deleted file mode 100644
index d3c24b403..000000000
--- a/mso/src/main/java/org/openecomp/policy/mso/MSOAsyncRequestStatus.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*-
- * ============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.openecomp.policy.mso;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-import com.google.gson.annotations.SerializedName;
-
-public class MSOAsyncRequestStatus implements Serializable {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -3283942659786236032L;
-	
-	@SerializedName("correlator")
-	public String correlator;
-	
-	@SerializedName("requestId")
-	public String requestId;
-	
-	@SerializedName("instanceReferences")
-	public MSOInstanceReferences instanceReferences;
-
-	@SerializedName("startTime")
-	public LocalDateTime startTime;
-	
-	@SerializedName("finishTime")
-	public LocalDateTime finishTime;
-	
-	@SerializedName("requestScope")
-	public String requestScope;
-	
-	@SerializedName("requestType")
-	public String requestType;
-	
-	@SerializedName("requestStatus")
-	public MSORequestStatus requestStatus;
-	
-
-	public MSOAsyncRequestStatus() {
-	}
-
-}
diff --git a/mso/src/main/java/org/openecomp/policy/mso/MSOCloudConfiguration.java b/mso/src/main/java/org/openecomp/policy/mso/MSOCloudConfiguration.java
deleted file mode 100644
index 847619eaa..000000000
--- a/mso/src/main/java/org/openecomp/policy/mso/MSOCloudConfiguration.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*-
- * ============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.openecomp.policy.mso;
-
-import java.io.Serializable;
-
-
-import com.google.gson.annotations.SerializedName;
-
-public class MSOCloudConfiguration implements Serializable {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -3283942659786236032L;
-	
-	@SerializedName("lcpCloudRegionId")
-	public String lcpCloudRegionId;
-	
-	@SerializedName("tenantId")
-	public String tenantId;
-
-	public MSOCloudConfiguration() {
-	}
-
-}
diff --git a/mso/src/main/java/org/openecomp/policy/mso/MSOInstanceReferences.java b/mso/src/main/java/org/openecomp/policy/mso/MSOInstanceReferences.java
deleted file mode 100644
index 3c3c4961d..000000000
--- a/mso/src/main/java/org/openecomp/policy/mso/MSOInstanceReferences.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*-
- * ============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.openecomp.policy.mso;
-
-import java.io.Serializable;
-
-
-import com.google.gson.annotations.SerializedName;
-
-public class MSOInstanceReferences implements Serializable {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -3283942659786236032L;
-	
-	@SerializedName("requestId")
-	public String requestId;
-	
-	@SerializedName("instanceId")
-	public String instanceId;
-	
-	public MSOInstanceReferences() {
-	}
-
-}
diff --git a/mso/src/main/java/org/openecomp/policy/mso/MSOManager.java b/mso/src/main/java/org/openecomp/policy/mso/MSOManager.java
deleted file mode 100644
index dcac32626..000000000
--- a/mso/src/main/java/org/openecomp/policy/mso/MSOManager.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ============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.openecomp.policy.mso;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.openecomp.policy.mso.util.Serialization;
-import org.openecomp.policy.rest.RESTManager;
-import org.openecomp.policy.rest.RESTManager.Pair;
-
-import com.google.gson.JsonSyntaxException;
-
-public final class MSOManager {
-
-	public static MSOResponse createModuleInstance(String url, String urlBase, String username, String password, MSORequest 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 {
-				MSOResponse response = Serialization.gsonPretty.fromJson(httpDetails.b, MSOResponse.class);
-				
-				String body = Serialization.gsonPretty.toJson(response);
-				System.out.println("***** Response to post:");
-				System.out.println(body);
-				
-				String requestId = response.requestReferences.requestId;
-				int attemptsLeft = 20;
-				
-				//String getUrl = "/orchestrationRequests/v2/"+requestId;
-				String urlGet = urlBase + "/orchestrationRequests/v2/"+requestId;
-				MSOResponse responseGet = null;
-				
-				while(attemptsLeft-- > 0){
-					
-					Pair<Integer, String> httpDetailsGet = RESTManager.get(urlGet, username, password, headers);
-					responseGet = Serialization.gsonPretty.fromJson(httpDetailsGet.b, MSOResponse.class);
-					body = Serialization.gsonPretty.toJson(responseGet);
-					System.out.println("***** Response to get:");
-					System.out.println(body);
-					
-					if(httpDetailsGet.a == 200){
-						if(responseGet.request.requestStatus.requestState.equalsIgnoreCase("COMPLETE") || 
-								responseGet.request.requestStatus.requestState.equalsIgnoreCase("FAILED")){
-							System.out.println("***** ########  VF Module Creation "+responseGet.request.requestStatus.requestState);
-							return responseGet;
-						}
-					}
-					Thread.sleep(20000);
-				}
-				
-				System.out.println("***** ########  VF Module Creation timeout. Status: ("+responseGet.request.requestStatus.requestState+")");
-				return responseGet;
-			} catch (JsonSyntaxException e) {
-				System.err.println("Failed to deserialize into MSOResponse" + e.getLocalizedMessage());
-			} catch (InterruptedException e) {
-				System.err.println("Interrupted exception: " + e.getLocalizedMessage());
-			}
-		}
-		
-		
-		
-		
-		return null;
-	}
-
-}
diff --git a/mso/src/main/java/org/openecomp/policy/mso/MSOModelInfo.java b/mso/src/main/java/org/openecomp/policy/mso/MSOModelInfo.java
deleted file mode 100644
index a908056da..000000000
--- a/mso/src/main/java/org/openecomp/policy/mso/MSOModelInfo.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * ============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.openecomp.policy.mso;
-
-import java.io.Serializable;
-
-
-import com.google.gson.annotations.SerializedName;
-
-public class MSOModelInfo 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;
-
-	public MSOModelInfo() {
-	}
-
-}
diff --git a/mso/src/main/java/org/openecomp/policy/mso/MSOPolicyException.java b/mso/src/main/java/org/openecomp/policy/mso/MSOPolicyException.java
deleted file mode 100644
index 4dc6ad8b2..000000000
--- a/mso/src/main/java/org/openecomp/policy/mso/MSOPolicyException.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * ============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.openecomp.policy.mso;
-
-import java.io.Serializable;
-
-import com.google.gson.annotations.SerializedName;
-
-public class MSOPolicyException implements Serializable {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -3283942659786236032L;
-	
-	@SerializedName("messageId")
-	public String messageId;	
-	
-	@SerializedName("text")
-	public String text;
-	
-	public MSOPolicyException() {
-	}
-
-}
diff --git a/mso/src/main/java/org/openecomp/policy/mso/MSORelatedInstance.java b/mso/src/main/java/org/openecomp/policy/mso/MSORelatedInstance.java
deleted file mode 100644
index 09cbba65d..000000000
--- a/mso/src/main/java/org/openecomp/policy/mso/MSORelatedInstance.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * ============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.openecomp.policy.mso;
-
-import java.io.Serializable;
-
-
-
-import com.google.gson.annotations.SerializedName;
-
-public class MSORelatedInstance implements Serializable {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -3283942659786236032L;
-	
-	@SerializedName("instanceId")
-	public String instanceId;
-	
-	@SerializedName("instanceName")
-	public String instanceName;
-	
-	@SerializedName("modelInfo")
-	public MSOModelInfo modelInfo;
-	
-	
-	public MSORelatedInstance() {
-	}
-
-}
diff --git a/mso/src/main/java/org/openecomp/policy/mso/MSORelatedInstanceListElement.java b/mso/src/main/java/org/openecomp/policy/mso/MSORelatedInstanceListElement.java
deleted file mode 100644
index 31a9158a5..000000000
--- a/mso/src/main/java/org/openecomp/policy/mso/MSORelatedInstanceListElement.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * ============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.openecomp.policy.mso;
-
-import java.io.Serializable;
-
-
-import com.google.gson.annotations.SerializedName;
-
-public class MSORelatedInstanceListElement implements Serializable {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -3283942659786236032L;
-	
-	@SerializedName("relatedInstance")
-	public MSORelatedInstance relatedInstance;
-	
-	
-	public MSORelatedInstanceListElement() {
-	}
-
-}
diff --git a/mso/src/main/java/org/openecomp/policy/mso/MSORequest.java b/mso/src/main/java/org/openecomp/policy/mso/MSORequest.java
deleted file mode 100644
index 331fcb5b3..000000000
--- a/mso/src/main/java/org/openecomp/policy/mso/MSORequest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * ============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.openecomp.policy.mso;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-import com.google.gson.annotations.SerializedName;
-
-public class MSORequest implements Serializable {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -3283942659786236032L;
-	
-	@SerializedName("requestId")
-	public String 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 MSORequestDetails requestDetails;
-	
-	@SerializedName("requestStatus")
-	public MSORequestStatus requestStatus;
-
-	public MSORequest() {
-	}
-
-}
diff --git a/mso/src/main/java/org/openecomp/policy/mso/MSORequestDetails.java b/mso/src/main/java/org/openecomp/policy/mso/MSORequestDetails.java
deleted file mode 100644
index 182675f91..000000000
--- a/mso/src/main/java/org/openecomp/policy/mso/MSORequestDetails.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * ============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.openecomp.policy.mso;
-
-import java.io.Serializable;
-import java.util.LinkedList;
-import java.util.List;
-
-import com.google.gson.annotations.SerializedName;
-
-public class MSORequestDetails implements Serializable {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -3283942659786236032L;
-	
-	@SerializedName("modelInfo")
-	public MSOModelInfo modelInfo;
-	
-	@SerializedName("cloudConfiguration")
-	public MSOCloudConfiguration cloudConfiguration;
-	
-	@SerializedName("requestInfo")
-	public MSORequestInfo requestInfo;
-	
-	@SerializedName("subscriberInfo")
-	public MSOSubscriberInfo subscriberInfo;
-	
-	@SerializedName("relatedInstanceList")
-	public List<MSORelatedInstanceListElement> relatedInstanceList= new LinkedList<MSORelatedInstanceListElement>();	
-	
-	@SerializedName("requestParameters")
-	public MSORequestParameters requestParameters;
-
-	public MSORequestDetails() {
-	}
-
-}
diff --git a/mso/src/main/java/org/openecomp/policy/mso/MSORequestError.java b/mso/src/main/java/org/openecomp/policy/mso/MSORequestError.java
deleted file mode 100644
index 42c4182a0..000000000
--- a/mso/src/main/java/org/openecomp/policy/mso/MSORequestError.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * ============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.openecomp.policy.mso;
-
-import java.io.Serializable;
-
-import com.google.gson.annotations.SerializedName;
-
-public class MSORequestError implements Serializable {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -3283942659786236032L;
-	
-	
-	@SerializedName("policyException")
-	public MSOPolicyException policyException;
-	
-	
-	@SerializedName("serviceException")
-	public MSOServiceException serviceException;
-	
-	/*
-	@SerializedName("messageId")
-	public String messageId;
-	
-	@SerializedName("text")
-	public String text;
-	
-	@SerializedName("url")
-	public String url;
-
-	@SerializedName("variables")
-	public String variables;
-	*/
-
-	public MSORequestError() {
-	}
-
-}
diff --git a/mso/src/main/java/org/openecomp/policy/mso/MSORequestInfo.java b/mso/src/main/java/org/openecomp/policy/mso/MSORequestInfo.java
deleted file mode 100644
index 4c033a465..000000000
--- a/mso/src/main/java/org/openecomp/policy/mso/MSORequestInfo.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * ============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.openecomp.policy.mso;
-
-import java.io.Serializable;
-
-
-import com.google.gson.annotations.SerializedName;
-
-public class MSORequestInfo 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 MSORequestInfo() {
-	}
-
-}
diff --git a/mso/src/main/java/org/openecomp/policy/mso/MSORequestParameters.java b/mso/src/main/java/org/openecomp/policy/mso/MSORequestParameters.java
deleted file mode 100644
index d40cdc9a4..000000000
--- a/mso/src/main/java/org/openecomp/policy/mso/MSORequestParameters.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * ============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.openecomp.policy.mso;
-
-import java.io.Serializable;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-
-import com.google.gson.annotations.SerializedName;
-
-public class MSORequestParameters 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 MSORequestParameters() {
-	}
-
-}
diff --git a/mso/src/main/java/org/openecomp/policy/mso/MSORequestReferences.java b/mso/src/main/java/org/openecomp/policy/mso/MSORequestReferences.java
deleted file mode 100644
index dea094567..000000000
--- a/mso/src/main/java/org/openecomp/policy/mso/MSORequestReferences.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*-
- * ============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.openecomp.policy.mso;
-
-import java.io.Serializable;
-
-
-import com.google.gson.annotations.SerializedName;
-
-public class MSORequestReferences implements Serializable {
-
-	private static final long serialVersionUID = -3283942659786236032L;
-	
-	@SerializedName("instanceId")
-	public String instanceId;
-	
-	@SerializedName("requestId")
-	public String requestId;
-
-}
diff --git a/mso/src/main/java/org/openecomp/policy/mso/MSORequestStatus.java b/mso/src/main/java/org/openecomp/policy/mso/MSORequestStatus.java
deleted file mode 100644
index df2ce898d..000000000
--- a/mso/src/main/java/org/openecomp/policy/mso/MSORequestStatus.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * ============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.openecomp.policy.mso;
-
-import java.io.Serializable;
-
-import com.google.gson.annotations.SerializedName;
-
-public class MSORequestStatus 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 MSORequestStatus() {
-	}
-
-}
diff --git a/mso/src/main/java/org/openecomp/policy/mso/MSOResponse.java b/mso/src/main/java/org/openecomp/policy/mso/MSOResponse.java
deleted file mode 100644
index 51a8c5d42..000000000
--- a/mso/src/main/java/org/openecomp/policy/mso/MSOResponse.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * ============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.openecomp.policy.mso;
-
-import java.io.Serializable;
-
-import com.google.gson.annotations.SerializedName;
-
-public class MSOResponse implements Serializable {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -3283942659786236032L;
-	
-	@SerializedName("requestReferences")
-	public MSORequestReferences requestReferences;
-	
-	@SerializedName("requestError")
-	public MSORequestError requestError;
-	
-	@SerializedName("request")
-	public MSORequest request;
-	
-	
-
-	public MSOResponse() {
-	}
-
-}
diff --git a/mso/src/main/java/org/openecomp/policy/mso/MSOServiceException.java b/mso/src/main/java/org/openecomp/policy/mso/MSOServiceException.java
deleted file mode 100644
index b03da3f2b..000000000
--- a/mso/src/main/java/org/openecomp/policy/mso/MSOServiceException.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * ============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.openecomp.policy.mso;
-
-import java.io.Serializable;
-import java.util.LinkedList;
-import java.util.List;
-
-import com.google.gson.annotations.SerializedName;
-
-public class MSOServiceException 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 MSOServiceException() {
-	}
-
-}
diff --git a/mso/src/main/java/org/openecomp/policy/mso/MSOSubscriberInfo.java b/mso/src/main/java/org/openecomp/policy/mso/MSOSubscriberInfo.java
deleted file mode 100644
index a14ffee33..000000000
--- a/mso/src/main/java/org/openecomp/policy/mso/MSOSubscriberInfo.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * ============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.openecomp.policy.mso;
-
-import java.io.Serializable;
-
-
-import com.google.gson.annotations.SerializedName;
-
-public class MSOSubscriberInfo implements Serializable {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -3283942659786236032L;
-	
-	@SerializedName("globalSubscriberId")
-	public String globalSubscriberId;
-	
-	@SerializedName("subscriberCommonSiteId")
-	public String subscriberCommonSiteId;
-	
-	@SerializedName("subscriberName")
-	public String subscriberName;
-
-	public MSOSubscriberInfo() {
-	}
-
-}
diff --git a/mso/src/main/java/org/openecomp/policy/mso/util/Serialization.java b/mso/src/main/java/org/openecomp/policy/mso/util/Serialization.java
deleted file mode 100644
index fa82dde59..000000000
--- a/mso/src/main/java/org/openecomp/policy/mso/util/Serialization.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*-
- * ============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.openecomp.policy.mso.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();
-
-}
diff --git a/mso/src/test/java/org/openecomp/policy/mso/TestDemo.java b/mso/src/test/java/org/openecomp/policy/mso/TestDemo.java
deleted file mode 100644
index e9a7ec0d0..000000000
--- a/mso/src/test/java/org/openecomp/policy/mso/TestDemo.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*-
- * ============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.openecomp.policy.mso;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.Test;
-import org.openecomp.policy.mso.util.Serialization;
-
-public class TestDemo {
-
-	@Test
-	public void test() {
-		
-		MSORequest request = new MSORequest();
-		request.requestDetails = new MSORequestDetails();
-		request.requestDetails.modelInfo = new MSOModelInfo();
-		request.requestDetails.cloudConfiguration = new MSOCloudConfiguration();
-		request.requestDetails.requestInfo = new MSORequestInfo();
-		request.requestDetails.requestParameters = new MSORequestParameters();
-		
-		request.requestDetails.modelInfo.modelType = "vfModule";
-		request.requestDetails.modelInfo.modelInvariantId = "ff5256d2-5a33-55df-13ab-12abad84e7ff";
-		request.requestDetails.modelInfo.modelNameVersionId = "fe6478e5-ea33-3346-ac12-ab121484a3fe";
-		request.requestDetails.modelInfo.modelName = "vSAMP12..base..module-0";
-		request.requestDetails.modelInfo.modelVersion = "1";
-		
-		request.requestDetails.cloudConfiguration.lcpCloudRegionId = "mdt1";
-		request.requestDetails.cloudConfiguration.tenantId = "88a6ca3ee0394ade9403f075db23167e";
-		
-		request.requestDetails.requestInfo.instanceName = "MSOTEST103a-vSAMP12_base_module-0";
-		request.requestDetails.requestInfo.source = "VID";
-		request.requestDetails.requestInfo.suppressRollback = true;
-		
-		MSORelatedInstanceListElement relatedInstanceListElement1 = new MSORelatedInstanceListElement();
-		MSORelatedInstanceListElement relatedInstanceListElement2 = new MSORelatedInstanceListElement();
-		MSORelatedInstanceListElement relatedInstanceListElement3 = new MSORelatedInstanceListElement();
-		relatedInstanceListElement1.relatedInstance = new MSORelatedInstance();
-		relatedInstanceListElement2.relatedInstance = new MSORelatedInstance();
-		relatedInstanceListElement3.relatedInstance = new MSORelatedInstance();
-		
-		relatedInstanceListElement1.relatedInstance.instanceId = "17ef4658-bd1f-4ef0-9ca0-ea76e2bf122c";
-		relatedInstanceListElement1.relatedInstance.instanceName = "MSOTESTVOL103a-vSAMP12_base_module-0_vol";
-		relatedInstanceListElement1.relatedInstance.modelInfo = new MSOModelInfo();
-		relatedInstanceListElement1.relatedInstance.modelInfo.modelType = "volumeGroup";
-		
-		relatedInstanceListElement2.relatedInstance.instanceId = "serviceInstanceId";
-		relatedInstanceListElement2.relatedInstance.modelInfo = new MSOModelInfo();
-		relatedInstanceListElement2.relatedInstance.modelInfo.modelType = "service";
-		relatedInstanceListElement2.relatedInstance.modelInfo.modelInvariantId = "ff3514e3-5a33-55df-13ab-12abad84e7ff";
-		relatedInstanceListElement2.relatedInstance.modelInfo.modelNameVersionId = "fe6985cd-ea33-3346-ac12-ab121484a3fe";
-		relatedInstanceListElement2.relatedInstance.modelInfo.modelName = "parent service model name";
-		relatedInstanceListElement2.relatedInstance.modelInfo.modelVersion = "1.0";
-		
-		relatedInstanceListElement3.relatedInstance.instanceId = "vnfInstanceId";
-		relatedInstanceListElement3.relatedInstance.modelInfo = new MSOModelInfo();
-		relatedInstanceListElement3.relatedInstance.modelInfo.modelType = "vnf";
-		relatedInstanceListElement3.relatedInstance.modelInfo.modelInvariantId = "ff5256d1-5a33-55df-13ab-12abad84e7ff";
-		relatedInstanceListElement3.relatedInstance.modelInfo.modelNameVersionId = "fe6478e4-ea33-3346-ac12-ab121484a3fe";
-		relatedInstanceListElement3.relatedInstance.modelInfo.modelName = "vSAMP12";
-		relatedInstanceListElement3.relatedInstance.modelInfo.modelVersion = "1.0";
-		relatedInstanceListElement3.relatedInstance.modelInfo.modelCustomizationName = "vSAMP12 1";
-			
-		request.requestDetails.relatedInstanceList.add(relatedInstanceListElement1);
-		request.requestDetails.relatedInstanceList.add(relatedInstanceListElement2);
-		request.requestDetails.relatedInstanceList.add(relatedInstanceListElement3);
-		
-		Map<String, String> userParam1 = new HashMap<String, String>();
-		userParam1.put("name1", "value1");
-		
-		Map<String, String> userParam2 = new HashMap<String, String>();
-		userParam2.put("name2", "value2");
-		
-		request.requestDetails.requestParameters.userParams.add(userParam1);
-		request.requestDetails.requestParameters.userParams.add(userParam2);
-		
-		String body = Serialization.gsonPretty.toJson(request);
-		System.out.println(body);
-		
-		//MSOResponse response = MSOManager.createModuleInstance("http://localhost:7780/", "my_username", "my_passwd", request);
-		
-		//body = Serialization.gsonPretty.toJson(response);
-		//System.out.println(body);
-		
-	}
-	
-	@Test
-	public void testHack() {
-		
-		System.out.println("**  HACK  **");
-		
-		MSORequest request = new MSORequest();
-		//
-		request.requestDetails = new MSORequestDetails();
-		request.requestDetails.modelInfo = new MSOModelInfo();
-		request.requestDetails.cloudConfiguration = new MSOCloudConfiguration();
-		request.requestDetails.requestInfo = new MSORequestInfo();
-		request.requestDetails.requestParameters = new MSORequestParameters();
-		request.requestDetails.requestParameters.userParams = null;
-		
-		request.requestDetails.modelInfo.modelType = "vfModule";
-		request.requestDetails.modelInfo.modelInvariantId = "a9c4a35a-de48-451a-9e4e-343f2ac52928";
-		request.requestDetails.modelInfo.modelNameVersionId = "e0d98ad1-238d-4555-b439-023d3f9079f6";
-		request.requestDetails.modelInfo.modelName = "0d9e0d9d352749f4B3cb..dnsscaling..module-0";
-		request.requestDetails.modelInfo.modelVersion = "2.0";
-		
-		request.requestDetails.cloudConfiguration.lcpCloudRegionId = "DFW";
-		request.requestDetails.cloudConfiguration.tenantId = "1015548";
-		
-		request.requestDetails.requestInfo.instanceName = "Vfmodule_Ete_Name1eScaling63928f-ccdc-4b34-bdef-9bf64109026e";
-		request.requestDetails.requestInfo.source = "POLICY";
-		request.requestDetails.requestInfo.suppressRollback = false;
-		
-		MSORelatedInstanceListElement relatedInstanceListElement1 = new MSORelatedInstanceListElement();
-		MSORelatedInstanceListElement relatedInstanceListElement2 = new MSORelatedInstanceListElement();
-		relatedInstanceListElement1.relatedInstance = new MSORelatedInstance();
-		relatedInstanceListElement2.relatedInstance = new MSORelatedInstance();
-		
-		String serviceInstanceId = "98af39ce-6408-466b-921f-c2c7a8f59ed6";
-		relatedInstanceListElement1.relatedInstance.instanceId = serviceInstanceId;
-		relatedInstanceListElement1.relatedInstance.modelInfo = new MSOModelInfo();
-		relatedInstanceListElement1.relatedInstance.modelInfo.modelType = "service";
-		relatedInstanceListElement1.relatedInstance.modelInfo.modelInvariantId = "24329a0c-1d57-4210-b1af-a65df64e9d59";
-		relatedInstanceListElement1.relatedInstance.modelInfo.modelNameVersionId = "ac642881-8e7e-4217-bd64-16ad41c42e30";
-		relatedInstanceListElement1.relatedInstance.modelInfo.modelName = "5116d67e-0b4f-46bf-a46f";
-		relatedInstanceListElement1.relatedInstance.modelInfo.modelVersion = "2.0";
-		
-		String vnfInstanceId = "8eb411b8-a936-412f-b01f-9a9a435c0e93";
-		relatedInstanceListElement2.relatedInstance.instanceId = vnfInstanceId;
-		relatedInstanceListElement2.relatedInstance.modelInfo = new MSOModelInfo();
-		relatedInstanceListElement2.relatedInstance.modelInfo.modelType = "vnf";
-		relatedInstanceListElement2.relatedInstance.modelInfo.modelInvariantId = "09fd971e-db5f-475d-997c-cf6704b6b8fe";
-		relatedInstanceListElement2.relatedInstance.modelInfo.modelNameVersionId = "152ed917-6dcc-46ee-bf8a-a775c5aa5a74";
-		relatedInstanceListElement2.relatedInstance.modelInfo.modelName = "9e4c31d2-4b25-4d9e-9fb4";
-		relatedInstanceListElement2.relatedInstance.modelInfo.modelVersion = "2.0";
-		relatedInstanceListElement2.relatedInstance.modelInfo.modelCustomizationName = "0d9e0d9d-3527-49f4-b3cb 2";
-			
-		request.requestDetails.relatedInstanceList.add(relatedInstanceListElement1);
-		request.requestDetails.relatedInstanceList.add(relatedInstanceListElement2);
-		
-		String body = Serialization.gsonPretty.toJson(request);
-		System.out.println(body);
-	}
-
-}