Initial OpenECOMP MSO commit

Change-Id: Ia6a7574859480717402cc2f22534d9973a78fa6d
Signed-off-by: ChrisC <cc697w@intl.att.com>

165 files changed, 18030 insertions, 0 deletions

diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/ContrailNetwork.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/ContrailNetwork.java
new file mode 100644
index 0000000000..af44ce42b6
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/ContrailNetwork.java
@@ -0,0 +1,86 @@
+/*-
+ * ============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.nwrest;
+
+
+import java.util.List;
+
+public class ContrailNetwork {
+	private String shared   = "false";
+	private String external = "false";
+	private List<String> routeTargets;
+	private List<String> policyFqdns;
+	private List<String> routeTableFqdns;
+	
+	public ContrailNetwork() {
+		super();
+	}
+
+	public ContrailNetwork(String shared, String external, List<String> routeTargets, List<String> policyFqdns, List<String> routeTableFqdns) {
+		super();
+		this.shared = shared;
+		this.external = external;
+		this.routeTargets = routeTargets;
+		this.policyFqdns = policyFqdns;
+		this.routeTableFqdns = routeTableFqdns;
+	}
+
+	public String getShared() {
+		return shared;
+	}
+
+	public void setShared(String shared) {
+		this.shared = shared;
+	}
+
+	public String getExternal() {
+		return external;
+	}
+
+	public void setExternal(String external) {
+		this.external = external;
+	}
+
+	public List<String> getRouteTargets() {
+		return routeTargets;
+	}
+
+	public void setRouteTargets(List<String> routeTargets) {
+		this.routeTargets = routeTargets;
+	}
+
+	public List<String> getPolicyFqdns() {
+		return policyFqdns;
+	}
+
+	public void setPolicyFqdns(List<String> policyFqdns) {
+		this.policyFqdns = policyFqdns;
+	}
+	
+	public List<String> getRouteTableFqdns() {
+		return routeTableFqdns;
+	}
+
+	public void setRouteTableFqdns(List<String> routeTableFqdns) {
+		this.routeTableFqdns = routeTableFqdns;
+	}
+	
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/CreateNetworkError.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/CreateNetworkError.java
new file mode 100644
index 0000000000..e756261afb
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/CreateNetworkError.java
@@ -0,0 +1,48 @@
+/*-
+ * ============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.nwrest;
+
+
+import java.io.Serializable;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+import org.openecomp.mso.openstack.exceptions.MsoExceptionCategory;
+
+@XmlRootElement(name = "createNetworkError")
+@NoJackson
+public class CreateNetworkError extends NetworkExceptionResponse implements Serializable {
+	private static final long serialVersionUID = -4283402447149144456L;
+
+	public CreateNetworkError() {
+		super("");
+	}
+
+	public CreateNetworkError(String message) {
+		super(message);
+	}
+
+	public CreateNetworkError(String message, MsoExceptionCategory category, boolean rolledBack, String messageid) {
+		super(message, category, rolledBack, messageid);
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/CreateNetworkRequest.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/CreateNetworkRequest.java
new file mode 100644
index 0000000000..b8c70dd193
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/CreateNetworkRequest.java
@@ -0,0 +1,191 @@
+/*-
+ * ============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.nwrest;
+
+
+
+import org.openecomp.mso.openstack.beans.Subnet;
+import org.openecomp.mso.entity.MsoRequest;
+
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+import org.codehaus.jackson.map.annotate.JsonRootName;
+
+/* README
+* 1) Used JAXB/Jettison - see @NoJackson annotation on class to get RootElements REad by RestEasy
+* 2) due to 1) Maps need to use this format 
+
+"networkParams": {"entry": [
+                         	{"key": "network_id",
+                         	"value": "59ed7b41-2983-413f-ba93-e7d437433916"},
+                         	{"key": "subnet_id",
+                         	"value": "086c9298-5c57-49b7-bb2b-6fd5730c5d92"},
+                         	{"key": "server_name_0",
+                         	"value": "RaaNetwork1"}
+                         	]},
+ * 3) to output json see toJSonString method below which required the @JsonRootName annotation and the WRAP_ROOT feature enabled 
+ * 4) Tryong to work with RESTEASY JACKSON and JAXB/JETTISON to conform to Json input/output specs
+*/
+@JsonRootName("createNetworkRequest")
+@XmlRootElement(name = "createNetworkRequest")
+@NoJackson
+public class CreateNetworkRequest extends NetworkRequestCommon {
+	private String cloudSiteId;
+	private String tenantId;
+	private String networkId;
+	private String networkName;
+	private String networkType;
+	private String networkTypeVersion;
+	private NetworkTechnology networkTechnology = NetworkTechnology.NEUTRON;
+	private List<Subnet> subnets;
+	private ProviderVlanNetwork providerVlanNetwork;
+	private ContrailNetwork contrailNetwork;
+	private Boolean failIfExists = false;
+	private Boolean backout = true;
+	private Map<String,String> networkParams = new HashMap<String, String>();
+	private MsoRequest msoRequest = new MsoRequest();
+
+	public CreateNetworkRequest() {
+		super();
+	}
+
+	public String getCloudSiteId() {
+		return cloudSiteId;
+	}
+
+	public void setCloudSiteId(String cloudSiteId) {
+		this.cloudSiteId = cloudSiteId;
+	}
+
+	public String getTenantId() {
+		return tenantId;
+	}
+
+	public void setTenantId(String tenantId) {
+		this.tenantId = tenantId;
+	}
+
+	public String getNetworkId() {
+		return networkId;
+	}
+
+	public void setNetworkId(String networkId) {
+		this.networkId = networkId;
+	}
+
+	public String getNetworkName() {
+		return networkName;
+	}
+
+	public void setNetworkName(String networkName) {
+		this.networkName = networkName;
+	}
+
+	public String getNetworkType() {
+		return networkType;
+	}
+
+	public void setNetworkType(String networkType) {
+		this.networkType = networkType;
+	}
+
+	public String getNetworkTypeVersion() {
+		return networkTypeVersion;
+	}
+
+	public void setNetworkTypeVersion(String networkTypeVersion) {
+		this.networkTypeVersion = networkTypeVersion;
+	}
+
+	public String getNetworkTechnology() {
+		return networkTechnology.toString();
+	}
+
+	public void setNetworkTechnology(String networkTechnology) {
+		this.networkTechnology = NetworkTechnology.valueOf(networkTechnology);
+	}
+
+	public List<Subnet> getSubnets() {
+		return subnets;
+	}
+
+	public void setSubnets(List<Subnet> subnets) {
+		this.subnets = subnets;
+	}
+
+	public ProviderVlanNetwork getProviderVlanNetwork() {
+		return providerVlanNetwork;
+	}
+
+	public void setProviderVlanNetwork(ProviderVlanNetwork providerVlanNetwork) {
+		this.providerVlanNetwork = providerVlanNetwork;
+	}
+
+	public ContrailNetwork getContrailNetwork() {
+		return contrailNetwork;
+	}
+
+	public void setContrailNetwork(ContrailNetwork contrailNetwork) {
+		this.contrailNetwork = contrailNetwork;
+	}
+
+	public Boolean getFailIfExists() {
+		return failIfExists;
+	}
+
+	public void setFailIfExists(Boolean failIfExists) {
+		this.failIfExists = failIfExists;
+	}
+
+	public Boolean getBackout() {
+		return backout;
+	}
+
+	public void setBackout(Boolean backout) {
+		this.backout = backout;
+	}
+
+	public Map<String, String> getNetworkParams() {
+		return networkParams;
+	}
+
+	public void setNetworkParams(Map<String, String> networkParams) {
+		this.networkParams = networkParams;
+	}
+
+	public MsoRequest getMsoRequest() {
+		return msoRequest;
+	}
+
+	public void setMsoRequest(MsoRequest msoRequest) {
+		this.msoRequest = msoRequest;
+	}
+
+	public boolean isContrailRequest() {
+		return (networkTechnology == NetworkTechnology.CONTRAIL) && (contrailNetwork != null);
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/CreateNetworkResponse.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/CreateNetworkResponse.java
new file mode 100644
index 0000000000..f47272f5db
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/CreateNetworkResponse.java
@@ -0,0 +1,122 @@
+/*-
+ * ============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.nwrest;
+
+
+
+import org.openecomp.mso.openstack.beans.NetworkRollback;
+import java.util.Map;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.resteasy.annotations.providers.NoJackson;
+import org.codehaus.jackson.map.annotate.JsonRootName;
+
+@JsonRootName("createNetworkResponse")
+@XmlRootElement(name = "createNetworkResponse")
+@NoJackson
+public class CreateNetworkResponse extends NetworkResponseCommon {
+	private String networkId;
+	private String neutronNetworkId;
+	private String networkStackId;
+	private String networkFqdn;
+	private Boolean networkCreated;
+	private Map<String, String> subnetMap;
+	private NetworkRollback rollback = new NetworkRollback();
+
+	public CreateNetworkResponse() {
+		super();
+	}
+
+	public CreateNetworkResponse(String networkId,
+			String neutronNetworkId,
+			String networkStackId,
+			String networkFqdn,
+			Boolean networkCreated,
+			Map<String, String> subnetIdMap,
+			NetworkRollback rollback,
+			String messageId) {
+		super(messageId);
+		this.networkId = networkId;
+		this.neutronNetworkId = neutronNetworkId;
+		this.networkStackId = networkStackId;
+		this.networkFqdn = networkFqdn;
+		this.networkCreated = networkCreated;
+		this.subnetMap = subnetIdMap;
+		this.rollback = rollback;
+	}
+
+	public String getNetworkId() {
+		return networkId;
+	}
+
+	public void setNetworkId(String networkId) {
+		this.networkId = networkId;
+	}
+
+	public String getNeutronNetworkId() {
+		return neutronNetworkId;
+	}
+
+	public void setNeutronNetworkId(String neutronNetworkId) {
+		this.neutronNetworkId = neutronNetworkId;
+	}
+
+	public String getNetworkStackId() {
+		return networkStackId;
+	}
+
+	public void setNetworkStackId(String networkStackId) {
+		this.networkStackId = networkStackId;
+	}
+
+	public String getNetworkFqdn() {
+		return networkFqdn;
+	}
+
+	public void setNetworkFqdn(String networkFqdn) {
+		this.networkFqdn = networkFqdn;
+	}
+
+	public Boolean getNetworkCreated() {
+		return networkCreated;
+	}
+
+	public void setNetworkCreated(Boolean networkCreated) {
+		this.networkCreated = networkCreated;
+	}
+
+	public Map<String, String> getSubnetMap() {
+		return subnetMap;
+	}
+
+	public void setSubnetMap(Map<String, String> subnetMap) {
+		this.subnetMap = subnetMap;
+	}
+
+	public NetworkRollback getRollback() {
+		return rollback;
+	}
+
+	public void setRollback(NetworkRollback rollback) {
+		this.rollback = rollback;
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/DeleteNetworkError.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/DeleteNetworkError.java
new file mode 100644
index 0000000000..22af7fe21b
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/DeleteNetworkError.java
@@ -0,0 +1,48 @@
+/*-
+ * ============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.nwrest;
+
+
+import java.io.Serializable;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+import org.openecomp.mso.openstack.exceptions.MsoExceptionCategory;
+
+@XmlRootElement(name = "deleteNetworkError")
+@NoJackson
+public class DeleteNetworkError extends NetworkExceptionResponse implements Serializable {
+	private static final long serialVersionUID = 2735474165790444180L;
+
+	public DeleteNetworkError() {
+		super("");
+	}
+
+	public DeleteNetworkError(String message) {
+		super(message);
+	}
+
+	public DeleteNetworkError(String message, MsoExceptionCategory category, boolean unused, String messageid) {
+		super(message, category, unused, messageid);
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/DeleteNetworkRequest.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/DeleteNetworkRequest.java
new file mode 100644
index 0000000000..62c308d142
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/DeleteNetworkRequest.java
@@ -0,0 +1,93 @@
+/*-
+ * ============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.nwrest;
+
+
+
+import org.openecomp.mso.entity.MsoRequest;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.resteasy.annotations.providers.NoJackson;
+import org.codehaus.jackson.map.annotate.JsonRootName;
+
+@JsonRootName("deleteNetworkRequest")
+@XmlRootElement(name = "deleteNetworkRequest")
+@NoJackson
+public class DeleteNetworkRequest extends NetworkRequestCommon {
+
+	private String cloudSiteId;
+	private String tenantId;
+	private String networkId;
+	private String networkStackId;
+	private String networkType;
+	private MsoRequest msoRequest = new MsoRequest();
+
+	public DeleteNetworkRequest() {}
+	
+	public String getCloudSiteId() {
+		return cloudSiteId;
+	}
+
+	public void setCloudSiteId(String cloudSiteId) {
+		this.cloudSiteId = cloudSiteId;
+	}
+
+	public String getTenantId() {
+		return tenantId;
+	}
+
+	public void setTenantId(String tenantId) {
+		this.tenantId = tenantId;
+	}
+
+	public String getNetworkId() {
+		return networkId;
+	}
+
+	public void setNetworkId(String networkId) {
+		this.networkId = networkId;
+	}
+
+	public String getNetworkStackId() {
+		return networkStackId;
+	}
+
+	public void setNetworkStackId(String networkStackId) {
+		this.networkStackId = networkStackId;
+	}
+
+	public String getNetworkType() {
+		return networkType;
+	}
+
+	public void setNetworkType(String networkType) {
+		this.networkType = networkType;
+	}
+
+	public MsoRequest getMsoRequest() {
+		return msoRequest;
+	}
+
+	public void setMsoRequest(MsoRequest msoRequest) {
+		this.msoRequest = msoRequest;
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/DeleteNetworkResponse.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/DeleteNetworkResponse.java
new file mode 100644
index 0000000000..d6d295a53a
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/DeleteNetworkResponse.java
@@ -0,0 +1,62 @@
+/*-
+ * ============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.nwrest;
+
+
+
+import javax.xml.bind.annotation.XmlRootElement;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+import org.codehaus.jackson.map.annotate.JsonRootName;
+
+@JsonRootName("deleteNetworkResponse")
+@XmlRootElement(name = "deleteNetworkResponse")
+@NoJackson
+public class DeleteNetworkResponse extends NetworkResponseCommon {
+
+	private String networkId;
+	private Boolean networkDeleted;
+
+	public DeleteNetworkResponse() {
+		super();
+	}
+
+	public DeleteNetworkResponse(String networkId, Boolean networkDeleted, String messageId) {
+		super(messageId);
+		this.networkId = networkId;
+		this.networkDeleted = networkDeleted;
+	}
+	
+	public String getNetworkId() {
+		return networkId;
+	}
+
+	public void setNetworkId(String networkId) {
+		this.networkId = networkId;
+	}
+
+	public Boolean getNetworkDeleted() {
+		return networkDeleted;
+	}
+
+	public void setNetworkDeleted(Boolean networkDeleted) {
+		this.networkDeleted = networkDeleted;
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/NetworkExceptionResponse.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/NetworkExceptionResponse.java
new file mode 100644
index 0000000000..de37c3d8fd
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/NetworkExceptionResponse.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.nwrest;
+
+
+
+import org.openecomp.mso.openstack.exceptions.MsoExceptionCategory;
+
+public class NetworkExceptionResponse extends NetworkResponseCommon {
+    private String message;
+	private MsoExceptionCategory category;
+	private Boolean rolledBack;
+
+	public NetworkExceptionResponse () {}
+
+	public NetworkExceptionResponse (String message) {
+		super();
+		this.message = message;
+	}
+
+	public NetworkExceptionResponse (String message, MsoExceptionCategory category, boolean rolledBack, String messageid) {
+		super(messageid);
+		this.message = message;
+		this.category = category;
+		this.rolledBack = rolledBack;
+	}
+
+	public String getMessage() {
+		return message;
+	}
+
+	public void setMessage(String message) {
+		this.message = message;
+	}
+
+	public MsoExceptionCategory getCategory () {
+		return category;
+	}
+
+	public void setCategory (MsoExceptionCategory category) {
+		this.category = category;
+	}
+
+	public Boolean getRolledBack() {
+		return rolledBack;
+	}
+
+	public void setRolledBack(Boolean rolledBack) {
+		this.rolledBack = rolledBack;
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/NetworkRequestCommon.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/NetworkRequestCommon.java
new file mode 100644
index 0000000000..d04e960b00
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/NetworkRequestCommon.java
@@ -0,0 +1,95 @@
+/*-
+ * ============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.nwrest;
+
+
+
+import java.io.ByteArrayOutputStream;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.Marshaller;
+
+import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.map.SerializationConfig;
+
+/**
+ * Everything that is common between all Network Requests.
+ */
+public abstract class NetworkRequestCommon {
+	private Boolean skipAAI = false;
+	private String messageId;
+	private String notificationUrl;
+
+	public Boolean getSkipAAI() {
+		return skipAAI;
+	}
+
+	public void setSkipAAI(Boolean skipAAI) {
+		this.skipAAI = skipAAI;
+	}
+
+	public String getMessageId() {
+		return messageId;
+	}
+
+	public void setMessageId(String messageId) {
+		this.messageId = messageId;
+	}
+
+	public String getNotificationUrl() {
+		return notificationUrl;
+	}
+
+	public void setNotificationUrl(String notificationUrl) {
+		this.notificationUrl = notificationUrl;
+	}
+
+	public boolean isSynchronous() {
+		return notificationUrl == null || (notificationUrl != null && notificationUrl.isEmpty());
+	}
+
+	public String toJsonString() {
+		String jsonString = null;
+		try {
+			ObjectMapper mapper = new ObjectMapper();
+			mapper.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
+			jsonString = mapper.writeValueAsString(this);
+		} catch (Exception e) {
+			// ignore
+		}
+		return jsonString;
+	}
+
+	public String toXmlString() {
+		try {
+			ByteArrayOutputStream bs = new ByteArrayOutputStream();
+			JAXBContext context = JAXBContext.newInstance(this.getClass());
+			Marshaller marshaller = context.createMarshaller();
+			marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); //pretty print XML
+			marshaller.marshal(this, bs);
+			return bs.toString();
+		} catch (Exception e) {
+			// Shouldn't happen...
+			e.printStackTrace();
+			return "";
+		}
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/NetworkResponseCommon.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/NetworkResponseCommon.java
new file mode 100644
index 0000000000..e7cc9b9ceb
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/NetworkResponseCommon.java
@@ -0,0 +1,81 @@
+/*-
+ * ============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.nwrest;
+
+
+
+import java.io.ByteArrayOutputStream;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.Marshaller;
+
+import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.map.SerializationConfig;
+
+/**
+ * Everything that is common between all Volume Group Responses, except for QueryVolumeGroupResponse.
+ */
+public abstract class NetworkResponseCommon {
+	private String messageId;
+
+	public NetworkResponseCommon() {
+		messageId = null;
+	}
+
+	public NetworkResponseCommon(String messageId) {
+		this.messageId = messageId;
+	}
+
+	public String getMessageId() {
+		return messageId;
+	}
+
+	public void setMessageId(String messageId) {
+		this.messageId = messageId;
+	}
+
+	public String toJsonString() {
+		String jsonString = null;
+		try {
+			ObjectMapper mapper = new ObjectMapper();
+			mapper.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
+			jsonString = mapper.writeValueAsString(this);
+		} catch (Exception e) {
+			// ignore
+		}
+		return jsonString;
+	}
+
+	public String toXmlString() {
+		try {
+			ByteArrayOutputStream bs = new ByteArrayOutputStream();
+			JAXBContext context = JAXBContext.newInstance(this.getClass());
+			Marshaller marshaller = context.createMarshaller();
+			marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); //pretty print XML
+			marshaller.marshal(this, bs);
+			return bs.toString();
+		} catch (Exception e) {
+			// Shouldn't happen...
+			e.printStackTrace();
+			return "";
+		}
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/NetworkTechnology.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/NetworkTechnology.java
new file mode 100644
index 0000000000..62a821d658
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/NetworkTechnology.java
@@ -0,0 +1,26 @@
+/*-
+ * ============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.nwrest;
+
+
+public enum NetworkTechnology {
+	NEUTRON, VMWARE, CONTRAIL
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/ProviderVlanNetwork.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/ProviderVlanNetwork.java
new file mode 100644
index 0000000000..3956d3e785
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/ProviderVlanNetwork.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.nwrest;
+
+
+
+import java.util.List;
+
+public class ProviderVlanNetwork {
+	private String physicalNetworkName;
+	private List<Integer> vlans;
+	
+	public ProviderVlanNetwork() {
+		super();
+	}
+	
+	public ProviderVlanNetwork(String physicalNetworkName, List<Integer> vlans) {
+		super();
+		this.physicalNetworkName = physicalNetworkName;
+		this.vlans = vlans;
+	}
+
+	public String getPhysicalNetworkName() {
+		return physicalNetworkName;
+	}
+
+	public void setPhysicalNetworkName(String physicalNetworkName) {
+		this.physicalNetworkName = physicalNetworkName;
+	}
+
+	public List<Integer> getVlans() {
+		return vlans;
+	}
+
+	public void setVlans(List<Integer> vlans) {
+		this.vlans = vlans;
+	}	
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/QueryNetworkError.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/QueryNetworkError.java
new file mode 100644
index 0000000000..2b602f6882
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/QueryNetworkError.java
@@ -0,0 +1,34 @@
+/*-
+ * ============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.nwrest;
+
+
+import java.io.Serializable;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+@XmlRootElement(name = "queryNetworkError")
+@NoJackson
+public class QueryNetworkError extends NetworkExceptionResponse implements Serializable {
+	private static final long serialVersionUID = -6125469596399867146L;
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/QueryNetworkResponse.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/QueryNetworkResponse.java
new file mode 100644
index 0000000000..e79b463f93
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/QueryNetworkResponse.java
@@ -0,0 +1,144 @@
+/*-
+ * ============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.nwrest;
+
+
+
+import org.openecomp.mso.openstack.beans.NetworkStatus;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.codehaus.jackson.map.ObjectMapper;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+@XmlRootElement(name = "queryNetworkResponse")
+@NoJackson
+public class QueryNetworkResponse {
+	private String networkId;
+	private String neutronNetworkId;
+	private String networkStackId;
+	private Boolean networkExists;
+	private NetworkStatus networkStatus;
+	private List<Integer> vlans;
+	private List<String> routeTargets;
+	private Map<String, String> subnetIdMap;
+	private Map<String, String> networkOutputs;
+	
+	public QueryNetworkResponse() {
+		super();
+	}
+
+	public QueryNetworkResponse(String networkId, String neutronNetworkId,
+			String networkStackId, NetworkStatus networkStatus,
+			Map<String, String> networkOutputs) {
+		super();
+		this.networkId = networkId;
+		this.neutronNetworkId = neutronNetworkId;
+		this.networkStackId = networkStackId;
+		this.networkStatus = networkStatus;
+		this.networkOutputs = networkOutputs;
+	}
+
+	public String getNetworkId() {
+		return networkId;
+	}
+
+	public void setNetworkId(String networkId) {
+		this.networkId = networkId;
+	}
+
+	public String getNeutronNetworkId() {
+		return neutronNetworkId;
+	}
+
+	public void setNeutronNetworkId(String neutronNetworkId) {
+		this.neutronNetworkId = neutronNetworkId;
+	}
+
+	public String getNetworkStackId() {
+		return networkStackId;
+	}
+
+	public void setNetworkStackId(String networkStackId) {
+		this.networkStackId = networkStackId;
+	}
+
+	public NetworkStatus getNetworkStatus() {
+		return networkStatus;
+	}
+
+	public void setNetworkStatus(NetworkStatus networkStatus) {
+		this.networkStatus = networkStatus;
+	}
+
+	public Boolean getNetworkExists() {
+		return networkExists;
+	}
+
+	public void setNetworkExists(Boolean networkExists) {
+		this.networkExists = networkExists;
+	}
+
+	public List<Integer> getVlans() {
+		return vlans;
+	}
+
+	public void setVlans(List<Integer> vlans) {
+		this.vlans = vlans;
+	}
+
+	public List<String> getRouteTargets() {
+		return routeTargets;
+	}
+
+	public void setRouteTargets(List<String> routeTargets) {
+		this.routeTargets = routeTargets;
+	}
+
+	public Map<String, String> getSubnetIdMap() {
+		return subnetIdMap;
+	}
+
+	public void setSubnetIdMap(Map<String, String> subnetIdMap) {
+		this.subnetIdMap = subnetIdMap;
+	}
+
+	public Map<String, String> getNetworkOutputs() {
+		return networkOutputs;
+	}
+
+	public void setNetworkOutputs(Map<String, String> networkOutputs) {
+		this.networkOutputs = networkOutputs;
+	}
+	
+	public String toJsonString() {
+		String jsonString = null;
+		try {
+			ObjectMapper mapper = new ObjectMapper();
+			jsonString = mapper.writeValueAsString(this);
+		}
+		catch (Exception e) {}
+		return jsonString;
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/RollbackNetworkError.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/RollbackNetworkError.java
new file mode 100644
index 0000000000..9e6a328998
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/RollbackNetworkError.java
@@ -0,0 +1,48 @@
+/*-
+ * ============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.nwrest;
+
+
+import java.io.Serializable;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+import org.openecomp.mso.openstack.exceptions.MsoExceptionCategory;
+
+@XmlRootElement(name = "rollbackNetworkError")
+@NoJackson
+public class RollbackNetworkError extends NetworkExceptionResponse implements Serializable {
+	private static final long serialVersionUID = -3954464103037391980L;
+
+	public RollbackNetworkError() {
+		super("");
+	}
+
+	public RollbackNetworkError(String message) {
+		super(message);
+	}
+
+	public RollbackNetworkError(String message, MsoExceptionCategory category, boolean unused, String messageid) {
+		super(message, category, unused, messageid);
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/RollbackNetworkRequest.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/RollbackNetworkRequest.java
new file mode 100644
index 0000000000..37751149b9
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/RollbackNetworkRequest.java
@@ -0,0 +1,49 @@
+/*-
+ * ============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.nwrest;
+
+
+
+import org.openecomp.mso.openstack.beans.NetworkRollback;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.resteasy.annotations.providers.NoJackson;
+import org.codehaus.jackson.map.annotate.JsonRootName;
+
+@JsonRootName("rollbackNetworkRequest")
+@XmlRootElement(name = "rollbackNetworkRequest")
+@NoJackson
+public class RollbackNetworkRequest extends NetworkRequestCommon {
+	private NetworkRollback networkRollback;
+
+	public RollbackNetworkRequest() {
+		super();
+	}
+
+	public NetworkRollback getNetworkRollback() {
+		return networkRollback;
+	}
+
+	public void setNetworkRollback(NetworkRollback networkRollback) {
+		this.networkRollback = networkRollback;
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/RollbackNetworkResponse.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/RollbackNetworkResponse.java
new file mode 100644
index 0000000000..a7b3c16efa
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/RollbackNetworkResponse.java
@@ -0,0 +1,53 @@
+/*-
+ * ============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.nwrest;
+
+
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.resteasy.annotations.providers.NoJackson;
+import org.codehaus.jackson.map.annotate.JsonRootName;
+
+@JsonRootName("rollbackNetworkResponse")
+@XmlRootElement(name = "rollbackNetworkResponse")
+@NoJackson
+public class RollbackNetworkResponse extends NetworkResponseCommon {
+
+	private Boolean networkRolledBack;
+
+	public RollbackNetworkResponse() {
+		super();
+	}
+	
+	public RollbackNetworkResponse(Boolean networkRolledBack, String messageId) {
+		super(messageId);
+		this.networkRolledBack = networkRolledBack;
+	}
+
+	public Boolean getNetworkRolledBack() {
+		return networkRolledBack;
+	}
+
+	public void setNetworkRolledBack(Boolean networkRolledBack) {
+		this.networkRolledBack = networkRolledBack;
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/UpdateNetworkError.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/UpdateNetworkError.java
new file mode 100644
index 0000000000..f7066daa83
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/UpdateNetworkError.java
@@ -0,0 +1,48 @@
+/*-
+ * ============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.nwrest;
+
+
+import java.io.Serializable;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+import org.openecomp.mso.openstack.exceptions.MsoExceptionCategory;
+
+@XmlRootElement(name = "updateNetworkError")
+@NoJackson
+public class UpdateNetworkError extends NetworkExceptionResponse implements Serializable {
+	private static final long serialVersionUID = 46820809807914392L;
+
+	public UpdateNetworkError() {
+		super("");
+	}
+
+	public UpdateNetworkError(String message) {
+		super(message);
+	}
+
+	public UpdateNetworkError(String message, MsoExceptionCategory category, boolean unused, String messageid) {
+		super(message, category, unused, messageid);
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/UpdateNetworkRequest.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/UpdateNetworkRequest.java
new file mode 100644
index 0000000000..5ddc050131
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/UpdateNetworkRequest.java
@@ -0,0 +1,178 @@
+/*-
+ * ============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.nwrest;
+
+
+
+import org.openecomp.mso.entity.MsoRequest;
+import org.openecomp.mso.openstack.beans.Subnet;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+import org.codehaus.jackson.map.annotate.JsonRootName;
+
+@JsonRootName("updateNetworkRequest")
+@XmlRootElement(name = "updateNetworkRequest")
+@NoJackson
+public class UpdateNetworkRequest extends NetworkRequestCommon {
+	private String cloudSiteId;
+	private String tenantId;
+	private String networkId;
+	private String networkStackId;
+	private String networkName;
+	private String networkType;
+	private String networkTypeVersion;
+	private NetworkTechnology networkTechnology = NetworkTechnology.NEUTRON;
+	private List<Subnet> subnets;
+	private ProviderVlanNetwork providerVlanNetwork;
+	private ContrailNetwork contrailNetwork;
+	private Boolean backout = true;
+	private Map<String,String> networkParams = new HashMap<String, String>();
+	private MsoRequest msoRequest = new MsoRequest();
+
+	public UpdateNetworkRequest() {
+		super();
+	}
+
+	public String getCloudSiteId() {
+		return cloudSiteId;
+	}
+
+	public void setCloudSiteId(String cloudSiteId) {
+		this.cloudSiteId = cloudSiteId;
+	}
+
+	public String getTenantId() {
+		return tenantId;
+	}
+
+	public void setTenantId(String tenantId) {
+		this.tenantId = tenantId;
+	}
+
+	public String getNetworkId() {
+		return networkId;
+	}
+
+	public void setNetworkId(String networkId) {
+		this.networkId = networkId;
+	}
+
+	public String getNetworkStackId() {
+		return networkStackId;
+	}
+
+	public void setNetworkStackId(String networkStackId) {
+		this.networkStackId = networkStackId;
+	}
+
+	public String getNetworkName() {
+		return networkName;
+	}
+
+	public void setNetworkName(String networkName) {
+		this.networkName = networkName;
+	}
+
+	public String getNetworkType() {
+		return networkType;
+	}
+
+	public void setNetworkType(String networkType) {
+		this.networkType = networkType;
+	}
+
+	public String getNetworkTypeVersion() {
+		return networkTypeVersion;
+	}
+
+	public void setNetworkTypeVersion(String networkTypeVersion) {
+		this.networkTypeVersion = networkTypeVersion;
+	}
+
+	public String getNetworkTechnology() {
+		return networkTechnology.toString();
+	}
+
+	public void setNetworkTechnology(String networkTechnology) {
+		try {
+			this.networkTechnology = NetworkTechnology.valueOf(networkTechnology.toUpperCase());
+		} catch (IllegalArgumentException e) {
+			// ignore
+		}
+	}
+
+	public List<Subnet> getSubnets() {
+		return subnets;
+	}
+
+	public void setSubnets(List<Subnet> subnets) {
+		this.subnets = subnets;
+	}
+
+	public ProviderVlanNetwork getProviderVlanNetwork() {
+		return providerVlanNetwork;
+	}
+
+	public void setProviderVlanNetwork(ProviderVlanNetwork providerVlanNetwork) {
+		this.providerVlanNetwork = providerVlanNetwork;
+	}
+
+	public ContrailNetwork getContrailNetwork() {
+		return contrailNetwork;
+	}
+
+	public void setContrailNetwork(ContrailNetwork contrailNetwork) {
+		this.contrailNetwork = contrailNetwork;
+	}
+
+	public Boolean getBackout() {
+		return backout;
+	}
+
+	public void setBackout(Boolean backout) {
+		this.backout = backout;
+	}
+
+	public Map<String, String> getNetworkParams() {
+		return networkParams;
+	}
+
+	public void setNetworkParams(Map<String, String> networkParams) {
+		this.networkParams = networkParams;
+	}
+
+	public MsoRequest getMsoRequest() {
+		return msoRequest;
+	}
+
+	public void setMsoRequest(MsoRequest msoRequest) {
+		this.msoRequest = msoRequest;
+	}
+
+	public boolean isContrailRequest() {
+		return (networkTechnology == NetworkTechnology.CONTRAIL) && (contrailNetwork != null);
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/UpdateNetworkResponse.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/UpdateNetworkResponse.java
new file mode 100644
index 0000000000..d1531bf1ff
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/nwrest/UpdateNetworkResponse.java
@@ -0,0 +1,73 @@
+/*-
+ * ============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.nwrest;
+
+
+
+import java.util.Map;
+import javax.xml.bind.annotation.XmlRootElement;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+import org.codehaus.jackson.map.annotate.JsonRootName;
+
+@JsonRootName("updateNetworkResponse")
+@XmlRootElement(name = "updateNetworkResponse")
+@NoJackson
+public class UpdateNetworkResponse extends NetworkResponseCommon {
+	
+	private String networkId;
+	private String neutronNetworkId;
+	private Map<String, String> subnetMap;
+	
+	public UpdateNetworkResponse() {
+	}
+	
+	public UpdateNetworkResponse(String networkId, String neutronNetworkId,
+			Map<String, String> subnetMap, String messageId) {
+		super(messageId);
+		this.networkId = networkId;
+		this.neutronNetworkId = neutronNetworkId;
+		this.subnetMap = subnetMap;
+	}
+
+	public String getNetworkId() {
+		return networkId;
+	}
+
+	public void setNetworkId(String networkId) {
+		this.networkId = networkId;
+	}
+
+	public String getNeutronNetworkId() {
+		return neutronNetworkId;
+	}
+
+	public void setNeutronNetworkId(String neutronNetworkId) {
+		this.neutronNetworkId = neutronNetworkId;
+	}
+
+	public Map<String, String> getSubnetMap() {
+		return subnetMap;
+	}
+
+	public void setSubnetMap(Map<String, String> subnetMap) {
+		this.subnetMap = subnetMap;
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/CreateTenantError.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/CreateTenantError.java
new file mode 100644
index 0000000000..2a624a8934
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/CreateTenantError.java
@@ -0,0 +1,73 @@
+/*-
+ * ============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.tenantrest;
+
+
+
+import java.io.Serializable;
+import javax.xml.bind.annotation.XmlRootElement;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+import org.openecomp.mso.openstack.exceptions.MsoExceptionCategory;
+
+@XmlRootElement(name = "createTenantError")
+@NoJackson
+public class CreateTenantError implements Serializable {
+	private static final long serialVersionUID = 7305288262646805568L;
+	private String message;
+	private MsoExceptionCategory category;
+	private Boolean rolledBack;
+
+	public CreateTenantError () {}
+
+	public CreateTenantError (String message) {
+		this.message = message;
+	}
+
+	public CreateTenantError (String message, MsoExceptionCategory category, boolean rolledBack) {
+		this.message = message;
+		this.category = category;
+		this.rolledBack = rolledBack;
+	}
+
+	public String getMessage() {
+		return message;
+	}
+
+	public void setMessage(String message) {
+		this.message = message;
+	}
+
+	public MsoExceptionCategory getCategory () {
+		return category;
+	}
+
+	public void setCategory (MsoExceptionCategory category) {
+		this.category = category;
+	}
+
+	public Boolean getRolledBack() {
+		return rolledBack;
+	}
+
+	public void setRolledBack(Boolean rolledBack) {
+		this.rolledBack = rolledBack;
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/CreateTenantRequest.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/CreateTenantRequest.java
new file mode 100644
index 0000000000..3bfaf05b15
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/CreateTenantRequest.java
@@ -0,0 +1,98 @@
+/*-
+ * ============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.tenantrest;
+
+
+
+import org.openecomp.mso.entity.MsoRequest;
+import java.util.Map;
+import java.util.HashMap;
+import javax.xml.bind.annotation.XmlRootElement;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+@XmlRootElement(name = "createTenantRequest")
+@NoJackson
+public class CreateTenantRequest extends TenantRequestCommon {
+	private String cloudSiteId;
+	private String tenantName;
+	private Boolean failIfExists;
+	private Boolean backout;
+	private Map<String,String> metadata = new HashMap<String, String>();
+	private MsoRequest msoRequest = new MsoRequest();
+	
+	public CreateTenantRequest() {}
+
+	public String getCloudSiteId() {
+		return cloudSiteId;
+	}
+
+	public void setCloudSiteId(String cloudSiteId) {
+		this.cloudSiteId = cloudSiteId;
+	}
+
+	public String getTenantName() {
+		return tenantName;
+	}
+
+	public void setTenantName(String tenantName) {
+		this.tenantName = tenantName;
+	}
+
+	public Boolean getFailIfExists() {
+		return failIfExists;
+	}
+
+	public void setFailIfExists(Boolean failIfExists) {
+		this.failIfExists = failIfExists;
+	}
+
+	public Boolean getBackout() {
+		return backout;
+	}
+
+	public void setBackout(Boolean backout) {
+		this.backout = backout;
+	}
+
+	public Map<String, String> getMetadata() {
+		return metadata;
+	}
+
+	public void setMetadata(Map<String, String> metadata) {
+		this.metadata = metadata;
+	}
+
+	public MsoRequest getMsoRequest() {
+		return msoRequest;
+	}
+
+	public void setMsoRequest(MsoRequest msoRequest) {
+		this.msoRequest = msoRequest;
+	}
+
+	@Override
+	public String toString() {
+		return "CreateTenantRequest [cloudSiteId=" + cloudSiteId
+				+ ", tenantName=" + tenantName + ", failIfExists="
+				+ failIfExists + ", backout=" + backout + ", metadata="
+				+ metadata + "]";
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/CreateTenantResponse.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/CreateTenantResponse.java
new file mode 100644
index 0000000000..d25d2b47c8
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/CreateTenantResponse.java
@@ -0,0 +1,86 @@
+/*-
+ * ============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.tenantrest;
+
+
+
+import java.io.Serializable;
+import javax.xml.bind.annotation.XmlRootElement;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+@XmlRootElement(name = "createTenantResponse")
+@NoJackson
+public class CreateTenantResponse implements Serializable {
+	private static final long serialVersionUID = -456155026754759682L;
+	private String cloudSiteId;
+	private String tenantId;
+	private Boolean tenantCreated;
+	private TenantRollback tenantRollback = new TenantRollback();
+	
+	public CreateTenantResponse() {}
+
+	public CreateTenantResponse(String cloudSiteId, String tenantId,
+			Boolean tenantCreated, TenantRollback tenantRollback) {
+		this.cloudSiteId = cloudSiteId;
+		this.tenantId = tenantId;
+		this.tenantCreated = tenantCreated;
+		this.tenantRollback = tenantRollback;
+	}
+
+	public String getCloudSiteId() {
+		return cloudSiteId;
+	}
+
+	public void setCloudSiteId(String cloudSiteId) {
+		this.cloudSiteId = cloudSiteId;
+	}
+
+	public String getTenantId() {
+		return tenantId;
+	}
+
+	public void setTenantId(String tenantId) {
+		this.tenantId = tenantId;
+	}
+
+	public Boolean getTenantCreated() {
+		return tenantCreated;
+	}
+
+	public void setTenantCreated(Boolean tenantCreated) {
+		this.tenantCreated = tenantCreated;
+	}
+
+	public TenantRollback getTenantRollback() {
+		return tenantRollback;
+	}
+
+	public void setTenantRollback(TenantRollback tenantRollback) {
+		this.tenantRollback = tenantRollback;
+	}
+
+	@Override
+	public String toString() {
+		return "CreateTenantResponse [cloudSiteId=" + cloudSiteId
+				+ ", tenantId=" + tenantId + ", tenantCreated=" + tenantCreated
+				+ ", tenantRollback=" + tenantRollback.toString() +  "]";
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/DeleteTenantError.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/DeleteTenantError.java
new file mode 100644
index 0000000000..e55e58f294
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/DeleteTenantError.java
@@ -0,0 +1,73 @@
+/*-
+ * ============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.tenantrest;
+
+
+
+import java.io.Serializable;
+import javax.xml.bind.annotation.XmlRootElement;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+import org.openecomp.mso.openstack.exceptions.MsoExceptionCategory;
+
+@XmlRootElement(name = "deleteTenantError")
+@NoJackson
+public class DeleteTenantError implements Serializable {
+	private static final long serialVersionUID = -5778340182805870809L;
+	private String message;
+	private MsoExceptionCategory category;
+	private Boolean rolledBack;
+
+	public DeleteTenantError () {}
+
+	public DeleteTenantError (String message) {
+		this.message = message;
+	}
+
+	public DeleteTenantError (String message, MsoExceptionCategory category, boolean rolledBack) {
+		this.message = message;
+		this.category = category;
+		this.rolledBack = rolledBack;
+	}
+
+	public String getMessage() {
+		return message;
+	}
+
+	public void setMessage(String message) {
+		this.message = message;
+	}
+
+	public MsoExceptionCategory getCategory () {
+		return category;
+	}
+
+	public void setCategory (MsoExceptionCategory category) {
+		this.category = category;
+	}
+
+	public Boolean getRolledBack() {
+		return rolledBack;
+	}
+
+	public void setRolledBack(Boolean rolledBack) {
+		this.rolledBack = rolledBack;
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/DeleteTenantRequest.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/DeleteTenantRequest.java
new file mode 100644
index 0000000000..8efb10b83f
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/DeleteTenantRequest.java
@@ -0,0 +1,63 @@
+/*-
+ * ============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.tenantrest;
+
+
+
+import org.openecomp.mso.entity.MsoRequest;
+import javax.xml.bind.annotation.XmlRootElement;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+@XmlRootElement(name = "deleteTenantRequest")
+@NoJackson
+public class DeleteTenantRequest extends TenantRequestCommon {
+
+	private String cloudSiteId;
+	private String tenantId;
+
+	private MsoRequest msoRequest = new MsoRequest();
+
+	public DeleteTenantRequest() {}
+	
+	public String getCloudSiteId() {
+		return cloudSiteId;
+	}
+
+	public void setCloudSiteId(String cloudSiteId) {
+		this.cloudSiteId = cloudSiteId;
+	}
+
+	public String getTenantId() {
+		return tenantId;
+	}
+
+	public void setTenantId(String tenantId) {
+		this.tenantId = tenantId;
+	}
+
+	public MsoRequest getMsoRequest() {
+		return msoRequest;
+	}
+
+	public void setMsoRequest(MsoRequest msoRequest) {
+		this.msoRequest = msoRequest;
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/DeleteTenantResponse.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/DeleteTenantResponse.java
new file mode 100644
index 0000000000..f2a1d38171
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/DeleteTenantResponse.java
@@ -0,0 +1,43 @@
+/*-
+ * ============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.tenantrest;
+
+
+
+import javax.xml.bind.annotation.XmlRootElement;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+@XmlRootElement(name = "deleteTenantResponse")
+@NoJackson
+public class DeleteTenantResponse {
+
+	private Boolean tenantDeleted;
+
+	public DeleteTenantResponse() {}
+	
+	public Boolean getTenantDeleted() {
+		return tenantDeleted;
+	}
+
+	public void setTenantDeleted(Boolean tenantDeleted) {
+		this.tenantDeleted = tenantDeleted;
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/HealthCheckHandler.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/HealthCheckHandler.java
new file mode 100644
index 0000000000..531a683aca
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/HealthCheckHandler.java
@@ -0,0 +1,51 @@
+/*-
+ * ============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.tenantrest;
+
+
+
+import javax.ws.rs.GET;
+import javax.ws.rs.HEAD;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Response;
+
+import org.apache.http.HttpStatus;
+
+import org.openecomp.mso.logger.MsoLogger;
+
+@Path("/")
+public class HealthCheckHandler {
+	
+	private static MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.RA);
+    private static final String CHECK_HTML = "<!DOCTYPE html><html><head><meta charset=\"ISO-8859-1\"><title>Health Check</title></head><body>Application ready</body></html>";
+    private static final Response HEALTH_CHECK_RESPONSE = Response.status (HttpStatus.SC_OK)
+                                                                  .entity (CHECK_HTML)
+                                                                  .build ();
+    @HEAD
+    @GET
+    @Path("/healthcheck")
+    @Produces("text/html")
+    public Response healthcheck () {
+    	msoLogger.debug ("Health check call in Tenant Adapter");
+        return HEALTH_CHECK_RESPONSE;
+    }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/QueryTenantError.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/QueryTenantError.java
new file mode 100644
index 0000000000..100df47018
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/QueryTenantError.java
@@ -0,0 +1,63 @@
+/*-
+ * ============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.tenantrest;
+
+
+
+import java.io.Serializable;
+import javax.xml.bind.annotation.XmlRootElement;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+import org.openecomp.mso.openstack.exceptions.MsoExceptionCategory;
+
+@XmlRootElement(name = "queryTenantError")
+@NoJackson
+public class QueryTenantError implements Serializable {
+	private static final long serialVersionUID = 7358240830662453507L;
+	private String message;
+	private MsoExceptionCategory category;
+
+	public QueryTenantError () {}
+
+	public QueryTenantError (String message) {
+		this.message = message;
+	}
+
+	public QueryTenantError (String message, MsoExceptionCategory category) {
+		this.message = message;
+		this.category = category;
+	}
+
+	public String getMessage() {
+		return message;
+	}
+
+	public void setMessage(String message) {
+		this.message = message;
+	}
+
+	public MsoExceptionCategory getCategory () {
+		return category;
+	}
+
+	public void setCategory (MsoExceptionCategory category) {
+		this.category = category;
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/QueryTenantResponse.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/QueryTenantResponse.java
new file mode 100644
index 0000000000..5fb5db7b5e
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/QueryTenantResponse.java
@@ -0,0 +1,64 @@
+/*-
+ * ============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.tenantrest;
+
+
+
+import java.util.Map;
+import javax.xml.bind.annotation.XmlRootElement;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+@XmlRootElement(name = "queryTenantResponse")
+@NoJackson
+public class QueryTenantResponse extends TenantRequestCommon {
+	private String tenantId;
+	private String tenantName;
+	private Map<String,String> metadata;
+	
+	public QueryTenantResponse() {}
+	
+	public QueryTenantResponse (String id, String name, Map<String,String> metadata) {
+		this.tenantId = id;
+		this.tenantName = name;
+		this.metadata = metadata;
+	}
+	
+	public String getTenantId() {
+		return tenantId;
+	}
+	public void setTenantId(String tenantId) {
+		this.tenantId = tenantId;
+	}
+	
+	public String getTenantName() {
+		return tenantName;
+	}
+	public void setTenantName(String tenantName) {
+		this.tenantName = tenantName;
+	}
+	
+	public Map<String, String> getMetadata() {
+		return metadata;
+	}
+	public void setMetadata(Map<String, String> metadata) {
+		this.metadata = metadata;
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/RollbackTenantError.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/RollbackTenantError.java
new file mode 100644
index 0000000000..0327cefbd5
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/RollbackTenantError.java
@@ -0,0 +1,73 @@
+/*-
+ * ============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.tenantrest;
+
+
+
+import java.io.Serializable;
+import javax.xml.bind.annotation.XmlRootElement;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+import org.openecomp.mso.openstack.exceptions.MsoExceptionCategory;
+
+@XmlRootElement(name = "rollbackTenantError")
+@NoJackson
+public class RollbackTenantError implements Serializable {
+	private static final long serialVersionUID = -5313713674529615223L;
+	private String message;
+	private MsoExceptionCategory category;
+	private Boolean rolledBack;
+
+	public RollbackTenantError () {}
+
+	public RollbackTenantError (String message) {
+		this.message = message;
+	}
+
+	public RollbackTenantError (String message, MsoExceptionCategory category, boolean rolledBack) {
+		this.message = message;
+		this.category = category;
+		this.rolledBack = rolledBack;
+	}
+
+	public String getMessage() {
+		return message;
+	}
+
+	public void setMessage(String message) {
+		this.message = message;
+	}
+
+	public MsoExceptionCategory getCategory () {
+		return category;
+	}
+
+	public void setCategory (MsoExceptionCategory category) {
+		this.category = category;
+	}
+
+	public Boolean getRolledBack() {
+		return rolledBack;
+	}
+
+	public void setRolledBack(Boolean rolledBack) {
+		this.rolledBack = rolledBack;
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/RollbackTenantRequest.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/RollbackTenantRequest.java
new file mode 100644
index 0000000000..a78da38692
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/RollbackTenantRequest.java
@@ -0,0 +1,43 @@
+/*-
+ * ============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.tenantrest;
+
+
+
+import javax.xml.bind.annotation.XmlRootElement;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+@XmlRootElement(name = "rollbackTenantRequest")
+@NoJackson
+public class RollbackTenantRequest extends TenantRequestCommon {
+
+	private TenantRollback tenantRollback;
+
+	public RollbackTenantRequest() {}
+
+	public TenantRollback getTenantRollback() {
+		return tenantRollback;
+	}
+
+	public void setTenantRollback(TenantRollback tenantRollback) {
+		this.tenantRollback = tenantRollback;
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/RollbackTenantResponse.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/RollbackTenantResponse.java
new file mode 100644
index 0000000000..ec9632fbc5
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/RollbackTenantResponse.java
@@ -0,0 +1,43 @@
+/*-
+ * ============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.tenantrest;
+
+
+
+import javax.xml.bind.annotation.XmlRootElement;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+@XmlRootElement(name = "rollbackTenantResponse")
+@NoJackson
+public class RollbackTenantResponse {
+
+	private Boolean tenantRolledback;
+
+	public RollbackTenantResponse() {}
+	
+	public Boolean getTenantRolledback() {
+		return tenantRolledback;
+	}
+
+	public void setTenantRolledback(Boolean tenantRolledback) {
+		this.tenantRolledback = tenantRolledback;
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/TenantExceptionResponse.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/TenantExceptionResponse.java
new file mode 100644
index 0000000000..5a79243e42
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/TenantExceptionResponse.java
@@ -0,0 +1,76 @@
+/*-
+ * ============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.tenantrest;
+
+
+
+import org.openecomp.mso.openstack.exceptions.MsoExceptionCategory;
+import java.io.Serializable;
+import javax.xml.bind.annotation.XmlRootElement;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+@XmlRootElement(name = "createTenantResponse")
+@NoJackson
+public class TenantExceptionResponse implements Serializable {
+
+    private static final long serialVersionUID = -9062290006520066109L;
+
+    private String message;
+	private MsoExceptionCategory category;
+	private Boolean rolledBack;
+
+	public TenantExceptionResponse () {}
+
+	public TenantExceptionResponse (String message) {
+		this.message = message;
+	}
+
+	public TenantExceptionResponse (String message, MsoExceptionCategory category, boolean rolledBack) {
+		this.message = message;
+		this.category = category;
+		this.rolledBack = rolledBack;
+	}
+
+	public String getMessage() {
+		return message;
+	}
+
+	public void setMessage(String message) {
+		this.message = message;
+	}
+
+	public MsoExceptionCategory getCategory () {
+		return category;
+	}
+
+	public void setCategory (MsoExceptionCategory category) {
+		this.category = category;
+	}
+
+	public Boolean getRolledBack() {
+		return rolledBack;
+	}
+
+	public void setRolledBack(Boolean rolledBack) {
+		this.rolledBack = rolledBack;
+	}
+	
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/TenantRequestCommon.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/TenantRequestCommon.java
new file mode 100644
index 0000000000..972d5eb6fa
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/TenantRequestCommon.java
@@ -0,0 +1,61 @@
+/*-
+ * ============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.tenantrest;
+
+
+import java.io.ByteArrayOutputStream;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.Marshaller;
+
+import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.map.SerializationConfig;
+
+public class TenantRequestCommon {
+	public String toJsonString() {
+		try {
+			String jsonString = null;
+			ObjectMapper mapper = new ObjectMapper();
+			mapper.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
+			jsonString = mapper.writeValueAsString(this);
+			return jsonString;
+		} catch (Exception e) {
+			// Shouldn't happen...
+			e.printStackTrace();
+			return "";
+		}
+	}
+
+	public String toXmlString() {
+		try {
+			ByteArrayOutputStream bs = new ByteArrayOutputStream();
+			JAXBContext context = JAXBContext.newInstance(this.getClass());
+			Marshaller marshaller = context.createMarshaller();
+			marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); //pretty print XML
+			marshaller.marshal(this, bs);
+			return bs.toString();
+		} catch (Exception e) {
+			// Shouldn't happen...
+			e.printStackTrace();
+			return "";
+		}
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/TenantRollback.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/TenantRollback.java
new file mode 100644
index 0000000000..3d346afabe
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/tenantrest/TenantRollback.java
@@ -0,0 +1,81 @@
+/*-
+ * ============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.tenantrest;
+
+
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.openecomp.mso.entity.MsoRequest;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+/**
+ * Javabean representing the rollback criteria following a "Create Tenant"
+ * operation.  This structure can be passed back to the "Rollback Tenant"
+ * operation to undo the effects of the create.
+ *
+ *
+ */
+
+@XmlRootElement(name = "rollbackTenantRequest")
+@NoJackson
+public class TenantRollback extends TenantRequestCommon {
+	private String tenantId;
+	private String cloudId;
+	private boolean tenantCreated = false;
+	private MsoRequest msoRequest;
+
+	public TenantRollback() {}
+	
+	public String getTenantId() {
+		return tenantId;
+	}
+	public void setTenantId(String tenantId) {
+		this.tenantId = tenantId;
+	}
+
+	public String getCloudId() {
+		return cloudId;
+	}
+	public void setCloudId(String cloudId) {
+		this.cloudId = cloudId;
+	}
+
+	public boolean getTenantCreated() {
+		return tenantCreated;
+	}
+	public void setTenantCreated(boolean tenantCreated) {
+		this.tenantCreated = tenantCreated;
+	}
+
+	public MsoRequest getMsoRequest() {
+		return msoRequest;
+	}
+	public void setMsoRequest (MsoRequest msoRequest) {
+		this.msoRequest = msoRequest;
+	}
+
+	@Override
+    public String toString() {
+		return "VnfRollback: cloud=" + cloudId + ", tenant=" + tenantId +
+				", tenantCreated=" + tenantCreated;
+	}
+}
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
new file mode 100644
index 0000000000..f337c4c9de
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/CreateVfModuleRequest.java
@@ -0,0 +1,212 @@
+/*-
+ * ============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.vnfrest;
+
+
+import org.openecomp.mso.entity.MsoRequest;
+
+import java.util.Map;
+import java.util.HashMap;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+import org.codehaus.jackson.map.annotate.JsonRootName;
+
+/* README
+* 1) Used JAXB/Jettison - see @NoJackson annotation on class to get RootElements REad by RestEasy
+* 2) due to 1) Maps need to use this format
+
+"vfModuleParams": {"entry": [
+                         	{"key": "network_id",
+                         	"value": "59ed7b41-2983-413f-ba93-e7d437433916"},
+                         	{"key": "subnet_id",
+                         	"value": "086c9298-5c57-49b7-bb2b-6fd5730c5d92"},
+                         	{"key": "server_name_0",
+                         	"value": "RaaVnf1"}
+                         	]},
+ * 3) to output json see toJSonString method below which required the @JsonRootName annotation and the WRAP_ROOT feature enabled
+ * 4) Tryong to work with RESTEASY JACKSON and JAXB/JETTISON to conform to Json input/output specs
+*/
+@JsonRootName("createVfModuleRequest")
+@XmlRootElement(name = "createVfModuleRequest")
+@NoJackson
+public class CreateVfModuleRequest extends VfRequestCommon {
+	private String cloudSiteId;
+	private String tenantId;
+
+	private String vnfId;
+	private String vnfType;
+	private String vnfVersion;
+
+	private String vfModuleId;
+	private String vfModuleName;
+	private String vfModuleType;
+
+	private String volumeGroupId;
+	private String volumeGroupStackId;
+	private String baseVfModuleId;
+	private String baseVfModuleStackId;
+
+	private String requestType;
+	private Boolean failIfExists;
+	private Boolean backout;
+
+	private Map<String,String> vfModuleParams = new HashMap<String, String>();
+	private MsoRequest msoRequest = new MsoRequest();
+
+	public String getCloudSiteId() {
+		return cloudSiteId;
+	}
+
+	public void setCloudSiteId(String cloudSiteId) {
+		this.cloudSiteId = cloudSiteId;
+	}
+
+	public String getTenantId() {
+		return tenantId;
+	}
+
+	public void setTenantId(String tenantId) {
+		this.tenantId = tenantId;
+	}
+
+	public String getVnfId() {
+		return vnfId;
+	}
+
+	public void setVnfId(String vnfId) {
+		this.vnfId = vnfId;
+	}
+
+	public String getVfModuleName() {
+		return vfModuleName;
+	}
+
+	public void setVfModuleName(String vfModuleName) {
+		this.vfModuleName = vfModuleName;
+	}
+
+	public String getVnfType() {
+		return vnfType;
+	}
+
+	public void setVnfType(String vnfType) {
+		this.vnfType = vnfType;
+	}
+
+	public String getVnfVersion() {
+		return vnfVersion;
+	}
+
+	public void setVnfVersion(String vnfVersion) {
+		this.vnfVersion = vnfVersion;
+	}
+
+	public String getVfModuleId() {
+		return vfModuleId;
+	}
+
+	public void setVfModuleId(String vfModuleId) {
+		this.vfModuleId = vfModuleId;
+	}
+
+	public String getVfModuleType() {
+		return vfModuleType;
+	}
+
+	public void setVfModuleType(String vfModuleType) {
+		this.vfModuleType = vfModuleType;
+	}
+
+	public String getVolumeGroupId() {
+		return volumeGroupId;
+	}
+
+	public void setVolumeGroupId(String volumeGroupId) {
+		this.volumeGroupId = volumeGroupId;
+	}
+
+	public String getVolumeGroupStackId() {
+		return volumeGroupStackId;
+	}
+
+	public void setVolumeGroupStackId(String volumeGroupStackId) {
+		this.volumeGroupStackId = volumeGroupStackId;
+	}
+
+	public String getBaseVfModuleId() {
+		return baseVfModuleId;
+	}
+
+	public void setBaseVfModuleId(String baseVfModuleId) {
+		this.baseVfModuleId = baseVfModuleId;
+	}
+
+	public String getBaseVfModuleStackId() {
+		return baseVfModuleStackId;
+	}
+
+	public void setBaseVfModuleStackId(String baseVfModuleStackId) {
+		this.baseVfModuleStackId = baseVfModuleStackId;
+	}
+
+	public String getRequestType() {
+		return requestType;
+	}
+
+	public void setRequestType(String requestType) {
+		this.requestType = requestType;
+	}
+
+	public Boolean getFailIfExists() {
+		return failIfExists;
+	}
+
+	public void setFailIfExists(Boolean failIfExists) {
+		this.failIfExists = failIfExists;
+	}
+
+	public Boolean getBackout() {
+		return backout;
+	}
+
+	public void setBackout(Boolean backout) {
+		this.backout = backout;
+	}
+
+	public Map<String, String> getVfModuleParams() {
+		return vfModuleParams;
+	}
+
+	public void setVfModuleParams(Map<String, String> vfModuleParams) {
+		this.vfModuleParams = vfModuleParams;
+	}
+
+	public MsoRequest getMsoRequest() {
+		return msoRequest;
+	}
+
+	public void setMsoRequest(MsoRequest msoRequest) {
+		this.msoRequest = msoRequest;
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/CreateVfModuleResponse.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/CreateVfModuleResponse.java
new file mode 100644
index 0000000000..566a136712
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/CreateVfModuleResponse.java
@@ -0,0 +1,106 @@
+/*-
+ * ============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.vnfrest;
+
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+import org.codehaus.jackson.map.annotate.JsonRootName;
+
+@JsonRootName("createVfModuleResponse")
+@XmlRootElement(name = "createVfModuleResponse")
+@NoJackson
+public class CreateVfModuleResponse extends VfResponseCommon {
+	private String vnfId;
+	private String vfModuleId;
+	private String vfModuleStackId;
+	private Boolean vfModuleCreated;
+	private Map<String,String> vfModuleOutputs = new HashMap<String, String>();
+	private VfModuleRollback rollback = new VfModuleRollback();
+
+	public CreateVfModuleResponse() {
+		super();
+	}
+
+	public CreateVfModuleResponse(String vnfId, String vfModuleId,
+			String vfModuleStackId, Boolean vfModuleCreated,
+			Map<String, String> vfModuleOutputs, VfModuleRollback rollback,
+			String messageId) {
+		super(messageId);
+		this.vnfId = vnfId;
+		this.vfModuleId = vfModuleId;
+		this.vfModuleStackId = vfModuleStackId;
+		this.vfModuleCreated = vfModuleCreated;
+		this.vfModuleOutputs = vfModuleOutputs;
+		this.rollback = rollback;
+	}
+
+	public String getVnfId() {
+		return vnfId;
+	}
+
+	public void setVnfId(String vnfId) {
+		this.vnfId = vnfId;
+	}
+
+	public String getVfModuleId() {
+		return vfModuleId;
+	}
+
+	public void setVfModuleId(String vfModuleId) {
+		this.vfModuleId = vfModuleId;
+	}
+
+	public String getVfModuleStackId() {
+		return vfModuleStackId;
+	}
+
+	public void setVfModuleStackId(String vfModuleStackId) {
+		this.vfModuleStackId = vfModuleStackId;
+	}
+
+	public Boolean getVfModuleCreated() {
+		return vfModuleCreated;
+	}
+
+	public void setVfModuleCreated(Boolean vfModuleCreated) {
+		this.vfModuleCreated = vfModuleCreated;
+	}
+
+	public Map<String, String> getVfModuleOutputs() {
+		return vfModuleOutputs;
+	}
+
+	public void setVfModuleOutputs(Map<String, String> vfModuleOutputs) {
+		this.vfModuleOutputs = vfModuleOutputs;
+	}
+
+	public VfModuleRollback getRollback() {
+		return rollback;
+	}
+
+	public void setRollback(VfModuleRollback rollback) {
+		this.rollback = rollback;
+	}
+}
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
new file mode 100644
index 0000000000..b93a26031f
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/CreateVolumeGroupRequest.java
@@ -0,0 +1,141 @@
+/*-
+ * ============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.vnfrest;
+
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.codehaus.jackson.map.annotate.JsonRootName;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+import org.openecomp.mso.entity.MsoRequest;
+
+@JsonRootName("createVolumeGroupRequest")
+@XmlRootElement(name = "createVolumeGroupRequest")
+@NoJackson
+public class CreateVolumeGroupRequest extends VfRequestCommon {
+	private String cloudSiteId;
+	private String tenantId;
+	private String volumeGroupName;
+	private String volumeGroupId;
+	private String vnfType;
+	private String vnfVersion;
+	private String vfModuleType;
+	private Map<String,String> volumeGroupParams = new HashMap<String, String>();
+	private Boolean failIfExists;
+	private Boolean suppressBackout;
+	private MsoRequest msoRequest = new MsoRequest();
+
+	public CreateVolumeGroupRequest() {
+		super();
+	}
+
+	public String getCloudSiteId() {
+		return cloudSiteId;
+	}
+
+	public void setCloudSiteId(String cloudSiteId) {
+		this.cloudSiteId = cloudSiteId;
+	}
+
+	public String getTenantId() {
+		return tenantId;
+	}
+
+	public void setTenantId(String tenantId) {
+		this.tenantId = tenantId;
+	}
+
+	public String getVnfType() {
+		return vnfType;
+	}
+
+	public void setVnfType(String vnfType) {
+		this.vnfType = vnfType;
+	}
+
+	public String getVnfVersion() {
+		return vnfVersion;
+	}
+
+	public void setVnfVersion(String vnfVersion) {
+		this.vnfVersion = vnfVersion;
+	}
+
+	public String getVfModuleType() {
+		return vfModuleType;
+	}
+
+	public void setVfModuleType(String vfModuleType) {
+		this.vfModuleType = vfModuleType;
+	}
+
+	public Map<String, String> getVolumeGroupParams() {
+		return volumeGroupParams;
+	}
+
+	public void setVolumeGroupParams(Map<String, String> volumeGroupParams) {
+		this.volumeGroupParams = volumeGroupParams;
+	}
+
+	public String getVolumeGroupName() {
+		return volumeGroupName;
+	}
+
+	public void setVolumeGroupName(String volumeGroupName) {
+		this.volumeGroupName = volumeGroupName;
+	}
+
+	public String getVolumeGroupId() {
+		return volumeGroupId;
+	}
+
+	public void setVolumeGroupId(String volumeGroupId) {
+		this.volumeGroupId = volumeGroupId;
+	}
+
+	public Boolean getFailIfExists() {
+		return failIfExists;
+	}
+
+	public void setFailIfExists(Boolean failIfExists) {
+		this.failIfExists = failIfExists;
+	}
+
+	public Boolean getSuppressBackout() {
+		return suppressBackout;
+	}
+
+	public void setSuppressBackout(Boolean suppressBackout) {
+		this.suppressBackout = suppressBackout;
+	}
+
+	public MsoRequest getMsoRequest() {
+		return msoRequest;
+	}
+
+	public void setMsoRequest(MsoRequest msoRequest) {
+		this.msoRequest = msoRequest;
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/CreateVolumeGroupResponse.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/CreateVolumeGroupResponse.java
new file mode 100644
index 0000000000..abf599b13d
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/CreateVolumeGroupResponse.java
@@ -0,0 +1,101 @@
+/*-
+ * ============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.vnfrest;
+
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.codehaus.jackson.map.annotate.JsonRootName;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+@JsonRootName("createVolumeGroupResponse")
+@XmlRootElement(name = "createVolumeGroupResponse")
+@NoJackson
+public class CreateVolumeGroupResponse extends VfResponseCommon {
+	private String volumeGroupId;
+	private String volumeGroupStackId;
+	private Boolean volumeGroupCreated;
+	private Map<String,String> volumeGroupOutputs = new HashMap<String, String>();
+	private VolumeGroupRollback volumeGroupRollback = new VolumeGroupRollback();
+
+	public CreateVolumeGroupResponse() {
+		super();
+	}
+
+	public CreateVolumeGroupResponse(
+			String volumeGroupId,
+			String volumeGroupStackId,
+			Boolean volumeGroupCreated,
+			Map<String, String> volumeGroupOutputs,
+			VolumeGroupRollback volumeGroupRollback,
+			String messageId)
+	{
+		super(messageId);
+		this.volumeGroupId = volumeGroupId;
+		this.volumeGroupStackId = volumeGroupStackId;
+		this.volumeGroupCreated = volumeGroupCreated;
+		this.volumeGroupOutputs = volumeGroupOutputs;
+		this.volumeGroupRollback = volumeGroupRollback;
+	}
+
+	public String getVolumeGroupId() {
+		return volumeGroupId;
+	}
+
+	public void setVolumeGroupId(String volumeGroupId) {
+		this.volumeGroupId = volumeGroupId;
+	}
+
+	public String getVolumeGroupStackId() {
+		return volumeGroupStackId;
+	}
+
+	public void setVolumeGroupStackId(String volumeGroupStackId) {
+		this.volumeGroupStackId = volumeGroupStackId;
+	}
+
+	public Boolean getVolumeGroupCreated() {
+		return volumeGroupCreated;
+	}
+
+	public void setVolumeGroupCreated(Boolean volumeGroupCreated) {
+		this.volumeGroupCreated = volumeGroupCreated;
+	}
+
+	public Map<String, String> getVolumeGroupOutputs() {
+		return volumeGroupOutputs;
+	}
+
+	public void setVolumeGroupOutputs(Map<String, String> volumeGroupOutputs) {
+		this.volumeGroupOutputs = volumeGroupOutputs;
+	}
+
+	public VolumeGroupRollback getVolumeGroupRollback() {
+		return volumeGroupRollback;
+	}
+
+	public void setVolumeGroupRollback(VolumeGroupRollback volumeGroupRollback) {
+		this.volumeGroupRollback = volumeGroupRollback;
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/DeleteVfModuleRequest.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/DeleteVfModuleRequest.java
new file mode 100644
index 0000000000..14ecd5e654
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/DeleteVfModuleRequest.java
@@ -0,0 +1,93 @@
+/*-
+ * ============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.vnfrest;
+
+
+import org.openecomp.mso.entity.MsoRequest;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+import org.codehaus.jackson.map.annotate.JsonRootName;
+
+@JsonRootName("deleteVfModuleRequest")
+@XmlRootElement(name = "deleteVfModuleRequest")
+@NoJackson
+public class DeleteVfModuleRequest extends VfRequestCommon {
+	private String cloudSiteId;
+	private String tenantId;
+	private String vnfId;
+	private String vfModuleId;
+	private String vfModuleStackId;
+
+	private MsoRequest msoRequest = new MsoRequest();
+
+	public DeleteVfModuleRequest() {
+		super();
+	}
+
+	public String getCloudSiteId() {
+		return cloudSiteId;
+	}
+
+	public void setCloudSiteId(String cloudSiteId) {
+		this.cloudSiteId = cloudSiteId;
+	}
+
+	public String getTenantId() {
+		return tenantId;
+	}
+
+	public void setTenantId(String tenantId) {
+		this.tenantId = tenantId;
+	}
+
+	public String getVnfId() {
+		return vnfId;
+	}
+
+	public void setVnfId(String vnfId) {
+		this.vnfId = vnfId;
+	}
+
+	public String getVfModuleId() {
+		return vfModuleId;
+	}
+
+	public void setVfModuleId(String vfModuleId) {
+		this.vfModuleId = vfModuleId;
+	}
+
+	public String getVfModuleStackId() {
+		return vfModuleStackId;
+	}
+
+	public void setVfModuleStackId(String vfModuleStackId) {
+		this.vfModuleStackId = vfModuleStackId;
+	}
+
+	public MsoRequest getMsoRequest() {
+		return msoRequest;
+	}
+
+	public void setMsoRequest(MsoRequest msoRequest) {
+		this.msoRequest = msoRequest;
+	}
+}
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
new file mode 100644
index 0000000000..a3d00a95cd
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/DeleteVfModuleResponse.java
@@ -0,0 +1,70 @@
+/*-
+ * ============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.vnfrest;
+
+
+import javax.xml.bind.annotation.XmlRootElement;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+import org.codehaus.jackson.map.annotate.JsonRootName;
+
+@JsonRootName("deleteVfModuleResponse")
+@XmlRootElement(name = "deleteVfModuleResponse")
+@NoJackson
+public class DeleteVfModuleResponse extends VfResponseCommon {
+	private String vnfId;
+	private String vfModuleId;
+	private Boolean vfModuleDeleted;
+
+	public DeleteVfModuleResponse() {
+		super();
+	}
+
+	public DeleteVfModuleResponse(String vnfId, String vfModuleId, Boolean vfModuleDeleted, String messageId) {
+		super(messageId);
+		this.vnfId = vnfId;
+		this.vfModuleId = vfModuleId;
+		this.vfModuleDeleted = vfModuleDeleted;
+	}
+
+	public String getVnfId() {
+		return vnfId;
+	}
+
+	public void setVnfId(String vnfId) {
+		this.vnfId = vnfId;
+	}
+
+	public String getVfModuleId() {
+		return vfModuleId;
+	}
+
+	public void setVfModuleId(String vfModuleId) {
+		this.vfModuleId = vfModuleId;
+	}
+
+	public Boolean getVfModuleDeleted() {
+		return vfModuleDeleted;
+	}
+
+	public void setVfModuleDeleted(Boolean vfModuleDeleted) {
+		this.vfModuleDeleted = vfModuleDeleted;
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/DeleteVolumeGroupRequest.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/DeleteVolumeGroupRequest.java
new file mode 100644
index 0000000000..01dc8ffa38
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/DeleteVolumeGroupRequest.java
@@ -0,0 +1,84 @@
+/*-
+ * ============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.vnfrest;
+
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.codehaus.jackson.map.annotate.JsonRootName;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+import org.openecomp.mso.entity.MsoRequest;
+
+@JsonRootName("deleteVolumeGroupRequest")
+@XmlRootElement(name = "deleteVolumeGroupRequest")
+@NoJackson
+public class DeleteVolumeGroupRequest extends VfRequestCommon {
+	private String cloudSiteId;
+	private String tenantId;
+	private String volumeGroupId;
+	private String volumeGroupStackId;
+	private MsoRequest msoRequest = new MsoRequest();
+
+	public DeleteVolumeGroupRequest() {
+		super();
+	}
+
+	public String getCloudSiteId() {
+		return cloudSiteId;
+	}
+
+	public void setCloudSiteId(String cloudSiteId) {
+		this.cloudSiteId = cloudSiteId;
+	}
+
+	public String getTenantId() {
+		return tenantId;
+	}
+
+	public void setTenantId(String tenantId) {
+		this.tenantId = tenantId;
+	}
+
+	public String getVolumeGroupId() {
+		return volumeGroupId;
+	}
+
+	public void setVolumeGroupId(String volumeGroupId) {
+		this.volumeGroupId = volumeGroupId;
+	}
+
+	public String getVolumeGroupStackId() {
+		return volumeGroupStackId;
+	}
+
+	public void setVolumeGroupStackId(String volumeGroupStackId) {
+		this.volumeGroupStackId = volumeGroupStackId;
+	}
+
+	public MsoRequest getMsoRequest() {
+		return msoRequest;
+	}
+
+	public void setMsoRequest(MsoRequest msoRequest) {
+		this.msoRequest = msoRequest;
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/DeleteVolumeGroupResponse.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/DeleteVolumeGroupResponse.java
new file mode 100644
index 0000000000..738abd6923
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/DeleteVolumeGroupResponse.java
@@ -0,0 +1,51 @@
+/*-
+ * ============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.vnfrest;
+
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.codehaus.jackson.map.annotate.JsonRootName;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+@JsonRootName("deleteVolumeGroupResponse")
+@XmlRootElement(name = "deleteVolumeGroupResponse")
+@NoJackson
+public class DeleteVolumeGroupResponse extends VfResponseCommon {
+	private Boolean volumeGroupDeleted;
+
+	public DeleteVolumeGroupResponse() {
+		super();
+	}
+
+	public DeleteVolumeGroupResponse(Boolean volumeGroupDeleted, String messageId) {
+		super(messageId);
+		this.volumeGroupDeleted = volumeGroupDeleted;
+	}
+
+	public Boolean getVolumeGroupDeleted() {
+		return volumeGroupDeleted;
+	}
+
+	public void setVolumeGroupDeleted(Boolean volumeGroupDeleted) {
+		this.volumeGroupDeleted = volumeGroupDeleted;
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/QueryVfModuleResponse.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/QueryVfModuleResponse.java
new file mode 100644
index 0000000000..91da93065d
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/QueryVfModuleResponse.java
@@ -0,0 +1,106 @@
+/*-
+ * ============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.vnfrest;
+
+
+import java.util.Map;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.codehaus.jackson.map.ObjectMapper;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+import org.openecomp.mso.openstack.beans.VnfStatus;
+
+@XmlRootElement(name = "queryVfModuleResponse")
+@NoJackson
+public class QueryVfModuleResponse {
+	private String vnfId;
+	private String vfModuleId;
+	private String vfModuleStackId;
+	private VnfStatus vnfStatus;
+	private Map<String,String> vfModuleOutputs;
+
+	public QueryVfModuleResponse() {
+		super();
+	}
+
+	public QueryVfModuleResponse(String vnfId, String vfModuleId,
+			String vfModuleStackId, VnfStatus vnfStatus,
+			Map<String, String> vfModuleOutputs) {
+		super();
+		this.vnfId = vnfId;
+		this.vfModuleId = vfModuleId;
+		this.vfModuleStackId = vfModuleStackId;
+		this.vnfStatus = vnfStatus;
+		this.vfModuleOutputs = vfModuleOutputs;
+	}
+
+	public String getVnfId() {
+		return vnfId;
+	}
+
+	public void setVnfId(String vnfId) {
+		this.vnfId = vnfId;
+	}
+
+	public String getVfModuleId() {
+		return vfModuleId;
+	}
+
+	public void setVfModuleId(String vfModuleId) {
+		this.vfModuleId = vfModuleId;
+	}
+
+	public String getVfModuleStackId() {
+		return vfModuleStackId;
+	}
+
+	public void setVfModuleStackId(String vfModuleStackId) {
+		this.vfModuleStackId = vfModuleStackId;
+	}
+
+	public VnfStatus getVnfStatus() {
+		return vnfStatus;
+	}
+
+	public void setVnfStatus(VnfStatus vnfStatus) {
+		this.vnfStatus = vnfStatus;
+	}
+
+	public Map<String, String> getVfModuleOutputs() {
+		return vfModuleOutputs;
+	}
+
+	public void setVfModuleOutputs(Map<String, String> vfModuleOutputs) {
+		this.vfModuleOutputs = vfModuleOutputs;
+	}
+
+	public String toJsonString() {
+		String jsonString = null;
+		try {
+			ObjectMapper mapper = new ObjectMapper();
+			jsonString = mapper.writeValueAsString(this);
+		}
+		catch (Exception e) {}
+		return jsonString;
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/QueryVolumeGroupResponse.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/QueryVolumeGroupResponse.java
new file mode 100644
index 0000000000..5e0d8bbe90
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/QueryVolumeGroupResponse.java
@@ -0,0 +1,100 @@
+/*-
+ * ============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.vnfrest;
+
+
+import java.util.Map;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.map.SerializationConfig;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+import org.openecomp.mso.openstack.beans.VnfStatus;
+
+@XmlRootElement(name = "queryVolumeGroupResponse")
+@NoJackson
+public class QueryVolumeGroupResponse {
+	private String volumeGroupId;
+	private String volumeGroupStackId;
+	private VnfStatus volumeGroupStatus;
+	private Map<String,String> volumeGroupOutputs;
+
+	public QueryVolumeGroupResponse() {
+	}
+
+	public QueryVolumeGroupResponse(
+			String volumeGroupId,
+			String volumeGroupStackId,
+			VnfStatus volumeGroupStatus,
+			Map<String, String> volumeGroupOutputs)
+	{
+		super();
+		this.volumeGroupId = volumeGroupId;
+		this.volumeGroupStackId = volumeGroupStackId;
+		this.volumeGroupStatus = volumeGroupStatus;
+		this.volumeGroupOutputs = volumeGroupOutputs;
+	}
+
+	public String getVolumeGroupId() {
+		return volumeGroupId;
+	}
+
+	public void setVolumeGroupId(String volumeGroupId) {
+		this.volumeGroupId = volumeGroupId;
+	}
+
+	public String getVolumeGroupStackId() {
+		return volumeGroupStackId;
+	}
+
+	public void setVolumeGroupStackId(String volumeGroupStackId) {
+		this.volumeGroupStackId = volumeGroupStackId;
+	}
+
+	public VnfStatus getVolumeGroupStatus() {
+		return volumeGroupStatus;
+	}
+
+	public void setVolumeGroupStatus(VnfStatus volumeGroupStatus) {
+		this.volumeGroupStatus = volumeGroupStatus;
+	}
+
+	public Map<String, String> getVolumeGroupOutputs() {
+		return volumeGroupOutputs;
+	}
+
+	public void setVolumeGroupOutputs(Map<String, String> volumeGroupOutputs) {
+		this.volumeGroupOutputs = volumeGroupOutputs;
+	}
+
+	public String toJsonString() {
+		String jsonString = null;
+		try {
+			ObjectMapper mapper = new ObjectMapper();
+			mapper.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
+			jsonString = mapper.writeValueAsString(this);
+		}
+		catch (Exception e) {}
+		return jsonString;
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/RollbackVfModuleRequest.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/RollbackVfModuleRequest.java
new file mode 100644
index 0000000000..3365a05907
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/RollbackVfModuleRequest.java
@@ -0,0 +1,46 @@
+/*-
+ * ============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.vnfrest;
+
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.resteasy.annotations.providers.NoJackson;
+import org.codehaus.jackson.map.annotate.JsonRootName;
+
+@JsonRootName("rollbackVfModuleRequest")
+@XmlRootElement(name = "rollbackVfModuleRequest")
+@NoJackson
+public class RollbackVfModuleRequest extends VfRequestCommon {
+	private VfModuleRollback vfModuleRollback;
+
+	public RollbackVfModuleRequest() {
+		super();
+	}
+
+	public VfModuleRollback getVfModuleRollback() {
+		return vfModuleRollback;
+	}
+
+	public void setVfModuleRollback(VfModuleRollback vfModuleRollback) {
+		this.vfModuleRollback = vfModuleRollback;
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/RollbackVfModuleResponse.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/RollbackVfModuleResponse.java
new file mode 100644
index 0000000000..d877d667c8
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/RollbackVfModuleResponse.java
@@ -0,0 +1,51 @@
+/*-
+ * ============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.vnfrest;
+
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.resteasy.annotations.providers.NoJackson;
+import org.codehaus.jackson.map.annotate.JsonRootName;
+
+@JsonRootName("rollbackVfModuleResponse")
+@XmlRootElement(name = "rollbackVfModuleResponse")
+@NoJackson
+public class RollbackVfModuleResponse extends VfResponseCommon {
+	private Boolean vfModuleRolledback;
+
+	public RollbackVfModuleResponse() {
+		super();
+	}
+
+	public RollbackVfModuleResponse(Boolean vfModuleRolledback, String messageId) {
+		super(messageId);
+		this.vfModuleRolledback = vfModuleRolledback;
+	}
+
+	public Boolean getVfModuleRolledback() {
+		return vfModuleRolledback;
+	}
+
+	public void setVfModuleRolledback(Boolean vfModuleRolledback) {
+		this.vfModuleRolledback = vfModuleRolledback;
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/RollbackVolumeGroupRequest.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/RollbackVolumeGroupRequest.java
new file mode 100644
index 0000000000..cb877bb858
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/RollbackVolumeGroupRequest.java
@@ -0,0 +1,46 @@
+/*-
+ * ============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.vnfrest;
+
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.codehaus.jackson.map.annotate.JsonRootName;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+@JsonRootName("rollbackVolumeGroupRequest")
+@XmlRootElement(name = "rollbackVolumeGroupRequest")
+@NoJackson
+public class RollbackVolumeGroupRequest extends VfRequestCommon {
+	private VolumeGroupRollback volumeGroupRollback;
+
+	public RollbackVolumeGroupRequest() {
+		super();
+	}
+
+	public VolumeGroupRollback getVolumeGroupRollback() {
+		return volumeGroupRollback;
+	}
+
+	public void setVolumeGroupRollback(VolumeGroupRollback volumeGroupRollback) {
+		this.volumeGroupRollback = volumeGroupRollback;
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/RollbackVolumeGroupResponse.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/RollbackVolumeGroupResponse.java
new file mode 100644
index 0000000000..603b7581c0
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/RollbackVolumeGroupResponse.java
@@ -0,0 +1,51 @@
+/*-
+ * ============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.vnfrest;
+
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.codehaus.jackson.map.annotate.JsonRootName;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+@JsonRootName("rollbackVolumeGroupResponse")
+@XmlRootElement(name = "rollbackVolumeGroupResponse")
+@NoJackson
+public class RollbackVolumeGroupResponse extends VfResponseCommon {
+	private Boolean volumeGroupRolledBack;
+
+	public RollbackVolumeGroupResponse() {
+		super();
+	}
+
+	public RollbackVolumeGroupResponse(Boolean volumeGroupRolledBack, String messageId) {
+		super(messageId);
+		this.volumeGroupRolledBack = volumeGroupRolledBack;
+	}
+
+	public Boolean getVolumeGroupRolledBack() {
+		return volumeGroupRolledBack;
+	}
+
+	public void setVolumeGroupRolledBack(Boolean volumeGroupRolledBack) {
+		this.volumeGroupRolledBack = volumeGroupRolledBack;
+	}
+}
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
new file mode 100644
index 0000000000..a234e749ba
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/UpdateVfModuleRequest.java
@@ -0,0 +1,205 @@
+/*-
+ * ============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.vnfrest;
+
+
+import org.openecomp.mso.entity.MsoRequest;
+
+import java.util.Map;
+import java.util.HashMap;
+import javax.xml.bind.annotation.XmlRootElement;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+import org.codehaus.jackson.map.annotate.JsonRootName;
+
+@JsonRootName("updateVfModuleRequest")
+@XmlRootElement(name = "updateVfModuleRequest")
+@NoJackson
+public class UpdateVfModuleRequest extends VfRequestCommon {
+
+	private String cloudSiteId;
+	private String tenantId;
+
+	private String vnfId;
+	private String vnfType;
+	private String vnfVersion;
+
+	private String vfModuleName;
+	private String vfModuleType;
+	private String vfModuleId;
+	private String vfModuleStackId;
+
+	private String volumeGroupId;
+	private String volumeGroupStackId;
+
+	private String baseVfModuleId;
+	private String baseVfModuleStackId;
+
+	private String requestType;
+	private Boolean failIfExists;
+	private Boolean backout;
+
+	private Map<String,String> vfModuleParams = new HashMap<String, String>();
+	private MsoRequest msoRequest = new MsoRequest();
+
+	public String getCloudSiteId() {
+		return cloudSiteId;
+	}
+
+	public void setCloudSiteId(String cloudSiteId) {
+		this.cloudSiteId = cloudSiteId;
+	}
+
+	public String getTenantId() {
+		return tenantId;
+	}
+
+	public void setTenantId(String tenantId) {
+		this.tenantId = tenantId;
+	}
+
+	public String getVnfId() {
+		return vnfId;
+	}
+
+	public void setVnfId(String vnfId) {
+		this.vnfId = vnfId;
+	}
+
+	public String getVfModuleName() {
+		return vfModuleName;
+	}
+
+	public void setVfModuleName(String vfModuleName) {
+		this.vfModuleName = vfModuleName;
+	}
+
+	public String getVnfType() {
+		return vnfType;
+	}
+
+	public void setVnfType(String vnfType) {
+		this.vnfType = vnfType;
+	}
+
+	public String getVnfVersion() {
+		return vnfVersion;
+	}
+
+	public void setVnfVersion(String vnfVersion) {
+		this.vnfVersion = vnfVersion;
+	}
+
+	public String getVfModuleId() {
+		return vfModuleId;
+	}
+
+	public void setVfModuleId(String vfModuleId) {
+		this.vfModuleId = vfModuleId;
+	}
+
+	public String getVfModuleType() {
+		return vfModuleType;
+	}
+
+	public void setVfModuleType(String vfModuleType) {
+		this.vfModuleType = vfModuleType;
+	}
+
+	public String getVfModuleStackId() {
+		return vfModuleStackId;
+	}
+
+	public void setVfModuleStackId(String vfModuleStackId) {
+		this.vfModuleStackId = vfModuleStackId;
+	}
+
+	public String getVolumeGroupId() {
+		return volumeGroupId;
+	}
+
+	public void setVolumeGroupId(String volumeGroupId) {
+		this.volumeGroupId = volumeGroupId;
+	}
+
+	public String getVolumeGroupStackId() {
+		return volumeGroupStackId;
+	}
+
+	public void setVolumeGroupStackId(String volumeGroupStackId) {
+		this.volumeGroupStackId = volumeGroupStackId;
+	}
+
+	public String getBaseVfModuleId() {
+		return baseVfModuleId;
+	}
+
+	public void setBaseVfModuleId(String baseVfModuleId) {
+		this.baseVfModuleId = baseVfModuleId;
+	}
+
+	public String getBaseVfModuleStackId() {
+		return baseVfModuleStackId;
+	}
+
+	public void setBaseVfModuleStackId(String baseVfModuleStackId) {
+		this.baseVfModuleStackId = baseVfModuleStackId;
+	}
+
+	public String getRequestType() {
+		return requestType;
+	}
+
+	public void setRequestType(String requestType) {
+		this.requestType = requestType;
+	}
+
+	public Boolean getFailIfExists() {
+		return failIfExists;
+	}
+
+	public void setFailIfExists(Boolean failIfExists) {
+		this.failIfExists = failIfExists;
+	}
+
+	public Boolean getBackout() {
+		return backout;
+	}
+
+	public void setBackout(Boolean backout) {
+		this.backout = backout;
+	}
+
+	public Map<String, String> getVfModuleParams() {
+		return vfModuleParams;
+	}
+
+	public void setVfModuleParams(Map<String, String> vfModuleParams) {
+		this.vfModuleParams = vfModuleParams;
+	}
+
+	public MsoRequest getMsoRequest() {
+		return msoRequest;
+	}
+
+	public void setMsoRequest(MsoRequest msoRequest) {
+		this.msoRequest = msoRequest;
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/UpdateVfModuleResponse.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/UpdateVfModuleResponse.java
new file mode 100644
index 0000000000..af162b2e98
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/UpdateVfModuleResponse.java
@@ -0,0 +1,85 @@
+/*-
+ * ============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.vnfrest;
+
+
+import java.util.HashMap;
+import java.util.Map;
+import javax.xml.bind.annotation.XmlRootElement;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+import org.codehaus.jackson.map.annotate.JsonRootName;
+
+@JsonRootName("updateVfModuleResponse")
+@XmlRootElement(name = "updateVfModuleResponse")
+@NoJackson
+public class UpdateVfModuleResponse extends VfResponseCommon {
+	private String vnfId;
+	private String vfModuleId;
+	private String vfModuleStackId;
+	private Map<String,String> vfModuleOutputs = new HashMap<String, String>();
+
+	public UpdateVfModuleResponse() {
+		super();
+	}
+
+	public UpdateVfModuleResponse(String vnfId, String vfModuleId,
+			String vfModuleStackId,
+			Map<String, String> vfModuleOutputs,
+			String messageId) {
+		super(messageId);
+		this.vnfId = vnfId;
+		this.vfModuleId = vfModuleId;
+		this.vfModuleStackId = vfModuleStackId;
+		this.vfModuleOutputs = vfModuleOutputs;
+	}
+
+	public String getVnfId() {
+		return vnfId;
+	}
+
+	public void setVnfId(String vnfId) {
+		this.vnfId = vnfId;
+	}
+
+	public String getVfModuleId() {
+		return vfModuleId;
+	}
+
+	public void setVfModuleId(String vfModuleId) {
+		this.vfModuleId = vfModuleId;
+	}
+
+	public String getVfModuleStackId() {
+		return vfModuleStackId;
+	}
+
+	public void setVfModuleStackId(String vfModuleStackId) {
+		this.vfModuleStackId = vfModuleStackId;
+	}
+
+	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/UpdateVolumeGroupRequest.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/UpdateVolumeGroupRequest.java
new file mode 100644
index 0000000000..50c60b30d6
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/UpdateVolumeGroupRequest.java
@@ -0,0 +1,123 @@
+/*-
+ * ============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.vnfrest;
+
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.codehaus.jackson.map.annotate.JsonRootName;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+import org.openecomp.mso.entity.MsoRequest;
+
+@JsonRootName("updateVolumeGroupRequest")
+@XmlRootElement(name = "updateVolumeGroupRequest")
+@NoJackson
+public class UpdateVolumeGroupRequest extends VfRequestCommon {
+	private String cloudSiteId;
+	private String tenantId;
+	private String volumeGroupId;
+	private String volumeGroupStackId;
+	private String vnfType;
+	private String vnfVersion;
+	private String vfModuleType;
+	private Map<String,String> volumeGroupParams = new HashMap<String, String>();
+	private MsoRequest msoRequest = new MsoRequest();
+
+	public UpdateVolumeGroupRequest() {
+		super();
+	}
+
+	public String getCloudSiteId() {
+		return cloudSiteId;
+	}
+
+	public void setCloudSiteId(String cloudSiteId) {
+		this.cloudSiteId = cloudSiteId;
+	}
+
+	public String getTenantId() {
+		return tenantId;
+	}
+
+	public void setTenantId(String tenantId) {
+		this.tenantId = tenantId;
+	}
+
+	public String getVolumeGroupId() {
+		return volumeGroupId;
+	}
+
+	public void setVolumeGroupId(String volumeGroupId) {
+		this.volumeGroupId = volumeGroupId;
+	}
+
+	public String getVolumeGroupStackId() {
+		return volumeGroupStackId;
+	}
+
+	public void setVolumeGroupStackId(String volumeGroupStackId) {
+		this.volumeGroupStackId = volumeGroupStackId;
+	}
+
+	public String getVnfType() {
+		return vnfType;
+	}
+
+	public void setVnfType(String vnfType) {
+		this.vnfType = vnfType;
+	}
+
+	public String getVnfVersion() {
+		return vnfVersion;
+	}
+
+	public void setVnfVersion(String vnfVersion) {
+		this.vnfVersion = vnfVersion;
+	}
+
+	public String getVfModuleType() {
+		return vfModuleType;
+	}
+
+	public void setVfModuleType(String vfModuleType) {
+		this.vfModuleType = vfModuleType;
+	}
+
+	public Map<String, String> getVolumeGroupParams() {
+		return volumeGroupParams;
+	}
+
+	public void setVolumeGroupParams(Map<String, String> volumeGroupParams) {
+		this.volumeGroupParams = volumeGroupParams;
+	}
+
+	public MsoRequest getMsoRequest() {
+		return msoRequest;
+	}
+
+	public void setMsoRequest(MsoRequest msoRequest) {
+		this.msoRequest = msoRequest;
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/UpdateVolumeGroupResponse.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/UpdateVolumeGroupResponse.java
new file mode 100644
index 0000000000..2bd210f131
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/UpdateVolumeGroupResponse.java
@@ -0,0 +1,80 @@
+/*-
+ * ============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.vnfrest;
+
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.codehaus.jackson.map.annotate.JsonRootName;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+@JsonRootName("updateVolumeGroupResponse")
+@XmlRootElement(name = "updateVolumeGroupResponse")
+@NoJackson
+public class UpdateVolumeGroupResponse extends VfResponseCommon {
+	private String volumeGroupId;
+	private String volumeGroupStackId;
+	private Map<String,String> volumeGroupOutputs;
+
+	public UpdateVolumeGroupResponse() {
+		super();
+		this.volumeGroupOutputs = new HashMap<String, String>();
+	}
+
+	public UpdateVolumeGroupResponse(
+			String volumeGroupId,
+			String volumeGroupStackId,
+			Map<String, String> volumeGroupOutputs,
+			String messageId)
+	{
+		super(messageId);
+		this.volumeGroupId = volumeGroupId;
+		this.volumeGroupStackId = volumeGroupStackId;
+		this.volumeGroupOutputs = volumeGroupOutputs;
+	}
+
+	public String getVolumeGroupId() {
+		return volumeGroupId;
+	}
+
+	public void setVolumeGroupId(String volumeGroupId) {
+		this.volumeGroupId = volumeGroupId;
+	}
+
+	public String getVolumeGroupStackId() {
+		return volumeGroupStackId;
+	}
+
+	public void setVolumeGroupStackId(String volumeGroupStackId) {
+		this.volumeGroupStackId = volumeGroupStackId;
+	}
+
+	public Map<String, String> getVolumeGroupOutputs() {
+		return volumeGroupOutputs;
+	}
+
+	public void setVolumeGroupOutputs(Map<String, String> volumeGroupOutputs) {
+		this.volumeGroupOutputs = volumeGroupOutputs;
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/VfModuleExceptionResponse.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/VfModuleExceptionResponse.java
new file mode 100644
index 0000000000..419d1df566
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/VfModuleExceptionResponse.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.vnfrest;
+
+
+import java.io.Serializable;
+import javax.xml.bind.annotation.XmlRootElement;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+import org.openecomp.mso.openstack.exceptions.MsoExceptionCategory;
+
+@XmlRootElement(name = "vfModuleException")
+@NoJackson
+public class VfModuleExceptionResponse extends VfResponseCommon implements Serializable {
+    private static final long serialVersionUID = -9062290006520066109L;
+
+    private String message;
+	private MsoExceptionCategory category;
+	private Boolean rolledBack;
+
+	public VfModuleExceptionResponse () {}
+
+	public VfModuleExceptionResponse (String message) {
+		this.message = message;
+	}
+
+	public VfModuleExceptionResponse (String message, MsoExceptionCategory category, boolean rolledBack, String messageid) {
+		super(messageid);
+		this.message = message;
+		this.category = category;
+		this.rolledBack = rolledBack;
+	}
+
+	public String getMessage() {
+		return message;
+	}
+
+	public void setMessage(String message) {
+		this.message = message;
+	}
+
+	public MsoExceptionCategory getCategory () {
+		return category;
+	}
+
+	public void setCategory (MsoExceptionCategory category) {
+		this.category = category;
+	}
+
+	public Boolean getRolledBack() {
+		return rolledBack;
+	}
+
+	public void setRolledBack(Boolean rolledBack) {
+		this.rolledBack = rolledBack;
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/VfModuleRollback.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/VfModuleRollback.java
new file mode 100644
index 0000000000..84ef7146fd
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/VfModuleRollback.java
@@ -0,0 +1,123 @@
+/*-
+ * ============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.vnfrest;
+
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.openecomp.mso.entity.MsoRequest;
+import org.openecomp.mso.openstack.beans.VnfRollback;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+import org.codehaus.jackson.map.annotate.JsonRootName;
+
+@JsonRootName("VfModuleRollback")
+@XmlRootElement(name = "VfModuleRollback")
+@NoJackson
+public class VfModuleRollback {
+	private String vnfId;
+	private String vfModuleId;
+	private String vfModuleStackId;
+	private boolean vfModuleCreated = false;
+	private String tenantId;
+	private String cloudSiteId;
+	private MsoRequest msoRequest;
+	private String messageId;
+
+	public VfModuleRollback() {
+	}
+
+	public VfModuleRollback(VnfRollback vrb, String vfModuleId, String vfModuleStackId, String messageId)
+	{
+		this.vnfId = vrb.getVnfId();
+		this.vfModuleId = vfModuleId;
+		this.vfModuleStackId = vfModuleStackId;
+		this.vfModuleCreated = vrb.getVnfCreated();
+		this.tenantId = vrb.getTenantId();
+		this.cloudSiteId = vrb.getCloudSiteId();
+		this.msoRequest = vrb.getMsoRequest();
+		this.messageId = messageId;
+	}
+
+	public VfModuleRollback(String vnfId, String vfModuleId,
+			String vfModuleStackId, boolean vfModuleCreated, String tenantId,
+			String cloudSiteId,
+			MsoRequest msoRequest,
+			String messageId) {
+		super();
+		this.vnfId = vnfId;
+		this.vfModuleId = vfModuleId;
+		this.vfModuleStackId = vfModuleStackId;
+		this.vfModuleCreated = vfModuleCreated;
+		this.tenantId = tenantId;
+		this.cloudSiteId = cloudSiteId;
+		this.msoRequest = msoRequest;
+		this.messageId = messageId;
+	}
+
+	public String getVnfId() {
+		return vnfId;
+	}
+	public void setVnfId(String vnfId) {
+		this.vnfId = vnfId;
+	}
+	public String getVfModuleId() {
+		return vfModuleId;
+	}
+	public void setVfModuleId(String vfModuleId) {
+		this.vfModuleId = vfModuleId;
+	}
+	public String getVfModuleStackId() {
+		return vfModuleStackId;
+	}
+	public void setVfModuleStackId(String vfModuleStackId) {
+		this.vfModuleStackId = vfModuleStackId;
+	}
+	public boolean isVfModuleCreated() {
+		return vfModuleCreated;
+	}
+	public void setVfModuleCreated(boolean vfModuleCreated) {
+		this.vfModuleCreated = vfModuleCreated;
+	}
+	public String getTenantId() {
+		return tenantId;
+	}
+	public void setTenantId(String tenantId) {
+		this.tenantId = tenantId;
+	}
+	public String getCloudSiteId() {
+		return cloudSiteId;
+	}
+	public void setCloudSiteId(String cloudSiteId) {
+		this.cloudSiteId = cloudSiteId;
+	}
+	public MsoRequest getMsoRequest() {
+		return msoRequest;
+	}
+	public void setMsoRequest(MsoRequest msoRequest) {
+		this.msoRequest = msoRequest;
+	}
+	public String getMessageId() {
+		return messageId;
+	}
+	public void setMessageId(String messageId) {
+		this.messageId = messageId;
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/VfRequestCommon.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/VfRequestCommon.java
new file mode 100644
index 0000000000..e315444eb3
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/VfRequestCommon.java
@@ -0,0 +1,52 @@
+/*-
+ * ============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.vnfrest;
+
+
+/**
+ * Everything that is common between all VfModule and VolumeGroup Requests.
+ */
+public abstract class VfRequestCommon extends VfResponseCommon {
+	private Boolean skipAAI;
+	private String notificationUrl;
+
+	public Boolean getSkipAAI() {
+		return skipAAI;
+	}
+
+	public void setSkipAAI(Boolean skipAAI) {
+		this.skipAAI = skipAAI;
+	}
+
+	public String getNotificationUrl() {
+		return notificationUrl;
+	}
+
+	public void setNotificationUrl(String notificationUrl) {
+		this.notificationUrl = notificationUrl;
+	}
+
+	public boolean isSynchronous() {
+		return notificationUrl == null || (notificationUrl != null && notificationUrl.isEmpty());
+	}
+
+	// getMessageId, setMessageId, toJsonString, toJsonString are all defined in VfResponseCommon.
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/VfResponseCommon.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/VfResponseCommon.java
new file mode 100644
index 0000000000..96a83e41fd
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/VfResponseCommon.java
@@ -0,0 +1,83 @@
+/*-
+ * ============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.vnfrest;
+
+
+import java.io.ByteArrayOutputStream;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.Marshaller;
+
+import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.map.SerializationConfig;
+
+/**
+ * Everything that is common between all VfModule and VolumeGroup Responses,
+ * except for QueryVfModuleResponse and QueryVolumeGroupResponse.
+ */
+public abstract class VfResponseCommon {
+	private String messageId;
+
+	public VfResponseCommon() {
+		messageId = null;
+	}
+
+	public VfResponseCommon(String messageId) {
+		this.messageId = messageId;
+	}
+
+	public String getMessageId() {
+		return messageId;
+	}
+
+	public void setMessageId(String messageId) {
+		this.messageId = messageId;
+	}
+
+	public String toJsonString() {
+		try {
+			String jsonString = null;
+			ObjectMapper mapper = new ObjectMapper();
+			mapper.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
+			jsonString = mapper.writeValueAsString(this);
+			return jsonString;
+		} catch (Exception e) {
+			// Shouldn't happen...
+			e.printStackTrace();
+			return "";
+		}
+	}
+
+	public String toXmlString() {
+		try {
+			ByteArrayOutputStream bs = new ByteArrayOutputStream();
+			JAXBContext context = JAXBContext.newInstance(this.getClass());
+			Marshaller marshaller = context.createMarshaller();
+			marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); //pretty print XML
+			marshaller.marshal(this, bs);
+			return bs.toString();
+		} catch (Exception e) {
+			// Shouldn't happen...
+			e.printStackTrace();
+			return "";
+		}
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/VolumeGroupExceptionResponse.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/VolumeGroupExceptionResponse.java
new file mode 100644
index 0000000000..bc4e54b3a2
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/VolumeGroupExceptionResponse.java
@@ -0,0 +1,48 @@
+/*-
+ * ============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.vnfrest;
+
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+import org.openecomp.mso.openstack.exceptions.MsoExceptionCategory;
+
+@XmlRootElement(name = "volumeGroupException")
+@NoJackson
+public class VolumeGroupExceptionResponse extends VfModuleExceptionResponse {
+	// Exactly the same as a VfModuleExceptionResponse
+
+	private static final long serialVersionUID = 1168681288205898800L;
+
+	public VolumeGroupExceptionResponse() {
+		super();
+	}
+
+	public VolumeGroupExceptionResponse(String message) {
+		super(message);
+	}
+
+	public VolumeGroupExceptionResponse(String message, MsoExceptionCategory category, boolean rolledBack, String messageid) {
+		super(message, category, rolledBack, messageid);
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/VolumeGroupRollback.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/VolumeGroupRollback.java
new file mode 100644
index 0000000000..bda222159e
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/vnfrest/VolumeGroupRollback.java
@@ -0,0 +1,130 @@
+/*-
+ * ============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.vnfrest;
+
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.codehaus.jackson.map.annotate.JsonRootName;
+import org.jboss.resteasy.annotations.providers.NoJackson;
+
+import org.openecomp.mso.entity.MsoRequest;
+
+@JsonRootName("VolumeGroupRollback")
+@XmlRootElement(name = "VolumeGroupRollback")
+@NoJackson
+public class VolumeGroupRollback {
+//	“volumeGroupRollback”: {
+//	“volumeGroupId”: “<A&AI_ VOLUME_GROUP_ID>”,
+//	“volumeGroupStackId”: “<VOLUME_GROUP _STACK_ID>”,
+//	 “tenantId”: “<TENANT_ID>”,
+//	“cloudSiteId”: “<CLOUD_CLLI>”,
+//	“volumeGroupCreated”: TRUE|FALSE,
+//	“msoRequest”: {
+//		“requestId”: “<REQUEST_ID>”,
+//		“serviceInstanceId”: “<SERVICE_INSTANCE_ID>”
+//	}
+//},
+
+	private String volumeGroupId;
+	private String volumeGroupStackId;
+	private String tenantId;
+	private String cloudSiteId;
+	private boolean volumeGroupCreated = false;
+	private MsoRequest msoRequest;
+	private String messageId;
+
+	public VolumeGroupRollback() {
+	}
+
+	public VolumeGroupRollback(VolumeGroupRollback vrb, String volumeGroupStackId, String messageId)
+	{
+		this.volumeGroupId      = vrb.getVolumeGroupId();
+		this.volumeGroupStackId = volumeGroupStackId;
+		this.tenantId           = vrb.getTenantId();
+		this.cloudSiteId        = vrb.getCloudSiteId();
+		this.volumeGroupCreated = vrb.isVolumeGroupCreated();
+		this.msoRequest         = vrb.getMsoRequest();
+		this.messageId          = messageId;
+	}
+
+	public VolumeGroupRollback(
+			String volumeGroupId,
+			String volumeGroupStackId,
+			boolean volumeGroupCreated,
+			String tenantId,
+			String cloudSiteId,
+			MsoRequest msoRequest,
+			String messageId)
+	{
+		super();
+		this.volumeGroupId = volumeGroupId;
+		this.volumeGroupStackId = volumeGroupStackId;
+		this.volumeGroupCreated = volumeGroupCreated;
+		this.tenantId = tenantId;
+		this.cloudSiteId = cloudSiteId;
+		this.msoRequest = msoRequest;
+		this.messageId = messageId;
+	}
+
+	public String getVolumeGroupId() {
+		return volumeGroupId;
+	}
+	public void setVolumeGroupId(String volumeGroupId) {
+		this.volumeGroupId = volumeGroupId;
+	}
+	public String getVolumeGroupStackId() {
+		return volumeGroupStackId;
+	}
+	public void setVolumeGroupStackId(String volumeGroupStackId) {
+		this.volumeGroupStackId = volumeGroupStackId;
+	}
+	public String getTenantId() {
+		return tenantId;
+	}
+	public void setTenantId(String tenantId) {
+		this.tenantId = tenantId;
+	}
+	public String getCloudSiteId() {
+		return cloudSiteId;
+	}
+	public void setCloudSiteId(String cloudSiteId) {
+		this.cloudSiteId = cloudSiteId;
+	}
+	public boolean isVolumeGroupCreated() {
+		return volumeGroupCreated;
+	}
+	public void setVolumeGroupCreated(boolean volumeGroupCreated) {
+		this.volumeGroupCreated = volumeGroupCreated;
+	}
+	public MsoRequest getMsoRequest() {
+		return msoRequest;
+	}
+	public void setMsoRequest(MsoRequest msoRequest) {
+		this.msoRequest = msoRequest;
+	}
+	public String getMessageId() {
+		return messageId;
+	}
+	public void setMessageId(String messageId) {
+		this.messageId = messageId;
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/ContrailNetworkESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/ContrailNetworkESTest.java
new file mode 100644
index 0000000000..50992bfd11
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/ContrailNetworkESTest.java
@@ -0,0 +1,178 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:28:01 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.nwrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import java.util.LinkedList;
+import java.util.List;
+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 ContrailNetworkESTest extends ContrailNetworkESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test00()  throws Throwable  {
+      ContrailNetwork contrailNetwork0 = new ContrailNetwork((String) null, (String) null, (List<String>) null, (List<String>) null, (List<String>) null);
+      String string0 = contrailNetwork0.getShared();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test01()  throws Throwable  {
+      LinkedList<String> linkedList0 = new LinkedList<String>();
+      ContrailNetwork contrailNetwork0 = new ContrailNetwork((String) null, "!1.", (List<String>) linkedList0, (List<String>) linkedList0, (List<String>) linkedList0);
+      List<String> list0 = contrailNetwork0.getRouteTargets();
+      assertTrue(list0.isEmpty());
+  }
+
+  @Test(timeout = 4000)
+  public void test02()  throws Throwable  {
+      LinkedList<String> linkedList0 = new LinkedList<String>();
+      linkedList0.offer("Q");
+      ContrailNetwork contrailNetwork0 = new ContrailNetwork("Q", "|", (List<String>) linkedList0, (List<String>) linkedList0, (List<String>) linkedList0);
+      contrailNetwork0.getRouteTargets();
+      assertEquals("Q", contrailNetwork0.getShared());
+      assertEquals("|", contrailNetwork0.getExternal());
+  }
+
+  @Test(timeout = 4000)
+  public void test03()  throws Throwable  {
+      LinkedList<String> linkedList0 = new LinkedList<String>();
+      ContrailNetwork contrailNetwork0 = new ContrailNetwork("", "RIEp7.g7I,Oi", (List<String>) linkedList0, (List<String>) linkedList0, (List<String>) linkedList0);
+      contrailNetwork0.getRouteTableFqdns();
+      assertEquals("RIEp7.g7I,Oi", contrailNetwork0.getExternal());
+      assertEquals("", contrailNetwork0.getShared());
+  }
+
+  @Test(timeout = 4000)
+  public void test04()  throws Throwable  {
+      LinkedList<String> linkedList0 = new LinkedList<String>();
+      linkedList0.offer("Q");
+      ContrailNetwork contrailNetwork0 = new ContrailNetwork("Q", "|", (List<String>) linkedList0, (List<String>) linkedList0, (List<String>) linkedList0);
+      contrailNetwork0.getRouteTableFqdns();
+      assertEquals("Q", contrailNetwork0.getShared());
+      assertEquals("|", contrailNetwork0.getExternal());
+  }
+
+  @Test(timeout = 4000)
+  public void test05()  throws Throwable  {
+      LinkedList<String> linkedList0 = new LinkedList<String>();
+      ContrailNetwork contrailNetwork0 = new ContrailNetwork("", "", (List<String>) linkedList0, (List<String>) linkedList0, (List<String>) linkedList0);
+      List<String> list0 = contrailNetwork0.getPolicyFqdns();
+      assertTrue(list0.isEmpty());
+  }
+
+  @Test(timeout = 4000)
+  public void test06()  throws Throwable  {
+      LinkedList<String> linkedList0 = new LinkedList<String>();
+      linkedList0.add((String) null);
+      ContrailNetwork contrailNetwork0 = new ContrailNetwork("false", "52", (List<String>) linkedList0, (List<String>) linkedList0, (List<String>) linkedList0);
+      contrailNetwork0.getPolicyFqdns();
+      assertEquals("52", contrailNetwork0.getExternal());
+      assertEquals("false", contrailNetwork0.getShared());
+  }
+
+  @Test(timeout = 4000)
+  public void test07()  throws Throwable  {
+      ContrailNetwork contrailNetwork0 = new ContrailNetwork("", "", (List<String>) null, (List<String>) null, (List<String>) null);
+      String string0 = contrailNetwork0.getExternal();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test08()  throws Throwable  {
+      ContrailNetwork contrailNetwork0 = new ContrailNetwork();
+      contrailNetwork0.getPolicyFqdns();
+      assertEquals("false", contrailNetwork0.getExternal());
+      assertEquals("false", contrailNetwork0.getShared());
+  }
+
+  @Test(timeout = 4000)
+  public void test09()  throws Throwable  {
+      ContrailNetwork contrailNetwork0 = new ContrailNetwork();
+      contrailNetwork0.getRouteTableFqdns();
+      assertEquals("false", contrailNetwork0.getExternal());
+      assertEquals("false", contrailNetwork0.getShared());
+  }
+
+  @Test(timeout = 4000)
+  public void test10()  throws Throwable  {
+      ContrailNetwork contrailNetwork0 = new ContrailNetwork();
+      contrailNetwork0.getRouteTargets();
+      assertEquals("false", contrailNetwork0.getShared());
+      assertEquals("false", contrailNetwork0.getExternal());
+  }
+
+  @Test(timeout = 4000)
+  public void test11()  throws Throwable  {
+      ContrailNetwork contrailNetwork0 = new ContrailNetwork((String) null, (String) null, (List<String>) null, (List<String>) null, (List<String>) null);
+      String string0 = contrailNetwork0.getExternal();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test12()  throws Throwable  {
+      ContrailNetwork contrailNetwork0 = new ContrailNetwork();
+      contrailNetwork0.setRouteTableFqdns((List<String>) null);
+      assertEquals("false", contrailNetwork0.getShared());
+      assertEquals("false", contrailNetwork0.getExternal());
+  }
+
+  @Test(timeout = 4000)
+  public void test13()  throws Throwable  {
+      ContrailNetwork contrailNetwork0 = new ContrailNetwork();
+      contrailNetwork0.setPolicyFqdns((List<String>) null);
+      assertEquals("false", contrailNetwork0.getShared());
+      assertEquals("false", contrailNetwork0.getExternal());
+  }
+
+  @Test(timeout = 4000)
+  public void test14()  throws Throwable  {
+      ContrailNetwork contrailNetwork0 = new ContrailNetwork();
+      contrailNetwork0.setRouteTargets((List<String>) null);
+      assertEquals("false", contrailNetwork0.getShared());
+      assertEquals("false", contrailNetwork0.getExternal());
+  }
+
+  @Test(timeout = 4000)
+  public void test15()  throws Throwable  {
+      ContrailNetwork contrailNetwork0 = new ContrailNetwork();
+      assertEquals("false", contrailNetwork0.getShared());
+      
+      contrailNetwork0.setShared("");
+      contrailNetwork0.getShared();
+      assertEquals("false", contrailNetwork0.getExternal());
+  }
+
+  @Test(timeout = 4000)
+  public void test16()  throws Throwable  {
+      ContrailNetwork contrailNetwork0 = new ContrailNetwork();
+      assertEquals("false", contrailNetwork0.getExternal());
+      
+      contrailNetwork0.setExternal("fhtl}[");
+      assertEquals("false", contrailNetwork0.getShared());
+  }
+
+  @Test(timeout = 4000)
+  public void test17()  throws Throwable  {
+      ContrailNetwork contrailNetwork0 = new ContrailNetwork();
+      String string0 = contrailNetwork0.getShared();
+      assertEquals("false", contrailNetwork0.getExternal());
+      assertEquals("false", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test18()  throws Throwable  {
+      ContrailNetwork contrailNetwork0 = new ContrailNetwork();
+      String string0 = contrailNetwork0.getExternal();
+      assertEquals("false", string0);
+      assertEquals("false", contrailNetwork0.getShared());
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/ContrailNetworkESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/ContrailNetworkESTestscaffolding.java
new file mode 100644
index 0000000000..125b3f4360
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/ContrailNetworkESTestscaffolding.java
@@ -0,0 +1,78 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:28:01 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.nwrest;
+
+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 ContrailNetworkESTestscaffolding {
+
+  @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.nwrest.ContrailNetwork"; 
+    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(ContrailNetworkESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.adapters.nwrest.ContrailNetwork"
+    );
+  } 
+
+  private static void resetClasses() {
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/CreateNetworkErrorESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/CreateNetworkErrorESTest.java
new file mode 100644
index 0000000000..0f7b51184f
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/CreateNetworkErrorESTest.java
@@ -0,0 +1,37 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:21:05 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.nwrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import org.openecomp.mso.openstack.exceptions.MsoExceptionCategory;
+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 CreateNetworkErrorESTest extends CreateNetworkErrorESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test0()  throws Throwable  {
+      CreateNetworkError createNetworkError0 = new CreateNetworkError();
+      assertNull(createNetworkError0.getMessageId());
+  }
+
+  @Test(timeout = 4000)
+  public void test1()  throws Throwable  {
+      MsoExceptionCategory msoExceptionCategory0 = MsoExceptionCategory.INTERNAL;
+      CreateNetworkError createNetworkError0 = new CreateNetworkError(".iOuG[TmaW", msoExceptionCategory0, false, "&j1e*8kgmi]:2n?(");
+      assertEquals("&j1e*8kgmi]:2n?(", createNetworkError0.getMessageId());
+  }
+
+  @Test(timeout = 4000)
+  public void test2()  throws Throwable  {
+      CreateNetworkError createNetworkError0 = new CreateNetworkError("");
+      assertNull(createNetworkError0.getCategory());
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/CreateNetworkErrorESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/CreateNetworkErrorESTestscaffolding.java
new file mode 100644
index 0000000000..50422e6783
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/CreateNetworkErrorESTestscaffolding.java
@@ -0,0 +1,87 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:21:05 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.nwrest;
+
+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 CreateNetworkErrorESTestscaffolding {
+
+  @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.nwrest.CreateNetworkError"; 
+    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(CreateNetworkErrorESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.adapters.nwrest.CreateNetworkError",
+      "org.openecomp.mso.adapters.nwrest.NetworkResponseCommon",
+      "org.openecomp.mso.adapters.nwrest.NetworkExceptionResponse",
+      "org.openecomp.mso.openstack.exceptions.MsoExceptionCategory",
+      "org.jboss.resteasy.annotations.providers.NoJackson"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(CreateNetworkErrorESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "org.openecomp.mso.adapters.nwrest.CreateNetworkError"
+    );
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/CreateNetworkRequestESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/CreateNetworkRequestESTest.java
new file mode 100644
index 0000000000..eb99054393
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/CreateNetworkRequestESTest.java
@@ -0,0 +1,356 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:05:55 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.nwrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+import static org.evosuite.runtime.EvoAssertions.*;
+
+import org.openecomp.mso.entity.MsoRequest;
+import org.openecomp.mso.openstack.beans.Subnet;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+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 CreateNetworkRequestESTest extends CreateNetworkRequestESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test00()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      createNetworkRequest0.setTenantId("gTN<#W#q}?BdTz");
+      String string0 = createNetworkRequest0.getTenantId();
+      assertEquals("gTN<#W#q}?BdTz", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test01()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      LinkedList<Subnet> linkedList0 = new LinkedList<Subnet>();
+      Subnet subnet0 = new Subnet();
+      linkedList0.add(0, subnet0);
+      createNetworkRequest0.setSubnets(linkedList0);
+      List<Subnet> list0 = createNetworkRequest0.getSubnets();
+      assertFalse(list0.isEmpty());
+  }
+
+  @Test(timeout = 4000)
+  public void test02()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      ProviderVlanNetwork providerVlanNetwork0 = new ProviderVlanNetwork("", (List<Integer>) null);
+      createNetworkRequest0.setProviderVlanNetwork(providerVlanNetwork0);
+      ProviderVlanNetwork providerVlanNetwork1 = createNetworkRequest0.getProviderVlanNetwork();
+      assertSame(providerVlanNetwork1, providerVlanNetwork0);
+  }
+
+  @Test(timeout = 4000)
+  public void test03()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      createNetworkRequest0.setNetworkTypeVersion("Zt;$+0,06");
+      String string0 = createNetworkRequest0.getNetworkTypeVersion();
+      assertEquals("Zt;$+0,06", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test04()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      createNetworkRequest0.setNetworkTypeVersion("");
+      String string0 = createNetworkRequest0.getNetworkTypeVersion();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test05()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      createNetworkRequest0.setNetworkType("+34spiczRb5|Z");
+      String string0 = createNetworkRequest0.getNetworkType();
+      assertEquals("+34spiczRb5|Z", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test06()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      createNetworkRequest0.setNetworkType("");
+      String string0 = createNetworkRequest0.getNetworkType();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test07()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      createNetworkRequest0.setNetworkParams((Map<String, String>) null);
+      Map<String, String> map0 = createNetworkRequest0.getNetworkParams();
+      assertNull(map0);
+  }
+
+  @Test(timeout = 4000)
+  public void test08()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      createNetworkRequest0.setNetworkParams(hashMap0);
+      hashMap0.put("B]gM^ `p!", "Subnet [subnetName=");
+      Map<String, String> map0 = createNetworkRequest0.getNetworkParams();
+      assertEquals(1, map0.size());
+  }
+
+  @Test(timeout = 4000)
+  public void test09()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      createNetworkRequest0.setNetworkName("5rW0L[ye %khIOB;(P");
+      String string0 = createNetworkRequest0.getNetworkName();
+      assertEquals("5rW0L[ye %khIOB;(P", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test10()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      createNetworkRequest0.setNetworkName("");
+      String string0 = createNetworkRequest0.getNetworkName();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test11()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      createNetworkRequest0.setNetworkId("");
+      String string0 = createNetworkRequest0.getNetworkId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test12()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      createNetworkRequest0.setFailIfExists((Boolean) null);
+      Boolean boolean0 = createNetworkRequest0.getFailIfExists();
+      assertNull(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test13()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      ContrailNetwork contrailNetwork0 = new ContrailNetwork((String) null, (String) null, (List<String>) null, (List<String>) null, (List<String>) null);
+      createNetworkRequest0.setContrailNetwork(contrailNetwork0);
+      ContrailNetwork contrailNetwork1 = createNetworkRequest0.getContrailNetwork();
+      assertNull(contrailNetwork1.getShared());
+  }
+
+  @Test(timeout = 4000)
+  public void test14()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      createNetworkRequest0.setCloudSiteId("5ISVyjyr^WpJF");
+      String string0 = createNetworkRequest0.getCloudSiteId();
+      assertEquals("5ISVyjyr^WpJF", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test15()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      createNetworkRequest0.setCloudSiteId("");
+      String string0 = createNetworkRequest0.getCloudSiteId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test16()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      createNetworkRequest0.setBackout((Boolean) null);
+      Boolean boolean0 = createNetworkRequest0.getBackout();
+      assertNull(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test17()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      Boolean boolean0 = createNetworkRequest0.getSkipAAI();
+      createNetworkRequest0.setBackout(boolean0);
+      Boolean boolean1 = createNetworkRequest0.getBackout();
+      assertFalse(boolean1);
+  }
+
+  @Test(timeout = 4000)
+  public void test18()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      // Undeclared exception!
+      try { 
+        createNetworkRequest0.setNetworkTechnology("");
+        fail("Expecting exception: IllegalArgumentException");
+      
+      } catch(IllegalArgumentException e) {
+         //
+         // No enum constant org.openecomp.mso.adapters.nwrest.NetworkTechnology.
+         //
+         verifyException("java.lang.Enum", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test19()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      String string0 = createNetworkRequest0.getNetworkType();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test20()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      String string0 = createNetworkRequest0.getNetworkTechnology();
+      assertEquals("NEUTRON", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test21()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      Boolean boolean0 = createNetworkRequest0.getFailIfExists();
+      assertFalse(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test22()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      ProviderVlanNetwork providerVlanNetwork0 = createNetworkRequest0.getProviderVlanNetwork();
+      assertNull(providerVlanNetwork0);
+  }
+
+  @Test(timeout = 4000)
+  public void test23()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      MsoRequest msoRequest0 = createNetworkRequest0.getMsoRequest();
+      assertNull(msoRequest0.getServiceInstanceId());
+  }
+
+  @Test(timeout = 4000)
+  public void test24()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      String string0 = createNetworkRequest0.getNetworkName();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test25()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      String string0 = createNetworkRequest0.getNetworkId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test26()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      List<Subnet> list0 = createNetworkRequest0.getSubnets();
+      assertNull(list0);
+  }
+
+  @Test(timeout = 4000)
+  public void test27()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      String string0 = createNetworkRequest0.getNetworkTypeVersion();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test28()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      boolean boolean0 = createNetworkRequest0.isContrailRequest();
+      assertFalse(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test29()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      Map<String, String> map0 = createNetworkRequest0.getNetworkParams();
+      createNetworkRequest0.setNetworkParams(map0);
+      assertNull(createNetworkRequest0.getNetworkName());
+  }
+
+  @Test(timeout = 4000)
+  public void test30()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      createNetworkRequest0.setTenantId("");
+      String string0 = createNetworkRequest0.getTenantId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test31()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      LinkedList<Subnet> linkedList0 = new LinkedList<Subnet>();
+      createNetworkRequest0.setSubnets(linkedList0);
+      List<Subnet> list0 = createNetworkRequest0.getSubnets();
+      assertTrue(list0.isEmpty());
+  }
+
+  @Test(timeout = 4000)
+  public void test32()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      ContrailNetwork contrailNetwork0 = createNetworkRequest0.getContrailNetwork();
+      assertNull(contrailNetwork0);
+  }
+
+  @Test(timeout = 4000)
+  public void test33()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      Boolean boolean0 = Boolean.valueOf(true);
+      createNetworkRequest0.setFailIfExists(boolean0);
+      Boolean boolean1 = createNetworkRequest0.getFailIfExists();
+      assertTrue(boolean1);
+  }
+
+  @Test(timeout = 4000)
+  public void test34()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      String string0 = createNetworkRequest0.getTenantId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test35()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      String string0 = createNetworkRequest0.getCloudSiteId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test36()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      createNetworkRequest0.setNetworkId(", allocationPools=");
+      String string0 = createNetworkRequest0.getNetworkId();
+      assertEquals(", allocationPools=", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test37()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      // Undeclared exception!
+      try { 
+        createNetworkRequest0.setNetworkTechnology((String) null);
+        fail("Expecting exception: NullPointerException");
+      
+      } catch(NullPointerException e) {
+         //
+         // Name is null
+         //
+         verifyException("java.lang.Enum", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test38()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      createNetworkRequest0.setMsoRequest((MsoRequest) null);
+      MsoRequest msoRequest0 = createNetworkRequest0.getMsoRequest();
+      assertNull(msoRequest0);
+  }
+
+  @Test(timeout = 4000)
+  public void test39()  throws Throwable  {
+      CreateNetworkRequest createNetworkRequest0 = new CreateNetworkRequest();
+      Boolean boolean0 = createNetworkRequest0.getBackout();
+      assertTrue(boolean0);
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/CreateNetworkRequestESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/CreateNetworkRequestESTestscaffolding.java
new file mode 100644
index 0000000000..d58834422d
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/CreateNetworkRequestESTestscaffolding.java
@@ -0,0 +1,246 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:05:55 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.nwrest;
+
+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 CreateNetworkRequestESTestscaffolding {
+
+  @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.nwrest.CreateNetworkRequest"; 
+    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(CreateNetworkRequestESTestscaffolding.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.ser.BeanSerializerFactory",
+      "org.codehaus.jackson.map.JsonSerializer",
+      "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.openecomp.mso.openstack.beans.Subnet",
+      "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",
+      "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.openecomp.mso.adapters.nwrest.NetworkRequestCommon",
+      "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.openecomp.mso.adapters.nwrest.CreateNetworkRequest",
+      "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.openecomp.mso.adapters.nwrest.NetworkTechnology",
+      "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.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.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.openecomp.mso.entity.MsoRequest",
+      "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.openecomp.mso.adapters.nwrest.ContrailNetwork",
+      "org.codehaus.jackson.map.type.MapType",
+      "org.openecomp.mso.adapters.nwrest.ProviderVlanNetwork",
+      "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(CreateNetworkRequestESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "org.openecomp.mso.adapters.nwrest.NetworkTechnology",
+      "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/nwrest/CreateNetworkResponseESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/CreateNetworkResponseESTest.java
new file mode 100644
index 0000000000..f946c1ebda
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/CreateNetworkResponseESTest.java
@@ -0,0 +1,241 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:26:16 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.nwrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import org.openecomp.mso.openstack.beans.NetworkRollback;
+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 CreateNetworkResponseESTest extends CreateNetworkResponseESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test00()  throws Throwable  {
+      CreateNetworkResponse createNetworkResponse0 = new CreateNetworkResponse();
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      createNetworkResponse0.setSubnetMap(hashMap0);
+      Map<String, String> map0 = createNetworkResponse0.getSubnetMap();
+      assertTrue(map0.isEmpty());
+  }
+
+  @Test(timeout = 4000)
+  public void test01()  throws Throwable  {
+      CreateNetworkResponse createNetworkResponse0 = new CreateNetworkResponse();
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      hashMap0.put("", (String) null);
+      createNetworkResponse0.setSubnetMap(hashMap0);
+      Map<String, String> map0 = createNetworkResponse0.getSubnetMap();
+      assertFalse(map0.isEmpty());
+  }
+
+  @Test(timeout = 4000)
+  public void test02()  throws Throwable  {
+      CreateNetworkResponse createNetworkResponse0 = new CreateNetworkResponse();
+      createNetworkResponse0.setRollback((NetworkRollback) null);
+      NetworkRollback networkRollback0 = createNetworkResponse0.getRollback();
+      assertNull(networkRollback0);
+  }
+
+  @Test(timeout = 4000)
+  public void test03()  throws Throwable  {
+      CreateNetworkResponse createNetworkResponse0 = new CreateNetworkResponse();
+      NetworkRollback networkRollback0 = new NetworkRollback();
+      networkRollback0.setNetworkCreated(true);
+      createNetworkResponse0.setRollback(networkRollback0);
+      NetworkRollback networkRollback1 = createNetworkResponse0.getRollback();
+      assertNull(networkRollback1.getNetworkName());
+  }
+
+  @Test(timeout = 4000)
+  public void test04()  throws Throwable  {
+      Boolean boolean0 = Boolean.FALSE;
+      NetworkRollback networkRollback0 = new NetworkRollback();
+      CreateNetworkResponse createNetworkResponse0 = new CreateNetworkResponse("RmsrRU", "D=<", "D=<", "RmsrRU", boolean0, (Map<String, String>) null, networkRollback0, "0V");
+      String string0 = createNetworkResponse0.getNeutronNetworkId();
+      assertEquals("RmsrRU", createNetworkResponse0.getNetworkFqdn());
+      assertEquals("D=<", createNetworkResponse0.getNetworkStackId());
+      assertEquals("RmsrRU", createNetworkResponse0.getNetworkId());
+      assertEquals("D=<", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test05()  throws Throwable  {
+      Boolean boolean0 = Boolean.FALSE;
+      NetworkRollback networkRollback0 = new NetworkRollback();
+      CreateNetworkResponse createNetworkResponse0 = new CreateNetworkResponse("", "", "SouUi*E=\"K.O", "", boolean0, (Map<String, String>) null, networkRollback0, "");
+      String string0 = createNetworkResponse0.getNeutronNetworkId();
+      assertEquals("", createNetworkResponse0.getNetworkFqdn());
+      assertEquals("", string0);
+      assertEquals("", createNetworkResponse0.getNetworkId());
+      assertEquals("SouUi*E=\"K.O", createNetworkResponse0.getNetworkStackId());
+  }
+
+  @Test(timeout = 4000)
+  public void test06()  throws Throwable  {
+      Boolean boolean0 = Boolean.valueOf(true);
+      CreateNetworkResponse createNetworkResponse0 = new CreateNetworkResponse("", "", "", "NetworkRollback [networkId=", boolean0, (Map<String, String>) null, (NetworkRollback) null, (String) null);
+      String string0 = createNetworkResponse0.getNetworkStackId();
+      assertEquals("", createNetworkResponse0.getNeutronNetworkId());
+      assertEquals("", createNetworkResponse0.getNetworkId());
+      assertNotNull(string0);
+      assertEquals("NetworkRollback [networkId=", createNetworkResponse0.getNetworkFqdn());
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test07()  throws Throwable  {
+      Boolean boolean0 = Boolean.valueOf(", tenantId=");
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      NetworkRollback networkRollback0 = new NetworkRollback();
+      CreateNetworkResponse createNetworkResponse0 = new CreateNetworkResponse(", tenantId=", "L", "L", ", tenantId=", boolean0, (Map<String, String>) hashMap0, networkRollback0, "o+oNP;9q:Yc_JWzxM");
+      String string0 = createNetworkResponse0.getNetworkId();
+      assertEquals("L", createNetworkResponse0.getNetworkStackId());
+      assertEquals(", tenantId=", string0);
+      assertEquals("L", createNetworkResponse0.getNeutronNetworkId());
+      assertEquals(", tenantId=", createNetworkResponse0.getNetworkFqdn());
+  }
+
+  @Test(timeout = 4000)
+  public void test08()  throws Throwable  {
+      Boolean boolean0 = Boolean.valueOf(true);
+      CreateNetworkResponse createNetworkResponse0 = new CreateNetworkResponse("", "", "", "NetworkRollback [networkId=", boolean0, (Map<String, String>) null, (NetworkRollback) null, (String) null);
+      String string0 = createNetworkResponse0.getNetworkId();
+      assertEquals("", createNetworkResponse0.getNetworkStackId());
+      assertNotNull(string0);
+      assertEquals("NetworkRollback [networkId=", createNetworkResponse0.getNetworkFqdn());
+      assertEquals("", string0);
+      assertEquals("", createNetworkResponse0.getNeutronNetworkId());
+  }
+
+  @Test(timeout = 4000)
+  public void test09()  throws Throwable  {
+      CreateNetworkResponse createNetworkResponse0 = new CreateNetworkResponse();
+      createNetworkResponse0.setNetworkFqdn(",E4f.8o)&~");
+      String string0 = createNetworkResponse0.getNetworkFqdn();
+      assertEquals(",E4f.8o)&~", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test10()  throws Throwable  {
+      CreateNetworkResponse createNetworkResponse0 = new CreateNetworkResponse();
+      createNetworkResponse0.setNetworkFqdn("");
+      String string0 = createNetworkResponse0.getNetworkFqdn();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test11()  throws Throwable  {
+      CreateNetworkResponse createNetworkResponse0 = new CreateNetworkResponse();
+      Boolean boolean0 = createNetworkResponse0.getNetworkCreated();
+      assertNull(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test12()  throws Throwable  {
+      Boolean boolean0 = Boolean.FALSE;
+      NetworkRollback networkRollback0 = new NetworkRollback();
+      CreateNetworkResponse createNetworkResponse0 = new CreateNetworkResponse("", "", "SouUi*E=\"K.O", "", boolean0, (Map<String, String>) null, networkRollback0, "");
+      createNetworkResponse0.getNetworkCreated();
+      assertEquals("", createNetworkResponse0.getNetworkFqdn());
+      assertEquals("", createNetworkResponse0.getNeutronNetworkId());
+      assertEquals("SouUi*E=\"K.O", createNetworkResponse0.getNetworkStackId());
+      assertEquals("", createNetworkResponse0.getNetworkId());
+  }
+
+  @Test(timeout = 4000)
+  public void test13()  throws Throwable  {
+      CreateNetworkResponse createNetworkResponse0 = new CreateNetworkResponse();
+      String string0 = createNetworkResponse0.getNetworkStackId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test14()  throws Throwable  {
+      CreateNetworkResponse createNetworkResponse0 = new CreateNetworkResponse();
+      String string0 = createNetworkResponse0.getNeutronNetworkId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test15()  throws Throwable  {
+      CreateNetworkResponse createNetworkResponse0 = new CreateNetworkResponse();
+      String string0 = createNetworkResponse0.getNetworkFqdn();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test16()  throws Throwable  {
+      CreateNetworkResponse createNetworkResponse0 = new CreateNetworkResponse();
+      createNetworkResponse0.setNetworkStackId("]xrJb:cD,G(|6B0(");
+      String string0 = createNetworkResponse0.getNetworkStackId();
+      assertEquals("]xrJb:cD,G(|6B0(", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test17()  throws Throwable  {
+      CreateNetworkResponse createNetworkResponse0 = new CreateNetworkResponse();
+      String string0 = createNetworkResponse0.getNetworkId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test18()  throws Throwable  {
+      Boolean boolean0 = Boolean.valueOf(true);
+      CreateNetworkResponse createNetworkResponse0 = new CreateNetworkResponse("", "", "", "NetworkRollback [networkId=", boolean0, (Map<String, String>) null, (NetworkRollback) null, (String) null);
+      createNetworkResponse0.getNetworkCreated();
+      assertEquals("NetworkRollback [networkId=", createNetworkResponse0.getNetworkFqdn());
+      assertEquals("", createNetworkResponse0.getNetworkStackId());
+      assertEquals("", createNetworkResponse0.getNetworkId());
+      assertEquals("", createNetworkResponse0.getNeutronNetworkId());
+  }
+
+  @Test(timeout = 4000)
+  public void test19()  throws Throwable  {
+      CreateNetworkResponse createNetworkResponse0 = new CreateNetworkResponse();
+      Map<String, String> map0 = createNetworkResponse0.getSubnetMap();
+      assertNull(map0);
+  }
+
+  @Test(timeout = 4000)
+  public void test20()  throws Throwable  {
+      CreateNetworkResponse createNetworkResponse0 = new CreateNetworkResponse();
+      NetworkRollback networkRollback0 = createNetworkResponse0.getRollback();
+      assertFalse(networkRollback0.getNetworkCreated());
+  }
+
+  @Test(timeout = 4000)
+  public void test21()  throws Throwable  {
+      CreateNetworkResponse createNetworkResponse0 = new CreateNetworkResponse();
+      createNetworkResponse0.setNetworkId("]xrJb:cD,G(|6B0(");
+      assertNull(createNetworkResponse0.getNetworkStackId());
+  }
+
+  @Test(timeout = 4000)
+  public void test22()  throws Throwable  {
+      Boolean boolean0 = Boolean.valueOf(", tenantId=");
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      NetworkRollback networkRollback0 = new NetworkRollback();
+      CreateNetworkResponse createNetworkResponse0 = new CreateNetworkResponse(", tenantId=", "L", "L", ", tenantId=", boolean0, (Map<String, String>) hashMap0, networkRollback0, "o+oNP;9q:Yc_JWzxM");
+      assertEquals("L", createNetworkResponse0.getNeutronNetworkId());
+      
+      createNetworkResponse0.setNeutronNetworkId(", tenantId=");
+      assertEquals(", tenantId=", createNetworkResponse0.getNetworkId());
+  }
+
+  @Test(timeout = 4000)
+  public void test23()  throws Throwable  {
+      CreateNetworkResponse createNetworkResponse0 = new CreateNetworkResponse();
+      Boolean boolean0 = Boolean.TRUE;
+      createNetworkResponse0.setNetworkCreated(boolean0);
+      assertNull(createNetworkResponse0.getNetworkStackId());
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/CreateNetworkResponseESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/CreateNetworkResponseESTestscaffolding.java
new file mode 100644
index 0000000000..be0fbf8edb
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/CreateNetworkResponseESTestscaffolding.java
@@ -0,0 +1,100 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:26:16 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.nwrest;
+
+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 CreateNetworkResponseESTestscaffolding {
+
+  @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.nwrest.CreateNetworkResponse"; 
+    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(CreateNetworkResponseESTestscaffolding.class.getClassLoader() ,
+      "org.codehaus.jackson.annotate.JacksonAnnotation",
+      "org.openecomp.mso.adapters.nwrest.NetworkResponseCommon",
+      "org.openecomp.mso.entity.MsoRequest",
+      "org.openecomp.mso.openstack.beans.NetworkRollback",
+      "org.openecomp.mso.adapters.nwrest.CreateNetworkResponse",
+      "org.jboss.resteasy.annotations.providers.NoJackson",
+      "org.codehaus.jackson.map.annotate.JsonRootName"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(CreateNetworkResponseESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "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/nwrest/DeleteNetworkErrorESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/DeleteNetworkErrorESTest.java
new file mode 100644
index 0000000000..ad5a65b9f3
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/DeleteNetworkErrorESTest.java
@@ -0,0 +1,37 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:20:47 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.nwrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import org.openecomp.mso.openstack.exceptions.MsoExceptionCategory;
+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 DeleteNetworkErrorESTest extends DeleteNetworkErrorESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test0()  throws Throwable  {
+      MsoExceptionCategory msoExceptionCategory0 = MsoExceptionCategory.IO;
+      DeleteNetworkError deleteNetworkError0 = new DeleteNetworkError("9X", msoExceptionCategory0, false, "ew9AjW>{Sk.");
+      assertEquals("9X", deleteNetworkError0.getMessage());
+  }
+
+  @Test(timeout = 4000)
+  public void test1()  throws Throwable  {
+      DeleteNetworkError deleteNetworkError0 = new DeleteNetworkError();
+      assertNull(deleteNetworkError0.getCategory());
+  }
+
+  @Test(timeout = 4000)
+  public void test2()  throws Throwable  {
+      DeleteNetworkError deleteNetworkError0 = new DeleteNetworkError("9X");
+      assertNull(deleteNetworkError0.getCategory());
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/DeleteNetworkErrorESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/DeleteNetworkErrorESTestscaffolding.java
new file mode 100644
index 0000000000..56788169f6
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/DeleteNetworkErrorESTestscaffolding.java
@@ -0,0 +1,87 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:20:47 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.nwrest;
+
+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 DeleteNetworkErrorESTestscaffolding {
+
+  @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.nwrest.DeleteNetworkError"; 
+    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(DeleteNetworkErrorESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.adapters.nwrest.NetworkResponseCommon",
+      "org.openecomp.mso.adapters.nwrest.NetworkExceptionResponse",
+      "org.openecomp.mso.openstack.exceptions.MsoExceptionCategory",
+      "org.openecomp.mso.adapters.nwrest.DeleteNetworkError",
+      "org.jboss.resteasy.annotations.providers.NoJackson"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(DeleteNetworkErrorESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "org.openecomp.mso.adapters.nwrest.DeleteNetworkError"
+    );
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/DeleteNetworkRequestESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/DeleteNetworkRequestESTest.java
new file mode 100644
index 0000000000..67867b4b38
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/DeleteNetworkRequestESTest.java
@@ -0,0 +1,149 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:26:39 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.nwrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import org.openecomp.mso.entity.MsoRequest;
+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 DeleteNetworkRequestESTest extends DeleteNetworkRequestESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test00()  throws Throwable  {
+      DeleteNetworkRequest deleteNetworkRequest0 = new DeleteNetworkRequest();
+      deleteNetworkRequest0.setTenantId("jaxb.formatted.output");
+      String string0 = deleteNetworkRequest0.getTenantId();
+      assertEquals("jaxb.formatted.output", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test01()  throws Throwable  {
+      DeleteNetworkRequest deleteNetworkRequest0 = new DeleteNetworkRequest();
+      deleteNetworkRequest0.setNetworkType("v6GIJ");
+      String string0 = deleteNetworkRequest0.getNetworkType();
+      assertEquals("v6GIJ", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test02()  throws Throwable  {
+      DeleteNetworkRequest deleteNetworkRequest0 = new DeleteNetworkRequest();
+      deleteNetworkRequest0.setNetworkType("");
+      String string0 = deleteNetworkRequest0.getNetworkType();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test03()  throws Throwable  {
+      DeleteNetworkRequest deleteNetworkRequest0 = new DeleteNetworkRequest();
+      deleteNetworkRequest0.setNetworkStackId(":E:r|{0%c~Z5LYz0S8");
+      String string0 = deleteNetworkRequest0.getNetworkStackId();
+      assertEquals(":E:r|{0%c~Z5LYz0S8", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test04()  throws Throwable  {
+      DeleteNetworkRequest deleteNetworkRequest0 = new DeleteNetworkRequest();
+      deleteNetworkRequest0.setNetworkStackId("");
+      String string0 = deleteNetworkRequest0.getNetworkStackId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test05()  throws Throwable  {
+      DeleteNetworkRequest deleteNetworkRequest0 = new DeleteNetworkRequest();
+      deleteNetworkRequest0.setNetworkId("jaxb.formatted.output");
+      String string0 = deleteNetworkRequest0.getNetworkId();
+      assertEquals("jaxb.formatted.output", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test06()  throws Throwable  {
+      DeleteNetworkRequest deleteNetworkRequest0 = new DeleteNetworkRequest();
+      deleteNetworkRequest0.setMsoRequest((MsoRequest) null);
+      MsoRequest msoRequest0 = deleteNetworkRequest0.getMsoRequest();
+      assertNull(msoRequest0);
+  }
+
+  @Test(timeout = 4000)
+  public void test07()  throws Throwable  {
+      DeleteNetworkRequest deleteNetworkRequest0 = new DeleteNetworkRequest();
+      deleteNetworkRequest0.setCloudSiteId("");
+      String string0 = deleteNetworkRequest0.getCloudSiteId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test08()  throws Throwable  {
+      DeleteNetworkRequest deleteNetworkRequest0 = new DeleteNetworkRequest();
+      String string0 = deleteNetworkRequest0.getNetworkStackId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test09()  throws Throwable  {
+      DeleteNetworkRequest deleteNetworkRequest0 = new DeleteNetworkRequest();
+      String string0 = deleteNetworkRequest0.getNetworkType();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test10()  throws Throwable  {
+      DeleteNetworkRequest deleteNetworkRequest0 = new DeleteNetworkRequest();
+      deleteNetworkRequest0.setNetworkId("");
+      String string0 = deleteNetworkRequest0.getNetworkId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test11()  throws Throwable  {
+      DeleteNetworkRequest deleteNetworkRequest0 = new DeleteNetworkRequest();
+      String string0 = deleteNetworkRequest0.getCloudSiteId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test12()  throws Throwable  {
+      DeleteNetworkRequest deleteNetworkRequest0 = new DeleteNetworkRequest();
+      deleteNetworkRequest0.setTenantId("");
+      String string0 = deleteNetworkRequest0.getTenantId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test13()  throws Throwable  {
+      DeleteNetworkRequest deleteNetworkRequest0 = new DeleteNetworkRequest();
+      String string0 = deleteNetworkRequest0.getNetworkId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test14()  throws Throwable  {
+      DeleteNetworkRequest deleteNetworkRequest0 = new DeleteNetworkRequest();
+      String string0 = deleteNetworkRequest0.getTenantId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test15()  throws Throwable  {
+      DeleteNetworkRequest deleteNetworkRequest0 = new DeleteNetworkRequest();
+      deleteNetworkRequest0.setCloudSiteId("'+#+m");
+      String string0 = deleteNetworkRequest0.getCloudSiteId();
+      assertEquals("'+#+m", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test16()  throws Throwable  {
+      DeleteNetworkRequest deleteNetworkRequest0 = new DeleteNetworkRequest();
+      MsoRequest msoRequest0 = deleteNetworkRequest0.getMsoRequest();
+      deleteNetworkRequest0.setMsoRequest(msoRequest0);
+      assertTrue(deleteNetworkRequest0.isSynchronous());
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/DeleteNetworkRequestESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/DeleteNetworkRequestESTestscaffolding.java
new file mode 100644
index 0000000000..0dc2789a37
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/DeleteNetworkRequestESTestscaffolding.java
@@ -0,0 +1,99 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:26:39 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.nwrest;
+
+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 DeleteNetworkRequestESTestscaffolding {
+
+  @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.nwrest.DeleteNetworkRequest"; 
+    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(DeleteNetworkRequestESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.adapters.nwrest.NetworkRequestCommon",
+      "org.codehaus.jackson.annotate.JacksonAnnotation",
+      "org.openecomp.mso.entity.MsoRequest",
+      "org.openecomp.mso.adapters.nwrest.DeleteNetworkRequest",
+      "org.jboss.resteasy.annotations.providers.NoJackson",
+      "org.codehaus.jackson.map.annotate.JsonRootName"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(DeleteNetworkRequestESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "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/nwrest/DeleteNetworkResponseESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/DeleteNetworkResponseESTest.java
new file mode 100644
index 0000000000..ef93be54d8
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/DeleteNetworkResponseESTest.java
@@ -0,0 +1,73 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Thu Nov 10 15:50:13 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.nwrest;
+
+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 DeleteNetworkResponseESTest extends DeleteNetworkResponseESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test0()  throws Throwable  {
+      DeleteNetworkResponse deleteNetworkResponse0 = new DeleteNetworkResponse();
+      String string0 = deleteNetworkResponse0.getNetworkId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test1()  throws Throwable  {
+      Boolean boolean0 = Boolean.valueOf("!$j-,Qjk_");
+      DeleteNetworkResponse deleteNetworkResponse0 = new DeleteNetworkResponse("!$j-,Qjk_", boolean0, "!$j-,Qjk_");
+      String string0 = deleteNetworkResponse0.getNetworkId();
+      assertEquals("!$j-,Qjk_", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test2()  throws Throwable  {
+      Boolean boolean0 = Boolean.valueOf("!$j-,Qjk_");
+      DeleteNetworkResponse deleteNetworkResponse0 = new DeleteNetworkResponse("!$j-,Qjk_", boolean0, "!$j-,Qjk_");
+      Boolean boolean1 = Boolean.TRUE;
+      deleteNetworkResponse0.setNetworkDeleted(boolean1);
+      Boolean boolean2 = deleteNetworkResponse0.getNetworkDeleted();
+      assertFalse(boolean2.equals((Object)boolean0));
+  }
+
+  @Test(timeout = 4000)
+  public void test3()  throws Throwable  {
+      Boolean boolean0 = Boolean.FALSE;
+      DeleteNetworkResponse deleteNetworkResponse0 = new DeleteNetworkResponse("", boolean0, "");
+      String string0 = deleteNetworkResponse0.getNetworkId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test4()  throws Throwable  {
+      Boolean boolean0 = Boolean.FALSE;
+      DeleteNetworkResponse deleteNetworkResponse0 = new DeleteNetworkResponse("", boolean0, "");
+      Boolean boolean1 = deleteNetworkResponse0.getNetworkDeleted();
+      assertFalse(boolean1);
+  }
+
+  @Test(timeout = 4000)
+  public void test5()  throws Throwable  {
+      Boolean boolean0 = Boolean.FALSE;
+      DeleteNetworkResponse deleteNetworkResponse0 = new DeleteNetworkResponse("", boolean0, "");
+      deleteNetworkResponse0.setNetworkId("");
+      assertEquals("", deleteNetworkResponse0.getMessageId());
+  }
+
+  @Test(timeout = 4000)
+  public void test6()  throws Throwable  {
+      DeleteNetworkResponse deleteNetworkResponse0 = new DeleteNetworkResponse();
+      Boolean boolean0 = deleteNetworkResponse0.getNetworkDeleted();
+      assertNull(boolean0);
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/DeleteNetworkResponseESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/DeleteNetworkResponseESTestscaffolding.java
new file mode 100644
index 0000000000..7c89224e1a
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/DeleteNetworkResponseESTestscaffolding.java
@@ -0,0 +1,98 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Thu Nov 10 15:50:13 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.nwrest;
+
+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 DeleteNetworkResponseESTestscaffolding {
+
+  @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.nwrest.DeleteNetworkResponse"; 
+    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(DeleteNetworkResponseESTestscaffolding.class.getClassLoader() ,
+      "org.codehaus.jackson.annotate.JacksonAnnotation",
+      "org.openecomp.mso.adapters.nwrest.NetworkResponseCommon",
+      "org.openecomp.mso.adapters.nwrest.DeleteNetworkResponse",
+      "org.jboss.resteasy.annotations.providers.NoJackson",
+      "org.codehaus.jackson.map.annotate.JsonRootName"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(DeleteNetworkResponseESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "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/nwrest/NetworkExceptionResponseESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/NetworkExceptionResponseESTest.java
new file mode 100644
index 0000000000..3f23287e0f
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/NetworkExceptionResponseESTest.java
@@ -0,0 +1,86 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:19:39 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.nwrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import org.openecomp.mso.openstack.exceptions.MsoExceptionCategory;
+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 NetworkExceptionResponseESTest extends NetworkExceptionResponseESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test0()  throws Throwable  {
+      MsoExceptionCategory msoExceptionCategory0 = MsoExceptionCategory.IO;
+      NetworkExceptionResponse networkExceptionResponse0 = new NetworkExceptionResponse("('zix", msoExceptionCategory0, true, "3)w4.");
+      Boolean boolean0 = networkExceptionResponse0.getRolledBack();
+      assertEquals("('zix", networkExceptionResponse0.getMessage());
+      assertTrue(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test1()  throws Throwable  {
+      MsoExceptionCategory msoExceptionCategory0 = MsoExceptionCategory.INTERNAL;
+      NetworkExceptionResponse networkExceptionResponse0 = new NetworkExceptionResponse("9L(TNeou", msoExceptionCategory0, false, "9L(TNeou");
+      Boolean boolean0 = networkExceptionResponse0.getRolledBack();
+      assertFalse(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test2()  throws Throwable  {
+      NetworkExceptionResponse networkExceptionResponse0 = new NetworkExceptionResponse("");
+      String string0 = networkExceptionResponse0.getMessage();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test3()  throws Throwable  {
+      NetworkExceptionResponse networkExceptionResponse0 = new NetworkExceptionResponse();
+      MsoExceptionCategory msoExceptionCategory0 = MsoExceptionCategory.IO;
+      networkExceptionResponse0.setCategory(msoExceptionCategory0);
+      MsoExceptionCategory msoExceptionCategory1 = networkExceptionResponse0.getCategory();
+      assertEquals(MsoExceptionCategory.IO, msoExceptionCategory1);
+  }
+
+  @Test(timeout = 4000)
+  public void test4()  throws Throwable  {
+      NetworkExceptionResponse networkExceptionResponse0 = new NetworkExceptionResponse();
+      Boolean boolean0 = networkExceptionResponse0.getRolledBack();
+      assertNull(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test5()  throws Throwable  {
+      NetworkExceptionResponse networkExceptionResponse0 = new NetworkExceptionResponse("");
+      networkExceptionResponse0.getCategory();
+  }
+
+  @Test(timeout = 4000)
+  public void test6()  throws Throwable  {
+      NetworkExceptionResponse networkExceptionResponse0 = new NetworkExceptionResponse();
+      networkExceptionResponse0.setMessage("USERDATA");
+      String string0 = networkExceptionResponse0.getMessage();
+      assertEquals("USERDATA", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test7()  throws Throwable  {
+      NetworkExceptionResponse networkExceptionResponse0 = new NetworkExceptionResponse();
+      networkExceptionResponse0.setRolledBack((Boolean) null);
+      assertNull(networkExceptionResponse0.getCategory());
+  }
+
+  @Test(timeout = 4000)
+  public void test8()  throws Throwable  {
+      NetworkExceptionResponse networkExceptionResponse0 = new NetworkExceptionResponse();
+      String string0 = networkExceptionResponse0.getMessage();
+      assertNull(string0);
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/NetworkExceptionResponseESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/NetworkExceptionResponseESTestscaffolding.java
new file mode 100644
index 0000000000..8cc13647f0
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/NetworkExceptionResponseESTestscaffolding.java
@@ -0,0 +1,96 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:19:39 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.nwrest;
+
+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 NetworkExceptionResponseESTestscaffolding {
+
+  @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.nwrest.NetworkExceptionResponse"; 
+    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(NetworkExceptionResponseESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.adapters.nwrest.NetworkResponseCommon",
+      "org.openecomp.mso.adapters.nwrest.NetworkExceptionResponse",
+      "org.openecomp.mso.openstack.exceptions.MsoExceptionCategory"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(NetworkExceptionResponseESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "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/nwrest/ProviderVlanNetworkESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/ProviderVlanNetworkESTest.java
new file mode 100644
index 0000000000..871683ad6f
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/ProviderVlanNetworkESTest.java
@@ -0,0 +1,81 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:29:16 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.nwrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import java.util.LinkedList;
+import java.util.List;
+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 ProviderVlanNetworkESTest extends ProviderVlanNetworkESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test0()  throws Throwable  {
+      ProviderVlanNetwork providerVlanNetwork0 = new ProviderVlanNetwork();
+      List<Integer> list0 = providerVlanNetwork0.getVlans();
+      assertNull(list0);
+  }
+
+  @Test(timeout = 4000)
+  public void test1()  throws Throwable  {
+      LinkedList<Integer> linkedList0 = new LinkedList<Integer>();
+      Integer integer0 = new Integer((-1244));
+      linkedList0.add(integer0);
+      ProviderVlanNetwork providerVlanNetwork0 = new ProviderVlanNetwork("PF?v'FLs", (List<Integer>) linkedList0);
+      List<Integer> list0 = providerVlanNetwork0.getVlans();
+      assertEquals(1, list0.size());
+  }
+
+  @Test(timeout = 4000)
+  public void test2()  throws Throwable  {
+      ProviderVlanNetwork providerVlanNetwork0 = new ProviderVlanNetwork();
+      String string0 = providerVlanNetwork0.getPhysicalNetworkName();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test3()  throws Throwable  {
+      ProviderVlanNetwork providerVlanNetwork0 = new ProviderVlanNetwork("I;{", (List<Integer>) null);
+      String string0 = providerVlanNetwork0.getPhysicalNetworkName();
+      assertEquals("I;{", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test4()  throws Throwable  {
+      ProviderVlanNetwork providerVlanNetwork0 = new ProviderVlanNetwork("I;{", (List<Integer>) null);
+      providerVlanNetwork0.setPhysicalNetworkName("h8H");
+      assertEquals("h8H", providerVlanNetwork0.getPhysicalNetworkName());
+  }
+
+  @Test(timeout = 4000)
+  public void test5()  throws Throwable  {
+      LinkedList<Integer> linkedList0 = new LinkedList<Integer>();
+      ProviderVlanNetwork providerVlanNetwork0 = new ProviderVlanNetwork("", (List<Integer>) linkedList0);
+      String string0 = providerVlanNetwork0.getPhysicalNetworkName();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test6()  throws Throwable  {
+      ProviderVlanNetwork providerVlanNetwork0 = new ProviderVlanNetwork();
+      LinkedList<Integer> linkedList0 = new LinkedList<Integer>();
+      providerVlanNetwork0.setVlans(linkedList0);
+      assertEquals(0, linkedList0.size());
+  }
+
+  @Test(timeout = 4000)
+  public void test7()  throws Throwable  {
+      LinkedList<Integer> linkedList0 = new LinkedList<Integer>();
+      ProviderVlanNetwork providerVlanNetwork0 = new ProviderVlanNetwork("3UmMF;h", (List<Integer>) linkedList0);
+      List<Integer> list0 = providerVlanNetwork0.getVlans();
+      assertTrue(list0.isEmpty());
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/ProviderVlanNetworkESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/ProviderVlanNetworkESTestscaffolding.java
new file mode 100644
index 0000000000..93149f6b50
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/ProviderVlanNetworkESTestscaffolding.java
@@ -0,0 +1,78 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:29:16 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.nwrest;
+
+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 ProviderVlanNetworkESTestscaffolding {
+
+  @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.nwrest.ProviderVlanNetwork"; 
+    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(ProviderVlanNetworkESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.adapters.nwrest.ProviderVlanNetwork"
+    );
+  } 
+
+  private static void resetClasses() {
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/QueryNetworkErrorESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/QueryNetworkErrorESTest.java
new file mode 100644
index 0000000000..645d506936
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/QueryNetworkErrorESTest.java
@@ -0,0 +1,23 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:17:33 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.nwrest;
+
+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 QueryNetworkErrorESTest extends QueryNetworkErrorESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test0()  throws Throwable  {
+      QueryNetworkError queryNetworkError0 = new QueryNetworkError();
+      assertNull(queryNetworkError0.getMessage());
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/QueryNetworkErrorESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/QueryNetworkErrorESTestscaffolding.java
new file mode 100644
index 0000000000..700d2aaf74
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/QueryNetworkErrorESTestscaffolding.java
@@ -0,0 +1,87 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:17:33 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.nwrest;
+
+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 QueryNetworkErrorESTestscaffolding {
+
+  @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.nwrest.QueryNetworkError"; 
+    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(QueryNetworkErrorESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.adapters.nwrest.NetworkResponseCommon",
+      "org.openecomp.mso.adapters.nwrest.NetworkExceptionResponse",
+      "org.openecomp.mso.openstack.exceptions.MsoExceptionCategory",
+      "org.jboss.resteasy.annotations.providers.NoJackson",
+      "org.openecomp.mso.adapters.nwrest.QueryNetworkError"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(QueryNetworkErrorESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "org.openecomp.mso.adapters.nwrest.QueryNetworkError"
+    );
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/QueryNetworkResponseESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/QueryNetworkResponseESTest.java
new file mode 100644
index 0000000000..be18fcc1c4
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/QueryNetworkResponseESTest.java
@@ -0,0 +1,296 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:16:38 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.nwrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+import static org.evosuite.runtime.EvoAssertions.*;
+
+import org.openecomp.mso.openstack.beans.NetworkStatus;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+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 QueryNetworkResponseESTest extends QueryNetworkResponseESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test00()  throws Throwable  {
+      NetworkStatus networkStatus0 = NetworkStatus.DOWN;
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      QueryNetworkResponse queryNetworkResponse0 = new QueryNetworkResponse("'Y=Kq<f!!gJ{1Q6v", "", "", networkStatus0, (Map<String, String>) hashMap0);
+      LinkedList<Integer> linkedList0 = new LinkedList<Integer>();
+      queryNetworkResponse0.setVlans(linkedList0);
+      queryNetworkResponse0.getVlans();
+      assertEquals("", queryNetworkResponse0.getNetworkStackId());
+      assertEquals("'Y=Kq<f!!gJ{1Q6v", queryNetworkResponse0.getNetworkId());
+      assertEquals("", queryNetworkResponse0.getNeutronNetworkId());
+  }
+
+  @Test(timeout = 4000)
+  public void test01()  throws Throwable  {
+      QueryNetworkResponse queryNetworkResponse0 = new QueryNetworkResponse();
+      LinkedList<Integer> linkedList0 = new LinkedList<Integer>();
+      Integer integer0 = new Integer(1256);
+      linkedList0.add(integer0);
+      queryNetworkResponse0.setVlans(linkedList0);
+      List<Integer> list0 = queryNetworkResponse0.getVlans();
+      assertFalse(list0.isEmpty());
+  }
+
+  @Test(timeout = 4000)
+  public void test02()  throws Throwable  {
+      NetworkStatus networkStatus0 = NetworkStatus.UNKNOWN;
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      QueryNetworkResponse queryNetworkResponse0 = new QueryNetworkResponse(" v7FX_$8q *", "~MSM=Lj 78BbfMF4", " v7FX_$8q *", networkStatus0, (Map<String, String>) hashMap0);
+      queryNetworkResponse0.setSubnetIdMap(hashMap0);
+      queryNetworkResponse0.getSubnetIdMap();
+      assertEquals(" v7FX_$8q *", queryNetworkResponse0.getNetworkId());
+      assertEquals("~MSM=Lj 78BbfMF4", queryNetworkResponse0.getNeutronNetworkId());
+      assertEquals(" v7FX_$8q *", queryNetworkResponse0.getNetworkStackId());
+  }
+
+  @Test(timeout = 4000)
+  public void test03()  throws Throwable  {
+      NetworkStatus networkStatus0 = NetworkStatus.UNKNOWN;
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      QueryNetworkResponse queryNetworkResponse0 = new QueryNetworkResponse("6+6JBO^tv]?e;D6`Hh", "+QU\"j=Jt>;9w<w[9~c.", "6+6JBO^tv]?e;D6`Hh", networkStatus0, (Map<String, String>) hashMap0);
+      queryNetworkResponse0.setSubnetIdMap(hashMap0);
+      hashMap0.put((String) null, (String) null);
+      queryNetworkResponse0.getSubnetIdMap();
+      assertEquals("6+6JBO^tv]?e;D6`Hh", queryNetworkResponse0.getNetworkId());
+      assertEquals("6+6JBO^tv]?e;D6`Hh", queryNetworkResponse0.getNetworkStackId());
+      assertEquals("+QU\"j=Jt>;9w<w[9~c.", queryNetworkResponse0.getNeutronNetworkId());
+  }
+
+  @Test(timeout = 4000)
+  public void test04()  throws Throwable  {
+      QueryNetworkResponse queryNetworkResponse0 = new QueryNetworkResponse();
+      LinkedList<String> linkedList0 = new LinkedList<String>();
+      linkedList0.push("s<z*H=#g");
+      queryNetworkResponse0.setRouteTargets(linkedList0);
+      List<String> list0 = queryNetworkResponse0.getRouteTargets();
+      assertFalse(list0.isEmpty());
+  }
+
+  @Test(timeout = 4000)
+  public void test05()  throws Throwable  {
+      NetworkStatus networkStatus0 = NetworkStatus.UNKNOWN;
+      QueryNetworkResponse queryNetworkResponse0 = new QueryNetworkResponse("", "ACTIVE", "ACTIVE", networkStatus0, (Map<String, String>) null);
+      String string0 = queryNetworkResponse0.getNeutronNetworkId();
+      assertEquals("", queryNetworkResponse0.getNetworkId());
+      assertEquals("ACTIVE", queryNetworkResponse0.getNetworkStackId());
+      assertEquals("ACTIVE", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test06()  throws Throwable  {
+      NetworkStatus networkStatus0 = NetworkStatus.DOWN;
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      QueryNetworkResponse queryNetworkResponse0 = new QueryNetworkResponse("'Y=Kq<f!!gJ{1Q6v", "", "", networkStatus0, (Map<String, String>) hashMap0);
+      String string0 = queryNetworkResponse0.getNeutronNetworkId();
+      assertEquals("", string0);
+      assertEquals("", queryNetworkResponse0.getNetworkStackId());
+      assertEquals("'Y=Kq<f!!gJ{1Q6v", queryNetworkResponse0.getNetworkId());
+  }
+
+  @Test(timeout = 4000)
+  public void test07()  throws Throwable  {
+      NetworkStatus networkStatus0 = NetworkStatus.UNKNOWN;
+      QueryNetworkResponse queryNetworkResponse0 = new QueryNetworkResponse("ZLW;0Nz", "ZLW;0Nz", "ZLW;0Nz", networkStatus0, (Map<String, String>) null);
+      String string0 = queryNetworkResponse0.getNetworkStackId();
+      assertEquals("ZLW;0Nz", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test08()  throws Throwable  {
+      NetworkStatus networkStatus0 = NetworkStatus.DOWN;
+      QueryNetworkResponse queryNetworkResponse0 = new QueryNetworkResponse("", "", "", networkStatus0, (Map<String, String>) null);
+      String string0 = queryNetworkResponse0.getNetworkStackId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test09()  throws Throwable  {
+      NetworkStatus networkStatus0 = NetworkStatus.UNKNOWN;
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      QueryNetworkResponse queryNetworkResponse0 = new QueryNetworkResponse(" v7FX_$8q *", "~MSM=Lj 78BbfMF4", " v7FX_$8q *", networkStatus0, (Map<String, String>) hashMap0);
+      queryNetworkResponse0.getNetworkOutputs();
+      assertEquals("~MSM=Lj 78BbfMF4", queryNetworkResponse0.getNeutronNetworkId());
+      assertEquals(" v7FX_$8q *", queryNetworkResponse0.getNetworkStackId());
+      assertEquals(" v7FX_$8q *", queryNetworkResponse0.getNetworkId());
+  }
+
+  @Test(timeout = 4000)
+  public void test10()  throws Throwable  {
+      NetworkStatus networkStatus0 = NetworkStatus.UNKNOWN;
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      QueryNetworkResponse queryNetworkResponse0 = new QueryNetworkResponse("6+6JBO^tv]?e;D6`Hh", "+QU\"j=Jt>;9w<w[9~c.", "6+6JBO^tv]?e;D6`Hh", networkStatus0, (Map<String, String>) hashMap0);
+      hashMap0.put((String) null, (String) null);
+      queryNetworkResponse0.getNetworkOutputs();
+      assertEquals("6+6JBO^tv]?e;D6`Hh", queryNetworkResponse0.getNetworkId());
+      assertEquals("+QU\"j=Jt>;9w<w[9~c.", queryNetworkResponse0.getNeutronNetworkId());
+      assertEquals("6+6JBO^tv]?e;D6`Hh", queryNetworkResponse0.getNetworkStackId());
+  }
+
+  @Test(timeout = 4000)
+  public void test11()  throws Throwable  {
+      QueryNetworkResponse queryNetworkResponse0 = new QueryNetworkResponse();
+      queryNetworkResponse0.setNetworkId("");
+      String string0 = queryNetworkResponse0.getNetworkId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test12()  throws Throwable  {
+      QueryNetworkResponse queryNetworkResponse0 = new QueryNetworkResponse();
+      Boolean boolean0 = new Boolean(false);
+      queryNetworkResponse0.setNetworkExists(boolean0);
+      Boolean boolean1 = queryNetworkResponse0.getNetworkExists();
+      assertFalse(boolean1);
+  }
+
+  @Test(timeout = 4000)
+  public void test13()  throws Throwable  {
+      QueryNetworkResponse queryNetworkResponse0 = new QueryNetworkResponse();
+      queryNetworkResponse0.setNeutronNetworkId("org.openecomp.mso.openstack.beans.NetworkStatus");
+      assertNull(queryNetworkResponse0.getNetworkId());
+  }
+
+  @Test(timeout = 4000)
+  public void test14()  throws Throwable  {
+      QueryNetworkResponse queryNetworkResponse0 = new QueryNetworkResponse();
+      String string0 = queryNetworkResponse0.getNetworkStackId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test15()  throws Throwable  {
+      QueryNetworkResponse queryNetworkResponse0 = new QueryNetworkResponse();
+      Boolean boolean0 = queryNetworkResponse0.getNetworkExists();
+      assertNull(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test16()  throws Throwable  {
+      QueryNetworkResponse queryNetworkResponse0 = new QueryNetworkResponse();
+      Map<String, String> map0 = queryNetworkResponse0.getSubnetIdMap();
+      assertNull(map0);
+  }
+
+  @Test(timeout = 4000)
+  public void test17()  throws Throwable  {
+      QueryNetworkResponse queryNetworkResponse0 = new QueryNetworkResponse();
+      // Undeclared exception!
+      try { 
+        queryNetworkResponse0.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 test18()  throws Throwable  {
+      QueryNetworkResponse queryNetworkResponse0 = new QueryNetworkResponse();
+      Map<String, String> map0 = queryNetworkResponse0.getNetworkOutputs();
+      assertNull(map0);
+  }
+
+  @Test(timeout = 4000)
+  public void test19()  throws Throwable  {
+      QueryNetworkResponse queryNetworkResponse0 = new QueryNetworkResponse();
+      List<Integer> list0 = queryNetworkResponse0.getVlans();
+      assertNull(list0);
+  }
+
+  @Test(timeout = 4000)
+  public void test20()  throws Throwable  {
+      QueryNetworkResponse queryNetworkResponse0 = new QueryNetworkResponse();
+      NetworkStatus networkStatus0 = NetworkStatus.DOWN;
+      queryNetworkResponse0.setNetworkStatus(networkStatus0);
+      NetworkStatus networkStatus1 = queryNetworkResponse0.getNetworkStatus();
+      assertEquals(NetworkStatus.DOWN, networkStatus1);
+  }
+
+  @Test(timeout = 4000)
+  public void test21()  throws Throwable  {
+      QueryNetworkResponse queryNetworkResponse0 = new QueryNetworkResponse();
+      List<String> list0 = queryNetworkResponse0.getRouteTargets();
+      assertNull(list0);
+  }
+
+  @Test(timeout = 4000)
+  public void test22()  throws Throwable  {
+      QueryNetworkResponse queryNetworkResponse0 = new QueryNetworkResponse();
+      String string0 = queryNetworkResponse0.getNeutronNetworkId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test23()  throws Throwable  {
+      QueryNetworkResponse queryNetworkResponse0 = new QueryNetworkResponse();
+      Boolean boolean0 = Boolean.TRUE;
+      queryNetworkResponse0.setNetworkExists(boolean0);
+      Boolean boolean1 = queryNetworkResponse0.getNetworkExists();
+      assertTrue(boolean1);
+  }
+
+  @Test(timeout = 4000)
+  public void test24()  throws Throwable  {
+      QueryNetworkResponse queryNetworkResponse0 = new QueryNetworkResponse();
+      queryNetworkResponse0.setNetworkStackId((String) null);
+      assertNull(queryNetworkResponse0.getNeutronNetworkId());
+  }
+
+  @Test(timeout = 4000)
+  public void test25()  throws Throwable  {
+      QueryNetworkResponse queryNetworkResponse0 = new QueryNetworkResponse();
+      String string0 = queryNetworkResponse0.getNetworkId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test26()  throws Throwable  {
+      QueryNetworkResponse queryNetworkResponse0 = new QueryNetworkResponse();
+      queryNetworkResponse0.setNetworkOutputs((Map<String, String>) null);
+      assertNull(queryNetworkResponse0.getNeutronNetworkId());
+  }
+
+  @Test(timeout = 4000)
+  public void test27()  throws Throwable  {
+      QueryNetworkResponse queryNetworkResponse0 = new QueryNetworkResponse();
+      queryNetworkResponse0.getNetworkStatus();
+  }
+
+  @Test(timeout = 4000)
+  public void test28()  throws Throwable  {
+      QueryNetworkResponse queryNetworkResponse0 = new QueryNetworkResponse();
+      LinkedList<String> linkedList0 = new LinkedList<String>();
+      queryNetworkResponse0.setRouteTargets(linkedList0);
+      List<String> list0 = queryNetworkResponse0.getRouteTargets();
+      assertTrue(list0.isEmpty());
+  }
+
+  @Test(timeout = 4000)
+  public void test29()  throws Throwable  {
+      NetworkStatus networkStatus0 = NetworkStatus.ERROR;
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      QueryNetworkResponse queryNetworkResponse0 = new QueryNetworkResponse("Cm6LuDyY", "Cm6LuDyY", "O5]9 [Se?X,q", networkStatus0, (Map<String, String>) hashMap0);
+      String string0 = queryNetworkResponse0.getNetworkId();
+      assertEquals("Cm6LuDyY", string0);
+      assertEquals("O5]9 [Se?X,q", queryNetworkResponse0.getNetworkStackId());
+      assertEquals("Cm6LuDyY", queryNetworkResponse0.getNeutronNetworkId());
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/QueryNetworkResponseESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/QueryNetworkResponseESTestscaffolding.java
new file mode 100644
index 0000000000..9f554d3e14
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/QueryNetworkResponseESTestscaffolding.java
@@ -0,0 +1,194 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:16:38 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.nwrest;
+
+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 QueryNetworkResponseESTestscaffolding {
+
+  @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.nwrest.QueryNetworkResponse"; 
+    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(QueryNetworkResponseESTestscaffolding.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.openecomp.mso.adapters.nwrest.QueryNetworkResponse",
+      "org.codehaus.jackson.map.JsonSerializable",
+      "org.codehaus.jackson.annotate.JsonMethod",
+      "org.codehaus.jackson.node.BaseJsonNode",
+      "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",
+      "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.map.ClassIntrospector",
+      "org.codehaus.jackson.map.AnnotationIntrospector$Pair",
+      "org.codehaus.jackson.Versioned",
+      "org.codehaus.jackson.map.type.TypeBase",
+      "org.codehaus.jackson.map.ser.BasicSerializerFactory",
+      "org.codehaus.jackson.node.ContainerNode",
+      "org.codehaus.jackson.map.introspect.NopAnnotationIntrospector",
+      "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.codehaus.jackson.node.ObjectNode",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$MinimalMethodFilter",
+      "org.codehaus.jackson.map.type.CollectionLikeType",
+      "org.codehaus.jackson.sym.CharsToNameCanonicalizer$Bucket",
+      "org.codehaus.jackson.impl.JsonParserMinimalBase",
+      "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.openecomp.mso.openstack.beans.NetworkStatus",
+      "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",
+      "org.codehaus.jackson.ObjectCodec",
+      "org.codehaus.jackson.map.introspect.AnnotatedMethod",
+      "org.codehaus.jackson.JsonFactory",
+      "org.codehaus.jackson.node.ArrayNode",
+      "org.codehaus.jackson.io.SegmentedStringWriter",
+      "org.codehaus.jackson.map.jsontype.TypeResolverBuilder",
+      "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.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",
+      "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",
+      "org.codehaus.jackson.map.MapperConfig",
+      "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.codehaus.jackson.map.ClassIntrospector$MixInResolver"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(QueryNetworkResponseESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "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/nwrest/RollbackNetworkErrorESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/RollbackNetworkErrorESTest.java
new file mode 100644
index 0000000000..5880bdbfca
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/RollbackNetworkErrorESTest.java
@@ -0,0 +1,37 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:27:07 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.nwrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import org.openecomp.mso.openstack.exceptions.MsoExceptionCategory;
+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 RollbackNetworkErrorESTest extends RollbackNetworkErrorESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test0()  throws Throwable  {
+      MsoExceptionCategory msoExceptionCategory0 = MsoExceptionCategory.USERDATA;
+      RollbackNetworkError rollbackNetworkError0 = new RollbackNetworkError("$/e2Fa;", msoExceptionCategory0, false, "org.openecomp.mso.openstack.exceptions.MsoExceptionCategory");
+      assertEquals("$/e2Fa;", rollbackNetworkError0.getMessage());
+  }
+
+  @Test(timeout = 4000)
+  public void test1()  throws Throwable  {
+      RollbackNetworkError rollbackNetworkError0 = new RollbackNetworkError();
+      assertNull(rollbackNetworkError0.getMessageId());
+  }
+
+  @Test(timeout = 4000)
+  public void test2()  throws Throwable  {
+      RollbackNetworkError rollbackNetworkError0 = new RollbackNetworkError("6.4B5l)6k@iZM");
+      assertNull(rollbackNetworkError0.getCategory());
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/RollbackNetworkErrorESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/RollbackNetworkErrorESTestscaffolding.java
new file mode 100644
index 0000000000..647a917d52
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/RollbackNetworkErrorESTestscaffolding.java
@@ -0,0 +1,87 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:27:07 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.nwrest;
+
+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 RollbackNetworkErrorESTestscaffolding {
+
+  @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.nwrest.RollbackNetworkError"; 
+    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(RollbackNetworkErrorESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.adapters.nwrest.RollbackNetworkError",
+      "org.openecomp.mso.adapters.nwrest.NetworkResponseCommon",
+      "org.openecomp.mso.adapters.nwrest.NetworkExceptionResponse",
+      "org.openecomp.mso.openstack.exceptions.MsoExceptionCategory",
+      "org.jboss.resteasy.annotations.providers.NoJackson"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(RollbackNetworkErrorESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "org.openecomp.mso.adapters.nwrest.RollbackNetworkError"
+    );
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/RollbackNetworkRequestESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/RollbackNetworkRequestESTest.java
new file mode 100644
index 0000000000..255a18e826
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/RollbackNetworkRequestESTest.java
@@ -0,0 +1,44 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:15:37 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.nwrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import org.openecomp.mso.openstack.beans.NetworkRollback;
+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 RollbackNetworkRequestESTest extends RollbackNetworkRequestESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test0()  throws Throwable  {
+      RollbackNetworkRequest rollbackNetworkRequest0 = new RollbackNetworkRequest();
+      NetworkRollback networkRollback0 = new NetworkRollback();
+      rollbackNetworkRequest0.setNetworkRollback(networkRollback0);
+      networkRollback0.setNetworkCreated(true);
+      NetworkRollback networkRollback1 = rollbackNetworkRequest0.getNetworkRollback();
+      assertNull(networkRollback1.getNeutronNetworkId());
+  }
+
+  @Test(timeout = 4000)
+  public void test1()  throws Throwable  {
+      RollbackNetworkRequest rollbackNetworkRequest0 = new RollbackNetworkRequest();
+      NetworkRollback networkRollback0 = new NetworkRollback();
+      rollbackNetworkRequest0.setNetworkRollback(networkRollback0);
+      NetworkRollback networkRollback1 = rollbackNetworkRequest0.getNetworkRollback();
+      assertNull(networkRollback1.getNeutronNetworkId());
+  }
+
+  @Test(timeout = 4000)
+  public void test2()  throws Throwable  {
+      RollbackNetworkRequest rollbackNetworkRequest0 = new RollbackNetworkRequest();
+      NetworkRollback networkRollback0 = rollbackNetworkRequest0.getNetworkRollback();
+      assertNull(networkRollback0);
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/RollbackNetworkRequestESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/RollbackNetworkRequestESTestscaffolding.java
new file mode 100644
index 0000000000..3290c92f58
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/RollbackNetworkRequestESTestscaffolding.java
@@ -0,0 +1,100 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:15:37 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.nwrest;
+
+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 RollbackNetworkRequestESTestscaffolding {
+
+  @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.nwrest.RollbackNetworkRequest"; 
+    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(RollbackNetworkRequestESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.adapters.nwrest.NetworkRequestCommon",
+      "org.codehaus.jackson.annotate.JacksonAnnotation",
+      "org.openecomp.mso.entity.MsoRequest",
+      "org.openecomp.mso.adapters.nwrest.RollbackNetworkRequest",
+      "org.openecomp.mso.openstack.beans.NetworkRollback",
+      "org.jboss.resteasy.annotations.providers.NoJackson",
+      "org.codehaus.jackson.map.annotate.JsonRootName"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(RollbackNetworkRequestESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "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/nwrest/RollbackNetworkResponseESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/RollbackNetworkResponseESTest.java
new file mode 100644
index 0000000000..ba571a1356
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/RollbackNetworkResponseESTest.java
@@ -0,0 +1,42 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:20:37 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.nwrest;
+
+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 RollbackNetworkResponseESTest extends RollbackNetworkResponseESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test0()  throws Throwable  {
+      Boolean boolean0 = Boolean.TRUE;
+      RollbackNetworkResponse rollbackNetworkResponse0 = new RollbackNetworkResponse(boolean0, "");
+      Boolean boolean1 = rollbackNetworkResponse0.getNetworkRolledBack();
+      assertTrue(boolean1);
+  }
+
+  @Test(timeout = 4000)
+  public void test1()  throws Throwable  {
+      Boolean boolean0 = Boolean.TRUE;
+      RollbackNetworkResponse rollbackNetworkResponse0 = new RollbackNetworkResponse(boolean0, "");
+      Boolean boolean1 = new Boolean("");
+      rollbackNetworkResponse0.setNetworkRolledBack(boolean1);
+      Boolean boolean2 = rollbackNetworkResponse0.getNetworkRolledBack();
+      assertFalse(boolean2);
+  }
+
+  @Test(timeout = 4000)
+  public void test2()  throws Throwable  {
+      RollbackNetworkResponse rollbackNetworkResponse0 = new RollbackNetworkResponse();
+      Boolean boolean0 = rollbackNetworkResponse0.getNetworkRolledBack();
+      assertNull(boolean0);
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/RollbackNetworkResponseESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/RollbackNetworkResponseESTestscaffolding.java
new file mode 100644
index 0000000000..7efb29e91a
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/RollbackNetworkResponseESTestscaffolding.java
@@ -0,0 +1,98 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:20:37 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.nwrest;
+
+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 RollbackNetworkResponseESTestscaffolding {
+
+  @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.nwrest.RollbackNetworkResponse"; 
+    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(RollbackNetworkResponseESTestscaffolding.class.getClassLoader() ,
+      "org.codehaus.jackson.annotate.JacksonAnnotation",
+      "org.openecomp.mso.adapters.nwrest.NetworkResponseCommon",
+      "org.openecomp.mso.adapters.nwrest.RollbackNetworkResponse",
+      "org.jboss.resteasy.annotations.providers.NoJackson",
+      "org.codehaus.jackson.map.annotate.JsonRootName"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(RollbackNetworkResponseESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "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/nwrest/UpdateNetworkErrorESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/UpdateNetworkErrorESTest.java
new file mode 100644
index 0000000000..4f24306501
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/UpdateNetworkErrorESTest.java
@@ -0,0 +1,37 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:22:12 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.nwrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import org.openecomp.mso.openstack.exceptions.MsoExceptionCategory;
+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 UpdateNetworkErrorESTest extends UpdateNetworkErrorESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test0()  throws Throwable  {
+      UpdateNetworkError updateNetworkError0 = new UpdateNetworkError();
+      assertNull(updateNetworkError0.getMessageId());
+  }
+
+  @Test(timeout = 4000)
+  public void test1()  throws Throwable  {
+      UpdateNetworkError updateNetworkError0 = new UpdateNetworkError("");
+      assertNull(updateNetworkError0.getCategory());
+  }
+
+  @Test(timeout = 4000)
+  public void test2()  throws Throwable  {
+      MsoExceptionCategory msoExceptionCategory0 = MsoExceptionCategory.OPENSTACK;
+      UpdateNetworkError updateNetworkError0 = new UpdateNetworkError("", msoExceptionCategory0, false, "");
+      assertEquals("", updateNetworkError0.getMessage());
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/UpdateNetworkErrorESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/UpdateNetworkErrorESTestscaffolding.java
new file mode 100644
index 0000000000..91bae26302
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/UpdateNetworkErrorESTestscaffolding.java
@@ -0,0 +1,87 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:22:12 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.nwrest;
+
+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 UpdateNetworkErrorESTestscaffolding {
+
+  @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.nwrest.UpdateNetworkError"; 
+    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(UpdateNetworkErrorESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.adapters.nwrest.UpdateNetworkError",
+      "org.openecomp.mso.adapters.nwrest.NetworkResponseCommon",
+      "org.openecomp.mso.adapters.nwrest.NetworkExceptionResponse",
+      "org.openecomp.mso.openstack.exceptions.MsoExceptionCategory",
+      "org.jboss.resteasy.annotations.providers.NoJackson"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(UpdateNetworkErrorESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "org.openecomp.mso.adapters.nwrest.UpdateNetworkError"
+    );
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/UpdateNetworkRequestESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/UpdateNetworkRequestESTest.java
new file mode 100644
index 0000000000..f7703d5853
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/UpdateNetworkRequestESTest.java
@@ -0,0 +1,353 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:13:39 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.nwrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+import static org.evosuite.runtime.EvoAssertions.*;
+
+import org.openecomp.mso.entity.MsoRequest;
+import org.openecomp.mso.openstack.beans.Subnet;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+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 UpdateNetworkRequestESTest extends UpdateNetworkRequestESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test00()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      updateNetworkRequest0.setNetworkTechnology("NEUTRON");
+      assertNull(updateNetworkRequest0.getNetworkStackId());
+  }
+
+  @Test(timeout = 4000)
+  public void test01()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      updateNetworkRequest0.setTenantId("");
+      String string0 = updateNetworkRequest0.getTenantId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test02()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      LinkedList<Subnet> linkedList0 = new LinkedList<Subnet>();
+      Subnet subnet0 = new Subnet();
+      linkedList0.addLast(subnet0);
+      updateNetworkRequest0.setSubnets(linkedList0);
+      List<Subnet> list0 = updateNetworkRequest0.getSubnets();
+      assertEquals(1, list0.size());
+  }
+
+  @Test(timeout = 4000)
+  public void test03()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      LinkedList<Integer> linkedList0 = new LinkedList<Integer>();
+      ProviderVlanNetwork providerVlanNetwork0 = new ProviderVlanNetwork("NEUTRON", (List<Integer>) linkedList0);
+      updateNetworkRequest0.setProviderVlanNetwork(providerVlanNetwork0);
+      ProviderVlanNetwork providerVlanNetwork1 = updateNetworkRequest0.getProviderVlanNetwork();
+      assertSame(providerVlanNetwork1, providerVlanNetwork0);
+  }
+
+  @Test(timeout = 4000)
+  public void test04()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      updateNetworkRequest0.setNetworkTypeVersion("$7/{y&^~o(,9x11)BHX");
+      String string0 = updateNetworkRequest0.getNetworkTypeVersion();
+      assertEquals("$7/{y&^~o(,9x11)BHX", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test05()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      updateNetworkRequest0.setNetworkTypeVersion("");
+      String string0 = updateNetworkRequest0.getNetworkTypeVersion();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test06()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      updateNetworkRequest0.setNetworkType("IW4N;?_XL%q;");
+      String string0 = updateNetworkRequest0.getNetworkType();
+      assertEquals("IW4N;?_XL%q;", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test07()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      updateNetworkRequest0.setNetworkStackId("Allocation_pool [start=");
+      String string0 = updateNetworkRequest0.getNetworkStackId();
+      assertEquals("Allocation_pool [start=", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test08()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      updateNetworkRequest0.setNetworkStackId("");
+      String string0 = updateNetworkRequest0.getNetworkStackId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test09()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      hashMap0.put("", "");
+      updateNetworkRequest0.setNetworkParams(hashMap0);
+      Map<String, String> map0 = updateNetworkRequest0.getNetworkParams();
+      assertFalse(map0.isEmpty());
+  }
+
+  @Test(timeout = 4000)
+  public void test10()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      updateNetworkRequest0.setNetworkName("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<updateNetworkRequest>\n    <skipAAI>false</skipAAI>\n    <backout>true</backout>\n    <msoRequest/>\n    <networkParams/>\n    <networkTechnology>NEUTRON</networkTechnology>\n</updateNetworkRequest>\n");
+      String string0 = updateNetworkRequest0.getNetworkName();
+      assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<updateNetworkRequest>\n    <skipAAI>false</skipAAI>\n    <backout>true</backout>\n    <msoRequest/>\n    <networkParams/>\n    <networkTechnology>NEUTRON</networkTechnology>\n</updateNetworkRequest>\n", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test11()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      updateNetworkRequest0.setNetworkName("");
+      String string0 = updateNetworkRequest0.getNetworkName();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test12()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      updateNetworkRequest0.setNetworkId("");
+      String string0 = updateNetworkRequest0.getNetworkId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test13()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      updateNetworkRequest0.setMsoRequest((MsoRequest) null);
+      MsoRequest msoRequest0 = updateNetworkRequest0.getMsoRequest();
+      assertNull(msoRequest0);
+  }
+
+  @Test(timeout = 4000)
+  public void test14()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      ContrailNetwork contrailNetwork0 = new ContrailNetwork();
+      updateNetworkRequest0.setContrailNetwork(contrailNetwork0);
+      ContrailNetwork contrailNetwork1 = updateNetworkRequest0.getContrailNetwork();
+      assertEquals("false", contrailNetwork1.getShared());
+  }
+
+  @Test(timeout = 4000)
+  public void test15()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      updateNetworkRequest0.setCloudSiteId("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<updateNetworkRequest>\n    <skipAAI>false</skipAAI>\n    <backout>true</backout>\n    <msoRequest>\n        <requestId></requestId>\n        <serviceInstanceId></serviceInstanceId>\n    </msoRequest>\n    <networkParams/>\n    <networkTechnology>NEUTRON</networkTechnology>\n</updateNetworkRequest>\n");
+      String string0 = updateNetworkRequest0.getCloudSiteId();
+      assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<updateNetworkRequest>\n    <skipAAI>false</skipAAI>\n    <backout>true</backout>\n    <msoRequest>\n        <requestId></requestId>\n        <serviceInstanceId></serviceInstanceId>\n    </msoRequest>\n    <networkParams/>\n    <networkTechnology>NEUTRON</networkTechnology>\n</updateNetworkRequest>\n", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test16()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      updateNetworkRequest0.setBackout((Boolean) null);
+      Boolean boolean0 = updateNetworkRequest0.getBackout();
+      assertNull(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test17()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      Boolean boolean0 = Boolean.valueOf(false);
+      updateNetworkRequest0.setBackout(boolean0);
+      Boolean boolean1 = updateNetworkRequest0.getBackout();
+      assertFalse(boolean1);
+  }
+
+  @Test(timeout = 4000)
+  public void test18()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      // Undeclared exception!
+      try { 
+        updateNetworkRequest0.setNetworkTechnology((String) null);
+        fail("Expecting exception: NullPointerException");
+      
+      } catch(NullPointerException e) {
+         //
+         // no message in exception (getMessage() returned null)
+         //
+         verifyException("org.openecomp.mso.adapters.nwrest.UpdateNetworkRequest", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test19()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      ContrailNetwork contrailNetwork0 = updateNetworkRequest0.getContrailNetwork();
+      assertNull(contrailNetwork0);
+  }
+
+  @Test(timeout = 4000)
+  public void test20()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      List<Subnet> list0 = updateNetworkRequest0.getSubnets();
+      assertNull(list0);
+  }
+
+  @Test(timeout = 4000)
+  public void test21()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      Boolean boolean0 = updateNetworkRequest0.getBackout();
+      assertTrue(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test22()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      String string0 = updateNetworkRequest0.getNetworkType();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test23()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      String string0 = updateNetworkRequest0.getTenantId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test24()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      MsoRequest msoRequest0 = updateNetworkRequest0.getMsoRequest();
+      assertNull(msoRequest0.getServiceInstanceId());
+  }
+
+  @Test(timeout = 4000)
+  public void test25()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      String string0 = updateNetworkRequest0.getNetworkName();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test26()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      String string0 = updateNetworkRequest0.getNetworkId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test27()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      Map<String, String> map0 = updateNetworkRequest0.getNetworkParams();
+      assertEquals(0, map0.size());
+  }
+
+  @Test(timeout = 4000)
+  public void test28()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      ProviderVlanNetwork providerVlanNetwork0 = updateNetworkRequest0.getProviderVlanNetwork();
+      assertNull(providerVlanNetwork0);
+  }
+
+  @Test(timeout = 4000)
+  public void test29()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      String string0 = updateNetworkRequest0.getCloudSiteId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test30()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      String string0 = updateNetworkRequest0.getNetworkTechnology();
+      assertEquals("NEUTRON", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test31()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      String string0 = updateNetworkRequest0.getNetworkTypeVersion();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test32()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      String string0 = updateNetworkRequest0.getNetworkStackId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test33()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      boolean boolean0 = updateNetworkRequest0.isContrailRequest();
+      assertFalse(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test34()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      updateNetworkRequest0.setNetworkId("}!c9td^-G>0|Ac");
+      String string0 = updateNetworkRequest0.getNetworkId();
+      assertEquals("}!c9td^-G>0|Ac", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test35()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      LinkedList<Subnet> linkedList0 = new LinkedList<Subnet>();
+      updateNetworkRequest0.setSubnets(linkedList0);
+      List<Subnet> list0 = updateNetworkRequest0.getSubnets();
+      assertTrue(list0.isEmpty());
+  }
+
+  @Test(timeout = 4000)
+  public void test36()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      updateNetworkRequest0.setNetworkTechnology("X$XC7&D7JVmMj3FS.");
+      assertTrue(updateNetworkRequest0.isSynchronous());
+  }
+
+  @Test(timeout = 4000)
+  public void test37()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      updateNetworkRequest0.setCloudSiteId("");
+      String string0 = updateNetworkRequest0.getCloudSiteId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test38()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      updateNetworkRequest0.setTenantId("X$XC7&D7JVmMj3FS.");
+      String string0 = updateNetworkRequest0.getTenantId();
+      assertEquals("X$XC7&D7JVmMj3FS.", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test39()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      updateNetworkRequest0.setNetworkParams((Map<String, String>) null);
+      Map<String, String> map0 = updateNetworkRequest0.getNetworkParams();
+      assertNull(map0);
+  }
+
+  @Test(timeout = 4000)
+  public void test40()  throws Throwable  {
+      UpdateNetworkRequest updateNetworkRequest0 = new UpdateNetworkRequest();
+      updateNetworkRequest0.setNetworkType("");
+      String string0 = updateNetworkRequest0.getNetworkType();
+      assertEquals("", string0);
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/UpdateNetworkRequestESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/UpdateNetworkRequestESTestscaffolding.java
new file mode 100644
index 0000000000..0965197d05
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/UpdateNetworkRequestESTestscaffolding.java
@@ -0,0 +1,246 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:13:39 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.nwrest;
+
+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 UpdateNetworkRequestESTestscaffolding {
+
+  @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.nwrest.UpdateNetworkRequest"; 
+    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(UpdateNetworkRequestESTestscaffolding.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.ser.BeanSerializerFactory",
+      "org.codehaus.jackson.map.JsonSerializer",
+      "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.openecomp.mso.openstack.beans.Subnet",
+      "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",
+      "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.openecomp.mso.adapters.nwrest.NetworkRequestCommon",
+      "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.openecomp.mso.adapters.nwrest.NetworkTechnology",
+      "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.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.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.openecomp.mso.entity.MsoRequest",
+      "org.codehaus.jackson.node.TreeTraversingParser",
+      "org.codehaus.jackson.map.type.CollectionType",
+      "org.openecomp.mso.adapters.nwrest.UpdateNetworkRequest",
+      "org.codehaus.jackson.map.MapperConfig",
+      "org.codehaus.jackson.map.Module$SetupContext",
+      "org.codehaus.jackson.map.introspect.VisibilityChecker$1",
+      "org.codehaus.jackson.io.UTF8Writer",
+      "org.openecomp.mso.adapters.nwrest.ContrailNetwork",
+      "org.codehaus.jackson.map.type.MapType",
+      "org.openecomp.mso.adapters.nwrest.ProviderVlanNetwork",
+      "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(UpdateNetworkRequestESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "org.openecomp.mso.adapters.nwrest.NetworkTechnology",
+      "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/nwrest/UpdateNetworkResponseESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/UpdateNetworkResponseESTest.java
new file mode 100644
index 0000000000..a3e417804c
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/UpdateNetworkResponseESTest.java
@@ -0,0 +1,105 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:27:07 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.nwrest;
+
+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 UpdateNetworkResponseESTest extends UpdateNetworkResponseESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test00()  throws Throwable  {
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      UpdateNetworkResponse updateNetworkResponse0 = new UpdateNetworkResponse("|YT76&e:{$$La`3", "", (Map<String, String>) hashMap0, "h#%+?1`[X0M#}D0#1");
+      updateNetworkResponse0.getSubnetMap();
+      assertEquals("", updateNetworkResponse0.getNeutronNetworkId());
+      assertEquals("|YT76&e:{$$La`3", updateNetworkResponse0.getNetworkId());
+  }
+
+  @Test(timeout = 4000)
+  public void test01()  throws Throwable  {
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      UpdateNetworkResponse updateNetworkResponse0 = new UpdateNetworkResponse("|YT76&e:{$$La`3", "", (Map<String, String>) hashMap0, "h#%+?1`[X0M#}D0#1");
+      hashMap0.put((String) null, "|YT76&e:{$$La`3");
+      updateNetworkResponse0.getSubnetMap();
+      assertEquals("", updateNetworkResponse0.getNeutronNetworkId());
+      assertEquals("|YT76&e:{$$La`3", updateNetworkResponse0.getNetworkId());
+  }
+
+  @Test(timeout = 4000)
+  public void test02()  throws Throwable  {
+      UpdateNetworkResponse updateNetworkResponse0 = new UpdateNetworkResponse();
+      String string0 = updateNetworkResponse0.getNeutronNetworkId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test03()  throws Throwable  {
+      UpdateNetworkResponse updateNetworkResponse0 = new UpdateNetworkResponse();
+      String string0 = updateNetworkResponse0.getNetworkId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test04()  throws Throwable  {
+      UpdateNetworkResponse updateNetworkResponse0 = new UpdateNetworkResponse("", "", (Map<String, String>) null, "");
+      String string0 = updateNetworkResponse0.getNetworkId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test05()  throws Throwable  {
+      UpdateNetworkResponse updateNetworkResponse0 = new UpdateNetworkResponse("+xyc4(mUPnyf\"U)b", "+xyc4(mUPnyf\"U)b", (Map<String, String>) null, "K:spgI9eR/g*L\"*8OY");
+      String string0 = updateNetworkResponse0.getNetworkId();
+      assertEquals("+xyc4(mUPnyf\"U)b", string0);
+      assertEquals("+xyc4(mUPnyf\"U)b", updateNetworkResponse0.getNeutronNetworkId());
+  }
+
+  @Test(timeout = 4000)
+  public void test06()  throws Throwable  {
+      UpdateNetworkResponse updateNetworkResponse0 = new UpdateNetworkResponse();
+      Map<String, String> map0 = updateNetworkResponse0.getSubnetMap();
+      assertNull(map0);
+  }
+
+  @Test(timeout = 4000)
+  public void test07()  throws Throwable  {
+      UpdateNetworkResponse updateNetworkResponse0 = new UpdateNetworkResponse();
+      updateNetworkResponse0.setNetworkId("");
+      assertNull(updateNetworkResponse0.getNeutronNetworkId());
+  }
+
+  @Test(timeout = 4000)
+  public void test08()  throws Throwable  {
+      UpdateNetworkResponse updateNetworkResponse0 = new UpdateNetworkResponse();
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      updateNetworkResponse0.setSubnetMap(hashMap0);
+      assertTrue(hashMap0.isEmpty());
+  }
+
+  @Test(timeout = 4000)
+  public void test09()  throws Throwable  {
+      UpdateNetworkResponse updateNetworkResponse0 = new UpdateNetworkResponse("", "", (Map<String, String>) null, "?B\"6@FJt`=0vemyZk");
+      String string0 = updateNetworkResponse0.getNeutronNetworkId();
+      assertEquals("", updateNetworkResponse0.getNetworkId());
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test10()  throws Throwable  {
+      UpdateNetworkResponse updateNetworkResponse0 = new UpdateNetworkResponse();
+      updateNetworkResponse0.setNeutronNetworkId("~<;oyAz");
+      String string0 = updateNetworkResponse0.getNeutronNetworkId();
+      assertEquals("~<;oyAz", string0);
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/UpdateNetworkResponseESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/UpdateNetworkResponseESTestscaffolding.java
new file mode 100644
index 0000000000..1df83e9527
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/nwrest/UpdateNetworkResponseESTestscaffolding.java
@@ -0,0 +1,98 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:27:07 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.nwrest;
+
+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 UpdateNetworkResponseESTestscaffolding {
+
+  @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.nwrest.UpdateNetworkResponse"; 
+    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(UpdateNetworkResponseESTestscaffolding.class.getClassLoader() ,
+      "org.codehaus.jackson.annotate.JacksonAnnotation",
+      "org.openecomp.mso.adapters.nwrest.NetworkResponseCommon",
+      "org.openecomp.mso.adapters.nwrest.UpdateNetworkResponse",
+      "org.jboss.resteasy.annotations.providers.NoJackson",
+      "org.codehaus.jackson.map.annotate.JsonRootName"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(UpdateNetworkResponseESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "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/tenantrest/CreateTenantErrorESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/CreateTenantErrorESTest.java
new file mode 100644
index 0000000000..31981957f5
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/CreateTenantErrorESTest.java
@@ -0,0 +1,93 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:11:09 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.tenantrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import org.openecomp.mso.openstack.exceptions.MsoExceptionCategory;
+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 CreateTenantErrorESTest extends CreateTenantErrorESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test0()  throws Throwable  {
+      MsoExceptionCategory msoExceptionCategory0 = MsoExceptionCategory.OPENSTACK;
+      CreateTenantError createTenantError0 = new CreateTenantError("1lR", msoExceptionCategory0, true);
+      Boolean boolean0 = createTenantError0.getRolledBack();
+      assertTrue(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test1()  throws Throwable  {
+      MsoExceptionCategory msoExceptionCategory0 = MsoExceptionCategory.OPENSTACK;
+      CreateTenantError createTenantError0 = new CreateTenantError("]n~ZI>O", msoExceptionCategory0, false);
+      Boolean boolean0 = createTenantError0.getRolledBack();
+      assertFalse(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test2()  throws Throwable  {
+      CreateTenantError createTenantError0 = new CreateTenantError("1lR");
+      String string0 = createTenantError0.getMessage();
+      assertEquals("1lR", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test3()  throws Throwable  {
+      CreateTenantError createTenantError0 = new CreateTenantError("1lR");
+      MsoExceptionCategory msoExceptionCategory0 = MsoExceptionCategory.OPENSTACK;
+      createTenantError0.setCategory(msoExceptionCategory0);
+      MsoExceptionCategory msoExceptionCategory1 = createTenantError0.getCategory();
+      assertEquals(MsoExceptionCategory.OPENSTACK, msoExceptionCategory1);
+  }
+
+  @Test(timeout = 4000)
+  public void test4()  throws Throwable  {
+      CreateTenantError createTenantError0 = new CreateTenantError();
+      assertNull(createTenantError0.getMessage());
+  }
+
+  @Test(timeout = 4000)
+  public void test5()  throws Throwable  {
+      CreateTenantError createTenantError0 = new CreateTenantError("1lR");
+      createTenantError0.setRolledBack((Boolean) null);
+      assertNull(createTenantError0.getCategory());
+  }
+
+  @Test(timeout = 4000)
+  public void test6()  throws Throwable  {
+      CreateTenantError createTenantError0 = new CreateTenantError("1lR");
+      Boolean boolean0 = createTenantError0.getRolledBack();
+      assertNull(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test7()  throws Throwable  {
+      CreateTenantError createTenantError0 = new CreateTenantError("1lR");
+      createTenantError0.getCategory();
+  }
+
+  @Test(timeout = 4000)
+  public void test8()  throws Throwable  {
+      MsoExceptionCategory msoExceptionCategory0 = MsoExceptionCategory.OPENSTACK;
+      CreateTenantError createTenantError0 = new CreateTenantError((String) null, msoExceptionCategory0, false);
+      String string0 = createTenantError0.getMessage();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test9()  throws Throwable  {
+      MsoExceptionCategory msoExceptionCategory0 = MsoExceptionCategory.OPENSTACK;
+      CreateTenantError createTenantError0 = new CreateTenantError((String) null, msoExceptionCategory0, false);
+      createTenantError0.setMessage("");
+      String string0 = createTenantError0.getMessage();
+      assertEquals("", string0);
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/CreateTenantErrorESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/CreateTenantErrorESTestscaffolding.java
new file mode 100644
index 0000000000..49198893b3
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/CreateTenantErrorESTestscaffolding.java
@@ -0,0 +1,85 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:11:09 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.tenantrest;
+
+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 CreateTenantErrorESTestscaffolding {
+
+  @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.tenantrest.CreateTenantError"; 
+    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(CreateTenantErrorESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.adapters.tenantrest.CreateTenantError",
+      "org.openecomp.mso.openstack.exceptions.MsoExceptionCategory",
+      "org.jboss.resteasy.annotations.providers.NoJackson"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(CreateTenantErrorESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "org.openecomp.mso.adapters.tenantrest.CreateTenantError"
+    );
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/CreateTenantRequestESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/CreateTenantRequestESTest.java
new file mode 100644
index 0000000000..244194b817
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/CreateTenantRequestESTest.java
@@ -0,0 +1,165 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:17:07 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.tenantrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import org.openecomp.mso.entity.MsoRequest;
+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 CreateTenantRequestESTest extends CreateTenantRequestESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test00()  throws Throwable  {
+      CreateTenantRequest createTenantRequest0 = new CreateTenantRequest();
+      createTenantRequest0.setTenantName("");
+      String string0 = createTenantRequest0.getTenantName();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test01()  throws Throwable  {
+      CreateTenantRequest createTenantRequest0 = new CreateTenantRequest();
+      createTenantRequest0.setMsoRequest((MsoRequest) null);
+      MsoRequest msoRequest0 = createTenantRequest0.getMsoRequest();
+      assertNull(msoRequest0);
+  }
+
+  @Test(timeout = 4000)
+  public void test02()  throws Throwable  {
+      CreateTenantRequest createTenantRequest0 = new CreateTenantRequest();
+      createTenantRequest0.setMetadata((Map<String, String>) null);
+      Map<String, String> map0 = createTenantRequest0.getMetadata();
+      assertNull(map0);
+  }
+
+  @Test(timeout = 4000)
+  public void test03()  throws Throwable  {
+      CreateTenantRequest createTenantRequest0 = new CreateTenantRequest();
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      hashMap0.put("+xMNxiyZP", (String) null);
+      createTenantRequest0.setMetadata(hashMap0);
+      Map<String, String> map0 = createTenantRequest0.getMetadata();
+      assertFalse(map0.isEmpty());
+  }
+
+  @Test(timeout = 4000)
+  public void test04()  throws Throwable  {
+      CreateTenantRequest createTenantRequest0 = new CreateTenantRequest();
+      Boolean boolean0 = new Boolean(true);
+      createTenantRequest0.setFailIfExists(boolean0);
+      Boolean boolean1 = createTenantRequest0.getFailIfExists();
+      assertTrue(boolean1);
+  }
+
+  @Test(timeout = 4000)
+  public void test05()  throws Throwable  {
+      CreateTenantRequest createTenantRequest0 = new CreateTenantRequest();
+      Boolean boolean0 = new Boolean("%Rg\"4z\"aLm@>#");
+      createTenantRequest0.setFailIfExists(boolean0);
+      Boolean boolean1 = createTenantRequest0.getFailIfExists();
+      assertFalse(boolean1);
+  }
+
+  @Test(timeout = 4000)
+  public void test06()  throws Throwable  {
+      CreateTenantRequest createTenantRequest0 = new CreateTenantRequest();
+      createTenantRequest0.setCloudSiteId("[E;Tr]]/");
+      String string0 = createTenantRequest0.getCloudSiteId();
+      assertEquals("[E;Tr]]/", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test07()  throws Throwable  {
+      CreateTenantRequest createTenantRequest0 = new CreateTenantRequest();
+      createTenantRequest0.setCloudSiteId("");
+      String string0 = createTenantRequest0.getCloudSiteId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test08()  throws Throwable  {
+      CreateTenantRequest createTenantRequest0 = new CreateTenantRequest();
+      Boolean boolean0 = new Boolean(true);
+      createTenantRequest0.setBackout(boolean0);
+      Boolean boolean1 = createTenantRequest0.getBackout();
+      assertTrue(boolean1);
+  }
+
+  @Test(timeout = 4000)
+  public void test09()  throws Throwable  {
+      CreateTenantRequest createTenantRequest0 = new CreateTenantRequest();
+      Boolean boolean0 = Boolean.valueOf("I?$u7");
+      createTenantRequest0.setBackout(boolean0);
+      Boolean boolean1 = createTenantRequest0.getBackout();
+      assertFalse(boolean1);
+  }
+
+  @Test(timeout = 4000)
+  public void test10()  throws Throwable  {
+      CreateTenantRequest createTenantRequest0 = new CreateTenantRequest();
+      Boolean boolean0 = createTenantRequest0.getBackout();
+      assertNull(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test11()  throws Throwable  {
+      CreateTenantRequest createTenantRequest0 = new CreateTenantRequest();
+      Boolean boolean0 = createTenantRequest0.getFailIfExists();
+      assertNull(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test12()  throws Throwable  {
+      CreateTenantRequest createTenantRequest0 = new CreateTenantRequest();
+      String string0 = createTenantRequest0.getTenantName();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test13()  throws Throwable  {
+      CreateTenantRequest createTenantRequest0 = new CreateTenantRequest();
+      String string0 = createTenantRequest0.getCloudSiteId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test14()  throws Throwable  {
+      CreateTenantRequest createTenantRequest0 = new CreateTenantRequest();
+      String string0 = createTenantRequest0.toString();
+      assertEquals("CreateTenantRequest [cloudSiteId=null, tenantName=null, failIfExists=null, backout=null, metadata={}]", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test15()  throws Throwable  {
+      CreateTenantRequest createTenantRequest0 = new CreateTenantRequest();
+      MsoRequest msoRequest0 = createTenantRequest0.getMsoRequest();
+      createTenantRequest0.setMsoRequest(msoRequest0);
+      assertNull(createTenantRequest0.getTenantName());
+  }
+
+  @Test(timeout = 4000)
+  public void test16()  throws Throwable  {
+      CreateTenantRequest createTenantRequest0 = new CreateTenantRequest();
+      createTenantRequest0.setTenantName("Z:%{KRDa=c\"`");
+      String string0 = createTenantRequest0.getTenantName();
+      assertEquals("Z:%{KRDa=c\"`", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test17()  throws Throwable  {
+      CreateTenantRequest createTenantRequest0 = new CreateTenantRequest();
+      Map<String, String> map0 = createTenantRequest0.getMetadata();
+      createTenantRequest0.setMetadata(map0);
+      assertEquals(0, map0.size());
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/CreateTenantRequestESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/CreateTenantRequestESTestscaffolding.java
new file mode 100644
index 0000000000..357047d502
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/CreateTenantRequestESTestscaffolding.java
@@ -0,0 +1,97 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:17:07 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.tenantrest;
+
+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 CreateTenantRequestESTestscaffolding {
+
+  @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.tenantrest.CreateTenantRequest"; 
+    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(CreateTenantRequestESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.entity.MsoRequest",
+      "org.openecomp.mso.adapters.tenantrest.TenantRequestCommon",
+      "org.openecomp.mso.adapters.tenantrest.CreateTenantRequest",
+      "org.jboss.resteasy.annotations.providers.NoJackson"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(CreateTenantRequestESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "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/tenantrest/CreateTenantResponseESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/CreateTenantResponseESTest.java
new file mode 100644
index 0000000000..b7c8e720f6
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/CreateTenantResponseESTest.java
@@ -0,0 +1,148 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:18:27 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.tenantrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+import static org.evosuite.runtime.EvoAssertions.*;
+
+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 CreateTenantResponseESTest extends CreateTenantResponseESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test00()  throws Throwable  {
+      Boolean boolean0 = Boolean.valueOf((String) null);
+      TenantRollback tenantRollback0 = new TenantRollback();
+      CreateTenantResponse createTenantResponse0 = new CreateTenantResponse("<MtZQZIH{-M@", "<MtZQZIH{-M@", boolean0, tenantRollback0);
+      String string0 = createTenantResponse0.toString();
+      assertEquals("CreateTenantResponse [cloudSiteId=<MtZQZIH{-M@, tenantId=<MtZQZIH{-M@, tenantCreated=false, tenantRollback=VnfRollback: cloud=null, tenant=null, tenantCreated=false]", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test01()  throws Throwable  {
+      Boolean boolean0 = Boolean.valueOf((String) null);
+      TenantRollback tenantRollback0 = new TenantRollback();
+      tenantRollback0.setTenantCreated(true);
+      CreateTenantResponse createTenantResponse0 = new CreateTenantResponse("<MtZQZIH{-M@", "<MtZQZIH{-M@", boolean0, tenantRollback0);
+      TenantRollback tenantRollback1 = createTenantResponse0.getTenantRollback();
+      assertSame(tenantRollback0, tenantRollback1);
+  }
+
+  @Test(timeout = 4000)
+  public void test02()  throws Throwable  {
+      CreateTenantResponse createTenantResponse0 = new CreateTenantResponse();
+      createTenantResponse0.setTenantId("");
+      String string0 = createTenantResponse0.getTenantId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test03()  throws Throwable  {
+      CreateTenantResponse createTenantResponse0 = new CreateTenantResponse();
+      Boolean boolean0 = createTenantResponse0.getTenantCreated();
+      assertNull(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test04()  throws Throwable  {
+      Boolean boolean0 = Boolean.valueOf("");
+      TenantRollback tenantRollback0 = new TenantRollback();
+      CreateTenantResponse createTenantResponse0 = new CreateTenantResponse("", "", boolean0, tenantRollback0);
+      Boolean boolean1 = createTenantResponse0.getTenantCreated();
+      assertFalse(boolean1);
+  }
+
+  @Test(timeout = 4000)
+  public void test05()  throws Throwable  {
+      CreateTenantResponse createTenantResponse0 = new CreateTenantResponse();
+      createTenantResponse0.setCloudSiteId("");
+      String string0 = createTenantResponse0.getCloudSiteId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test06()  throws Throwable  {
+      CreateTenantResponse createTenantResponse0 = new CreateTenantResponse();
+      createTenantResponse0.setTenantRollback((TenantRollback) null);
+      TenantRollback tenantRollback0 = createTenantResponse0.getTenantRollback();
+      assertNull(tenantRollback0);
+  }
+
+  @Test(timeout = 4000)
+  public void test07()  throws Throwable  {
+      CreateTenantResponse createTenantResponse0 = new CreateTenantResponse();
+      String string0 = createTenantResponse0.getTenantId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test08()  throws Throwable  {
+      CreateTenantResponse createTenantResponse0 = new CreateTenantResponse();
+      TenantRollback tenantRollback0 = createTenantResponse0.getTenantRollback();
+      assertFalse(tenantRollback0.getTenantCreated());
+  }
+
+  @Test(timeout = 4000)
+  public void test09()  throws Throwable  {
+      Boolean boolean0 = Boolean.valueOf(true);
+      TenantRollback tenantRollback0 = new TenantRollback();
+      CreateTenantResponse createTenantResponse0 = new CreateTenantResponse("2@/.nLo", "2@/.nLo", boolean0, tenantRollback0);
+      Boolean boolean1 = createTenantResponse0.getTenantCreated();
+      assertTrue(boolean1);
+  }
+
+  @Test(timeout = 4000)
+  public void test10()  throws Throwable  {
+      Boolean boolean0 = new Boolean("");
+      CreateTenantResponse createTenantResponse0 = new CreateTenantResponse("8{", "U<b`ZSrD;4T", boolean0, (TenantRollback) null);
+      // Undeclared exception!
+      try { 
+        createTenantResponse0.toString();
+        fail("Expecting exception: NullPointerException");
+      
+      } catch(NullPointerException e) {
+         //
+         // no message in exception (getMessage() returned null)
+         //
+         verifyException("org.openecomp.mso.adapters.tenantrest.CreateTenantResponse", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test11()  throws Throwable  {
+      CreateTenantResponse createTenantResponse0 = new CreateTenantResponse();
+      createTenantResponse0.setCloudSiteId("uj>\"L98");
+      String string0 = createTenantResponse0.getCloudSiteId();
+      assertEquals("uj>\"L98", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test12()  throws Throwable  {
+      CreateTenantResponse createTenantResponse0 = new CreateTenantResponse();
+      String string0 = createTenantResponse0.getCloudSiteId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test13()  throws Throwable  {
+      CreateTenantResponse createTenantResponse0 = new CreateTenantResponse();
+      createTenantResponse0.setTenantId("uj>\"L98");
+      String string0 = createTenantResponse0.getTenantId();
+      assertEquals("uj>\"L98", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test14()  throws Throwable  {
+      CreateTenantResponse createTenantResponse0 = new CreateTenantResponse();
+      Boolean boolean0 = Boolean.valueOf((String) null);
+      createTenantResponse0.setTenantCreated(boolean0);
+      assertNull(createTenantResponse0.getTenantId());
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/CreateTenantResponseESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/CreateTenantResponseESTestscaffolding.java
new file mode 100644
index 0000000000..71fe644d5d
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/CreateTenantResponseESTestscaffolding.java
@@ -0,0 +1,87 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:18:27 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.tenantrest;
+
+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 CreateTenantResponseESTestscaffolding {
+
+  @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.tenantrest.CreateTenantResponse"; 
+    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(CreateTenantResponseESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.adapters.tenantrest.CreateTenantResponse",
+      "org.openecomp.mso.entity.MsoRequest",
+      "org.openecomp.mso.adapters.tenantrest.TenantRequestCommon",
+      "org.openecomp.mso.adapters.tenantrest.TenantRollback",
+      "org.jboss.resteasy.annotations.providers.NoJackson"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(CreateTenantResponseESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "org.openecomp.mso.adapters.tenantrest.CreateTenantResponse"
+    );
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/DeleteTenantErrorESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/DeleteTenantErrorESTest.java
new file mode 100644
index 0000000000..54c187b1df
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/DeleteTenantErrorESTest.java
@@ -0,0 +1,86 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:21:42 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.tenantrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import org.openecomp.mso.openstack.exceptions.MsoExceptionCategory;
+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 DeleteTenantErrorESTest extends DeleteTenantErrorESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test0()  throws Throwable  {
+      DeleteTenantError deleteTenantError0 = new DeleteTenantError();
+      deleteTenantError0.setMessage("");
+      String string0 = deleteTenantError0.getMessage();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test1()  throws Throwable  {
+      DeleteTenantError deleteTenantError0 = new DeleteTenantError();
+      deleteTenantError0.setRolledBack((Boolean) null);
+      assertNull(deleteTenantError0.getMessage());
+  }
+
+  @Test(timeout = 4000)
+  public void test2()  throws Throwable  {
+      DeleteTenantError deleteTenantError0 = new DeleteTenantError();
+      MsoExceptionCategory msoExceptionCategory0 = MsoExceptionCategory.USERDATA;
+      deleteTenantError0.setCategory(msoExceptionCategory0);
+      MsoExceptionCategory msoExceptionCategory1 = deleteTenantError0.getCategory();
+      assertEquals(MsoExceptionCategory.USERDATA, msoExceptionCategory1);
+  }
+
+  @Test(timeout = 4000)
+  public void test3()  throws Throwable  {
+      DeleteTenantError deleteTenantError0 = new DeleteTenantError();
+      Boolean boolean0 = deleteTenantError0.getRolledBack();
+      assertNull(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test4()  throws Throwable  {
+      DeleteTenantError deleteTenantError0 = new DeleteTenantError();
+      MsoExceptionCategory msoExceptionCategory0 = deleteTenantError0.getCategory();
+      DeleteTenantError deleteTenantError1 = new DeleteTenantError((String) null, msoExceptionCategory0, true);
+      Boolean boolean0 = deleteTenantError1.getRolledBack();
+      assertTrue(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test5()  throws Throwable  {
+      DeleteTenantError deleteTenantError0 = new DeleteTenantError((String) null, (MsoExceptionCategory) null, false);
+      Boolean boolean0 = deleteTenantError0.getRolledBack();
+      assertFalse(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test6()  throws Throwable  {
+      DeleteTenantError deleteTenantError0 = new DeleteTenantError("lgbv,d=W|mN,b");
+      assertNull(deleteTenantError0.getCategory());
+  }
+
+  @Test(timeout = 4000)
+  public void test7()  throws Throwable  {
+      DeleteTenantError deleteTenantError0 = new DeleteTenantError();
+      String string0 = deleteTenantError0.getMessage();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test8()  throws Throwable  {
+      DeleteTenantError deleteTenantError0 = new DeleteTenantError();
+      deleteTenantError0.setMessage("lgbv,d=W|mN,b");
+      String string0 = deleteTenantError0.getMessage();
+      assertEquals("lgbv,d=W|mN,b", string0);
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/DeleteTenantErrorESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/DeleteTenantErrorESTestscaffolding.java
new file mode 100644
index 0000000000..46033773a3
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/DeleteTenantErrorESTestscaffolding.java
@@ -0,0 +1,85 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:21:42 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.tenantrest;
+
+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 DeleteTenantErrorESTestscaffolding {
+
+  @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.tenantrest.DeleteTenantError"; 
+    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(DeleteTenantErrorESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.openstack.exceptions.MsoExceptionCategory",
+      "org.jboss.resteasy.annotations.providers.NoJackson",
+      "org.openecomp.mso.adapters.tenantrest.DeleteTenantError"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(DeleteTenantErrorESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "org.openecomp.mso.adapters.tenantrest.DeleteTenantError"
+    );
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/DeleteTenantRequestESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/DeleteTenantRequestESTest.java
new file mode 100644
index 0000000000..3ad1b05199
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/DeleteTenantRequestESTest.java
@@ -0,0 +1,79 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:11:58 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.tenantrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import org.openecomp.mso.entity.MsoRequest;
+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 DeleteTenantRequestESTest extends DeleteTenantRequestESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test0()  throws Throwable  {
+      DeleteTenantRequest deleteTenantRequest0 = new DeleteTenantRequest();
+      deleteTenantRequest0.setTenantId("");
+      String string0 = deleteTenantRequest0.getTenantId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test1()  throws Throwable  {
+      DeleteTenantRequest deleteTenantRequest0 = new DeleteTenantRequest();
+      deleteTenantRequest0.setMsoRequest((MsoRequest) null);
+      MsoRequest msoRequest0 = deleteTenantRequest0.getMsoRequest();
+      assertNull(msoRequest0);
+  }
+
+  @Test(timeout = 4000)
+  public void test2()  throws Throwable  {
+      DeleteTenantRequest deleteTenantRequest0 = new DeleteTenantRequest();
+      deleteTenantRequest0.setCloudSiteId("");
+      String string0 = deleteTenantRequest0.getCloudSiteId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test3()  throws Throwable  {
+      DeleteTenantRequest deleteTenantRequest0 = new DeleteTenantRequest();
+      String string0 = deleteTenantRequest0.getCloudSiteId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test4()  throws Throwable  {
+      DeleteTenantRequest deleteTenantRequest0 = new DeleteTenantRequest();
+      MsoRequest msoRequest0 = deleteTenantRequest0.getMsoRequest();
+      assertNull(msoRequest0.getServiceInstanceId());
+  }
+
+  @Test(timeout = 4000)
+  public void test5()  throws Throwable  {
+      DeleteTenantRequest deleteTenantRequest0 = new DeleteTenantRequest();
+      deleteTenantRequest0.setTenantId("jaxb.formatted.output");
+      String string0 = deleteTenantRequest0.getTenantId();
+      assertEquals("jaxb.formatted.output", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test6()  throws Throwable  {
+      DeleteTenantRequest deleteTenantRequest0 = new DeleteTenantRequest();
+      String string0 = deleteTenantRequest0.getTenantId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test7()  throws Throwable  {
+      DeleteTenantRequest deleteTenantRequest0 = new DeleteTenantRequest();
+      deleteTenantRequest0.setCloudSiteId("7hA.^5Lo<M_u");
+      String string0 = deleteTenantRequest0.getCloudSiteId();
+      assertEquals("7hA.^5Lo<M_u", string0);
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/DeleteTenantRequestESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/DeleteTenantRequestESTestscaffolding.java
new file mode 100644
index 0000000000..ecd83298af
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/DeleteTenantRequestESTestscaffolding.java
@@ -0,0 +1,97 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:11:58 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.tenantrest;
+
+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 DeleteTenantRequestESTestscaffolding {
+
+  @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.tenantrest.DeleteTenantRequest"; 
+    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(DeleteTenantRequestESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.adapters.tenantrest.DeleteTenantRequest",
+      "org.openecomp.mso.entity.MsoRequest",
+      "org.openecomp.mso.adapters.tenantrest.TenantRequestCommon",
+      "org.jboss.resteasy.annotations.providers.NoJackson"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(DeleteTenantRequestESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "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/tenantrest/DeleteTenantResponseESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/DeleteTenantResponseESTest.java
new file mode 100644
index 0000000000..79ca972678
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/DeleteTenantResponseESTest.java
@@ -0,0 +1,42 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:19:42 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.tenantrest;
+
+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 DeleteTenantResponseESTest extends DeleteTenantResponseESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test0()  throws Throwable  {
+      DeleteTenantResponse deleteTenantResponse0 = new DeleteTenantResponse();
+      Boolean boolean0 = Boolean.valueOf("");
+      deleteTenantResponse0.setTenantDeleted(boolean0);
+      Boolean boolean1 = deleteTenantResponse0.getTenantDeleted();
+      assertFalse(boolean1);
+  }
+
+  @Test(timeout = 4000)
+  public void test1()  throws Throwable  {
+      DeleteTenantResponse deleteTenantResponse0 = new DeleteTenantResponse();
+      Boolean boolean0 = deleteTenantResponse0.getTenantDeleted();
+      assertNull(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test2()  throws Throwable  {
+      DeleteTenantResponse deleteTenantResponse0 = new DeleteTenantResponse();
+      Boolean boolean0 = new Boolean(true);
+      deleteTenantResponse0.setTenantDeleted(boolean0);
+      Boolean boolean1 = deleteTenantResponse0.getTenantDeleted();
+      assertTrue(boolean1);
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/DeleteTenantResponseESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/DeleteTenantResponseESTestscaffolding.java
new file mode 100644
index 0000000000..057d669aac
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/DeleteTenantResponseESTestscaffolding.java
@@ -0,0 +1,79 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:19:42 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.tenantrest;
+
+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 DeleteTenantResponseESTestscaffolding {
+
+  @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.tenantrest.DeleteTenantResponse"; 
+    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(DeleteTenantResponseESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.adapters.tenantrest.DeleteTenantResponse",
+      "org.jboss.resteasy.annotations.providers.NoJackson"
+    );
+  } 
+
+  private static void resetClasses() {
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/HealthCheckHandlerESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/HealthCheckHandlerESTest.java
new file mode 100644
index 0000000000..b42f9da103
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/HealthCheckHandlerESTest.java
@@ -0,0 +1,25 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:28:25 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.tenantrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import org.evosuite.runtime.EvoRunner;
+import org.evosuite.runtime.EvoRunnerParameters;
+import org.jboss.resteasy.specimpl.BuiltResponse;
+import org.junit.runner.RunWith;
+
+@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
+public class HealthCheckHandlerESTest extends HealthCheckHandlerESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test0()  throws Throwable  {
+      HealthCheckHandler healthCheckHandler0 = new HealthCheckHandler();
+      BuiltResponse builtResponse0 = (BuiltResponse)healthCheckHandler0.healthcheck();
+      assertFalse(builtResponse0.isClosed());
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/HealthCheckHandlerESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/HealthCheckHandlerESTestscaffolding.java
new file mode 100644
index 0000000000..c53bc98139
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/HealthCheckHandlerESTestscaffolding.java
@@ -0,0 +1,107 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:28:25 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.tenantrest;
+
+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 HealthCheckHandlerESTestscaffolding {
+
+  @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.tenantrest.HealthCheckHandler"; 
+    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(HealthCheckHandlerESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.logger.MsoLogger",
+      "org.openecomp.mso.logger.MessageEnum",
+      "com.att.eelf.i18n.EELFResolvableErrorEnum",
+      "org.openecomp.mso.logger.MsoLogger$ResponseCode",
+      "org.openecomp.mso.entity.MsoRequest",
+      "org.openecomp.mso.logger.MsoLogger$StatusCode",
+      "com.att.eelf.i18n.EELFResourceManager$RESOURCE_TYPES",
+      "com.att.eelf.configuration.EELFManager",
+      "org.openecomp.mso.logger.MsoLogger$ErrorCode",
+      "com.att.eelf.configuration.EELFLogger",
+      "com.att.eelf.i18n.EELFMsgs",
+      "com.att.eelf.configuration.EELFLogger$Level",
+      "org.jboss.resteasy.specimpl.BuiltResponse",
+      "org.openecomp.mso.logger.MsoLogger$Catalog",
+      "com.att.eelf.configuration.SLF4jWrapper",
+      "org.openecomp.mso.adapters.tenantrest.HealthCheckHandler",
+      "com.att.eelf.i18n.EELFResourceManager"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(HealthCheckHandlerESTestscaffolding.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.tenantrest.HealthCheckHandler"
+    );
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/QueryTenantErrorESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/QueryTenantErrorESTest.java
new file mode 100644
index 0000000000..1695ad3afb
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/QueryTenantErrorESTest.java
@@ -0,0 +1,62 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:23:14 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.tenantrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import org.openecomp.mso.openstack.exceptions.MsoExceptionCategory;
+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 QueryTenantErrorESTest extends QueryTenantErrorESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test0()  throws Throwable  {
+      QueryTenantError queryTenantError0 = new QueryTenantError();
+      String string0 = queryTenantError0.getMessage();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test1()  throws Throwable  {
+      MsoExceptionCategory msoExceptionCategory0 = MsoExceptionCategory.OPENSTACK;
+      QueryTenantError queryTenantError0 = new QueryTenantError("", msoExceptionCategory0);
+      assertEquals("", queryTenantError0.getMessage());
+  }
+
+  @Test(timeout = 4000)
+  public void test2()  throws Throwable  {
+      QueryTenantError queryTenantError0 = new QueryTenantError();
+      queryTenantError0.setMessage("Io21y\"Bvi");
+      String string0 = queryTenantError0.getMessage();
+      assertEquals("Io21y\"Bvi", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test3()  throws Throwable  {
+      QueryTenantError queryTenantError0 = new QueryTenantError();
+      MsoExceptionCategory msoExceptionCategory0 = MsoExceptionCategory.OPENSTACK;
+      queryTenantError0.setCategory(msoExceptionCategory0);
+      MsoExceptionCategory msoExceptionCategory1 = queryTenantError0.getCategory();
+      assertEquals(MsoExceptionCategory.OPENSTACK, msoExceptionCategory1);
+  }
+
+  @Test(timeout = 4000)
+  public void test4()  throws Throwable  {
+      QueryTenantError queryTenantError0 = new QueryTenantError("");
+      String string0 = queryTenantError0.getMessage();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test5()  throws Throwable  {
+      QueryTenantError queryTenantError0 = new QueryTenantError();
+      queryTenantError0.getCategory();
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/QueryTenantErrorESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/QueryTenantErrorESTestscaffolding.java
new file mode 100644
index 0000000000..e7bbd3deb0
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/QueryTenantErrorESTestscaffolding.java
@@ -0,0 +1,85 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:23:14 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.tenantrest;
+
+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 QueryTenantErrorESTestscaffolding {
+
+  @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.tenantrest.QueryTenantError"; 
+    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(QueryTenantErrorESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.openstack.exceptions.MsoExceptionCategory",
+      "org.openecomp.mso.adapters.tenantrest.QueryTenantError",
+      "org.jboss.resteasy.annotations.providers.NoJackson"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(QueryTenantErrorESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "org.openecomp.mso.adapters.tenantrest.QueryTenantError"
+    );
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/QueryTenantResponseESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/QueryTenantResponseESTest.java
new file mode 100644
index 0000000000..86ae5efab2
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/QueryTenantResponseESTest.java
@@ -0,0 +1,99 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:16:12 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.tenantrest;
+
+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 QueryTenantResponseESTest extends QueryTenantResponseESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test0()  throws Throwable  {
+      QueryTenantResponse queryTenantResponse0 = new QueryTenantResponse();
+      String string0 = queryTenantResponse0.getTenantName();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test1()  throws Throwable  {
+      QueryTenantResponse queryTenantResponse0 = new QueryTenantResponse("", "jaxb.formatted.output", (Map<String, String>) null);
+      String string0 = queryTenantResponse0.getTenantName();
+      assertEquals("jaxb.formatted.output", string0);
+      assertEquals("", queryTenantResponse0.getTenantId());
+  }
+
+  @Test(timeout = 4000)
+  public void test2()  throws Throwable  {
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      QueryTenantResponse queryTenantResponse0 = new QueryTenantResponse("/d/SGl|KH4#n", "", (Map<String, String>) hashMap0);
+      String string0 = queryTenantResponse0.getTenantId();
+      assertEquals("", queryTenantResponse0.getTenantName());
+      assertEquals("/d/SGl|KH4#n", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test3()  throws Throwable  {
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      QueryTenantResponse queryTenantResponse0 = new QueryTenantResponse(":!JHcoDwU", ":!JHcoDwU", (Map<String, String>) hashMap0);
+      Map<String, String> map0 = queryTenantResponse0.getMetadata();
+      assertTrue(map0.isEmpty());
+  }
+
+  @Test(timeout = 4000)
+  public void test4()  throws Throwable  {
+      QueryTenantResponse queryTenantResponse0 = new QueryTenantResponse();
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      hashMap0.put("3Lk\"uS,GJ", "3Lk\"uS,GJ");
+      queryTenantResponse0.setMetadata(hashMap0);
+      Map<String, String> map0 = queryTenantResponse0.getMetadata();
+      assertEquals(1, map0.size());
+  }
+
+  @Test(timeout = 4000)
+  public void test5()  throws Throwable  {
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      QueryTenantResponse queryTenantResponse0 = new QueryTenantResponse("b", "", (Map<String, String>) hashMap0);
+      String string0 = queryTenantResponse0.getTenantName();
+      assertEquals("", string0);
+      assertEquals("b", queryTenantResponse0.getTenantId());
+  }
+
+  @Test(timeout = 4000)
+  public void test6()  throws Throwable  {
+      QueryTenantResponse queryTenantResponse0 = new QueryTenantResponse();
+      String string0 = queryTenantResponse0.getTenantId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test7()  throws Throwable  {
+      QueryTenantResponse queryTenantResponse0 = new QueryTenantResponse();
+      Map<String, String> map0 = queryTenantResponse0.getMetadata();
+      assertNull(map0);
+  }
+
+  @Test(timeout = 4000)
+  public void test8()  throws Throwable  {
+      QueryTenantResponse queryTenantResponse0 = new QueryTenantResponse();
+      queryTenantResponse0.setTenantName("hKe?S+T{hz:~0");
+      assertEquals("hKe?S+T{hz:~0", queryTenantResponse0.getTenantName());
+  }
+
+  @Test(timeout = 4000)
+  public void test9()  throws Throwable  {
+      QueryTenantResponse queryTenantResponse0 = new QueryTenantResponse();
+      queryTenantResponse0.setTenantId("");
+      String string0 = queryTenantResponse0.getTenantId();
+      assertEquals("", string0);
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/QueryTenantResponseESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/QueryTenantResponseESTestscaffolding.java
new file mode 100644
index 0000000000..960abf7500
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/QueryTenantResponseESTestscaffolding.java
@@ -0,0 +1,96 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:16:12 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.tenantrest;
+
+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 QueryTenantResponseESTestscaffolding {
+
+  @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.tenantrest.QueryTenantResponse"; 
+    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(QueryTenantResponseESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.adapters.tenantrest.TenantRequestCommon",
+      "org.openecomp.mso.adapters.tenantrest.QueryTenantResponse",
+      "org.jboss.resteasy.annotations.providers.NoJackson"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(QueryTenantResponseESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "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/tenantrest/RollbackTenantErrorESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/RollbackTenantErrorESTest.java
new file mode 100644
index 0000000000..b1232f3856
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/RollbackTenantErrorESTest.java
@@ -0,0 +1,92 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:22:42 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.tenantrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import org.openecomp.mso.openstack.exceptions.MsoExceptionCategory;
+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 RollbackTenantErrorESTest extends RollbackTenantErrorESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test0()  throws Throwable  {
+      RollbackTenantError rollbackTenantError0 = new RollbackTenantError();
+      Boolean boolean0 = rollbackTenantError0.getRolledBack();
+      assertNull(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test1()  throws Throwable  {
+      RollbackTenantError rollbackTenantError0 = new RollbackTenantError("w8nm;2F^\"Z", (MsoExceptionCategory) null, true);
+      Boolean boolean0 = rollbackTenantError0.getRolledBack();
+      assertTrue(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test2()  throws Throwable  {
+      RollbackTenantError rollbackTenantError0 = new RollbackTenantError();
+      String string0 = rollbackTenantError0.getMessage();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test3()  throws Throwable  {
+      RollbackTenantError rollbackTenantError0 = new RollbackTenantError("=i_>GLf`");
+      String string0 = rollbackTenantError0.getMessage();
+      assertEquals("=i_>GLf`", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test4()  throws Throwable  {
+      RollbackTenantError rollbackTenantError0 = new RollbackTenantError();
+      rollbackTenantError0.getCategory();
+  }
+
+  @Test(timeout = 4000)
+  public void test5()  throws Throwable  {
+      MsoExceptionCategory msoExceptionCategory0 = MsoExceptionCategory.OPENSTACK;
+      RollbackTenantError rollbackTenantError0 = new RollbackTenantError("", msoExceptionCategory0, false);
+      rollbackTenantError0.setCategory(msoExceptionCategory0);
+      assertEquals(MsoExceptionCategory.OPENSTACK, rollbackTenantError0.getCategory());
+  }
+
+  @Test(timeout = 4000)
+  public void test6()  throws Throwable  {
+      MsoExceptionCategory msoExceptionCategory0 = MsoExceptionCategory.OPENSTACK;
+      RollbackTenantError rollbackTenantError0 = new RollbackTenantError("", msoExceptionCategory0, false);
+      MsoExceptionCategory msoExceptionCategory1 = rollbackTenantError0.getCategory();
+      assertEquals(MsoExceptionCategory.OPENSTACK, msoExceptionCategory1);
+  }
+
+  @Test(timeout = 4000)
+  public void test7()  throws Throwable  {
+      MsoExceptionCategory msoExceptionCategory0 = MsoExceptionCategory.OPENSTACK;
+      RollbackTenantError rollbackTenantError0 = new RollbackTenantError("", msoExceptionCategory0, false);
+      String string0 = rollbackTenantError0.getMessage();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test8()  throws Throwable  {
+      MsoExceptionCategory msoExceptionCategory0 = MsoExceptionCategory.OPENSTACK;
+      RollbackTenantError rollbackTenantError0 = new RollbackTenantError("", msoExceptionCategory0, false);
+      Boolean boolean0 = rollbackTenantError0.getRolledBack();
+      rollbackTenantError0.setRolledBack(boolean0);
+      assertEquals(MsoExceptionCategory.OPENSTACK, rollbackTenantError0.getCategory());
+  }
+
+  @Test(timeout = 4000)
+  public void test9()  throws Throwable  {
+      RollbackTenantError rollbackTenantError0 = new RollbackTenantError();
+      rollbackTenantError0.setMessage("org.openecomp.mso.openstack.exceptions.MsoExceptionCategory");
+      assertEquals("org.openecomp.mso.openstack.exceptions.MsoExceptionCategory", rollbackTenantError0.getMessage());
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/RollbackTenantErrorESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/RollbackTenantErrorESTestscaffolding.java
new file mode 100644
index 0000000000..8ca1cb047b
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/RollbackTenantErrorESTestscaffolding.java
@@ -0,0 +1,85 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:22:42 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.tenantrest;
+
+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 RollbackTenantErrorESTestscaffolding {
+
+  @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.tenantrest.RollbackTenantError"; 
+    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(RollbackTenantErrorESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.openstack.exceptions.MsoExceptionCategory",
+      "org.openecomp.mso.adapters.tenantrest.RollbackTenantError",
+      "org.jboss.resteasy.annotations.providers.NoJackson"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(RollbackTenantErrorESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "org.openecomp.mso.adapters.tenantrest.RollbackTenantError"
+    );
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/RollbackTenantRequestESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/RollbackTenantRequestESTest.java
new file mode 100644
index 0000000000..c846222423
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/RollbackTenantRequestESTest.java
@@ -0,0 +1,43 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:26:04 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.tenantrest;
+
+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 RollbackTenantRequestESTest extends RollbackTenantRequestESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test0()  throws Throwable  {
+      RollbackTenantRequest rollbackTenantRequest0 = new RollbackTenantRequest();
+      TenantRollback tenantRollback0 = new TenantRollback();
+      rollbackTenantRequest0.setTenantRollback(tenantRollback0);
+      tenantRollback0.setTenantCreated(true);
+      TenantRollback tenantRollback1 = rollbackTenantRequest0.getTenantRollback();
+      assertTrue(tenantRollback1.getTenantCreated());
+  }
+
+  @Test(timeout = 4000)
+  public void test1()  throws Throwable  {
+      RollbackTenantRequest rollbackTenantRequest0 = new RollbackTenantRequest();
+      TenantRollback tenantRollback0 = new TenantRollback();
+      rollbackTenantRequest0.setTenantRollback(tenantRollback0);
+      TenantRollback tenantRollback1 = rollbackTenantRequest0.getTenantRollback();
+      assertSame(tenantRollback1, tenantRollback0);
+  }
+
+  @Test(timeout = 4000)
+  public void test2()  throws Throwable  {
+      RollbackTenantRequest rollbackTenantRequest0 = new RollbackTenantRequest();
+      TenantRollback tenantRollback0 = rollbackTenantRequest0.getTenantRollback();
+      assertNull(tenantRollback0);
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/RollbackTenantRequestESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/RollbackTenantRequestESTestscaffolding.java
new file mode 100644
index 0000000000..fa9d0c6ef1
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/RollbackTenantRequestESTestscaffolding.java
@@ -0,0 +1,98 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:26:04 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.tenantrest;
+
+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 RollbackTenantRequestESTestscaffolding {
+
+  @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.tenantrest.RollbackTenantRequest"; 
+    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(RollbackTenantRequestESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.entity.MsoRequest",
+      "org.openecomp.mso.adapters.tenantrest.TenantRequestCommon",
+      "org.openecomp.mso.adapters.tenantrest.RollbackTenantRequest",
+      "org.openecomp.mso.adapters.tenantrest.TenantRollback",
+      "org.jboss.resteasy.annotations.providers.NoJackson"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(RollbackTenantRequestESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "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/tenantrest/RollbackTenantResponseESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/RollbackTenantResponseESTest.java
new file mode 100644
index 0000000000..3669382f3a
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/RollbackTenantResponseESTest.java
@@ -0,0 +1,42 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:19:02 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.tenantrest;
+
+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 RollbackTenantResponseESTest extends RollbackTenantResponseESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test0()  throws Throwable  {
+      RollbackTenantResponse rollbackTenantResponse0 = new RollbackTenantResponse();
+      Boolean boolean0 = Boolean.TRUE;
+      rollbackTenantResponse0.setTenantRolledback(boolean0);
+      Boolean boolean1 = rollbackTenantResponse0.getTenantRolledback();
+      assertTrue(boolean1);
+  }
+
+  @Test(timeout = 4000)
+  public void test1()  throws Throwable  {
+      RollbackTenantResponse rollbackTenantResponse0 = new RollbackTenantResponse();
+      Boolean boolean0 = Boolean.valueOf(":;W(ksM>u2+");
+      rollbackTenantResponse0.setTenantRolledback(boolean0);
+      Boolean boolean1 = rollbackTenantResponse0.getTenantRolledback();
+      assertFalse(boolean1);
+  }
+
+  @Test(timeout = 4000)
+  public void test2()  throws Throwable  {
+      RollbackTenantResponse rollbackTenantResponse0 = new RollbackTenantResponse();
+      Boolean boolean0 = rollbackTenantResponse0.getTenantRolledback();
+      assertNull(boolean0);
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/RollbackTenantResponseESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/RollbackTenantResponseESTestscaffolding.java
new file mode 100644
index 0000000000..975ce058af
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/RollbackTenantResponseESTestscaffolding.java
@@ -0,0 +1,79 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:19:02 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.tenantrest;
+
+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 RollbackTenantResponseESTestscaffolding {
+
+  @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.tenantrest.RollbackTenantResponse"; 
+    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(RollbackTenantResponseESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.adapters.tenantrest.RollbackTenantResponse",
+      "org.jboss.resteasy.annotations.providers.NoJackson"
+    );
+  } 
+
+  private static void resetClasses() {
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/TenantExceptionResponseESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/TenantExceptionResponseESTest.java
new file mode 100644
index 0000000000..1694ca2ae7
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/TenantExceptionResponseESTest.java
@@ -0,0 +1,97 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:25:22 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.tenantrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import org.openecomp.mso.openstack.exceptions.MsoExceptionCategory;
+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 TenantExceptionResponseESTest extends TenantExceptionResponseESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test00()  throws Throwable  {
+      MsoExceptionCategory msoExceptionCategory0 = MsoExceptionCategory.OPENSTACK;
+      TenantExceptionResponse tenantExceptionResponse0 = new TenantExceptionResponse((String) null, msoExceptionCategory0, true);
+      Boolean boolean0 = tenantExceptionResponse0.getRolledBack();
+      assertTrue(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test01()  throws Throwable  {
+      TenantExceptionResponse tenantExceptionResponse0 = new TenantExceptionResponse("sxH3DHvAo$");
+      String string0 = tenantExceptionResponse0.getMessage();
+      assertEquals("sxH3DHvAo$", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test02()  throws Throwable  {
+      MsoExceptionCategory msoExceptionCategory0 = MsoExceptionCategory.OPENSTACK;
+      TenantExceptionResponse tenantExceptionResponse0 = new TenantExceptionResponse((String) null, msoExceptionCategory0, true);
+      MsoExceptionCategory msoExceptionCategory1 = tenantExceptionResponse0.getCategory();
+      assertSame(msoExceptionCategory0, msoExceptionCategory1);
+  }
+
+  @Test(timeout = 4000)
+  public void test03()  throws Throwable  {
+      TenantExceptionResponse tenantExceptionResponse0 = new TenantExceptionResponse("");
+      tenantExceptionResponse0.setMessage("1LGUz =Y?.wyJ");
+      assertNull(tenantExceptionResponse0.getCategory());
+  }
+
+  @Test(timeout = 4000)
+  public void test04()  throws Throwable  {
+      TenantExceptionResponse tenantExceptionResponse0 = new TenantExceptionResponse("");
+      Boolean boolean0 = tenantExceptionResponse0.getRolledBack();
+      assertNull(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test05()  throws Throwable  {
+      TenantExceptionResponse tenantExceptionResponse0 = new TenantExceptionResponse("");
+      tenantExceptionResponse0.setCategory((MsoExceptionCategory) null);
+      assertEquals("", tenantExceptionResponse0.getMessage());
+  }
+
+  @Test(timeout = 4000)
+  public void test06()  throws Throwable  {
+      TenantExceptionResponse tenantExceptionResponse0 = new TenantExceptionResponse();
+      String string0 = tenantExceptionResponse0.getMessage();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test07()  throws Throwable  {
+      TenantExceptionResponse tenantExceptionResponse0 = new TenantExceptionResponse("");
+      String string0 = tenantExceptionResponse0.getMessage();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test08()  throws Throwable  {
+      MsoExceptionCategory msoExceptionCategory0 = MsoExceptionCategory.INTERNAL;
+      TenantExceptionResponse tenantExceptionResponse0 = new TenantExceptionResponse("", msoExceptionCategory0, false);
+      Boolean boolean0 = tenantExceptionResponse0.getRolledBack();
+      assertFalse(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test09()  throws Throwable  {
+      TenantExceptionResponse tenantExceptionResponse0 = new TenantExceptionResponse("");
+      tenantExceptionResponse0.setRolledBack((Boolean) null);
+      assertNull(tenantExceptionResponse0.getCategory());
+  }
+
+  @Test(timeout = 4000)
+  public void test10()  throws Throwable  {
+      TenantExceptionResponse tenantExceptionResponse0 = new TenantExceptionResponse("");
+      tenantExceptionResponse0.getCategory();
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/TenantExceptionResponseESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/TenantExceptionResponseESTestscaffolding.java
new file mode 100644
index 0000000000..712eea38a0
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/TenantExceptionResponseESTestscaffolding.java
@@ -0,0 +1,85 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:25:22 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.tenantrest;
+
+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 TenantExceptionResponseESTestscaffolding {
+
+  @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.tenantrest.TenantExceptionResponse"; 
+    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(TenantExceptionResponseESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.adapters.tenantrest.TenantExceptionResponse",
+      "org.openecomp.mso.openstack.exceptions.MsoExceptionCategory",
+      "org.jboss.resteasy.annotations.providers.NoJackson"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(TenantExceptionResponseESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "org.openecomp.mso.adapters.tenantrest.TenantExceptionResponse"
+    );
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/TenantRollbackESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/TenantRollbackESTest.java
new file mode 100644
index 0000000000..48b4e04bb0
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/TenantRollbackESTest.java
@@ -0,0 +1,104 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:14:33 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.tenantrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import org.openecomp.mso.entity.MsoRequest;
+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 TenantRollbackESTest extends TenantRollbackESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test00()  throws Throwable  {
+      TenantRollback tenantRollback0 = new TenantRollback();
+      tenantRollback0.setTenantId("e'W6mm;1{:,");
+      tenantRollback0.getTenantId();
+      assertFalse(tenantRollback0.getTenantCreated());
+  }
+
+  @Test(timeout = 4000)
+  public void test01()  throws Throwable  {
+      TenantRollback tenantRollback0 = new TenantRollback();
+      assertFalse(tenantRollback0.getTenantCreated());
+      
+      tenantRollback0.setTenantCreated(true);
+      boolean boolean0 = tenantRollback0.getTenantCreated();
+      assertTrue(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test02()  throws Throwable  {
+      TenantRollback tenantRollback0 = new TenantRollback();
+      tenantRollback0.setCloudId("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<rollbackTenantRequest>\n    <tenantCreated>false</tenantCreated>\n</rollbackTenantRequest>\n");
+      tenantRollback0.getCloudId();
+      assertFalse(tenantRollback0.getTenantCreated());
+  }
+
+  @Test(timeout = 4000)
+  public void test03()  throws Throwable  {
+      TenantRollback tenantRollback0 = new TenantRollback();
+      tenantRollback0.setCloudId("");
+      tenantRollback0.getCloudId();
+      assertFalse(tenantRollback0.getTenantCreated());
+  }
+
+  @Test(timeout = 4000)
+  public void test04()  throws Throwable  {
+      TenantRollback tenantRollback0 = new TenantRollback();
+      tenantRollback0.getMsoRequest();
+      assertFalse(tenantRollback0.getTenantCreated());
+  }
+
+  @Test(timeout = 4000)
+  public void test05()  throws Throwable  {
+      TenantRollback tenantRollback0 = new TenantRollback();
+      boolean boolean0 = tenantRollback0.getTenantCreated();
+      assertFalse(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test06()  throws Throwable  {
+      TenantRollback tenantRollback0 = new TenantRollback();
+      tenantRollback0.getCloudId();
+      assertFalse(tenantRollback0.getTenantCreated());
+  }
+
+  @Test(timeout = 4000)
+  public void test07()  throws Throwable  {
+      TenantRollback tenantRollback0 = new TenantRollback();
+      tenantRollback0.getTenantId();
+      assertFalse(tenantRollback0.getTenantCreated());
+  }
+
+  @Test(timeout = 4000)
+  public void test08()  throws Throwable  {
+      TenantRollback tenantRollback0 = new TenantRollback();
+      MsoRequest msoRequest0 = new MsoRequest();
+      tenantRollback0.setMsoRequest(msoRequest0);
+      tenantRollback0.getMsoRequest();
+      assertFalse(tenantRollback0.getTenantCreated());
+  }
+
+  @Test(timeout = 4000)
+  public void test09()  throws Throwable  {
+      TenantRollback tenantRollback0 = new TenantRollback();
+      tenantRollback0.setTenantId("");
+      tenantRollback0.getTenantId();
+      assertFalse(tenantRollback0.getTenantCreated());
+  }
+
+  @Test(timeout = 4000)
+  public void test10()  throws Throwable  {
+      TenantRollback tenantRollback0 = new TenantRollback();
+      String string0 = tenantRollback0.toString();
+      assertEquals("VnfRollback: cloud=null, tenant=null, tenantCreated=false", string0);
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/TenantRollbackESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/TenantRollbackESTestscaffolding.java
new file mode 100644
index 0000000000..c75ee49c43
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/tenantrest/TenantRollbackESTestscaffolding.java
@@ -0,0 +1,97 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:14:33 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.tenantrest;
+
+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 TenantRollbackESTestscaffolding {
+
+  @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.tenantrest.TenantRollback"; 
+    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(TenantRollbackESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.entity.MsoRequest",
+      "org.openecomp.mso.adapters.tenantrest.TenantRequestCommon",
+      "org.openecomp.mso.adapters.tenantrest.TenantRollback",
+      "org.jboss.resteasy.annotations.providers.NoJackson"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(TenantRollbackESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "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/vnfrest/CreateVfModuleRequestESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/CreateVfModuleRequestESTest.java
new file mode 100644
index 0000000000..daaf4f0b49
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/CreateVfModuleRequestESTest.java
@@ -0,0 +1,661 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:13:00 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+import static org.evosuite.runtime.EvoAssertions.*;
+
+import org.openecomp.mso.entity.MsoRequest;
+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 CreateVfModuleRequestESTest extends CreateVfModuleRequestESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test00()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      assertNull(createVfModuleRequest0.getVnfId());
+      
+      createVfModuleRequest0.setVnfVersion("sJ%kzC");
+      createVfModuleRequest0.getVolumeGroupId();
+      createVfModuleRequest0.setTenantId((String) null);
+      createVfModuleRequest0.setRequestType((String) null);
+      createVfModuleRequest0.getVnfVersion();
+      createVfModuleRequest0.setVnfType((String) null);
+      createVfModuleRequest0.getBaseVfModuleId();
+      createVfModuleRequest0.getBaseVfModuleId();
+      MsoRequest msoRequest0 = new MsoRequest();
+      createVfModuleRequest0.setMsoRequest(msoRequest0);
+      createVfModuleRequest0.getBackout();
+      createVfModuleRequest0.toXmlString();
+      Boolean.logicalAnd(false, false);
+      createVfModuleRequest0.setBackout((Boolean) null);
+      createVfModuleRequest0.getVolumeGroupId();
+      createVfModuleRequest0.getVfModuleType();
+      createVfModuleRequest0.setBaseVfModuleStackId("");
+      createVfModuleRequest0.setRequestType("&$7s5#");
+      assertTrue(createVfModuleRequest0.isSynchronous());
+  }
+
+  @Test(timeout = 4000)
+  public void test01()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      createVfModuleRequest0.setBaseVfModuleStackId("gi,pZwt!/Q");
+      createVfModuleRequest0.setTenantId("<(b");
+      createVfModuleRequest0.setVfModuleName("");
+      createVfModuleRequest0.setVnfId("");
+      createVfModuleRequest0.getVnfId();
+      createVfModuleRequest0.getBackout();
+      createVfModuleRequest0.setRequestType("");
+      createVfModuleRequest0.getTenantId();
+      createVfModuleRequest0.setVfModuleId("gi,pZwt!/Q");
+      createVfModuleRequest0.getVfModuleParams();
+      createVfModuleRequest0.getVolumeGroupStackId();
+      String string0 = createVfModuleRequest0.getVolumeGroupId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test02()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      createVfModuleRequest0.getFailIfExists();
+      createVfModuleRequest0.setFailIfExists((Boolean) null);
+      assertTrue(createVfModuleRequest0.isSynchronous());
+      
+      createVfModuleRequest0.setVnfId("");
+      createVfModuleRequest0.setTenantId("P%");
+      createVfModuleRequest0.setTenantId("vqbsX2ysx.>]T ");
+      createVfModuleRequest0.getBaseVfModuleStackId();
+      createVfModuleRequest0.getBaseVfModuleStackId();
+      createVfModuleRequest0.getCloudSiteId();
+      createVfModuleRequest0.getVfModuleParams();
+      String string0 = createVfModuleRequest0.getTenantId();
+      assertEquals("vqbsX2ysx.>]T ", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test03()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      createVfModuleRequest0.setMessageId("");
+      createVfModuleRequest0.setVfModuleName("");
+      createVfModuleRequest0.setVnfType("");
+      MsoRequest msoRequest0 = new MsoRequest();
+      msoRequest0.setRequestId("");
+      createVfModuleRequest0.setMsoRequest(msoRequest0);
+      createVfModuleRequest0.getBaseVfModuleId();
+      Boolean boolean0 = Boolean.TRUE;
+      Boolean.getBoolean("");
+      createVfModuleRequest0.setBaseVfModuleId("$I<po0F7W[gG2}iD,.");
+      createVfModuleRequest0.setBackout(boolean0);
+      CreateVfModuleRequest createVfModuleRequest1 = new CreateVfModuleRequest();
+      createVfModuleRequest0.toXmlString();
+      createVfModuleRequest1.setBaseVfModuleStackId("$I<po0F7W[gG2}iD,.");
+      createVfModuleRequest0.getVfModuleName();
+      Boolean boolean1 = createVfModuleRequest0.getBackout();
+      assertTrue(boolean1);
+  }
+
+  @Test(timeout = 4000)
+  public void test04()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      MsoRequest msoRequest0 = new MsoRequest();
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      createVfModuleRequest0.setVfModuleParams(hashMap0);
+      createVfModuleRequest0.setMsoRequest(msoRequest0);
+      createVfModuleRequest0.setTenantId("");
+      Map<String, String> map0 = createVfModuleRequest0.getVfModuleParams();
+      createVfModuleRequest0.setVfModuleParams(map0);
+      createVfModuleRequest0.setVolumeGroupStackId("E8");
+      createVfModuleRequest0.setVfModuleId("");
+      createVfModuleRequest0.setVfModuleParams((Map<String, String>) null);
+      createVfModuleRequest0.getVfModuleId();
+      createVfModuleRequest0.setVfModuleParams((Map<String, String>) null);
+      createVfModuleRequest0.setVfModuleType("@<W6qx4|DZ(CMN`JzXQ");
+      assertEquals("", createVfModuleRequest0.getTenantId());
+  }
+
+  @Test(timeout = 4000)
+  public void test05()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      createVfModuleRequest0.setBaseVfModuleStackId("jaxb.formatted.output");
+      Boolean boolean0 = Boolean.valueOf(false);
+      Boolean.compare(false, false);
+      createVfModuleRequest0.setVfModuleType("");
+      Boolean.logicalXor(false, true);
+      Boolean.logicalOr(true, true);
+      Boolean.compare(false, false);
+      createVfModuleRequest0.setFailIfExists(boolean0);
+      createVfModuleRequest0.setVfModuleName("bMZ`m<$@<x?!ofbD`!");
+      createVfModuleRequest0.setVfModuleType("");
+      createVfModuleRequest0.getFailIfExists();
+      createVfModuleRequest0.setTenantId("");
+      createVfModuleRequest0.setVnfId("");
+      createVfModuleRequest0.getBaseVfModuleStackId();
+      createVfModuleRequest0.getMsoRequest();
+      createVfModuleRequest0.getTenantId();
+      MsoRequest msoRequest0 = createVfModuleRequest0.getMsoRequest();
+      msoRequest0.setServiceInstanceId("");
+      createVfModuleRequest0.getVnfType();
+      createVfModuleRequest0.getVnfType();
+      createVfModuleRequest0.setVfModuleName("");
+      msoRequest0.setRequestId((String) null);
+      createVfModuleRequest0.setMsoRequest(msoRequest0);
+      createVfModuleRequest0.setVfModuleId((String) null);
+      createVfModuleRequest0.setBaseVfModuleId("");
+      createVfModuleRequest0.getBackout();
+      createVfModuleRequest0.setRequestType("");
+      assertNull(createVfModuleRequest0.getVnfType());
+  }
+
+  @Test(timeout = 4000)
+  public void test06()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      createVfModuleRequest0.setVolumeGroupId("C}GH#3Zrrwj]-VWQfx");
+      createVfModuleRequest0.setVnfType("jaxb.formatted.output");
+      createVfModuleRequest0.setRequestType("jaxb.formatted.output");
+      createVfModuleRequest0.getBackout();
+      String string0 = createVfModuleRequest0.getVolumeGroupId();
+      assertEquals("C}GH#3Zrrwj]-VWQfx", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test07()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      createVfModuleRequest0.setVfModuleParams(hashMap0);
+      Boolean boolean0 = Boolean.valueOf(false);
+      Boolean.logicalXor(false, false);
+      createVfModuleRequest0.setFailIfExists(boolean0);
+      createVfModuleRequest0.setVolumeGroupId((String) null);
+      createVfModuleRequest0.setRequestType("jaxb.formatted.output");
+      createVfModuleRequest0.getRequestType();
+      String string0 = createVfModuleRequest0.getTenantId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test08()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      createVfModuleRequest0.setVnfType("4$IXyLo,UL9");
+      createVfModuleRequest0.getVfModuleName();
+      MsoRequest msoRequest0 = new MsoRequest();
+      msoRequest0.setServiceInstanceId("4$IXyLo,UL9");
+      createVfModuleRequest0.toXmlString();
+      msoRequest0.setServiceInstanceId("");
+      msoRequest0.setRequestId("4$IXyLo,UL9");
+      Boolean boolean0 = Boolean.valueOf("4$IXyLo,UL9");
+      Boolean.getBoolean("4$IXyLo,UL9");
+      createVfModuleRequest0.setBackout(boolean0);
+      msoRequest0.setServiceInstanceId("t.d]=Q;m");
+      msoRequest0.setRequestId("");
+      createVfModuleRequest0.setMsoRequest(msoRequest0);
+      createVfModuleRequest0.setVolumeGroupId("");
+      createVfModuleRequest0.getVolumeGroupId();
+      createVfModuleRequest0.getBaseVfModuleStackId();
+      createVfModuleRequest0.getVnfId();
+      createVfModuleRequest0.getCloudSiteId();
+      createVfModuleRequest0.setVfModuleType("Hc<-mV");
+      assertNull(createVfModuleRequest0.getMessageId());
+  }
+
+  @Test(timeout = 4000)
+  public void test09()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      createVfModuleRequest0.setBaseVfModuleStackId(":N_M0a[eewxveG");
+      createVfModuleRequest0.setMessageId("qajtT(\"^v~n0>3Q/F9");
+      Boolean boolean0 = Boolean.valueOf(":N_M0a[eewxveG");
+      Boolean.compare(true, true);
+      createVfModuleRequest0.setFailIfExists(boolean0);
+      createVfModuleRequest0.setVfModuleId("");
+      createVfModuleRequest0.setBaseVfModuleId("");
+      createVfModuleRequest0.setVnfId("&uC#o/=");
+      createVfModuleRequest0.setVfModuleName("jaxb.formatted.output");
+      createVfModuleRequest0.setVnfType("jaxb.formatted.output");
+      createVfModuleRequest0.getVnfId();
+      createVfModuleRequest0.getBaseVfModuleId();
+      createVfModuleRequest0.setVfModuleId("");
+      createVfModuleRequest0.setVfModuleId("'l b#");
+      assertNull(createVfModuleRequest0.getVolumeGroupId());
+  }
+
+  @Test(timeout = 4000)
+  public void test10()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      Map<String, String> map0 = createVfModuleRequest0.getVfModuleParams();
+      createVfModuleRequest0.setVnfId("Mi!");
+      createVfModuleRequest0.setVolumeGroupId((String) null);
+      createVfModuleRequest0.setVfModuleParams(map0);
+      createVfModuleRequest0.setBaseVfModuleStackId("Mi!");
+      createVfModuleRequest0.getVnfId();
+      createVfModuleRequest0.getBaseVfModuleStackId();
+      createVfModuleRequest0.getVolumeGroupId();
+      createVfModuleRequest0.setVfModuleId((String) null);
+      assertNull(createVfModuleRequest0.getVolumeGroupStackId());
+  }
+
+  @Test(timeout = 4000)
+  public void test11()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      createVfModuleRequest0.toXmlString();
+      createVfModuleRequest0.setVolumeGroupId("");
+      createVfModuleRequest0.getBaseVfModuleId();
+      createVfModuleRequest0.toXmlString();
+      createVfModuleRequest0.setVfModuleType("~o");
+      createVfModuleRequest0.setRequestType("");
+      createVfModuleRequest0.getVfModuleName();
+      Boolean boolean0 = new Boolean(false);
+      createVfModuleRequest0.setFailIfExists(boolean0);
+      createVfModuleRequest0.getRequestType();
+      createVfModuleRequest0.setVfModuleId("");
+      createVfModuleRequest0.setVfModuleId("");
+      assertEquals("", createVfModuleRequest0.getVolumeGroupId());
+  }
+
+  @Test(timeout = 4000)
+  public void test12()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      Map<String, String> map0 = createVfModuleRequest0.getVfModuleParams();
+      createVfModuleRequest0.setVfModuleParams(map0);
+      createVfModuleRequest0.getBaseVfModuleId();
+      createVfModuleRequest0.getTenantId();
+      createVfModuleRequest0.getCloudSiteId();
+      createVfModuleRequest0.setVolumeGroupStackId((String) null);
+      createVfModuleRequest0.getBackout();
+      createVfModuleRequest0.getVfModuleType();
+      createVfModuleRequest0.setVnfId("3TEn*yZmhM~PV>H");
+      createVfModuleRequest0.getFailIfExists();
+      createVfModuleRequest0.setCloudSiteId("");
+      createVfModuleRequest0.getCloudSiteId();
+      String string0 = createVfModuleRequest0.getVnfVersion();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test13()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      createVfModuleRequest0.setVnfVersion("!oK");
+      createVfModuleRequest0.setCloudSiteId((String) null);
+      createVfModuleRequest0.setVfModuleType("");
+      createVfModuleRequest0.getRequestType();
+      createVfModuleRequest0.setVfModuleId((String) null);
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      createVfModuleRequest0.setNotificationUrl((String) null);
+      hashMap0.put("", (String) null);
+      createVfModuleRequest0.setVfModuleParams(hashMap0);
+      hashMap0.put("!oK", "");
+      createVfModuleRequest0.setVfModuleParams(hashMap0);
+      createVfModuleRequest0.getVnfType();
+      createVfModuleRequest0.getVfModuleParams();
+      String string0 = createVfModuleRequest0.getVnfId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test14()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      Boolean boolean0 = Boolean.TRUE;
+      Boolean.getBoolean((String) null);
+      Boolean.logicalOr(true, false);
+      createVfModuleRequest0.setSkipAAI(boolean0);
+      Boolean boolean1 = createVfModuleRequest0.getSkipAAI();
+      createVfModuleRequest0.setSkipAAI(boolean1);
+      createVfModuleRequest0.setBaseVfModuleId("u=(R@E]!q2rk");
+      createVfModuleRequest0.setVnfId("");
+      createVfModuleRequest0.setVfModuleId("u=(R@E]!q2rk");
+      createVfModuleRequest0.setVolumeGroupId("u=(R@E]!q2rk");
+      createVfModuleRequest0.setBaseVfModuleStackId((String) null);
+      createVfModuleRequest0.setCloudSiteId("^)DR(@$VIDb");
+      createVfModuleRequest0.setVnfId("^)DR(@$VIDb");
+      createVfModuleRequest0.getVfModuleParams();
+      createVfModuleRequest0.getVfModuleId();
+      createVfModuleRequest0.getBaseVfModuleId();
+      String string0 = createVfModuleRequest0.getVnfType();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test15()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      createVfModuleRequest0.setRequestType("");
+      createVfModuleRequest0.setRequestType("");
+      createVfModuleRequest0.getMsoRequest();
+      createVfModuleRequest0.setBaseVfModuleStackId("");
+      createVfModuleRequest0.setVolumeGroupStackId(":S");
+      createVfModuleRequest0.getBaseVfModuleStackId();
+      CreateVfModuleRequest createVfModuleRequest1 = new CreateVfModuleRequest();
+      createVfModuleRequest1.getFailIfExists();
+      Boolean.compare(false, false);
+      // Undeclared exception!
+      try { 
+        createVfModuleRequest1.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 test16()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      createVfModuleRequest0.setVnfType("");
+      assertNull(createVfModuleRequest0.getBaseVfModuleStackId());
+      
+      MsoRequest msoRequest0 = new MsoRequest("", (String) null);
+      msoRequest0.setServiceInstanceId("");
+      msoRequest0.setRequestId("y/H`4");
+      createVfModuleRequest0.setMsoRequest(msoRequest0);
+      createVfModuleRequest0.setVolumeGroupStackId("1!1@Hk");
+      createVfModuleRequest0.setNotificationUrl("");
+      createVfModuleRequest0.getVnfType();
+      createVfModuleRequest0.getRequestType();
+      createVfModuleRequest0.getBackout();
+      createVfModuleRequest0.getVolumeGroupStackId();
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      createVfModuleRequest0.setVfModuleParams(hashMap0);
+      assertNull(createVfModuleRequest0.getVnfVersion());
+  }
+
+  @Test(timeout = 4000)
+  public void test17()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      createVfModuleRequest0.setVnfVersion("");
+      createVfModuleRequest0.setVolumeGroupStackId("g[TSR)[o{D\"(-N");
+      createVfModuleRequest0.getFailIfExists();
+      MsoRequest msoRequest0 = new MsoRequest("", "");
+      msoRequest0.setServiceInstanceId("{l*;T:T");
+      createVfModuleRequest0.setMsoRequest(msoRequest0);
+      createVfModuleRequest0.setVnfType("");
+      createVfModuleRequest0.setMessageId("");
+      createVfModuleRequest0.setBaseVfModuleId("6=");
+      createVfModuleRequest0.setRequestType("");
+      createVfModuleRequest0.getVnfVersion();
+      createVfModuleRequest0.setVolumeGroupStackId("");
+      createVfModuleRequest0.getVolumeGroupStackId();
+      createVfModuleRequest0.setVnfType("");
+      createVfModuleRequest0.setVfModuleId("7vlbM({1@v[1?Q^A;");
+      assertNull(createVfModuleRequest0.getBaseVfModuleStackId());
+  }
+
+  @Test(timeout = 4000)
+  public void test18()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      MsoRequest msoRequest0 = new MsoRequest();
+      createVfModuleRequest0.setMsoRequest(msoRequest0);
+      createVfModuleRequest0.getVfModuleName();
+      Boolean boolean0 = Boolean.FALSE;
+      Boolean.logicalOr(true, true);
+      createVfModuleRequest0.setBackout(boolean0);
+      createVfModuleRequest0.setVnfVersion("");
+      createVfModuleRequest0.setVnfVersion("");
+      createVfModuleRequest0.getMsoRequest();
+      String string0 = createVfModuleRequest0.getVnfVersion();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test19()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      Boolean boolean0 = new Boolean("");
+      Boolean.logicalOr(true, false);
+      createVfModuleRequest0.setBackout(boolean0);
+      createVfModuleRequest0.setTenantId("");
+      createVfModuleRequest0.getBackout();
+      createVfModuleRequest0.setVfModuleName("rdQqc>V^");
+      assertTrue(createVfModuleRequest0.isSynchronous());
+  }
+
+  @Test(timeout = 4000)
+  public void test20()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      Map<String, String> map0 = createVfModuleRequest0.getVfModuleParams();
+      Boolean boolean0 = Boolean.valueOf("");
+      boolean boolean1 = Boolean.logicalXor(false, false);
+      createVfModuleRequest0.setSkipAAI(boolean0);
+      createVfModuleRequest0.setVfModuleParams(map0);
+      createVfModuleRequest0.getVfModuleType();
+      createVfModuleRequest0.setVnfId("");
+      createVfModuleRequest0.getBackout();
+      createVfModuleRequest0.getBaseVfModuleId();
+      createVfModuleRequest0.getVfModuleParams();
+      Boolean boolean2 = new Boolean(true);
+      createVfModuleRequest0.setFailIfExists(boolean2);
+      Boolean boolean3 = createVfModuleRequest0.getFailIfExists();
+      assertFalse(boolean3.equals((Object)boolean1));
+  }
+
+  @Test(timeout = 4000)
+  public void test21()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      createVfModuleRequest0.setVfModuleId(",XO#k)z!8GWX&8V+O");
+      createVfModuleRequest0.setCloudSiteId((String) null);
+      createVfModuleRequest0.setRequestType(",XO#k)z!8GWX&8V+O");
+      createVfModuleRequest0.setMsoRequest((MsoRequest) null);
+      createVfModuleRequest0.setRequestType(",XO#k)z!8GWX&8V+O");
+      createVfModuleRequest0.setVolumeGroupStackId("'ug-");
+      createVfModuleRequest0.setVnfType("s7~':&U/'F;]h");
+      createVfModuleRequest0.setBaseVfModuleId("'ug-");
+      createVfModuleRequest0.toXmlString();
+      createVfModuleRequest0.setVnfId("NmH3Tn>J]!Fg%4@%uY");
+      createVfModuleRequest0.setVnfId("'ug-");
+      createVfModuleRequest0.setVolumeGroupId("'ug-");
+      createVfModuleRequest0.setVolumeGroupId("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<createVfModuleRequest>\n    <baseVfModuleId>'ug-</baseVfModuleId>\n    <requestType>,XO#k)z!8GWX&amp;8V+O</requestType>\n    <vfModuleId>,XO#k)z!8GWX&amp;8V+O</vfModuleId>\n    <vfModuleParams/>\n    <vnfType>s7~':&amp;U/'F;]h</vnfType>\n    <volumeGroupStackId>'ug-</volumeGroupStackId>\n</createVfModuleRequest>\n");
+      createVfModuleRequest0.getVfModuleType();
+      createVfModuleRequest0.getMsoRequest();
+      createVfModuleRequest0.getVfModuleName();
+      createVfModuleRequest0.getVfModuleId();
+      Boolean boolean0 = Boolean.TRUE;
+      createVfModuleRequest0.setVfModuleName("p'k7");
+      createVfModuleRequest0.setFailIfExists(boolean0);
+      createVfModuleRequest0.getBackout();
+      createVfModuleRequest0.getVfModuleType();
+      createVfModuleRequest0.setBackout(boolean0);
+      createVfModuleRequest0.setVfModuleId((String) null);
+      createVfModuleRequest0.getVfModuleParams();
+      String string0 = createVfModuleRequest0.getVfModuleName();
+      assertEquals("p'k7", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test22()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      createVfModuleRequest0.setCloudSiteId("");
+      assertNull(createVfModuleRequest0.getVfModuleType());
+      
+      createVfModuleRequest0.setVfModuleId("-)#\"]O:7");
+      createVfModuleRequest0.getRequestType();
+      createVfModuleRequest0.getVfModuleName();
+      createVfModuleRequest0.setVfModuleName("-)#\"]O:7");
+      createVfModuleRequest0.setVnfVersion("");
+      createVfModuleRequest0.getVfModuleId();
+      Boolean boolean0 = new Boolean("$HZL");
+      Boolean.logicalXor(false, true);
+      Boolean.getBoolean("-)#\"]O:7");
+      Boolean.getBoolean("$HZL");
+      createVfModuleRequest0.setBackout(boolean0);
+      CreateVfModuleRequest createVfModuleRequest1 = new CreateVfModuleRequest();
+      CreateVfModuleRequest createVfModuleRequest2 = new CreateVfModuleRequest();
+      assertTrue(createVfModuleRequest2.isSynchronous());
+  }
+
+  @Test(timeout = 4000)
+  public void test23()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      createVfModuleRequest0.setBaseVfModuleStackId("");
+      createVfModuleRequest0.getFailIfExists();
+      createVfModuleRequest0.setBackout((Boolean) null);
+      createVfModuleRequest0.setVfModuleName("^z)=F7B=ZvfaN");
+      createVfModuleRequest0.getBackout();
+      createVfModuleRequest0.setVnfVersion("^z)=F7B=ZvfaN");
+      createVfModuleRequest0.setVolumeGroupId("jaxb.formatted.output");
+      createVfModuleRequest0.setVfModuleType("");
+      createVfModuleRequest0.getVfModuleName();
+      createVfModuleRequest0.getVnfId();
+      createVfModuleRequest0.setBaseVfModuleId("");
+      createVfModuleRequest0.getVfModuleType();
+      createVfModuleRequest0.getCloudSiteId();
+      createVfModuleRequest0.setVolumeGroupId("");
+      createVfModuleRequest0.setFailIfExists((Boolean) null);
+      String string0 = createVfModuleRequest0.getCloudSiteId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test24()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      createVfModuleRequest0.setVolumeGroupId("a72)-2");
+      String string0 = createVfModuleRequest0.getVfModuleName();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test25()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      createVfModuleRequest0.setVfModuleName("}2#uF?(<`4`}.");
+      assertNull(createVfModuleRequest0.getVnfVersion());
+  }
+
+  @Test(timeout = 4000)
+  public void test26()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      createVfModuleRequest0.setVfModuleParams((Map<String, String>) null);
+      createVfModuleRequest0.getBaseVfModuleId();
+      createVfModuleRequest0.getVnfVersion();
+      createVfModuleRequest0.setVolumeGroupStackId("");
+      createVfModuleRequest0.setCloudSiteId("aZB6^K~Z,$Q1");
+      createVfModuleRequest0.setVolumeGroupId("");
+      createVfModuleRequest0.setBaseVfModuleId((String) null);
+      createVfModuleRequest0.getBackout();
+      createVfModuleRequest0.getVfModuleParams();
+      createVfModuleRequest0.setVolumeGroupStackId("\"tKNX~{9QfJ");
+      String string0 = createVfModuleRequest0.getCloudSiteId();
+      assertEquals("aZB6^K~Z,$Q1", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test27()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      createVfModuleRequest0.setVnfType("Zp..9csA_m");
+      createVfModuleRequest0.setVolumeGroupStackId("Zp..9csA_m");
+      createVfModuleRequest0.setVnfId("");
+      CreateVfModuleRequest createVfModuleRequest1 = new CreateVfModuleRequest();
+      createVfModuleRequest1.setTenantId("");
+      createVfModuleRequest1.setVnfVersion("");
+      createVfModuleRequest0.setBaseVfModuleId("Zp..9csA_m");
+      Boolean boolean0 = Boolean.FALSE;
+      createVfModuleRequest0.setBackout(boolean0);
+      createVfModuleRequest0.setVfModuleType("");
+      String string0 = createVfModuleRequest0.getVnfType();
+      assertEquals("Zp..9csA_m", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test28()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      createVfModuleRequest0.setVolumeGroupStackId("");
+      createVfModuleRequest0.setBaseVfModuleId("");
+      String string0 = createVfModuleRequest0.getVnfType();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test29()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      createVfModuleRequest0.getVolumeGroupStackId();
+      // Undeclared exception!
+      try { 
+        createVfModuleRequest0.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 test30()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      createVfModuleRequest0.setRequestType("]8]Fja*=.9+U");
+      createVfModuleRequest0.setVnfVersion("]8]Fja*=.9+U");
+      createVfModuleRequest0.setBackout((Boolean) null);
+      createVfModuleRequest0.setVnfType("");
+      createVfModuleRequest0.setVfModuleType("]8]Fja*=.9+U");
+      createVfModuleRequest0.setVfModuleId("2`+q>,#Bb");
+      createVfModuleRequest0.setCloudSiteId("]8]Fja*=.9+U");
+      createVfModuleRequest0.setVolumeGroupId("2`+q>,#Bb");
+      createVfModuleRequest0.setVnfId("@=t[3*cN,^q ");
+      createVfModuleRequest0.getVfModuleType();
+      createVfModuleRequest0.getTenantId();
+      createVfModuleRequest0.getBackout();
+      createVfModuleRequest0.setBaseVfModuleStackId("1w$l-");
+      assertTrue(createVfModuleRequest0.isSynchronous());
+  }
+
+  @Test(timeout = 4000)
+  public void test31()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      createVfModuleRequest0.setBaseVfModuleId("");
+      createVfModuleRequest0.getCloudSiteId();
+      createVfModuleRequest0.setRequestType((String) null);
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      createVfModuleRequest0.setVfModuleParams(hashMap0);
+      assertNull(createVfModuleRequest0.getBaseVfModuleStackId());
+  }
+
+  @Test(timeout = 4000)
+  public void test32()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      MsoRequest msoRequest0 = createVfModuleRequest0.getMsoRequest();
+      createVfModuleRequest0.setMsoRequest(msoRequest0);
+      assertNull(createVfModuleRequest0.getVfModuleName());
+  }
+
+  @Test(timeout = 4000)
+  public void test33()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      createVfModuleRequest0.setVnfVersion("");
+      String string0 = createVfModuleRequest0.getVfModuleId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test34()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      createVfModuleRequest0.getVolumeGroupId();
+      createVfModuleRequest0.setVfModuleType((String) null);
+      createVfModuleRequest0.setVnfId("");
+      assertNull(createVfModuleRequest0.getVnfVersion());
+  }
+
+  @Test(timeout = 4000)
+  public void test35()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      createVfModuleRequest0.toXmlString();
+      createVfModuleRequest0.setVfModuleType("");
+      String string0 = createVfModuleRequest0.getVnfVersion();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test36()  throws Throwable  {
+      CreateVfModuleRequest createVfModuleRequest0 = new CreateVfModuleRequest();
+      createVfModuleRequest0.getVfModuleType();
+      createVfModuleRequest0.getVfModuleParams();
+      createVfModuleRequest0.setTenantId((String) null);
+      assertNull(createVfModuleRequest0.getBaseVfModuleId());
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/CreateVfModuleRequestESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/CreateVfModuleRequestESTestscaffolding.java
new file mode 100644
index 0000000000..685cb06f9e
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/CreateVfModuleRequestESTestscaffolding.java
@@ -0,0 +1,197 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:13:00 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+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 CreateVfModuleRequestESTestscaffolding {
+
+  @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.vnfrest.CreateVfModuleRequest"; 
+    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(CreateVfModuleRequestESTestscaffolding.class.getClassLoader() ,
+      "org.codehaus.jackson.map.JsonSerializableWithType",
+      "org.openecomp.mso.adapters.vnfrest.CreateVfModuleRequest",
+      "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",
+      "org.codehaus.jackson.node.BaseJsonNode",
+      "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",
+      "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.map.ClassIntrospector",
+      "org.codehaus.jackson.map.AnnotationIntrospector$Pair",
+      "org.codehaus.jackson.Versioned",
+      "org.codehaus.jackson.map.type.TypeBase",
+      "org.codehaus.jackson.map.ser.BasicSerializerFactory",
+      "org.codehaus.jackson.node.ContainerNode",
+      "org.codehaus.jackson.map.introspect.NopAnnotationIntrospector",
+      "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.codehaus.jackson.node.ObjectNode",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$MinimalMethodFilter",
+      "org.codehaus.jackson.map.type.CollectionLikeType",
+      "org.codehaus.jackson.sym.CharsToNameCanonicalizer$Bucket",
+      "org.codehaus.jackson.impl.JsonParserMinimalBase",
+      "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",
+      "org.codehaus.jackson.ObjectCodec",
+      "org.codehaus.jackson.map.introspect.AnnotatedMethod",
+      "org.codehaus.jackson.JsonFactory",
+      "org.codehaus.jackson.node.ArrayNode",
+      "org.codehaus.jackson.io.SegmentedStringWriter",
+      "org.codehaus.jackson.map.jsontype.TypeResolverBuilder",
+      "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.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",
+      "org.codehaus.jackson.map.introspect.VisibilityChecker$Std",
+      "org.codehaus.jackson.map.annotate.JsonRootName",
+      "org.codehaus.jackson.JsonParser",
+      "org.codehaus.jackson.node.NullNode",
+      "org.openecomp.mso.adapters.vnfrest.VfResponseCommon",
+      "org.codehaus.jackson.map.jsontype.impl.StdSubtypeResolver",
+      "org.openecomp.mso.entity.MsoRequest",
+      "org.codehaus.jackson.node.TreeTraversingParser",
+      "org.codehaus.jackson.map.type.CollectionType",
+      "org.codehaus.jackson.map.MapperConfig",
+      "org.openecomp.mso.adapters.vnfrest.VfRequestCommon",
+      "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.codehaus.jackson.map.ClassIntrospector$MixInResolver"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(CreateVfModuleRequestESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "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/vnfrest/CreateVfModuleResponseESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/CreateVfModuleResponseESTest.java
new file mode 100644
index 0000000000..b6719ef398
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/CreateVfModuleResponseESTest.java
@@ -0,0 +1,193 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:29:29 GMT 2016
+ */
+
+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;
+
+@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());
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/CreateVfModuleResponseESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/CreateVfModuleResponseESTestscaffolding.java
new file mode 100644
index 0000000000..2e7c295a80
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/CreateVfModuleResponseESTestscaffolding.java
@@ -0,0 +1,101 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:29:29 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+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 CreateVfModuleResponseESTestscaffolding {
+
+  @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.vnfrest.CreateVfModuleResponse"; 
+    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(CreateVfModuleResponseESTestscaffolding.class.getClassLoader() ,
+      "org.codehaus.jackson.annotate.JacksonAnnotation",
+      "org.openecomp.mso.adapters.vnfrest.VfResponseCommon",
+      "org.openecomp.mso.openstack.beans.VnfRollback",
+      "org.openecomp.mso.entity.MsoRequest",
+      "org.openecomp.mso.adapters.vnfrest.VfModuleRollback",
+      "org.jboss.resteasy.annotations.providers.NoJackson",
+      "org.codehaus.jackson.map.annotate.JsonRootName",
+      "org.openecomp.mso.adapters.vnfrest.CreateVfModuleResponse"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(CreateVfModuleResponseESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "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/vnfrest/CreateVolumeGroupRequestESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/CreateVolumeGroupRequestESTest.java
new file mode 100644
index 0000000000..42a4ff7a0d
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/CreateVolumeGroupRequestESTest.java
@@ -0,0 +1,367 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:25:19 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import org.openecomp.mso.entity.MsoRequest;
+import java.util.HashMap;
+import java.util.Map;
+import org.evosuite.runtime.EvoRunner;
+import org.evosuite.runtime.EvoRunnerParameters;
+import org.evosuite.runtime.System;
+import org.junit.runner.RunWith;
+
+@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
+public class CreateVolumeGroupRequestESTest extends CreateVolumeGroupRequestESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test00()  throws Throwable  {
+      CreateVolumeGroupRequest createVolumeGroupRequest0 = new CreateVolumeGroupRequest();
+      assertNull(createVolumeGroupRequest0.getVnfVersion());
+      
+      CreateVolumeGroupRequest createVolumeGroupRequest1 = new CreateVolumeGroupRequest();
+      MsoRequest msoRequest0 = createVolumeGroupRequest1.getMsoRequest();
+      createVolumeGroupRequest0.setMsoRequest(msoRequest0);
+      Boolean boolean0 = new Boolean(true);
+      createVolumeGroupRequest0.toXmlString();
+      createVolumeGroupRequest0.setVnfVersion("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<createVolumeGroupRequest>\n    <msoRequest/>\n    <volumeGroupParams/>\n</createVolumeGroupRequest>\n");
+      Boolean.compare(true, false);
+      createVolumeGroupRequest0.setFailIfExists(boolean0);
+      createVolumeGroupRequest0.getTenantId();
+      createVolumeGroupRequest0.getSuppressBackout();
+      createVolumeGroupRequest0.getVnfVersion();
+      createVolumeGroupRequest1.getVnfVersion();
+      createVolumeGroupRequest1.getVolumeGroupName();
+      Boolean boolean1 = createVolumeGroupRequest0.getSuppressBackout();
+      assertNull(boolean1);
+  }
+
+  @Test(timeout = 4000)
+  public void test01()  throws Throwable  {
+      CreateVolumeGroupRequest createVolumeGroupRequest0 = new CreateVolumeGroupRequest();
+      Boolean boolean0 = Boolean.FALSE;
+      Boolean.getBoolean("p?:e~");
+      createVolumeGroupRequest0.setFailIfExists(boolean0);
+      createVolumeGroupRequest0.toXmlString();
+      createVolumeGroupRequest0.setVnfVersion("\r>M+*VxIe4t0");
+      createVolumeGroupRequest0.getFailIfExists();
+      createVolumeGroupRequest0.toXmlString();
+      createVolumeGroupRequest0.setVolumeGroupId("");
+      createVolumeGroupRequest0.getVfModuleType();
+      createVolumeGroupRequest0.getSuppressBackout();
+      createVolumeGroupRequest0.setVnfVersion("");
+      createVolumeGroupRequest0.getVolumeGroupName();
+      createVolumeGroupRequest0.setMsoRequest((MsoRequest) null);
+      createVolumeGroupRequest0.setTenantId((String) null);
+      createVolumeGroupRequest0.getTenantId();
+      createVolumeGroupRequest0.setMsoRequest((MsoRequest) null);
+      assertNull(createVolumeGroupRequest0.getVolumeGroupName());
+  }
+
+  @Test(timeout = 4000)
+  public void test02()  throws Throwable  {
+      CreateVolumeGroupRequest createVolumeGroupRequest0 = new CreateVolumeGroupRequest();
+      Boolean boolean0 = Boolean.valueOf(true);
+      createVolumeGroupRequest0.setFailIfExists(boolean0);
+      createVolumeGroupRequest0.setVnfVersion("");
+      createVolumeGroupRequest0.getFailIfExists();
+      createVolumeGroupRequest0.getVnfVersion();
+      Boolean boolean1 = createVolumeGroupRequest0.getFailIfExists();
+      assertTrue(boolean1);
+  }
+
+  @Test(timeout = 4000)
+  public void test03()  throws Throwable  {
+      CreateVolumeGroupRequest createVolumeGroupRequest0 = new CreateVolumeGroupRequest();
+      createVolumeGroupRequest0.setVfModuleType("@ 8T");
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      createVolumeGroupRequest0.setVolumeGroupParams(hashMap0);
+      createVolumeGroupRequest0.getSuppressBackout();
+      createVolumeGroupRequest0.setVolumeGroupId("@ 8T");
+      createVolumeGroupRequest0.setVolumeGroupId("@ 8T");
+      createVolumeGroupRequest0.setVolumeGroupName("@ 8T");
+      createVolumeGroupRequest0.getVolumeGroupName();
+      createVolumeGroupRequest0.getVnfType();
+      String string0 = createVolumeGroupRequest0.getVolumeGroupName();
+      String string1 = createVolumeGroupRequest0.getVfModuleType();
+      assertTrue(string1.equals((Object)string0));
+  }
+
+  @Test(timeout = 4000)
+  public void test04()  throws Throwable  {
+      CreateVolumeGroupRequest createVolumeGroupRequest0 = new CreateVolumeGroupRequest();
+      createVolumeGroupRequest0.setVnfType("");
+      createVolumeGroupRequest0.setVolumeGroupId("I<\"*}");
+      createVolumeGroupRequest0.setTenantId("");
+      createVolumeGroupRequest0.setMessageId("gZK#x[BqFD");
+      createVolumeGroupRequest0.getVnfType();
+      createVolumeGroupRequest0.getTenantId();
+      Boolean boolean0 = new Boolean(true);
+      Boolean.logicalOr(true, true);
+      createVolumeGroupRequest0.setSuppressBackout(boolean0);
+      createVolumeGroupRequest0.setFailIfExists(boolean0);
+      assertTrue(createVolumeGroupRequest0.isSynchronous());
+  }
+
+  @Test(timeout = 4000)
+  public void test05()  throws Throwable  {
+      CreateVolumeGroupRequest createVolumeGroupRequest0 = new CreateVolumeGroupRequest();
+      createVolumeGroupRequest0.getSkipAAI();
+      createVolumeGroupRequest0.setFailIfExists((Boolean) null);
+      createVolumeGroupRequest0.setVfModuleType("");
+      createVolumeGroupRequest0.setNotificationUrl("");
+      createVolumeGroupRequest0.setVnfType((String) null);
+      CreateVolumeGroupRequest createVolumeGroupRequest1 = new CreateVolumeGroupRequest();
+      createVolumeGroupRequest0.getSuppressBackout();
+      MsoRequest msoRequest0 = new MsoRequest();
+      createVolumeGroupRequest0.setMsoRequest(msoRequest0);
+      String string0 = createVolumeGroupRequest0.getVfModuleType();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test06()  throws Throwable  {
+      CreateVolumeGroupRequest createVolumeGroupRequest0 = new CreateVolumeGroupRequest();
+      MsoRequest msoRequest0 = createVolumeGroupRequest0.getMsoRequest();
+      createVolumeGroupRequest0.setMsoRequest(msoRequest0);
+      assertNull(createVolumeGroupRequest0.getVnfType());
+      
+      createVolumeGroupRequest0.getVnfVersion();
+      createVolumeGroupRequest0.getTenantId();
+      Boolean boolean0 = Boolean.TRUE;
+      createVolumeGroupRequest0.setSkipAAI(boolean0);
+      createVolumeGroupRequest0.setSuppressBackout(boolean0);
+      Boolean boolean1 = createVolumeGroupRequest0.getSuppressBackout();
+      createVolumeGroupRequest0.setVnfVersion("");
+      Boolean.compare(false, false);
+      createVolumeGroupRequest0.setSuppressBackout(boolean1);
+      assertNull(createVolumeGroupRequest0.getVolumeGroupName());
+  }
+
+  @Test(timeout = 4000)
+  public void test07()  throws Throwable  {
+      CreateVolumeGroupRequest createVolumeGroupRequest0 = new CreateVolumeGroupRequest();
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      hashMap0.put("", "");
+      createVolumeGroupRequest0.setVolumeGroupParams(hashMap0);
+      createVolumeGroupRequest0.getVolumeGroupParams();
+      createVolumeGroupRequest0.setVfModuleType("jaxb.formatted.output");
+      assertNull(createVolumeGroupRequest0.getVnfType());
+  }
+
+  @Test(timeout = 4000)
+  public void test08()  throws Throwable  {
+      CreateVolumeGroupRequest createVolumeGroupRequest0 = new CreateVolumeGroupRequest();
+      CreateVolumeGroupRequest createVolumeGroupRequest1 = new CreateVolumeGroupRequest();
+      createVolumeGroupRequest1.getSkipAAI();
+      createVolumeGroupRequest0.setFailIfExists((Boolean) null);
+      createVolumeGroupRequest0.setVnfType("Hi&CG{k}/*QY9RvXr");
+      createVolumeGroupRequest1.setMessageId("");
+      createVolumeGroupRequest1.setVnfType("xUUBE/B}M{1");
+      String string0 = createVolumeGroupRequest1.getVnfType();
+      assertEquals("xUUBE/B}M{1", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test09()  throws Throwable  {
+      CreateVolumeGroupRequest createVolumeGroupRequest0 = new CreateVolumeGroupRequest();
+      createVolumeGroupRequest0.setCloudSiteId("");
+      createVolumeGroupRequest0.setVolumeGroupId("");
+      createVolumeGroupRequest0.setMessageId("");
+      createVolumeGroupRequest0.setVfModuleType("");
+      String string0 = createVolumeGroupRequest0.getCloudSiteId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test10()  throws Throwable  {
+      CreateVolumeGroupRequest createVolumeGroupRequest0 = new CreateVolumeGroupRequest();
+      CreateVolumeGroupRequest createVolumeGroupRequest1 = new CreateVolumeGroupRequest();
+      Map<String, String> map0 = createVolumeGroupRequest1.getVolumeGroupParams();
+      createVolumeGroupRequest1.setVolumeGroupParams(map0);
+      createVolumeGroupRequest0.setTenantId("$m=");
+      createVolumeGroupRequest0.setVolumeGroupParams(map0);
+      createVolumeGroupRequest1.getSuppressBackout();
+      createVolumeGroupRequest0.getTenantId();
+      createVolumeGroupRequest1.setVolumeGroupId((String) null);
+      createVolumeGroupRequest0.getVfModuleType();
+      createVolumeGroupRequest0.getSuppressBackout();
+      createVolumeGroupRequest0.setFailIfExists((Boolean) null);
+      createVolumeGroupRequest0.getSuppressBackout();
+      createVolumeGroupRequest0.setSuppressBackout((Boolean) null);
+      createVolumeGroupRequest0.getVnfType();
+      String string0 = createVolumeGroupRequest1.getVfModuleType();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test11()  throws Throwable  {
+      CreateVolumeGroupRequest createVolumeGroupRequest0 = new CreateVolumeGroupRequest();
+      MsoRequest msoRequest0 = new MsoRequest("V", "");
+      createVolumeGroupRequest0.setMsoRequest(msoRequest0);
+      createVolumeGroupRequest0.setVolumeGroupId("V");
+      createVolumeGroupRequest0.getVolumeGroupId();
+      Map<String, String> map0 = createVolumeGroupRequest0.getVolumeGroupParams();
+      assertEquals(0, map0.size());
+  }
+
+  @Test(timeout = 4000)
+  public void test12()  throws Throwable  {
+      CreateVolumeGroupRequest createVolumeGroupRequest0 = new CreateVolumeGroupRequest();
+      createVolumeGroupRequest0.setCloudSiteId("q^BO");
+      createVolumeGroupRequest0.setCloudSiteId(")|yH");
+      Boolean boolean0 = new Boolean(true);
+      Boolean.logicalXor(true, true);
+      createVolumeGroupRequest0.setSuppressBackout(boolean0);
+      createVolumeGroupRequest0.setVnfVersion("1SaWHwHs.6GKc|");
+      createVolumeGroupRequest0.getCloudSiteId();
+      CreateVolumeGroupRequest createVolumeGroupRequest1 = new CreateVolumeGroupRequest();
+      createVolumeGroupRequest0.getCloudSiteId();
+      CreateVolumeGroupRequest createVolumeGroupRequest2 = new CreateVolumeGroupRequest();
+      assertNull(createVolumeGroupRequest2.getVfModuleType());
+  }
+
+  @Test(timeout = 4000)
+  public void test13()  throws Throwable  {
+      CreateVolumeGroupRequest createVolumeGroupRequest0 = new CreateVolumeGroupRequest();
+      Boolean boolean0 = Boolean.valueOf(true);
+      createVolumeGroupRequest0.setVolumeGroupId("");
+      createVolumeGroupRequest0.setFailIfExists(boolean0);
+      createVolumeGroupRequest0.setSuppressBackout(boolean0);
+      createVolumeGroupRequest0.getVolumeGroupName();
+      CreateVolumeGroupRequest createVolumeGroupRequest1 = new CreateVolumeGroupRequest();
+      createVolumeGroupRequest0.getVolumeGroupId();
+      createVolumeGroupRequest0.setVolumeGroupId((String) null);
+      createVolumeGroupRequest1.setTenantId("k|l4f6h+M:_");
+      assertNull(createVolumeGroupRequest1.getVnfVersion());
+  }
+
+  @Test(timeout = 4000)
+  public void test14()  throws Throwable  {
+      CreateVolumeGroupRequest createVolumeGroupRequest0 = new CreateVolumeGroupRequest();
+      createVolumeGroupRequest0.toXmlString();
+      createVolumeGroupRequest0.setMsoRequest((MsoRequest) null);
+      createVolumeGroupRequest0.setVfModuleType("");
+      createVolumeGroupRequest0.getFailIfExists();
+      createVolumeGroupRequest0.setSuppressBackout((Boolean) null);
+      createVolumeGroupRequest0.setSuppressBackout((Boolean) null);
+      createVolumeGroupRequest0.getMsoRequest();
+      createVolumeGroupRequest0.setMsoRequest((MsoRequest) null);
+      createVolumeGroupRequest0.setVnfVersion("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<createVolumeGroupRequest>\n    <msoRequest/>\n    <volumeGroupParams/>\n</createVolumeGroupRequest>\n");
+      createVolumeGroupRequest0.getVolumeGroupId();
+      String string0 = createVolumeGroupRequest0.getVolumeGroupName();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test15()  throws Throwable  {
+      CreateVolumeGroupRequest createVolumeGroupRequest0 = new CreateVolumeGroupRequest();
+      createVolumeGroupRequest0.setVolumeGroupId("C}BU:zm--=1Md");
+      Boolean boolean0 = Boolean.valueOf(false);
+      createVolumeGroupRequest0.setSuppressBackout(boolean0);
+      createVolumeGroupRequest0.setVnfVersion("");
+      createVolumeGroupRequest0.setVfModuleType("i%IbRNJ6X^k'i&e+s");
+      createVolumeGroupRequest0.setVnfType("");
+      createVolumeGroupRequest0.getSuppressBackout();
+      createVolumeGroupRequest0.setVolumeGroupId("i%IbRNJ6X^k'i&e+s");
+      createVolumeGroupRequest0.setTenantId("");
+      createVolumeGroupRequest0.setVolumeGroupId("");
+      createVolumeGroupRequest0.setVnfVersion("VK&a");
+      createVolumeGroupRequest0.setTenantId("");
+      assertEquals("", createVolumeGroupRequest0.getVolumeGroupId());
+  }
+
+  @Test(timeout = 4000)
+  public void test16()  throws Throwable  {
+      CreateVolumeGroupRequest createVolumeGroupRequest0 = new CreateVolumeGroupRequest();
+      String string0 = createVolumeGroupRequest0.getVnfVersion();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test17()  throws Throwable  {
+      CreateVolumeGroupRequest createVolumeGroupRequest0 = new CreateVolumeGroupRequest();
+      String string0 = createVolumeGroupRequest0.getTenantId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test18()  throws Throwable  {
+      CreateVolumeGroupRequest createVolumeGroupRequest0 = new CreateVolumeGroupRequest();
+      createVolumeGroupRequest0.setVolumeGroupId("");
+      assertNull(createVolumeGroupRequest0.getVolumeGroupName());
+      
+      String string0 = createVolumeGroupRequest0.getCloudSiteId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test19()  throws Throwable  {
+      CreateVolumeGroupRequest createVolumeGroupRequest0 = new CreateVolumeGroupRequest();
+      createVolumeGroupRequest0.getVolumeGroupParams();
+      createVolumeGroupRequest0.getVnfType();
+      createVolumeGroupRequest0.setCloudSiteId("");
+      assertEquals("", createVolumeGroupRequest0.getCloudSiteId());
+  }
+
+  @Test(timeout = 4000)
+  public void test20()  throws Throwable  {
+      CreateVolumeGroupRequest createVolumeGroupRequest0 = new CreateVolumeGroupRequest();
+      createVolumeGroupRequest0.getFailIfExists();
+      createVolumeGroupRequest0.setSuppressBackout((Boolean) null);
+      assertNull(createVolumeGroupRequest0.getVnfType());
+  }
+
+  @Test(timeout = 4000)
+  public void test21()  throws Throwable  {
+      CreateVolumeGroupRequest createVolumeGroupRequest0 = new CreateVolumeGroupRequest();
+      createVolumeGroupRequest0.setNotificationUrl("");
+      createVolumeGroupRequest0.setVolumeGroupParams((Map<String, String>) null);
+      createVolumeGroupRequest0.getFailIfExists();
+      Boolean.compare(true, true);
+      createVolumeGroupRequest0.setFailIfExists((Boolean) null);
+      createVolumeGroupRequest0.getFailIfExists();
+      createVolumeGroupRequest0.setVolumeGroupName("");
+      createVolumeGroupRequest0.getVolumeGroupName();
+      createVolumeGroupRequest0.getVolumeGroupParams();
+      System.setCurrentTimeMillis(0);
+  }
+
+  @Test(timeout = 4000)
+  public void test22()  throws Throwable  {
+      CreateVolumeGroupRequest createVolumeGroupRequest0 = new CreateVolumeGroupRequest();
+      createVolumeGroupRequest0.getSuppressBackout();
+      createVolumeGroupRequest0.setFailIfExists((Boolean) null);
+      assertNull(createVolumeGroupRequest0.getVfModuleType());
+  }
+
+  @Test(timeout = 4000)
+  public void test23()  throws Throwable  {
+      CreateVolumeGroupRequest createVolumeGroupRequest0 = new CreateVolumeGroupRequest();
+      createVolumeGroupRequest0.setVolumeGroupName("");
+      assertNull(createVolumeGroupRequest0.getNotificationUrl());
+  }
+
+  @Test(timeout = 4000)
+  public void test24()  throws Throwable  {
+      CreateVolumeGroupRequest createVolumeGroupRequest0 = new CreateVolumeGroupRequest();
+      createVolumeGroupRequest0.toXmlString();
+      String string0 = createVolumeGroupRequest0.getVolumeGroupId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test25()  throws Throwable  {
+      CreateVolumeGroupRequest createVolumeGroupRequest0 = new CreateVolumeGroupRequest();
+      Map<String, String> map0 = createVolumeGroupRequest0.getVolumeGroupParams();
+      assertTrue(map0.isEmpty());
+      
+      createVolumeGroupRequest0.setVolumeGroupParams(map0);
+      assertNull(createVolumeGroupRequest0.getVolumeGroupName());
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/CreateVolumeGroupRequestESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/CreateVolumeGroupRequestESTestscaffolding.java
new file mode 100644
index 0000000000..2cd4efca2b
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/CreateVolumeGroupRequestESTestscaffolding.java
@@ -0,0 +1,100 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:25:19 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+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 CreateVolumeGroupRequestESTestscaffolding {
+
+  @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.vnfrest.CreateVolumeGroupRequest"; 
+    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(CreateVolumeGroupRequestESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.adapters.vnfrest.VfRequestCommon",
+      "org.codehaus.jackson.annotate.JacksonAnnotation",
+      "org.openecomp.mso.adapters.vnfrest.VfResponseCommon",
+      "org.openecomp.mso.adapters.vnfrest.CreateVolumeGroupRequest",
+      "org.openecomp.mso.entity.MsoRequest",
+      "org.jboss.resteasy.annotations.providers.NoJackson",
+      "org.codehaus.jackson.map.annotate.JsonRootName"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(CreateVolumeGroupRequestESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "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/vnfrest/CreateVolumeGroupResponseESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/CreateVolumeGroupResponseESTest.java
new file mode 100644
index 0000000000..141d7f8504
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/CreateVolumeGroupResponseESTest.java
@@ -0,0 +1,141 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:22:14 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+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 CreateVolumeGroupResponseESTest extends CreateVolumeGroupResponseESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test00()  throws Throwable  {
+      CreateVolumeGroupResponse createVolumeGroupResponse0 = new CreateVolumeGroupResponse();
+      createVolumeGroupResponse0.setVolumeGroupStackId("#soQ+\"O.VGnL");
+      String string0 = createVolumeGroupResponse0.getVolumeGroupStackId();
+      assertEquals("#soQ+\"O.VGnL", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test01()  throws Throwable  {
+      CreateVolumeGroupResponse createVolumeGroupResponse0 = new CreateVolumeGroupResponse();
+      createVolumeGroupResponse0.setVolumeGroupOutputs((Map<String, String>) null);
+      Map<String, String> map0 = createVolumeGroupResponse0.getVolumeGroupOutputs();
+      assertNull(map0);
+  }
+
+  @Test(timeout = 4000)
+  public void test02()  throws Throwable  {
+      CreateVolumeGroupResponse createVolumeGroupResponse0 = new CreateVolumeGroupResponse();
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      hashMap0.put(",MyEf", ",MyEf");
+      createVolumeGroupResponse0.setVolumeGroupOutputs(hashMap0);
+      Map<String, String> map0 = createVolumeGroupResponse0.getVolumeGroupOutputs();
+      assertFalse(map0.isEmpty());
+  }
+
+  @Test(timeout = 4000)
+  public void test03()  throws Throwable  {
+      CreateVolumeGroupResponse createVolumeGroupResponse0 = new CreateVolumeGroupResponse();
+      createVolumeGroupResponse0.setVolumeGroupId(".X(v-Tvwzh&");
+      String string0 = createVolumeGroupResponse0.getVolumeGroupId();
+      assertEquals(".X(v-Tvwzh&", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test04()  throws Throwable  {
+      CreateVolumeGroupResponse createVolumeGroupResponse0 = new CreateVolumeGroupResponse();
+      createVolumeGroupResponse0.setVolumeGroupId("");
+      String string0 = createVolumeGroupResponse0.getVolumeGroupId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test05()  throws Throwable  {
+      CreateVolumeGroupResponse createVolumeGroupResponse0 = new CreateVolumeGroupResponse();
+      Boolean boolean0 = Boolean.valueOf(true);
+      createVolumeGroupResponse0.setVolumeGroupCreated(boolean0);
+      Boolean boolean1 = createVolumeGroupResponse0.getVolumeGroupCreated();
+      assertTrue(boolean1);
+  }
+
+  @Test(timeout = 4000)
+  public void test06()  throws Throwable  {
+      CreateVolumeGroupResponse createVolumeGroupResponse0 = new CreateVolumeGroupResponse();
+      Boolean boolean0 = new Boolean("^MG80I,4g3M>=01Xp");
+      createVolumeGroupResponse0.setVolumeGroupCreated(boolean0);
+      Boolean boolean1 = createVolumeGroupResponse0.getVolumeGroupCreated();
+      assertFalse(boolean1);
+  }
+
+  @Test(timeout = 4000)
+  public void test07()  throws Throwable  {
+      CreateVolumeGroupResponse createVolumeGroupResponse0 = new CreateVolumeGroupResponse();
+      createVolumeGroupResponse0.setVolumeGroupStackId("");
+      String string0 = createVolumeGroupResponse0.getVolumeGroupStackId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test08()  throws Throwable  {
+      CreateVolumeGroupResponse createVolumeGroupResponse0 = new CreateVolumeGroupResponse();
+      VolumeGroupRollback volumeGroupRollback0 = createVolumeGroupResponse0.getVolumeGroupRollback();
+      volumeGroupRollback0.setVolumeGroupCreated(true);
+      VolumeGroupRollback volumeGroupRollback1 = createVolumeGroupResponse0.getVolumeGroupRollback();
+      assertSame(volumeGroupRollback1, volumeGroupRollback0);
+  }
+
+  @Test(timeout = 4000)
+  public void test09()  throws Throwable  {
+      CreateVolumeGroupResponse createVolumeGroupResponse0 = new CreateVolumeGroupResponse();
+      createVolumeGroupResponse0.setVolumeGroupRollback((VolumeGroupRollback) null);
+      VolumeGroupRollback volumeGroupRollback0 = createVolumeGroupResponse0.getVolumeGroupRollback();
+      assertNull(volumeGroupRollback0);
+  }
+
+  @Test(timeout = 4000)
+  public void test10()  throws Throwable  {
+      CreateVolumeGroupResponse createVolumeGroupResponse0 = new CreateVolumeGroupResponse();
+      Boolean boolean0 = createVolumeGroupResponse0.getVolumeGroupCreated();
+      assertNull(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test11()  throws Throwable  {
+      CreateVolumeGroupResponse createVolumeGroupResponse0 = new CreateVolumeGroupResponse();
+      String string0 = createVolumeGroupResponse0.getVolumeGroupStackId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test12()  throws Throwable  {
+      CreateVolumeGroupResponse createVolumeGroupResponse0 = new CreateVolumeGroupResponse();
+      String string0 = createVolumeGroupResponse0.getVolumeGroupId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test13()  throws Throwable  {
+      CreateVolumeGroupResponse createVolumeGroupResponse0 = new CreateVolumeGroupResponse();
+      Map<String, String> map0 = createVolumeGroupResponse0.getVolumeGroupOutputs();
+      createVolumeGroupResponse0.setVolumeGroupOutputs(map0);
+      assertNull(createVolumeGroupResponse0.getVolumeGroupId());
+  }
+
+  @Test(timeout = 4000)
+  public void test14()  throws Throwable  {
+      CreateVolumeGroupResponse createVolumeGroupResponse0 = new CreateVolumeGroupResponse();
+      Map<String, String> map0 = createVolumeGroupResponse0.getVolumeGroupOutputs();
+      CreateVolumeGroupResponse createVolumeGroupResponse1 = new CreateVolumeGroupResponse("", "", (Boolean) null, map0, (VolumeGroupRollback) null, "");
+      assertEquals("", createVolumeGroupResponse1.getVolumeGroupStackId());
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/CreateVolumeGroupResponseESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/CreateVolumeGroupResponseESTestscaffolding.java
new file mode 100644
index 0000000000..990517d29a
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/CreateVolumeGroupResponseESTestscaffolding.java
@@ -0,0 +1,100 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:22:14 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+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 CreateVolumeGroupResponseESTestscaffolding {
+
+  @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.vnfrest.CreateVolumeGroupResponse"; 
+    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(CreateVolumeGroupResponseESTestscaffolding.class.getClassLoader() ,
+      "org.codehaus.jackson.annotate.JacksonAnnotation",
+      "org.openecomp.mso.adapters.vnfrest.VfResponseCommon",
+      "org.openecomp.mso.adapters.vnfrest.VolumeGroupRollback",
+      "org.openecomp.mso.entity.MsoRequest",
+      "org.jboss.resteasy.annotations.providers.NoJackson",
+      "org.openecomp.mso.adapters.vnfrest.CreateVolumeGroupResponse",
+      "org.codehaus.jackson.map.annotate.JsonRootName"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(CreateVolumeGroupResponseESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "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/vnfrest/DeleteVfModuleRequestESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/DeleteVfModuleRequestESTest.java
new file mode 100644
index 0000000000..8c2d6b7594
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/DeleteVfModuleRequestESTest.java
@@ -0,0 +1,149 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:28:35 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import org.openecomp.mso.entity.MsoRequest;
+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 DeleteVfModuleRequestESTest extends DeleteVfModuleRequestESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test00()  throws Throwable  {
+      DeleteVfModuleRequest deleteVfModuleRequest0 = new DeleteVfModuleRequest();
+      deleteVfModuleRequest0.setVnfId("5=?YJsH");
+      String string0 = deleteVfModuleRequest0.getVnfId();
+      assertEquals("5=?YJsH", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test01()  throws Throwable  {
+      DeleteVfModuleRequest deleteVfModuleRequest0 = new DeleteVfModuleRequest();
+      deleteVfModuleRequest0.setVfModuleStackId("}VSDk5?");
+      String string0 = deleteVfModuleRequest0.getVfModuleStackId();
+      assertEquals("}VSDk5?", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test02()  throws Throwable  {
+      DeleteVfModuleRequest deleteVfModuleRequest0 = new DeleteVfModuleRequest();
+      deleteVfModuleRequest0.setVfModuleId("Si8s(O0S8");
+      String string0 = deleteVfModuleRequest0.getVfModuleId();
+      assertEquals("Si8s(O0S8", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test03()  throws Throwable  {
+      DeleteVfModuleRequest deleteVfModuleRequest0 = new DeleteVfModuleRequest();
+      deleteVfModuleRequest0.setTenantId("");
+      String string0 = deleteVfModuleRequest0.getTenantId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test04()  throws Throwable  {
+      DeleteVfModuleRequest deleteVfModuleRequest0 = new DeleteVfModuleRequest();
+      deleteVfModuleRequest0.setMsoRequest((MsoRequest) null);
+      MsoRequest msoRequest0 = deleteVfModuleRequest0.getMsoRequest();
+      assertNull(msoRequest0);
+  }
+
+  @Test(timeout = 4000)
+  public void test05()  throws Throwable  {
+      DeleteVfModuleRequest deleteVfModuleRequest0 = new DeleteVfModuleRequest();
+      deleteVfModuleRequest0.setCloudSiteId("");
+      String string0 = deleteVfModuleRequest0.getCloudSiteId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test06()  throws Throwable  {
+      DeleteVfModuleRequest deleteVfModuleRequest0 = new DeleteVfModuleRequest();
+      String string0 = deleteVfModuleRequest0.getVfModuleId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test07()  throws Throwable  {
+      DeleteVfModuleRequest deleteVfModuleRequest0 = new DeleteVfModuleRequest();
+      String string0 = deleteVfModuleRequest0.getCloudSiteId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test08()  throws Throwable  {
+      DeleteVfModuleRequest deleteVfModuleRequest0 = new DeleteVfModuleRequest();
+      deleteVfModuleRequest0.setTenantId("[!?QZiHc2[");
+      String string0 = deleteVfModuleRequest0.getTenantId();
+      assertEquals("[!?QZiHc2[", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test09()  throws Throwable  {
+      DeleteVfModuleRequest deleteVfModuleRequest0 = new DeleteVfModuleRequest();
+      deleteVfModuleRequest0.setVnfId("");
+      String string0 = deleteVfModuleRequest0.getVnfId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test10()  throws Throwable  {
+      DeleteVfModuleRequest deleteVfModuleRequest0 = new DeleteVfModuleRequest();
+      deleteVfModuleRequest0.setCloudSiteId("jaxb.formatted.output");
+      String string0 = deleteVfModuleRequest0.getCloudSiteId();
+      assertEquals("jaxb.formatted.output", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test11()  throws Throwable  {
+      DeleteVfModuleRequest deleteVfModuleRequest0 = new DeleteVfModuleRequest();
+      String string0 = deleteVfModuleRequest0.getTenantId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test12()  throws Throwable  {
+      DeleteVfModuleRequest deleteVfModuleRequest0 = new DeleteVfModuleRequest();
+      String string0 = deleteVfModuleRequest0.getVnfId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test13()  throws Throwable  {
+      DeleteVfModuleRequest deleteVfModuleRequest0 = new DeleteVfModuleRequest();
+      deleteVfModuleRequest0.setVfModuleId("");
+      String string0 = deleteVfModuleRequest0.getVfModuleId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test14()  throws Throwable  {
+      DeleteVfModuleRequest deleteVfModuleRequest0 = new DeleteVfModuleRequest();
+      deleteVfModuleRequest0.setVfModuleStackId("");
+      String string0 = deleteVfModuleRequest0.getVfModuleStackId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test15()  throws Throwable  {
+      DeleteVfModuleRequest deleteVfModuleRequest0 = new DeleteVfModuleRequest();
+      MsoRequest msoRequest0 = deleteVfModuleRequest0.getMsoRequest();
+      deleteVfModuleRequest0.setMsoRequest(msoRequest0);
+      assertNull(deleteVfModuleRequest0.getVnfId());
+  }
+
+  @Test(timeout = 4000)
+  public void test16()  throws Throwable  {
+      DeleteVfModuleRequest deleteVfModuleRequest0 = new DeleteVfModuleRequest();
+      String string0 = deleteVfModuleRequest0.getVfModuleStackId();
+      assertNull(string0);
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/DeleteVfModuleRequestESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/DeleteVfModuleRequestESTestscaffolding.java
new file mode 100644
index 0000000000..3090fbc4d1
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/DeleteVfModuleRequestESTestscaffolding.java
@@ -0,0 +1,100 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:28:35 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+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 DeleteVfModuleRequestESTestscaffolding {
+
+  @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.vnfrest.DeleteVfModuleRequest"; 
+    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(DeleteVfModuleRequestESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.adapters.vnfrest.VfRequestCommon",
+      "org.codehaus.jackson.annotate.JacksonAnnotation",
+      "org.openecomp.mso.adapters.vnfrest.VfResponseCommon",
+      "org.openecomp.mso.entity.MsoRequest",
+      "org.openecomp.mso.adapters.vnfrest.DeleteVfModuleRequest",
+      "org.jboss.resteasy.annotations.providers.NoJackson",
+      "org.codehaus.jackson.map.annotate.JsonRootName"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(DeleteVfModuleRequestESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "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/vnfrest/DeleteVfModuleResponseESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/DeleteVfModuleResponseESTest.java
new file mode 100644
index 0000000000..e141f4b4e1
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/DeleteVfModuleResponseESTest.java
@@ -0,0 +1,112 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:11:34 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+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 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());
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/DeleteVfModuleResponseESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/DeleteVfModuleResponseESTestscaffolding.java
new file mode 100644
index 0000000000..c1b3717fbc
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/DeleteVfModuleResponseESTestscaffolding.java
@@ -0,0 +1,98 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:11:34 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+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 DeleteVfModuleResponseESTestscaffolding {
+
+  @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.vnfrest.DeleteVfModuleResponse"; 
+    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(DeleteVfModuleResponseESTestscaffolding.class.getClassLoader() ,
+      "org.codehaus.jackson.annotate.JacksonAnnotation",
+      "org.openecomp.mso.adapters.vnfrest.VfResponseCommon",
+      "org.openecomp.mso.adapters.vnfrest.DeleteVfModuleResponse",
+      "org.jboss.resteasy.annotations.providers.NoJackson",
+      "org.codehaus.jackson.map.annotate.JsonRootName"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(DeleteVfModuleResponseESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "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/vnfrest/DeleteVolumeGroupRequestESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/DeleteVolumeGroupRequestESTest.java
new file mode 100644
index 0000000000..e9d6d0e041
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/DeleteVolumeGroupRequestESTest.java
@@ -0,0 +1,126 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:17:10 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import org.openecomp.mso.entity.MsoRequest;
+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 DeleteVolumeGroupRequestESTest extends DeleteVolumeGroupRequestESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test00()  throws Throwable  {
+      DeleteVolumeGroupRequest deleteVolumeGroupRequest0 = new DeleteVolumeGroupRequest();
+      deleteVolumeGroupRequest0.setVolumeGroupStackId("");
+      String string0 = deleteVolumeGroupRequest0.getVolumeGroupStackId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test01()  throws Throwable  {
+      DeleteVolumeGroupRequest deleteVolumeGroupRequest0 = new DeleteVolumeGroupRequest();
+      deleteVolumeGroupRequest0.setVolumeGroupId("");
+      String string0 = deleteVolumeGroupRequest0.getVolumeGroupId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test02()  throws Throwable  {
+      DeleteVolumeGroupRequest deleteVolumeGroupRequest0 = new DeleteVolumeGroupRequest();
+      deleteVolumeGroupRequest0.setTenantId("yv3_q/ h?N");
+      String string0 = deleteVolumeGroupRequest0.getTenantId();
+      assertEquals("yv3_q/ h?N", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test03()  throws Throwable  {
+      DeleteVolumeGroupRequest deleteVolumeGroupRequest0 = new DeleteVolumeGroupRequest();
+      deleteVolumeGroupRequest0.setMsoRequest((MsoRequest) null);
+      MsoRequest msoRequest0 = deleteVolumeGroupRequest0.getMsoRequest();
+      assertNull(msoRequest0);
+  }
+
+  @Test(timeout = 4000)
+  public void test04()  throws Throwable  {
+      DeleteVolumeGroupRequest deleteVolumeGroupRequest0 = new DeleteVolumeGroupRequest();
+      deleteVolumeGroupRequest0.setCloudSiteId("u'!&M 10_");
+      String string0 = deleteVolumeGroupRequest0.getCloudSiteId();
+      assertEquals("u'!&M 10_", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test05()  throws Throwable  {
+      DeleteVolumeGroupRequest deleteVolumeGroupRequest0 = new DeleteVolumeGroupRequest();
+      String string0 = deleteVolumeGroupRequest0.getVolumeGroupId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test06()  throws Throwable  {
+      DeleteVolumeGroupRequest deleteVolumeGroupRequest0 = new DeleteVolumeGroupRequest();
+      deleteVolumeGroupRequest0.setVolumeGroupId(")wf3_");
+      String string0 = deleteVolumeGroupRequest0.getVolumeGroupId();
+      assertEquals(")wf3_", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test07()  throws Throwable  {
+      DeleteVolumeGroupRequest deleteVolumeGroupRequest0 = new DeleteVolumeGroupRequest();
+      deleteVolumeGroupRequest0.setVolumeGroupStackId("jaxb.formatted.output");
+      String string0 = deleteVolumeGroupRequest0.getVolumeGroupStackId();
+      assertEquals("jaxb.formatted.output", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test08()  throws Throwable  {
+      DeleteVolumeGroupRequest deleteVolumeGroupRequest0 = new DeleteVolumeGroupRequest();
+      deleteVolumeGroupRequest0.setTenantId("");
+      String string0 = deleteVolumeGroupRequest0.getTenantId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test09()  throws Throwable  {
+      DeleteVolumeGroupRequest deleteVolumeGroupRequest0 = new DeleteVolumeGroupRequest();
+      MsoRequest msoRequest0 = deleteVolumeGroupRequest0.getMsoRequest();
+      deleteVolumeGroupRequest0.setMsoRequest(msoRequest0);
+      assertNull(msoRequest0.getRequestId());
+  }
+
+  @Test(timeout = 4000)
+  public void test10()  throws Throwable  {
+      DeleteVolumeGroupRequest deleteVolumeGroupRequest0 = new DeleteVolumeGroupRequest();
+      deleteVolumeGroupRequest0.setCloudSiteId("");
+      String string0 = deleteVolumeGroupRequest0.getCloudSiteId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test11()  throws Throwable  {
+      DeleteVolumeGroupRequest deleteVolumeGroupRequest0 = new DeleteVolumeGroupRequest();
+      String string0 = deleteVolumeGroupRequest0.getVolumeGroupStackId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test12()  throws Throwable  {
+      DeleteVolumeGroupRequest deleteVolumeGroupRequest0 = new DeleteVolumeGroupRequest();
+      String string0 = deleteVolumeGroupRequest0.getCloudSiteId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test13()  throws Throwable  {
+      DeleteVolumeGroupRequest deleteVolumeGroupRequest0 = new DeleteVolumeGroupRequest();
+      String string0 = deleteVolumeGroupRequest0.getTenantId();
+      assertNull(string0);
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/DeleteVolumeGroupRequestESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/DeleteVolumeGroupRequestESTestscaffolding.java
new file mode 100644
index 0000000000..844120296b
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/DeleteVolumeGroupRequestESTestscaffolding.java
@@ -0,0 +1,100 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:17:10 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+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 DeleteVolumeGroupRequestESTestscaffolding {
+
+  @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.vnfrest.DeleteVolumeGroupRequest"; 
+    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(DeleteVolumeGroupRequestESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.adapters.vnfrest.VfRequestCommon",
+      "org.codehaus.jackson.annotate.JacksonAnnotation",
+      "org.openecomp.mso.adapters.vnfrest.VfResponseCommon",
+      "org.openecomp.mso.entity.MsoRequest",
+      "org.openecomp.mso.adapters.vnfrest.DeleteVolumeGroupRequest",
+      "org.jboss.resteasy.annotations.providers.NoJackson",
+      "org.codehaus.jackson.map.annotate.JsonRootName"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(DeleteVolumeGroupRequestESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "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/vnfrest/DeleteVolumeGroupResponseESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/DeleteVolumeGroupResponseESTest.java
new file mode 100644
index 0000000000..2947693f9c
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/DeleteVolumeGroupResponseESTest.java
@@ -0,0 +1,42 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:18:54 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+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 DeleteVolumeGroupResponseESTest extends DeleteVolumeGroupResponseESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test0()  throws Throwable  {
+      Boolean boolean0 = new Boolean(true);
+      DeleteVolumeGroupResponse deleteVolumeGroupResponse0 = new DeleteVolumeGroupResponse(boolean0, (String) null);
+      Boolean boolean1 = new Boolean("");
+      deleteVolumeGroupResponse0.setVolumeGroupDeleted(boolean1);
+      Boolean boolean2 = deleteVolumeGroupResponse0.getVolumeGroupDeleted();
+      assertFalse(boolean2.equals((Object)boolean0));
+  }
+
+  @Test(timeout = 4000)
+  public void test1()  throws Throwable  {
+      DeleteVolumeGroupResponse deleteVolumeGroupResponse0 = new DeleteVolumeGroupResponse();
+      Boolean boolean0 = deleteVolumeGroupResponse0.getVolumeGroupDeleted();
+      assertNull(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test2()  throws Throwable  {
+      Boolean boolean0 = new Boolean(true);
+      DeleteVolumeGroupResponse deleteVolumeGroupResponse0 = new DeleteVolumeGroupResponse(boolean0, (String) null);
+      Boolean boolean1 = deleteVolumeGroupResponse0.getVolumeGroupDeleted();
+      assertTrue(boolean1);
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/DeleteVolumeGroupResponseESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/DeleteVolumeGroupResponseESTestscaffolding.java
new file mode 100644
index 0000000000..f0476f61ce
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/DeleteVolumeGroupResponseESTestscaffolding.java
@@ -0,0 +1,98 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:18:54 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+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 DeleteVolumeGroupResponseESTestscaffolding {
+
+  @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.vnfrest.DeleteVolumeGroupResponse"; 
+    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(DeleteVolumeGroupResponseESTestscaffolding.class.getClassLoader() ,
+      "org.codehaus.jackson.annotate.JacksonAnnotation",
+      "org.openecomp.mso.adapters.vnfrest.VfResponseCommon",
+      "org.openecomp.mso.adapters.vnfrest.DeleteVolumeGroupResponse",
+      "org.jboss.resteasy.annotations.providers.NoJackson",
+      "org.codehaus.jackson.map.annotate.JsonRootName"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(DeleteVolumeGroupResponseESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "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/vnfrest/QueryVfModuleResponseESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/QueryVfModuleResponseESTest.java
new file mode 100644
index 0000000000..61e98845b3
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/QueryVfModuleResponseESTest.java
@@ -0,0 +1,170 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:15:19 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+import static org.evosuite.runtime.EvoAssertions.*;
+
+import org.openecomp.mso.openstack.beans.VnfStatus;
+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 QueryVfModuleResponseESTest extends QueryVfModuleResponseESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test00()  throws Throwable  {
+      QueryVfModuleResponse queryVfModuleResponse0 = new QueryVfModuleResponse();
+      queryVfModuleResponse0.setVnfId("K@Avo(l_W.<jd$");
+      String string0 = queryVfModuleResponse0.getVnfId();
+      assertEquals("K@Avo(l_W.<jd$", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test01()  throws Throwable  {
+      VnfStatus vnfStatus0 = VnfStatus.UNKNOWN;
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      QueryVfModuleResponse queryVfModuleResponse0 = new QueryVfModuleResponse("", "", "/iul.p>pa`w<:0tL", vnfStatus0, (Map<String, String>) hashMap0);
+      String string0 = queryVfModuleResponse0.getVnfId();
+      assertEquals("/iul.p>pa`w<:0tL", queryVfModuleResponse0.getVfModuleStackId());
+      assertEquals("", string0);
+      assertEquals("", queryVfModuleResponse0.getVfModuleId());
+  }
+
+  @Test(timeout = 4000)
+  public void test02()  throws Throwable  {
+      VnfStatus vnfStatus0 = VnfStatus.UNKNOWN;
+      QueryVfModuleResponse queryVfModuleResponse0 = new QueryVfModuleResponse("", "", "", vnfStatus0, (Map<String, String>) null);
+      String string0 = queryVfModuleResponse0.getVfModuleStackId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test03()  throws Throwable  {
+      VnfStatus vnfStatus0 = VnfStatus.UNKNOWN;
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      QueryVfModuleResponse queryVfModuleResponse0 = new QueryVfModuleResponse("", "", "/iul.p>pa`w<:0tL", vnfStatus0, (Map<String, String>) hashMap0);
+      queryVfModuleResponse0.getVfModuleOutputs();
+      assertEquals("", queryVfModuleResponse0.getVnfId());
+      assertEquals("/iul.p>pa`w<:0tL", queryVfModuleResponse0.getVfModuleStackId());
+      assertEquals("", queryVfModuleResponse0.getVfModuleId());
+  }
+
+  @Test(timeout = 4000)
+  public void test04()  throws Throwable  {
+      VnfStatus vnfStatus0 = VnfStatus.UNKNOWN;
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      QueryVfModuleResponse queryVfModuleResponse0 = new QueryVfModuleResponse("", "", "q'&!##_pFRAIJ4uo]*=", vnfStatus0, (Map<String, String>) hashMap0);
+      hashMap0.put("q'&!##_pFRAIJ4uo]*=", "");
+      queryVfModuleResponse0.getVfModuleOutputs();
+      assertEquals("", queryVfModuleResponse0.getVfModuleId());
+      assertEquals("q'&!##_pFRAIJ4uo]*=", queryVfModuleResponse0.getVfModuleStackId());
+      assertEquals("", queryVfModuleResponse0.getVnfId());
+  }
+
+  @Test(timeout = 4000)
+  public void test05()  throws Throwable  {
+      VnfStatus vnfStatus0 = VnfStatus.FAILED;
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      QueryVfModuleResponse queryVfModuleResponse0 = new QueryVfModuleResponse("C5aGYYh%|7be0.E!NHp", "C5aGYYh%|7be0.E!NHp", "C5aGYYh%|7be0.E!NHp", vnfStatus0, (Map<String, String>) hashMap0);
+      String string0 = queryVfModuleResponse0.getVfModuleId();
+      assertEquals("C5aGYYh%|7be0.E!NHp", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test06()  throws Throwable  {
+      QueryVfModuleResponse queryVfModuleResponse0 = new QueryVfModuleResponse();
+      VnfStatus vnfStatus0 = VnfStatus.NOTFOUND;
+      queryVfModuleResponse0.setVnfStatus(vnfStatus0);
+      VnfStatus vnfStatus1 = queryVfModuleResponse0.getVnfStatus();
+      assertSame(vnfStatus1, vnfStatus0);
+  }
+
+  @Test(timeout = 4000)
+  public void test07()  throws Throwable  {
+      QueryVfModuleResponse queryVfModuleResponse0 = new QueryVfModuleResponse();
+      String string0 = queryVfModuleResponse0.getVfModuleId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test08()  throws Throwable  {
+      QueryVfModuleResponse queryVfModuleResponse0 = new QueryVfModuleResponse();
+      queryVfModuleResponse0.setVfModuleId("\"Sdeh");
+      assertNull(queryVfModuleResponse0.getVfModuleStackId());
+  }
+
+  @Test(timeout = 4000)
+  public void test09()  throws Throwable  {
+      QueryVfModuleResponse queryVfModuleResponse0 = new QueryVfModuleResponse();
+      String string0 = queryVfModuleResponse0.getVnfId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test10()  throws Throwable  {
+      QueryVfModuleResponse queryVfModuleResponse0 = new QueryVfModuleResponse();
+      Map<String, String> map0 = queryVfModuleResponse0.getVfModuleOutputs();
+      assertNull(map0);
+  }
+
+  @Test(timeout = 4000)
+  public void test11()  throws Throwable  {
+      QueryVfModuleResponse queryVfModuleResponse0 = new QueryVfModuleResponse();
+      queryVfModuleResponse0.setVfModuleStackId("\"Sdeh");
+      String string0 = queryVfModuleResponse0.getVfModuleStackId();
+      assertEquals("\"Sdeh", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test12()  throws Throwable  {
+      QueryVfModuleResponse queryVfModuleResponse0 = new QueryVfModuleResponse();
+      // Undeclared exception!
+      try { 
+        queryVfModuleResponse0.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 test13()  throws Throwable  {
+      QueryVfModuleResponse queryVfModuleResponse0 = new QueryVfModuleResponse();
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      queryVfModuleResponse0.setVfModuleOutputs(hashMap0);
+      assertNull(queryVfModuleResponse0.getVfModuleId());
+  }
+
+  @Test(timeout = 4000)
+  public void test14()  throws Throwable  {
+      QueryVfModuleResponse queryVfModuleResponse0 = new QueryVfModuleResponse();
+      String string0 = queryVfModuleResponse0.getVfModuleStackId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test15()  throws Throwable  {
+      VnfStatus vnfStatus0 = VnfStatus.ACTIVE;
+      QueryVfModuleResponse queryVfModuleResponse0 = new QueryVfModuleResponse((String) null, "", "", vnfStatus0, (Map<String, String>) null);
+      String string0 = queryVfModuleResponse0.getVfModuleId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test16()  throws Throwable  {
+      QueryVfModuleResponse queryVfModuleResponse0 = new QueryVfModuleResponse();
+      queryVfModuleResponse0.getVnfStatus();
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/QueryVfModuleResponseESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/QueryVfModuleResponseESTestscaffolding.java
new file mode 100644
index 0000000000..fcad1ead16
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/QueryVfModuleResponseESTestscaffolding.java
@@ -0,0 +1,194 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:15:19 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+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 QueryVfModuleResponseESTestscaffolding {
+
+  @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.vnfrest.QueryVfModuleResponse"; 
+    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(QueryVfModuleResponseESTestscaffolding.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.openecomp.mso.adapters.vnfrest.QueryVfModuleResponse",
+      "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",
+      "org.codehaus.jackson.node.BaseJsonNode",
+      "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",
+      "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.map.ClassIntrospector",
+      "org.codehaus.jackson.map.AnnotationIntrospector$Pair",
+      "org.codehaus.jackson.Versioned",
+      "org.codehaus.jackson.map.type.TypeBase",
+      "org.codehaus.jackson.map.ser.BasicSerializerFactory",
+      "org.codehaus.jackson.node.ContainerNode",
+      "org.codehaus.jackson.map.introspect.NopAnnotationIntrospector",
+      "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.codehaus.jackson.node.ObjectNode",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$MinimalMethodFilter",
+      "org.codehaus.jackson.map.type.CollectionLikeType",
+      "org.codehaus.jackson.sym.CharsToNameCanonicalizer$Bucket",
+      "org.codehaus.jackson.impl.JsonParserMinimalBase",
+      "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",
+      "org.openecomp.mso.openstack.beans.VnfStatus",
+      "org.codehaus.jackson.ObjectCodec",
+      "org.codehaus.jackson.map.introspect.AnnotatedMethod",
+      "org.codehaus.jackson.JsonFactory",
+      "org.codehaus.jackson.node.ArrayNode",
+      "org.codehaus.jackson.io.SegmentedStringWriter",
+      "org.codehaus.jackson.map.jsontype.TypeResolverBuilder",
+      "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.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",
+      "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",
+      "org.codehaus.jackson.map.MapperConfig",
+      "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.codehaus.jackson.map.ClassIntrospector$MixInResolver"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(QueryVfModuleResponseESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "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/vnfrest/RollbackVfModuleRequestESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/RollbackVfModuleRequestESTest.java
new file mode 100644
index 0000000000..326205981a
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/RollbackVfModuleRequestESTest.java
@@ -0,0 +1,48 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:14:23 GMT 2016
+ */
+
+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;
+
+@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 test2()  throws Throwable  {
+      RollbackVfModuleRequest rollbackVfModuleRequest0 = new RollbackVfModuleRequest();
+      VfModuleRollback vfModuleRollback0 = rollbackVfModuleRequest0.getVfModuleRollback();
+      assertNull(vfModuleRollback0);
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/RollbackVfModuleRequestESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/RollbackVfModuleRequestESTestscaffolding.java
new file mode 100644
index 0000000000..aae081ec17
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/RollbackVfModuleRequestESTestscaffolding.java
@@ -0,0 +1,102 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:14:23 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+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 RollbackVfModuleRequestESTestscaffolding {
+
+  @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.vnfrest.RollbackVfModuleRequest"; 
+    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(RollbackVfModuleRequestESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.adapters.vnfrest.VfRequestCommon",
+      "org.codehaus.jackson.annotate.JacksonAnnotation",
+      "org.openecomp.mso.adapters.vnfrest.VfResponseCommon",
+      "org.openecomp.mso.entity.MsoRequest",
+      "org.openecomp.mso.openstack.beans.VnfRollback",
+      "org.openecomp.mso.adapters.vnfrest.VfModuleRollback",
+      "org.jboss.resteasy.annotations.providers.NoJackson",
+      "org.openecomp.mso.adapters.vnfrest.RollbackVfModuleRequest",
+      "org.codehaus.jackson.map.annotate.JsonRootName"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(RollbackVfModuleRequestESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "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/vnfrest/RollbackVfModuleResponseESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/RollbackVfModuleResponseESTest.java
new file mode 100644
index 0000000000..f0e6c09f43
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/RollbackVfModuleResponseESTest.java
@@ -0,0 +1,48 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:20:06 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+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 RollbackVfModuleResponseESTest extends RollbackVfModuleResponseESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test0()  throws Throwable  {
+      Boolean boolean0 = new Boolean(true);
+      RollbackVfModuleResponse rollbackVfModuleResponse0 = new RollbackVfModuleResponse(boolean0, "W$Bqj~ \u0000}YvH");
+      Boolean boolean1 = rollbackVfModuleResponse0.getVfModuleRolledback();
+      assertTrue(boolean1);
+  }
+
+  @Test(timeout = 4000)
+  public void test1()  throws Throwable  {
+      Boolean boolean0 = new Boolean("nR:)\"X2$B@=Yf<Y~Z");
+      RollbackVfModuleResponse rollbackVfModuleResponse0 = new RollbackVfModuleResponse(boolean0, "");
+      Boolean boolean1 = rollbackVfModuleResponse0.getVfModuleRolledback();
+      assertFalse(boolean1);
+  }
+
+  @Test(timeout = 4000)
+  public void test2()  throws Throwable  {
+      Boolean boolean0 = new Boolean("nR:)\"X2$B@=Yf<Y~Z");
+      RollbackVfModuleResponse rollbackVfModuleResponse0 = new RollbackVfModuleResponse(boolean0, "");
+      rollbackVfModuleResponse0.setVfModuleRolledback(boolean0);
+      assertEquals("", rollbackVfModuleResponse0.getMessageId());
+  }
+
+  @Test(timeout = 4000)
+  public void test3()  throws Throwable  {
+      RollbackVfModuleResponse rollbackVfModuleResponse0 = new RollbackVfModuleResponse();
+      Boolean boolean0 = rollbackVfModuleResponse0.getVfModuleRolledback();
+      assertNull(boolean0);
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/RollbackVfModuleResponseESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/RollbackVfModuleResponseESTestscaffolding.java
new file mode 100644
index 0000000000..e2202d86b0
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/RollbackVfModuleResponseESTestscaffolding.java
@@ -0,0 +1,98 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:20:06 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+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 RollbackVfModuleResponseESTestscaffolding {
+
+  @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.vnfrest.RollbackVfModuleResponse"; 
+    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(RollbackVfModuleResponseESTestscaffolding.class.getClassLoader() ,
+      "org.codehaus.jackson.annotate.JacksonAnnotation",
+      "org.openecomp.mso.adapters.vnfrest.VfResponseCommon",
+      "org.openecomp.mso.adapters.vnfrest.RollbackVfModuleResponse",
+      "org.jboss.resteasy.annotations.providers.NoJackson",
+      "org.codehaus.jackson.map.annotate.JsonRootName"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(RollbackVfModuleResponseESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "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/vnfrest/RollbackVolumeGroupRequestESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/RollbackVolumeGroupRequestESTest.java
new file mode 100644
index 0000000000..89ff8debce
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/RollbackVolumeGroupRequestESTest.java
@@ -0,0 +1,31 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:23:56 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+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 RollbackVolumeGroupRequestESTest extends RollbackVolumeGroupRequestESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test0()  throws Throwable  {
+      RollbackVolumeGroupRequest rollbackVolumeGroupRequest0 = new RollbackVolumeGroupRequest();
+      rollbackVolumeGroupRequest0.setVolumeGroupRollback((VolumeGroupRollback) null);
+      assertNull(rollbackVolumeGroupRequest0.getMessageId());
+  }
+
+  @Test(timeout = 4000)
+  public void test1()  throws Throwable  {
+      RollbackVolumeGroupRequest rollbackVolumeGroupRequest0 = new RollbackVolumeGroupRequest();
+      VolumeGroupRollback volumeGroupRollback0 = rollbackVolumeGroupRequest0.getVolumeGroupRollback();
+      assertNull(volumeGroupRollback0);
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/RollbackVolumeGroupRequestESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/RollbackVolumeGroupRequestESTestscaffolding.java
new file mode 100644
index 0000000000..7b4fcaad4d
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/RollbackVolumeGroupRequestESTestscaffolding.java
@@ -0,0 +1,101 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:23:56 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+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 RollbackVolumeGroupRequestESTestscaffolding {
+
+  @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.vnfrest.RollbackVolumeGroupRequest"; 
+    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(RollbackVolumeGroupRequestESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.adapters.vnfrest.VfRequestCommon",
+      "org.codehaus.jackson.annotate.JacksonAnnotation",
+      "org.openecomp.mso.adapters.vnfrest.VfResponseCommon",
+      "org.openecomp.mso.adapters.vnfrest.VolumeGroupRollback",
+      "org.openecomp.mso.entity.MsoRequest",
+      "org.jboss.resteasy.annotations.providers.NoJackson",
+      "org.codehaus.jackson.map.annotate.JsonRootName",
+      "org.openecomp.mso.adapters.vnfrest.RollbackVolumeGroupRequest"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(RollbackVolumeGroupRequestESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "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/vnfrest/RollbackVolumeGroupResponseESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/RollbackVolumeGroupResponseESTest.java
new file mode 100644
index 0000000000..c6804b22aa
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/RollbackVolumeGroupResponseESTest.java
@@ -0,0 +1,47 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:15:06 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+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 RollbackVolumeGroupResponseESTest extends RollbackVolumeGroupResponseESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test0()  throws Throwable  {
+      Boolean boolean0 = new Boolean(true);
+      RollbackVolumeGroupResponse rollbackVolumeGroupResponse0 = new RollbackVolumeGroupResponse(boolean0, "");
+      Boolean boolean1 = rollbackVolumeGroupResponse0.getVolumeGroupRolledBack();
+      assertTrue(boolean1);
+  }
+
+  @Test(timeout = 4000)
+  public void test1()  throws Throwable  {
+      Boolean boolean0 = Boolean.FALSE;
+      RollbackVolumeGroupResponse rollbackVolumeGroupResponse0 = new RollbackVolumeGroupResponse(boolean0, "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<rollbackVolumeGroupResponse>\n    <messageId></messageId>\n    <volumeGroupRolledBack>true</volumeGroupRolledBack>\n</rollbackVolumeGroupResponse>\n");
+      Boolean boolean1 = rollbackVolumeGroupResponse0.getVolumeGroupRolledBack();
+      assertFalse(boolean1);
+  }
+
+  @Test(timeout = 4000)
+  public void test2()  throws Throwable  {
+      RollbackVolumeGroupResponse rollbackVolumeGroupResponse0 = new RollbackVolumeGroupResponse();
+      rollbackVolumeGroupResponse0.setVolumeGroupRolledBack((Boolean) null);
+      assertNull(rollbackVolumeGroupResponse0.getMessageId());
+  }
+
+  @Test(timeout = 4000)
+  public void test3()  throws Throwable  {
+      RollbackVolumeGroupResponse rollbackVolumeGroupResponse0 = new RollbackVolumeGroupResponse();
+      Boolean boolean0 = rollbackVolumeGroupResponse0.getVolumeGroupRolledBack();
+      assertNull(boolean0);
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/RollbackVolumeGroupResponseESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/RollbackVolumeGroupResponseESTestscaffolding.java
new file mode 100644
index 0000000000..d2acc793eb
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/RollbackVolumeGroupResponseESTestscaffolding.java
@@ -0,0 +1,98 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:15:06 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+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 RollbackVolumeGroupResponseESTestscaffolding {
+
+  @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.vnfrest.RollbackVolumeGroupResponse"; 
+    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(RollbackVolumeGroupResponseESTestscaffolding.class.getClassLoader() ,
+      "org.codehaus.jackson.annotate.JacksonAnnotation",
+      "org.openecomp.mso.adapters.vnfrest.VfResponseCommon",
+      "org.openecomp.mso.adapters.vnfrest.RollbackVolumeGroupResponse",
+      "org.jboss.resteasy.annotations.providers.NoJackson",
+      "org.codehaus.jackson.map.annotate.JsonRootName"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(RollbackVolumeGroupResponseESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "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/vnfrest/UpdateVfModuleRequestESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/UpdateVfModuleRequestESTest.java
new file mode 100644
index 0000000000..0702294be8
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/UpdateVfModuleRequestESTest.java
@@ -0,0 +1,746 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:24:18 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+import static org.evosuite.runtime.EvoAssertions.*;
+
+import org.openecomp.mso.entity.MsoRequest;
+import java.util.HashMap;
+import java.util.Map;
+import org.evosuite.runtime.EvoRunner;
+import org.evosuite.runtime.EvoRunnerParameters;
+import org.evosuite.runtime.System;
+import org.junit.runner.RunWith;
+
+@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
+public class UpdateVfModuleRequestESTest extends UpdateVfModuleRequestESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test00()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.toXmlString();
+      updateVfModuleRequest0.setVfModuleId("xM");
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      updateVfModuleRequest0.setVnfType("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<updateVfModuleRequest>\n    <msoRequest/>\n    <vfModuleParams/>\n</updateVfModuleRequest>\n");
+      hashMap0.entrySet();
+      updateVfModuleRequest0.setVfModuleParams(hashMap0);
+      updateVfModuleRequest0.getVnfType();
+      updateVfModuleRequest0.setVfModuleId("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<updateVfModuleRequest>\n    <msoRequest/>\n    <vfModuleParams/>\n</updateVfModuleRequest>\n");
+      updateVfModuleRequest0.setVolumeGroupStackId("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<updateVfModuleRequest>\n    <msoRequest/>\n    <vfModuleParams/>\n</updateVfModuleRequest>\n");
+      updateVfModuleRequest0.setCloudSiteId("$i@h");
+      updateVfModuleRequest0.setVfModuleParams(hashMap0);
+      updateVfModuleRequest0.setTenantId("$i@h");
+      MsoRequest msoRequest0 = new MsoRequest();
+      msoRequest0.setServiceInstanceId("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<updateVfModuleRequest>\n    <msoRequest/>\n    <vfModuleParams/>\n</updateVfModuleRequest>\n");
+      updateVfModuleRequest0.setMsoRequest(msoRequest0);
+      Boolean boolean0 = new Boolean("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<updateVfModuleRequest>\n    <msoRequest/>\n    <vfModuleParams/>\n</updateVfModuleRequest>\n");
+      updateVfModuleRequest0.setFailIfExists(boolean0);
+      updateVfModuleRequest0.getVfModuleStackId();
+      updateVfModuleRequest0.getRequestType();
+      updateVfModuleRequest0.setBaseVfModuleId("$i@h");
+      updateVfModuleRequest0.setVfModuleId((String) null);
+      updateVfModuleRequest0.getVolumeGroupStackId();
+      String string0 = updateVfModuleRequest0.getTenantId();
+      assertEquals("$i@h", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test01()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.setVnfType(">LosD~A.W]T\"Ht");
+      updateVfModuleRequest0.setVfModuleStackId("");
+      updateVfModuleRequest0.setVnfType(">LosD~A.W]T\"Ht");
+      updateVfModuleRequest0.setBaseVfModuleStackId("rG\"Rcq79:TWr}bI");
+      updateVfModuleRequest0.getVfModuleName();
+      updateVfModuleRequest0.setVnfVersion((String) null);
+      updateVfModuleRequest0.setVfModuleType((String) null);
+      updateVfModuleRequest0.getVnfType();
+      String string0 = updateVfModuleRequest0.getVfModuleType();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test02()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.setVfModuleStackId("");
+      updateVfModuleRequest0.getVfModuleId();
+      updateVfModuleRequest0.setVolumeGroupId("");
+      updateVfModuleRequest0.setVfModuleId(";Zz^*Eup;I8");
+      updateVfModuleRequest0.getTenantId();
+      updateVfModuleRequest0.setVfModuleName((String) null);
+      updateVfModuleRequest0.getFailIfExists();
+      updateVfModuleRequest0.getVnfId();
+      updateVfModuleRequest0.getVfModuleId();
+      updateVfModuleRequest0.setVfModuleType((String) null);
+      updateVfModuleRequest0.getBackout();
+      updateVfModuleRequest0.setVfModuleId("p H/yV<46O");
+      updateVfModuleRequest0.setVnfId("");
+      assertNull(updateVfModuleRequest0.getVolumeGroupStackId());
+  }
+
+  @Test(timeout = 4000)
+  public void test03()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.setBaseVfModuleId("y|.n5Xbo!qUzw");
+      updateVfModuleRequest0.setRequestType("y|.n5Xbo!qUzw");
+      updateVfModuleRequest0.setBaseVfModuleId("");
+      updateVfModuleRequest0.getBaseVfModuleStackId();
+      updateVfModuleRequest0.getBaseVfModuleId();
+      MsoRequest msoRequest0 = updateVfModuleRequest0.getMsoRequest();
+      updateVfModuleRequest0.getBackout();
+      updateVfModuleRequest0.setSkipAAI((Boolean) null);
+      updateVfModuleRequest0.setMsoRequest(msoRequest0);
+      updateVfModuleRequest0.getBackout();
+      updateVfModuleRequest0.setRequestType("");
+      updateVfModuleRequest0.getVfModuleStackId();
+      updateVfModuleRequest0.setMsoRequest(msoRequest0);
+      updateVfModuleRequest0.setTenantId("");
+      assertNull(updateVfModuleRequest0.getVfModuleName());
+  }
+
+  @Test(timeout = 4000)
+  public void test04()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.setVfModuleStackId("jaxb.formatted.output");
+      updateVfModuleRequest0.setVfModuleName("jaxb.formatted.output");
+      Boolean boolean0 = Boolean.valueOf("");
+      Boolean.logicalXor(false, false);
+      updateVfModuleRequest0.setFailIfExists(boolean0);
+      updateVfModuleRequest0.getBackout();
+      updateVfModuleRequest0.setVfModuleType("jaxb.formatted.output");
+      Boolean.logicalOr(true, true);
+      updateVfModuleRequest0.setBackout((Boolean) null);
+      updateVfModuleRequest0.getVfModuleStackId();
+      updateVfModuleRequest0.getVfModuleName();
+      updateVfModuleRequest0.setVolumeGroupId("jaxb.formatted.output");
+      updateVfModuleRequest0.getBaseVfModuleStackId();
+      updateVfModuleRequest0.setRequestType(".zGbDU h'`XYM2");
+      updateVfModuleRequest0.getVfModuleStackId();
+      updateVfModuleRequest0.setBaseVfModuleStackId("");
+      updateVfModuleRequest0.getBackout();
+      updateVfModuleRequest0.getVolumeGroupId();
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      updateVfModuleRequest0.setVfModuleParams(hashMap0);
+      updateVfModuleRequest0.setBaseVfModuleId("");
+      assertNull(updateVfModuleRequest0.getVfModuleId());
+  }
+
+  @Test(timeout = 4000)
+  public void test05()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      Boolean boolean0 = updateVfModuleRequest0.getFailIfExists();
+      assertNull(boolean0);
+      
+      updateVfModuleRequest0.getVnfId();
+      updateVfModuleRequest0.setVnfVersion((String) null);
+      updateVfModuleRequest0.setBaseVfModuleId((String) null);
+      updateVfModuleRequest0.setVfModuleStackId("");
+      updateVfModuleRequest0.getVfModuleStackId();
+      // Undeclared exception!
+      try { 
+        updateVfModuleRequest0.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 test06()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.setVfModuleStackId("tnNRSR)XN");
+      updateVfModuleRequest0.setCloudSiteId("");
+      updateVfModuleRequest0.setVnfId("");
+      updateVfModuleRequest0.setVfModuleType("");
+      updateVfModuleRequest0.setVfModuleStackId("");
+      MsoRequest msoRequest0 = new MsoRequest();
+      msoRequest0.setServiceInstanceId("");
+      updateVfModuleRequest0.setMsoRequest(msoRequest0);
+      updateVfModuleRequest0.setVfModuleName("*$x.GUPO|E:0LZ<");
+      String string0 = updateVfModuleRequest0.getVfModuleType();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test07()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.getVfModuleName();
+      updateVfModuleRequest0.getFailIfExists();
+      updateVfModuleRequest0.setBackout((Boolean) null);
+      updateVfModuleRequest0.getVfModuleName();
+      updateVfModuleRequest0.setVolumeGroupStackId((String) null);
+      updateVfModuleRequest0.setRequestType("td");
+      updateVfModuleRequest0.getRequestType();
+      updateVfModuleRequest0.setVolumeGroupId((String) null);
+      updateVfModuleRequest0.getBaseVfModuleStackId();
+      MsoRequest msoRequest0 = updateVfModuleRequest0.getMsoRequest();
+      updateVfModuleRequest0.setMsoRequest(msoRequest0);
+      assertNull(updateVfModuleRequest0.getVolumeGroupStackId());
+  }
+
+  @Test(timeout = 4000)
+  public void test08()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.setVolumeGroupStackId("");
+      updateVfModuleRequest0.setVfModuleType("");
+      updateVfModuleRequest0.setVnfVersion("");
+      updateVfModuleRequest0.getVolumeGroupId();
+      MsoRequest msoRequest0 = new MsoRequest("jaxb.formatted.output", (String) null);
+      msoRequest0.setServiceInstanceId((String) null);
+      Boolean boolean0 = Boolean.FALSE;
+      updateVfModuleRequest0.setSkipAAI(boolean0);
+      msoRequest0.setServiceInstanceId((String) null);
+      msoRequest0.setServiceInstanceId("");
+      updateVfModuleRequest0.setVolumeGroupId("9oR~ ");
+      updateVfModuleRequest0.setMsoRequest(msoRequest0);
+      updateVfModuleRequest0.getVfModuleStackId();
+      updateVfModuleRequest0.setVfModuleName("");
+      updateVfModuleRequest0.getFailIfExists();
+      updateVfModuleRequest0.getVfModuleName();
+      updateVfModuleRequest0.getFailIfExists();
+      updateVfModuleRequest0.getRequestType();
+      String string0 = updateVfModuleRequest0.getRequestType();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test09()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      hashMap0.put("8bJYY1&kKT", "8bJYY1&kKT");
+      hashMap0.entrySet();
+      updateVfModuleRequest0.setVfModuleParams(hashMap0);
+      updateVfModuleRequest0.toXmlString();
+      updateVfModuleRequest0.setVolumeGroupId((String) null);
+      updateVfModuleRequest0.getMsoRequest();
+      Boolean boolean0 = new Boolean(true);
+      Boolean.logicalAnd(true, true);
+      updateVfModuleRequest0.setBackout(boolean0);
+      updateVfModuleRequest0.getBackout();
+      Boolean boolean1 = Boolean.valueOf(true);
+      Boolean.logicalXor(true, true);
+      updateVfModuleRequest0.setFailIfExists(boolean1);
+      assertNull(updateVfModuleRequest0.getVolumeGroupId());
+  }
+
+  @Test(timeout = 4000)
+  public void test10()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.setVfModuleType(" h&a.O(2wp'tIm%yKJY");
+      MsoRequest msoRequest0 = updateVfModuleRequest0.getMsoRequest();
+      updateVfModuleRequest0.setMsoRequest(msoRequest0);
+      updateVfModuleRequest0.getVolumeGroupId();
+      updateVfModuleRequest0.getVolumeGroupId();
+      String string0 = updateVfModuleRequest0.getVfModuleType();
+      assertEquals(" h&a.O(2wp'tIm%yKJY", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test11()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.setTenantId("");
+      updateVfModuleRequest0.setVolumeGroupStackId("");
+      updateVfModuleRequest0.setBaseVfModuleStackId("");
+      updateVfModuleRequest0.setVolumeGroupId("");
+      updateVfModuleRequest0.setBaseVfModuleId("Q)H$p?i^[$S\u0003_Q");
+      updateVfModuleRequest0.setVnfVersion("");
+      updateVfModuleRequest0.setTenantId("Q)H$p?i^[$S\u0003_Q");
+      updateVfModuleRequest0.setVfModuleId("");
+      updateVfModuleRequest0.getRequestType();
+      updateVfModuleRequest0.setVfModuleType("(");
+      String string0 = updateVfModuleRequest0.getVolumeGroupStackId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test12()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.getCloudSiteId();
+      Map<String, String> map0 = updateVfModuleRequest0.getVfModuleParams();
+      updateVfModuleRequest0.setTenantId((String) null);
+      updateVfModuleRequest0.setBaseVfModuleStackId((String) null);
+      updateVfModuleRequest0.getBaseVfModuleId();
+      updateVfModuleRequest0.getTenantId();
+      updateVfModuleRequest0.setVfModuleStackId("");
+      updateVfModuleRequest0.setVfModuleParams(map0);
+      updateVfModuleRequest0.setBaseVfModuleId("og~*KEPst]:7");
+      updateVfModuleRequest0.setVfModuleStackId("");
+      updateVfModuleRequest0.setVnfId("");
+      Boolean boolean0 = new Boolean(false);
+      updateVfModuleRequest0.setBackout(boolean0);
+      updateVfModuleRequest0.setVnfType("");
+      String string0 = updateVfModuleRequest0.getBaseVfModuleId();
+      assertEquals("og~*KEPst]:7", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test13()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      hashMap0.put("tW$,C`\"=2HoY\"N", "tW$,C`\"=2HoY\"N");
+      updateVfModuleRequest0.setVfModuleParams(hashMap0);
+      updateVfModuleRequest0.setBaseVfModuleId((String) null);
+      updateVfModuleRequest0.setBaseVfModuleId("");
+      updateVfModuleRequest0.getVnfVersion();
+      MsoRequest msoRequest0 = updateVfModuleRequest0.getMsoRequest();
+      updateVfModuleRequest0.setMsoRequest(msoRequest0);
+      msoRequest0.setRequestId("HA");
+      msoRequest0.setServiceInstanceId("}Fo|8N");
+      msoRequest0.setRequestId("");
+      updateVfModuleRequest0.setMsoRequest(msoRequest0);
+      Map<String, String> map0 = updateVfModuleRequest0.getVfModuleParams();
+      assertFalse(map0.isEmpty());
+  }
+
+  @Test(timeout = 4000)
+  public void test14()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.setTenantId("");
+      updateVfModuleRequest0.setMessageId("");
+      updateVfModuleRequest0.toXmlString();
+      updateVfModuleRequest0.setVfModuleType("");
+      updateVfModuleRequest0.setBaseVfModuleId("");
+      updateVfModuleRequest0.setVolumeGroupId("");
+      updateVfModuleRequest0.setVfModuleType((String) null);
+      updateVfModuleRequest0.setNotificationUrl((String) null);
+      updateVfModuleRequest0.setBaseVfModuleStackId("");
+      updateVfModuleRequest0.setBaseVfModuleId("");
+      updateVfModuleRequest0.getBaseVfModuleStackId();
+      Boolean boolean0 = Boolean.FALSE;
+      Boolean.logicalOr(false, false);
+      updateVfModuleRequest0.setFailIfExists(boolean0);
+      updateVfModuleRequest0.getRequestType();
+      updateVfModuleRequest0.setBaseVfModuleStackId("4N9!j*vkAv[");
+      updateVfModuleRequest0.setMessageId((String) null);
+      String string0 = updateVfModuleRequest0.getVnfType();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test15()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.setBaseVfModuleStackId("jaxb.formatted.output");
+      updateVfModuleRequest0.getVnfId();
+      updateVfModuleRequest0.getSkipAAI();
+      Boolean.getBoolean((String) null);
+      updateVfModuleRequest0.setFailIfExists((Boolean) null);
+      updateVfModuleRequest0.getBaseVfModuleStackId();
+      updateVfModuleRequest0.setVfModuleStackId((String) null);
+      Map<String, String> map0 = updateVfModuleRequest0.getVfModuleParams();
+      updateVfModuleRequest0.setVfModuleParams(map0);
+      String string0 = updateVfModuleRequest0.getRequestType();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test16()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      Boolean boolean0 = Boolean.FALSE;
+      updateVfModuleRequest0.setTenantId("");
+      updateVfModuleRequest0.setVnfId("^");
+      Boolean.logicalAnd(false, false);
+      Boolean.logicalOr(false, true);
+      Boolean.logicalXor(false, false);
+      updateVfModuleRequest0.setCloudSiteId(", )iA\"g F{9C");
+      Boolean boolean1 = Boolean.valueOf("");
+      updateVfModuleRequest0.setFailIfExists(boolean1);
+      updateVfModuleRequest0.setFailIfExists(boolean0);
+      updateVfModuleRequest0.getVfModuleParams();
+      String string0 = updateVfModuleRequest0.getTenantId();
+      updateVfModuleRequest0.setBaseVfModuleStackId("");
+      updateVfModuleRequest0.getVfModuleParams();
+      updateVfModuleRequest0.getVnfId();
+      updateVfModuleRequest0.getFailIfExists();
+      updateVfModuleRequest0.getVnfVersion();
+      updateVfModuleRequest0.setVfModuleStackId("^");
+      updateVfModuleRequest0.setVolumeGroupId("");
+      updateVfModuleRequest0.setBaseVfModuleStackId("");
+      String string1 = updateVfModuleRequest0.getCloudSiteId();
+      assertFalse(string1.equals((Object)string0));
+  }
+
+  @Test(timeout = 4000)
+  public void test17()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.setNotificationUrl("XC8g/I");
+      updateVfModuleRequest0.setVfModuleParams((Map<String, String>) null);
+      updateVfModuleRequest0.setRequestType("");
+      updateVfModuleRequest0.setVfModuleType("");
+      updateVfModuleRequest0.getFailIfExists();
+      updateVfModuleRequest0.setBackout((Boolean) null);
+      updateVfModuleRequest0.setTenantId("");
+      updateVfModuleRequest0.setVfModuleStackId("");
+      updateVfModuleRequest0.setMsoRequest((MsoRequest) null);
+      updateVfModuleRequest0.getRequestType();
+      updateVfModuleRequest0.getBaseVfModuleId();
+      updateVfModuleRequest0.setVfModuleType((String) null);
+      updateVfModuleRequest0.setVfModuleType("");
+      updateVfModuleRequest0.setTenantId((String) null);
+      updateVfModuleRequest0.getTenantId();
+      updateVfModuleRequest0.getMsoRequest();
+      updateVfModuleRequest0.setVnfVersion("");
+      updateVfModuleRequest0.getVfModuleName();
+      updateVfModuleRequest0.setVfModuleType((String) null);
+      String string0 = updateVfModuleRequest0.getVolumeGroupStackId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test18()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.setVfModuleId("");
+      updateVfModuleRequest0.setRequestType("");
+      updateVfModuleRequest0.getVfModuleName();
+      updateVfModuleRequest0.setVolumeGroupStackId("?|d!=PZ_");
+      updateVfModuleRequest0.getMsoRequest();
+      updateVfModuleRequest0.setVnfType("");
+      updateVfModuleRequest0.setVnfType((String) null);
+      updateVfModuleRequest0.getRequestType();
+      updateVfModuleRequest0.getFailIfExists();
+      updateVfModuleRequest0.setTenantId("");
+      assertEquals("", updateVfModuleRequest0.getRequestType());
+  }
+
+  @Test(timeout = 4000)
+  public void test19()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.getVfModuleName();
+      Boolean boolean0 = new Boolean("");
+      updateVfModuleRequest0.setBaseVfModuleId((String) null);
+      Boolean.getBoolean("");
+      Boolean.getBoolean("");
+      MsoRequest msoRequest0 = new MsoRequest();
+      updateVfModuleRequest0.setMsoRequest(msoRequest0);
+      updateVfModuleRequest0.setBackout(boolean0);
+      updateVfModuleRequest0.getBackout();
+      updateVfModuleRequest0.setVolumeGroupId("jaxb.formatted.output");
+      updateVfModuleRequest0.getVolumeGroupId();
+      updateVfModuleRequest0.setVolumeGroupId("");
+      updateVfModuleRequest0.getBackout();
+      updateVfModuleRequest0.getCloudSiteId();
+      updateVfModuleRequest0.getBackout();
+      updateVfModuleRequest0.getVolumeGroupId();
+      updateVfModuleRequest0.setVnfType("");
+      updateVfModuleRequest0.getVnfVersion();
+      updateVfModuleRequest0.setVnfVersion("nSI5S-r/)Nt{7E");
+      updateVfModuleRequest0.setTenantId((String) null);
+      assertNull(updateVfModuleRequest0.getVnfId());
+  }
+
+  @Test(timeout = 4000)
+  public void test20()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.setVolumeGroupId("1}p^{.,|o6fiV%T=nE");
+      updateVfModuleRequest0.getVfModuleId();
+      updateVfModuleRequest0.getBaseVfModuleId();
+      updateVfModuleRequest0.setRequestType((String) null);
+      updateVfModuleRequest0.setVnfId("()4#Rt0S|Ok?6LpP6d");
+      updateVfModuleRequest0.setCloudSiteId((String) null);
+      updateVfModuleRequest0.setVnfId("OTV[DjNZt,,%");
+      updateVfModuleRequest0.setVnfId((String) null);
+      updateVfModuleRequest0.setVnfType((String) null);
+      updateVfModuleRequest0.getRequestType();
+      updateVfModuleRequest0.getVolumeGroupId();
+      MsoRequest msoRequest0 = updateVfModuleRequest0.getMsoRequest();
+      updateVfModuleRequest0.setMsoRequest(msoRequest0);
+      updateVfModuleRequest0.getBackout();
+      updateVfModuleRequest0.setBackout((Boolean) null);
+      updateVfModuleRequest0.getVnfVersion();
+      updateVfModuleRequest0.setVfModuleId("()4#Rt0S|Ok?6LpP6d");
+      String string0 = updateVfModuleRequest0.getBaseVfModuleStackId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test21()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.getVolumeGroupId();
+      updateVfModuleRequest0.setVnfVersion((String) null);
+      updateVfModuleRequest0.getVfModuleName();
+      updateVfModuleRequest0.setBaseVfModuleId("");
+      updateVfModuleRequest0.setCloudSiteId("");
+      updateVfModuleRequest0.getVnfType();
+      updateVfModuleRequest0.setVolumeGroupStackId("");
+      updateVfModuleRequest0.setVolumeGroupId("");
+      updateVfModuleRequest0.setVolumeGroupId("");
+      updateVfModuleRequest0.getVfModuleId();
+      updateVfModuleRequest0.getTenantId();
+      UpdateVfModuleRequest updateVfModuleRequest1 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.getVolumeGroupId();
+      updateVfModuleRequest1.getVfModuleStackId();
+      updateVfModuleRequest1.getVolumeGroupStackId();
+      Boolean boolean0 = new Boolean(false);
+      updateVfModuleRequest0.setBackout(boolean0);
+      assertNull(updateVfModuleRequest0.getRequestType());
+  }
+
+  @Test(timeout = 4000)
+  public void test22()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      Boolean boolean0 = new Boolean("[b#W!$Hl5#Z");
+      updateVfModuleRequest0.setFailIfExists(boolean0);
+      String string0 = updateVfModuleRequest0.getCloudSiteId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test23()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.getVolumeGroupStackId();
+      updateVfModuleRequest0.getVnfVersion();
+      updateVfModuleRequest0.setVfModuleStackId("V|x2kON!8h|bBCf,\"I");
+      assertNull(updateVfModuleRequest0.getVnfType());
+  }
+
+  @Test(timeout = 4000)
+  public void test24()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.getVnfVersion();
+      String string0 = updateVfModuleRequest0.getVfModuleName();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test25()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.setTenantId("3G");
+      updateVfModuleRequest0.getSkipAAI();
+      updateVfModuleRequest0.toXmlString();
+      updateVfModuleRequest0.setBackout((Boolean) null);
+      updateVfModuleRequest0.getVfModuleParams();
+      updateVfModuleRequest0.setVnfId("MnBvF");
+      updateVfModuleRequest0.setTenantId("NX5yxi");
+      updateVfModuleRequest0.getVnfId();
+      updateVfModuleRequest0.getBaseVfModuleStackId();
+      updateVfModuleRequest0.getVfModuleParams();
+      MsoRequest msoRequest0 = updateVfModuleRequest0.getMsoRequest();
+      assertNull(msoRequest0.getRequestId());
+  }
+
+  @Test(timeout = 4000)
+  public void test26()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.getVfModuleId();
+      updateVfModuleRequest0.setBaseVfModuleId("");
+      assertNull(updateVfModuleRequest0.getVfModuleName());
+  }
+
+  @Test(timeout = 4000)
+  public void test27()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.setVnfId("");
+      assertNull(updateVfModuleRequest0.getVolumeGroupStackId());
+      
+      updateVfModuleRequest0.getFailIfExists();
+      updateVfModuleRequest0.setFailIfExists((Boolean) null);
+      updateVfModuleRequest0.setMessageId((String) null);
+      updateVfModuleRequest0.setVolumeGroupId("");
+      updateVfModuleRequest0.getVfModuleType();
+      updateVfModuleRequest0.setVnfVersion("4x");
+      String string0 = updateVfModuleRequest0.getVnfVersion();
+      updateVfModuleRequest0.setBaseVfModuleStackId("[Oc:_#*]&+4`o");
+      String string1 = updateVfModuleRequest0.getVnfId();
+      assertFalse(string1.equals((Object)string0));
+  }
+
+  @Test(timeout = 4000)
+  public void test28()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      MsoRequest msoRequest0 = updateVfModuleRequest0.getMsoRequest();
+      updateVfModuleRequest0.setMsoRequest(msoRequest0);
+      assertNull(updateVfModuleRequest0.getVnfVersion());
+  }
+
+  @Test(timeout = 4000)
+  public void test29()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.getRequestType();
+      Boolean boolean0 = updateVfModuleRequest0.getBackout();
+      assertNull(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test30()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.setCloudSiteId("");
+      updateVfModuleRequest0.setVfModuleParams((Map<String, String>) null);
+      updateVfModuleRequest0.getBaseVfModuleStackId();
+      updateVfModuleRequest0.setVnfVersion("");
+      updateVfModuleRequest0.getVfModuleParams();
+      updateVfModuleRequest0.setBaseVfModuleId("");
+      updateVfModuleRequest0.getCloudSiteId();
+      updateVfModuleRequest0.setVfModuleParams((Map<String, String>) null);
+      updateVfModuleRequest0.getVnfVersion();
+      updateVfModuleRequest0.getVfModuleStackId();
+      updateVfModuleRequest0.getVolumeGroupId();
+      updateVfModuleRequest0.setCloudSiteId((String) null);
+      updateVfModuleRequest0.getMsoRequest();
+      updateVfModuleRequest0.setBaseVfModuleStackId("");
+      updateVfModuleRequest0.getVfModuleParams();
+      updateVfModuleRequest0.setVolumeGroupStackId("[9~u'kSpnk!");
+      assertNull(updateVfModuleRequest0.getMessageId());
+  }
+
+  @Test(timeout = 4000)
+  public void test31()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.getFailIfExists();
+      updateVfModuleRequest0.setVnfType("");
+      updateVfModuleRequest0.setBackout((Boolean) null);
+      updateVfModuleRequest0.setBaseVfModuleId("");
+      updateVfModuleRequest0.getVfModuleParams();
+      updateVfModuleRequest0.getVnfId();
+      updateVfModuleRequest0.setVfModuleId("");
+      updateVfModuleRequest0.setVfModuleStackId("");
+      updateVfModuleRequest0.getVfModuleId();
+      updateVfModuleRequest0.setCloudSiteId("");
+      updateVfModuleRequest0.getMsoRequest();
+      updateVfModuleRequest0.setVfModuleId("");
+      updateVfModuleRequest0.getVnfType();
+      Boolean boolean0 = updateVfModuleRequest0.getFailIfExists();
+      assertNull(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test32()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.getFailIfExists();
+      updateVfModuleRequest0.setBackout((Boolean) null);
+      assertNull(updateVfModuleRequest0.getVnfId());
+  }
+
+  @Test(timeout = 4000)
+  public void test33()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.setVfModuleName("");
+      updateVfModuleRequest0.setBaseVfModuleStackId("");
+      // Undeclared exception!
+      try { 
+        updateVfModuleRequest0.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 test34()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.setVolumeGroupStackId("nY0b");
+      assertNull(updateVfModuleRequest0.getRequestType());
+  }
+
+  @Test(timeout = 4000)
+  public void test35()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.setVnfVersion("Ht/U");
+      assertNull(updateVfModuleRequest0.getVolumeGroupId());
+  }
+
+  @Test(timeout = 4000)
+  public void test36()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.setVnfType("W;cx8uJk]p#e&?c3PcO");
+      updateVfModuleRequest0.setVfModuleType("z3qr`!V;?");
+      updateVfModuleRequest0.setVfModuleName("W;cx8uJk]p#e&?c3PcO");
+      assertNull(updateVfModuleRequest0.getRequestType());
+  }
+
+  @Test(timeout = 4000)
+  public void test37()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.toXmlString();
+      String string0 = updateVfModuleRequest0.getBaseVfModuleStackId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test38()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.setVfModuleName("W#m\"_5ykHHHo_@kq/");
+      assertNull(updateVfModuleRequest0.getRequestType());
+  }
+
+  @Test(timeout = 4000)
+  public void test39()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.setTenantId("?!vD=6S.7p/[;zX3i");
+      assertNull(updateVfModuleRequest0.getMessageId());
+  }
+
+  @Test(timeout = 4000)
+  public void test40()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.setCloudSiteId("");
+      Map<String, String> map0 = updateVfModuleRequest0.getVfModuleParams();
+      updateVfModuleRequest0.setVfModuleParams(map0);
+      updateVfModuleRequest0.setVfModuleParams(map0);
+      updateVfModuleRequest0.setVfModuleStackId("");
+      assertNull(updateVfModuleRequest0.getRequestType());
+  }
+
+  @Test(timeout = 4000)
+  public void test41()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      Boolean boolean0 = Boolean.valueOf(true);
+      Boolean.logicalAnd(true, true);
+      Boolean.logicalXor(true, true);
+      Boolean.logicalAnd(true, true);
+      Boolean.logicalXor(true, false);
+      updateVfModuleRequest0.setFailIfExists(boolean0);
+      updateVfModuleRequest0.setFailIfExists(boolean0);
+      Boolean boolean1 = new Boolean(false);
+      Boolean.compare(true, true);
+      boolean boolean2 = Boolean.logicalAnd(true, true);
+      updateVfModuleRequest0.setSkipAAI(boolean1);
+      updateVfModuleRequest0.setBaseVfModuleId("O[9~5!");
+      updateVfModuleRequest0.setVfModuleType((String) null);
+      updateVfModuleRequest0.getFailIfExists();
+      updateVfModuleRequest0.getFailIfExists();
+      System.setCurrentTimeMillis(3682L);
+      System.setCurrentTimeMillis(3682L);
+      System.setCurrentTimeMillis((-116L));
+      System.setCurrentTimeMillis((-116L));
+      System.setCurrentTimeMillis(0L);
+      System.setCurrentTimeMillis(0);
+      Boolean boolean3 = updateVfModuleRequest0.getFailIfExists();
+      assertTrue(boolean3.equals((Object)boolean2));
+  }
+
+  @Test(timeout = 4000)
+  public void test42()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.setBaseVfModuleId("");
+      assertNull(updateVfModuleRequest0.getMessageId());
+  }
+
+  @Test(timeout = 4000)
+  public void test43()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      updateVfModuleRequest0.setRequestType("");
+      updateVfModuleRequest0.setVfModuleType("ybR");
+      assertEquals("ybR", updateVfModuleRequest0.getVfModuleType());
+  }
+
+  @Test(timeout = 4000)
+  public void test44()  throws Throwable  {
+      UpdateVfModuleRequest updateVfModuleRequest0 = new UpdateVfModuleRequest();
+      UpdateVfModuleRequest updateVfModuleRequest1 = new UpdateVfModuleRequest();
+      updateVfModuleRequest1.getSkipAAI();
+      updateVfModuleRequest0.setFailIfExists((Boolean) null);
+      assertNull(updateVfModuleRequest0.getVfModuleName());
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/UpdateVfModuleRequestESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/UpdateVfModuleRequestESTestscaffolding.java
new file mode 100644
index 0000000000..7d23ee1ce5
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/UpdateVfModuleRequestESTestscaffolding.java
@@ -0,0 +1,197 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:24:18 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+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 UpdateVfModuleRequestESTestscaffolding {
+
+  @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.vnfrest.UpdateVfModuleRequest"; 
+    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(UpdateVfModuleRequestESTestscaffolding.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",
+      "org.codehaus.jackson.node.BaseJsonNode",
+      "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",
+      "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.map.ClassIntrospector",
+      "org.codehaus.jackson.map.AnnotationIntrospector$Pair",
+      "org.codehaus.jackson.Versioned",
+      "org.codehaus.jackson.map.type.TypeBase",
+      "org.codehaus.jackson.map.ser.BasicSerializerFactory",
+      "org.codehaus.jackson.node.ContainerNode",
+      "org.codehaus.jackson.map.introspect.NopAnnotationIntrospector",
+      "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.codehaus.jackson.node.ObjectNode",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$MinimalMethodFilter",
+      "org.codehaus.jackson.map.type.CollectionLikeType",
+      "org.codehaus.jackson.sym.CharsToNameCanonicalizer$Bucket",
+      "org.codehaus.jackson.impl.JsonParserMinimalBase",
+      "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",
+      "org.codehaus.jackson.ObjectCodec",
+      "org.codehaus.jackson.map.introspect.AnnotatedMethod",
+      "org.codehaus.jackson.JsonFactory",
+      "org.codehaus.jackson.node.ArrayNode",
+      "org.codehaus.jackson.io.SegmentedStringWriter",
+      "org.codehaus.jackson.map.jsontype.TypeResolverBuilder",
+      "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.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",
+      "org.codehaus.jackson.map.introspect.VisibilityChecker$Std",
+      "org.codehaus.jackson.map.annotate.JsonRootName",
+      "org.codehaus.jackson.JsonParser",
+      "org.openecomp.mso.adapters.vnfrest.UpdateVfModuleRequest",
+      "org.codehaus.jackson.node.NullNode",
+      "org.openecomp.mso.adapters.vnfrest.VfResponseCommon",
+      "org.codehaus.jackson.map.jsontype.impl.StdSubtypeResolver",
+      "org.openecomp.mso.entity.MsoRequest",
+      "org.codehaus.jackson.node.TreeTraversingParser",
+      "org.codehaus.jackson.map.type.CollectionType",
+      "org.codehaus.jackson.map.MapperConfig",
+      "org.openecomp.mso.adapters.vnfrest.VfRequestCommon",
+      "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.codehaus.jackson.map.ClassIntrospector$MixInResolver"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(UpdateVfModuleRequestESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "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/vnfrest/UpdateVfModuleResponseESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/UpdateVfModuleResponseESTest.java
new file mode 100644
index 0000000000..2d48c57579
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/UpdateVfModuleResponseESTest.java
@@ -0,0 +1,149 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:18:01 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+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 UpdateVfModuleResponseESTest extends UpdateVfModuleResponseESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test00()  throws Throwable  {
+      UpdateVfModuleResponse updateVfModuleResponse0 = new UpdateVfModuleResponse();
+      String string0 = updateVfModuleResponse0.getVnfId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test01()  throws Throwable  {
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      UpdateVfModuleResponse updateVfModuleResponse0 = new UpdateVfModuleResponse("", "", "\"c2NA-]kge", (Map<String, String>) hashMap0, "");
+      String string0 = updateVfModuleResponse0.getVnfId();
+      assertEquals("\"c2NA-]kge", updateVfModuleResponse0.getVfModuleStackId());
+      assertEquals("", updateVfModuleResponse0.getVfModuleId());
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test02()  throws Throwable  {
+      UpdateVfModuleResponse updateVfModuleResponse0 = new UpdateVfModuleResponse();
+      String string0 = updateVfModuleResponse0.getVfModuleStackId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test03()  throws Throwable  {
+      UpdateVfModuleResponse updateVfModuleResponse0 = new UpdateVfModuleResponse("", "", "", (Map<String, String>) null, "eBT|~3\"z");
+      updateVfModuleResponse0.getVfModuleOutputs();
+      assertEquals("", updateVfModuleResponse0.getVfModuleStackId());
+      assertEquals("", updateVfModuleResponse0.getVnfId());
+      assertEquals("", updateVfModuleResponse0.getVfModuleId());
+  }
+
+  @Test(timeout = 4000)
+  public void test04()  throws Throwable  {
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      UpdateVfModuleResponse updateVfModuleResponse0 = new UpdateVfModuleResponse((String) null, (String) null, "", (Map<String, String>) hashMap0, (String) null);
+      hashMap0.put((String) null, "");
+      Map<String, String> map0 = updateVfModuleResponse0.getVfModuleOutputs();
+      assertFalse(map0.isEmpty());
+  }
+
+  @Test(timeout = 4000)
+  public void test05()  throws Throwable  {
+      UpdateVfModuleResponse updateVfModuleResponse0 = new UpdateVfModuleResponse();
+      String string0 = updateVfModuleResponse0.getVfModuleId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test06()  throws Throwable  {
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      UpdateVfModuleResponse updateVfModuleResponse0 = new UpdateVfModuleResponse("}t3zhbFZl^dGLS@6+", "}t3zhbFZl^dGLS@6+", "}t3zhbFZl^dGLS@6+", (Map<String, String>) hashMap0, "");
+      String string0 = updateVfModuleResponse0.getVfModuleId();
+      assertNotNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test07()  throws Throwable  {
+      UpdateVfModuleResponse updateVfModuleResponse0 = new UpdateVfModuleResponse();
+      updateVfModuleResponse0.setVfModuleStackId("p|+");
+      String string0 = updateVfModuleResponse0.getVfModuleStackId();
+      assertEquals("p|+", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test08()  throws Throwable  {
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      UpdateVfModuleResponse updateVfModuleResponse0 = new UpdateVfModuleResponse((String) null, (String) null, "", (Map<String, String>) hashMap0, (String) null);
+      String string0 = updateVfModuleResponse0.getVfModuleStackId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test09()  throws Throwable  {
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      UpdateVfModuleResponse updateVfModuleResponse0 = new UpdateVfModuleResponse((String) null, (String) null, "", (Map<String, String>) hashMap0, (String) null);
+      updateVfModuleResponse0.setVnfId("trb");
+      assertEquals("", updateVfModuleResponse0.getVfModuleStackId());
+  }
+
+  @Test(timeout = 4000)
+  public void test10()  throws Throwable  {
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      UpdateVfModuleResponse updateVfModuleResponse0 = new UpdateVfModuleResponse("'o^@:C|OvN:", "'o^@:C|OvN:", "'o^@:C|OvN:", (Map<String, String>) hashMap0, "xcX3]w^");
+      String string0 = updateVfModuleResponse0.getVnfId();
+      assertEquals("'o^@:C|OvN:", updateVfModuleResponse0.getVfModuleStackId());
+      assertEquals("'o^@:C|OvN:", updateVfModuleResponse0.getVfModuleId());
+      assertEquals("'o^@:C|OvN:", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test11()  throws Throwable  {
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      UpdateVfModuleResponse updateVfModuleResponse0 = new UpdateVfModuleResponse("lE0", "", "", (Map<String, String>) hashMap0, "");
+      String string0 = updateVfModuleResponse0.getVfModuleId();
+      assertEquals("", string0);
+      assertEquals("lE0", updateVfModuleResponse0.getVnfId());
+      assertEquals("", updateVfModuleResponse0.getVfModuleStackId());
+  }
+
+  @Test(timeout = 4000)
+  public void test12()  throws Throwable  {
+      UpdateVfModuleResponse updateVfModuleResponse0 = new UpdateVfModuleResponse("", "", "", (Map<String, String>) null, "eBT|~3\"z");
+      assertEquals("", updateVfModuleResponse0.getVfModuleId());
+      
+      updateVfModuleResponse0.setVfModuleId("");
+      assertEquals("", updateVfModuleResponse0.getVnfId());
+      assertEquals("", updateVfModuleResponse0.getVfModuleStackId());
+  }
+
+  @Test(timeout = 4000)
+  public void test13()  throws Throwable  {
+      UpdateVfModuleResponse updateVfModuleResponse0 = new UpdateVfModuleResponse("", "", "", (Map<String, String>) null, "eBT|~3\"z");
+      updateVfModuleResponse0.setVfModuleOutputs((Map<String, String>) null);
+      assertEquals("", updateVfModuleResponse0.getVfModuleId());
+      assertEquals("", updateVfModuleResponse0.getVnfId());
+      assertEquals("", updateVfModuleResponse0.getVfModuleStackId());
+  }
+
+  @Test(timeout = 4000)
+  public void test14()  throws Throwable  {
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      UpdateVfModuleResponse updateVfModuleResponse0 = new UpdateVfModuleResponse("'o^@:C|OvN:", "'o^@:C|OvN:", "'o^@:C|OvN:", (Map<String, String>) hashMap0, "xcX3]w^");
+      updateVfModuleResponse0.getVfModuleOutputs();
+      assertEquals("'o^@:C|OvN:", updateVfModuleResponse0.getVfModuleStackId());
+      assertEquals("'o^@:C|OvN:", updateVfModuleResponse0.getVfModuleId());
+      assertEquals("'o^@:C|OvN:", updateVfModuleResponse0.getVnfId());
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/UpdateVfModuleResponseESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/UpdateVfModuleResponseESTestscaffolding.java
new file mode 100644
index 0000000000..4551abbcf4
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/UpdateVfModuleResponseESTestscaffolding.java
@@ -0,0 +1,98 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:18:01 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+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 UpdateVfModuleResponseESTestscaffolding {
+
+  @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.vnfrest.UpdateVfModuleResponse"; 
+    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(UpdateVfModuleResponseESTestscaffolding.class.getClassLoader() ,
+      "org.codehaus.jackson.annotate.JacksonAnnotation",
+      "org.openecomp.mso.adapters.vnfrest.VfResponseCommon",
+      "org.jboss.resteasy.annotations.providers.NoJackson",
+      "org.codehaus.jackson.map.annotate.JsonRootName",
+      "org.openecomp.mso.adapters.vnfrest.UpdateVfModuleResponse"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(UpdateVfModuleResponseESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "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/vnfrest/UpdateVolumeGroupRequestESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/UpdateVolumeGroupRequestESTest.java
new file mode 100644
index 0000000000..5ee5d2ef20
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/UpdateVolumeGroupRequestESTest.java
@@ -0,0 +1,222 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:13:54 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import org.openecomp.mso.entity.MsoRequest;
+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 UpdateVolumeGroupRequestESTest extends UpdateVolumeGroupRequestESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test00()  throws Throwable  {
+      UpdateVolumeGroupRequest updateVolumeGroupRequest0 = new UpdateVolumeGroupRequest();
+      updateVolumeGroupRequest0.setVolumeGroupStackId("");
+      String string0 = updateVolumeGroupRequest0.getVolumeGroupStackId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test01()  throws Throwable  {
+      UpdateVolumeGroupRequest updateVolumeGroupRequest0 = new UpdateVolumeGroupRequest();
+      updateVolumeGroupRequest0.setVolumeGroupParams((Map<String, String>) null);
+      Map<String, String> map0 = updateVolumeGroupRequest0.getVolumeGroupParams();
+      assertNull(map0);
+  }
+
+  @Test(timeout = 4000)
+  public void test02()  throws Throwable  {
+      UpdateVolumeGroupRequest updateVolumeGroupRequest0 = new UpdateVolumeGroupRequest();
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      hashMap0.put("x; 6d0BPfz`", "x; 6d0BPfz`");
+      updateVolumeGroupRequest0.setVolumeGroupParams(hashMap0);
+      Map<String, String> map0 = updateVolumeGroupRequest0.getVolumeGroupParams();
+      assertFalse(map0.isEmpty());
+  }
+
+  @Test(timeout = 4000)
+  public void test03()  throws Throwable  {
+      UpdateVolumeGroupRequest updateVolumeGroupRequest0 = new UpdateVolumeGroupRequest();
+      updateVolumeGroupRequest0.setVolumeGroupId("jaxb.formatted.output");
+      String string0 = updateVolumeGroupRequest0.getVolumeGroupId();
+      assertEquals("jaxb.formatted.output", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test04()  throws Throwable  {
+      UpdateVolumeGroupRequest updateVolumeGroupRequest0 = new UpdateVolumeGroupRequest();
+      updateVolumeGroupRequest0.setVnfVersion("VE");
+      String string0 = updateVolumeGroupRequest0.getVnfVersion();
+      assertEquals("VE", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test05()  throws Throwable  {
+      UpdateVolumeGroupRequest updateVolumeGroupRequest0 = new UpdateVolumeGroupRequest();
+      updateVolumeGroupRequest0.setVnfType(";z<~4]OiR");
+      String string0 = updateVolumeGroupRequest0.getVnfType();
+      assertEquals(";z<~4]OiR", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test06()  throws Throwable  {
+      UpdateVolumeGroupRequest updateVolumeGroupRequest0 = new UpdateVolumeGroupRequest();
+      updateVolumeGroupRequest0.setVnfType("");
+      String string0 = updateVolumeGroupRequest0.getVnfType();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test07()  throws Throwable  {
+      UpdateVolumeGroupRequest updateVolumeGroupRequest0 = new UpdateVolumeGroupRequest();
+      updateVolumeGroupRequest0.setVfModuleType("jaxb.formatted.output");
+      String string0 = updateVolumeGroupRequest0.getVfModuleType();
+      assertEquals("jaxb.formatted.output", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test08()  throws Throwable  {
+      UpdateVolumeGroupRequest updateVolumeGroupRequest0 = new UpdateVolumeGroupRequest();
+      updateVolumeGroupRequest0.setTenantId("*\"Y)Ey _n!jPx[,gv");
+      String string0 = updateVolumeGroupRequest0.getTenantId();
+      assertEquals("*\"Y)Ey _n!jPx[,gv", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test09()  throws Throwable  {
+      UpdateVolumeGroupRequest updateVolumeGroupRequest0 = new UpdateVolumeGroupRequest();
+      updateVolumeGroupRequest0.setCloudSiteId("kaFalmm'SWu=)x");
+      String string0 = updateVolumeGroupRequest0.getCloudSiteId();
+      assertEquals("kaFalmm'SWu=)x", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test10()  throws Throwable  {
+      UpdateVolumeGroupRequest updateVolumeGroupRequest0 = new UpdateVolumeGroupRequest();
+      String string0 = updateVolumeGroupRequest0.getVnfVersion();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test11()  throws Throwable  {
+      UpdateVolumeGroupRequest updateVolumeGroupRequest0 = new UpdateVolumeGroupRequest();
+      String string0 = updateVolumeGroupRequest0.getVfModuleType();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test12()  throws Throwable  {
+      UpdateVolumeGroupRequest updateVolumeGroupRequest0 = new UpdateVolumeGroupRequest();
+      String string0 = updateVolumeGroupRequest0.getCloudSiteId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test13()  throws Throwable  {
+      UpdateVolumeGroupRequest updateVolumeGroupRequest0 = new UpdateVolumeGroupRequest();
+      MsoRequest msoRequest0 = updateVolumeGroupRequest0.getMsoRequest();
+      assertNull(msoRequest0.getRequestId());
+  }
+
+  @Test(timeout = 4000)
+  public void test14()  throws Throwable  {
+      UpdateVolumeGroupRequest updateVolumeGroupRequest0 = new UpdateVolumeGroupRequest();
+      String string0 = updateVolumeGroupRequest0.getVnfType();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test15()  throws Throwable  {
+      UpdateVolumeGroupRequest updateVolumeGroupRequest0 = new UpdateVolumeGroupRequest();
+      String string0 = updateVolumeGroupRequest0.getTenantId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test16()  throws Throwable  {
+      UpdateVolumeGroupRequest updateVolumeGroupRequest0 = new UpdateVolumeGroupRequest();
+      updateVolumeGroupRequest0.setTenantId("");
+      String string0 = updateVolumeGroupRequest0.getTenantId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test17()  throws Throwable  {
+      UpdateVolumeGroupRequest updateVolumeGroupRequest0 = new UpdateVolumeGroupRequest();
+      updateVolumeGroupRequest0.setVolumeGroupStackId("%CmN&s3>7F)p/0");
+      String string0 = updateVolumeGroupRequest0.getVolumeGroupStackId();
+      assertEquals("%CmN&s3>7F)p/0", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test18()  throws Throwable  {
+      UpdateVolumeGroupRequest updateVolumeGroupRequest0 = new UpdateVolumeGroupRequest();
+      updateVolumeGroupRequest0.setVfModuleType("");
+      String string0 = updateVolumeGroupRequest0.getVfModuleType();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test19()  throws Throwable  {
+      UpdateVolumeGroupRequest updateVolumeGroupRequest0 = new UpdateVolumeGroupRequest();
+      updateVolumeGroupRequest0.setCloudSiteId("");
+      String string0 = updateVolumeGroupRequest0.getCloudSiteId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test20()  throws Throwable  {
+      UpdateVolumeGroupRequest updateVolumeGroupRequest0 = new UpdateVolumeGroupRequest();
+      updateVolumeGroupRequest0.setVnfVersion("");
+      String string0 = updateVolumeGroupRequest0.getVnfVersion();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test21()  throws Throwable  {
+      UpdateVolumeGroupRequest updateVolumeGroupRequest0 = new UpdateVolumeGroupRequest();
+      updateVolumeGroupRequest0.setMsoRequest((MsoRequest) null);
+      MsoRequest msoRequest0 = updateVolumeGroupRequest0.getMsoRequest();
+      assertNull(msoRequest0);
+  }
+
+  @Test(timeout = 4000)
+  public void test22()  throws Throwable  {
+      UpdateVolumeGroupRequest updateVolumeGroupRequest0 = new UpdateVolumeGroupRequest();
+      updateVolumeGroupRequest0.setVolumeGroupId("");
+      String string0 = updateVolumeGroupRequest0.getVolumeGroupId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test23()  throws Throwable  {
+      UpdateVolumeGroupRequest updateVolumeGroupRequest0 = new UpdateVolumeGroupRequest();
+      Map<String, String> map0 = updateVolumeGroupRequest0.getVolumeGroupParams();
+      updateVolumeGroupRequest0.setVolumeGroupParams(map0);
+      assertNull(updateVolumeGroupRequest0.getCloudSiteId());
+  }
+
+  @Test(timeout = 4000)
+  public void test24()  throws Throwable  {
+      UpdateVolumeGroupRequest updateVolumeGroupRequest0 = new UpdateVolumeGroupRequest();
+      String string0 = updateVolumeGroupRequest0.getVolumeGroupStackId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test25()  throws Throwable  {
+      UpdateVolumeGroupRequest updateVolumeGroupRequest0 = new UpdateVolumeGroupRequest();
+      String string0 = updateVolumeGroupRequest0.getVolumeGroupId();
+      assertNull(string0);
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/UpdateVolumeGroupRequestESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/UpdateVolumeGroupRequestESTestscaffolding.java
new file mode 100644
index 0000000000..048f6b9f06
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/UpdateVolumeGroupRequestESTestscaffolding.java
@@ -0,0 +1,100 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:13:54 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+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 UpdateVolumeGroupRequestESTestscaffolding {
+
+  @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.vnfrest.UpdateVolumeGroupRequest"; 
+    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(UpdateVolumeGroupRequestESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.adapters.vnfrest.VfRequestCommon",
+      "org.codehaus.jackson.annotate.JacksonAnnotation",
+      "org.openecomp.mso.adapters.vnfrest.VfResponseCommon",
+      "org.openecomp.mso.entity.MsoRequest",
+      "org.openecomp.mso.adapters.vnfrest.UpdateVolumeGroupRequest",
+      "org.jboss.resteasy.annotations.providers.NoJackson",
+      "org.codehaus.jackson.map.annotate.JsonRootName"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(UpdateVolumeGroupRequestESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "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/vnfrest/UpdateVolumeGroupResponseESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/UpdateVolumeGroupResponseESTest.java
new file mode 100644
index 0000000000..ccf0983f58
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/UpdateVolumeGroupResponseESTest.java
@@ -0,0 +1,99 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:23:04 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+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 UpdateVolumeGroupResponseESTest extends UpdateVolumeGroupResponseESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test0()  throws Throwable  {
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      UpdateVolumeGroupResponse updateVolumeGroupResponse0 = new UpdateVolumeGroupResponse("", "F`m", (Map<String, String>) hashMap0, "");
+      String string0 = updateVolumeGroupResponse0.getVolumeGroupStackId();
+      assertEquals("", updateVolumeGroupResponse0.getVolumeGroupId());
+      assertEquals("F`m", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test1()  throws Throwable  {
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      UpdateVolumeGroupResponse updateVolumeGroupResponse0 = new UpdateVolumeGroupResponse("", "F`m", (Map<String, String>) hashMap0, "");
+      hashMap0.put("9GcmH1su}s&bc=", "");
+      updateVolumeGroupResponse0.getVolumeGroupOutputs();
+      assertEquals("F`m", updateVolumeGroupResponse0.getVolumeGroupStackId());
+      assertEquals("", updateVolumeGroupResponse0.getVolumeGroupId());
+  }
+
+  @Test(timeout = 4000)
+  public void test2()  throws Throwable  {
+      UpdateVolumeGroupResponse updateVolumeGroupResponse0 = new UpdateVolumeGroupResponse();
+      String string0 = updateVolumeGroupResponse0.getVolumeGroupId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test3()  throws Throwable  {
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      UpdateVolumeGroupResponse updateVolumeGroupResponse0 = new UpdateVolumeGroupResponse("TzCXEX\"l?\"8x", "", (Map<String, String>) hashMap0, "TzCXEX\"l?\"8x");
+      String string0 = updateVolumeGroupResponse0.getVolumeGroupId();
+      assertEquals("", updateVolumeGroupResponse0.getVolumeGroupStackId());
+      assertEquals("TzCXEX\"l?\"8x", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test4()  throws Throwable  {
+      UpdateVolumeGroupResponse updateVolumeGroupResponse0 = new UpdateVolumeGroupResponse();
+      Map<String, String> map0 = updateVolumeGroupResponse0.getVolumeGroupOutputs();
+      updateVolumeGroupResponse0.setVolumeGroupOutputs(map0);
+      assertNull(updateVolumeGroupResponse0.getVolumeGroupStackId());
+  }
+
+  @Test(timeout = 4000)
+  public void test5()  throws Throwable  {
+      UpdateVolumeGroupResponse updateVolumeGroupResponse0 = new UpdateVolumeGroupResponse();
+      updateVolumeGroupResponse0.setVolumeGroupStackId("");
+      String string0 = updateVolumeGroupResponse0.getVolumeGroupStackId();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test6()  throws Throwable  {
+      UpdateVolumeGroupResponse updateVolumeGroupResponse0 = new UpdateVolumeGroupResponse();
+      String string0 = updateVolumeGroupResponse0.getVolumeGroupStackId();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test7()  throws Throwable  {
+      UpdateVolumeGroupResponse updateVolumeGroupResponse0 = new UpdateVolumeGroupResponse("", "", (Map<String, String>) null, "");
+      Map<String, String> map0 = updateVolumeGroupResponse0.getVolumeGroupOutputs();
+      assertNull(map0);
+  }
+
+  @Test(timeout = 4000)
+  public void test8()  throws Throwable  {
+      UpdateVolumeGroupResponse updateVolumeGroupResponse0 = new UpdateVolumeGroupResponse("", "", (Map<String, String>) null, "");
+      updateVolumeGroupResponse0.setVolumeGroupId("@(Ux]`8WPh");
+      assertEquals("@(Ux]`8WPh", updateVolumeGroupResponse0.getVolumeGroupId());
+  }
+
+  @Test(timeout = 4000)
+  public void test9()  throws Throwable  {
+      HashMap<String, String> hashMap0 = new HashMap<String, String>();
+      UpdateVolumeGroupResponse updateVolumeGroupResponse0 = new UpdateVolumeGroupResponse("", "", (Map<String, String>) hashMap0, "");
+      String string0 = updateVolumeGroupResponse0.getVolumeGroupId();
+      assertEquals("", string0);
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/UpdateVolumeGroupResponseESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/UpdateVolumeGroupResponseESTestscaffolding.java
new file mode 100644
index 0000000000..c53ea4cb9a
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/UpdateVolumeGroupResponseESTestscaffolding.java
@@ -0,0 +1,98 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:23:04 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+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 UpdateVolumeGroupResponseESTestscaffolding {
+
+  @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.vnfrest.UpdateVolumeGroupResponse"; 
+    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(UpdateVolumeGroupResponseESTestscaffolding.class.getClassLoader() ,
+      "org.codehaus.jackson.annotate.JacksonAnnotation",
+      "org.openecomp.mso.adapters.vnfrest.VfResponseCommon",
+      "org.openecomp.mso.adapters.vnfrest.UpdateVolumeGroupResponse",
+      "org.jboss.resteasy.annotations.providers.NoJackson",
+      "org.codehaus.jackson.map.annotate.JsonRootName"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(UpdateVolumeGroupResponseESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "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/vnfrest/VfModuleExceptionResponseESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/VfModuleExceptionResponseESTest.java
new file mode 100644
index 0000000000..66144bace6
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/VfModuleExceptionResponseESTest.java
@@ -0,0 +1,141 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:24:56 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+import static org.evosuite.runtime.EvoAssertions.*;
+
+import org.openecomp.mso.openstack.exceptions.MsoExceptionCategory;
+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 VfModuleExceptionResponseESTest extends VfModuleExceptionResponseESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test0()  throws Throwable  {
+      MsoExceptionCategory msoExceptionCategory0 = MsoExceptionCategory.OPENSTACK;
+      VfModuleExceptionResponse vfModuleExceptionResponse0 = new VfModuleExceptionResponse("2m", msoExceptionCategory0, false, "2m");
+      assertEquals(MsoExceptionCategory.OPENSTACK, vfModuleExceptionResponse0.getCategory());
+  }
+
+  @Test(timeout = 4000)
+  public void test1()  throws Throwable  {
+      VfModuleExceptionResponse vfModuleExceptionResponse0 = new VfModuleExceptionResponse();
+      assertNull(vfModuleExceptionResponse0.getCategory());
+      
+      MsoExceptionCategory msoExceptionCategory0 = MsoExceptionCategory.USERDATA;
+      Boolean boolean0 = new Boolean(false);
+      vfModuleExceptionResponse0.setMessage("jaxb.formatted.output");
+      vfModuleExceptionResponse0.setRolledBack(boolean0);
+      vfModuleExceptionResponse0.setMessage("jaxb.formatted.output");
+      vfModuleExceptionResponse0.setMessageId("jaxb.formatted.output");
+      Boolean.logicalXor(false, false);
+      Boolean.getBoolean((String) null);
+      vfModuleExceptionResponse0.setRolledBack(boolean0);
+      vfModuleExceptionResponse0.setCategory(msoExceptionCategory0);
+      vfModuleExceptionResponse0.setMessageId("OPENSTACK");
+      VfModuleExceptionResponse vfModuleExceptionResponse1 = new VfModuleExceptionResponse();
+      Boolean boolean1 = vfModuleExceptionResponse0.getRolledBack();
+      assertFalse(boolean1);
+  }
+
+  @Test(timeout = 4000)
+  public void test2()  throws Throwable  {
+      MsoExceptionCategory msoExceptionCategory0 = MsoExceptionCategory.USERDATA;
+      VfModuleExceptionResponse vfModuleExceptionResponse0 = new VfModuleExceptionResponse("", msoExceptionCategory0, true, "");
+      vfModuleExceptionResponse0.setMessageId("");
+      Boolean boolean0 = vfModuleExceptionResponse0.getRolledBack();
+      assertTrue(boolean0);
+      
+      Boolean.logicalAnd(false, false);
+      MsoExceptionCategory msoExceptionCategory1 = MsoExceptionCategory.USERDATA;
+      Boolean.logicalAnd(true, true);
+      vfModuleExceptionResponse0.setRolledBack(boolean0);
+      VfModuleExceptionResponse vfModuleExceptionResponse1 = new VfModuleExceptionResponse("&g.0W4Nah+8,", msoExceptionCategory1, true, "");
+      vfModuleExceptionResponse0.setMessageId((String) null);
+      VfModuleExceptionResponse vfModuleExceptionResponse2 = new VfModuleExceptionResponse((String) null, msoExceptionCategory1, false, (String) null);
+      VfModuleExceptionResponse vfModuleExceptionResponse3 = new VfModuleExceptionResponse("&g.0W4Nah+8,");
+      vfModuleExceptionResponse0.getMessage();
+      VfModuleExceptionResponse vfModuleExceptionResponse4 = new VfModuleExceptionResponse();
+      vfModuleExceptionResponse1.setRolledBack((Boolean) null);
+      assertEquals("&g.0W4Nah+8,", vfModuleExceptionResponse1.getMessage());
+  }
+
+  @Test(timeout = 4000)
+  public void test3()  throws Throwable  {
+      VfModuleExceptionResponse vfModuleExceptionResponse0 = new VfModuleExceptionResponse("org.openecomp.mso.openstack.exceptions.MsoExceptionCategory");
+      MsoExceptionCategory msoExceptionCategory0 = MsoExceptionCategory.INTERNAL;
+      vfModuleExceptionResponse0.setCategory(msoExceptionCategory0);
+      String string0 = vfModuleExceptionResponse0.getMessage();
+      assertEquals("org.openecomp.mso.openstack.exceptions.MsoExceptionCategory", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test4()  throws Throwable  {
+      MsoExceptionCategory msoExceptionCategory0 = MsoExceptionCategory.IO;
+      String string0 = "";
+      VfModuleExceptionResponse vfModuleExceptionResponse0 = new VfModuleExceptionResponse("XOGaF|t", msoExceptionCategory0, true, "");
+      // Undeclared exception!
+      try { 
+        vfModuleExceptionResponse0.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 test5()  throws Throwable  {
+      VfModuleExceptionResponse vfModuleExceptionResponse0 = new VfModuleExceptionResponse();
+      vfModuleExceptionResponse0.setMessage("");
+      vfModuleExceptionResponse0.setMessage("");
+      vfModuleExceptionResponse0.toXmlString();
+      vfModuleExceptionResponse0.setMessage("org.openecomp.mso.adapters.vnfrest.VfModuleExceptionResponse");
+      VfModuleExceptionResponse vfModuleExceptionResponse1 = new VfModuleExceptionResponse("org.openecomp.mso.adapters.vnfrest.VfModuleExceptionResponse");
+      MsoExceptionCategory msoExceptionCategory0 = MsoExceptionCategory.INTERNAL;
+      vfModuleExceptionResponse1.toXmlString();
+      vfModuleExceptionResponse1.setCategory(msoExceptionCategory0);
+      vfModuleExceptionResponse0.setMessage((String) null);
+      MsoExceptionCategory msoExceptionCategory1 = vfModuleExceptionResponse1.getCategory();
+      VfModuleExceptionResponse vfModuleExceptionResponse2 = new VfModuleExceptionResponse();
+      vfModuleExceptionResponse1.setCategory(msoExceptionCategory1);
+      VfModuleExceptionResponse vfModuleExceptionResponse3 = new VfModuleExceptionResponse("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<vfModuleException>\n    <message>org.openecomp.mso.adapters.vnfrest.VfModuleExceptionResponse</message>\n</vfModuleException>\n");
+      vfModuleExceptionResponse3.getRolledBack();
+      vfModuleExceptionResponse3.getMessage();
+      vfModuleExceptionResponse3.setRolledBack((Boolean) null);
+      Boolean boolean0 = Boolean.TRUE;
+      Boolean.getBoolean("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<vfModuleException>\n    <message>org.openecomp.mso.adapters.vnfrest.VfModuleExceptionResponse</message>\n</vfModuleException>\n");
+      vfModuleExceptionResponse0.setRolledBack(boolean0);
+      vfModuleExceptionResponse0.getCategory();
+  }
+
+  @Test(timeout = 4000)
+  public void test6()  throws Throwable  {
+      VfModuleExceptionResponse vfModuleExceptionResponse0 = new VfModuleExceptionResponse();
+      vfModuleExceptionResponse0.setMessageId("cO)VBma");
+      vfModuleExceptionResponse0.getMessage();
+      VfModuleExceptionResponse vfModuleExceptionResponse1 = new VfModuleExceptionResponse();
+      Boolean boolean0 = vfModuleExceptionResponse0.getRolledBack();
+      assertNull(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test7()  throws Throwable  {
+      MsoExceptionCategory msoExceptionCategory0 = MsoExceptionCategory.OPENSTACK;
+      VfModuleExceptionResponse vfModuleExceptionResponse0 = new VfModuleExceptionResponse("IxX(PnBaVq=pz", msoExceptionCategory0, false, "");
+      Boolean boolean0 = Boolean.valueOf(false);
+      Boolean.logicalAnd(true, false);
+      vfModuleExceptionResponse0.setRolledBack(boolean0);
+      assertEquals("IxX(PnBaVq=pz", vfModuleExceptionResponse0.getMessage());
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/VfModuleExceptionResponseESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/VfModuleExceptionResponseESTestscaffolding.java
new file mode 100644
index 0000000000..954f118e12
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/VfModuleExceptionResponseESTestscaffolding.java
@@ -0,0 +1,196 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:24:56 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+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 VfModuleExceptionResponseESTestscaffolding {
+
+  @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.vnfrest.VfModuleExceptionResponse"; 
+    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(VfModuleExceptionResponseESTestscaffolding.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",
+      "org.codehaus.jackson.node.BaseJsonNode",
+      "org.openecomp.mso.openstack.exceptions.MsoExceptionCategory",
+      "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",
+      "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.map.ClassIntrospector",
+      "org.codehaus.jackson.map.AnnotationIntrospector$Pair",
+      "org.codehaus.jackson.Versioned",
+      "org.codehaus.jackson.map.type.TypeBase",
+      "org.codehaus.jackson.map.ser.BasicSerializerFactory",
+      "org.codehaus.jackson.node.ContainerNode",
+      "org.codehaus.jackson.map.introspect.NopAnnotationIntrospector",
+      "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.codehaus.jackson.node.ObjectNode",
+      "org.codehaus.jackson.map.introspect.BasicClassIntrospector$MinimalMethodFilter",
+      "org.codehaus.jackson.map.type.CollectionLikeType",
+      "org.codehaus.jackson.sym.CharsToNameCanonicalizer$Bucket",
+      "org.codehaus.jackson.impl.JsonParserMinimalBase",
+      "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",
+      "org.codehaus.jackson.ObjectCodec",
+      "org.codehaus.jackson.map.introspect.AnnotatedMethod",
+      "org.codehaus.jackson.JsonFactory",
+      "org.codehaus.jackson.node.ArrayNode",
+      "org.codehaus.jackson.io.SegmentedStringWriter",
+      "org.codehaus.jackson.map.jsontype.TypeResolverBuilder",
+      "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.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",
+      "org.codehaus.jackson.map.introspect.VisibilityChecker$Std",
+      "org.codehaus.jackson.JsonParser",
+      "org.codehaus.jackson.node.NullNode",
+      "org.openecomp.mso.adapters.vnfrest.VfResponseCommon",
+      "org.openecomp.mso.adapters.vnfrest.VfModuleExceptionResponse",
+      "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.io.UTF8Writer",
+      "org.codehaus.jackson.map.type.MapType",
+      "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(VfModuleExceptionResponseESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "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.vnfrest.VfModuleExceptionResponse"
+    );
+  }
+}
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
new file mode 100644
index 0000000000..1ba09e124f
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/VfModuleRollbackESTest.java
@@ -0,0 +1,246 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:20:21 GMT 2016
+ */
+
+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.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;
+
+@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());
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/VfModuleRollbackESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/VfModuleRollbackESTestscaffolding.java
new file mode 100644
index 0000000000..b89667deff
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/VfModuleRollbackESTestscaffolding.java
@@ -0,0 +1,83 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:20:21 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+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 VfModuleRollbackESTestscaffolding {
+
+  @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.vnfrest.VfModuleRollback"; 
+    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(VfModuleRollbackESTestscaffolding.class.getClassLoader() ,
+      "org.codehaus.jackson.annotate.JacksonAnnotation",
+      "org.openecomp.mso.openstack.beans.VnfRollback",
+      "org.openecomp.mso.entity.MsoRequest",
+      "org.openecomp.mso.adapters.vnfrest.VfModuleRollback",
+      "org.jboss.resteasy.annotations.providers.NoJackson",
+      "org.codehaus.jackson.map.annotate.JsonRootName"
+    );
+  } 
+
+  private static void resetClasses() {
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/VfRequestCommonESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/VfRequestCommonESTest.java
new file mode 100644
index 0000000000..58a2d1c0cf
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/VfRequestCommonESTest.java
@@ -0,0 +1,88 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:10:46 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+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 VfRequestCommonESTest extends VfRequestCommonESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test0()  throws Throwable  {
+      CreateVolumeGroupRequest createVolumeGroupRequest0 = new CreateVolumeGroupRequest();
+      Boolean boolean0 = Boolean.TRUE;
+      createVolumeGroupRequest0.setSkipAAI(boolean0);
+      Boolean boolean1 = createVolumeGroupRequest0.getSkipAAI();
+      assertTrue(boolean1);
+  }
+
+  @Test(timeout = 4000)
+  public void test1()  throws Throwable  {
+      DeleteVfModuleRequest deleteVfModuleRequest0 = new DeleteVfModuleRequest();
+      deleteVfModuleRequest0.setNotificationUrl("ghhl_5");
+      String string0 = deleteVfModuleRequest0.getNotificationUrl();
+      assertEquals("ghhl_5", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test2()  throws Throwable  {
+      DeleteVolumeGroupRequest deleteVolumeGroupRequest0 = new DeleteVolumeGroupRequest();
+      deleteVolumeGroupRequest0.setNotificationUrl("");
+      String string0 = deleteVolumeGroupRequest0.getNotificationUrl();
+      assertEquals("", string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test3()  throws Throwable  {
+      DeleteVfModuleRequest deleteVfModuleRequest0 = new DeleteVfModuleRequest();
+      deleteVfModuleRequest0.setNotificationUrl("");
+      boolean boolean0 = deleteVfModuleRequest0.isSynchronous();
+      assertTrue(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test4()  throws Throwable  {
+      DeleteVolumeGroupRequest deleteVolumeGroupRequest0 = new DeleteVolumeGroupRequest();
+      boolean boolean0 = deleteVolumeGroupRequest0.isSynchronous();
+      assertTrue(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test5()  throws Throwable  {
+      CreateVolumeGroupRequest createVolumeGroupRequest0 = new CreateVolumeGroupRequest();
+      Boolean boolean0 = createVolumeGroupRequest0.getSkipAAI();
+      assertNull(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test6()  throws Throwable  {
+      DeleteVfModuleRequest deleteVfModuleRequest0 = new DeleteVfModuleRequest();
+      String string0 = deleteVfModuleRequest0.getNotificationUrl();
+      assertNull(string0);
+  }
+
+  @Test(timeout = 4000)
+  public void test7()  throws Throwable  {
+      DeleteVfModuleRequest deleteVfModuleRequest0 = new DeleteVfModuleRequest();
+      deleteVfModuleRequest0.setNotificationUrl("ghhl_5");
+      boolean boolean0 = deleteVfModuleRequest0.isSynchronous();
+      assertFalse(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test8()  throws Throwable  {
+      CreateVolumeGroupRequest createVolumeGroupRequest0 = new CreateVolumeGroupRequest();
+      Boolean boolean0 = new Boolean("");
+      createVolumeGroupRequest0.setSkipAAI(boolean0);
+      Boolean boolean1 = createVolumeGroupRequest0.getSkipAAI();
+      assertFalse(boolean1);
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/VfRequestCommonESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/VfRequestCommonESTestscaffolding.java
new file mode 100644
index 0000000000..61a986d991
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/VfRequestCommonESTestscaffolding.java
@@ -0,0 +1,104 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:10:46 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+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 VfRequestCommonESTestscaffolding {
+
+  @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.vnfrest.VfRequestCommon"; 
+    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(VfRequestCommonESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.adapters.vnfrest.VfRequestCommon",
+      "org.codehaus.jackson.annotate.JacksonAnnotation",
+      "org.codehaus.jackson.Versioned",
+      "org.openecomp.mso.adapters.vnfrest.VfResponseCommon",
+      "org.openecomp.mso.adapters.vnfrest.CreateVolumeGroupRequest",
+      "org.openecomp.mso.entity.MsoRequest",
+      "org.codehaus.jackson.map.introspect.VisibilityChecker",
+      "org.openecomp.mso.adapters.vnfrest.DeleteVfModuleRequest",
+      "org.openecomp.mso.adapters.vnfrest.DeleteVolumeGroupRequest",
+      "org.jboss.resteasy.annotations.providers.NoJackson",
+      "org.codehaus.jackson.map.annotate.JsonRootName"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(VfRequestCommonESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "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/vnfrest/VolumeGroupExceptionResponseESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/VolumeGroupExceptionResponseESTest.java
new file mode 100644
index 0000000000..08fb7709e4
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/VolumeGroupExceptionResponseESTest.java
@@ -0,0 +1,37 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:27:29 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import org.openecomp.mso.openstack.exceptions.MsoExceptionCategory;
+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 VolumeGroupExceptionResponseESTest extends VolumeGroupExceptionResponseESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test0()  throws Throwable  {
+      VolumeGroupExceptionResponse volumeGroupExceptionResponse0 = new VolumeGroupExceptionResponse();
+      assertNull(volumeGroupExceptionResponse0.getMessageId());
+  }
+
+  @Test(timeout = 4000)
+  public void test1()  throws Throwable  {
+      MsoExceptionCategory msoExceptionCategory0 = MsoExceptionCategory.USERDATA;
+      VolumeGroupExceptionResponse volumeGroupExceptionResponse0 = new VolumeGroupExceptionResponse("L", msoExceptionCategory0, false, "M4");
+      assertEquals("L", volumeGroupExceptionResponse0.getMessage());
+  }
+
+  @Test(timeout = 4000)
+  public void test2()  throws Throwable  {
+      VolumeGroupExceptionResponse volumeGroupExceptionResponse0 = new VolumeGroupExceptionResponse("M4");
+      assertNull(volumeGroupExceptionResponse0.getCategory());
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/VolumeGroupExceptionResponseESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/VolumeGroupExceptionResponseESTestscaffolding.java
new file mode 100644
index 0000000000..7046189b28
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/VolumeGroupExceptionResponseESTestscaffolding.java
@@ -0,0 +1,88 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:27:29 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+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 VolumeGroupExceptionResponseESTestscaffolding {
+
+  @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.vnfrest.VolumeGroupExceptionResponse"; 
+    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(VolumeGroupExceptionResponseESTestscaffolding.class.getClassLoader() ,
+      "org.openecomp.mso.adapters.vnfrest.VfResponseCommon",
+      "org.openecomp.mso.adapters.vnfrest.VfModuleExceptionResponse",
+      "org.openecomp.mso.adapters.vnfrest.VolumeGroupExceptionResponse",
+      "org.openecomp.mso.openstack.exceptions.MsoExceptionCategory",
+      "org.jboss.resteasy.annotations.providers.NoJackson"
+    );
+  } 
+
+  private static void resetClasses() {
+    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(VolumeGroupExceptionResponseESTestscaffolding.class.getClassLoader());
+
+    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
+      "org.openecomp.mso.adapters.vnfrest.VfModuleExceptionResponse",
+      "org.openecomp.mso.adapters.vnfrest.VolumeGroupExceptionResponse"
+    );
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/VolumeGroupRollbackESTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/VolumeGroupRollbackESTest.java
new file mode 100644
index 0000000000..7a4a386cc3
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/VolumeGroupRollbackESTest.java
@@ -0,0 +1,198 @@
+/*
+ * This file was automatically generated by EvoSuite
+ * Mon Nov 14 09:18:37 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+import static org.evosuite.runtime.EvoAssertions.*;
+
+import org.openecomp.mso.entity.MsoRequest;
+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 VolumeGroupRollbackESTest extends VolumeGroupRollbackESTestscaffolding {
+
+  @Test(timeout = 4000)
+  public void test00()  throws Throwable  {
+      VolumeGroupRollback volumeGroupRollback0 = new VolumeGroupRollback();
+      volumeGroupRollback0.setVolumeGroupStackId("F");
+      volumeGroupRollback0.getVolumeGroupStackId();
+      assertFalse(volumeGroupRollback0.isVolumeGroupCreated());
+  }
+
+  @Test(timeout = 4000)
+  public void test01()  throws Throwable  {
+      VolumeGroupRollback volumeGroupRollback0 = new VolumeGroupRollback();
+      volumeGroupRollback0.setVolumeGroupId("?4I<}KM{|IP");
+      volumeGroupRollback0.getVolumeGroupId();
+      assertFalse(volumeGroupRollback0.isVolumeGroupCreated());
+  }
+
+  @Test(timeout = 4000)
+  public void test02()  throws Throwable  {
+      MsoRequest msoRequest0 = new MsoRequest("", "");
+      VolumeGroupRollback volumeGroupRollback0 = new VolumeGroupRollback("", "", false, "", "", msoRequest0, "");
+      volumeGroupRollback0.getVolumeGroupId();
+      assertFalse(volumeGroupRollback0.isVolumeGroupCreated());
+  }
+
+  @Test(timeout = 4000)
+  public void test03()  throws Throwable  {
+      MsoRequest msoRequest0 = new MsoRequest();
+      VolumeGroupRollback volumeGroupRollback0 = new VolumeGroupRollback("q\"(B{+Ht7bO5", "q\"(B{+Ht7bO5", false, "q\"(B{+Ht7bO5", "q\"(B{+Ht7bO5", msoRequest0, "q\"(B{+Ht7bO5");
+      volumeGroupRollback0.getTenantId();
+      assertFalse(volumeGroupRollback0.isVolumeGroupCreated());
+  }
+
+  @Test(timeout = 4000)
+  public void test04()  throws Throwable  {
+      VolumeGroupRollback volumeGroupRollback0 = new VolumeGroupRollback();
+      volumeGroupRollback0.setTenantId("");
+      volumeGroupRollback0.getTenantId();
+      assertFalse(volumeGroupRollback0.isVolumeGroupCreated());
+  }
+
+  @Test(timeout = 4000)
+  public void test05()  throws Throwable  {
+      MsoRequest msoRequest0 = new MsoRequest();
+      VolumeGroupRollback volumeGroupRollback0 = new VolumeGroupRollback("", "", true, "", "", msoRequest0, "");
+      volumeGroupRollback0.getMsoRequest();
+      assertTrue(volumeGroupRollback0.isVolumeGroupCreated());
+  }
+
+  @Test(timeout = 4000)
+  public void test06()  throws Throwable  {
+      VolumeGroupRollback volumeGroupRollback0 = new VolumeGroupRollback();
+      volumeGroupRollback0.setMessageId("~O0>CjU'2WS");
+      volumeGroupRollback0.getMessageId();
+      assertFalse(volumeGroupRollback0.isVolumeGroupCreated());
+  }
+
+  @Test(timeout = 4000)
+  public void test07()  throws Throwable  {
+      VolumeGroupRollback volumeGroupRollback0 = new VolumeGroupRollback();
+      volumeGroupRollback0.setMessageId("");
+      volumeGroupRollback0.getMessageId();
+      assertFalse(volumeGroupRollback0.isVolumeGroupCreated());
+  }
+
+  @Test(timeout = 4000)
+  public void test08()  throws Throwable  {
+      VolumeGroupRollback volumeGroupRollback0 = new VolumeGroupRollback();
+      volumeGroupRollback0.setCloudSiteId("F");
+      volumeGroupRollback0.getCloudSiteId();
+      assertFalse(volumeGroupRollback0.isVolumeGroupCreated());
+  }
+
+  @Test(timeout = 4000)
+  public void test09()  throws Throwable  {
+      VolumeGroupRollback volumeGroupRollback0 = null;
+      try {
+        volumeGroupRollback0 = new VolumeGroupRollback((VolumeGroupRollback) null, "", "");
+        fail("Expecting exception: NullPointerException");
+      
+      } catch(NullPointerException e) {
+         //
+         // no message in exception (getMessage() returned null)
+         //
+         verifyException("org.openecomp.mso.adapters.vnfrest.VolumeGroupRollback", e);
+      }
+  }
+
+  @Test(timeout = 4000)
+  public void test10()  throws Throwable  {
+      VolumeGroupRollback volumeGroupRollback0 = new VolumeGroupRollback();
+      volumeGroupRollback0.getMsoRequest();
+      assertFalse(volumeGroupRollback0.isVolumeGroupCreated());
+  }
+
+  @Test(timeout = 4000)
+  public void test11()  throws Throwable  {
+      VolumeGroupRollback volumeGroupRollback0 = new VolumeGroupRollback();
+      boolean boolean0 = volumeGroupRollback0.isVolumeGroupCreated();
+      assertFalse(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test12()  throws Throwable  {
+      VolumeGroupRollback volumeGroupRollback0 = new VolumeGroupRollback();
+      volumeGroupRollback0.getVolumeGroupId();
+      assertFalse(volumeGroupRollback0.isVolumeGroupCreated());
+  }
+
+  @Test(timeout = 4000)
+  public void test13()  throws Throwable  {
+      VolumeGroupRollback volumeGroupRollback0 = new VolumeGroupRollback();
+      volumeGroupRollback0.getTenantId();
+      assertFalse(volumeGroupRollback0.isVolumeGroupCreated());
+  }
+
+  @Test(timeout = 4000)
+  public void test14()  throws Throwable  {
+      VolumeGroupRollback volumeGroupRollback0 = new VolumeGroupRollback();
+      volumeGroupRollback0.getCloudSiteId();
+      assertFalse(volumeGroupRollback0.isVolumeGroupCreated());
+  }
+
+  @Test(timeout = 4000)
+  public void test15()  throws Throwable  {
+      VolumeGroupRollback volumeGroupRollback0 = new VolumeGroupRollback();
+      volumeGroupRollback0.getMessageId();
+      assertFalse(volumeGroupRollback0.isVolumeGroupCreated());
+  }
+
+  @Test(timeout = 4000)
+  public void test16()  throws Throwable  {
+      VolumeGroupRollback volumeGroupRollback0 = new VolumeGroupRollback();
+      volumeGroupRollback0.setCloudSiteId("");
+      volumeGroupRollback0.getCloudSiteId();
+      assertFalse(volumeGroupRollback0.isVolumeGroupCreated());
+  }
+
+  @Test(timeout = 4000)
+  public void test17()  throws Throwable  {
+      VolumeGroupRollback volumeGroupRollback0 = new VolumeGroupRollback();
+      volumeGroupRollback0.getVolumeGroupStackId();
+      assertFalse(volumeGroupRollback0.isVolumeGroupCreated());
+  }
+
+  @Test(timeout = 4000)
+  public void test18()  throws Throwable  {
+      VolumeGroupRollback volumeGroupRollback0 = new VolumeGroupRollback();
+      assertFalse(volumeGroupRollback0.isVolumeGroupCreated());
+      
+      volumeGroupRollback0.setVolumeGroupCreated(true);
+      boolean boolean0 = volumeGroupRollback0.isVolumeGroupCreated();
+      assertTrue(boolean0);
+  }
+
+  @Test(timeout = 4000)
+  public void test19()  throws Throwable  {
+      VolumeGroupRollback volumeGroupRollback0 = new VolumeGroupRollback();
+      volumeGroupRollback0.setVolumeGroupStackId("");
+      volumeGroupRollback0.getVolumeGroupStackId();
+      assertFalse(volumeGroupRollback0.isVolumeGroupCreated());
+  }
+
+  @Test(timeout = 4000)
+  public void test20()  throws Throwable  {
+      VolumeGroupRollback volumeGroupRollback0 = new VolumeGroupRollback();
+      MsoRequest msoRequest0 = new MsoRequest();
+      volumeGroupRollback0.setMsoRequest(msoRequest0);
+      assertFalse(volumeGroupRollback0.isVolumeGroupCreated());
+  }
+
+  @Test(timeout = 4000)
+  public void test21()  throws Throwable  {
+      VolumeGroupRollback volumeGroupRollback0 = new VolumeGroupRollback();
+      VolumeGroupRollback volumeGroupRollback1 = new VolumeGroupRollback(volumeGroupRollback0, "", "HC1I]xTWKN0*icHc]");
+      assertEquals("", volumeGroupRollback1.getVolumeGroupStackId());
+      assertFalse(volumeGroupRollback1.isVolumeGroupCreated());
+      assertEquals("HC1I]xTWKN0*icHc]", volumeGroupRollback1.getMessageId());
+  }
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/VolumeGroupRollbackESTestscaffolding.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/VolumeGroupRollbackESTestscaffolding.java
new file mode 100644
index 0000000000..d88e9e7dee
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/vnfrest/VolumeGroupRollbackESTestscaffolding.java
@@ -0,0 +1,82 @@
+/**
+ * Scaffolding file used to store all the setups needed to run 
+ * tests automatically generated by EvoSuite
+ * Mon Nov 14 09:18:37 GMT 2016
+ */
+
+package org.openecomp.mso.adapters.vnfrest;
+
+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 VolumeGroupRollbackESTestscaffolding {
+
+  @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.vnfrest.VolumeGroupRollback"; 
+    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(VolumeGroupRollbackESTestscaffolding.class.getClassLoader() ,
+      "org.codehaus.jackson.annotate.JacksonAnnotation",
+      "org.openecomp.mso.adapters.vnfrest.VolumeGroupRollback",
+      "org.openecomp.mso.entity.MsoRequest",
+      "org.jboss.resteasy.annotations.providers.NoJackson",
+      "org.codehaus.jackson.map.annotate.JsonRootName"
+    );
+  } 
+
+  private static void resetClasses() {
+  }
+}