[MSO-8] Update the maven dependency

Update the maven depenency for sdc-distribution-client to cooperate with the sdc changes.

Change-Id: I2da936e5c40cb68c7181bb78307192dd5655b5dc
Signed-off-by: xg353y <xg353y@intl.att.com>

45 files changed, 4625 insertions, 547 deletions

diff --git a/adapters/mso-adapters-rest-interface/pom.xml b/adapters/mso-adapters-rest-interface/pom.xml
index 0080d1b6a1..8619f4bfa6 100644
--- a/adapters/mso-adapters-rest-interface/pom.xml
+++ b/adapters/mso-adapters-rest-interface/pom.xml
@@ -11,7 +11,7 @@
 	<packaging>jar</packaging>
 	<name>mso-adapters-rest-interface</name>
 	<description>
-		Java Beans (Requests and Responses) for Network/Tenant/VNF REST Operations
+		Java Beans (Requests and Responses) for Network/Tenant/VNF/SDNC REST Operations
 	</description>
 	<build>
 		<finalName>${project.artifactId}-${project.version}</finalName>
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/catalogrest/QueryAllottedResourceCustomization.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/catalogrest/QueryAllottedResourceCustomization.java
new file mode 100644
index 0000000000..fc4cec9201
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/catalogrest/QueryAllottedResourceCustomization.java
@@ -0,0 +1,69 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - 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.mso.adapters.catalogrest;
+
+import org.openecomp.mso.db.catalog.beans.AllottedResourceCustomization;
+import org.openecomp.mso.logger.MsoLogger;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.ArrayList;
+import java.util.List;
+
+@XmlRootElement(name = "serviceAllottedResources")
+@NoJackson
+public class QueryAllottedResourceCustomization {
+	private static MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
+	private List<AllottedResourceCustomization> allottedResourceCustomization;
+
+	public QueryAllottedResourceCustomization() { super(); allottedResourceCustomization = new ArrayList<AllottedResourceCustomization>(); }
+	public QueryAllottedResourceCustomization(List<AllottedResourceCustomization> vlist) { allottedResourceCustomization = vlist; }
+
+	public List<AllottedResourceCustomization> getServiceAllottedResources(){ return this.allottedResourceCustomization; }
+	public void setServiceAllottedResources(List<AllottedResourceCustomization> v) { this.allottedResourceCustomization = v; }
+
+	@Override
+	public String toString () {
+		StringBuffer buf = new StringBuffer();
+
+		boolean first = true;
+		int i = 1;
+		for (AllottedResourceCustomization o : allottedResourceCustomization) {
+			buf.append(i+"\t");
+			if (!first) buf.append("\n"); first = false;
+			buf.append(o);
+		}
+		return buf.toString();
+    }
+
+	public String toJsonString() {
+		String jsonString = null;
+		try {
+			ObjectMapper mapper = new ObjectMapper();
+			jsonString = mapper.writeValueAsString(this);
+			LOGGER.debug ("AllottedResourceCustomization jsonString: "+jsonString);
+		}
+		catch (Exception e) {
+			LOGGER.debug ("AllottedResourceCustomization jsonString exception:"+e.getMessage());
+		}
+		return jsonString;
+	}
+}
\ No newline at end of file
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/catalogrest/QueryServiceMacroHolder.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/catalogrest/QueryServiceMacroHolder.java
new file mode 100644
index 0000000000..2cb756b856
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/catalogrest/QueryServiceMacroHolder.java
@@ -0,0 +1,56 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - 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.mso.adapters.catalogrest;
+
+import org.openecomp.mso.db.catalog.beans.ServiceMacroHolder;
+import org.openecomp.mso.logger.MsoLogger;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "serviceResources")
+@NoJackson
+public class QueryServiceMacroHolder {
+	private static MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
+	private ServiceMacroHolder serviceMacroHolder;
+
+	public QueryServiceMacroHolder() { super(); serviceMacroHolder = new ServiceMacroHolder(); }
+	public QueryServiceMacroHolder(ServiceMacroHolder vlist) { serviceMacroHolder = vlist; }
+
+	public ServiceMacroHolder getServiceResources(){ return this.serviceMacroHolder; }
+	public void setServiceResources(ServiceMacroHolder v) { this.serviceMacroHolder = v; }
+
+	@Override
+	public String toString () { return serviceMacroHolder.toString(); }
+
+	public String toJsonString() {
+		String jsonString = null;
+		try {
+			ObjectMapper mapper = new ObjectMapper();
+			jsonString = mapper.writeValueAsString(this);
+			LOGGER.debug ("QueryServiceMacroHolder jsonString: "+jsonString);
+		}
+		catch (Exception e) {
+			LOGGER.debug ("QueryServiceMacroHolder jsonString exception:"+e.getMessage());
+		}
+		return jsonString;
+	}
+}
\ No newline at end of file
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/catalogrest/QueryServiceNetworks.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/catalogrest/QueryServiceNetworks.java
new file mode 100644
index 0000000000..dfc3683fad
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/catalogrest/QueryServiceNetworks.java
@@ -0,0 +1,78 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - 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.mso.adapters.catalogrest;
+
+import org.openecomp.mso.db.catalog.beans.NetworkResourceCustomization;
+import org.openecomp.mso.logger.MsoLogger;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.ArrayList;
+import java.util.List;
+
+@XmlRootElement(name = "serviceNetworks")
+@NoJackson
+public class QueryServiceNetworks {
+	private static MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
+	private List<NetworkResourceCustomization> serviceNetworks;
+
+	public QueryServiceNetworks() { super(); serviceNetworks = new ArrayList<NetworkResourceCustomization>(); }
+	public QueryServiceNetworks(List<NetworkResourceCustomization> vlist) {
+		LOGGER.debug ("QueryServiceNetworks:");
+		serviceNetworks = new ArrayList<NetworkResourceCustomization>();
+		for (NetworkResourceCustomization o : vlist) {
+			LOGGER.debug ("-- o is a  serviceNetworks ----");
+			LOGGER.debug (o.toString());
+			serviceNetworks.add(o);
+			LOGGER.debug ("-------------------");
+		}
+	}
+
+	public List<NetworkResourceCustomization> getServiceNetworks(){ return this.serviceNetworks; }
+	public void setServiceNetworks(List<NetworkResourceCustomization> v) { this.serviceNetworks = v; }
+
+	@Override
+	public String toString () {
+		StringBuffer buf = new StringBuffer();
+
+		boolean first = true;
+		int i = 1;
+		for (NetworkResourceCustomization o : serviceNetworks) {
+			buf.append(i+"\t");
+			if (!first) buf.append("\n"); first = false;
+			buf.append(o);
+		}
+		return buf.toString();
+    }
+
+	public String toJsonString() {
+		String jsonString = null;
+		try {
+			ObjectMapper mapper = new ObjectMapper();
+			jsonString = mapper.writeValueAsString(this);
+			LOGGER.debug ("QueryServiceNetworks jsonString: "+jsonString);
+		}
+		catch (Exception e) {
+			LOGGER.debug ("QueryServiceNetworks jsonString exception:"+e.getMessage());
+		}
+		return jsonString;
+	}
+}
\ No newline at end of file
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/catalogrest/QueryServiceVnfs.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/catalogrest/QueryServiceVnfs.java
new file mode 100644
index 0000000000..0ea054309b
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/catalogrest/QueryServiceVnfs.java
@@ -0,0 +1,79 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - 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.mso.adapters.catalogrest;
+/* should be called QueryVnfResource.java */
+
+import org.openecomp.mso.db.catalog.beans.VnfResource;
+import org.openecomp.mso.logger.MsoLogger;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.ArrayList;
+import java.util.List;
+
+@XmlRootElement(name = "serviceVnfs")
+@NoJackson
+public class QueryServiceVnfs {
+	private static MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
+	private List<VnfResource> serviceVnfs;
+
+	public QueryServiceVnfs() { super(); serviceVnfs = new ArrayList<VnfResource>(); }
+	public QueryServiceVnfs(List<VnfResource> vlist) {
+		LOGGER.debug ("QueryServiceVnfs:");
+		serviceVnfs = new ArrayList<VnfResource>();
+		for (VnfResource o : vlist) {
+			LOGGER.debug ("-- o is a  serviceVnfs ----");
+			LOGGER.debug (o.toString());
+			serviceVnfs.add(o);
+			LOGGER.debug ("-------------------");
+		}
+	}
+
+	public List<VnfResource> getServiceVnfs(){ return this.serviceVnfs; }
+	public void setServiceVnfs(List<VnfResource> v) { this.serviceVnfs = v; }
+
+	@Override
+	public String toString () {
+		StringBuffer buf = new StringBuffer();
+
+		boolean first = true;
+		int i = 1;
+		for (VnfResource o : serviceVnfs) {
+			buf.append(i+"\t");
+			if (!first) buf.append("\n"); first = false;
+			buf.append(o);
+		}
+		return buf.toString();
+    }
+
+	public String toJsonString() {
+		String jsonString = null;
+		try {
+			ObjectMapper mapper = new ObjectMapper();
+			jsonString = mapper.writeValueAsString(this);
+			LOGGER.debug ("QuerySrviceVnfs jsonString: "+jsonString);
+		}
+		catch (Exception e) {
+			LOGGER.debug ("QuerySrviceVnfs jsonString exception:"+e.getMessage());
+		}
+		return jsonString;
+	}
+}
\ No newline at end of file
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/json/MapDeserializer.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/json/MapDeserializer.java
new file mode 100644
index 0000000000..03b8beae03
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/json/MapDeserializer.java
@@ -0,0 +1,74 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - 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.mso.adapters.json;
+
+import org.codehaus.jackson.JsonNode;
+import org.codehaus.jackson.JsonParser;
+import org.codehaus.jackson.JsonProcessingException;
+import org.codehaus.jackson.map.DeserializationContext;
+import org.codehaus.jackson.map.JsonDeserializer;
+import org.codehaus.jackson.map.ObjectMapper;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * Custom JSON Deserializer for Map<String, String>.
+ * In MSO with Jackson 1.9.12 and RestEasy 3.0.8, maps in JSON are serialized as
+ * follows:
+ * <pre>
+ * "params": {
+ *   "entry": [
+ *     {"key": "P1", "value": "V1"},
+ *     {"key": "P2", "value": "V2"},
+ *     ...
+ *     {"key": "PN", "value": "VN"}
+ *   ]
+ * }
+ * The implementation uses a LinkedHashMap to preserve the ordering of entries.
+ * </pre>
+ */
+public class MapDeserializer extends JsonDeserializer<Map<String, String>> {
+	@Override
+	public Map<String, String> deserialize(JsonParser parser,
+			DeserializationContext context) throws IOException,
+			JsonProcessingException {
+		ObjectMapper mapper = new ObjectMapper();
+		JsonNode tree = mapper.readTree(parser);
+
+		Map<String, String> map = new LinkedHashMap<String, String>();
+		Iterator<JsonNode> iterator = tree.iterator();
+
+		while (iterator.hasNext()) {
+			JsonNode element = iterator.next();
+			Iterator<JsonNode> arrayIterator = element.iterator();
+			while (arrayIterator.hasNext()) {
+				JsonNode arrayElement = arrayIterator.next();
+				String key = arrayElement.get("key").getTextValue();
+				String value = arrayElement.get("value").getTextValue();
+				map.put(key, value);
+			}
+		}
+
+		return map;
+	}
+}
\ No newline at end of file
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/json/MapSerializer.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/json/MapSerializer.java
new file mode 100644
index 0000000000..e3f55a0e69
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/json/MapSerializer.java
@@ -0,0 +1,67 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - 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.mso.adapters.json;
+
+import org.codehaus.jackson.JsonGenerationException;
+import org.codehaus.jackson.JsonGenerator;
+import org.codehaus.jackson.map.JsonSerializer;
+import org.codehaus.jackson.map.SerializerProvider;
+
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * Custom JSON Serializer for Map<String, String>.
+ * In MSO with Jackson 1.9.12 and RestEasy 3.0.8, maps in JSON are serialized as
+ * follows:
+ * <pre>
+ * "params": {
+ *   "entry": [
+ *     {"key": "P1", "value": "V1"},
+ *     {"key": "P2", "value": "V2"},
+ *     ...
+ *     {"key": "PN", "value": "VN"}
+ *   ]
+ * }
+ * </pre>
+ * The implementation uses a TreeMap, so entries are always sorted according
+ * to the natural ordering of the keys.
+ */
+public class MapSerializer extends JsonSerializer<Map<String, String>> {
+	@Override
+	public void serialize(Map<String, String> map, JsonGenerator jsonGenerator,
+			SerializerProvider serializerProvider) throws IOException,
+			JsonGenerationException {
+
+		jsonGenerator.writeStartObject();
+		jsonGenerator.writeArrayFieldStart("entry");
+
+		for (String key : map.keySet()) {
+			String value = map.get(key);
+			jsonGenerator.writeStartObject();
+			jsonGenerator.writeStringField("key", key);
+			jsonGenerator.writeStringField("value", value);
+			jsonGenerator.writeEndObject();
+		}
+
+		jsonGenerator.writeEndArray();
+		jsonGenerator.writeEndObject();
+	}
+}
\ No newline at end of file
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/RequestInformation.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/RequestInformation.java
new file mode 100644
index 0000000000..24a543c4f0
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/RequestInformation.java
@@ -0,0 +1,87 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - 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.mso.adapters.sdncrest;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+import javax.xml.bind.annotation.XmlElement;
+import java.io.Serializable;
+
+/**
+ * Request Information specified by the SDNC "agnostic" API.
+ */
+public class RequestInformation implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	// Identifies the transaction MSO has with the calling system.
+	private String requestId;
+
+	// Identifies the calling system, e.g. CCD.
+	private String source;
+
+	// The calling system's endpoint for receiving notifications from MSO.
+	private String notificationUrl;
+
+	// NOTE: these are defined in the SDNC AID, but not used by MSO:
+	//     request-action
+	//     request-sub-action
+
+	public RequestInformation(String requestId, String source, String notificationUrl) {
+		this.requestId = requestId;
+		this.source = source;
+		this.notificationUrl = notificationUrl;
+	}
+
+	public RequestInformation() {
+	}
+
+	@JsonProperty("requestId")
+	@XmlElement(name = "requestId")
+	public String getRequestId() {
+		return requestId;
+	}
+
+	@JsonProperty("requestId")
+	public void setRequestId(String requestId) {
+		this.requestId = requestId;
+	}
+
+	@JsonProperty("source")
+	@XmlElement(name = "source")
+	public String getSource() {
+		return source;
+	}
+
+	@JsonProperty("source")
+	public void setSource(String source) {
+		this.source = source;
+	}
+
+	@JsonProperty("notificationUrl")
+	@XmlElement(name = "notificationUrl")
+	public String getNotificationUrl() {
+		return notificationUrl;
+	}
+
+	@JsonProperty("notificationUrl")
+	public void setNotificationUrl(String notificationUrl) {
+		this.notificationUrl = notificationUrl;
+	}
+}
\ No newline at end of file
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/SDNCErrorCommon.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/SDNCErrorCommon.java
new file mode 100644
index 0000000000..20fc0498f4
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/SDNCErrorCommon.java
@@ -0,0 +1,37 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - 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.mso.adapters.sdncrest;
+
+import java.io.Serializable;
+
+/**
+ * Base class for all SDNC adapter error responses.
+ */
+public abstract class SDNCErrorCommon extends SDNCResponseCommon implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	public SDNCErrorCommon(String sdncRequestId, String responseCode,
+			String responseMessage, String ackFinalIndicator) {
+		super(sdncRequestId, responseCode, responseMessage, ackFinalIndicator);
+	}
+
+	public SDNCErrorCommon() {
+	}
+}
\ No newline at end of file
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/SDNCEvent.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/SDNCEvent.java
new file mode 100644
index 0000000000..038aaa4bba
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/SDNCEvent.java
@@ -0,0 +1,151 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - 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.mso.adapters.sdncrest;
+
+import org.openecomp.mso.adapters.json.MapDeserializer;
+import org.openecomp.mso.adapters.json.MapSerializer;
+import org.codehaus.jackson.annotate.JsonProperty;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.map.SerializationConfig;
+import org.codehaus.jackson.map.annotate.JsonDeserialize;
+import org.codehaus.jackson.map.annotate.JsonRootName;
+import org.codehaus.jackson.map.annotate.JsonSerialize;
+import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+// NOTE: the JAXB (XML) annotations are required with JBoss AS7 and RESTEasy,
+//       even though we are using JSON exclusively.  The @NoJackson annotation
+//       is also required in this environment.
+
+/**
+ * SDNC adapter success response for "agnostic" API services. Note that the
+ * map of response parameters is represented this way in JSON:
+ * <pre>
+ * "params": {
+ *   "entry": [
+ *     {"key": "P1", "value": "V1"},
+ *     {"key": "P2", "value": "V2"},
+ *     ...
+ *     {"key": "PN", "value": "VN"}
+ *   ]
+ * }
+ * </pre>
+ */
+@JsonRootName("SDNCEvent")
+@JsonSerialize(include= Inclusion.NON_NULL)
+@XmlRootElement(name = "SDNCEvent")
+@NoJackson
+public class SDNCEvent implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	// Event type
+	private String eventType;
+
+	// Event correlator type
+	private String eventCorrelatorType;
+
+	// Event correlator value.
+	private String eventCorrelator;
+
+	// Map of response parameters (possibly none).
+	private Map<String, String> params = null;
+
+	public SDNCEvent(String eventType, String eventCorrelatorType, String eventCorrelator) {
+		this.eventType = eventType;
+		this.eventCorrelatorType =  eventCorrelatorType;
+		this.eventCorrelator =  eventCorrelator;
+	}
+
+	public SDNCEvent() {
+	}
+
+	@JsonProperty("eventType")
+	@XmlElement(name = "eventType")
+	public String getEventType() {
+		return eventType;
+	}
+
+	@JsonProperty("eventType")
+	public void setEventType(String eventType) {
+		this.eventType = eventType;
+	}
+
+	@JsonProperty("eventCorrelatorType")
+	@XmlElement(name = "eventCorrelatorType")
+	public String getEventCorrelatorType() {
+		return eventCorrelatorType;
+	}
+
+	@JsonProperty("eventCorrelatorType")
+	public void setEventCorrelatorType(String eventCorrelatorType) {
+		this.eventCorrelatorType = eventCorrelatorType;
+	}
+
+	@JsonProperty("eventCorrelator")
+	@XmlElement(name = "eventCorrelator")
+	public String getEventCorrelator() {
+		return eventCorrelator;
+	}
+
+	@JsonProperty("eventCorrelator")
+	public void setEventCorrelator(String eventCorrelator) {
+		this.eventCorrelator = eventCorrelator;
+	}
+
+	@JsonProperty("params")
+	@JsonDeserialize(using = MapDeserializer.class)
+	@XmlElement(name = "params")
+	public Map<String, String> getParams() {
+		return params;
+	}
+
+	@JsonProperty("params")
+	@JsonSerialize(using = MapSerializer.class, include= Inclusion.NON_NULL)
+	public void setParams(Map<String, String> params) {
+		this.params = params;
+	}
+
+	public void addParam(String name, String value) {
+		if (params == null) {
+			params = new LinkedHashMap<String, String>();
+		}
+		params.put(name, value);
+	}
+
+	public String toJson() {
+		try {
+			ObjectMapper mapper = new ObjectMapper();
+			mapper.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
+			mapper.setSerializationInclusion(Inclusion.NON_NULL);
+			return mapper.writeValueAsString(this);
+		} catch (IOException e) {
+			e.printStackTrace();
+			throw new UnsupportedOperationException("Cannot convert "
+				+ getClass().getSimpleName() + " to JSON", e);
+		}
+	}
+}
\ No newline at end of file
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/SDNCRequestCommon.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/SDNCRequestCommon.java
new file mode 100644
index 0000000000..6232af6f79
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/SDNCRequestCommon.java
@@ -0,0 +1,109 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - 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.mso.adapters.sdncrest;
+
+import org.codehaus.jackson.annotate.JsonIgnore;
+import org.codehaus.jackson.annotate.JsonProperty;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.map.SerializationConfig;
+import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
+import javax.xml.bind.annotation.XmlElement;
+import java.io.IOException;
+import java.io.Serializable;
+
+/**
+ * Base class for all SDNC adapter requests.
+ */
+public abstract class SDNCRequestCommon implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	// Endpoint on which BPMN can receive notifications from the SDNC adapter.
+	private String bpNotificationUrl;
+
+	// BPMN flow timeout value in ISO 8601 format, e.g. PT5M.
+	// Not currently used by the SDNC adapter.
+	private String bpTimeout;
+
+	// Identifies the MSO transaction with SDNC.
+	// Maps to sdnc-request-header/requestId in the SDNC request.
+	private String sdncRequestId;
+
+	public SDNCRequestCommon(String sdncRequestId, String bpNotificationUrl,
+			String bpTimeout) {
+		this.sdncRequestId = sdncRequestId;
+		this.bpNotificationUrl = bpNotificationUrl;
+		this.bpTimeout = bpTimeout;
+	}
+
+	public SDNCRequestCommon() {
+	}
+
+	@JsonProperty("bpNotificationUrl")
+	@XmlElement(name = "bpNotificationUrl")
+	public String getBPNotificationUrl() {
+		return bpNotificationUrl;
+	}
+
+	@JsonProperty("bpNotificationUrl")
+	public void setBPNotificationUrl(String bpNotificationUrl) {
+		this.bpNotificationUrl = bpNotificationUrl;
+	}
+
+	@JsonProperty("bpTimeout")
+	@XmlElement(name = "bpTimeout")
+	public String getBPTimeout() {
+		return bpTimeout;
+	}
+
+	@JsonProperty("bpTimeout")
+	public void setBPTimeout(String bpTimeout) {
+		this.bpTimeout = bpTimeout;
+	}
+
+	@JsonProperty("sdncRequestId")
+	@XmlElement(name = "sdncRequestId")
+	public String getSDNCRequestId() {
+		return sdncRequestId;
+	}
+
+	@JsonProperty("sdncRequestId")
+	public void setSDNCRequestId(String sdncRequestId) {
+		this.sdncRequestId = sdncRequestId;
+	}
+
+	@JsonIgnore
+	public boolean isSynchronous() {
+		return bpNotificationUrl == null || bpNotificationUrl.isEmpty();
+	}
+
+	public String toJson() {
+		try {
+			ObjectMapper mapper = new ObjectMapper();
+			mapper.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
+			mapper.setSerializationInclusion(Inclusion.NON_NULL);
+			return mapper.writeValueAsString(this);
+		} catch (IOException e) {
+			e.printStackTrace();
+			throw new UnsupportedOperationException("Cannot convert "
+				+ getClass().getSimpleName() + " to JSON", e);
+		}
+	}
+}
\ No newline at end of file
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/SDNCResponseCommon.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/SDNCResponseCommon.java
new file mode 100644
index 0000000000..aa0be2702b
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/SDNCResponseCommon.java
@@ -0,0 +1,117 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - 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.mso.adapters.sdncrest;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.map.SerializationConfig;
+import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
+import javax.xml.bind.annotation.XmlElement;
+import java.io.IOException;
+import java.io.Serializable;
+
+/**
+ * Base class for all SDNC adapter responses, including errors.
+ */
+public abstract class SDNCResponseCommon implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	// Identifies the MSO transaction with SDNC.
+	private String sdncRequestId;
+
+	// Response code, either from SDNC, or generated by the SDNC adapter.
+	// 2XX responses are considered success responses.
+	private String responseCode;
+
+	// Response message, either from SDNC, or generated by the SDNC adapter.
+	private String responseMessage;
+
+	// Indicates if the response is final (Y or N).
+	private String ackFinalIndicator;
+
+	public SDNCResponseCommon(String sdncRequestId, String responseCode,
+			String responseMessage, String ackFinalIndicator) {
+		this.sdncRequestId = sdncRequestId;
+		this.responseCode = responseCode;
+		this.responseMessage = responseMessage;
+		this.ackFinalIndicator = ackFinalIndicator;
+	}
+
+	public SDNCResponseCommon() {
+	}
+
+	@JsonProperty("sdncRequestId")
+	@XmlElement(name = "sdncRequestId")
+	public String getSDNCRequestId() {
+		return sdncRequestId;
+	}
+
+	@JsonProperty("sdncRequestId")
+	public void setSDNCRequestId(String sdncRequestId) {
+		this.sdncRequestId = sdncRequestId;
+	}
+
+	@JsonProperty("responseCode")
+	@XmlElement(name = "responseCode")
+	public String getResponseCode() {
+		return responseCode;
+	}
+
+	@JsonProperty("responseCode")
+	public void setResponseCode(String responseCode) {
+		this.responseCode = responseCode;
+	}
+
+	@JsonProperty("responseMessage")
+	@XmlElement(name = "responseMessage")
+	public String getResponseMessage() {
+		return responseMessage;
+	}
+
+	@JsonProperty("responseMessage")
+	public void setResponseMessage(String responseMessage) {
+		this.responseMessage = responseMessage;
+	}
+
+	@JsonProperty("ackFinalIndicator")
+	@XmlElement(name = "ackFinalIndicator")
+	public String getAckFinalIndicator() {
+		return ackFinalIndicator;
+	}
+
+	@JsonProperty("ackFinalIndicator")
+	public void setAckFinalIndicator(String ackFinalIndicator) {
+		this.ackFinalIndicator = ackFinalIndicator;
+	}
+
+	public String toJson() {
+		try {
+			ObjectMapper mapper = new ObjectMapper();
+			mapper.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
+			mapper.setSerializationInclusion(Inclusion.NON_NULL);
+			return mapper.writeValueAsString(this);
+		} catch (IOException e) {
+			e.printStackTrace();
+			throw new UnsupportedOperationException("Cannot convert "
+				+ getClass().getSimpleName() + " to JSON", e);
+		}
+	}
+}
\ No newline at end of file
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceError.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceError.java
new file mode 100644
index 0000000000..a789316754
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceError.java
@@ -0,0 +1,50 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - 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.mso.adapters.sdncrest;
+
+import org.codehaus.jackson.map.annotate.JsonRootName;
+import org.codehaus.jackson.map.annotate.JsonSerialize;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
+
+// NOTE: the JAXB (XML) annotations are required with JBoss AS7 and RESTEasy,
+//       even though we are using JSON exclusively.  The @NoJackson annotation
+//       is also required in this environment.
+
+/**
+ * SDNC adapter error response for "agnostic" API services.
+ */
+@JsonRootName("SDNCServiceError")
+@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
+@XmlRootElement(name = "SDNCServiceError")
+@NoJackson
+public class SDNCServiceError extends SDNCErrorCommon implements Serializable {
+	private static final long serialVersionUID = 1;
+
+	public SDNCServiceError(String sdncRequestId, String responseCode,
+			String responseMessage, String ackFinalIndicator) {
+		super(sdncRequestId, responseCode, responseMessage, ackFinalIndicator);
+	}
+
+	public SDNCServiceError() {
+	}
+}
\ No newline at end of file
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceRequest.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceRequest.java
new file mode 100644
index 0000000000..814b603783
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceRequest.java
@@ -0,0 +1,146 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - 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.mso.adapters.sdncrest;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+import org.codehaus.jackson.map.annotate.JsonRootName;
+import org.codehaus.jackson.map.annotate.JsonSerialize;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
+
+// NOTE: the JAXB (XML) annotations are required with JBoss AS7 and RESTEasy,
+//       even though we are using JSON exclusively.  The @NoJackson annotation
+//       is also required in this environment.
+
+/**
+ * SDNC adapter request for "agnostic" API services.
+ * The target action is determined by a service type and an operation.
+ */
+@JsonRootName("SDNCServiceRequest")
+@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
+@XmlRootElement(name = "SDNCServiceRequest")
+@NoJackson
+public class SDNCServiceRequest extends SDNCRequestCommon implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	// Request Information specified by SDNC "agnostic" API
+	private RequestInformation requestInformation;
+
+	// Service Information specified by: SDNC "agnostic" API
+	private ServiceInformation serviceInformation;
+
+	// The SDNC service type specified by SDNC "agnostic" API
+	private String sdncService;
+
+	// The SDNC operation specified by SDNC "agnostic" API
+	private String sdncOperation;
+
+	// The SDNC service data type specified by SDNC "agnostic" API
+	private String sdncServiceDataType;
+
+	// The SDNC service data specified by SDNC "agnostic" API
+    private String sndcServiceData;
+
+	public SDNCServiceRequest() {
+	}
+
+	public SDNCServiceRequest(String bpNotificationUrl, String bpTimeout,
+			String sdncRequestId, String sdncService, String sdncOperation,
+			RequestInformation requestInformation,
+			ServiceInformation serviceInformation, String sdncServiceDataType,
+			String sndcServiceData) {
+		super(bpNotificationUrl, bpTimeout, sdncRequestId);
+		this.requestInformation = requestInformation;
+		this.serviceInformation = serviceInformation;
+		this.sdncService = sdncService;
+		this.sdncOperation = sdncOperation;
+		this.sdncServiceDataType = sdncServiceDataType;
+		this.sndcServiceData = sndcServiceData;
+	}
+
+	@JsonProperty("requestInformation")
+	@XmlElement(name = "requestInformation")
+	public RequestInformation getRequestInformation() {
+		return requestInformation;
+	}
+
+	@JsonProperty("requestInformation")
+	public void setRequestInformation(RequestInformation requestInformation) {
+		this.requestInformation = requestInformation;
+	}
+
+	@JsonProperty("serviceInformation")
+	@XmlElement(name = "serviceInformation")
+	public ServiceInformation getServiceInformation() {
+		return serviceInformation;
+	}
+
+	@JsonProperty("serviceInformation")
+	public void setServiceInformation(ServiceInformation serviceInformation) {
+		this.serviceInformation = serviceInformation;
+	}
+
+	@JsonProperty("sdncService")
+	@XmlElement(name = "sdncService")
+	public String getSDNCService() {
+		return sdncService;
+	}
+
+	@JsonProperty("sdncService")
+	public void setSDNCService(String sdncService) {
+		this.sdncService = sdncService;
+	}
+
+	@JsonProperty("sdncOperation")
+	@XmlElement(name = "sdncOperation")
+	public String getSDNCOperation() {
+		return sdncOperation;
+	}
+
+	@JsonProperty("sdncOperation")
+	public void setSDNCOperation(String sdncOperation) {
+		this.sdncOperation = sdncOperation;
+	}
+
+	@JsonProperty("sdncServiceDataType")
+	@XmlElement(name = "sdncServiceDataType")
+	public String getSDNCServiceDataType() {
+		return sdncServiceDataType;
+	}
+
+	@JsonProperty("sdncServiceDataType")
+	public void setSDNCServiceDataType(String sdncServiceDataType) {
+		this.sdncServiceDataType = sdncServiceDataType;
+	}
+
+	@JsonProperty("sdncServiceData")
+	@XmlElement(name = "sdncServiceData")
+	public String getSDNCServiceData() {
+		return sndcServiceData;
+	}
+
+	@JsonProperty("sdncServiceData")
+	public void setSDNCServiceData(String sndcServiceData) {
+		this.sndcServiceData = sndcServiceData;
+	}
+}
\ No newline at end of file
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceResponse.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceResponse.java
new file mode 100644
index 0000000000..2ab6ed5a8a
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceResponse.java
@@ -0,0 +1,91 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - 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.mso.adapters.sdncrest;
+
+import org.openecomp.mso.adapters.json.MapDeserializer;
+import org.openecomp.mso.adapters.json.MapSerializer;
+import org.codehaus.jackson.annotate.JsonProperty;
+import org.codehaus.jackson.map.annotate.JsonDeserialize;
+import org.codehaus.jackson.map.annotate.JsonRootName;
+import org.codehaus.jackson.map.annotate.JsonSerialize;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+// NOTE: the JAXB (XML) annotations are required with JBoss AS7 and RESTEasy,
+//       even though we are using JSON exclusively.  The @NoJackson annotation
+//       is also required in this environment.
+
+/**
+ * SDNC adapter success response for "agnostic" API services. Note that the
+ * map of response parameters is represented this way in JSON:
+ * <pre>
+ * "params": {
+ *   "entry": [
+ *     {"key": "P1", "value": "V1"},
+ *     {"key": "P2", "value": "V2"},
+ *     ...
+ *     {"key": "PN", "value": "VN"}
+ *   ]
+ * }
+ * </pre>
+ */
+@JsonRootName("SDNCServiceResponse")
+@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
+@XmlRootElement(name = "SDNCServiceResponse")
+@NoJackson
+public class SDNCServiceResponse extends SDNCResponseCommon implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	// Map of response parameters (possibly none).
+	private Map<String, String> params = null;
+
+	public SDNCServiceResponse(String sdncRequestId, String responseCode,
+			String responseMessage, String ackFinalIndicator) {
+		super(sdncRequestId, responseCode, responseMessage, ackFinalIndicator);
+	}
+
+	public SDNCServiceResponse() {
+	}
+
+	@JsonProperty("params")
+	@JsonDeserialize(using = MapDeserializer.class)
+	@XmlElement(name = "params")
+	public Map<String, String> getParams() {
+		return params;
+	}
+
+	@JsonProperty("params")
+	@JsonSerialize(using = MapSerializer.class, include=JsonSerialize.Inclusion.NON_NULL)
+	public void setParams(Map<String, String> params) {
+		this.params = params;
+	}
+
+	public void addParam(String name, String value) {
+		if (params == null) {
+			params = new LinkedHashMap<String, String>();
+		}
+		params.put(name, value);
+	}
+}
\ No newline at end of file
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/ServiceInformation.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/ServiceInformation.java
new file mode 100644
index 0000000000..628ef9c071
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/sdncrest/ServiceInformation.java
@@ -0,0 +1,102 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * OPENECOMP - 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.mso.adapters.sdncrest;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+import javax.xml.bind.annotation.XmlElement;
+import java.io.Serializable;
+
+/**
+ * Service Information specified by the SDNC "agnostic" API.
+ */
+public class ServiceInformation implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	// The subscription's service type for the target service instance.
+	private String serviceType;
+
+	// Identifies the target service instance for this particular SDNC request.
+	// NOTE: this could be a child of the parent model instance, i.e. this
+	// service instance ID may be different from the service instance ID
+	// associated with the transaction MSO has with the system that invoked it.
+	private String serviceInstanceId;
+
+	// The subscriber name.
+	private String subscriberName;
+
+	// The subscriber global ID (customer ID).
+	private String subscriberGlobalId;
+
+	public ServiceInformation(String serviceType, String serviceInstanceId,
+			String subscriberName, String subscriberGlobalId) {
+		this.serviceType = serviceType;
+		this.serviceInstanceId = serviceInstanceId;
+		this.subscriberName = subscriberName;
+		this.subscriberGlobalId = subscriberGlobalId;
+	}
+
+	public ServiceInformation() {
+	}
+
+	@JsonProperty("serviceType")
+	@XmlElement(name = "serviceType")
+	public String getServiceType() {
+		return serviceType;
+	}
+
+	@JsonProperty("serviceType")
+	public void setServiceType(String serviceType) {
+		this.serviceType = serviceType;
+	}
+
+	@JsonProperty("serviceInstanceId")
+	@XmlElement(name = "serviceInstanceId")
+	public String getServiceInstanceId() {
+		return serviceInstanceId;
+	}
+
+	@JsonProperty("serviceInstanceId")
+	public void setServiceInstanceId(String serviceInstanceId) {
+		this.serviceInstanceId = serviceInstanceId;
+	}
+
+	@JsonProperty("subscriberName")
+	@XmlElement(name = "subscriberName")
+	public String getSubscriberName() {
+		return subscriberName;
+	}
+
+	@JsonProperty("subscriberName")
+	public void setSubscriberName(String subscriberName) {
+		this.subscriberName = subscriberName;
+	}
+
+	@JsonProperty("subscriberGlobalId")
+	@XmlElement(name = "subscriberGlobalId")
+	public String getSubscriberGlobalId() {
+		return subscriberGlobalId;
+	}
+
+	@JsonProperty("subscriberGlobalId")
+	public void setSubscriberGlobalId(String subscriberGlobalId) {
+		this.subscriberGlobalId = subscriberGlobalId;
+	}
+}
\ No newline at end of file
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/CreateVfModuleRequest.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/CreateVfModuleRequest.java
index f337c4c9de..bcee2ffd8a 100644
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/CreateVfModuleRequest.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/CreateVfModuleRequest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -66,6 +66,7 @@ public class CreateVfModuleRequest extends VfRequestCommon {
 	private String volumeGroupStackId;
 	private String baseVfModuleId;
 	private String baseVfModuleStackId;
+	private String modelCustomizationUuid;
 
 	private String requestType;
 	private Boolean failIfExists;
@@ -170,6 +171,14 @@ public class CreateVfModuleRequest extends VfRequestCommon {
 		this.baseVfModuleStackId = baseVfModuleStackId;
 	}
 
+	public String getModelCustomizationUuid() {
+		return this.modelCustomizationUuid;
+	}
+
+	public void setModelCustomizationUuid(String modelCustomizationUuid) {
+		this.modelCustomizationUuid = modelCustomizationUuid;
+	}
+
 	public String getRequestType() {
 		return requestType;
 	}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/CreateVolumeGroupRequest.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/CreateVolumeGroupRequest.java
index b93a26031f..840edf7fbc 100644
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/CreateVolumeGroupRequest.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/CreateVolumeGroupRequest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -42,6 +42,7 @@ public class CreateVolumeGroupRequest extends VfRequestCommon {
 	private String vnfType;
 	private String vnfVersion;
 	private String vfModuleType;
+	private String modelCustomizationUuid;
 	private Map<String,String> volumeGroupParams = new HashMap<String, String>();
 	private Boolean failIfExists;
 	private Boolean suppressBackout;
@@ -111,6 +112,14 @@ public class CreateVolumeGroupRequest extends VfRequestCommon {
 		return volumeGroupId;
 	}
 
+	public String getModelCustomizationUuid() {
+		return this.modelCustomizationUuid;
+	}
+
+	public void setModelCustomizationUuid(String modelCustomizationUuid) {
+		this.modelCustomizationUuid = modelCustomizationUuid;
+	}
+
 	public void setVolumeGroupId(String volumeGroupId) {
 		this.volumeGroupId = volumeGroupId;
 	}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/DeleteVfModuleResponse.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/DeleteVfModuleResponse.java
index a3d00a95cd..8f719c88c8 100644
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/DeleteVfModuleResponse.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/DeleteVfModuleResponse.java
@@ -7,9 +7,9 @@
  * 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.
@@ -25,6 +25,9 @@ import javax.xml.bind.annotation.XmlRootElement;
 import org.jboss.resteasy.annotations.providers.NoJackson;
 import org.codehaus.jackson.map.annotate.JsonRootName;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @JsonRootName("deleteVfModuleResponse")
 @XmlRootElement(name = "deleteVfModuleResponse")
 @NoJackson
@@ -32,16 +35,17 @@ public class DeleteVfModuleResponse extends VfResponseCommon {
 	private String vnfId;
 	private String vfModuleId;
 	private Boolean vfModuleDeleted;
-
+	private Map<String,String> vfModuleOutputs = new HashMap<String, String>();
 	public DeleteVfModuleResponse() {
 		super();
 	}
 
-	public DeleteVfModuleResponse(String vnfId, String vfModuleId, Boolean vfModuleDeleted, String messageId) {
+	public DeleteVfModuleResponse(String vnfId, String vfModuleId, Boolean vfModuleDeleted, String messageId, Map<String,String> outputs) {
 		super(messageId);
 		this.vnfId = vnfId;
 		this.vfModuleId = vfModuleId;
 		this.vfModuleDeleted = vfModuleDeleted;
+		this.vfModuleOutputs = outputs;
 	}
 
 	public String getVnfId() {
@@ -67,4 +71,11 @@ public class DeleteVfModuleResponse extends VfResponseCommon {
 	public void setVfModuleDeleted(Boolean vfModuleDeleted) {
 		this.vfModuleDeleted = vfModuleDeleted;
 	}
+	public Map<String, String> getVfModuleOutputs() {
+		return vfModuleOutputs;
+	}
+
+	public void setVfModuleOutputs(Map<String, String> vfModuleOutputs) {
+		this.vfModuleOutputs = vfModuleOutputs;
+	}
 }
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/UpdateVfModuleRequest.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/UpdateVfModuleRequest.java
index a234e749ba..6c11232bfa 100644
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/UpdateVfModuleRequest.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/UpdateVfModuleRequest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -52,6 +52,8 @@ public class UpdateVfModuleRequest extends VfRequestCommon {
 	private String baseVfModuleId;
 	private String baseVfModuleStackId;
 
+	private String modelCustomizationUuid;
+
 	private String requestType;
 	private Boolean failIfExists;
 	private Boolean backout;
@@ -151,6 +153,14 @@ public class UpdateVfModuleRequest extends VfRequestCommon {
 		return baseVfModuleId;
 	}
 
+	public String getModelCustomizationUuid() {
+		return this.modelCustomizationUuid;
+	}
+
+	public void setModelCustomizationUuid(String modelCustomizationUuid) {
+		this.modelCustomizationUuid = modelCustomizationUuid;
+	}
+
 	public void setBaseVfModuleId(String baseVfModuleId) {
 		this.baseVfModuleId = baseVfModuleId;
 	}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/UpdateVolumeGroupRequest.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/UpdateVolumeGroupRequest.java
index 50c60b30d6..596021e5e8 100644
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/UpdateVolumeGroupRequest.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/UpdateVolumeGroupRequest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -42,6 +42,7 @@ public class UpdateVolumeGroupRequest extends VfRequestCommon {
 	private String vnfType;
 	private String vnfVersion;
 	private String vfModuleType;
+	private String modelCustomizationUuid;
 	private Map<String,String> volumeGroupParams = new HashMap<String, String>();
 	private MsoRequest msoRequest = new MsoRequest();
 
@@ -105,6 +106,14 @@ public class UpdateVolumeGroupRequest extends VfRequestCommon {
 		this.vfModuleType = vfModuleType;
 	}
 
+	public String getModelCustomizationUuid() {
+		return this.modelCustomizationUuid;
+	}
+
+	public void setModelCustomizationUuid(String modelCustomizationUuid) {
+		this.modelCustomizationUuid = modelCustomizationUuid;
+	}
+
 	public Map<String, String> getVolumeGroupParams() {
 		return volumeGroupParams;
 	}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryAllottedResourceCustomizationESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryAllottedResourceCustomizationESTest.java
new file mode 100644
index 0000000000..5addb999ce
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryAllottedResourceCustomizationESTest.java
@@ -0,0 +1,97 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Feb 20 14:08:31 GMT 2017
+ */
+
+package org.openecomp.mso.adapters.catalogrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+import static org.evosuite.runtime.EvoAssertions.*;
+import java.util.LinkedList;
+import java.util.List;
+import org.evosuite.runtime.EvoRunner;
+import org.evosuite.runtime.EvoRunnerParameters;
+import org.junit.runner.RunWith;
+import org.openecomp.mso.db.catalog.beans.AllottedResourceCustomization;
+
+@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true)
+public class QueryAllottedResourceCustomizationESTest extends QueryAllottedResourceCustomizationESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test0()  throws Throwable  {
+      QueryAllottedResourceCustomization queryAllottedResourceCustomization0 = new QueryAllottedResourceCustomization();
+      queryAllottedResourceCustomization0.setServiceAllottedResources((List<AllottedResourceCustomization>) null);
+      List<AllottedResourceCustomization> list0 = queryAllottedResourceCustomization0.getServiceAllottedResources();
+      assertNull(list0);
+  }
+
+  @Test(timeout = 4000)
+  public void test1()  throws Throwable  {
+      LinkedList<AllottedResourceCustomization> linkedList0 = new LinkedList<AllottedResourceCustomization>();
+      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
+      linkedList0.add(allottedResourceCustomization0);
+      QueryAllottedResourceCustomization queryAllottedResourceCustomization0 = new QueryAllottedResourceCustomization((List<AllottedResourceCustomization>) linkedList0);
+      List<AllottedResourceCustomization> list0 = queryAllottedResourceCustomization0.getServiceAllottedResources();
+      assertFalse(list0.isEmpty());
+  }
+
+  @Test(timeout = 4000)
+  public void test2()  throws Throwable  {
+      LinkedList<AllottedResourceCustomization> linkedList0 = new LinkedList<AllottedResourceCustomization>();
+      AllottedResourceCustomization allottedResourceCustomization0 = new AllottedResourceCustomization();
+      linkedList0.add(allottedResourceCustomization0);
+      QueryAllottedResourceCustomization queryAllottedResourceCustomization0 = new QueryAllottedResourceCustomization((List<AllottedResourceCustomization>) linkedList0);
+      linkedList0.add(allottedResourceCustomization0);
+      String string0 = queryAllottedResourceCustomization0.toString();
+      assertEquals("1\tmodelName=null,modelVersion=null,version=null,modelUuid=null,modelInvariantUuid=null,modelCustomizationUuid=null,modelInstanceName=null,description=null,modelInstanceName=null,created=null1\t\nmodelName=null,modelVersion=null,version=null,modelUuid=null,modelInvariantUuid=null,modelCustomizationUuid=null,modelInstanceName=null,description=null,modelInstanceName=null,created=null", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test3()  throws Throwable  {
+      QueryAllottedResourceCustomization queryAllottedResourceCustomization0 = new QueryAllottedResourceCustomization();
+      String string0 = queryAllottedResourceCustomization0.toString();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test4()  throws Throwable  {
+      QueryAllottedResourceCustomization queryAllottedResourceCustomization0 = new QueryAllottedResourceCustomization();
+      List<AllottedResourceCustomization> list0 = queryAllottedResourceCustomization0.getServiceAllottedResources();
+      assertTrue(list0.isEmpty());
+  }
+
+  @Test(timeout = 4000)
+  public void test5()  throws Throwable  {
+      QueryAllottedResourceCustomization queryAllottedResourceCustomization0 = new QueryAllottedResourceCustomization();
+      queryAllottedResourceCustomization0.setServiceAllottedResources((List<AllottedResourceCustomization>) null);
+      // Undeclared exception!
+      try {
+        queryAllottedResourceCustomization0.toString();
+        fail("Expecting exception: NullPointerException");
+
+      } catch(NullPointerException e) {
+         //
+         // no message in exception (getMessage() returned null)
+         //
+         verifyException("org.openecomp.mso.adapters.catalogrest.QueryAllottedResourceCustomization", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test6()  throws Throwable  {
+      LinkedList<AllottedResourceCustomization> linkedList0 = new LinkedList<AllottedResourceCustomization>();
+      QueryAllottedResourceCustomization queryAllottedResourceCustomization0 = new QueryAllottedResourceCustomization((List<AllottedResourceCustomization>) linkedList0);
+      // Undeclared exception!
+      try {
+        queryAllottedResourceCustomization0.toJsonString();
+        fail("Expecting exception: VerifyError");
+
+      } catch(VerifyError e) {
+         //
+         // (class: org/codehaus/jackson/map/MapperConfig, method: <clinit> signature: ()V) Bad type in putfield/putstatic
+         //
+         verifyException("org.codehaus.jackson.map.ObjectMapper", e);
+      }
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryAllottedResourceCustomizationESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryAllottedResourceCustomizationESTestscaffolding.java
new file mode 100644
index 0000000000..0ce23dc7c2
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryAllottedResourceCustomizationESTestscaffolding.java
@@ -0,0 +1,264 @@
+/**
+ * Scaffolding file used to store all the setups needed to run
+ * tests automatically generated by EvoSuite
+ * Mon Feb 20 14:08:31 GMT 2017
+ */
+
+package org.openecomp.mso.adapters.catalogrest;
+
+import org.evosuite.runtime.annotation.EvoSuiteClassExclude;
+import org.junit.BeforeClass;
+import org.junit.Before;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.evosuite.runtime.sandbox.Sandbox;
+
+@EvoSuiteClassExclude
+public class QueryAllottedResourceCustomizationESTestscaffolding {
+
+  @org.junit.Rule
+  public org.evosuite.runtime.vnet.NonFunctionalRequirementRule nfr = new org.evosuite.runtime.vnet.NonFunctionalRequirementRule();
+
+  private static final java.util.Properties defaultProperties = (java.util.Properties) java.lang.System.getProperties().clone();
+
+  private org.evosuite.runtime.thread.ThreadStopper threadStopper =  new org.evosuite.runtime.thread.ThreadStopper (org.evosuite.runtime.thread.KillSwitchHandler.getInstance(), 3000);
+
+  @BeforeClass
+  public static void initEvoSuiteFramework() {
+    org.evosuite.runtime.RuntimeSettings.className = "org.openecomp.mso.adapters.catalogrest.QueryAllottedResourceCustomization";
+    org.evosuite.runtime.GuiSupport.initialize();
+    org.evosuite.runtime.RuntimeSettings.maxNumberOfThreads = 100;
+    org.evosuite.runtime.RuntimeSettings.maxNumberOfIterationsPerLoop = 10000;
+    org.evosuite.runtime.RuntimeSettings.mockSystemIn = true;
+    org.evosuite.runtime.RuntimeSettings.sandboxMode = org.evosuite.runtime.sandbox.Sandbox.SandboxMode.RECOMMENDED;
+    org.evosuite.runtime.sandbox.Sandbox.initializeSecurityManagerForSUT();
+    org.evosuite.runtime.classhandling.JDKClassResetter.init();
+    initializeClasses();
+    org.evosuite.runtime.Runtime.getInstance().resetRuntime();
+  }
+
+  @AfterClass
+  public static void clearEvoSuiteFramework(){
+    Sandbox.resetDefaultSecurityManager();
+    java.lang.System.setProperties((java.util.Properties) defaultProperties.clone());
+  }
+
+  @Before
+  public void initTestCase(){
+    threadStopper.storeCurrentThreads();
+    threadStopper.startRecordingTime();
+    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().initHandler();
+    org.evosuite.runtime.sandbox.Sandbox.goingToExecuteSUTCode();
+    org.evosuite.runtime.GuiSupport.setHeadless();
+    org.evosuite.runtime.Runtime.getInstance().resetRuntime();
+    org.evosuite.runtime.agent.InstrumentingAgent.activate();
+  }
+
+  @After
+  public void doneWithTestCase(){
+    threadStopper.killAndJoinClientThreads();
+    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().safeExecuteAddedHooks();
+    org.evosuite.runtime.classhandling.JDKClassResetter.reset();
+    resetClasses();
+    org.evosuite.runtime.sandbox.Sandbox.doneWithExecutingSUTCode();
+    org.evosuite.runtime.agent.InstrumentingAgent.deactivate();
+    org.evosuite.runtime.GuiSupport.restoreHeadlessMode();
+  }
+
+  private static void initializeClasses() {
+    org.evosuite.runtime.classhandling.ClassStateSupport.initializeClasses(QueryAllottedResourceCustomizationESTestscaffolding.class.getClassLoader() ,
+      "org.codehaus.jackson.map.JsonSerializableWithType",
+      "org.codehaus.jackson.map.HandlerInstantiator",
+      "org.codehaus.jackson.map.deser.StdDeserializerProvider",
+      "org.codehaus.jackson.map.SerializerFactory",
+      "org.codehaus.jackson.map.SerializerProvider",
+      "org.codehaus.jackson.map.type.TypeBindings",
+      "org.codehaus.jackson.map.SerializationConfig",
+      "org.codehaus.jackson.JsonProcessingException",
+      "org.codehaus.jackson.map.introspect.AnnotationMap",
+      "org.codehaus.jackson.map.introspect.Annotated",
+      "org.codehaus.jackson.io.InputDecorator",
+      "org.codehaus.jackson.map.Module",
+      "org.codehaus.jackson.map.util.Annotations",
+      "org.codehaus.jackson.map.type.TypeModifier",
+      "org.codehaus.jackson.sym.NameN",
+      "org.codehaus.jackson.JsonGenerator",
+      "org.codehaus.jackson.map.introspect.AnnotatedClass",
+      "org.codehaus.jackson.map.introspect.JacksonAnnotationIntrospector",
+      "org.codehaus.jackson.annotate.JsonAutoDetect$1",
+      "org.codehaus.jackson.map.JsonSerializable",
+      "org.codehaus.jackson.annotate.JsonMethod",
+      "com.att.eelf.i18n.EELFResolvableErrorEnum",
+      "org.codehaus.jackson.node.BaseJsonNode",
+      "org.openecomp.mso.logger.MsoLogger$StatusCode",
+      "org.codehaus.jackson.map.ObjectReader",
+      "org.codehaus.jackson.map.DeserializerProvider",
+      "org.codehaus.jackson.annotate.JsonAutoDetect$Visibility",
+      "org.codehaus.jackson.node.ValueNode",
+      "org.codehaus.jackson.map.ser.BeanSerializerFactory",
+      "org.codehaus.jackson.map.JsonSerializer",
+      "org.codehaus.jackson.map.introspect.AnnotatedWithParams",
+      "com.att.eelf.i18n.EELFMsgs",
+      "org.codehaus.jackson.map.AnnotationIntrospector",
+      "org.codehaus.jackson.map.MappingJsonFactory",
+      "com.att.eelf.configuration.EELFLogger$Level",
+      "org.codehaus.jackson.map.MapperConfig$Impl",
+      "org.codehaus.jackson.sym.Name1",
+      "org.codehaus.jackson.sym.Name2",
+      "org.codehaus.jackson.sym.Name3",
+      "org.codehaus.jackson.map.introspect.MethodFilter",
+      "org.codehaus.jackson.map.ser.StdSerializerProvider",
+      "org.codehaus.jackson.map.deser.StdDeserializationContext",
+      "org.codehaus.jackson.type.TypeReference",
+      "org.codehaus.jackson.map.ClassIntrospector",
+      "org.codehaus.jackson.map.AnnotationIntrospector$Pair",
+      "org.codehaus.jackson.map.PropertyNamingStrategy$LowerCaseWithUnderscoresStrategy",
+      "org.codehaus.jackson.map.MapperConfig$ConfigFeature",
+      "org.codehaus.jackson.map.SerializationConfig$Feature",
+      "org.codehaus.jackson.Versioned",
+      "org.codehaus.jackson.io.IOContext",
+      "org.openecomp.mso.adapters.catalogrest.QueryAllottedResourceCustomization",
+      "org.codehaus.jackson.map.type.TypeBase",
+      "org.codehaus.jackson.map.ser.BasicSerializerFactory",
+      "com.att.eelf.i18n.EELFResourceManager$RESOURCE_TYPES",
+      "org.codehaus.jackson.map.PropertyNamingStrategy",
+      "org.codehaus.jackson.node.ContainerNode",
+      "org.codehaus.jackson.map.ser.FilterProvider",
+      "org.codehaus.jackson.map.jsontype.NamedType",
+      "org.codehaus.jackson.map.introspect.NopAnnotationIntrospector",
+      "com.att.eelf.configuration.EELFLogger",
+      "org.codehaus.jackson.map.DeserializationConfig",
+      "org.codehaus.jackson.map.introspect.AnnotatedConstructor",
+      "org.codehaus.jackson.sym.BytesToNameCanonicalizer",
+      "org.codehaus.jackson.map.type.TypeFactory",
+      "org.codehaus.jackson.impl.ReaderBasedParser",
+      "org.codehaus.jackson.sym.BytesToNameCanonicalizer$TableInfo",
+      "org.codehaus.jackson.JsonEncoding",
+      "org.codehaus.jackson.map.type.MapLikeType",
+      "org.codehaus.jackson.map.JsonDeserializer",
+      "org.codehaus.jackson.map.PropertyNamingStrategy$PropertyNamingStrategyBase",
+      "org.codehaus.jackson.node.ObjectNode",
+      "org.openecomp.mso.logger.MsoLogger$ErrorCode",
+      "org.codehaus.jackson.map.ser.std.SerializerBase",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$MinimalMethodFilter",
+      "org.codehaus.jackson.map.type.CollectionLikeType",
+      "org.openecomp.mso.logger.MessageEnum",
+      "org.codehaus.jackson.map.DeserializationConfig$Feature",
+      "org.codehaus.jackson.sym.CharsToNameCanonicalizer$Bucket",
+      "org.codehaus.jackson.map.introspect.AnnotatedMethodMap",
+      "org.codehaus.jackson.impl.JsonParserMinimalBase",
+      "org.codehaus.jackson.map.type.TypeParser",
+      "org.codehaus.jackson.map.introspect.POJOPropertiesCollector",
+      "org.codehaus.jackson.JsonParseException",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$SetterMethodFilter",
+      "org.codehaus.jackson.map.introspect.VisibilityChecker",
+      "org.codehaus.jackson.map.introspect.AnnotatedField",
+      "org.codehaus.jackson.impl.JsonGeneratorBase",
+      "org.codehaus.jackson.map.ObjectMapper",
+      "org.codehaus.jackson.util.ByteArrayBuilder",
+      "org.codehaus.jackson.map.ser.impl.FailingSerializer",
+      "org.codehaus.jackson.PrettyPrinter",
+      "org.codehaus.jackson.JsonToken",
+      "org.codehaus.jackson.map.jsontype.SubtypeResolver",
+      "org.codehaus.jackson.map.type.SimpleType",
+      "org.codehaus.jackson.map.util.StdDateFormat",
+      "org.codehaus.jackson.impl.Utf8Generator",
+      "org.codehaus.jackson.node.NumericNode",
+      "org.jboss.resteasy.annotations.providers.NoJackson",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$SetterAndGetterMethodFilter",
+      "org.codehaus.jackson.JsonNode",
+      "org.codehaus.jackson.sym.CharsToNameCanonicalizer",
+      "org.codehaus.jackson.annotate.JacksonAnnotation",
+      "org.codehaus.jackson.map.ObjectWriter",
+      "org.codehaus.jackson.schema.SchemaAware",
+      "org.codehaus.jackson.io.OutputDecorator",
+      "com.att.eelf.configuration.SLF4jWrapper",
+      "org.codehaus.jackson.FormatSchema",
+      "org.codehaus.jackson.format.MatchStrength",
+      "org.openecomp.mso.logger.MsoLogger$Catalog",
+      "org.codehaus.jackson.ObjectCodec",
+      "org.codehaus.jackson.map.introspect.AnnotatedMethod",
+      "org.openecomp.mso.db.catalog.utils.MavenLikeVersioning",
+      "org.codehaus.jackson.JsonGenerationException",
+      "org.openecomp.mso.entity.MsoRequest",
+      "org.codehaus.jackson.format.InputAccessor",
+      "org.codehaus.jackson.JsonFactory",
+      "org.codehaus.jackson.node.ArrayNode",
+      "org.codehaus.jackson.util.BufferRecycler",
+      "org.codehaus.jackson.io.SegmentedStringWriter",
+      "org.openecomp.mso.logger.MsoLogger$ResponseCode",
+      "org.codehaus.jackson.map.jsontype.TypeResolverBuilder",
+      "org.codehaus.jackson.map.type.HierarchicType",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$GetterMethodFilter",
+      "org.codehaus.jackson.JsonParser$Feature",
+      "org.codehaus.jackson.map.BeanDescription",
+      "org.codehaus.jackson.JsonParser$1",
+      "org.codehaus.jackson.impl.WriterBasedGenerator",
+      "org.codehaus.jackson.JsonGenerator$Feature",
+      "org.codehaus.jackson.sym.Name",
+      "org.codehaus.jackson.Version",
+      "org.codehaus.jackson.io.CharacterEscapes",
+      "org.codehaus.jackson.map.introspect.BasicBeanDescription",
+      "org.codehaus.jackson.schema.JsonSchema",
+      "org.codehaus.jackson.util.TokenBuffer",
+      "org.codehaus.jackson.map.MappingIterator",
+      "org.codehaus.jackson.map.annotate.JsonSerialize$Inclusion",
+      "org.codehaus.jackson.map.DeserializationContext",
+      "org.codehaus.jackson.impl.JsonParserBase",
+      "org.codehaus.jackson.map.ObjectMapper$DefaultTyping",
+      "org.codehaus.jackson.map.JsonMappingException",
+      "org.codehaus.jackson.map.introspect.AnnotatedMember",
+      "org.codehaus.jackson.node.JsonNodeFactory",
+      "org.codehaus.jackson.type.JavaType",
+      "com.att.eelf.i18n.EELFResourceManager",
+      "org.codehaus.jackson.map.introspect.VisibilityChecker$Std",
+      "org.codehaus.jackson.annotate.JsonTypeInfo$As",
+      "org.codehaus.jackson.JsonParser",
+      "org.codehaus.jackson.node.NullNode",
+      "org.codehaus.jackson.map.InjectableValues",
+      "org.codehaus.jackson.map.jsontype.impl.StdSubtypeResolver",
+      "org.codehaus.jackson.node.TreeTraversingParser",
+      "org.codehaus.jackson.map.type.CollectionType",
+      "com.att.eelf.configuration.EELFManager",
+      "org.codehaus.jackson.map.MapperConfig",
+      "org.openecomp.mso.db.catalog.beans.AllottedResourceCustomization",
+      "org.codehaus.jackson.map.Module$SetupContext",
+      "org.codehaus.jackson.io.UTF8Writer",
+      "org.codehaus.jackson.map.introspect.VisibilityChecker$1",
+      "org.codehaus.jackson.map.type.MapType",
+      "org.codehaus.jackson.annotate.JsonAutoDetect",
+      "org.codehaus.jackson.map.type.ArrayType",
+      "org.openecomp.mso.logger.MsoLogger",
+      "org.codehaus.jackson.map.ClassIntrospector$MixInResolver"
+    );
+  }
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(QueryAllottedResourceCustomizationESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "org.openecomp.mso.logger.MsoLogger$Catalog",
+      "org.openecomp.mso.logger.MsoLogger",
+      "com.att.eelf.i18n.EELFResourceManager",
+      "com.att.eelf.i18n.EELFMsgs",
+      "com.att.eelf.i18n.EELFResourceManager$RESOURCE_TYPES",
+      "com.att.eelf.configuration.EELFLogger$Level",
+      "com.att.eelf.configuration.EELFManager",
+      "org.openecomp.mso.logger.MessageEnum",
+      "org.openecomp.mso.adapters.catalogrest.QueryAllottedResourceCustomization",
+      "org.codehaus.jackson.map.introspect.AnnotatedClass",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector",
+      "org.codehaus.jackson.annotate.JsonAutoDetect$Visibility",
+      "org.codehaus.jackson.annotate.JsonMethod",
+      "org.codehaus.jackson.map.introspect.VisibilityChecker$Std",
+      "org.codehaus.jackson.map.ObjectMapper",
+      "org.codehaus.jackson.JsonParser$Feature",
+      "org.codehaus.jackson.JsonGenerator$Feature",
+      "org.codehaus.jackson.JsonFactory",
+      "org.codehaus.jackson.sym.CharsToNameCanonicalizer",
+      "org.codehaus.jackson.sym.BytesToNameCanonicalizer",
+      "org.codehaus.jackson.map.type.TypeFactory"
+    );
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceMacroHolderESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceMacroHolderESTest.java
new file mode 100644
index 0000000000..6f3fa5aec5
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceMacroHolderESTest.java
@@ -0,0 +1,109 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Feb 20 14:12:21 GMT 2017
+ */
+
+package org.openecomp.mso.adapters.catalogrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+import static org.evosuite.shaded.org.mockito.Mockito.*;
+import static org.evosuite.runtime.EvoAssertions.*;
+import org.evosuite.runtime.EvoRunner;
+import org.evosuite.runtime.EvoRunnerParameters;
+import org.evosuite.runtime.ViolatedAssumptionAnswer;
+import org.junit.runner.RunWith;
+import org.openecomp.mso.db.catalog.beans.ServiceMacroHolder;
+
+@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true)
+public class QueryServiceMacroHolderESTest extends QueryServiceMacroHolderESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test0()  throws Throwable  {
+      ServiceMacroHolder serviceMacroHolder0 = mock(ServiceMacroHolder.class, new ViolatedAssumptionAnswer());
+      doReturn((String) null).when(serviceMacroHolder0).toString();
+      QueryServiceMacroHolder queryServiceMacroHolder0 = new QueryServiceMacroHolder(serviceMacroHolder0);
+      String string0 = queryServiceMacroHolder0.toString();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test1()  throws Throwable  {
+      ServiceMacroHolder serviceMacroHolder0 = mock(ServiceMacroHolder.class, new ViolatedAssumptionAnswer());
+      doReturn("com.att.eelf.policy").when(serviceMacroHolder0).toString();
+      QueryServiceMacroHolder queryServiceMacroHolder0 = new QueryServiceMacroHolder(serviceMacroHolder0);
+      String string0 = queryServiceMacroHolder0.toString();
+      assertEquals("com.att.eelf.policy", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test2()  throws Throwable  {
+      ServiceMacroHolder serviceMacroHolder0 = mock(ServiceMacroHolder.class, new ViolatedAssumptionAnswer());
+      doReturn("com.att.eelf.policy").when(serviceMacroHolder0).toString();
+      QueryServiceMacroHolder queryServiceMacroHolder0 = new QueryServiceMacroHolder(serviceMacroHolder0);
+      ServiceMacroHolder serviceMacroHolder1 = queryServiceMacroHolder0.getServiceResources();
+      assertSame(serviceMacroHolder1, serviceMacroHolder0);
+  }
+
+  @Test(timeout = 4000)
+  public void test3()  throws Throwable  {
+      QueryServiceMacroHolder queryServiceMacroHolder0 = new QueryServiceMacroHolder((ServiceMacroHolder) null);
+      // Undeclared exception!
+      try {
+        queryServiceMacroHolder0.toString();
+        fail("Expecting exception: NullPointerException");
+
+      } catch(NullPointerException e) {
+         //
+         // no message in exception (getMessage() returned null)
+         //
+         verifyException("org.openecomp.mso.adapters.catalogrest.QueryServiceMacroHolder", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test4()  throws Throwable  {
+      ServiceMacroHolder serviceMacroHolder0 = mock(ServiceMacroHolder.class, new ViolatedAssumptionAnswer());
+      doReturn("").when(serviceMacroHolder0).toString();
+      QueryServiceMacroHolder queryServiceMacroHolder0 = new QueryServiceMacroHolder(serviceMacroHolder0);
+      String string0 = queryServiceMacroHolder0.toString();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test5()  throws Throwable  {
+      QueryServiceMacroHolder queryServiceMacroHolder0 = new QueryServiceMacroHolder();
+  }
+
+  @Test(timeout = 4000)
+  public void test6()  throws Throwable  {
+      ServiceMacroHolder serviceMacroHolder0 = mock(ServiceMacroHolder.class, new ViolatedAssumptionAnswer());
+      QueryServiceMacroHolder queryServiceMacroHolder0 = new QueryServiceMacroHolder(serviceMacroHolder0);
+      // Undeclared exception!
+      try {
+        queryServiceMacroHolder0.toJsonString();
+        fail("Expecting exception: VerifyError");
+
+      } catch(VerifyError e) {
+         //
+         // (class: org/codehaus/jackson/map/MapperConfig, method: <clinit> signature: ()V) Bad type in putfield/putstatic
+         //
+         verifyException("org.codehaus.jackson.map.ObjectMapper", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test7()  throws Throwable  {
+      QueryServiceMacroHolder queryServiceMacroHolder0 = new QueryServiceMacroHolder((ServiceMacroHolder) null);
+      ServiceMacroHolder serviceMacroHolder0 = queryServiceMacroHolder0.getServiceResources();
+      assertNull(serviceMacroHolder0);
+  }
+
+  @Test(timeout = 4000)
+  public void test8()  throws Throwable  {
+      ServiceMacroHolder serviceMacroHolder0 = mock(ServiceMacroHolder.class, new ViolatedAssumptionAnswer());
+      QueryServiceMacroHolder queryServiceMacroHolder0 = new QueryServiceMacroHolder(serviceMacroHolder0);
+      ServiceMacroHolder serviceMacroHolder1 = mock(ServiceMacroHolder.class, new ViolatedAssumptionAnswer());
+      queryServiceMacroHolder0.setServiceResources(serviceMacroHolder1);
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceMacroHolderESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceMacroHolderESTestscaffolding.java
new file mode 100644
index 0000000000..4a5898649b
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceMacroHolderESTestscaffolding.java
@@ -0,0 +1,221 @@
+/**
+ * Scaffolding file used to store all the setups needed to run
+ * tests automatically generated by EvoSuite
+ * Mon Feb 20 14:12:21 GMT 2017
+ */
+
+package org.openecomp.mso.adapters.catalogrest;
+
+import org.evosuite.runtime.annotation.EvoSuiteClassExclude;
+import org.junit.BeforeClass;
+import org.junit.Before;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.evosuite.runtime.sandbox.Sandbox;
+
+@EvoSuiteClassExclude
+public class QueryServiceMacroHolderESTestscaffolding {
+
+  @org.junit.Rule
+  public org.evosuite.runtime.vnet.NonFunctionalRequirementRule nfr = new org.evosuite.runtime.vnet.NonFunctionalRequirementRule();
+
+  private static final java.util.Properties defaultProperties = (java.util.Properties) java.lang.System.getProperties().clone();
+
+  private org.evosuite.runtime.thread.ThreadStopper threadStopper =  new org.evosuite.runtime.thread.ThreadStopper (org.evosuite.runtime.thread.KillSwitchHandler.getInstance(), 3000);
+
+  @BeforeClass
+  public static void initEvoSuiteFramework() {
+    org.evosuite.runtime.RuntimeSettings.className = "org.openecomp.mso.adapters.catalogrest.QueryServiceMacroHolder";
+    org.evosuite.runtime.GuiSupport.initialize();
+    org.evosuite.runtime.RuntimeSettings.maxNumberOfThreads = 100;
+    org.evosuite.runtime.RuntimeSettings.maxNumberOfIterationsPerLoop = 10000;
+    org.evosuite.runtime.RuntimeSettings.mockSystemIn = true;
+    org.evosuite.runtime.RuntimeSettings.sandboxMode = org.evosuite.runtime.sandbox.Sandbox.SandboxMode.RECOMMENDED;
+    org.evosuite.runtime.sandbox.Sandbox.initializeSecurityManagerForSUT();
+    org.evosuite.runtime.classhandling.JDKClassResetter.init();
+    initializeClasses();
+    org.evosuite.runtime.Runtime.getInstance().resetRuntime();
+  }
+
+  @AfterClass
+  public static void clearEvoSuiteFramework(){
+    Sandbox.resetDefaultSecurityManager();
+    java.lang.System.setProperties((java.util.Properties) defaultProperties.clone());
+  }
+
+  @Before
+  public void initTestCase(){
+    threadStopper.storeCurrentThreads();
+    threadStopper.startRecordingTime();
+    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().initHandler();
+    org.evosuite.runtime.sandbox.Sandbox.goingToExecuteSUTCode();
+    org.evosuite.runtime.GuiSupport.setHeadless();
+    org.evosuite.runtime.Runtime.getInstance().resetRuntime();
+    org.evosuite.runtime.agent.InstrumentingAgent.activate();
+  }
+
+  @After
+  public void doneWithTestCase(){
+    threadStopper.killAndJoinClientThreads();
+    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().safeExecuteAddedHooks();
+    org.evosuite.runtime.classhandling.JDKClassResetter.reset();
+    resetClasses();
+    org.evosuite.runtime.sandbox.Sandbox.doneWithExecutingSUTCode();
+    org.evosuite.runtime.agent.InstrumentingAgent.deactivate();
+    org.evosuite.runtime.GuiSupport.restoreHeadlessMode();
+  }
+
+  private static void initializeClasses() {
+    org.evosuite.runtime.classhandling.ClassStateSupport.initializeClasses(QueryServiceMacroHolderESTestscaffolding.class.getClassLoader() ,
+      "org.codehaus.jackson.map.JsonSerializableWithType",
+      "org.codehaus.jackson.map.deser.StdDeserializerProvider",
+      "org.codehaus.jackson.map.SerializerFactory",
+      "org.codehaus.jackson.map.SerializerProvider",
+      "org.codehaus.jackson.map.SerializationConfig",
+      "org.codehaus.jackson.JsonProcessingException",
+      "org.codehaus.jackson.map.introspect.AnnotationMap",
+      "org.codehaus.jackson.map.introspect.Annotated",
+      "org.codehaus.jackson.map.util.Annotations",
+      "org.codehaus.jackson.sym.NameN",
+      "org.codehaus.jackson.JsonGenerator",
+      "org.codehaus.jackson.map.introspect.AnnotatedClass",
+      "org.codehaus.jackson.map.introspect.JacksonAnnotationIntrospector",
+      "org.codehaus.jackson.map.JsonSerializable",
+      "org.codehaus.jackson.annotate.JsonMethod",
+      "com.att.eelf.i18n.EELFResolvableErrorEnum",
+      "org.codehaus.jackson.node.BaseJsonNode",
+      "org.openecomp.mso.logger.MsoLogger$StatusCode",
+      "org.codehaus.jackson.map.DeserializerProvider",
+      "org.codehaus.jackson.annotate.JsonAutoDetect$Visibility",
+      "org.codehaus.jackson.node.ValueNode",
+      "org.codehaus.jackson.map.ser.BeanSerializerFactory",
+      "org.codehaus.jackson.map.introspect.AnnotatedWithParams",
+      "com.att.eelf.i18n.EELFMsgs",
+      "org.codehaus.jackson.map.AnnotationIntrospector",
+      "org.codehaus.jackson.map.MappingJsonFactory",
+      "com.att.eelf.configuration.EELFLogger$Level",
+      "org.codehaus.jackson.map.MapperConfig$Impl",
+      "org.codehaus.jackson.sym.Name1",
+      "org.codehaus.jackson.sym.Name2",
+      "org.codehaus.jackson.sym.Name3",
+      "org.codehaus.jackson.map.introspect.MethodFilter",
+      "org.codehaus.jackson.map.ser.StdSerializerProvider",
+      "org.codehaus.jackson.map.deser.StdDeserializationContext",
+      "org.codehaus.jackson.map.ClassIntrospector",
+      "org.codehaus.jackson.map.AnnotationIntrospector$Pair",
+      "org.codehaus.jackson.Versioned",
+      "org.openecomp.mso.db.catalog.beans.NetworkResourceCustomization",
+      "org.codehaus.jackson.map.type.TypeBase",
+      "org.codehaus.jackson.map.ser.BasicSerializerFactory",
+      "com.att.eelf.i18n.EELFResourceManager$RESOURCE_TYPES",
+      "org.codehaus.jackson.node.ContainerNode",
+      "org.codehaus.jackson.map.introspect.NopAnnotationIntrospector",
+      "com.att.eelf.configuration.EELFLogger",
+      "org.codehaus.jackson.map.DeserializationConfig",
+      "org.codehaus.jackson.map.introspect.AnnotatedConstructor",
+      "org.codehaus.jackson.sym.BytesToNameCanonicalizer",
+      "org.codehaus.jackson.map.type.TypeFactory",
+      "org.codehaus.jackson.impl.ReaderBasedParser",
+      "org.codehaus.jackson.sym.BytesToNameCanonicalizer$TableInfo",
+      "org.codehaus.jackson.map.type.MapLikeType",
+      "org.openecomp.mso.db.catalog.beans.VnfResource",
+      "org.openecomp.mso.logger.MsoLogger$ErrorCode",
+      "org.codehaus.jackson.node.ObjectNode",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$MinimalMethodFilter",
+      "org.codehaus.jackson.map.type.CollectionLikeType",
+      "org.openecomp.mso.logger.MessageEnum",
+      "org.codehaus.jackson.sym.CharsToNameCanonicalizer$Bucket",
+      "org.codehaus.jackson.impl.JsonParserMinimalBase",
+      "org.openecomp.mso.db.catalog.beans.ServiceMacroHolder",
+      "org.codehaus.jackson.map.type.TypeParser",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$SetterMethodFilter",
+      "org.codehaus.jackson.map.introspect.VisibilityChecker",
+      "org.codehaus.jackson.map.introspect.AnnotatedField",
+      "org.codehaus.jackson.impl.JsonGeneratorBase",
+      "org.codehaus.jackson.map.ObjectMapper",
+      "org.codehaus.jackson.util.ByteArrayBuilder",
+      "org.codehaus.jackson.PrettyPrinter",
+      "org.codehaus.jackson.map.jsontype.SubtypeResolver",
+      "org.codehaus.jackson.map.type.SimpleType",
+      "org.codehaus.jackson.map.util.StdDateFormat",
+      "org.codehaus.jackson.impl.Utf8Generator",
+      "org.jboss.resteasy.annotations.providers.NoJackson",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$SetterAndGetterMethodFilter",
+      "org.codehaus.jackson.JsonNode",
+      "org.codehaus.jackson.sym.CharsToNameCanonicalizer",
+      "org.codehaus.jackson.annotate.JacksonAnnotation",
+      "com.att.eelf.configuration.SLF4jWrapper",
+      "org.openecomp.mso.logger.MsoLogger$Catalog",
+      "org.codehaus.jackson.ObjectCodec",
+      "org.codehaus.jackson.map.introspect.AnnotatedMethod",
+      "org.openecomp.mso.db.catalog.utils.MavenLikeVersioning",
+      "org.openecomp.mso.entity.MsoRequest",
+      "org.codehaus.jackson.JsonFactory",
+      "org.codehaus.jackson.node.ArrayNode",
+      "org.codehaus.jackson.io.SegmentedStringWriter",
+      "org.openecomp.mso.logger.MsoLogger$ResponseCode",
+      "org.codehaus.jackson.map.jsontype.TypeResolverBuilder",
+      "org.openecomp.mso.adapters.catalogrest.QueryServiceMacroHolder",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$GetterMethodFilter",
+      "org.codehaus.jackson.JsonParser$Feature",
+      "org.codehaus.jackson.map.BeanDescription",
+      "org.codehaus.jackson.impl.WriterBasedGenerator",
+      "org.codehaus.jackson.JsonGenerator$Feature",
+      "org.codehaus.jackson.sym.Name",
+      "org.openecomp.mso.db.catalog.beans.Service",
+      "org.codehaus.jackson.map.introspect.BasicBeanDescription",
+      "org.codehaus.jackson.util.TokenBuffer",
+      "org.codehaus.jackson.map.DeserializationContext",
+      "org.codehaus.jackson.impl.JsonParserBase",
+      "org.codehaus.jackson.map.JsonMappingException",
+      "org.codehaus.jackson.map.introspect.AnnotatedMember",
+      "org.codehaus.jackson.type.JavaType",
+      "com.att.eelf.i18n.EELFResourceManager",
+      "org.codehaus.jackson.map.introspect.VisibilityChecker$Std",
+      "org.codehaus.jackson.JsonParser",
+      "org.codehaus.jackson.node.NullNode",
+      "org.codehaus.jackson.map.jsontype.impl.StdSubtypeResolver",
+      "org.codehaus.jackson.node.TreeTraversingParser",
+      "org.codehaus.jackson.map.type.CollectionType",
+      "com.att.eelf.configuration.EELFManager",
+      "org.codehaus.jackson.map.MapperConfig",
+      "org.openecomp.mso.db.catalog.beans.AllottedResourceCustomization",
+      "org.codehaus.jackson.map.Module$SetupContext",
+      "org.codehaus.jackson.io.UTF8Writer",
+      "org.codehaus.jackson.map.type.MapType",
+      "org.codehaus.jackson.annotate.JsonAutoDetect",
+      "org.codehaus.jackson.map.type.ArrayType",
+      "org.openecomp.mso.logger.MsoLogger",
+      "org.codehaus.jackson.map.ClassIntrospector$MixInResolver"
+    );
+  }
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(QueryServiceMacroHolderESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "org.openecomp.mso.logger.MsoLogger$Catalog",
+      "org.openecomp.mso.logger.MsoLogger",
+      "com.att.eelf.i18n.EELFResourceManager",
+      "com.att.eelf.i18n.EELFMsgs",
+      "com.att.eelf.i18n.EELFResourceManager$RESOURCE_TYPES",
+      "com.att.eelf.configuration.EELFLogger$Level",
+      "com.att.eelf.configuration.EELFManager",
+      "org.openecomp.mso.logger.MessageEnum",
+      "org.openecomp.mso.adapters.catalogrest.QueryServiceMacroHolder",
+      "org.codehaus.jackson.map.introspect.AnnotatedClass",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector",
+      "org.codehaus.jackson.annotate.JsonAutoDetect$Visibility",
+      "org.codehaus.jackson.annotate.JsonMethod",
+      "org.codehaus.jackson.map.introspect.VisibilityChecker$Std",
+      "org.codehaus.jackson.map.ObjectMapper",
+      "org.codehaus.jackson.JsonParser$Feature",
+      "org.codehaus.jackson.JsonGenerator$Feature",
+      "org.codehaus.jackson.JsonFactory",
+      "org.codehaus.jackson.sym.CharsToNameCanonicalizer",
+      "org.codehaus.jackson.sym.BytesToNameCanonicalizer",
+      "org.codehaus.jackson.map.type.TypeFactory"
+    );
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceNetworksESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceNetworksESTest.java
new file mode 100644
index 0000000000..0219fb52fa
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceNetworksESTest.java
@@ -0,0 +1,163 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Feb 20 14:04:40 GMT 2017
+ */
+
+package org.openecomp.mso.adapters.catalogrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+import static org.evosuite.shaded.org.mockito.Mockito.*;
+import static org.evosuite.runtime.EvoAssertions.*;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import org.evosuite.runtime.EvoRunner;
+import org.evosuite.runtime.EvoRunnerParameters;
+import org.evosuite.runtime.ViolatedAssumptionAnswer;
+import org.junit.runner.RunWith;
+import org.openecomp.mso.db.catalog.beans.NetworkResourceCustomization;
+
+@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true)
+public class QueryServiceNetworksESTest extends QueryServiceNetworksESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test0()  throws Throwable  {
+      LinkedList<NetworkResourceCustomization> linkedList0 = new LinkedList<NetworkResourceCustomization>();
+      QueryServiceNetworks queryServiceNetworks0 = new QueryServiceNetworks((List<NetworkResourceCustomization>) linkedList0);
+      queryServiceNetworks0.setServiceNetworks((List<NetworkResourceCustomization>) null);
+      List<NetworkResourceCustomization> list0 = queryServiceNetworks0.getServiceNetworks();
+      assertNull(list0);
+  }
+
+  @Test(timeout = 4000)
+  public void test1()  throws Throwable  {
+      LinkedList<NetworkResourceCustomization> linkedList0 = new LinkedList<NetworkResourceCustomization>();
+      QueryServiceNetworks queryServiceNetworks0 = new QueryServiceNetworks();
+      Object[] objectArray0 = new Object[3];
+      objectArray0[0] = (Object) queryServiceNetworks0;
+      Collection<NetworkResourceCustomization> collection0 = (Collection<NetworkResourceCustomization>) mock(Collection.class, new ViolatedAssumptionAnswer());
+      doReturn(objectArray0).when(collection0).toArray();
+      linkedList0.addAll(collection0);
+      queryServiceNetworks0.setServiceNetworks(linkedList0);
+      // Undeclared exception!
+      try {
+        queryServiceNetworks0.toString();
+        fail("Expecting exception: ClassCastException");
+
+      } catch(ClassCastException e) {
+         //
+         // org.openecomp.mso.adapters.catalogrest.QueryServiceNetworks cannot be cast to org.openecomp.mso.db.catalog.beans.NetworkResourceCustomization
+         //
+         verifyException("org.openecomp.mso.adapters.catalogrest.QueryServiceNetworks", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test2()  throws Throwable  {
+      QueryServiceNetworks queryServiceNetworks0 = null;
+      try {
+        queryServiceNetworks0 = new QueryServiceNetworks((List<NetworkResourceCustomization>) null);
+        fail("Expecting exception: NullPointerException");
+
+      } catch(NullPointerException e) {
+         //
+         // no message in exception (getMessage() returned null)
+         //
+         verifyException("org.openecomp.mso.adapters.catalogrest.QueryServiceNetworks", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test3()  throws Throwable  {
+      LinkedList<NetworkResourceCustomization> linkedList0 = new LinkedList<NetworkResourceCustomization>();
+      NetworkResourceCustomization networkResourceCustomization0 = new NetworkResourceCustomization();
+      linkedList0.add(networkResourceCustomization0);
+      Object[] objectArray0 = new Object[4];
+      objectArray0[0] = (Object) linkedList0;
+      Collection<NetworkResourceCustomization> collection0 = (Collection<NetworkResourceCustomization>) mock(Collection.class, new ViolatedAssumptionAnswer());
+      doReturn(objectArray0).when(collection0).toArray();
+      linkedList0.addAll(1, collection0);
+      QueryServiceNetworks queryServiceNetworks0 = null;
+      try {
+        queryServiceNetworks0 = new QueryServiceNetworks((List<NetworkResourceCustomization>) linkedList0);
+        fail("Expecting exception: ClassCastException");
+
+      } catch(ClassCastException e) {
+         //
+         // java.util.LinkedList cannot be cast to org.openecomp.mso.db.catalog.beans.NetworkResourceCustomization
+         //
+         verifyException("org.openecomp.mso.adapters.catalogrest.QueryServiceNetworks", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test4()  throws Throwable  {
+      LinkedList<NetworkResourceCustomization> linkedList0 = new LinkedList<NetworkResourceCustomization>();
+      QueryServiceNetworks queryServiceNetworks0 = new QueryServiceNetworks();
+      queryServiceNetworks0.setServiceNetworks(linkedList0);
+      NetworkResourceCustomization networkResourceCustomization0 = new NetworkResourceCustomization();
+      linkedList0.add(networkResourceCustomization0);
+      linkedList0.add(networkResourceCustomization0);
+      String string0 = queryServiceNetworks0.toString();
+      assertEquals("1\tmodelName=nullmodelUuid=nullmodelUuid=nullmodelInvariantUuid=nullmodelVersion=nullmodelCustomizationUuid=nullmodelInstanceName=nullnetworkResourceId=0networkType=null1\t\nmodelName=nullmodelUuid=nullmodelUuid=nullmodelInvariantUuid=nullmodelVersion=nullmodelCustomizationUuid=nullmodelInstanceName=nullnetworkResourceId=0networkType=null", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test5()  throws Throwable  {
+      QueryServiceNetworks queryServiceNetworks0 = new QueryServiceNetworks();
+      String string0 = queryServiceNetworks0.toString();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test6()  throws Throwable  {
+      LinkedList<NetworkResourceCustomization> linkedList0 = new LinkedList<NetworkResourceCustomization>();
+      NetworkResourceCustomization networkResourceCustomization0 = new NetworkResourceCustomization();
+      linkedList0.add(networkResourceCustomization0);
+      QueryServiceNetworks queryServiceNetworks0 = new QueryServiceNetworks((List<NetworkResourceCustomization>) linkedList0);
+      List<NetworkResourceCustomization> list0 = queryServiceNetworks0.getServiceNetworks();
+      assertEquals(1, list0.size());
+  }
+
+  @Test(timeout = 4000)
+  public void test7()  throws Throwable  {
+      LinkedList<NetworkResourceCustomization> linkedList0 = new LinkedList<NetworkResourceCustomization>();
+      QueryServiceNetworks queryServiceNetworks0 = new QueryServiceNetworks((List<NetworkResourceCustomization>) linkedList0);
+      queryServiceNetworks0.setServiceNetworks((List<NetworkResourceCustomization>) null);
+      // Undeclared exception!
+      try {
+        queryServiceNetworks0.toString();
+        fail("Expecting exception: NullPointerException");
+
+      } catch(NullPointerException e) {
+         //
+         // no message in exception (getMessage() returned null)
+         //
+         verifyException("org.openecomp.mso.adapters.catalogrest.QueryServiceNetworks", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test8()  throws Throwable  {
+      QueryServiceNetworks queryServiceNetworks0 = new QueryServiceNetworks();
+      List<NetworkResourceCustomization> list0 = queryServiceNetworks0.getServiceNetworks();
+      assertTrue(list0.isEmpty());
+  }
+
+  @Test(timeout = 4000)
+  public void test9()  throws Throwable  {
+      QueryServiceNetworks queryServiceNetworks0 = new QueryServiceNetworks();
+      // Undeclared exception!
+      try {
+        queryServiceNetworks0.toJsonString();
+        fail("Expecting exception: VerifyError");
+
+      } catch(VerifyError e) {
+         //
+         // (class: org/codehaus/jackson/map/MapperConfig, method: <clinit> signature: ()V) Bad type in putfield/putstatic
+         //
+         verifyException("org.codehaus.jackson.map.ObjectMapper", e);
+      }
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceNetworksESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceNetworksESTestscaffolding.java
new file mode 100644
index 0000000000..e47d9b2a5b
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceNetworksESTestscaffolding.java
@@ -0,0 +1,265 @@
+/**
+ * Scaffolding file used to store all the setups needed to run
+ * tests automatically generated by EvoSuite
+ * Mon Feb 20 14:04:40 GMT 2017
+ */
+
+package org.openecomp.mso.adapters.catalogrest;
+
+import org.evosuite.runtime.annotation.EvoSuiteClassExclude;
+import org.junit.BeforeClass;
+import org.junit.Before;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.evosuite.runtime.sandbox.Sandbox;
+
+@EvoSuiteClassExclude
+public class QueryServiceNetworksESTestscaffolding {
+
+  @org.junit.Rule
+  public org.evosuite.runtime.vnet.NonFunctionalRequirementRule nfr = new org.evosuite.runtime.vnet.NonFunctionalRequirementRule();
+
+  private static final java.util.Properties defaultProperties = (java.util.Properties) java.lang.System.getProperties().clone();
+
+  private org.evosuite.runtime.thread.ThreadStopper threadStopper =  new org.evosuite.runtime.thread.ThreadStopper (org.evosuite.runtime.thread.KillSwitchHandler.getInstance(), 3000);
+
+  @BeforeClass
+  public static void initEvoSuiteFramework() {
+    org.evosuite.runtime.RuntimeSettings.className = "org.openecomp.mso.adapters.catalogrest.QueryServiceNetworks";
+    org.evosuite.runtime.GuiSupport.initialize();
+    org.evosuite.runtime.RuntimeSettings.maxNumberOfThreads = 100;
+    org.evosuite.runtime.RuntimeSettings.maxNumberOfIterationsPerLoop = 10000;
+    org.evosuite.runtime.RuntimeSettings.mockSystemIn = true;
+    org.evosuite.runtime.RuntimeSettings.sandboxMode = org.evosuite.runtime.sandbox.Sandbox.SandboxMode.RECOMMENDED;
+    org.evosuite.runtime.sandbox.Sandbox.initializeSecurityManagerForSUT();
+    org.evosuite.runtime.classhandling.JDKClassResetter.init();
+    initializeClasses();
+    org.evosuite.runtime.Runtime.getInstance().resetRuntime();
+  }
+
+  @AfterClass
+  public static void clearEvoSuiteFramework(){
+    Sandbox.resetDefaultSecurityManager();
+    java.lang.System.setProperties((java.util.Properties) defaultProperties.clone());
+  }
+
+  @Before
+  public void initTestCase(){
+    threadStopper.storeCurrentThreads();
+    threadStopper.startRecordingTime();
+    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().initHandler();
+    org.evosuite.runtime.sandbox.Sandbox.goingToExecuteSUTCode();
+    org.evosuite.runtime.GuiSupport.setHeadless();
+    org.evosuite.runtime.Runtime.getInstance().resetRuntime();
+    org.evosuite.runtime.agent.InstrumentingAgent.activate();
+  }
+
+  @After
+  public void doneWithTestCase(){
+    threadStopper.killAndJoinClientThreads();
+    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().safeExecuteAddedHooks();
+    org.evosuite.runtime.classhandling.JDKClassResetter.reset();
+    resetClasses();
+    org.evosuite.runtime.sandbox.Sandbox.doneWithExecutingSUTCode();
+    org.evosuite.runtime.agent.InstrumentingAgent.deactivate();
+    org.evosuite.runtime.GuiSupport.restoreHeadlessMode();
+  }
+
+  private static void initializeClasses() {
+    org.evosuite.runtime.classhandling.ClassStateSupport.initializeClasses(QueryServiceNetworksESTestscaffolding.class.getClassLoader() ,
+      "org.codehaus.jackson.map.JsonSerializableWithType",
+      "org.codehaus.jackson.map.HandlerInstantiator",
+      "org.codehaus.jackson.map.deser.StdDeserializerProvider",
+      "org.codehaus.jackson.map.SerializerFactory",
+      "org.codehaus.jackson.map.SerializerProvider",
+      "org.codehaus.jackson.map.type.TypeBindings",
+      "org.codehaus.jackson.map.SerializationConfig",
+      "org.codehaus.jackson.JsonProcessingException",
+      "org.codehaus.jackson.map.introspect.AnnotationMap",
+      "org.codehaus.jackson.map.introspect.Annotated",
+      "org.codehaus.jackson.io.InputDecorator",
+      "org.codehaus.jackson.map.Module",
+      "org.codehaus.jackson.map.util.Annotations",
+      "org.codehaus.jackson.map.type.TypeModifier",
+      "org.codehaus.jackson.sym.NameN",
+      "org.codehaus.jackson.JsonGenerator",
+      "org.codehaus.jackson.map.introspect.AnnotatedClass",
+      "org.codehaus.jackson.map.introspect.JacksonAnnotationIntrospector",
+      "org.codehaus.jackson.annotate.JsonAutoDetect$1",
+      "org.codehaus.jackson.map.JsonSerializable",
+      "org.codehaus.jackson.annotate.JsonMethod",
+      "com.att.eelf.i18n.EELFResolvableErrorEnum",
+      "org.codehaus.jackson.node.BaseJsonNode",
+      "org.openecomp.mso.logger.MsoLogger$StatusCode",
+      "org.codehaus.jackson.map.ObjectReader",
+      "org.codehaus.jackson.map.DeserializerProvider",
+      "org.codehaus.jackson.annotate.JsonAutoDetect$Visibility",
+      "org.codehaus.jackson.node.ValueNode",
+      "org.codehaus.jackson.map.ser.BeanSerializerFactory",
+      "org.codehaus.jackson.map.JsonSerializer",
+      "org.codehaus.jackson.map.introspect.AnnotatedWithParams",
+      "com.att.eelf.i18n.EELFMsgs",
+      "org.codehaus.jackson.map.AnnotationIntrospector",
+      "org.codehaus.jackson.map.MappingJsonFactory",
+      "com.att.eelf.configuration.EELFLogger$Level",
+      "org.codehaus.jackson.map.MapperConfig$Impl",
+      "org.codehaus.jackson.sym.Name1",
+      "org.codehaus.jackson.sym.Name2",
+      "org.codehaus.jackson.sym.Name3",
+      "org.codehaus.jackson.map.introspect.MethodFilter",
+      "org.codehaus.jackson.map.ser.StdSerializerProvider",
+      "org.codehaus.jackson.map.deser.StdDeserializationContext",
+      "org.codehaus.jackson.type.TypeReference",
+      "org.codehaus.jackson.map.ClassIntrospector",
+      "org.codehaus.jackson.map.AnnotationIntrospector$Pair",
+      "org.codehaus.jackson.map.PropertyNamingStrategy$LowerCaseWithUnderscoresStrategy",
+      "org.codehaus.jackson.map.MapperConfig$ConfigFeature",
+      "org.codehaus.jackson.map.SerializationConfig$Feature",
+      "org.codehaus.jackson.Versioned",
+      "org.codehaus.jackson.io.IOContext",
+      "org.openecomp.mso.db.catalog.beans.NetworkResourceCustomization",
+      "org.codehaus.jackson.map.type.TypeBase",
+      "org.codehaus.jackson.map.ser.BasicSerializerFactory",
+      "com.att.eelf.i18n.EELFResourceManager$RESOURCE_TYPES",
+      "org.codehaus.jackson.map.PropertyNamingStrategy",
+      "org.codehaus.jackson.node.ContainerNode",
+      "org.codehaus.jackson.map.jsontype.NamedType",
+      "org.codehaus.jackson.map.ser.FilterProvider",
+      "org.codehaus.jackson.map.introspect.NopAnnotationIntrospector",
+      "com.att.eelf.configuration.EELFLogger",
+      "org.codehaus.jackson.map.DeserializationConfig",
+      "org.codehaus.jackson.map.introspect.AnnotatedConstructor",
+      "org.codehaus.jackson.sym.BytesToNameCanonicalizer",
+      "org.codehaus.jackson.map.type.TypeFactory",
+      "org.codehaus.jackson.impl.ReaderBasedParser",
+      "org.codehaus.jackson.sym.BytesToNameCanonicalizer$TableInfo",
+      "org.codehaus.jackson.JsonEncoding",
+      "org.codehaus.jackson.map.type.MapLikeType",
+      "org.codehaus.jackson.map.JsonDeserializer",
+      "org.codehaus.jackson.map.PropertyNamingStrategy$PropertyNamingStrategyBase",
+      "org.codehaus.jackson.node.ObjectNode",
+      "org.openecomp.mso.logger.MsoLogger$ErrorCode",
+      "org.codehaus.jackson.map.ser.std.SerializerBase",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$MinimalMethodFilter",
+      "org.codehaus.jackson.map.type.CollectionLikeType",
+      "org.openecomp.mso.logger.MessageEnum",
+      "org.codehaus.jackson.map.DeserializationConfig$Feature",
+      "org.codehaus.jackson.sym.CharsToNameCanonicalizer$Bucket",
+      "org.codehaus.jackson.map.introspect.AnnotatedMethodMap",
+      "org.codehaus.jackson.impl.JsonParserMinimalBase",
+      "org.codehaus.jackson.map.type.TypeParser",
+      "org.codehaus.jackson.map.introspect.POJOPropertiesCollector",
+      "org.codehaus.jackson.JsonParseException",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$SetterMethodFilter",
+      "org.codehaus.jackson.map.introspect.VisibilityChecker",
+      "org.codehaus.jackson.map.introspect.AnnotatedField",
+      "org.codehaus.jackson.impl.JsonGeneratorBase",
+      "org.codehaus.jackson.map.ObjectMapper",
+      "org.codehaus.jackson.util.ByteArrayBuilder",
+      "org.codehaus.jackson.map.ser.impl.FailingSerializer",
+      "org.codehaus.jackson.PrettyPrinter",
+      "org.codehaus.jackson.JsonToken",
+      "org.codehaus.jackson.map.jsontype.SubtypeResolver",
+      "org.codehaus.jackson.map.type.SimpleType",
+      "org.codehaus.jackson.map.util.StdDateFormat",
+      "org.codehaus.jackson.impl.Utf8Generator",
+      "org.codehaus.jackson.node.NumericNode",
+      "org.jboss.resteasy.annotations.providers.NoJackson",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$SetterAndGetterMethodFilter",
+      "org.codehaus.jackson.JsonNode",
+      "org.codehaus.jackson.sym.CharsToNameCanonicalizer",
+      "org.codehaus.jackson.annotate.JacksonAnnotation",
+      "org.codehaus.jackson.map.ObjectWriter",
+      "org.codehaus.jackson.schema.SchemaAware",
+      "org.codehaus.jackson.io.OutputDecorator",
+      "com.att.eelf.configuration.SLF4jWrapper",
+      "org.codehaus.jackson.FormatSchema",
+      "org.codehaus.jackson.format.MatchStrength",
+      "org.openecomp.mso.logger.MsoLogger$Catalog",
+      "org.codehaus.jackson.ObjectCodec",
+      "org.codehaus.jackson.map.introspect.AnnotatedMethod",
+      "org.openecomp.mso.db.catalog.utils.MavenLikeVersioning",
+      "org.codehaus.jackson.JsonGenerationException",
+      "org.openecomp.mso.entity.MsoRequest",
+      "org.codehaus.jackson.format.InputAccessor",
+      "org.codehaus.jackson.JsonFactory",
+      "org.codehaus.jackson.node.ArrayNode",
+      "org.codehaus.jackson.util.BufferRecycler",
+      "org.codehaus.jackson.io.SegmentedStringWriter",
+      "org.openecomp.mso.logger.MsoLogger$ResponseCode",
+      "org.codehaus.jackson.map.jsontype.TypeResolverBuilder",
+      "org.codehaus.jackson.map.type.HierarchicType",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$GetterMethodFilter",
+      "org.codehaus.jackson.JsonParser$Feature",
+      "org.codehaus.jackson.map.BeanDescription",
+      "org.codehaus.jackson.JsonParser$1",
+      "org.codehaus.jackson.impl.WriterBasedGenerator",
+      "org.codehaus.jackson.JsonGenerator$Feature",
+      "org.codehaus.jackson.sym.Name",
+      "org.codehaus.jackson.Version",
+      "org.codehaus.jackson.io.CharacterEscapes",
+      "org.codehaus.jackson.map.introspect.BasicBeanDescription",
+      "org.codehaus.jackson.schema.JsonSchema",
+      "org.codehaus.jackson.util.TokenBuffer",
+      "org.codehaus.jackson.map.MappingIterator",
+      "org.codehaus.jackson.map.annotate.JsonSerialize$Inclusion",
+      "org.codehaus.jackson.map.DeserializationContext",
+      "org.codehaus.jackson.impl.JsonParserBase",
+      "org.codehaus.jackson.map.ObjectMapper$DefaultTyping",
+      "org.codehaus.jackson.map.JsonMappingException",
+      "org.codehaus.jackson.map.introspect.AnnotatedMember",
+      "org.codehaus.jackson.node.JsonNodeFactory",
+      "org.codehaus.jackson.type.JavaType",
+      "com.att.eelf.i18n.EELFResourceManager",
+      "org.codehaus.jackson.map.introspect.VisibilityChecker$Std",
+      "org.codehaus.jackson.annotate.JsonTypeInfo$As",
+      "org.codehaus.jackson.JsonParser",
+      "org.codehaus.jackson.node.NullNode",
+      "org.codehaus.jackson.map.InjectableValues",
+      "org.codehaus.jackson.map.jsontype.impl.StdSubtypeResolver",
+      "org.codehaus.jackson.node.TreeTraversingParser",
+      "org.codehaus.jackson.map.type.CollectionType",
+      "com.att.eelf.configuration.EELFManager",
+      "org.codehaus.jackson.map.MapperConfig",
+      "org.codehaus.jackson.map.Module$SetupContext",
+      "org.openecomp.mso.adapters.catalogrest.QueryServiceNetworks",
+      "org.codehaus.jackson.io.UTF8Writer",
+      "org.openecomp.mso.db.catalog.beans.NetworkResource",
+      "org.codehaus.jackson.map.introspect.VisibilityChecker$1",
+      "org.codehaus.jackson.map.type.MapType",
+      "org.codehaus.jackson.annotate.JsonAutoDetect",
+      "org.codehaus.jackson.map.type.ArrayType",
+      "org.openecomp.mso.logger.MsoLogger",
+      "org.codehaus.jackson.map.ClassIntrospector$MixInResolver"
+    );
+  }
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(QueryServiceNetworksESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "org.openecomp.mso.logger.MsoLogger$Catalog",
+      "org.openecomp.mso.logger.MsoLogger",
+      "com.att.eelf.i18n.EELFResourceManager",
+      "com.att.eelf.i18n.EELFMsgs",
+      "com.att.eelf.i18n.EELFResourceManager$RESOURCE_TYPES",
+      "com.att.eelf.configuration.EELFLogger$Level",
+      "com.att.eelf.configuration.EELFManager",
+      "org.openecomp.mso.logger.MessageEnum",
+      "org.openecomp.mso.adapters.catalogrest.QueryServiceNetworks",
+      "org.codehaus.jackson.map.introspect.AnnotatedClass",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector",
+      "org.codehaus.jackson.annotate.JsonAutoDetect$Visibility",
+      "org.codehaus.jackson.annotate.JsonMethod",
+      "org.codehaus.jackson.map.introspect.VisibilityChecker$Std",
+      "org.codehaus.jackson.map.ObjectMapper",
+      "org.codehaus.jackson.JsonParser$Feature",
+      "org.codehaus.jackson.JsonGenerator$Feature",
+      "org.codehaus.jackson.JsonFactory",
+      "org.codehaus.jackson.sym.CharsToNameCanonicalizer",
+      "org.codehaus.jackson.sym.BytesToNameCanonicalizer",
+      "org.codehaus.jackson.map.type.TypeFactory"
+    );
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceVnfsESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceVnfsESTest.java
new file mode 100644
index 0000000000..4f963032d0
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceVnfsESTest.java
@@ -0,0 +1,188 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Wed Feb 22 12:31:50 GMT 2017
+ */
+
+package org.openecomp.mso.adapters.catalogrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+import static org.evosuite.shaded.org.mockito.Mockito.*;
+import static org.evosuite.runtime.MockitoExtension.*;
+import static org.evosuite.runtime.EvoAssertions.*;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.LinkedList;
+import java.util.List;
+import org.evosuite.runtime.EvoRunner;
+import org.evosuite.runtime.EvoRunnerParameters;
+import org.evosuite.runtime.ViolatedAssumptionAnswer;
+import org.junit.runner.RunWith;
+import org.openecomp.mso.adapters.catalogrest.QueryServiceVnfs;
+import org.openecomp.mso.db.catalog.beans.VnfResource;
+
+@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true)
+public class QueryServiceVnfsESTest extends QueryServiceVnfsESTestscaffolding {
+
+    @Test(timeout = 4000)
+    public void test00()  throws Throwable  {
+        QueryServiceVnfs queryServiceVnfs0 = new QueryServiceVnfs();
+        queryServiceVnfs0.setServiceVnfs((List<VnfResource>) null);
+        List<VnfResource> list0 = queryServiceVnfs0.getServiceVnfs();
+        assertNull(list0);
+    }
+
+    @Test(timeout = 4000)
+    public void test01()  throws Throwable  {
+        LinkedList<VnfResource> linkedList0 = new LinkedList<VnfResource>();
+        VnfResource vnfResource0 = new VnfResource();
+        linkedList0.add(vnfResource0);
+        List<VnfResource> list0 = linkedList0.subList(1, 1);
+        linkedList0.add(vnfResource0);
+        QueryServiceVnfs queryServiceVnfs0 = new QueryServiceVnfs();
+        queryServiceVnfs0.setServiceVnfs(list0);
+        // Undeclared exception!
+        try {
+            queryServiceVnfs0.toString();
+            fail("Expecting exception: ConcurrentModificationException");
+
+        } catch(ConcurrentModificationException e) {
+            //
+            // no message in exception (getMessage() returned null)
+            //
+            verifyException("java.util.SubList", e);
+        }
+    }
+
+    @Test(timeout = 4000)
+    public void test02()  throws Throwable  {
+        QueryServiceVnfs queryServiceVnfs0 = new QueryServiceVnfs();
+        queryServiceVnfs0.setServiceVnfs((List<VnfResource>) null);
+        // Undeclared exception!
+        try {
+            queryServiceVnfs0.toString();
+            fail("Expecting exception: NullPointerException");
+
+        } catch(NullPointerException e) {
+            //
+            // no message in exception (getMessage() returned null)
+            //
+            verifyException("org.openecomp.mso.adapters.catalogrest.QueryServiceVnfs", e);
+        }
+    }
+
+    @Test(timeout = 4000)
+    public void test03()  throws Throwable  {
+        LinkedList<VnfResource> linkedList0 = new LinkedList<VnfResource>();
+        QueryServiceVnfs queryServiceVnfs0 = new QueryServiceVnfs();
+        Object[] objectArray0 = new Object[3];
+        objectArray0[1] = (Object) queryServiceVnfs0;
+        queryServiceVnfs0.setServiceVnfs(linkedList0);
+        Collection<VnfResource> collection0 = (Collection<VnfResource>) mock(Collection.class, new ViolatedAssumptionAnswer());
+        doReturn(objectArray0).when(collection0).toArray();
+        linkedList0.addAll(collection0);
+        // Undeclared exception!
+        try {
+            queryServiceVnfs0.toString();
+            fail("Expecting exception: ClassCastException");
+
+        } catch(ClassCastException e) {
+            //
+            // org.openecomp.mso.adapters.catalogrest.QueryServiceVnfs cannot be cast to org.openecomp.mso.db.catalog.beans.VnfResource
+            //
+            verifyException("org.openecomp.mso.adapters.catalogrest.QueryServiceVnfs", e);
+        }
+    }
+
+    @Test(timeout = 4000)
+    public void test04()  throws Throwable  {
+        LinkedList<VnfResource> linkedList0 = new LinkedList<VnfResource>();
+        linkedList0.add((VnfResource) null);
+        QueryServiceVnfs queryServiceVnfs0 = null;
+        try {
+            queryServiceVnfs0 = new QueryServiceVnfs((List<VnfResource>) linkedList0);
+            fail("Expecting exception: NullPointerException");
+
+        } catch(NullPointerException e) {
+            //
+            // no message in exception (getMessage() returned null)
+            //
+            verifyException("org.openecomp.mso.adapters.catalogrest.QueryServiceVnfs", e);
+        }
+    }
+
+    @Test(timeout = 4000)
+    public void test05()  throws Throwable  {
+        LinkedList<VnfResource> linkedList0 = new LinkedList<VnfResource>();
+        QueryServiceVnfs queryServiceVnfs0 = new QueryServiceVnfs();
+        Object[] objectArray0 = new Object[8];
+        objectArray0[0] = (Object) queryServiceVnfs0;
+        Collection<VnfResource> collection0 = (Collection<VnfResource>) mock(Collection.class, new ViolatedAssumptionAnswer());
+        doReturn(objectArray0).when(collection0).toArray();
+        linkedList0.addAll(0, collection0);
+        QueryServiceVnfs queryServiceVnfs1 = null;
+        try {
+            queryServiceVnfs1 = new QueryServiceVnfs((List<VnfResource>) linkedList0);
+            fail("Expecting exception: ClassCastException");
+
+        } catch(ClassCastException e) {
+            //
+            // org.openecomp.mso.adapters.catalogrest.QueryServiceVnfs cannot be cast to org.openecomp.mso.db.catalog.beans.VnfResource
+            //
+            verifyException("org.openecomp.mso.adapters.catalogrest.QueryServiceVnfs", e);
+        }
+    }
+
+    @Test(timeout = 4000)
+    public void test06()  throws Throwable  {
+        LinkedList<VnfResource> linkedList0 = new LinkedList<VnfResource>();
+        VnfResource vnfResource0 = new VnfResource();
+        linkedList0.add(vnfResource0);
+        QueryServiceVnfs queryServiceVnfs0 = new QueryServiceVnfs();
+        queryServiceVnfs0.setServiceVnfs(linkedList0);
+        linkedList0.add(vnfResource0);
+        String string0 = queryServiceVnfs0.toString();
+        assertEquals("1\tVNF=null,version=null,mode=null,template=null,envtId=null,asdcUuid=null,aicVersionMin=null,aicVersionMax=null,modelInvariantUuid=null,modelVersion=null,modelCustomizationName=null,modelName=null,serviceModelInvariantUUID=null,modelCustomizationUuid=nullVfModules: NONE1\t\nVNF=null,version=null,mode=null,template=null,envtId=null,asdcUuid=null,aicVersionMin=null,aicVersionMax=null,modelInvariantUuid=null,modelVersion=null,modelCustomizationName=null,modelName=null,serviceModelInvariantUUID=null,modelCustomizationUuid=nullVfModules: NONE", string0);
+    }
+
+    @Test(timeout = 4000)
+    public void test07()  throws Throwable  {
+        QueryServiceVnfs queryServiceVnfs0 = new QueryServiceVnfs();
+        String string0 = queryServiceVnfs0.toString();
+        assertEquals("", string0);
+    }
+
+    @Test(timeout = 4000)
+    public void test08()  throws Throwable  {
+        LinkedList<VnfResource> linkedList0 = new LinkedList<VnfResource>();
+        VnfResource vnfResource0 = new VnfResource();
+        linkedList0.add(vnfResource0);
+        QueryServiceVnfs queryServiceVnfs0 = new QueryServiceVnfs((List<VnfResource>) linkedList0);
+        List<VnfResource> list0 = queryServiceVnfs0.getServiceVnfs();
+        assertEquals(1, list0.size());
+    }
+
+    @Test(timeout = 4000)
+    public void test09()  throws Throwable  {
+        QueryServiceVnfs queryServiceVnfs0 = new QueryServiceVnfs();
+        List<VnfResource> list0 = queryServiceVnfs0.getServiceVnfs();
+        queryServiceVnfs0.setServiceVnfs(list0);
+        assertTrue(list0.isEmpty());
+    }
+
+    @Test(timeout = 4000)
+    public void test10()  throws Throwable  {
+        QueryServiceVnfs queryServiceVnfs0 = new QueryServiceVnfs();
+        // Undeclared exception!
+        try {
+            queryServiceVnfs0.toJsonString();
+            fail("Expecting exception: VerifyError");
+
+        } catch(VerifyError e) {
+            //
+            // (class: org/codehaus/jackson/map/MapperConfig, method: <clinit> signature: ()V) Bad type in putfield/putstatic
+            //
+            verifyException("org.codehaus.jackson.map.ObjectMapper", e);
+        }
+    }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceVnfsESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceVnfsESTestscaffolding.java
new file mode 100644
index 0000000000..aa9a411de2
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/catalogrest/QueryServiceVnfsESTestscaffolding.java
@@ -0,0 +1,264 @@
+/**
+ * Scaffolding file used to store all the setups needed to run
+ * tests automatically generated by EvoSuite
+ * Mon Feb 20 14:04:40 GMT 2017
+ */
+
+package org.openecomp.mso.adapters.catalogrest;
+
+import org.evosuite.runtime.annotation.EvoSuiteClassExclude;
+import org.junit.BeforeClass;
+import org.junit.Before;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.evosuite.runtime.sandbox.Sandbox;
+
+@EvoSuiteClassExclude
+public class QueryServiceVnfsESTestscaffolding {
+
+  @org.junit.Rule
+  public org.evosuite.runtime.vnet.NonFunctionalRequirementRule nfr = new org.evosuite.runtime.vnet.NonFunctionalRequirementRule();
+
+  private static final java.util.Properties defaultProperties = (java.util.Properties) java.lang.System.getProperties().clone();
+
+  private org.evosuite.runtime.thread.ThreadStopper threadStopper =  new org.evosuite.runtime.thread.ThreadStopper (org.evosuite.runtime.thread.KillSwitchHandler.getInstance(), 3000);
+
+  @BeforeClass
+  public static void initEvoSuiteFramework() {
+    org.evosuite.runtime.RuntimeSettings.className = "org.openecomp.mso.adapters.catalogrest.QueryServiceVnfs";
+    org.evosuite.runtime.GuiSupport.initialize();
+    org.evosuite.runtime.RuntimeSettings.maxNumberOfThreads = 100;
+    org.evosuite.runtime.RuntimeSettings.maxNumberOfIterationsPerLoop = 10000;
+    org.evosuite.runtime.RuntimeSettings.mockSystemIn = true;
+    org.evosuite.runtime.RuntimeSettings.sandboxMode = org.evosuite.runtime.sandbox.Sandbox.SandboxMode.RECOMMENDED;
+    org.evosuite.runtime.sandbox.Sandbox.initializeSecurityManagerForSUT();
+    org.evosuite.runtime.classhandling.JDKClassResetter.init();
+    initializeClasses();
+    org.evosuite.runtime.Runtime.getInstance().resetRuntime();
+  }
+
+  @AfterClass
+  public static void clearEvoSuiteFramework(){
+    Sandbox.resetDefaultSecurityManager();
+    java.lang.System.setProperties((java.util.Properties) defaultProperties.clone());
+  }
+
+  @Before
+  public void initTestCase(){
+    threadStopper.storeCurrentThreads();
+    threadStopper.startRecordingTime();
+    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().initHandler();
+    org.evosuite.runtime.sandbox.Sandbox.goingToExecuteSUTCode();
+    org.evosuite.runtime.GuiSupport.setHeadless();
+    org.evosuite.runtime.Runtime.getInstance().resetRuntime();
+    org.evosuite.runtime.agent.InstrumentingAgent.activate();
+  }
+
+  @After
+  public void doneWithTestCase(){
+    threadStopper.killAndJoinClientThreads();
+    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().safeExecuteAddedHooks();
+    org.evosuite.runtime.classhandling.JDKClassResetter.reset();
+    resetClasses();
+    org.evosuite.runtime.sandbox.Sandbox.doneWithExecutingSUTCode();
+    org.evosuite.runtime.agent.InstrumentingAgent.deactivate();
+    org.evosuite.runtime.GuiSupport.restoreHeadlessMode();
+  }
+
+  private static void initializeClasses() {
+    org.evosuite.runtime.classhandling.ClassStateSupport.initializeClasses(QueryServiceVnfsESTestscaffolding.class.getClassLoader() ,
+      "org.codehaus.jackson.map.JsonSerializableWithType",
+      "org.codehaus.jackson.map.HandlerInstantiator",
+      "org.codehaus.jackson.map.deser.StdDeserializerProvider",
+      "org.codehaus.jackson.map.SerializerFactory",
+      "org.codehaus.jackson.map.SerializerProvider",
+      "org.codehaus.jackson.map.type.TypeBindings",
+      "org.codehaus.jackson.map.SerializationConfig",
+      "org.codehaus.jackson.JsonProcessingException",
+      "org.codehaus.jackson.map.introspect.AnnotationMap",
+      "org.codehaus.jackson.map.introspect.Annotated",
+      "org.codehaus.jackson.io.InputDecorator",
+      "org.codehaus.jackson.map.Module",
+      "org.codehaus.jackson.map.util.Annotations",
+      "org.codehaus.jackson.map.type.TypeModifier",
+      "org.codehaus.jackson.sym.NameN",
+      "org.codehaus.jackson.JsonGenerator",
+      "org.codehaus.jackson.map.introspect.AnnotatedClass",
+      "org.codehaus.jackson.map.introspect.JacksonAnnotationIntrospector",
+      "org.codehaus.jackson.annotate.JsonAutoDetect$1",
+      "org.codehaus.jackson.map.JsonSerializable",
+      "org.codehaus.jackson.annotate.JsonMethod",
+      "com.att.eelf.i18n.EELFResolvableErrorEnum",
+      "org.codehaus.jackson.node.BaseJsonNode",
+      "org.openecomp.mso.logger.MsoLogger$StatusCode",
+      "org.codehaus.jackson.map.ObjectReader",
+      "org.codehaus.jackson.map.DeserializerProvider",
+      "org.codehaus.jackson.annotate.JsonAutoDetect$Visibility",
+      "org.codehaus.jackson.node.ValueNode",
+      "org.codehaus.jackson.map.ser.BeanSerializerFactory",
+      "org.codehaus.jackson.map.JsonSerializer",
+      "org.codehaus.jackson.map.introspect.AnnotatedWithParams",
+      "com.att.eelf.i18n.EELFMsgs",
+      "org.codehaus.jackson.map.AnnotationIntrospector",
+      "org.codehaus.jackson.map.MappingJsonFactory",
+      "com.att.eelf.configuration.EELFLogger$Level",
+      "org.codehaus.jackson.map.MapperConfig$Impl",
+      "org.codehaus.jackson.sym.Name1",
+      "org.codehaus.jackson.sym.Name2",
+      "org.codehaus.jackson.sym.Name3",
+      "org.codehaus.jackson.map.introspect.MethodFilter",
+      "org.codehaus.jackson.map.ser.StdSerializerProvider",
+      "org.codehaus.jackson.map.deser.StdDeserializationContext",
+      "org.codehaus.jackson.type.TypeReference",
+      "org.codehaus.jackson.map.ClassIntrospector",
+      "org.codehaus.jackson.map.AnnotationIntrospector$Pair",
+      "org.codehaus.jackson.map.PropertyNamingStrategy$LowerCaseWithUnderscoresStrategy",
+      "org.codehaus.jackson.map.MapperConfig$ConfigFeature",
+      "org.codehaus.jackson.map.SerializationConfig$Feature",
+      "org.codehaus.jackson.Versioned",
+      "org.codehaus.jackson.io.IOContext",
+      "org.codehaus.jackson.map.type.TypeBase",
+      "org.codehaus.jackson.map.ser.BasicSerializerFactory",
+      "com.att.eelf.i18n.EELFResourceManager$RESOURCE_TYPES",
+      "org.codehaus.jackson.map.PropertyNamingStrategy",
+      "org.codehaus.jackson.node.ContainerNode",
+      "org.codehaus.jackson.map.jsontype.NamedType",
+      "org.codehaus.jackson.map.ser.FilterProvider",
+      "org.codehaus.jackson.map.introspect.NopAnnotationIntrospector",
+      "com.att.eelf.configuration.EELFLogger",
+      "org.codehaus.jackson.map.DeserializationConfig",
+      "org.codehaus.jackson.map.introspect.AnnotatedConstructor",
+      "org.codehaus.jackson.sym.BytesToNameCanonicalizer",
+      "org.codehaus.jackson.map.type.TypeFactory",
+      "org.codehaus.jackson.impl.ReaderBasedParser",
+      "org.codehaus.jackson.sym.BytesToNameCanonicalizer$TableInfo",
+      "org.codehaus.jackson.JsonEncoding",
+      "org.codehaus.jackson.map.type.MapLikeType",
+      "org.codehaus.jackson.map.JsonDeserializer",
+      "org.openecomp.mso.db.catalog.beans.VnfResource",
+      "org.codehaus.jackson.map.PropertyNamingStrategy$PropertyNamingStrategyBase",
+      "org.codehaus.jackson.node.ObjectNode",
+      "org.openecomp.mso.logger.MsoLogger$ErrorCode",
+      "org.codehaus.jackson.map.ser.std.SerializerBase",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$MinimalMethodFilter",
+      "org.codehaus.jackson.map.type.CollectionLikeType",
+      "org.openecomp.mso.logger.MessageEnum",
+      "org.codehaus.jackson.map.DeserializationConfig$Feature",
+      "org.codehaus.jackson.sym.CharsToNameCanonicalizer$Bucket",
+      "org.codehaus.jackson.map.introspect.AnnotatedMethodMap",
+      "org.codehaus.jackson.impl.JsonParserMinimalBase",
+      "org.codehaus.jackson.map.type.TypeParser",
+      "org.codehaus.jackson.map.introspect.POJOPropertiesCollector",
+      "org.codehaus.jackson.JsonParseException",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$SetterMethodFilter",
+      "org.codehaus.jackson.map.introspect.VisibilityChecker",
+      "org.codehaus.jackson.map.introspect.AnnotatedField",
+      "org.codehaus.jackson.impl.JsonGeneratorBase",
+      "org.codehaus.jackson.map.ObjectMapper",
+      "org.codehaus.jackson.util.ByteArrayBuilder",
+      "org.codehaus.jackson.map.ser.impl.FailingSerializer",
+      "org.codehaus.jackson.PrettyPrinter",
+      "org.codehaus.jackson.JsonToken",
+      "org.codehaus.jackson.map.jsontype.SubtypeResolver",
+      "org.codehaus.jackson.map.type.SimpleType",
+      "org.codehaus.jackson.map.util.StdDateFormat",
+      "org.codehaus.jackson.impl.Utf8Generator",
+      "org.codehaus.jackson.node.NumericNode",
+      "org.jboss.resteasy.annotations.providers.NoJackson",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$SetterAndGetterMethodFilter",
+      "org.codehaus.jackson.JsonNode",
+      "org.codehaus.jackson.sym.CharsToNameCanonicalizer",
+      "org.codehaus.jackson.annotate.JacksonAnnotation",
+      "org.codehaus.jackson.map.ObjectWriter",
+      "org.codehaus.jackson.schema.SchemaAware",
+      "org.codehaus.jackson.io.OutputDecorator",
+      "com.att.eelf.configuration.SLF4jWrapper",
+      "org.codehaus.jackson.FormatSchema",
+      "org.codehaus.jackson.format.MatchStrength",
+      "org.openecomp.mso.logger.MsoLogger$Catalog",
+      "org.codehaus.jackson.ObjectCodec",
+      "org.codehaus.jackson.map.introspect.AnnotatedMethod",
+      "org.openecomp.mso.db.catalog.utils.MavenLikeVersioning",
+      "org.codehaus.jackson.JsonGenerationException",
+      "org.openecomp.mso.entity.MsoRequest",
+      "org.codehaus.jackson.format.InputAccessor",
+      "org.codehaus.jackson.JsonFactory",
+      "org.codehaus.jackson.node.ArrayNode",
+      "org.codehaus.jackson.util.BufferRecycler",
+      "org.codehaus.jackson.io.SegmentedStringWriter",
+      "org.openecomp.mso.logger.MsoLogger$ResponseCode",
+      "org.codehaus.jackson.map.jsontype.TypeResolverBuilder",
+      "org.codehaus.jackson.map.type.HierarchicType",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$GetterMethodFilter",
+      "org.codehaus.jackson.JsonParser$Feature",
+      "org.codehaus.jackson.map.BeanDescription",
+      "org.codehaus.jackson.JsonParser$1",
+      "org.codehaus.jackson.impl.WriterBasedGenerator",
+      "org.codehaus.jackson.JsonGenerator$Feature",
+      "org.codehaus.jackson.sym.Name",
+      "org.codehaus.jackson.Version",
+      "org.codehaus.jackson.io.CharacterEscapes",
+      "org.codehaus.jackson.map.introspect.BasicBeanDescription",
+      "org.codehaus.jackson.schema.JsonSchema",
+      "org.codehaus.jackson.util.TokenBuffer",
+      "org.codehaus.jackson.map.annotate.JsonSerialize$Inclusion",
+      "org.codehaus.jackson.map.MappingIterator",
+      "org.codehaus.jackson.map.DeserializationContext",
+      "org.codehaus.jackson.impl.JsonParserBase",
+      "org.codehaus.jackson.map.ObjectMapper$DefaultTyping",
+      "org.codehaus.jackson.map.JsonMappingException",
+      "org.codehaus.jackson.map.introspect.AnnotatedMember",
+      "org.codehaus.jackson.node.JsonNodeFactory",
+      "org.codehaus.jackson.type.JavaType",
+      "com.att.eelf.i18n.EELFResourceManager",
+      "org.codehaus.jackson.map.introspect.VisibilityChecker$Std",
+      "org.codehaus.jackson.annotate.JsonTypeInfo$As",
+      "org.codehaus.jackson.JsonParser",
+      "org.codehaus.jackson.node.NullNode",
+      "org.codehaus.jackson.map.InjectableValues",
+      "org.codehaus.jackson.map.jsontype.impl.StdSubtypeResolver",
+      "org.codehaus.jackson.node.TreeTraversingParser",
+      "org.codehaus.jackson.map.type.CollectionType",
+      "com.att.eelf.configuration.EELFManager",
+      "org.codehaus.jackson.map.MapperConfig",
+      "org.codehaus.jackson.map.Module$SetupContext",
+      "org.codehaus.jackson.io.UTF8Writer",
+      "org.codehaus.jackson.map.introspect.VisibilityChecker$1",
+      "org.codehaus.jackson.map.type.MapType",
+      "org.codehaus.jackson.annotate.JsonAutoDetect",
+      "org.openecomp.mso.adapters.catalogrest.QueryServiceVnfs",
+      "org.codehaus.jackson.map.type.ArrayType",
+      "org.openecomp.mso.logger.MsoLogger",
+      "org.codehaus.jackson.map.ClassIntrospector$MixInResolver"
+    );
+  }
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(QueryServiceVnfsESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "org.openecomp.mso.logger.MsoLogger$Catalog",
+      "org.openecomp.mso.logger.MsoLogger",
+      "com.att.eelf.i18n.EELFResourceManager",
+      "com.att.eelf.i18n.EELFMsgs",
+      "com.att.eelf.i18n.EELFResourceManager$RESOURCE_TYPES",
+      "com.att.eelf.configuration.EELFLogger$Level",
+      "com.att.eelf.configuration.EELFManager",
+      "org.openecomp.mso.logger.MessageEnum",
+      "org.openecomp.mso.adapters.catalogrest.QueryServiceVnfs",
+      "org.codehaus.jackson.map.introspect.AnnotatedClass",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector",
+      "org.codehaus.jackson.annotate.JsonAutoDetect$Visibility",
+      "org.codehaus.jackson.annotate.JsonMethod",
+      "org.codehaus.jackson.map.introspect.VisibilityChecker$Std",
+      "org.codehaus.jackson.map.ObjectMapper",
+      "org.codehaus.jackson.JsonParser$Feature",
+      "org.codehaus.jackson.JsonGenerator$Feature",
+      "org.codehaus.jackson.JsonFactory",
+      "org.codehaus.jackson.sym.CharsToNameCanonicalizer",
+      "org.codehaus.jackson.sym.BytesToNameCanonicalizer",
+      "org.codehaus.jackson.map.type.TypeFactory"
+    );
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/RequestInformationESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/RequestInformationESTest.java
new file mode 100644
index 0000000000..293a91e4f3
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/RequestInformationESTest.java
@@ -0,0 +1,108 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Feb 20 14:10:13 GMT 2017
+ */
+
+package org.openecomp.mso.adapters.sdncrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+import org.evosuite.runtime.EvoRunner;
+import org.evosuite.runtime.EvoRunnerParameters;
+import org.junit.runner.RunWith;
+
+@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true)
+public class RequestInformationESTest extends RequestInformationESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test00()  throws Throwable  {
+      RequestInformation requestInformation0 = new RequestInformation();
+      String string0 = requestInformation0.getSource();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test01()  throws Throwable  {
+      RequestInformation requestInformation0 = new RequestInformation("", "", "");
+      String string0 = requestInformation0.getSource();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test02()  throws Throwable  {
+      RequestInformation requestInformation0 = new RequestInformation();
+      String string0 = requestInformation0.getRequestId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test03()  throws Throwable  {
+      RequestInformation requestInformation0 = new RequestInformation("82W?GC", "", "82W?GC");
+      String string0 = requestInformation0.getNotificationUrl();
+      assertEquals("82W?GC", string0);
+      assertEquals("82W?GC", requestInformation0.getRequestId());
+      assertEquals("", requestInformation0.getSource());
+  }
+
+  @Test(timeout = 4000)
+  public void test04()  throws Throwable  {
+      RequestInformation requestInformation0 = new RequestInformation("", "3*5=IrA", "");
+      String string0 = requestInformation0.getSource();
+      assertEquals("3*5=IrA", string0);
+      assertEquals("", requestInformation0.getNotificationUrl());
+      assertEquals("", requestInformation0.getRequestId());
+  }
+
+  @Test(timeout = 4000)
+  public void test05()  throws Throwable  {
+      RequestInformation requestInformation0 = new RequestInformation("", "3*5=IrA", "");
+      assertEquals("", requestInformation0.getRequestId());
+
+      requestInformation0.setRequestId("3*5=IrA");
+      requestInformation0.getRequestId();
+      assertEquals("3*5=IrA", requestInformation0.getSource());
+  }
+
+  @Test(timeout = 4000)
+  public void test06()  throws Throwable  {
+      RequestInformation requestInformation0 = new RequestInformation();
+      String string0 = requestInformation0.getNotificationUrl();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test07()  throws Throwable  {
+      RequestInformation requestInformation0 = new RequestInformation("", "3*5=IrA", "");
+      assertEquals("", requestInformation0.getNotificationUrl());
+
+      requestInformation0.setNotificationUrl("3*5=IrA");
+      assertEquals("3*5=IrA", requestInformation0.getSource());
+  }
+
+  @Test(timeout = 4000)
+  public void test08()  throws Throwable  {
+      RequestInformation requestInformation0 = new RequestInformation("", "3*5=IrA", "");
+      String string0 = requestInformation0.getNotificationUrl();
+      assertEquals("", string0);
+      assertEquals("", requestInformation0.getRequestId());
+      assertEquals("3*5=IrA", requestInformation0.getSource());
+  }
+
+  @Test(timeout = 4000)
+  public void test09()  throws Throwable  {
+      RequestInformation requestInformation0 = new RequestInformation("", "3*5=IrA", "");
+      String string0 = requestInformation0.getRequestId();
+      assertEquals("", string0);
+      assertEquals("", requestInformation0.getNotificationUrl());
+      assertEquals("3*5=IrA", requestInformation0.getSource());
+  }
+
+  @Test(timeout = 4000)
+  public void test10()  throws Throwable  {
+      RequestInformation requestInformation0 = new RequestInformation("", "3*5=IrA", "");
+      assertEquals("3*5=IrA", requestInformation0.getSource());
+
+      requestInformation0.setSource("");
+      assertEquals("", requestInformation0.getNotificationUrl());
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/RequestInformationESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/RequestInformationESTestscaffolding.java
new file mode 100644
index 0000000000..a2d81096c4
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/RequestInformationESTestscaffolding.java
@@ -0,0 +1,81 @@
+/**
+ * Scaffolding file used to store all the setups needed to run
+ * tests automatically generated by EvoSuite
+ * Mon Feb 20 14:10:13 GMT 2017
+ */
+
+package org.openecomp.mso.adapters.sdncrest;
+
+import org.evosuite.runtime.annotation.EvoSuiteClassExclude;
+import org.junit.BeforeClass;
+import org.junit.Before;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.evosuite.runtime.sandbox.Sandbox;
+
+@EvoSuiteClassExclude
+public class RequestInformationESTestscaffolding {
+
+  @org.junit.Rule
+  public org.evosuite.runtime.vnet.NonFunctionalRequirementRule nfr = new org.evosuite.runtime.vnet.NonFunctionalRequirementRule();
+
+  private static final java.util.Properties defaultProperties = (java.util.Properties) java.lang.System.getProperties().clone();
+
+  private org.evosuite.runtime.thread.ThreadStopper threadStopper =  new org.evosuite.runtime.thread.ThreadStopper (org.evosuite.runtime.thread.KillSwitchHandler.getInstance(), 3000);
+
+  @BeforeClass
+  public static void initEvoSuiteFramework() {
+    org.evosuite.runtime.RuntimeSettings.className = "org.openecomp.mso.adapters.sdncrest.RequestInformation";
+    org.evosuite.runtime.GuiSupport.initialize();
+    org.evosuite.runtime.RuntimeSettings.maxNumberOfThreads = 100;
+    org.evosuite.runtime.RuntimeSettings.maxNumberOfIterationsPerLoop = 10000;
+    org.evosuite.runtime.RuntimeSettings.mockSystemIn = true;
+    org.evosuite.runtime.RuntimeSettings.sandboxMode = org.evosuite.runtime.sandbox.Sandbox.SandboxMode.RECOMMENDED;
+    org.evosuite.runtime.sandbox.Sandbox.initializeSecurityManagerForSUT();
+    org.evosuite.runtime.classhandling.JDKClassResetter.init();
+    initializeClasses();
+    org.evosuite.runtime.Runtime.getInstance().resetRuntime();
+  }
+
+  @AfterClass
+  public static void clearEvoSuiteFramework(){
+    Sandbox.resetDefaultSecurityManager();
+    java.lang.System.setProperties((java.util.Properties) defaultProperties.clone());
+  }
+
+  @Before
+  public void initTestCase(){
+    threadStopper.storeCurrentThreads();
+    threadStopper.startRecordingTime();
+    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().initHandler();
+    org.evosuite.runtime.sandbox.Sandbox.goingToExecuteSUTCode();
+    org.evosuite.runtime.GuiSupport.setHeadless();
+    org.evosuite.runtime.Runtime.getInstance().resetRuntime();
+    org.evosuite.runtime.agent.InstrumentingAgent.activate();
+  }
+
+  @After
+  public void doneWithTestCase(){
+    threadStopper.killAndJoinClientThreads();
+    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().safeExecuteAddedHooks();
+    org.evosuite.runtime.classhandling.JDKClassResetter.reset();
+    resetClasses();
+    org.evosuite.runtime.sandbox.Sandbox.doneWithExecutingSUTCode();
+    org.evosuite.runtime.agent.InstrumentingAgent.deactivate();
+    org.evosuite.runtime.GuiSupport.restoreHeadlessMode();
+  }
+
+  private static void initializeClasses() {
+    org.evosuite.runtime.classhandling.ClassStateSupport.initializeClasses(RequestInformationESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.adapters.sdncrest.RequestInformation"
+    );
+  }
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(RequestInformationESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "org.openecomp.mso.adapters.sdncrest.RequestInformation"
+    );
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCErrorCommonESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCErrorCommonESTest.java
new file mode 100644
index 0000000000..047735f8d9
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCErrorCommonESTest.java
@@ -0,0 +1,28 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Feb 20 14:06:32 GMT 2017
+ */
+
+package org.openecomp.mso.adapters.sdncrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+import org.evosuite.runtime.EvoRunner;
+import org.evosuite.runtime.EvoRunnerParameters;
+import org.junit.runner.RunWith;
+
+@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true)
+public class SDNCErrorCommonESTest extends SDNCErrorCommonESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test0()  throws Throwable  {
+      SDNCServiceError sDNCServiceError0 = new SDNCServiceError();
+      assertNull(sDNCServiceError0.getAckFinalIndicator());
+  }
+
+  @Test(timeout = 4000)
+  public void test1()  throws Throwable  {
+      SDNCServiceError sDNCServiceError0 = new SDNCServiceError("8F;T;=}$'$-(v5P;/wC", "8F;T;=}$'$-(v5P;/wC", "", "");
+      assertEquals("8F;T;=}$'$-(v5P;/wC", sDNCServiceError0.getSDNCRequestId());
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCErrorCommonESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCErrorCommonESTestscaffolding.java
new file mode 100644
index 0000000000..e90d27a622
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCErrorCommonESTestscaffolding.java
@@ -0,0 +1,96 @@
+/**
+ * Scaffolding file used to store all the setups needed to run
+ * tests automatically generated by EvoSuite
+ * Mon Feb 20 14:06:32 GMT 2017
+ */
+
+package org.openecomp.mso.adapters.sdncrest;
+
+import org.evosuite.runtime.annotation.EvoSuiteClassExclude;
+import org.junit.BeforeClass;
+import org.junit.Before;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.evosuite.runtime.sandbox.Sandbox;
+
+@EvoSuiteClassExclude
+public class SDNCErrorCommonESTestscaffolding {
+
+  @org.junit.Rule
+  public org.evosuite.runtime.vnet.NonFunctionalRequirementRule nfr = new org.evosuite.runtime.vnet.NonFunctionalRequirementRule();
+
+  private static final java.util.Properties defaultProperties = (java.util.Properties) java.lang.System.getProperties().clone();
+
+  private org.evosuite.runtime.thread.ThreadStopper threadStopper =  new org.evosuite.runtime.thread.ThreadStopper (org.evosuite.runtime.thread.KillSwitchHandler.getInstance(), 3000);
+
+  @BeforeClass
+  public static void initEvoSuiteFramework() {
+    org.evosuite.runtime.RuntimeSettings.className = "org.openecomp.mso.adapters.sdncrest.SDNCErrorCommon";
+    org.evosuite.runtime.GuiSupport.initialize();
+    org.evosuite.runtime.RuntimeSettings.maxNumberOfThreads = 100;
+    org.evosuite.runtime.RuntimeSettings.maxNumberOfIterationsPerLoop = 10000;
+    org.evosuite.runtime.RuntimeSettings.mockSystemIn = true;
+    org.evosuite.runtime.RuntimeSettings.sandboxMode = org.evosuite.runtime.sandbox.Sandbox.SandboxMode.RECOMMENDED;
+    org.evosuite.runtime.sandbox.Sandbox.initializeSecurityManagerForSUT();
+    org.evosuite.runtime.classhandling.JDKClassResetter.init();
+    initializeClasses();
+    org.evosuite.runtime.Runtime.getInstance().resetRuntime();
+  }
+
+  @AfterClass
+  public static void clearEvoSuiteFramework(){
+    Sandbox.resetDefaultSecurityManager();
+    java.lang.System.setProperties((java.util.Properties) defaultProperties.clone());
+  }
+
+  @Before
+  public void initTestCase(){
+    threadStopper.storeCurrentThreads();
+    threadStopper.startRecordingTime();
+    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().initHandler();
+    org.evosuite.runtime.sandbox.Sandbox.goingToExecuteSUTCode();
+    org.evosuite.runtime.GuiSupport.setHeadless();
+    org.evosuite.runtime.Runtime.getInstance().resetRuntime();
+    org.evosuite.runtime.agent.InstrumentingAgent.activate();
+  }
+
+  @After
+  public void doneWithTestCase(){
+    threadStopper.killAndJoinClientThreads();
+    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().safeExecuteAddedHooks();
+    org.evosuite.runtime.classhandling.JDKClassResetter.reset();
+    resetClasses();
+    org.evosuite.runtime.sandbox.Sandbox.doneWithExecutingSUTCode();
+    org.evosuite.runtime.agent.InstrumentingAgent.deactivate();
+    org.evosuite.runtime.GuiSupport.restoreHeadlessMode();
+  }
+
+  private static void initializeClasses() {
+    org.evosuite.runtime.classhandling.ClassStateSupport.initializeClasses(SDNCErrorCommonESTestscaffolding.class.getClassLoader() ,
+      "org.codehaus.jackson.annotate.JacksonAnnotation",
+      "org.openecomp.mso.adapters.sdncrest.SDNCErrorCommon",
+      "org.openecomp.mso.adapters.sdncrest.SDNCServiceError",
+      "org.codehaus.jackson.map.annotate.JsonSerialize$Typing",
+      "org.codehaus.jackson.map.annotate.JsonSerialize$Inclusion",
+      "org.openecomp.mso.adapters.sdncrest.SDNCResponseCommon",
+      "org.codehaus.jackson.map.JsonSerializer",
+      "org.codehaus.jackson.map.JsonSerializer$None",
+      "org.codehaus.jackson.map.annotate.NoClass",
+      "org.jboss.resteasy.annotations.providers.NoJackson",
+      "org.codehaus.jackson.map.annotate.JsonSerialize",
+      "org.codehaus.jackson.map.annotate.JsonRootName"
+    );
+  }
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(SDNCErrorCommonESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "org.codehaus.jackson.map.annotate.JsonSerialize$Inclusion",
+      "org.codehaus.jackson.map.annotate.JsonSerialize$Typing",
+      "org.openecomp.mso.adapters.sdncrest.SDNCServiceError",
+      "org.openecomp.mso.adapters.sdncrest.SDNCResponseCommon",
+      "org.openecomp.mso.adapters.sdncrest.SDNCErrorCommon"
+    );
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceErrorESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceErrorESTest.java
new file mode 100644
index 0000000000..3a980a345f
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceErrorESTest.java
@@ -0,0 +1,28 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Feb 20 14:12:21 GMT 2017
+ */
+
+package org.openecomp.mso.adapters.sdncrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+import org.evosuite.runtime.EvoRunner;
+import org.evosuite.runtime.EvoRunnerParameters;
+import org.junit.runner.RunWith;
+
+@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true)
+public class SDNCServiceErrorESTest extends SDNCServiceErrorESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test0()  throws Throwable  {
+      SDNCServiceError sDNCServiceError0 = new SDNCServiceError("org.openecomp.mso.adapters.sdncrest.SDNCServiceError", "org.openecomp.mso.adapters.sdncrest.SDNCServiceError", "org.openecomp.mso.adapters.sdncrest.SDNCServiceError", "");
+      assertEquals("org.openecomp.mso.adapters.sdncrest.SDNCServiceError", sDNCServiceError0.getSDNCRequestId());
+  }
+
+  @Test(timeout = 4000)
+  public void test1()  throws Throwable  {
+      SDNCServiceError sDNCServiceError0 = new SDNCServiceError();
+      assertNull(sDNCServiceError0.getResponseCode());
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceErrorESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceErrorESTestscaffolding.java
new file mode 100644
index 0000000000..0baefc00dc
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceErrorESTestscaffolding.java
@@ -0,0 +1,96 @@
+/**
+ * Scaffolding file used to store all the setups needed to run
+ * tests automatically generated by EvoSuite
+ * Mon Feb 20 14:12:21 GMT 2017
+ */
+
+package org.openecomp.mso.adapters.sdncrest;
+
+import org.evosuite.runtime.annotation.EvoSuiteClassExclude;
+import org.junit.BeforeClass;
+import org.junit.Before;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.evosuite.runtime.sandbox.Sandbox;
+
+@EvoSuiteClassExclude
+public class SDNCServiceErrorESTestscaffolding {
+
+  @org.junit.Rule
+  public org.evosuite.runtime.vnet.NonFunctionalRequirementRule nfr = new org.evosuite.runtime.vnet.NonFunctionalRequirementRule();
+
+  private static final java.util.Properties defaultProperties = (java.util.Properties) java.lang.System.getProperties().clone();
+
+  private org.evosuite.runtime.thread.ThreadStopper threadStopper =  new org.evosuite.runtime.thread.ThreadStopper (org.evosuite.runtime.thread.KillSwitchHandler.getInstance(), 3000);
+
+  @BeforeClass
+  public static void initEvoSuiteFramework() {
+    org.evosuite.runtime.RuntimeSettings.className = "org.openecomp.mso.adapters.sdncrest.SDNCServiceError";
+    org.evosuite.runtime.GuiSupport.initialize();
+    org.evosuite.runtime.RuntimeSettings.maxNumberOfThreads = 100;
+    org.evosuite.runtime.RuntimeSettings.maxNumberOfIterationsPerLoop = 10000;
+    org.evosuite.runtime.RuntimeSettings.mockSystemIn = true;
+    org.evosuite.runtime.RuntimeSettings.sandboxMode = org.evosuite.runtime.sandbox.Sandbox.SandboxMode.RECOMMENDED;
+    org.evosuite.runtime.sandbox.Sandbox.initializeSecurityManagerForSUT();
+    org.evosuite.runtime.classhandling.JDKClassResetter.init();
+    initializeClasses();
+    org.evosuite.runtime.Runtime.getInstance().resetRuntime();
+  }
+
+  @AfterClass
+  public static void clearEvoSuiteFramework(){
+    Sandbox.resetDefaultSecurityManager();
+    java.lang.System.setProperties((java.util.Properties) defaultProperties.clone());
+  }
+
+  @Before
+  public void initTestCase(){
+    threadStopper.storeCurrentThreads();
+    threadStopper.startRecordingTime();
+    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().initHandler();
+    org.evosuite.runtime.sandbox.Sandbox.goingToExecuteSUTCode();
+    org.evosuite.runtime.GuiSupport.setHeadless();
+    org.evosuite.runtime.Runtime.getInstance().resetRuntime();
+    org.evosuite.runtime.agent.InstrumentingAgent.activate();
+  }
+
+  @After
+  public void doneWithTestCase(){
+    threadStopper.killAndJoinClientThreads();
+    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().safeExecuteAddedHooks();
+    org.evosuite.runtime.classhandling.JDKClassResetter.reset();
+    resetClasses();
+    org.evosuite.runtime.sandbox.Sandbox.doneWithExecutingSUTCode();
+    org.evosuite.runtime.agent.InstrumentingAgent.deactivate();
+    org.evosuite.runtime.GuiSupport.restoreHeadlessMode();
+  }
+
+  private static void initializeClasses() {
+    org.evosuite.runtime.classhandling.ClassStateSupport.initializeClasses(SDNCServiceErrorESTestscaffolding.class.getClassLoader() ,
+      "org.codehaus.jackson.annotate.JacksonAnnotation",
+      "org.openecomp.mso.adapters.sdncrest.SDNCErrorCommon",
+      "org.openecomp.mso.adapters.sdncrest.SDNCServiceError",
+      "org.codehaus.jackson.map.annotate.JsonSerialize$Typing",
+      "org.codehaus.jackson.map.annotate.JsonSerialize$Inclusion",
+      "org.openecomp.mso.adapters.sdncrest.SDNCResponseCommon",
+      "org.codehaus.jackson.map.annotate.NoClass",
+      "org.codehaus.jackson.map.JsonSerializer",
+      "org.codehaus.jackson.map.JsonSerializer$None",
+      "org.jboss.resteasy.annotations.providers.NoJackson",
+      "org.codehaus.jackson.map.annotate.JsonSerialize",
+      "org.codehaus.jackson.map.annotate.JsonRootName"
+    );
+  }
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(SDNCServiceErrorESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "org.codehaus.jackson.map.annotate.JsonSerialize$Typing",
+      "org.codehaus.jackson.map.annotate.JsonSerialize$Inclusion",
+      "org.openecomp.mso.adapters.sdncrest.SDNCResponseCommon",
+      "org.openecomp.mso.adapters.sdncrest.SDNCErrorCommon",
+      "org.openecomp.mso.adapters.sdncrest.SDNCServiceError"
+    );
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceRequestESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceRequestESTest.java
new file mode 100644
index 0000000000..5df036600a
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceRequestESTest.java
@@ -0,0 +1,172 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Feb 20 14:08:11 GMT 2017
+ */
+
+package org.openecomp.mso.adapters.sdncrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+import static org.evosuite.shaded.org.mockito.Mockito.*;
+
+import org.evosuite.runtime.EvoRunner;
+import org.evosuite.runtime.EvoRunnerParameters;
+import org.evosuite.runtime.ViolatedAssumptionAnswer;
+import org.junit.runner.RunWith;
+
+@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true)
+public class SDNCServiceRequestESTest extends SDNCServiceRequestESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test00()  throws Throwable  {
+      RequestInformation requestInformation0 = mock(RequestInformation.class, new ViolatedAssumptionAnswer());
+      ServiceInformation serviceInformation0 = mock(ServiceInformation.class, new ViolatedAssumptionAnswer());
+      doReturn((String) null).when(serviceInformation0).toString();
+      SDNCServiceRequest sDNCServiceRequest0 = new SDNCServiceRequest("org.openecomp.mso.adapters.sdncrest.SDNCServiceRequest", "org.openecomp.mso.adapters.sdncrest.SDNCServiceRequest", "", "{", "org.openecomp.mso.adapters.sdncrest.SDNCServiceRequest", requestInformation0, serviceInformation0, "6`.", "{");
+      sDNCServiceRequest0.getServiceInformation();
+      assertEquals("{", sDNCServiceRequest0.getSDNCService());
+      assertEquals("{", sDNCServiceRequest0.getSDNCServiceData());
+      assertEquals("org.openecomp.mso.adapters.sdncrest.SDNCServiceRequest", sDNCServiceRequest0.getSDNCOperation());
+      assertEquals("6`.", sDNCServiceRequest0.getSDNCServiceDataType());
+  }
+
+  @Test(timeout = 4000)
+  public void test01()  throws Throwable  {
+      SDNCServiceRequest sDNCServiceRequest0 = new SDNCServiceRequest();
+      sDNCServiceRequest0.setSDNCServiceDataType("2u]\"aLx");
+      String string0 = sDNCServiceRequest0.getSDNCServiceDataType();
+      assertEquals("2u]\"aLx", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test02()  throws Throwable  {
+      SDNCServiceRequest sDNCServiceRequest0 = new SDNCServiceRequest();
+      sDNCServiceRequest0.setSDNCServiceData("}=uO{e7dUj.<");
+      String string0 = sDNCServiceRequest0.getSDNCServiceData();
+      assertEquals("}=uO{e7dUj.<", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test03()  throws Throwable  {
+      SDNCServiceRequest sDNCServiceRequest0 = new SDNCServiceRequest();
+      sDNCServiceRequest0.setSDNCServiceData("");
+      String string0 = sDNCServiceRequest0.getSDNCServiceData();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test04()  throws Throwable  {
+      RequestInformation requestInformation0 = mock(RequestInformation.class, new ViolatedAssumptionAnswer());
+      ServiceInformation serviceInformation0 = mock(ServiceInformation.class, new ViolatedAssumptionAnswer());
+      SDNCServiceRequest sDNCServiceRequest0 = new SDNCServiceRequest("STATIC", "STATIC", "", "", "STATIC", requestInformation0, serviceInformation0, "STATIC", "+VFyyH0:WXAf=Y+|K");
+      String string0 = sDNCServiceRequest0.getSDNCService();
+      assertEquals("", string0);
+      assertEquals("STATIC", sDNCServiceRequest0.getSDNCServiceDataType());
+      assertEquals("STATIC", sDNCServiceRequest0.getSDNCOperation());
+      assertEquals("+VFyyH0:WXAf=Y+|K", sDNCServiceRequest0.getSDNCServiceData());
+  }
+
+  @Test(timeout = 4000)
+  public void test05()  throws Throwable  {
+      SDNCServiceRequest sDNCServiceRequest0 = new SDNCServiceRequest();
+      String string0 = sDNCServiceRequest0.getSDNCOperation();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test06()  throws Throwable  {
+      SDNCServiceRequest sDNCServiceRequest0 = new SDNCServiceRequest();
+      sDNCServiceRequest0.setSDNCOperation("");
+      String string0 = sDNCServiceRequest0.getSDNCOperation();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test07()  throws Throwable  {
+      SDNCServiceRequest sDNCServiceRequest0 = new SDNCServiceRequest();
+      RequestInformation requestInformation0 = mock(RequestInformation.class, new ViolatedAssumptionAnswer());
+      doReturn((String) null).when(requestInformation0).toString();
+      sDNCServiceRequest0.setRequestInformation(requestInformation0);
+      RequestInformation requestInformation1 = sDNCServiceRequest0.getRequestInformation();
+      assertSame(requestInformation1, requestInformation0);
+  }
+
+  @Test(timeout = 4000)
+  public void test08()  throws Throwable  {
+      SDNCServiceRequest sDNCServiceRequest0 = new SDNCServiceRequest();
+      String string0 = sDNCServiceRequest0.getSDNCServiceDataType();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test09()  throws Throwable  {
+      SDNCServiceRequest sDNCServiceRequest0 = new SDNCServiceRequest();
+      String string0 = sDNCServiceRequest0.getSDNCService();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test10()  throws Throwable  {
+      RequestInformation requestInformation0 = mock(RequestInformation.class, new ViolatedAssumptionAnswer());
+      ServiceInformation serviceInformation0 = mock(ServiceInformation.class, new ViolatedAssumptionAnswer());
+      SDNCServiceRequest sDNCServiceRequest0 = new SDNCServiceRequest("STATIC", "STATIC", "", "", "STATIC", requestInformation0, serviceInformation0, "STATIC", "+VFyyH0:WXAf=Y+|K");
+      String string0 = sDNCServiceRequest0.getSDNCOperation();
+      assertEquals("", sDNCServiceRequest0.getSDNCService());
+      assertEquals("+VFyyH0:WXAf=Y+|K", sDNCServiceRequest0.getSDNCServiceData());
+      assertEquals("STATIC", string0);
+      assertEquals("STATIC", sDNCServiceRequest0.getSDNCServiceDataType());
+  }
+
+  @Test(timeout = 4000)
+  public void test11()  throws Throwable  {
+      SDNCServiceRequest sDNCServiceRequest0 = new SDNCServiceRequest();
+      ServiceInformation serviceInformation0 = sDNCServiceRequest0.getServiceInformation();
+      assertNull(serviceInformation0);
+  }
+
+  @Test(timeout = 4000)
+  public void test12()  throws Throwable  {
+      SDNCServiceRequest sDNCServiceRequest0 = new SDNCServiceRequest();
+      RequestInformation requestInformation0 = sDNCServiceRequest0.getRequestInformation();
+      assertNull(requestInformation0);
+  }
+
+  @Test(timeout = 4000)
+  public void test13()  throws Throwable  {
+      RequestInformation requestInformation0 = mock(RequestInformation.class, new ViolatedAssumptionAnswer());
+      ServiceInformation serviceInformation0 = mock(ServiceInformation.class, new ViolatedAssumptionAnswer());
+      SDNCServiceRequest sDNCServiceRequest0 = new SDNCServiceRequest("33M*~O'k?", "33M*~O'k?", "33M*~O'k?", "33M*~O'k?", "33M*~O'k?", requestInformation0, serviceInformation0, "33M*~O'k?", "[t[");
+      sDNCServiceRequest0.setServiceInformation((ServiceInformation) null);
+      assertEquals("33M*~O'k?", sDNCServiceRequest0.getSDNCService());
+      assertEquals("[t[", sDNCServiceRequest0.getSDNCServiceData());
+      assertEquals("33M*~O'k?", sDNCServiceRequest0.getSDNCOperation());
+      assertEquals("33M*~O'k?", sDNCServiceRequest0.getSDNCServiceDataType());
+  }
+
+  @Test(timeout = 4000)
+  public void test14()  throws Throwable  {
+      RequestInformation requestInformation0 = mock(RequestInformation.class, new ViolatedAssumptionAnswer());
+      ServiceInformation serviceInformation0 = mock(ServiceInformation.class, new ViolatedAssumptionAnswer());
+      SDNCServiceRequest sDNCServiceRequest0 = new SDNCServiceRequest("", "M6Oxa*g8~:)0BdUFX/", "org.openecomp.mso.adapters.sdncrest.SDNCServiceRequest", "M6Oxa*g8~:)0BdUFX/", "org.openecomp.mso.adapters.sdncrest.SDNCServiceRequest", requestInformation0, serviceInformation0, "", "TWqSFP>PXW");
+      String string0 = sDNCServiceRequest0.getSDNCServiceDataType();
+      assertEquals("org.openecomp.mso.adapters.sdncrest.SDNCServiceRequest", sDNCServiceRequest0.getSDNCOperation());
+      assertEquals("TWqSFP>PXW", sDNCServiceRequest0.getSDNCServiceData());
+      assertEquals("", string0);
+      assertEquals("M6Oxa*g8~:)0BdUFX/", sDNCServiceRequest0.getSDNCService());
+  }
+
+  @Test(timeout = 4000)
+  public void test15()  throws Throwable  {
+      SDNCServiceRequest sDNCServiceRequest0 = new SDNCServiceRequest();
+      String string0 = sDNCServiceRequest0.getSDNCServiceData();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test16()  throws Throwable  {
+      SDNCServiceRequest sDNCServiceRequest0 = new SDNCServiceRequest();
+      sDNCServiceRequest0.setSDNCService("-3eOw~BRI3K>O");
+      String string0 = sDNCServiceRequest0.getSDNCService();
+      assertEquals("-3eOw~BRI3K>O", string0);
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceRequestESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceRequestESTestscaffolding.java
new file mode 100644
index 0000000000..4de6c0ca7c
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceRequestESTestscaffolding.java
@@ -0,0 +1,110 @@
+/**
+ * Scaffolding file used to store all the setups needed to run
+ * tests automatically generated by EvoSuite
+ * Mon Feb 20 14:08:11 GMT 2017
+ */
+
+package org.openecomp.mso.adapters.sdncrest;
+
+import org.evosuite.runtime.annotation.EvoSuiteClassExclude;
+import org.junit.BeforeClass;
+import org.junit.Before;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.evosuite.runtime.sandbox.Sandbox;
+
+@EvoSuiteClassExclude
+public class SDNCServiceRequestESTestscaffolding {
+
+  @org.junit.Rule
+  public org.evosuite.runtime.vnet.NonFunctionalRequirementRule nfr = new org.evosuite.runtime.vnet.NonFunctionalRequirementRule();
+
+  private static final java.util.Properties defaultProperties = (java.util.Properties) java.lang.System.getProperties().clone();
+
+  private org.evosuite.runtime.thread.ThreadStopper threadStopper =  new org.evosuite.runtime.thread.ThreadStopper (org.evosuite.runtime.thread.KillSwitchHandler.getInstance(), 3000);
+
+  @BeforeClass
+  public static void initEvoSuiteFramework() {
+    org.evosuite.runtime.RuntimeSettings.className = "org.openecomp.mso.adapters.sdncrest.SDNCServiceRequest";
+    org.evosuite.runtime.GuiSupport.initialize();
+    org.evosuite.runtime.RuntimeSettings.maxNumberOfThreads = 100;
+    org.evosuite.runtime.RuntimeSettings.maxNumberOfIterationsPerLoop = 10000;
+    org.evosuite.runtime.RuntimeSettings.mockSystemIn = true;
+    org.evosuite.runtime.RuntimeSettings.sandboxMode = org.evosuite.runtime.sandbox.Sandbox.SandboxMode.RECOMMENDED;
+    org.evosuite.runtime.sandbox.Sandbox.initializeSecurityManagerForSUT();
+    org.evosuite.runtime.classhandling.JDKClassResetter.init();
+    initializeClasses();
+    org.evosuite.runtime.Runtime.getInstance().resetRuntime();
+  }
+
+  @AfterClass
+  public static void clearEvoSuiteFramework(){
+    Sandbox.resetDefaultSecurityManager();
+    java.lang.System.setProperties((java.util.Properties) defaultProperties.clone());
+  }
+
+  @Before
+  public void initTestCase(){
+    threadStopper.storeCurrentThreads();
+    threadStopper.startRecordingTime();
+    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().initHandler();
+    org.evosuite.runtime.sandbox.Sandbox.goingToExecuteSUTCode();
+    org.evosuite.runtime.GuiSupport.setHeadless();
+    org.evosuite.runtime.Runtime.getInstance().resetRuntime();
+    org.evosuite.runtime.agent.InstrumentingAgent.activate();
+  }
+
+  @After
+  public void doneWithTestCase(){
+    threadStopper.killAndJoinClientThreads();
+    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().safeExecuteAddedHooks();
+    org.evosuite.runtime.classhandling.JDKClassResetter.reset();
+    resetClasses();
+    org.evosuite.runtime.sandbox.Sandbox.doneWithExecutingSUTCode();
+    org.evosuite.runtime.agent.InstrumentingAgent.deactivate();
+    org.evosuite.runtime.GuiSupport.restoreHeadlessMode();
+  }
+
+  private static void initializeClasses() {
+    org.evosuite.runtime.classhandling.ClassStateSupport.initializeClasses(SDNCServiceRequestESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.adapters.sdncrest.ServiceInformation",
+      "org.openecomp.mso.adapters.sdncrest.SDNCRequestCommon",
+      "org.codehaus.jackson.map.annotate.JsonSerialize$Typing",
+      "org.codehaus.jackson.map.annotate.JsonSerialize$Inclusion",
+      "org.codehaus.jackson.map.JsonSerializer",
+      "org.openecomp.mso.adapters.sdncrest.SDNCServiceRequest",
+      "org.jboss.resteasy.annotations.providers.NoJackson",
+      "org.openecomp.mso.adapters.sdncrest.RequestInformation",
+      "org.codehaus.jackson.annotate.JacksonAnnotation",
+      "org.codehaus.jackson.map.annotate.NoClass",
+      "org.codehaus.jackson.map.JsonSerializer$None",
+      "org.codehaus.jackson.map.annotate.JsonSerialize",
+      "org.codehaus.jackson.map.annotate.JsonRootName"
+    );
+  }
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(SDNCServiceRequestESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "org.codehaus.jackson.map.annotate.JsonSerialize$Inclusion",
+      "org.codehaus.jackson.map.annotate.JsonSerialize$Typing",
+      "org.openecomp.mso.adapters.sdncrest.ServiceInformation",
+      "org.codehaus.jackson.map.introspect.AnnotatedClass",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector",
+      "org.codehaus.jackson.annotate.JsonAutoDetect$Visibility",
+      "org.codehaus.jackson.annotate.JsonMethod",
+      "org.codehaus.jackson.map.introspect.VisibilityChecker$Std",
+      "org.codehaus.jackson.map.ObjectMapper",
+      "org.codehaus.jackson.JsonParser$Feature",
+      "org.codehaus.jackson.JsonGenerator$Feature",
+      "org.codehaus.jackson.JsonFactory",
+      "org.codehaus.jackson.sym.CharsToNameCanonicalizer",
+      "org.codehaus.jackson.sym.BytesToNameCanonicalizer",
+      "org.codehaus.jackson.map.type.TypeFactory",
+      "org.openecomp.mso.adapters.sdncrest.RequestInformation",
+      "org.openecomp.mso.adapters.sdncrest.SDNCRequestCommon",
+      "org.openecomp.mso.adapters.sdncrest.SDNCServiceRequest"
+    );
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceResponseESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceResponseESTest.java
new file mode 100644
index 0000000000..fc05ed5b6c
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceResponseESTest.java
@@ -0,0 +1,63 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Feb 20 14:07:08 GMT 2017
+ */
+
+package org.openecomp.mso.adapters.sdncrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+import java.util.HashMap;
+import java.util.Map;
+import org.evosuite.runtime.EvoRunner;
+import org.evosuite.runtime.EvoRunnerParameters;
+import org.junit.runner.RunWith;
+
+@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true)
+public class SDNCServiceResponseESTest extends SDNCServiceResponseESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test0()  throws Throwable  {
+      SDNCServiceResponse sDNCServiceResponse0 = new SDNCServiceResponse();
+      sDNCServiceResponse0.addParam((String) null, "");
+      assertNull(sDNCServiceResponse0.getResponseMessage());
+  }
+
+  @Test(timeout = 4000)
+  public void test1()  throws Throwable  {
+      SDNCServiceResponse sDNCServiceResponse0 = new SDNCServiceResponse();
+      sDNCServiceResponse0.addParam("", "");
+      Map<String, String> map0 = sDNCServiceResponse0.getParams();
+      assertEquals(1, map0.size());
+  }
+
+  @Test(timeout = 4000)
+  public void test2()  throws Throwable  {
+      SDNCServiceResponse sDNCServiceResponse0 = new SDNCServiceResponse();
+      sDNCServiceResponse0.addParam("", "");
+      sDNCServiceResponse0.addParam("DYNAMIC", "DYNAMIC");
+      assertNull(sDNCServiceResponse0.getResponseMessage());
+  }
+
+  @Test(timeout = 4000)
+  public void test3()  throws Throwable  {
+      SDNCServiceResponse sDNCServiceResponse0 = new SDNCServiceResponse();
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      sDNCServiceResponse0.setParams(hashMap0);
+      Map<String, String> map0 = sDNCServiceResponse0.getParams();
+      assertEquals(0, map0.size());
+  }
+
+  @Test(timeout = 4000)
+  public void test4()  throws Throwable  {
+      SDNCServiceResponse sDNCServiceResponse0 = new SDNCServiceResponse("", "", "", "");
+      assertEquals("", sDNCServiceResponse0.getResponseCode());
+  }
+
+  @Test(timeout = 4000)
+  public void test5()  throws Throwable  {
+      SDNCServiceResponse sDNCServiceResponse0 = new SDNCServiceResponse();
+      Map<String, String> map0 = sDNCServiceResponse0.getParams();
+      assertNull(map0);
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceResponseESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceResponseESTestscaffolding.java
new file mode 100644
index 0000000000..243140efff
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceResponseESTestscaffolding.java
@@ -0,0 +1,246 @@
+/**
+ * Scaffolding file used to store all the setups needed to run
+ * tests automatically generated by EvoSuite
+ * Mon Feb 20 14:07:08 GMT 2017
+ */
+
+package org.openecomp.mso.adapters.sdncrest;
+
+import org.evosuite.runtime.annotation.EvoSuiteClassExclude;
+import org.junit.BeforeClass;
+import org.junit.Before;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.evosuite.runtime.sandbox.Sandbox;
+
+@EvoSuiteClassExclude
+public class SDNCServiceResponseESTestscaffolding {
+
+  @org.junit.Rule
+  public org.evosuite.runtime.vnet.NonFunctionalRequirementRule nfr = new org.evosuite.runtime.vnet.NonFunctionalRequirementRule();
+
+  private static final java.util.Properties defaultProperties = (java.util.Properties) java.lang.System.getProperties().clone();
+
+  private org.evosuite.runtime.thread.ThreadStopper threadStopper =  new org.evosuite.runtime.thread.ThreadStopper (org.evosuite.runtime.thread.KillSwitchHandler.getInstance(), 3000);
+
+  @BeforeClass
+  public static void initEvoSuiteFramework() {
+    org.evosuite.runtime.RuntimeSettings.className = "org.openecomp.mso.adapters.sdncrest.SDNCServiceResponse";
+    org.evosuite.runtime.GuiSupport.initialize();
+    org.evosuite.runtime.RuntimeSettings.maxNumberOfThreads = 100;
+    org.evosuite.runtime.RuntimeSettings.maxNumberOfIterationsPerLoop = 10000;
+    org.evosuite.runtime.RuntimeSettings.mockSystemIn = true;
+    org.evosuite.runtime.RuntimeSettings.sandboxMode = org.evosuite.runtime.sandbox.Sandbox.SandboxMode.RECOMMENDED;
+    org.evosuite.runtime.sandbox.Sandbox.initializeSecurityManagerForSUT();
+    org.evosuite.runtime.classhandling.JDKClassResetter.init();
+    initializeClasses();
+    org.evosuite.runtime.Runtime.getInstance().resetRuntime();
+  }
+
+  @AfterClass
+  public static void clearEvoSuiteFramework(){
+    Sandbox.resetDefaultSecurityManager();
+    java.lang.System.setProperties((java.util.Properties) defaultProperties.clone());
+  }
+
+  @Before
+  public void initTestCase(){
+    threadStopper.storeCurrentThreads();
+    threadStopper.startRecordingTime();
+    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().initHandler();
+    org.evosuite.runtime.sandbox.Sandbox.goingToExecuteSUTCode();
+    org.evosuite.runtime.GuiSupport.setHeadless();
+    org.evosuite.runtime.Runtime.getInstance().resetRuntime();
+    org.evosuite.runtime.agent.InstrumentingAgent.activate();
+  }
+
+  @After
+  public void doneWithTestCase(){
+    threadStopper.killAndJoinClientThreads();
+    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().safeExecuteAddedHooks();
+    org.evosuite.runtime.classhandling.JDKClassResetter.reset();
+    resetClasses();
+    org.evosuite.runtime.sandbox.Sandbox.doneWithExecutingSUTCode();
+    org.evosuite.runtime.agent.InstrumentingAgent.deactivate();
+    org.evosuite.runtime.GuiSupport.restoreHeadlessMode();
+  }
+
+  private static void initializeClasses() {
+    org.evosuite.runtime.classhandling.ClassStateSupport.initializeClasses(SDNCServiceResponseESTestscaffolding.class.getClassLoader() ,
+      "org.codehaus.jackson.map.JsonSerializableWithType",
+      "org.codehaus.jackson.map.HandlerInstantiator",
+      "org.codehaus.jackson.map.deser.StdDeserializerProvider",
+      "org.codehaus.jackson.map.SerializerFactory",
+      "org.codehaus.jackson.map.SerializerProvider",
+      "org.codehaus.jackson.map.type.TypeBindings",
+      "org.codehaus.jackson.map.SerializationConfig",
+      "org.codehaus.jackson.map.introspect.AnnotationMap",
+      "org.codehaus.jackson.JsonProcessingException",
+      "org.codehaus.jackson.map.introspect.Annotated",
+      "org.codehaus.jackson.io.InputDecorator",
+      "org.codehaus.jackson.map.Module",
+      "org.codehaus.jackson.map.util.Annotations",
+      "org.codehaus.jackson.map.type.TypeModifier",
+      "org.codehaus.jackson.sym.NameN",
+      "org.codehaus.jackson.JsonGenerator",
+      "org.codehaus.jackson.map.introspect.AnnotatedClass",
+      "org.codehaus.jackson.map.introspect.JacksonAnnotationIntrospector",
+      "org.codehaus.jackson.annotate.JsonAutoDetect$1",
+      "org.codehaus.jackson.map.JsonSerializable",
+      "org.codehaus.jackson.annotate.JsonMethod",
+      "org.codehaus.jackson.node.BaseJsonNode",
+      "org.codehaus.jackson.map.ObjectReader",
+      "org.codehaus.jackson.annotate.JsonAutoDetect$Visibility",
+      "org.codehaus.jackson.map.DeserializerProvider",
+      "org.codehaus.jackson.node.ValueNode",
+      "org.codehaus.jackson.map.JsonSerializer",
+      "org.codehaus.jackson.map.ser.BeanSerializerFactory",
+      "org.codehaus.jackson.map.introspect.AnnotatedWithParams",
+      "org.codehaus.jackson.map.AnnotationIntrospector",
+      "org.codehaus.jackson.map.MappingJsonFactory",
+      "org.codehaus.jackson.map.MapperConfig$Impl",
+      "org.codehaus.jackson.sym.Name1",
+      "org.codehaus.jackson.sym.Name2",
+      "org.codehaus.jackson.sym.Name3",
+      "org.codehaus.jackson.map.introspect.MethodFilter",
+      "org.codehaus.jackson.map.ser.StdSerializerProvider",
+      "org.codehaus.jackson.map.deser.StdDeserializationContext",
+      "org.codehaus.jackson.type.TypeReference",
+      "org.codehaus.jackson.map.ClassIntrospector",
+      "org.codehaus.jackson.map.AnnotationIntrospector$Pair",
+      "org.codehaus.jackson.map.PropertyNamingStrategy$LowerCaseWithUnderscoresStrategy",
+      "org.codehaus.jackson.map.MapperConfig$ConfigFeature",
+      "org.codehaus.jackson.map.SerializationConfig$Feature",
+      "org.codehaus.jackson.Versioned",
+      "org.codehaus.jackson.io.IOContext",
+      "org.codehaus.jackson.map.annotate.JsonSerialize$Typing",
+      "org.codehaus.jackson.map.type.TypeBase",
+      "org.codehaus.jackson.map.ser.BasicSerializerFactory",
+      "org.openecomp.mso.adapters.sdncrest.SDNCServiceResponse",
+      "org.codehaus.jackson.map.PropertyNamingStrategy",
+      "org.codehaus.jackson.node.ContainerNode",
+      "org.codehaus.jackson.map.jsontype.NamedType",
+      "org.codehaus.jackson.map.ser.FilterProvider",
+      "org.codehaus.jackson.map.introspect.AnnotatedConstructor",
+      "org.codehaus.jackson.map.DeserializationConfig",
+      "org.codehaus.jackson.sym.BytesToNameCanonicalizer",
+      "org.codehaus.jackson.map.type.TypeFactory",
+      "org.codehaus.jackson.impl.ReaderBasedParser",
+      "org.codehaus.jackson.sym.BytesToNameCanonicalizer$TableInfo",
+      "org.codehaus.jackson.JsonEncoding",
+      "org.codehaus.jackson.map.type.MapLikeType",
+      "org.codehaus.jackson.map.JsonDeserializer",
+      "org.codehaus.jackson.map.PropertyNamingStrategy$PropertyNamingStrategyBase",
+      "org.codehaus.jackson.node.ObjectNode",
+      "org.codehaus.jackson.map.ser.std.SerializerBase",
+      "org.codehaus.jackson.map.type.CollectionLikeType",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$MinimalMethodFilter",
+      "org.codehaus.jackson.map.DeserializationConfig$Feature",
+      "org.codehaus.jackson.sym.CharsToNameCanonicalizer$Bucket",
+      "org.codehaus.jackson.map.introspect.AnnotatedMethodMap",
+      "org.codehaus.jackson.impl.JsonParserMinimalBase",
+      "org.codehaus.jackson.map.type.TypeParser",
+      "org.codehaus.jackson.map.introspect.POJOPropertiesCollector",
+      "org.codehaus.jackson.JsonParseException",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$SetterMethodFilter",
+      "org.codehaus.jackson.map.introspect.VisibilityChecker",
+      "org.codehaus.jackson.map.introspect.AnnotatedField",
+      "org.codehaus.jackson.impl.JsonGeneratorBase",
+      "org.codehaus.jackson.map.ObjectMapper",
+      "org.codehaus.jackson.util.ByteArrayBuilder",
+      "org.codehaus.jackson.map.ser.impl.FailingSerializer",
+      "org.codehaus.jackson.PrettyPrinter",
+      "org.codehaus.jackson.JsonToken",
+      "org.codehaus.jackson.map.jsontype.SubtypeResolver",
+      "org.codehaus.jackson.map.type.SimpleType",
+      "org.codehaus.jackson.impl.Utf8Generator",
+      "org.codehaus.jackson.node.NumericNode",
+      "org.jboss.resteasy.annotations.providers.NoJackson",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$SetterAndGetterMethodFilter",
+      "org.codehaus.jackson.JsonNode",
+      "org.codehaus.jackson.sym.CharsToNameCanonicalizer",
+      "org.codehaus.jackson.annotate.JacksonAnnotation",
+      "org.codehaus.jackson.map.ObjectWriter",
+      "org.codehaus.jackson.schema.SchemaAware",
+      "org.codehaus.jackson.io.OutputDecorator",
+      "org.codehaus.jackson.FormatSchema",
+      "org.codehaus.jackson.format.MatchStrength",
+      "org.codehaus.jackson.ObjectCodec",
+      "org.codehaus.jackson.map.introspect.AnnotatedMethod",
+      "org.codehaus.jackson.JsonGenerationException",
+      "org.codehaus.jackson.format.InputAccessor",
+      "org.codehaus.jackson.JsonFactory",
+      "org.codehaus.jackson.node.ArrayNode",
+      "org.codehaus.jackson.util.BufferRecycler",
+      "org.codehaus.jackson.io.SegmentedStringWriter",
+      "org.codehaus.jackson.map.jsontype.TypeResolverBuilder",
+      "org.codehaus.jackson.map.type.HierarchicType",
+      "org.openecomp.mso.adapters.sdncrest.SDNCResponseCommon",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$GetterMethodFilter",
+      "org.codehaus.jackson.JsonParser$Feature",
+      "org.codehaus.jackson.map.annotate.JsonSerialize",
+      "org.codehaus.jackson.map.BeanDescription",
+      "org.codehaus.jackson.JsonParser$1",
+      "org.codehaus.jackson.impl.WriterBasedGenerator",
+      "org.codehaus.jackson.JsonGenerator$Feature",
+      "org.codehaus.jackson.sym.Name",
+      "org.codehaus.jackson.Version",
+      "org.codehaus.jackson.io.CharacterEscapes",
+      "org.codehaus.jackson.map.introspect.BasicBeanDescription",
+      "org.codehaus.jackson.schema.JsonSchema",
+      "org.codehaus.jackson.map.annotate.JsonSerialize$Inclusion",
+      "org.codehaus.jackson.util.TokenBuffer",
+      "org.codehaus.jackson.map.MappingIterator",
+      "org.codehaus.jackson.map.DeserializationContext",
+      "org.codehaus.jackson.map.ObjectMapper$DefaultTyping",
+      "org.codehaus.jackson.impl.JsonParserBase",
+      "org.codehaus.jackson.map.JsonMappingException",
+      "org.codehaus.jackson.map.introspect.AnnotatedMember",
+      "org.codehaus.jackson.node.JsonNodeFactory",
+      "org.codehaus.jackson.type.JavaType",
+      "org.codehaus.jackson.map.annotate.NoClass",
+      "org.codehaus.jackson.map.introspect.VisibilityChecker$Std",
+      "org.codehaus.jackson.annotate.JsonTypeInfo$As",
+      "org.codehaus.jackson.map.annotate.JsonRootName",
+      "org.codehaus.jackson.JsonParser",
+      "org.codehaus.jackson.node.NullNode",
+      "org.codehaus.jackson.map.InjectableValues",
+      "org.codehaus.jackson.map.jsontype.impl.StdSubtypeResolver",
+      "org.codehaus.jackson.node.TreeTraversingParser",
+      "org.codehaus.jackson.map.type.CollectionType",
+      "org.codehaus.jackson.map.MapperConfig",
+      "org.codehaus.jackson.map.Module$SetupContext",
+      "org.codehaus.jackson.map.introspect.VisibilityChecker$1",
+      "org.codehaus.jackson.io.UTF8Writer",
+      "org.codehaus.jackson.map.type.MapType",
+      "org.codehaus.jackson.map.JsonSerializer$None",
+      "org.codehaus.jackson.annotate.JsonAutoDetect",
+      "org.codehaus.jackson.map.type.ArrayType",
+      "org.codehaus.jackson.map.ClassIntrospector$MixInResolver"
+    );
+  }
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(SDNCServiceResponseESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "org.codehaus.jackson.map.annotate.JsonSerialize$Inclusion",
+      "org.codehaus.jackson.map.annotate.JsonSerialize$Typing",
+      "org.codehaus.jackson.map.introspect.AnnotatedClass",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector",
+      "org.codehaus.jackson.annotate.JsonAutoDetect$Visibility",
+      "org.codehaus.jackson.annotate.JsonMethod",
+      "org.codehaus.jackson.map.introspect.VisibilityChecker$Std",
+      "org.codehaus.jackson.map.ObjectMapper",
+      "org.codehaus.jackson.JsonParser$Feature",
+      "org.codehaus.jackson.JsonGenerator$Feature",
+      "org.codehaus.jackson.JsonFactory",
+      "org.codehaus.jackson.sym.CharsToNameCanonicalizer",
+      "org.codehaus.jackson.sym.BytesToNameCanonicalizer",
+      "org.codehaus.jackson.map.type.TypeFactory",
+      "org.openecomp.mso.adapters.sdncrest.SDNCResponseCommon",
+      "org.openecomp.mso.adapters.sdncrest.SDNCServiceResponse"
+    );
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/ServiceInformationESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/ServiceInformationESTest.java
new file mode 100644
index 0000000000..0cfe6dcd67
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/ServiceInformationESTest.java
@@ -0,0 +1,118 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Feb 20 14:09:38 GMT 2017
+ */
+
+package org.openecomp.mso.adapters.sdncrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+import org.evosuite.runtime.EvoRunner;
+import org.evosuite.runtime.EvoRunnerParameters;
+import org.junit.runner.RunWith;
+
+@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true)
+public class ServiceInformationESTest extends ServiceInformationESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test00()  throws Throwable  {
+      ServiceInformation serviceInformation0 = new ServiceInformation("J|^", ":N1Q`D JY", "org.openecomp.mso.adapters.sdncrest.ServiceInformation", ":N1Q`D JY");
+      String string0 = serviceInformation0.getSubscriberName();
+      assertEquals("org.openecomp.mso.adapters.sdncrest.ServiceInformation", string0);
+      assertEquals("J|^", serviceInformation0.getServiceType());
+      assertEquals(":N1Q`D JY", serviceInformation0.getSubscriberGlobalId());
+      assertEquals(":N1Q`D JY", serviceInformation0.getServiceInstanceId());
+  }
+
+  @Test(timeout = 4000)
+  public void test01()  throws Throwable  {
+      ServiceInformation serviceInformation0 = new ServiceInformation("", (String) null, "", "");
+      String string0 = serviceInformation0.getSubscriberName();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test02()  throws Throwable  {
+      ServiceInformation serviceInformation0 = new ServiceInformation("J|^", ":N1Q`D JY", "org.openecomp.mso.adapters.sdncrest.ServiceInformation", ":N1Q`D JY");
+      String string0 = serviceInformation0.getSubscriberGlobalId();
+      assertEquals(":N1Q`D JY", serviceInformation0.getServiceInstanceId());
+      assertEquals("org.openecomp.mso.adapters.sdncrest.ServiceInformation", serviceInformation0.getSubscriberName());
+      assertEquals("J|^", serviceInformation0.getServiceType());
+      assertEquals(":N1Q`D JY", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test03()  throws Throwable  {
+      ServiceInformation serviceInformation0 = new ServiceInformation();
+      serviceInformation0.setSubscriberGlobalId("");
+      String string0 = serviceInformation0.getSubscriberGlobalId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test04()  throws Throwable  {
+      ServiceInformation serviceInformation0 = new ServiceInformation();
+      serviceInformation0.setServiceType("org.openecomp.mso.adapters.sdncrest.ServiceInformation");
+      String string0 = serviceInformation0.getServiceType();
+      assertEquals("org.openecomp.mso.adapters.sdncrest.ServiceInformation", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test05()  throws Throwable  {
+      ServiceInformation serviceInformation0 = new ServiceInformation();
+      serviceInformation0.setServiceInstanceId("q3jc2(qb=E+3uz_L%");
+      String string0 = serviceInformation0.getServiceInstanceId();
+      assertEquals("q3jc2(qb=E+3uz_L%", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test06()  throws Throwable  {
+      ServiceInformation serviceInformation0 = new ServiceInformation();
+      serviceInformation0.setServiceInstanceId("");
+      String string0 = serviceInformation0.getServiceInstanceId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test07()  throws Throwable  {
+      ServiceInformation serviceInformation0 = new ServiceInformation();
+      String string0 = serviceInformation0.getSubscriberName();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test08()  throws Throwable  {
+      ServiceInformation serviceInformation0 = new ServiceInformation();
+      serviceInformation0.setSubscriberName((String) null);
+      assertNull(serviceInformation0.getServiceInstanceId());
+  }
+
+  @Test(timeout = 4000)
+  public void test09()  throws Throwable  {
+      ServiceInformation serviceInformation0 = new ServiceInformation();
+      String string0 = serviceInformation0.getServiceInstanceId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test10()  throws Throwable  {
+      ServiceInformation serviceInformation0 = new ServiceInformation();
+      String string0 = serviceInformation0.getSubscriberGlobalId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test11()  throws Throwable  {
+      ServiceInformation serviceInformation0 = new ServiceInformation();
+      String string0 = serviceInformation0.getServiceType();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test12()  throws Throwable  {
+      ServiceInformation serviceInformation0 = new ServiceInformation();
+      serviceInformation0.setServiceType("");
+      String string0 = serviceInformation0.getServiceType();
+      assertEquals("", string0);
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/ServiceInformationESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/ServiceInformationESTestscaffolding.java
new file mode 100644
index 0000000000..c9d31980c2
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/ServiceInformationESTestscaffolding.java
@@ -0,0 +1,81 @@
+/**
+ * Scaffolding file used to store all the setups needed to run
+ * tests automatically generated by EvoSuite
+ * Mon Feb 20 14:09:38 GMT 2017
+ */
+
+package org.openecomp.mso.adapters.sdncrest;
+
+import org.evosuite.runtime.annotation.EvoSuiteClassExclude;
+import org.junit.BeforeClass;
+import org.junit.Before;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.evosuite.runtime.sandbox.Sandbox;
+
+@EvoSuiteClassExclude
+public class ServiceInformationESTestscaffolding {
+
+  @org.junit.Rule
+  public org.evosuite.runtime.vnet.NonFunctionalRequirementRule nfr = new org.evosuite.runtime.vnet.NonFunctionalRequirementRule();
+
+  private static final java.util.Properties defaultProperties = (java.util.Properties) java.lang.System.getProperties().clone();
+
+  private org.evosuite.runtime.thread.ThreadStopper threadStopper =  new org.evosuite.runtime.thread.ThreadStopper (org.evosuite.runtime.thread.KillSwitchHandler.getInstance(), 3000);
+
+  @BeforeClass
+  public static void initEvoSuiteFramework() {
+    org.evosuite.runtime.RuntimeSettings.className = "org.openecomp.mso.adapters.sdncrest.ServiceInformation";
+    org.evosuite.runtime.GuiSupport.initialize();
+    org.evosuite.runtime.RuntimeSettings.maxNumberOfThreads = 100;
+    org.evosuite.runtime.RuntimeSettings.maxNumberOfIterationsPerLoop = 10000;
+    org.evosuite.runtime.RuntimeSettings.mockSystemIn = true;
+    org.evosuite.runtime.RuntimeSettings.sandboxMode = org.evosuite.runtime.sandbox.Sandbox.SandboxMode.RECOMMENDED;
+    org.evosuite.runtime.sandbox.Sandbox.initializeSecurityManagerForSUT();
+    org.evosuite.runtime.classhandling.JDKClassResetter.init();
+    initializeClasses();
+    org.evosuite.runtime.Runtime.getInstance().resetRuntime();
+  }
+
+  @AfterClass
+  public static void clearEvoSuiteFramework(){
+    Sandbox.resetDefaultSecurityManager();
+    java.lang.System.setProperties((java.util.Properties) defaultProperties.clone());
+  }
+
+  @Before
+  public void initTestCase(){
+    threadStopper.storeCurrentThreads();
+    threadStopper.startRecordingTime();
+    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().initHandler();
+    org.evosuite.runtime.sandbox.Sandbox.goingToExecuteSUTCode();
+    org.evosuite.runtime.GuiSupport.setHeadless();
+    org.evosuite.runtime.Runtime.getInstance().resetRuntime();
+    org.evosuite.runtime.agent.InstrumentingAgent.activate();
+  }
+
+  @After
+  public void doneWithTestCase(){
+    threadStopper.killAndJoinClientThreads();
+    org.evosuite.runtime.jvm.ShutdownHookHandler.getInstance().safeExecuteAddedHooks();
+    org.evosuite.runtime.classhandling.JDKClassResetter.reset();
+    resetClasses();
+    org.evosuite.runtime.sandbox.Sandbox.doneWithExecutingSUTCode();
+    org.evosuite.runtime.agent.InstrumentingAgent.deactivate();
+    org.evosuite.runtime.GuiSupport.restoreHeadlessMode();
+  }
+
+  private static void initializeClasses() {
+    org.evosuite.runtime.classhandling.ClassStateSupport.initializeClasses(ServiceInformationESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.adapters.sdncrest.ServiceInformation"
+    );
+  }
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(ServiceInformationESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "org.openecomp.mso.adapters.sdncrest.ServiceInformation"
+    );
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/CreateVfModuleResponseESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/CreateVfModuleResponseESTest.java
index b6719ef398..77f48a1232 100644
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/CreateVfModuleResponseESTest.java
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/CreateVfModuleResponseESTest.java
@@ -1,193 +1,127 @@
 /*
  * This file was automatically generated by EvoSuite
- * Mon Nov 14 09:29:29 GMT 2016
+ * Mon Feb 20 14:10:17 GMT 2017
  */
 
 package org.openecomp.mso.adapters.vnfrest;
 
 import org.junit.Test;
 import static org.junit.Assert.*;
-
-import org.openecomp.mso.entity.MsoRequest;
-import org.openecomp.mso.openstack.beans.VnfRollback;
-import java.util.HashMap;
 import java.util.Map;
 import org.evosuite.runtime.EvoRunner;
 import org.evosuite.runtime.EvoRunnerParameters;
 import org.junit.runner.RunWith;
+import org.openecomp.mso.adapters.vnfrest.CreateVfModuleResponse;
+import org.openecomp.mso.adapters.vnfrest.VfModuleRollback;
 
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
+@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true)
 public class CreateVfModuleResponseESTest extends CreateVfModuleResponseESTestscaffolding {
 
-  @Test(timeout = 4000)
-  public void test00()  throws Throwable  {
-      CreateVfModuleResponse createVfModuleResponse0 = new CreateVfModuleResponse();
-      createVfModuleResponse0.setVnfId("IJ@");
-      String string0 = createVfModuleResponse0.getVnfId();
-      assertEquals("IJ@", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test01()  throws Throwable  {
-      Boolean boolean0 = Boolean.TRUE;
-      HashMap<String, String> hashMap0 = new HashMap<String, String>();
-      CreateVfModuleResponse createVfModuleResponse0 = new CreateVfModuleResponse("", "", "", boolean0, (Map<String, String>) hashMap0, (VfModuleRollback) null, "");
-      String string0 = createVfModuleResponse0.getVnfId();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test02()  throws Throwable  {
-      CreateVfModuleResponse createVfModuleResponse0 = new CreateVfModuleResponse();
-      createVfModuleResponse0.setVfModuleStackId(", tenantCreated=");
-      String string0 = createVfModuleResponse0.getVfModuleStackId();
-      assertEquals(", tenantCreated=", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test03()  throws Throwable  {
-      Boolean boolean0 = new Boolean(true);
-      HashMap<String, String> hashMap0 = new HashMap<String, String>();
-      CreateVfModuleResponse createVfModuleResponse0 = new CreateVfModuleResponse("j|[9Y&=Ke", ", tenant=", "", boolean0, (Map<String, String>) hashMap0, (VfModuleRollback) null, ", tenant=");
-      String string0 = createVfModuleResponse0.getVfModuleStackId();
-      assertEquals(", tenant=", createVfModuleResponse0.getVfModuleId());
-      assertEquals("", string0);
-      assertEquals("j|[9Y&=Ke", createVfModuleResponse0.getVnfId());
-  }
-
-  @Test(timeout = 4000)
-  public void test04()  throws Throwable  {
-      Boolean boolean0 = new Boolean("");
-      VfModuleRollback vfModuleRollback0 = new VfModuleRollback();
-      CreateVfModuleResponse createVfModuleResponse0 = new CreateVfModuleResponse("Dz?II3`92;Y(@b$'\"", "Dz?II3`92;Y(@b$'\"", "", boolean0, (Map<String, String>) null, vfModuleRollback0, "Dz?II3`92;Y(@b$'\"");
-      createVfModuleResponse0.getVfModuleOutputs();
-      assertEquals("", createVfModuleResponse0.getVfModuleStackId());
-      assertEquals("Dz?II3`92;Y(@b$'\"", createVfModuleResponse0.getVfModuleId());
-      assertEquals("Dz?II3`92;Y(@b$'\"", createVfModuleResponse0.getVnfId());
-  }
-
-  @Test(timeout = 4000)
-  public void test05()  throws Throwable  {
-      CreateVfModuleResponse createVfModuleResponse0 = new CreateVfModuleResponse();
-      HashMap<String, String> hashMap0 = new HashMap<String, String>();
-      hashMap0.put("01.rc\"}EZ", "01.rc\"}EZ");
-      createVfModuleResponse0.setVfModuleOutputs(hashMap0);
-      Map<String, String> map0 = createVfModuleResponse0.getVfModuleOutputs();
-      assertFalse(map0.isEmpty());
-  }
-
-  @Test(timeout = 4000)
-  public void test06()  throws Throwable  {
-      Boolean boolean0 = new Boolean(true);
-      HashMap<String, String> hashMap0 = new HashMap<String, String>();
-      CreateVfModuleResponse createVfModuleResponse0 = new CreateVfModuleResponse("j|[9Y&=Ke", ", tenant=", "", boolean0, (Map<String, String>) hashMap0, (VfModuleRollback) null, ", tenant=");
-      String string0 = createVfModuleResponse0.getVfModuleId();
-      assertEquals("", createVfModuleResponse0.getVfModuleStackId());
-      assertEquals(", tenant=", string0);
-      assertEquals("j|[9Y&=Ke", createVfModuleResponse0.getVnfId());
-  }
-
-  @Test(timeout = 4000)
-  public void test07()  throws Throwable  {
-      Boolean boolean0 = Boolean.TRUE;
-      HashMap<String, String> hashMap0 = new HashMap<String, String>();
-      CreateVfModuleResponse createVfModuleResponse0 = new CreateVfModuleResponse("", "", "", boolean0, (Map<String, String>) hashMap0, (VfModuleRollback) null, "");
-      String string0 = createVfModuleResponse0.getVfModuleId();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test08()  throws Throwable  {
-      CreateVfModuleResponse createVfModuleResponse0 = new CreateVfModuleResponse();
-      Boolean boolean0 = createVfModuleResponse0.getVfModuleCreated();
-      assertNull(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test09()  throws Throwable  {
-      Boolean boolean0 = new Boolean(true);
-      CreateVfModuleResponse createVfModuleResponse0 = new CreateVfModuleResponse();
-      Map<String, String> map0 = createVfModuleResponse0.getVfModuleOutputs();
-      MsoRequest msoRequest0 = new MsoRequest("a", "");
-      VnfRollback vnfRollback0 = new VnfRollback("a", "", (String) null, true, false, msoRequest0, "", (String) null, "a");
-      VfModuleRollback vfModuleRollback0 = new VfModuleRollback(vnfRollback0, "a", "", "W[dY");
-      CreateVfModuleResponse createVfModuleResponse1 = new CreateVfModuleResponse("a", "", "", boolean0, (Map<String, String>) map0, vfModuleRollback0, "Q");
-      createVfModuleResponse1.getVfModuleCreated();
-      assertEquals("", createVfModuleResponse1.getVfModuleStackId());
-      assertEquals("", createVfModuleResponse1.getVfModuleId());
-      assertEquals("a", createVfModuleResponse1.getVnfId());
-  }
-
-  @Test(timeout = 4000)
-  public void test10()  throws Throwable  {
-      CreateVfModuleResponse createVfModuleResponse0 = new CreateVfModuleResponse();
-      createVfModuleResponse0.setRollback((VfModuleRollback) null);
-      VfModuleRollback vfModuleRollback0 = createVfModuleResponse0.getRollback();
-      assertNull(vfModuleRollback0);
-  }
-
-  @Test(timeout = 4000)
-  public void test11()  throws Throwable  {
-      Boolean boolean0 = Boolean.FALSE;
-      MsoRequest msoRequest0 = new MsoRequest();
-      VfModuleRollback vfModuleRollback0 = new VfModuleRollback("", "", "GC", true, "", "", msoRequest0, "");
-      CreateVfModuleResponse createVfModuleResponse0 = new CreateVfModuleResponse("", "", "", boolean0, (Map<String, String>) null, vfModuleRollback0, "xoOjQ;h*'Qx&0ys4");
-      createVfModuleResponse0.getRollback();
-      assertEquals("", createVfModuleResponse0.getVnfId());
-      assertEquals("", createVfModuleResponse0.getVfModuleStackId());
-      assertEquals("", createVfModuleResponse0.getVfModuleId());
-  }
-
-  @Test(timeout = 4000)
-  public void test12()  throws Throwable  {
-      Boolean boolean0 = new Boolean("");
-      VfModuleRollback vfModuleRollback0 = new VfModuleRollback();
-      CreateVfModuleResponse createVfModuleResponse0 = new CreateVfModuleResponse("Dz?II3`92;Y(@b$'\"", "Dz?II3`92;Y(@b$'\"", "", boolean0, (Map<String, String>) null, vfModuleRollback0, "Dz?II3`92;Y(@b$'\"");
-      createVfModuleResponse0.getVfModuleCreated();
-      assertEquals("Dz?II3`92;Y(@b$'\"", createVfModuleResponse0.getVfModuleId());
-      assertEquals("", createVfModuleResponse0.getVfModuleStackId());
-      assertEquals("Dz?II3`92;Y(@b$'\"", createVfModuleResponse0.getVnfId());
-  }
-
-  @Test(timeout = 4000)
-  public void test13()  throws Throwable  {
-      CreateVfModuleResponse createVfModuleResponse0 = new CreateVfModuleResponse();
-      String string0 = createVfModuleResponse0.getVnfId();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test14()  throws Throwable  {
-      CreateVfModuleResponse createVfModuleResponse0 = new CreateVfModuleResponse();
-      String string0 = createVfModuleResponse0.getVfModuleId();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test15()  throws Throwable  {
-      CreateVfModuleResponse createVfModuleResponse0 = new CreateVfModuleResponse();
-      VfModuleRollback vfModuleRollback0 = createVfModuleResponse0.getRollback();
-      assertNull(vfModuleRollback0.getCloudSiteId());
-  }
-
-  @Test(timeout = 4000)
-  public void test16()  throws Throwable  {
-      CreateVfModuleResponse createVfModuleResponse0 = new CreateVfModuleResponse();
-      String string0 = createVfModuleResponse0.getVfModuleStackId();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test17()  throws Throwable  {
-      CreateVfModuleResponse createVfModuleResponse0 = new CreateVfModuleResponse();
-      createVfModuleResponse0.setVfModuleCreated((Boolean) null);
-      assertNull(createVfModuleResponse0.getVfModuleStackId());
-  }
-
-  @Test(timeout = 4000)
-  public void test18()  throws Throwable  {
-      CreateVfModuleResponse createVfModuleResponse0 = new CreateVfModuleResponse();
-      createVfModuleResponse0.setVfModuleId((String) null);
-      assertNull(createVfModuleResponse0.getVnfId());
-  }
+    @Test(timeout = 4000)
+    public void test00()  throws Throwable  {
+        CreateVfModuleResponse createVfModuleResponse0 = new CreateVfModuleResponse();
+        createVfModuleResponse0.setVnfId("");
+        String string0 = createVfModuleResponse0.getVnfId();
+        assertEquals("", string0);
+    }
+
+    @Test(timeout = 4000)
+    public void test01()  throws Throwable  {
+        CreateVfModuleResponse createVfModuleResponse0 = new CreateVfModuleResponse();
+        createVfModuleResponse0.setVfModuleStackId("}V=E6z^$czD");
+        String string0 = createVfModuleResponse0.getVfModuleStackId();
+        assertEquals("}V=E6z^$czD", string0);
+    }
+
+    @Test(timeout = 4000)
+    public void test02()  throws Throwable  {
+        CreateVfModuleResponse createVfModuleResponse0 = new CreateVfModuleResponse();
+        createVfModuleResponse0.setVfModuleOutputs((Map<String, String>) null);
+        Map<String, String> map0 = createVfModuleResponse0.getVfModuleOutputs();
+        assertNull(map0);
+    }
+
+    @Test(timeout = 4000)
+    public void test03()  throws Throwable  {
+        CreateVfModuleResponse createVfModuleResponse0 = new CreateVfModuleResponse();
+        createVfModuleResponse0.setVfModuleId("Zc%GM]/E*oKC:3T=N_");
+        String string0 = createVfModuleResponse0.getVfModuleId();
+        assertEquals("Zc%GM]/E*oKC:3T=N_", string0);
+    }
+
+    @Test(timeout = 4000)
+    public void test04()  throws Throwable  {
+        CreateVfModuleResponse createVfModuleResponse0 = new CreateVfModuleResponse();
+        Boolean boolean0 = createVfModuleResponse0.getVfModuleCreated();
+        assertNull(boolean0);
+    }
+
+    @Test(timeout = 4000)
+    public void test05()  throws Throwable  {
+        CreateVfModuleResponse createVfModuleResponse0 = new CreateVfModuleResponse();
+        String string0 = createVfModuleResponse0.getVnfId();
+        assertNull(string0);
+    }
+
+    @Test(timeout = 4000)
+    public void test06()  throws Throwable  {
+        CreateVfModuleResponse createVfModuleResponse0 = new CreateVfModuleResponse();
+        Map<String, String> map0 = createVfModuleResponse0.getVfModuleOutputs();
+        CreateVfModuleResponse createVfModuleResponse1 = new CreateVfModuleResponse((String) null, (String) null, (String) null, (Boolean) null, map0, (VfModuleRollback) null, "g[03BX;$B");
+        VfModuleRollback vfModuleRollback0 = createVfModuleResponse1.getRollback();
+        assertNull(vfModuleRollback0);
+    }
+
+    @Test(timeout = 4000)
+    public void test07()  throws Throwable  {
+        CreateVfModuleResponse createVfModuleResponse0 = new CreateVfModuleResponse();
+        String string0 = createVfModuleResponse0.getVfModuleStackId();
+        assertNull(string0);
+    }
+
+    @Test(timeout = 4000)
+    public void test08()  throws Throwable  {
+        CreateVfModuleResponse createVfModuleResponse0 = new CreateVfModuleResponse();
+        VfModuleRollback vfModuleRollback0 = createVfModuleResponse0.getRollback();
+        createVfModuleResponse0.setRollback(vfModuleRollback0);
+        assertNull(vfModuleRollback0.getVnfId());
+    }
+
+    @Test(timeout = 4000)
+    public void test09()  throws Throwable  {
+        CreateVfModuleResponse createVfModuleResponse0 = new CreateVfModuleResponse();
+        createVfModuleResponse0.setVnfId("z");
+        String string0 = createVfModuleResponse0.getVnfId();
+        assertEquals("z", string0);
+    }
+
+    @Test(timeout = 4000)
+    public void test10()  throws Throwable  {
+        CreateVfModuleResponse createVfModuleResponse0 = new CreateVfModuleResponse();
+        createVfModuleResponse0.setVfModuleStackId("");
+        String string0 = createVfModuleResponse0.getVfModuleStackId();
+        assertEquals("", string0);
+    }
+
+    @Test(timeout = 4000)
+    public void test11()  throws Throwable  {
+        CreateVfModuleResponse createVfModuleResponse0 = new CreateVfModuleResponse();
+        createVfModuleResponse0.setVfModuleId("");
+        String string0 = createVfModuleResponse0.getVfModuleId();
+        assertEquals("", string0);
+    }
+
+    @Test(timeout = 4000)
+    public void test12()  throws Throwable  {
+        CreateVfModuleResponse createVfModuleResponse0 = new CreateVfModuleResponse();
+        String string0 = createVfModuleResponse0.getVfModuleId();
+        assertNull(string0);
+    }
+
+    @Test(timeout = 4000)
+    public void test13()  throws Throwable  {
+        CreateVfModuleResponse createVfModuleResponse0 = new CreateVfModuleResponse();
+        createVfModuleResponse0.setVfModuleCreated((Boolean) null);
+        assertNull(createVfModuleResponse0.getVnfId());
+    }
 }
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/DeleteVfModuleResponseESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/DeleteVfModuleResponseESTest.java
index e141f4b4e1..e11a30e336 100644
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/DeleteVfModuleResponseESTest.java
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/DeleteVfModuleResponseESTest.java
@@ -1,112 +1,100 @@
 /*
  * This file was automatically generated by EvoSuite
- * Mon Nov 14 09:11:34 GMT 2016
+ * Mon Feb 20 14:09:17 GMT 2017
  */
 
 package org.openecomp.mso.adapters.vnfrest;
 
 import org.junit.Test;
 import static org.junit.Assert.*;
-
+import java.util.Map;
 import org.evosuite.runtime.EvoRunner;
 import org.evosuite.runtime.EvoRunnerParameters;
 import org.junit.runner.RunWith;
+import org.openecomp.mso.adapters.vnfrest.DeleteVfModuleResponse;
 
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
+@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true)
 public class DeleteVfModuleResponseESTest extends DeleteVfModuleResponseESTestscaffolding {
 
-  @Test(timeout = 4000)
-  public void test00()  throws Throwable  {
-      DeleteVfModuleResponse deleteVfModuleResponse0 = new DeleteVfModuleResponse();
-      String string0 = deleteVfModuleResponse0.getVnfId();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test01()  throws Throwable  {
-      Boolean boolean0 = new Boolean(true);
-      DeleteVfModuleResponse deleteVfModuleResponse0 = new DeleteVfModuleResponse("", "", boolean0, "");
-      String string0 = deleteVfModuleResponse0.getVnfId();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test02()  throws Throwable  {
-      DeleteVfModuleResponse deleteVfModuleResponse0 = new DeleteVfModuleResponse();
-      String string0 = deleteVfModuleResponse0.getVfModuleId();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test03()  throws Throwable  {
-      Boolean boolean0 = Boolean.valueOf("");
-      DeleteVfModuleResponse deleteVfModuleResponse0 = new DeleteVfModuleResponse("", "", boolean0, "");
-      String string0 = deleteVfModuleResponse0.getVfModuleId();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test04()  throws Throwable  {
-      DeleteVfModuleResponse deleteVfModuleResponse0 = new DeleteVfModuleResponse();
-      Boolean boolean0 = deleteVfModuleResponse0.getVfModuleDeleted();
-      assertNull(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test05()  throws Throwable  {
-      Boolean boolean0 = Boolean.valueOf("");
-      DeleteVfModuleResponse deleteVfModuleResponse0 = new DeleteVfModuleResponse("", "", boolean0, "");
-      Boolean boolean1 = deleteVfModuleResponse0.getVfModuleDeleted();
-      assertFalse(boolean1);
-  }
-
-  @Test(timeout = 4000)
-  public void test06()  throws Throwable  {
-      Boolean boolean0 = Boolean.valueOf(true);
-      DeleteVfModuleResponse deleteVfModuleResponse0 = new DeleteVfModuleResponse("0ID1Ty#VhJ)'G`m%:", "ZtG4nF]b8,X8", boolean0, "V)B9%\"dq&%l{_Ou@");
-      String string0 = deleteVfModuleResponse0.getVfModuleId();
-      assertEquals("ZtG4nF]b8,X8", string0);
-      assertEquals("0ID1Ty#VhJ)'G`m%:", deleteVfModuleResponse0.getVnfId());
-  }
-
-  @Test(timeout = 4000)
-  public void test07()  throws Throwable  {
-      DeleteVfModuleResponse deleteVfModuleResponse0 = new DeleteVfModuleResponse();
-      Boolean boolean0 = Boolean.valueOf("");
-      deleteVfModuleResponse0.setVfModuleDeleted(boolean0);
-      assertNull(deleteVfModuleResponse0.getVfModuleId());
-  }
-
-  @Test(timeout = 4000)
-  public void test08()  throws Throwable  {
-      DeleteVfModuleResponse deleteVfModuleResponse0 = new DeleteVfModuleResponse();
-      deleteVfModuleResponse0.setVfModuleId("D:`0Q");
-      assertNull(deleteVfModuleResponse0.getMessageId());
-  }
-
-  @Test(timeout = 4000)
-  public void test09()  throws Throwable  {
-      Boolean boolean0 = Boolean.FALSE;
-      DeleteVfModuleResponse deleteVfModuleResponse0 = new DeleteVfModuleResponse("%cklg~Aa", "h*U[;Rpm9k o5[<", boolean0, "%cklg~Aa");
-      String string0 = deleteVfModuleResponse0.getVnfId();
-      assertEquals("h*U[;Rpm9k o5[<", deleteVfModuleResponse0.getVfModuleId());
-      assertEquals("%cklg~Aa", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test10()  throws Throwable  {
-      Boolean boolean0 = Boolean.valueOf(true);
-      DeleteVfModuleResponse deleteVfModuleResponse0 = new DeleteVfModuleResponse("0ID1Ty#VhJ)'G`m%:", "ZtG4nF]b8,X8", boolean0, "V)B9%\"dq&%l{_Ou@");
-      deleteVfModuleResponse0.getVfModuleDeleted();
-      assertEquals("ZtG4nF]b8,X8", deleteVfModuleResponse0.getVfModuleId());
-      assertEquals("0ID1Ty#VhJ)'G`m%:", deleteVfModuleResponse0.getVnfId());
-  }
-
-  @Test(timeout = 4000)
-  public void test11()  throws Throwable  {
-      Boolean boolean0 = Boolean.valueOf("");
-      DeleteVfModuleResponse deleteVfModuleResponse0 = new DeleteVfModuleResponse("", "", boolean0, "");
-      deleteVfModuleResponse0.setVnfId("");
-      assertEquals("", deleteVfModuleResponse0.getVnfId());
-  }
+    @Test(timeout = 4000)
+    public void test00()  throws Throwable  {
+        DeleteVfModuleResponse deleteVfModuleResponse0 = new DeleteVfModuleResponse();
+        deleteVfModuleResponse0.setVnfId("|Hny");
+        String string0 = deleteVfModuleResponse0.getVnfId();
+        assertEquals("|Hny", string0);
+    }
+
+    @Test(timeout = 4000)
+    public void test01()  throws Throwable  {
+        DeleteVfModuleResponse deleteVfModuleResponse0 = new DeleteVfModuleResponse();
+        deleteVfModuleResponse0.setVnfId("");
+        String string0 = deleteVfModuleResponse0.getVnfId();
+        assertEquals("", string0);
+    }
+
+    @Test(timeout = 4000)
+    public void test02()  throws Throwable  {
+        DeleteVfModuleResponse deleteVfModuleResponse0 = new DeleteVfModuleResponse();
+        deleteVfModuleResponse0.setVfModuleOutputs((Map<String, String>) null);
+        Map<String, String> map0 = deleteVfModuleResponse0.getVfModuleOutputs();
+        assertNull(map0);
+    }
+
+    @Test(timeout = 4000)
+    public void test03()  throws Throwable  {
+        DeleteVfModuleResponse deleteVfModuleResponse0 = new DeleteVfModuleResponse();
+        deleteVfModuleResponse0.setVfModuleId("z");
+        String string0 = deleteVfModuleResponse0.getVfModuleId();
+        assertEquals("z", string0);
+    }
+
+    @Test(timeout = 4000)
+    public void test04()  throws Throwable  {
+        DeleteVfModuleResponse deleteVfModuleResponse0 = new DeleteVfModuleResponse();
+        String string0 = deleteVfModuleResponse0.getVnfId();
+        assertNull(string0);
+    }
+
+    @Test(timeout = 4000)
+    public void test05()  throws Throwable  {
+        DeleteVfModuleResponse deleteVfModuleResponse0 = new DeleteVfModuleResponse();
+        Boolean boolean0 = deleteVfModuleResponse0.getVfModuleDeleted();
+        assertNull(boolean0);
+    }
+
+    @Test(timeout = 4000)
+    public void test06()  throws Throwable  {
+        DeleteVfModuleResponse deleteVfModuleResponse0 = new DeleteVfModuleResponse();
+        Map<String, String> map0 = deleteVfModuleResponse0.getVfModuleOutputs();
+        deleteVfModuleResponse0.setVfModuleOutputs(map0);
+        assertNull(deleteVfModuleResponse0.getVnfId());
+    }
+
+    @Test(timeout = 4000)
+    public void test07()  throws Throwable  {
+        DeleteVfModuleResponse deleteVfModuleResponse0 = new DeleteVfModuleResponse();
+        String string0 = deleteVfModuleResponse0.getVfModuleId();
+        assertNull(string0);
+    }
+
+    @Test(timeout = 4000)
+    public void test08()  throws Throwable  {
+        DeleteVfModuleResponse deleteVfModuleResponse0 = new DeleteVfModuleResponse("as~HC[>z,.,Z :hLu", "as~HC[>z,.,Z :hLu", (Boolean) null, "as~HC[>z,.,Z :hLu", (Map<String, String>) null);
+        assertEquals("as~HC[>z,.,Z :hLu", deleteVfModuleResponse0.getVnfId());
+    }
+
+    @Test(timeout = 4000)
+    public void test09()  throws Throwable  {
+        DeleteVfModuleResponse deleteVfModuleResponse0 = new DeleteVfModuleResponse();
+        deleteVfModuleResponse0.setVfModuleDeleted((Boolean) null);
+        assertNull(deleteVfModuleResponse0.getMessageId());
+    }
+
+    @Test(timeout = 4000)
+    public void test10()  throws Throwable  {
+        DeleteVfModuleResponse deleteVfModuleResponse0 = new DeleteVfModuleResponse();
+        deleteVfModuleResponse0.setVfModuleId("");
+        String string0 = deleteVfModuleResponse0.getVfModuleId();
+        assertEquals("", string0);
+    }
 }
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/RollbackVfModuleRequestESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/RollbackVfModuleRequestESTest.java
index 326205981a..919475eb5d 100644
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/RollbackVfModuleRequestESTest.java
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/RollbackVfModuleRequestESTest.java
@@ -1,48 +1,32 @@
 /*
  * This file was automatically generated by EvoSuite
- * Mon Nov 14 09:14:23 GMT 2016
+ * Mon Feb 20 14:11:28 GMT 2017
  */
 
 package org.openecomp.mso.adapters.vnfrest;
 
 import org.junit.Test;
 import static org.junit.Assert.*;
-
-import org.openecomp.mso.entity.MsoRequest;
-import org.openecomp.mso.openstack.beans.VnfRollback;
 import org.evosuite.runtime.EvoRunner;
 import org.evosuite.runtime.EvoRunnerParameters;
 import org.junit.runner.RunWith;
+import org.openecomp.mso.adapters.vnfrest.RollbackVfModuleRequest;
+import org.openecomp.mso.adapters.vnfrest.VfModuleRollback;
 
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
+@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true)
 public class RollbackVfModuleRequestESTest extends RollbackVfModuleRequestESTestscaffolding {
 
-  @Test(timeout = 4000)
-  public void test0()  throws Throwable  {
-      RollbackVfModuleRequest rollbackVfModuleRequest0 = new RollbackVfModuleRequest();
-      MsoRequest msoRequest0 = new MsoRequest();
-      VnfRollback vnfRollback0 = new VnfRollback("iL", "cG!", "", true, true, msoRequest0, "cG!", "", (String) null);
-      VfModuleRollback vfModuleRollback0 = new VfModuleRollback(vnfRollback0, "", "", (String) null);
-      rollbackVfModuleRequest0.setVfModuleRollback(vfModuleRollback0);
-      VfModuleRollback vfModuleRollback1 = rollbackVfModuleRequest0.getVfModuleRollback();
-      assertEquals("", vfModuleRollback1.getVfModuleStackId());
-  }
-
-  @Test(timeout = 4000)
-  public void test1()  throws Throwable  {
-      RollbackVfModuleRequest rollbackVfModuleRequest0 = new RollbackVfModuleRequest();
-      MsoRequest msoRequest0 = new MsoRequest("MJ|D", "MJ|D");
-      VnfRollback vnfRollback0 = new VnfRollback("jaxb.formatted.output", "jaxb.formatted.output", "jaxb.formatted.output", false, false, msoRequest0, "", "", "");
-      VfModuleRollback vfModuleRollback0 = new VfModuleRollback(vnfRollback0, (String) null, "jaxb.formatted.output", "jaxb.formatted.output");
-      rollbackVfModuleRequest0.setVfModuleRollback(vfModuleRollback0);
-      VfModuleRollback vfModuleRollback1 = rollbackVfModuleRequest0.getVfModuleRollback();
-      assertEquals("jaxb.formatted.output", vfModuleRollback1.getTenantId());
-  }
+    @Test(timeout = 4000)
+    public void test0()  throws Throwable  {
+        RollbackVfModuleRequest rollbackVfModuleRequest0 = new RollbackVfModuleRequest();
+        VfModuleRollback vfModuleRollback0 = rollbackVfModuleRequest0.getVfModuleRollback();
+        assertNull(vfModuleRollback0);
+    }
 
-  @Test(timeout = 4000)
-  public void test2()  throws Throwable  {
-      RollbackVfModuleRequest rollbackVfModuleRequest0 = new RollbackVfModuleRequest();
-      VfModuleRollback vfModuleRollback0 = rollbackVfModuleRequest0.getVfModuleRollback();
-      assertNull(vfModuleRollback0);
-  }
+    @Test(timeout = 4000)
+    public void test1()  throws Throwable  {
+        RollbackVfModuleRequest rollbackVfModuleRequest0 = new RollbackVfModuleRequest();
+        rollbackVfModuleRequest0.setVfModuleRollback((VfModuleRollback) null);
+        assertTrue(rollbackVfModuleRequest0.isSynchronous());
+    }
 }
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/VfModuleRollbackESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/VfModuleRollbackESTest.java
index 1ba09e124f..470fff5981 100644
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/VfModuleRollbackESTest.java
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/VfModuleRollbackESTest.java
@@ -1,6 +1,6 @@
 /*
  * This file was automatically generated by EvoSuite
- * Mon Nov 14 09:20:21 GMT 2016
+ * Mon Feb 20 14:10:44 GMT 2017
  */
 
 package org.openecomp.mso.adapters.vnfrest;
@@ -8,239 +8,252 @@ package org.openecomp.mso.adapters.vnfrest;
 import org.junit.Test;
 import static org.junit.Assert.*;
 import static org.evosuite.shaded.org.mockito.Mockito.*;
+import static org.evosuite.runtime.MockitoExtension.*;
 import static org.evosuite.runtime.EvoAssertions.*;
-
-import org.openecomp.mso.entity.MsoRequest;
-import org.openecomp.mso.openstack.beans.VnfRollback;
 import org.evosuite.runtime.EvoRunner;
 import org.evosuite.runtime.EvoRunnerParameters;
 import org.evosuite.runtime.ViolatedAssumptionAnswer;
 import org.junit.runner.RunWith;
+import org.openecomp.mso.adapters.vnfrest.VfModuleRollback;
+import org.openecomp.mso.entity.MsoRequest;
+import org.openecomp.mso.openstack.beans.VnfRollback;
 
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
+@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true)
 public class VfModuleRollbackESTest extends VfModuleRollbackESTestscaffolding {
 
-  @Test(timeout = 4000)
-  public void test00()  throws Throwable  {
-      VfModuleRollback vfModuleRollback0 = new VfModuleRollback();
-      boolean boolean0 = vfModuleRollback0.isVfModuleCreated();
-      assertFalse(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test01()  throws Throwable  {
-      MsoRequest msoRequest0 = mock(MsoRequest.class, new ViolatedAssumptionAnswer());
-      VfModuleRollback vfModuleRollback0 = new VfModuleRollback("", (String) null, "", false, "", "", msoRequest0, "");
-      String string0 = vfModuleRollback0.getVnfId();
-      assertNotNull(string0);
-      assertFalse(vfModuleRollback0.isVfModuleCreated());
-  }
-
-  @Test(timeout = 4000)
-  public void test02()  throws Throwable  {
-      VfModuleRollback vfModuleRollback0 = new VfModuleRollback();
-      vfModuleRollback0.setVfModuleStackId("ORmnn<.2+zb!'teC5");
-      vfModuleRollback0.getVfModuleStackId();
-      assertFalse(vfModuleRollback0.isVfModuleCreated());
-  }
-
-  @Test(timeout = 4000)
-  public void test03()  throws Throwable  {
-      MsoRequest msoRequest0 = mock(MsoRequest.class, new ViolatedAssumptionAnswer());
-      VfModuleRollback vfModuleRollback0 = new VfModuleRollback("", (String) null, "", false, "", "", msoRequest0, "");
-      String string0 = vfModuleRollback0.getVfModuleStackId();
-      assertFalse(vfModuleRollback0.isVfModuleCreated());
-      assertNotNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test04()  throws Throwable  {
-      VnfRollback vnfRollback0 = new VnfRollback();
-      VfModuleRollback vfModuleRollback0 = new VfModuleRollback(vnfRollback0, "", "", "");
-      String string0 = vfModuleRollback0.getVfModuleId();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test05()  throws Throwable  {
-      VfModuleRollback vfModuleRollback0 = new VfModuleRollback();
-      vfModuleRollback0.setTenantId("ORmnn<.2+zb!'teC5");
-      vfModuleRollback0.getTenantId();
-      assertFalse(vfModuleRollback0.isVfModuleCreated());
-  }
-
-  @Test(timeout = 4000)
-  public void test06()  throws Throwable  {
-      VfModuleRollback vfModuleRollback0 = new VfModuleRollback();
-      vfModuleRollback0.setTenantId("");
-      vfModuleRollback0.getTenantId();
-      assertFalse(vfModuleRollback0.isVfModuleCreated());
-  }
-
-  @Test(timeout = 4000)
-  public void test07()  throws Throwable  {
-      VfModuleRollback vfModuleRollback0 = new VfModuleRollback();
-      vfModuleRollback0.getMsoRequest();
-      assertFalse(vfModuleRollback0.isVfModuleCreated());
-  }
-
-  @Test(timeout = 4000)
-  public void test08()  throws Throwable  {
-      VfModuleRollback vfModuleRollback0 = new VfModuleRollback();
-      vfModuleRollback0.getMessageId();
-      assertFalse(vfModuleRollback0.isVfModuleCreated());
-  }
-
-  @Test(timeout = 4000)
-  public void test09()  throws Throwable  {
-      VnfRollback vnfRollback0 = new VnfRollback();
-      VfModuleRollback vfModuleRollback0 = new VfModuleRollback(vnfRollback0, "", "", "");
-      String string0 = vfModuleRollback0.getMessageId();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test10()  throws Throwable  {
-      VfModuleRollback vfModuleRollback0 = new VfModuleRollback();
-      vfModuleRollback0.setCloudSiteId("yIF#jVMha");
-      vfModuleRollback0.getCloudSiteId();
-      assertFalse(vfModuleRollback0.isVfModuleCreated());
-  }
-
-  @Test(timeout = 4000)
-  public void test11()  throws Throwable  {
-      VfModuleRollback vfModuleRollback0 = new VfModuleRollback("^4s-K=q)*Tb/", "XG?<}b?*4B", "XG?<}b?*4B", false, "", "", (MsoRequest) null, (String) null);
-      String string0 = vfModuleRollback0.getCloudSiteId();
-      assertEquals("", string0);
-      assertEquals("XG?<}b?*4B", vfModuleRollback0.getVfModuleId());
-      assertEquals("", vfModuleRollback0.getTenantId());
-      assertNotNull(string0);
-      assertEquals("^4s-K=q)*Tb/", vfModuleRollback0.getVnfId());
-      assertEquals("XG?<}b?*4B", vfModuleRollback0.getVfModuleStackId());
-      assertFalse(vfModuleRollback0.isVfModuleCreated());
-  }
-
-  @Test(timeout = 4000)
-  public void test12()  throws Throwable  {
-      VfModuleRollback vfModuleRollback0 = null;
-      try {
-        vfModuleRollback0 = new VfModuleRollback((VnfRollback) null, ", tenantCreated=", ", tenantCreated=", ", tenantCreated=");
-        fail("Expecting exception: NullPointerException");
-      
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.adapters.vnfrest.VfModuleRollback", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test13()  throws Throwable  {
-      MsoRequest msoRequest0 = new MsoRequest();
-      VnfRollback vnfRollback0 = new VnfRollback("", ", requestType = ", "", true, true, msoRequest0, " .~y_qT", "", "");
-      VfModuleRollback vfModuleRollback0 = new VfModuleRollback(vnfRollback0, (String) null, (String) null, "TgLE(4jqRR&B*tjC*6");
-      boolean boolean0 = vfModuleRollback0.isVfModuleCreated();
-      assertTrue(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test14()  throws Throwable  {
-      VfModuleRollback vfModuleRollback0 = new VfModuleRollback();
-      vfModuleRollback0.getVnfId();
-      assertFalse(vfModuleRollback0.isVfModuleCreated());
-  }
-
-  @Test(timeout = 4000)
-  public void test15()  throws Throwable  {
-      VfModuleRollback vfModuleRollback0 = new VfModuleRollback();
-      vfModuleRollback0.getCloudSiteId();
-      assertFalse(vfModuleRollback0.isVfModuleCreated());
-  }
-
-  @Test(timeout = 4000)
-  public void test16()  throws Throwable  {
-      MsoRequest msoRequest0 = new MsoRequest();
-      VnfRollback vnfRollback0 = new VnfRollback("", ", requestType = ", "", true, true, msoRequest0, " .~y_qT", "", "");
-      VfModuleRollback vfModuleRollback0 = new VfModuleRollback(vnfRollback0, (String) null, (String) null, "TgLE(4jqRR&B*tjC*6");
-      MsoRequest msoRequest1 = vfModuleRollback0.getMsoRequest();
-      assertNull(msoRequest1.getRequestId());
-  }
-
-  @Test(timeout = 4000)
-  public void test17()  throws Throwable  {
-      MsoRequest msoRequest0 = new MsoRequest();
-      VnfRollback vnfRollback0 = new VnfRollback("", ", requestType = ", "", true, true, msoRequest0, " .~y_qT", "", "");
-      VfModuleRollback vfModuleRollback0 = new VfModuleRollback(vnfRollback0, (String) null, (String) null, "TgLE(4jqRR&B*tjC*6");
-      vfModuleRollback0.setVfModuleId("TUj9qO3IbhX0v~");
-      String string0 = vfModuleRollback0.getVfModuleId();
-      assertEquals("TUj9qO3IbhX0v~", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test18()  throws Throwable  {
-      MsoRequest msoRequest0 = new MsoRequest();
-      VnfRollback vnfRollback0 = new VnfRollback("", ", requestType = ", "", true, true, msoRequest0, " .~y_qT", "", "");
-      VfModuleRollback vfModuleRollback0 = new VfModuleRollback(vnfRollback0, (String) null, (String) null, "TgLE(4jqRR&B*tjC*6");
-      vfModuleRollback0.setMessageId(", tenantCreated=");
-      assertNull(vfModuleRollback0.getVfModuleId());
-  }
-
-  @Test(timeout = 4000)
-  public void test19()  throws Throwable  {
-      VfModuleRollback vfModuleRollback0 = new VfModuleRollback();
-      vfModuleRollback0.setVnfId("n+S7/*fyf8oP5jpt#");
-      vfModuleRollback0.getVnfId();
-      assertFalse(vfModuleRollback0.isVfModuleCreated());
-  }
-
-  @Test(timeout = 4000)
-  public void test20()  throws Throwable  {
-      MsoRequest msoRequest0 = new MsoRequest();
-      VnfRollback vnfRollback0 = new VnfRollback("", ", requestType = ", "", true, true, msoRequest0, " .~y_qT", "", "");
-      VfModuleRollback vfModuleRollback0 = new VfModuleRollback(vnfRollback0, (String) null, (String) null, "TgLE(4jqRR&B*tjC*6");
-      vfModuleRollback0.setVfModuleCreated(true);
-      assertTrue(vfModuleRollback0.isVfModuleCreated());
-  }
-
-  @Test(timeout = 4000)
-  public void test21()  throws Throwable  {
-      MsoRequest msoRequest0 = new MsoRequest();
-      VnfRollback vnfRollback0 = new VnfRollback("", ", requestType = ", "", true, true, msoRequest0, " .~y_qT", "", "");
-      VfModuleRollback vfModuleRollback0 = new VfModuleRollback(vnfRollback0, (String) null, (String) null, "TgLE(4jqRR&B*tjC*6");
-      vfModuleRollback0.setMsoRequest(msoRequest0);
-      assertEquals(", requestType = ", vfModuleRollback0.getTenantId());
-  }
-
-  @Test(timeout = 4000)
-  public void test22()  throws Throwable  {
-      MsoRequest msoRequest0 = new MsoRequest();
-      VnfRollback vnfRollback0 = new VnfRollback("", ", requestType = ", "", true, true, msoRequest0, " .~y_qT", "", "");
-      VfModuleRollback vfModuleRollback0 = new VfModuleRollback(vnfRollback0, (String) null, (String) null, "TgLE(4jqRR&B*tjC*6");
-      String string0 = vfModuleRollback0.getMessageId();
-      assertEquals("TgLE(4jqRR&B*tjC*6", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test23()  throws Throwable  {
-      VfModuleRollback vfModuleRollback0 = new VfModuleRollback();
-      vfModuleRollback0.getVfModuleStackId();
-      assertFalse(vfModuleRollback0.isVfModuleCreated());
-  }
-
-  @Test(timeout = 4000)
-  public void test24()  throws Throwable  {
-      MsoRequest msoRequest0 = new MsoRequest();
-      VnfRollback vnfRollback0 = new VnfRollback("", ", requestType = ", "", true, true, msoRequest0, " .~y_qT", "", "");
-      VfModuleRollback vfModuleRollback0 = new VfModuleRollback(vnfRollback0, (String) null, (String) null, "TgLE(4jqRR&B*tjC*6");
-      String string0 = vfModuleRollback0.getVfModuleId();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test25()  throws Throwable  {
-      VfModuleRollback vfModuleRollback0 = new VfModuleRollback();
-      vfModuleRollback0.getTenantId();
-      assertFalse(vfModuleRollback0.isVfModuleCreated());
-  }
+    @Test(timeout = 4000)
+    public void test00()  throws Throwable  {
+        VnfRollback vnfRollback0 = mock(VnfRollback.class, new ViolatedAssumptionAnswer());
+        doReturn((String) null).when(vnfRollback0).getCloudSiteId();
+        doReturn((MsoRequest) null).when(vnfRollback0).getMsoRequest();
+        doReturn((String) null).when(vnfRollback0).getTenantId();
+        doReturn(false).when(vnfRollback0).getVnfCreated();
+        doReturn((String) null).when(vnfRollback0).getVnfId();
+        VfModuleRollback vfModuleRollback0 = new VfModuleRollback(vnfRollback0, "Gf(%P^Jj)\u0005JzrF?~", "Gf(%P^Jj)\u0005JzrF?~", "Gf(%P^Jj)\u0005JzrF?~");
+        vfModuleRollback0.setVfModuleCreated(true);
+        boolean boolean0 = vfModuleRollback0.isVfModuleCreated();
+        assertTrue(boolean0);
+    }
+
+    @Test(timeout = 4000)
+    public void test01()  throws Throwable  {
+        VfModuleRollback vfModuleRollback0 = new VfModuleRollback();
+        vfModuleRollback0.setVnfId("G\"nvy<Sfjr`hfI8Zl");
+        vfModuleRollback0.getVnfId();
+        assertFalse(vfModuleRollback0.isVfModuleCreated());
+    }
+
+    @Test(timeout = 4000)
+    public void test02()  throws Throwable  {
+        VnfRollback vnfRollback0 = mock(VnfRollback.class, new ViolatedAssumptionAnswer());
+        doReturn((String) null).when(vnfRollback0).getCloudSiteId();
+        doReturn((MsoRequest) null).when(vnfRollback0).getMsoRequest();
+        doReturn((String) null).when(vnfRollback0).getTenantId();
+        doReturn(false).when(vnfRollback0).getVnfCreated();
+        doReturn((String) null).when(vnfRollback0).getVnfId();
+        VfModuleRollback vfModuleRollback0 = new VfModuleRollback(vnfRollback0, "RS,v^T.EEJZW/qj~EC", "RS,v^T.EEJZW/qj~EC", "");
+        vfModuleRollback0.setVnfId("");
+        vfModuleRollback0.getVnfId();
+        assertEquals("RS,v^T.EEJZW/qj~EC", vfModuleRollback0.getVfModuleId());
+        assertEquals("RS,v^T.EEJZW/qj~EC", vfModuleRollback0.getVfModuleStackId());
+        assertEquals("", vfModuleRollback0.getMessageId());
+    }
+
+    @Test(timeout = 4000)
+    public void test03()  throws Throwable  {
+        VfModuleRollback vfModuleRollback0 = new VfModuleRollback();
+        vfModuleRollback0.getVfModuleStackId();
+        assertFalse(vfModuleRollback0.isVfModuleCreated());
+    }
+
+    @Test(timeout = 4000)
+    public void test04()  throws Throwable  {
+        VfModuleRollback vfModuleRollback0 = new VfModuleRollback();
+        vfModuleRollback0.setVfModuleStackId("G8yt`J");
+        vfModuleRollback0.getVfModuleStackId();
+        assertFalse(vfModuleRollback0.isVfModuleCreated());
+    }
+
+    @Test(timeout = 4000)
+    public void test05()  throws Throwable  {
+        VfModuleRollback vfModuleRollback0 = new VfModuleRollback();
+        vfModuleRollback0.setVfModuleId("<V0(ch?1");
+        vfModuleRollback0.getVfModuleId();
+        assertFalse(vfModuleRollback0.isVfModuleCreated());
+    }
+
+    @Test(timeout = 4000)
+    public void test06()  throws Throwable  {
+        VfModuleRollback vfModuleRollback0 = new VfModuleRollback();
+        vfModuleRollback0.setVfModuleId("");
+        vfModuleRollback0.getVfModuleId();
+        assertFalse(vfModuleRollback0.isVfModuleCreated());
+    }
+
+    @Test(timeout = 4000)
+    public void test07()  throws Throwable  {
+        VnfRollback vnfRollback0 = mock(VnfRollback.class, new ViolatedAssumptionAnswer());
+        doReturn((String) null).when(vnfRollback0).getCloudSiteId();
+        doReturn((MsoRequest) null).when(vnfRollback0).getMsoRequest();
+        doReturn((String) null).when(vnfRollback0).getTenantId();
+        doReturn(false).when(vnfRollback0).getVnfCreated();
+        doReturn((String) null).when(vnfRollback0).getVnfId();
+        VfModuleRollback vfModuleRollback0 = new VfModuleRollback(vnfRollback0, "RS,v^T.EEJZW/qj~EC", "RS,v^T.EEJZW/qj~EC", "");
+        vfModuleRollback0.setTenantId("RS,v^T.EEJZW/qj~EC");
+        vfModuleRollback0.getTenantId();
+        assertEquals("", vfModuleRollback0.getMessageId());
+        assertEquals("RS,v^T.EEJZW/qj~EC", vfModuleRollback0.getVfModuleStackId());
+        assertEquals("RS,v^T.EEJZW/qj~EC", vfModuleRollback0.getVfModuleId());
+    }
+
+    @Test(timeout = 4000)
+    public void test08()  throws Throwable  {
+        MsoRequest msoRequest0 = mock(MsoRequest.class, new ViolatedAssumptionAnswer());
+        VfModuleRollback vfModuleRollback0 = new VfModuleRollback("", "", "", false, "72M#WP;7?8*Y~!q", "72M#WP;7?8*Y~!q", msoRequest0, "");
+        assertEquals("72M#WP;7?8*Y~!q", vfModuleRollback0.getTenantId());
+
+        vfModuleRollback0.setTenantId("");
+        vfModuleRollback0.getTenantId();
+        assertEquals("", vfModuleRollback0.getMessageId());
+    }
+
+    @Test(timeout = 4000)
+    public void test09()  throws Throwable  {
+        MsoRequest msoRequest0 = mock(MsoRequest.class, new ViolatedAssumptionAnswer());
+        doReturn((String) null).when(msoRequest0).toString();
+        VfModuleRollback vfModuleRollback0 = new VfModuleRollback(", vnfCreated=", ", vnfCreated=", ", vnfCreated=", false, ", vnfCreated=", "Jd,{S<BvHJAw+", msoRequest0, "Jd,{S<BvHJAw+");
+        vfModuleRollback0.getMsoRequest();
+        assertEquals("Jd,{S<BvHJAw+", vfModuleRollback0.getCloudSiteId());
+        assertEquals(", vnfCreated=", vfModuleRollback0.getTenantId());
+        assertEquals(", vnfCreated=", vfModuleRollback0.getVfModuleId());
+        assertEquals(", vnfCreated=", vfModuleRollback0.getVfModuleStackId());
+        assertEquals(", vnfCreated=", vfModuleRollback0.getVnfId());
+        assertEquals("Jd,{S<BvHJAw+", vfModuleRollback0.getMessageId());
+        assertFalse(vfModuleRollback0.isVfModuleCreated());
+    }
+
+    @Test(timeout = 4000)
+    public void test10()  throws Throwable  {
+        VfModuleRollback vfModuleRollback0 = new VfModuleRollback();
+        vfModuleRollback0.setMessageId("");
+        vfModuleRollback0.getMessageId();
+        assertFalse(vfModuleRollback0.isVfModuleCreated());
+    }
+
+    @Test(timeout = 4000)
+    public void test11()  throws Throwable  {
+        VfModuleRollback vfModuleRollback0 = new VfModuleRollback();
+        vfModuleRollback0.setCloudSiteId("G8yt`J");
+        vfModuleRollback0.getCloudSiteId();
+        assertFalse(vfModuleRollback0.isVfModuleCreated());
+    }
+
+    @Test(timeout = 4000)
+    public void test12()  throws Throwable  {
+        VfModuleRollback vfModuleRollback0 = new VfModuleRollback();
+        vfModuleRollback0.getMessageId();
+        assertFalse(vfModuleRollback0.isVfModuleCreated());
+    }
+
+    @Test(timeout = 4000)
+    public void test13()  throws Throwable  {
+        MsoRequest msoRequest0 = mock(MsoRequest.class, new ViolatedAssumptionAnswer());
+        VfModuleRollback vfModuleRollback0 = new VfModuleRollback("", "", "", false, "72M#WP;7?8*Y~!q", "72M#WP;7?8*Y~!q", msoRequest0, "");
+        MsoRequest msoRequest1 = mock(MsoRequest.class, new ViolatedAssumptionAnswer());
+        vfModuleRollback0.setMsoRequest(msoRequest1);
+        assertEquals("", vfModuleRollback0.getVnfId());
+        assertEquals("72M#WP;7?8*Y~!q", vfModuleRollback0.getCloudSiteId());
+        assertEquals("", vfModuleRollback0.getVfModuleStackId());
+        assertEquals("", vfModuleRollback0.getMessageId());
+        assertEquals("72M#WP;7?8*Y~!q", vfModuleRollback0.getTenantId());
+        assertFalse(vfModuleRollback0.isVfModuleCreated());
+        assertEquals("", vfModuleRollback0.getVfModuleId());
+    }
+
+    @Test(timeout = 4000)
+    public void test14()  throws Throwable  {
+        VfModuleRollback vfModuleRollback0 = new VfModuleRollback();
+        vfModuleRollback0.getTenantId();
+        assertFalse(vfModuleRollback0.isVfModuleCreated());
+    }
+
+    @Test(timeout = 4000)
+    public void test15()  throws Throwable  {
+        VfModuleRollback vfModuleRollback0 = new VfModuleRollback();
+        vfModuleRollback0.getVnfId();
+        assertFalse(vfModuleRollback0.isVfModuleCreated());
+    }
+
+    @Test(timeout = 4000)
+    public void test16()  throws Throwable  {
+        VfModuleRollback vfModuleRollback0 = new VfModuleRollback();
+        vfModuleRollback0.getVfModuleId();
+        assertFalse(vfModuleRollback0.isVfModuleCreated());
+    }
+
+    @Test(timeout = 4000)
+    public void test17()  throws Throwable  {
+        VfModuleRollback vfModuleRollback0 = new VfModuleRollback();
+        vfModuleRollback0.setMessageId("{2)+G6]E#s_=J_S&");
+        vfModuleRollback0.getMessageId();
+        assertFalse(vfModuleRollback0.isVfModuleCreated());
+    }
+
+    @Test(timeout = 4000)
+    public void test18()  throws Throwable  {
+        VfModuleRollback vfModuleRollback0 = new VfModuleRollback();
+        vfModuleRollback0.getCloudSiteId();
+        assertFalse(vfModuleRollback0.isVfModuleCreated());
+    }
+
+    @Test(timeout = 4000)
+    public void test19()  throws Throwable  {
+        VfModuleRollback vfModuleRollback0 = new VfModuleRollback();
+        vfModuleRollback0.setCloudSiteId("");
+        vfModuleRollback0.getCloudSiteId();
+        assertFalse(vfModuleRollback0.isVfModuleCreated());
+    }
+
+    @Test(timeout = 4000)
+    public void test20()  throws Throwable  {
+        VfModuleRollback vfModuleRollback0 = new VfModuleRollback();
+        vfModuleRollback0.getMsoRequest();
+        assertFalse(vfModuleRollback0.isVfModuleCreated());
+    }
+
+    @Test(timeout = 4000)
+    public void test21()  throws Throwable  {
+        MsoRequest msoRequest0 = mock(MsoRequest.class, new ViolatedAssumptionAnswer());
+        VfModuleRollback vfModuleRollback0 = new VfModuleRollback("!y-*0?6`~", "", "", true, "", "", msoRequest0, "2<6zlA_/MQ2I~c6U0");
+        String string0 = vfModuleRollback0.getVfModuleStackId();
+        assertEquals("2<6zlA_/MQ2I~c6U0", vfModuleRollback0.getMessageId());
+        assertEquals("", vfModuleRollback0.getTenantId());
+        assertEquals("", string0);
+        assertTrue(vfModuleRollback0.isVfModuleCreated());
+        assertEquals("!y-*0?6`~", vfModuleRollback0.getVnfId());
+        assertEquals("", vfModuleRollback0.getCloudSiteId());
+        assertEquals("", vfModuleRollback0.getVfModuleId());
+    }
+
+    @Test(timeout = 4000)
+    public void test22()  throws Throwable  {
+        VfModuleRollback vfModuleRollback0 = null;
+        try {
+            vfModuleRollback0 = new VfModuleRollback((VnfRollback) null, "", "VnfRollback: cloud=", "");
+            fail("Expecting exception: NullPointerException");
+
+        } catch(NullPointerException e) {
+            //
+            // no message in exception (getMessage() returned null)
+            //
+            verifyException("org.openecomp.mso.adapters.vnfrest.VfModuleRollback", e);
+        }
+    }
+
+    @Test(timeout = 4000)
+    public void test23()  throws Throwable  {
+        VfModuleRollback vfModuleRollback0 = new VfModuleRollback();
+        boolean boolean0 = vfModuleRollback0.isVfModuleCreated();
+        assertFalse(boolean0);
+    }
 }