Merge "Renaming vid-automation #7"

23 files changed, 1873 insertions, 0 deletions

diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/ChangeManagementRequest.java b/vid-automation/src/test/java/org/onap/vid/model/mso/ChangeManagementRequest.java
new file mode 100644
index 00000000..91dd3ff2
--- /dev/null
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/ChangeManagementRequest.java
@@ -0,0 +1,70 @@
+package org.onap.vid.model.mso;
+
+import com.fasterxml.jackson.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@JsonPropertyOrder({
+    "requestDetails",
+		"requestType"
+})
+
+public class ChangeManagementRequest {
+
+	public static class MsoChangeManagementRequest {
+		public final static String SOFTWARE_UPDATE = "inPlaceSoftwareUpdate";
+		public static final String REPLACE = "replace";
+		public final static String CONFIG_UPDATE = "applyUpdatedConfig";
+
+	}
+
+	public final static String VNF_IN_PLACE_SOFTWARE_UPDATE = "vnf in place software update";
+	public static final String UPDATE = "update";
+	public static final String REPLACE = "replace";
+	public final static String CONFIG_UPDATE = "vnf config update";
+
+	@JsonProperty("requestDetails")
+    private List<ChangeManagementRequestDetails> requestDetails;
+
+	@JsonProperty("requestType")
+    private String requestType;
+
+	@JsonIgnore
+	private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+    
+	@JsonProperty("requestDetails")
+	public List<ChangeManagementRequestDetails> getRequestDetails() {
+		return requestDetails;
+	}
+
+	@JsonProperty("requestDetails")
+	public void setRequestDetails(List<ChangeManagementRequestDetails> requestDetails) {
+		this.requestDetails = requestDetails;
+	}
+
+	@JsonProperty("requestType")
+	public String getRequestType() {
+		return requestType;
+	}
+
+	@JsonProperty("requestType")
+	public void setRequestType(String requestType) {
+		this.requestType = requestType;
+	}
+
+	@JsonAnyGetter
+	public Map<String, Object> getAdditionalProperties() {
+	return this.additionalProperties;
+	}
+
+
+	@JsonAnySetter
+	public void setAdditionalProperty(String name, Object value) {
+	this.additionalProperties.put(name, value);
+	}
+
+	
+	
+}
diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/ChangeManagementRequestDetails.java b/vid-automation/src/test/java/org/onap/vid/model/mso/ChangeManagementRequestDetails.java
new file mode 100644
index 00000000..ad0a3815
--- /dev/null
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/ChangeManagementRequestDetails.java
@@ -0,0 +1,41 @@
+package org.onap.vid.model.mso;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+"modelInfo",
+"cloudConfiguration",
+"requestInfo",
+"requestParameters",
+"vnfName",
+"vnfInstanceId"
+})
+public class ChangeManagementRequestDetails extends RequestDetails{
+
+	@JsonProperty("vnfName")
+    private String vnfName;
+	@JsonProperty("vnfInstanceId")
+    private String vnfInstanceId;
+
+	@JsonProperty("vnfName")
+	public String getVnfName() {
+		return vnfName;
+	}
+
+	@JsonProperty("vnfName")
+	public void setVnfName(String vnfName) {
+		this.vnfName = vnfName;
+	}
+	@JsonProperty("vnfInstanceId")
+	public String getVnfInstanceId() {
+		return vnfInstanceId;
+	}
+
+	@JsonProperty("vnfInstanceId")
+	public void setVnfInstanceId(String vnfInstanceId) {
+		this.vnfInstanceId = vnfInstanceId;
+	}
+}
diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/CloudConfiguration.java b/vid-automation/src/test/java/org/onap/vid/model/mso/CloudConfiguration.java
new file mode 100644
index 00000000..0200bd6f
--- /dev/null
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/CloudConfiguration.java
@@ -0,0 +1,13 @@
+package org.onap.vid.model.mso;
+
+
+public class CloudConfiguration {
+
+    public CloudConfiguration() {
+    }
+
+    public String lcpCloudRegionId;
+
+    public String tenantId;
+
+}
diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/ExceptionResponse.java b/vid-automation/src/test/java/org/onap/vid/model/mso/ExceptionResponse.java
new file mode 100644
index 00000000..6801af2b
--- /dev/null
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/ExceptionResponse.java
@@ -0,0 +1,87 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * 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.vid.model.mso;
+
+/**
+ * The Class ExceptionResponse.
+ */
+public class ExceptionResponse {
+
+	public ExceptionResponse() {
+	}
+
+	/** The exception. */
+	private String exception;
+	
+	/** The message. */
+	private String message;
+
+	public ExceptionResponse(String exception, String message) {
+		this.exception = exception;
+		this.message = message;
+	}
+
+	public ExceptionResponse(Exception exception) {
+		setException(exception);
+	}
+
+	/**
+	 * Gets the exception.
+	 *
+	 * @return the exception
+	 */
+	public String getException() {
+		return exception;
+	}
+
+	/**
+	 * Sets the exception.
+	 *
+	 * @param exception the new exception
+	 */
+	public void setException(String exception) {
+		this.exception = exception;
+	}
+
+	public void setException(Exception exception) {
+		setException(exception.getClass().toString().replaceFirst("^.*[\\.$]", ""));
+		setMessage(exception.getMessage());
+	}
+
+	/**
+	 * Gets the message.
+	 *
+	 * @return the message
+	 */
+	public String getMessage() {
+		return message;
+	}
+
+	/**
+	 * Sets the message.
+	 *
+	 * @param message the new message
+	 */
+	public void setMessage(String message) {
+		this.message = message;
+	}
+
+}
diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/ModelInfo.java b/vid-automation/src/test/java/org/onap/vid/model/mso/ModelInfo.java
new file mode 100644
index 00000000..183d6dfd
--- /dev/null
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/ModelInfo.java
@@ -0,0 +1,124 @@
+package org.onap.vid.model.mso;
+
+import com.fasterxml.jackson.annotation.*;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+"modelType",
+"modelInvariantId",
+"modelVersionId",
+"modelName",
+"modelVersion",
+"modelCustomizationName",
+"modelCustomizationId"
+})
+public class ModelInfo {
+
+	public ModelInfo(){
+
+	}
+
+	@JsonProperty("modelType")
+	private String modelType;
+	@JsonProperty("modelInvariantId")
+	private String modelInvariantId;
+	@JsonProperty("modelVersionId")
+	private String modelVersionId;
+	@JsonProperty("modelName")
+	private String modelName;
+	@JsonProperty("modelVersion")
+	private String modelVersion;
+	@JsonProperty("modelCustomizationName")
+	private String modelCustomizationName;
+	@JsonProperty("modelCustomizationId")
+	private String modelCustomizationId;
+	@JsonIgnore
+	private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+
+	@JsonProperty("modelType")
+	public String getModelType() {
+	return modelType;
+	}
+
+	@JsonProperty("modelType")
+	public void setModelType(String modelType) {
+	this.modelType = modelType;
+	}
+
+	@JsonProperty("modelInvariantId")
+	public String getModelInvariantId() {
+	return modelInvariantId;
+	}
+
+	@JsonProperty("modelInvariantId")
+	public void setModelInvariantId(String modelInvariantId) {
+	this.modelInvariantId = modelInvariantId;
+	}
+
+	@JsonProperty("modelVersionId")
+	public String getModelVersionId() {
+	return modelVersionId;
+	}
+
+	@JsonProperty("modelVersionId")
+	public void setModelVersionId(String modelVersionId) {
+	this.modelVersionId = modelVersionId;
+	}
+
+	@JsonProperty("modelName")
+	public String getModelName() {
+	return modelName;
+	}
+
+	@JsonProperty("modelName")
+	public void setModelName(String modelName) {
+	this.modelName = modelName;
+	}
+
+	@JsonProperty("modelVersion")
+	public String getModelVersion() {
+	return modelVersion;
+	}
+
+	@JsonProperty("modelVersion")
+	public void setModelVersion(String modelVersion) {
+	this.modelVersion = modelVersion;
+	}
+
+	@JsonProperty("modelCustomizationName")
+	public String getModelCustomizationName() {
+	return modelCustomizationName;
+	}
+
+	@JsonProperty("modelCustomizationName")
+	public void setModelCustomizationName(String modelCustomizationName) {
+	this.modelCustomizationName = modelCustomizationName;
+	}
+
+	@JsonProperty("modelCustomizationId")
+	public String getModelCustomizationId() {
+	return modelCustomizationId;
+	}
+
+	@JsonProperty("modelCustomizationId")
+	public void setModelCustomizationId(String modelCustomizationId) {
+	this.modelCustomizationId = modelCustomizationId;
+	}
+
+	@JsonAnyGetter
+	public Map<String, Object> getAdditionalProperties() {
+	return this.additionalProperties;
+	}
+
+	@JsonAnySetter
+	public void setAdditionalProperty(String name, Object value) {
+	this.additionalProperties.put(name, value);
+	}
+
+
+
+
+}
diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/MsoExceptionResponse.java b/vid-automation/src/test/java/org/onap/vid/model/mso/MsoExceptionResponse.java
new file mode 100644
index 00000000..81b50606
--- /dev/null
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/MsoExceptionResponse.java
@@ -0,0 +1,32 @@
+package org.onap.vid.model.mso;
+
+public class MsoExceptionResponse {
+
+    public static class ServiceException {
+
+        public ServiceException(String messageId, String text) {
+            this.messageId = messageId;
+            this.text = text;
+        }
+
+        public ServiceException() {
+        }
+
+        public String messageId;
+        public String text;
+    }
+
+    public ServiceException serviceException;
+
+    public MsoExceptionResponse() {
+    }
+
+    public MsoExceptionResponse(String messageId, String text) {
+        this.serviceException = new ServiceException(messageId, text);
+    }
+
+    public MsoExceptionResponse(Exception exception) {
+        ExceptionResponse exceptionResponse = new ExceptionResponse(exception);
+        this.serviceException = new ServiceException(exceptionResponse.getException(), exceptionResponse.getMessage());
+    }
+}
diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/MsoResponseWrapper2.java b/vid-automation/src/test/java/org/onap/vid/model/mso/MsoResponseWrapper2.java
new file mode 100644
index 00000000..29fa931d
--- /dev/null
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/MsoResponseWrapper2.java
@@ -0,0 +1,60 @@
+package org.onap.vid.model.mso;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+@JsonPropertyOrder({
+	    "status",
+	    "entity"
+})
+
+/*
+This is a brother of MsoResponseWrapper. I (Ittay) think it's better.
+It is generic, immutable, and has some knowledge about RestObject.
+The serialized "entity" field may be either String or nested object.
+ */
+public class MsoResponseWrapper2<T> implements MsoResponseWrapperInterface {
+
+    final static ObjectMapper objectMapper = new ObjectMapper();
+
+	private final int status;
+	private final T entity;
+    private final String raw;
+
+    public MsoResponseWrapper2(RestObject<T> msoResponse) {
+        this.status = msoResponse.getStatusCode();
+        this.entity = msoResponse.get();
+        this.raw = msoResponse.getRaw();
+    }
+
+    public MsoResponseWrapper2(
+            @JsonProperty(value = "status", required = true) int status,
+            @JsonProperty(value = "entity", required = true) T entity) {
+        this.status = status;
+        this.entity = entity;
+        this.raw = null;
+    }
+
+    public int getStatus() {
+		return status;
+	}
+
+    @Override
+    @org.codehaus.jackson.annotate.JsonIgnore
+    @com.fasterxml.jackson.annotation.JsonIgnore
+    public String getResponse() {
+        try {
+            return objectMapper.writeValueAsString(this);
+        } catch (JsonProcessingException e) {
+            return getEntity() != null ? getEntity().toString() : null;
+        }
+    }
+
+    @JsonProperty
+	public Object getEntity() {
+		return entity != null ? entity : raw;
+	}
+
+}
diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/MsoResponseWrapperInterface.java b/vid-automation/src/test/java/org/onap/vid/model/mso/MsoResponseWrapperInterface.java
new file mode 100644
index 00000000..eb305d2d
--- /dev/null
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/MsoResponseWrapperInterface.java
@@ -0,0 +1,15 @@
+package org.onap.vid.model.mso;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public interface MsoResponseWrapperInterface {
+    @JsonProperty("entity")
+    Object getEntity();
+
+    @JsonProperty("status")
+    int getStatus();
+
+    @org.codehaus.jackson.annotate.JsonIgnore
+    @com.fasterxml.jackson.annotation.JsonIgnore
+    String getResponse();
+}
diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/OperationalEnvironment.java b/vid-automation/src/test/java/org/onap/vid/model/mso/OperationalEnvironment.java
new file mode 100644
index 00000000..59e0e2f3
--- /dev/null
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/OperationalEnvironment.java
@@ -0,0 +1,103 @@
+package org.onap.vid.model.mso;
+
+import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import org.codehaus.jackson.annotate.JsonProperty;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class OperationalEnvironment {
+
+    private String operationalEnvironmentId;
+    private String operationalEnvironmentName;
+    private String operationalEnvironmentType;
+    private String operationalEnvironmentStatus;
+    private String tenantContext;
+    private String workloadContext;
+    private String resourceVersion;
+    private RelationshipList relationshipList;
+
+    public OperationalEnvironment() {
+    }
+
+    public OperationalEnvironment(String operationalEnvironmentId, String operationalEnvironmentName, String operationalEnvironmentType, String operationalEnvironmentStatus, String tenantContext, String workloadContext, String resourceVersion, RelationshipList relationshipList) {
+        this.operationalEnvironmentId = operationalEnvironmentId;
+        this.operationalEnvironmentName = operationalEnvironmentName;
+        this.operationalEnvironmentType = operationalEnvironmentType;
+        this.operationalEnvironmentStatus = operationalEnvironmentStatus;
+        this.tenantContext = tenantContext;
+        this.workloadContext = workloadContext;
+        this.resourceVersion = resourceVersion;
+        this.relationshipList = relationshipList;
+    }
+
+    @JsonProperty("operational-environment-id")
+    public String getOperationalEnvironmentId() {
+        return operationalEnvironmentId;
+    }
+
+    public void setOperationalEnvironmentId(String operationalEnvironmentId) {
+        this.operationalEnvironmentId = operationalEnvironmentId;
+    }
+
+    @JsonProperty("operational-environment-name")
+    public String getOperationalEnvironmentName() {
+        return operationalEnvironmentName;
+    }
+
+    public void setOperationalEnvironmentName(String operationalEnvironmentName) {
+        this.operationalEnvironmentName = operationalEnvironmentName;
+    }
+
+    @JsonProperty("operational-environment-type")
+    public String getOperationalEnvironmentType() {
+        return operationalEnvironmentType;
+    }
+
+    public void setOperationalEnvironmentType(String operationalEnvironmentType) {
+        this.operationalEnvironmentType = operationalEnvironmentType;
+    }
+
+    @JsonProperty("operational-environment-status")
+    public String getOperationalEnvironmentStatus() {
+        return operationalEnvironmentStatus;
+    }
+
+    public void setOperationalEnvironmentStatus(String operationalEnvironmentStatus) {
+        this.operationalEnvironmentStatus = operationalEnvironmentStatus;
+    }
+
+    @JsonProperty("tenant-context")
+    public String getTenantContext() {
+        return tenantContext;
+    }
+
+    public void setTenantContext(String tenantContext) {
+        this.tenantContext = tenantContext;
+    }
+
+    @JsonProperty("workload-context")
+    public String getWorkloadContext() {
+        return workloadContext;
+    }
+
+    public void setWorkloadContext(String workloadContext) {
+        this.workloadContext = workloadContext;
+    }
+
+    @JsonProperty("resource-version")
+    public String getResourceVersion() {
+        return resourceVersion;
+    }
+
+    public void setResourceVersion(String resourceVersion) {
+        this.resourceVersion = resourceVersion;
+    }
+
+    @JsonProperty("relationship-list")
+    public RelationshipList getRelationshipList() {
+        return relationshipList;
+    }
+
+    public void setRelationshipList(RelationshipList relationshipList) {
+        this.relationshipList = relationshipList;
+    }
+}
diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/OperationalEnvironmentList.java b/vid-automation/src/test/java/org/onap/vid/model/mso/OperationalEnvironmentList.java
new file mode 100644
index 00000000..1ff84d3a
--- /dev/null
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/OperationalEnvironmentList.java
@@ -0,0 +1,29 @@
+package org.onap.vid.model.mso;
+
+import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import org.codehaus.jackson.annotate.JsonProperty;
+
+import java.util.List;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class OperationalEnvironmentList {
+
+    @JsonProperty("operational-environment")
+    public List<OperationalEnvironment> getOperationalEnvironment() {
+        return operationalEnvironment;
+    }
+
+    @JsonProperty("operational-environment")
+    public void setOperationalEnvironment(List<OperationalEnvironment> operationalEnvironment) {
+        this.operationalEnvironment = operationalEnvironment;
+    }
+
+    public OperationalEnvironmentList() {
+    }
+
+    public OperationalEnvironmentList(List<OperationalEnvironment> operationalEnvironment) {
+        this.operationalEnvironment = operationalEnvironment;
+    }
+
+    private List<OperationalEnvironment> operationalEnvironment;
+}
diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/ProxyResponse.java b/vid-automation/src/test/java/org/onap/vid/model/mso/ProxyResponse.java
new file mode 100644
index 00000000..7352d052
--- /dev/null
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/ProxyResponse.java
@@ -0,0 +1,30 @@
+package org.onap.vid.model.mso;
+
+import com.google.common.base.MoreObjects;
+
+/**
+ * Created by Oren on 7/10/17.
+ */
+public class ProxyResponse {
+
+    protected String errorMessage;
+
+    protected int httpCode;
+
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+
+
+    public int getHttpCode() {
+        return httpCode;
+    }
+
+    @Override
+    public String toString() {
+        return MoreObjects.toStringHelper(this)
+                .add("httpCode", httpCode)
+                .add("errorMessage", errorMessage)
+                .toString();
+    }
+}
diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/RelatedInstance.java b/vid-automation/src/test/java/org/onap/vid/model/mso/RelatedInstance.java
new file mode 100644
index 00000000..900f628d
--- /dev/null
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/RelatedInstance.java
@@ -0,0 +1,29 @@
+package org.onap.vid.model.mso;
+
+import com.fasterxml.jackson.annotation.*;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+        "instanceId",
+        "modelInfo"
+})
+public class RelatedInstance {
+
+    @JsonProperty("instanceId")
+    public String instanceId;
+
+
+    @JsonProperty("modelInfo")
+    public ModelInfo modelInfo;
+
+    @JsonGetter
+    public String getInstanceId() {
+        return instanceId;
+    }
+
+    @JsonSetter
+    public void setInstanceId(String instanceId) {
+        this.instanceId = instanceId;
+    }
+
+}
diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/RelatedInstanceList.java b/vid-automation/src/test/java/org/onap/vid/model/mso/RelatedInstanceList.java
new file mode 100644
index 00000000..81e87128
--- /dev/null
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/RelatedInstanceList.java
@@ -0,0 +1,26 @@
+package org.onap.vid.model.mso;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonSetter;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+        "relatedInstance"
+})
+public class RelatedInstanceList {
+
+    @JsonProperty("relatedInstance")
+    public RelatedInstance relatedInstance;
+
+    @JsonSetter
+    public RelatedInstance getRelatedInstance() {
+        return relatedInstance;
+    }
+
+    @JsonSetter
+    public void setRelatedInstance(RelatedInstance relatedInstance) {
+        this.relatedInstance = relatedInstance;
+    }
+}
diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/RelatedToProperty.java b/vid-automation/src/test/java/org/onap/vid/model/mso/RelatedToProperty.java
new file mode 100644
index 00000000..60fff94a
--- /dev/null
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/RelatedToProperty.java
@@ -0,0 +1,35 @@
+package org.onap.vid.model.mso;
+
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+public class RelatedToProperty {
+
+	public String getPropertyKey() {
+		return propertyKey;
+	}
+
+
+	public void setPropertyKey(String propertyKey) {
+		this.propertyKey = propertyKey;
+	}
+
+
+	public String getPropertyValue() {
+		return propertyValue;
+	}
+
+
+	public void setPropertyValue(String propertyValue) {
+		this.propertyValue = propertyValue;
+	}
+
+
+	@JsonProperty("property-key")
+	public String propertyKey;
+	
+	
+	@JsonProperty("property-value")
+	public String propertyValue;
+
+}
diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/Relationship.java b/vid-automation/src/test/java/org/onap/vid/model/mso/Relationship.java
new file mode 100644
index 00000000..a8f0f22d
--- /dev/null
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/Relationship.java
@@ -0,0 +1,56 @@
+package org.onap.vid.model.mso;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+import java.util.List;
+
+
+public class Relationship {
+	
+	@JsonProperty("related-to")
+	public String relatedTo;
+	
+	@JsonProperty("related-link")
+	public String relatedLink;
+	
+	@JsonProperty("relationship-data")
+	public List<RelationshipData> relationshipData;
+	
+	@JsonProperty("related-to-property")
+	public List<RelatedToProperty> relatedToProperty;
+
+	
+	public String getRelatedTo() {
+		return relatedTo;
+	}
+
+	public void setRelatedTo(String relatedTo) {
+		this.relatedTo = relatedTo;
+	}
+
+	public String getRelatedLink() {
+		return relatedLink;
+	}
+
+	public void setRelatedLink(String relatedLink) {
+		this.relatedLink = relatedLink;
+	}
+
+	public List<RelationshipData> getRelationDataList() {
+		return relationshipData;
+	}
+
+	public void setRelationDataList(List<RelationshipData> relationDataList) {
+		this.relationshipData = relationDataList;
+	}
+
+	public List<RelatedToProperty> getRelatedToPropertyList() {
+		return relatedToProperty;
+	}
+
+	public void setRelatedToPropertyList(List<RelatedToProperty> relatedToPropertyList) {
+		this.relatedToProperty = relatedToPropertyList;
+	}
+
+
+}
diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/RelationshipData.java b/vid-automation/src/test/java/org/onap/vid/model/mso/RelationshipData.java
new file mode 100644
index 00000000..1e6ad2a1
--- /dev/null
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/RelationshipData.java
@@ -0,0 +1,30 @@
+package org.onap.vid.model.mso;
+
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+public class RelationshipData {
+	@JsonProperty("relationship-key")
+	public String getRelationshipKey() {
+		return relationshipKey;
+	}
+	@JsonProperty("relationship-key")
+	public void setRelationshipKey(String relationshipKey) {
+		this.relationshipKey = relationshipKey;
+	}
+	@JsonProperty("relationship-value")
+	public String getRelationshipValue() {
+		return relationshipValue;
+	}
+	@JsonProperty("relationship-value")
+	public void setRelationshipValue(String relationshipValue) {
+		this.relationshipValue = relationshipValue;
+	}
+
+	@JsonProperty("relationship-key")
+	public String relationshipKey;
+	
+	@JsonProperty("relationship-value")
+	public String relationshipValue;
+
+}
diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/RelationshipList.java b/vid-automation/src/test/java/org/onap/vid/model/mso/RelationshipList.java
new file mode 100644
index 00000000..56a077d5
--- /dev/null
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/RelationshipList.java
@@ -0,0 +1,26 @@
+package org.onap.vid.model.mso;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+import java.util.List;
+
+
+public class RelationshipList {
+	
+	@JsonProperty("relationship")
+	public List<Relationship> getRelationship() {
+		return relationship;
+	}
+	
+	@JsonProperty("relationship")
+	public void setRelationship(List<Relationship> relationship) {
+		this.relationship = relationship;
+	}
+
+	@JsonProperty("relationship")
+	public List<Relationship> relationship;
+	
+	
+	
+
+}
diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/RequestDetails.java b/vid-automation/src/test/java/org/onap/vid/model/mso/RequestDetails.java
new file mode 100644
index 00000000..368350e8
--- /dev/null
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/RequestDetails.java
@@ -0,0 +1,218 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * 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.vid.model.mso;
+
+import com.fasterxml.jackson.annotation.*;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * aggregates the context, configuraiton and detailed parameters associated with the request into a single structure.
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+        "cloudConfiguration",
+        "modelInfo",
+        "relatedModelList",
+        "requestInfo",
+        "subscriberInfo",
+        "requestParameters"
+})
+public class RequestDetails {
+
+    /** The related model list. */
+    @JsonProperty("relatedInstanceList")
+    public List<RelatedInstanceList> relatedInstList;
+    /** The cloud configuration. */
+    @JsonProperty("cloudConfiguration")
+    private CloudConfiguration cloudConfiguration;
+
+    /** The model info. */
+    @JsonProperty("modelInfo")
+    private ModelInfo modelInfo;
+
+    /** The request info. */
+    @JsonProperty("requestInfo")
+    private RequestInfo requestInfo;
+
+    /** The subscriber info. */
+    @JsonProperty("subscriberInfo")
+    private SubscriberInfo subscriberInfo;
+
+    /** The request parameters. */
+    @JsonProperty("requestParameters")
+    private RequestParameters requestParameters;
+
+    /** The additional properties. */
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+
+    /**
+     * Gets the cloud configuration.
+     *
+     * @return     The cloudConfiguration
+     */
+    @JsonProperty("cloudConfiguration")
+    public CloudConfiguration getCloudConfiguration() {
+        return cloudConfiguration;
+    }
+
+    /**
+     * Sets the cloud configuration.
+     *
+     * @param cloudConfiguration     The cloudConfiguration
+     */
+    @JsonProperty("cloudConfiguration")
+    public void setCloudConfiguration(CloudConfiguration cloudConfiguration) {
+        this.cloudConfiguration = cloudConfiguration;
+    }
+
+    /**
+     * Gets the model info.
+     *
+     * @return     The modelInfo
+     */
+    @JsonProperty("modelInfo")
+    public ModelInfo getModelInfo() {
+        return modelInfo;
+    }
+
+    /**
+     * Sets the model info.
+     *
+     * @param modelInfo     The modelInfo
+     */
+    @JsonProperty("modelInfo")
+    public void setModelInfo(ModelInfo modelInfo) {
+        this.modelInfo = modelInfo;
+    }
+
+    /**
+     * Gets the request info.
+     *
+     * @return     The requestInfo
+     */
+    @JsonProperty("requestInfo")
+    public RequestInfo getRequestInfo() {
+        return requestInfo;
+    }
+
+    /**
+     * Sets the request info.
+     *
+     * @param requestInfo     The requestInfo
+     */
+    @JsonProperty("requestInfo")
+    public void setRequestInfo(RequestInfo requestInfo) {
+        this.requestInfo = requestInfo;
+    }
+
+    /**
+     * Gets the subscriber info.
+     *
+     * @return     The subscriberInfo
+     */
+    @JsonProperty("subscriberInfo")
+    public SubscriberInfo getSubscriberInfo() {
+        return subscriberInfo;
+    }
+
+    /**
+     * Sets the subscriber info.
+     *
+     * @param subscriberInfo     The subscriberInfo
+     */
+    @JsonProperty("subscriberInfo")
+    public void setSubscriberInfo(SubscriberInfo subscriberInfo) {
+        this.subscriberInfo = subscriberInfo;
+    }
+
+    /* (non-Javadoc)
+     * @see org.onap.vid.domain.mso.RequestDetails#toString()
+     */
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    /* (non-Javadoc)
+     * @see org.onap.vid.domain.mso.RequestDetails#getAdditionalProperties()
+     */
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    /* (non-Javadoc)
+     * @see org.onap.vid.domain.mso.RequestDetails#setAdditionalProperty(java.lang.String, java.lang.Object)
+     */
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    /* (non-Javadoc)
+     * @see org.onap.vid.domain.mso.RequestDetails#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(cloudConfiguration).append(modelInfo).append(requestInfo).append(getRequestParameters()).append(subscriberInfo).append(additionalProperties).toHashCode();
+    }
+
+    /* (non-Javadoc)
+     * @see org.onap.vid.domain.mso.RequestDetails#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+        if ((other instanceof RequestDetails) == false) {
+            return false;
+        }
+        RequestDetails rhs = ((RequestDetails) other);
+        return new EqualsBuilder().append(cloudConfiguration, rhs.cloudConfiguration).append(modelInfo, rhs.modelInfo).append(requestInfo, rhs.requestInfo).append(getRequestParameters(), rhs.getRequestParameters()).append(subscriberInfo, rhs.subscriberInfo).append(additionalProperties, rhs.additionalProperties).isEquals();
+    }
+
+    public RequestParameters getRequestParameters() {
+        return requestParameters;
+    }
+
+    public void setRequestParameters(RequestParameters requestParameters) {
+        this.requestParameters = requestParameters;
+    }
+
+    @JsonGetter
+    public List<RelatedInstanceList> getRelatedInstList() {
+        return relatedInstList;
+    }
+
+    @JsonSetter
+    public void setRelatedInstList(List<RelatedInstanceList> relatedInstList) {
+        this.relatedInstList = relatedInstList;
+    }
+}
diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/RequestInfo.java b/vid-automation/src/test/java/org/onap/vid/model/mso/RequestInfo.java
new file mode 100644
index 00000000..d25acbd2
--- /dev/null
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/RequestInfo.java
@@ -0,0 +1,378 @@
+
+package org.onap.vid.model.mso;
+
+import com.fasterxml.jackson.annotation.*;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import javax.annotation.Generated;
+import java.util.HashMap;
+import java.util.Map;
+
+
+/**
+ * fields providing general context information for the request
+ * 
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@Generated("org.jsonschema2pojo")
+@JsonPropertyOrder({
+    "billingAccountNumber",
+    "callbackUrl",
+    "correlator",
+    "instanceName",
+    "orderNumber",
+    "orderVersion",
+    "productFamilyId",
+    "source",
+    "suppressRollback",
+    "responseValue",
+    "requestorId"
+})
+public class RequestInfo {
+
+    /**
+     * billing account associated with the model being operated on
+     * 
+     */
+    @JsonProperty("billingAccountNumber")
+    private String billingAccountNumber;
+    /**
+     * client URL to use for asynchronous responses
+     * 
+     */
+    @JsonProperty("callbackUrl")
+    private String callbackUrl;
+    /**
+     * Optional correlationId for async callback requests
+     * 
+     */
+    @JsonProperty("correlator")
+    private String correlator;
+    /**
+     * Client provided name for the instance being operated on by the operation (note: not guaranteed to be unique)
+     * 
+     */
+    @JsonProperty("instanceName")
+    private String instanceName;
+    /**
+     * reference to an order
+     * 
+     */
+    @JsonProperty("orderNumber")
+    private String orderNumber;
+    /**
+     * order version number
+     * 
+     */
+    @JsonProperty("orderVersion")
+    private Double orderVersion;
+    /**
+     * UUID for the product family associated with the model being operated on
+     * 
+     */
+    @JsonProperty("productFamilyId")
+    private String productFamilyId;
+    /**
+     * source of the request--not authoritative--actual source revealed via authentication
+     * 
+     */
+    @JsonProperty("source")
+    private String source;
+    /**
+     * true or false boolean indicating whether rollbacks should be suppressed on failures
+     * 
+     */
+    @JsonProperty("suppressRollback")
+    private Boolean suppressRollback;
+    /**
+     * Is the user selected value based on the validResponses list provided to complete the manual task
+     * 
+     */
+    @JsonProperty("responseValue")
+    private String responseValue;
+    /**
+     * The id of the person who initiated the completion request
+     * 
+     */
+    @JsonProperty("requestorId")
+    private String requestorId;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+
+    /**
+     * billing account associated with the model being operated on
+     * 
+     * @return
+     *     The billingAccountNumber
+     */
+    @JsonProperty("billingAccountNumber")
+    public String getBillingAccountNumber() {
+        return billingAccountNumber;
+    }
+
+    /**
+     * billing account associated with the model being operated on
+     * 
+     * @param billingAccountNumber
+     *     The billingAccountNumber
+     */
+    @JsonProperty("billingAccountNumber")
+    public void setBillingAccountNumber(String billingAccountNumber) {
+        this.billingAccountNumber = billingAccountNumber;
+    }
+
+    /**
+     * client URL to use for asynchronous responses
+     * 
+     * @return
+     *     The callbackUrl
+     */
+    @JsonProperty("callbackUrl")
+    public String getCallbackUrl() {
+        return callbackUrl;
+    }
+
+    /**
+     * client URL to use for asynchronous responses
+     * 
+     * @param callbackUrl
+     *     The callbackUrl
+     */
+    @JsonProperty("callbackUrl")
+    public void setCallbackUrl(String callbackUrl) {
+        this.callbackUrl = callbackUrl;
+    }
+
+    /**
+     * Optional correlationId for async callback requests
+     * 
+     * @return
+     *     The correlator
+     */
+    @JsonProperty("correlator")
+    public String getCorrelator() {
+        return correlator;
+    }
+
+    /**
+     * Optional correlationId for async callback requests
+     * 
+     * @param correlator
+     *     The correlator
+     */
+    @JsonProperty("correlator")
+    public void setCorrelator(String correlator) {
+        this.correlator = correlator;
+    }
+
+    /**
+     * Client provided name for the instance being operated on by the operation (note: not guaranteed to be unique)
+     * 
+     * @return
+     *     The instanceName
+     */
+    @JsonProperty("instanceName")
+    public String getInstanceName() {
+        return instanceName;
+    }
+
+    /**
+     * Client provided name for the instance being operated on by the operation (note: not guaranteed to be unique)
+     * 
+     * @param instanceName
+     *     The instanceName
+     */
+    @JsonProperty("instanceName")
+    public void setInstanceName(String instanceName) {
+        this.instanceName = instanceName;
+    }
+
+    /**
+     * reference to an order
+     * 
+     * @return
+     *     The orderNumber
+     */
+    @JsonProperty("orderNumber")
+    public String getOrderNumber() {
+        return orderNumber;
+    }
+
+    /**
+     * reference to an order
+     * 
+     * @param orderNumber
+     *     The orderNumber
+     */
+    @JsonProperty("orderNumber")
+    public void setOrderNumber(String orderNumber) {
+        this.orderNumber = orderNumber;
+    }
+
+    /**
+     * order version number
+     * 
+     * @return
+     *     The orderVersion
+     */
+    @JsonProperty("orderVersion")
+    public Double getOrderVersion() {
+        return orderVersion;
+    }
+
+    /**
+     * order version number
+     * 
+     * @param orderVersion
+     *     The orderVersion
+     */
+    @JsonProperty("orderVersion")
+    public void setOrderVersion(Double orderVersion) {
+        this.orderVersion = orderVersion;
+    }
+
+    /**
+     * UUID for the product family associated with the model being operated on
+     * 
+     * @return
+     *     The productFamilyId
+     */
+    @JsonProperty("productFamilyId")
+    public String getProductFamilyId() {
+        return productFamilyId;
+    }
+
+    /**
+     * UUID for the product family associated with the model being operated on
+     * 
+     * @param productFamilyId
+     *     The productFamilyId
+     */
+    @JsonProperty("productFamilyId")
+    public void setProductFamilyId(String productFamilyId) {
+        this.productFamilyId = productFamilyId;
+    }
+
+    /**
+     * source of the request--not authoritative--actual source revealed via authentication
+     * 
+     * @return
+     *     The source
+     */
+    @JsonProperty("source")
+    public String getSource() {
+        return source;
+    }
+
+    /**
+     * source of the request--not authoritative--actual source revealed via authentication
+     * 
+     * @param source
+     *     The source
+     */
+    @JsonProperty("source")
+    public void setSource(String source) {
+        this.source = source;
+    }
+
+    /**
+     * true or false boolean indicating whether rollbacks should be suppressed on failures
+     * 
+     * @return
+     *     The suppressRollback
+     */
+    @JsonProperty("suppressRollback")
+    public Boolean getSuppressRollback() {
+        return suppressRollback;
+    }
+
+    /**
+     * true or false boolean indicating whether rollbacks should be suppressed on failures
+     * 
+     * @param suppressRollback
+     *     The suppressRollback
+     */
+    @JsonProperty("suppressRollback")
+    public void setSuppressRollback(Boolean suppressRollback) {
+        this.suppressRollback = suppressRollback;
+    }
+
+    /**
+     * Is the user selected value based on the validResponses list provided to complete the manual task
+     * 
+     * @return
+     *     The responseValue
+     */
+    @JsonProperty("responseValue")
+    public String getResponseValue() {
+        return responseValue;
+    }
+
+    /**
+     * Is the user selected value based on the validResponses list provided to complete the manual task
+     * 
+     * @param responseValue
+     *     The responseValue
+     */
+    @JsonProperty("responseValue")
+    public void setResponseValue(String responseValue) {
+        this.responseValue = responseValue;
+    }
+
+    /**
+     * The id of the person who initiated the completion request
+     * 
+     * @return
+     *     The requestorId
+     */
+    @JsonProperty("requestorId")
+    public String getRequestorId() {
+        return requestorId;
+    }
+
+    /**
+     * The id of the person who initiated the completion request
+     * 
+     * @param requestorId
+     *     The requestorId
+     */
+    @JsonProperty("requestorId")
+    public void setRequestorId(String requestorId) {
+        this.requestorId = requestorId;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(billingAccountNumber).append(callbackUrl).append(correlator).append(instanceName).append(orderNumber).append(orderVersion).append(productFamilyId).append(source).append(suppressRollback).append(responseValue).append(requestorId).append(additionalProperties).toHashCode();
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+        if ((other instanceof RequestInfo) == false) {
+            return false;
+        }
+        RequestInfo rhs = ((RequestInfo) other);
+        return new EqualsBuilder().append(billingAccountNumber, rhs.billingAccountNumber).append(callbackUrl, rhs.callbackUrl).append(correlator, rhs.correlator).append(instanceName, rhs.instanceName).append(orderNumber, rhs.orderNumber).append(orderVersion, rhs.orderVersion).append(productFamilyId, rhs.productFamilyId).append(source, rhs.source).append(suppressRollback, rhs.suppressRollback).append(responseValue, rhs.responseValue).append(requestorId, rhs.requestorId).append(additionalProperties, rhs.additionalProperties).isEquals();
+    }
+
+}
diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/RequestParameters.java b/vid-automation/src/test/java/org/onap/vid/model/mso/RequestParameters.java
new file mode 100644
index 00000000..d3574d7b
--- /dev/null
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/RequestParameters.java
@@ -0,0 +1,102 @@
+
+package org.onap.vid.model.mso;
+
+import com.fasterxml.jackson.annotation.*;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import javax.annotation.Generated;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@Generated("org.jsonschema2pojo")
+@JsonPropertyOrder({
+    "subscriptionServiceType",
+    "userParams"
+})
+public class RequestParameters {
+
+    @JsonProperty("subscriptionServiceType")
+    private String subscriptionServiceType;
+    @JsonProperty("userParams")
+    private List<UserParam> userParams = new ArrayList<UserParam>();
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+
+    /**
+     * 
+     * @return
+     *     The subscriptionServiceType
+     */
+    @JsonProperty("subscriptionServiceType")
+    public String getSubscriptionServiceType() {
+        return subscriptionServiceType;
+    }
+
+    /**
+     * 
+     * @param subscriptionServiceType
+     *     The subscriptionServiceType
+     */
+    @JsonProperty("subscriptionServiceType")
+    public void setSubscriptionServiceType(String subscriptionServiceType) {
+        this.subscriptionServiceType = subscriptionServiceType;
+    }
+
+    /**
+     * 
+     * @return
+     *     The userParams
+     */
+    @JsonProperty("userParams")
+    public List<UserParam> getUserParams() {
+        return userParams;
+    }
+
+    /**
+     * 
+     * @param userParams
+     *     The userParams
+     */
+    @JsonProperty("userParams")
+    public void setUserParams(List<UserParam> userParams) {
+        this.userParams = userParams;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(subscriptionServiceType).append(userParams).append(additionalProperties).toHashCode();
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+        if ((other instanceof RequestParameters) == false) {
+            return false;
+        }
+        RequestParameters rhs = ((RequestParameters) other);
+        return new EqualsBuilder().append(subscriptionServiceType, rhs.subscriptionServiceType).append(userParams, rhs.userParams).append(additionalProperties, rhs.additionalProperties).isEquals();
+    }
+
+}
diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/RestObject.java b/vid-automation/src/test/java/org/onap/vid/model/mso/RestObject.java
new file mode 100644
index 00000000..b91ea410
--- /dev/null
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/RestObject.java
@@ -0,0 +1,123 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * 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.vid.model.mso;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.base.MoreObjects;
+
+import javax.ws.rs.core.Response;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+
+/**
+ * The Class RestObject.
+ *
+ * @param <T> the generic type
+ */
+public class RestObject<T> {
+
+    final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS");
+
+    final static ObjectMapper objectMapper = new ObjectMapper();
+
+	/**
+	 * Generic version of the RestObject class.
+	 *
+	 */
+    // T stands for "Type"
+    private T t;
+    
+    // The string source of t, if available
+    private String rawT;
+
+    /** The status code. */
+    private int statusCode= 0;
+
+    public RestObject() {
+    }
+
+    public RestObject(Response cres, Class<?> tClass) {
+
+        String rawEntity = null;
+        try {
+            cres.bufferEntity();
+            rawEntity = cres.readEntity(String.class);
+            T t = (T) objectMapper.readValue(rawEntity, tClass);
+            this.set(t);
+        }
+        catch ( Exception e ) {
+            try {
+                this.setRaw(rawEntity);
+            } catch (Exception e2) {
+            }
+        }
+
+        int status = cres.getStatus();
+        this.setStatusCode (status);
+    }
+
+
+    /**
+     * Sets the.
+     *
+     * @param t the t
+     */
+    public void set(T t) { this.t = t; }
+    
+    /**
+     * Gets the.
+     *
+     * @return the t
+     */
+    public T get() { return t; }
+	
+    /**
+     * Sets the status code.
+     *
+     * @param v the new status code
+     */
+    public void setStatusCode(int v) { this.statusCode = v; }
+    
+    /**
+     * Gets the status code.
+     *
+     * @return the status code
+     */
+    public int getStatusCode() { return this.statusCode; }
+
+    public String getRaw() {
+        return rawT;
+    }
+
+    public void setRaw(String rawT) {
+        this.rawT = rawT;
+    }
+
+    @Override
+    public String toString() {
+        return MoreObjects.toStringHelper(this)
+                .add("t", t)
+                .add("rawT", rawT)
+                .add("statusCode", statusCode)
+                .toString();
+    }
+}
+
diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/SubscriberInfo.java b/vid-automation/src/test/java/org/onap/vid/model/mso/SubscriberInfo.java
new file mode 100644
index 00000000..67cded83
--- /dev/null
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/SubscriberInfo.java
@@ -0,0 +1,146 @@
+
+package org.onap.vid.model.mso;
+
+import com.fasterxml.jackson.annotation.*;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import javax.annotation.Generated;
+import java.util.HashMap;
+import java.util.Map;
+
+
+/**
+ * fields providing information about the subscriber associated with the request
+ * 
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@Generated("org.jsonschema2pojo")
+@JsonPropertyOrder({
+    "globalSubscriberId",
+    "subscriberCommonSiteId",
+    "subscriberName"
+})
+public class SubscriberInfo {
+
+    /**
+     * global Customer Id understood by A&AI
+     * 
+     */
+    @JsonProperty("globalSubscriberId")
+    private String globalSubscriberId;
+    /**
+     * id representing the location of the subscriber
+     * 
+     */
+    @JsonProperty("subscriberCommonSiteId")
+    private String subscriberCommonSiteId;
+    /**
+     * name of the customer or subscriber
+     * 
+     */
+    @JsonProperty("subscriberName")
+    private String subscriberName;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+
+    /**
+     * global Customer Id understood by A&AI
+     * 
+     * @return
+     *     The globalSubscriberId
+     */
+    @JsonProperty("globalSubscriberId")
+    public String getGlobalSubscriberId() {
+        return globalSubscriberId;
+    }
+
+    /**
+     * global Customer Id understood by A&AI
+     * 
+     * @param globalSubscriberId
+     *     The globalSubscriberId
+     */
+    @JsonProperty("globalSubscriberId")
+    public void setGlobalSubscriberId(String globalSubscriberId) {
+        this.globalSubscriberId = globalSubscriberId;
+    }
+
+    /**
+     * id representing the location of the subscriber
+     * 
+     * @return
+     *     The subscriberCommonSiteId
+     */
+    @JsonProperty("subscriberCommonSiteId")
+    public String getSubscriberCommonSiteId() {
+        return subscriberCommonSiteId;
+    }
+
+    /**
+     * id representing the location of the subscriber
+     * 
+     * @param subscriberCommonSiteId
+     *     The subscriberCommonSiteId
+     */
+    @JsonProperty("subscriberCommonSiteId")
+    public void setSubscriberCommonSiteId(String subscriberCommonSiteId) {
+        this.subscriberCommonSiteId = subscriberCommonSiteId;
+    }
+
+    /**
+     * name of the customer or subscriber
+     * 
+     * @return
+     *     The subscriberName
+     */
+    @JsonProperty("subscriberName")
+    public String getSubscriberName() {
+        return subscriberName;
+    }
+
+    /**
+     * name of the customer or subscriber
+     * 
+     * @param subscriberName
+     *     The subscriberName
+     */
+    @JsonProperty("subscriberName")
+    public void setSubscriberName(String subscriberName) {
+        this.subscriberName = subscriberName;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(globalSubscriberId).append(subscriberCommonSiteId).append(subscriberName).append(additionalProperties).toHashCode();
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+        if ((other instanceof SubscriberInfo) == false) {
+            return false;
+        }
+        SubscriberInfo rhs = ((SubscriberInfo) other);
+        return new EqualsBuilder().append(globalSubscriberId, rhs.globalSubscriberId).append(subscriberCommonSiteId, rhs.subscriberCommonSiteId).append(subscriberName, rhs.subscriberName).append(additionalProperties, rhs.additionalProperties).isEquals();
+    }
+
+}
diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/UserParam.java b/vid-automation/src/test/java/org/onap/vid/model/mso/UserParam.java
new file mode 100644
index 00000000..384e4563
--- /dev/null
+++ b/vid-automation/src/test/java/org/onap/vid/model/mso/UserParam.java
@@ -0,0 +1,100 @@
+
+package org.onap.vid.model.mso;
+
+import com.fasterxml.jackson.annotation.*;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import javax.annotation.Generated;
+import java.util.HashMap;
+import java.util.Map;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@Generated("org.jsonschema2pojo")
+@JsonPropertyOrder({
+    "name",
+    "value"
+})
+public class UserParam {
+
+    @JsonProperty("name")
+    private String name;
+    @JsonProperty("value")
+    private String value;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+
+    /**
+     * 
+     * @return
+     *     The name
+     */
+    @JsonProperty("name")
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * 
+     * @param name
+     *     The name
+     */
+    @JsonProperty("name")
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * 
+     * @return
+     *     The value
+     */
+    @JsonProperty("value")
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * 
+     * @param value
+     *     The value
+     */
+    @JsonProperty("value")
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder().append(name).append(value).append(additionalProperties).toHashCode();
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+        if ((other instanceof UserParam) == false) {
+            return false;
+        }
+        UserParam rhs = ((UserParam) other);
+        return new EqualsBuilder().append(name, rhs.name).append(value, rhs.value).append(additionalProperties, rhs.additionalProperties).isEquals();
+    }
+
+}