1710 Rebase - Second Attempt

This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit:
54483fc6606ddb1591a2e9da61bff8712325f924
Wed Sep 6 18:12:56 2017 -0400

Rebasing was done on a branch on top of this commit in so/master in ONAP:
93fbdfbe46104f8859d4754040f979cb7997c157
Thu Sep 7 16:42:59 2017 +0000

Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59
Issue-id: SO-107
Signed-off-by: Arthur Martella <amartell@research.att.com>

12 files changed, 126 insertions, 2793 deletions

diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/RequestsDatabase.java b/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/RequestsDatabase.java
index a08f7cb535..1f1882aa3a 100644
--- a/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/RequestsDatabase.java
+++ b/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/RequestsDatabase.java
@@ -20,12 +20,15 @@
 
 package org.openecomp.mso.requestsdb;
 
+import java.util.Date;
 import java.sql.Timestamp;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 import org.hibernate.Criteria;
 import org.hibernate.Query;
@@ -33,12 +36,13 @@ import org.hibernate.Session;
 import org.hibernate.criterion.Criterion;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
-import org.openecomp.mso.db.HibernateUtils;
+import org.openecomp.mso.db.AbstractSessionFactoryManager;
+import org.openecomp.mso.requestsdb.RequestsDbSessionFactoryManager;
 import org.openecomp.mso.logger.MsoLogger;
 
 public class RequestsDatabase {
 
-    protected static HibernateUtils hibernateUtils = new HibernateUtilsRequestsDb ();
+    protected final AbstractSessionFactoryManager sessionFactoryRequestDB;
     
     protected static MsoLogger msoLogger = MsoLogger.getMsoLogger (MsoLogger.Catalog.GENERAL);
     
@@ -63,34 +67,16 @@ public class RequestsDatabase {
     protected static final String         REQUEST_ID                 = "requestId";
     protected static MockRequestsDatabase mockDB                     = null;
 
-    protected static enum Scope {
-        SERVICE("service", SERVICE_INSTANCE_NAME, SERVICE_INSTANCE_ID, "serviceInstanceId"),
-        VNF_INSTANCE("vnf", VNF_INSTANCE_NAME, VNF_INSTANCE_ID, "vnfInstanceId"),
-        VOLUME_GROUP("volumeGroup", VOLUME_GROUP_INSTANCE_NAME, VOLUME_GROUP_INSTANCE_ID, "volumeGroupInstanceId"),
-        VFMODULE("vfModule", VFMODULE_INSTANCE_NAME, VFMODULE_INSTANCE_ID, "vfModuleInstanceId"),
-        NETWORK("network", NETWORK_INSTANCE_NAME, NETWORK_INSTANCE_ID, "networkInstanceId");
-
-        public final String type;
-        public final String nameColumn;
-        public final String idColumn;
-        public final String idMapKey;
-
-        private Scope(String type, String nameColumn, String idColumn, String idMapKey) {
-            this.type = type;
-            this.nameColumn = nameColumn;
-            this.idColumn = idColumn;
-            this.idMapKey = idMapKey;
-        }
+    public static RequestsDatabase getInstance() {
+        return new RequestsDatabase(new RequestsDbSessionFactoryManager ());
     }
 
-    /**
-     * Avoids creating an instance of this utility class.
-     */
-    protected RequestsDatabase () {
+    protected RequestsDatabase (AbstractSessionFactoryManager sessionFactoryRequest) {
+        sessionFactoryRequestDB = sessionFactoryRequest;
     }
 
-    public static boolean healthCheck () {
-        Session session = hibernateUtils.getSessionFactory ().openSession ();
+    public boolean healthCheck () {
+        Session session = sessionFactoryRequestDB.getSessionFactory ().openSession ();
         try {
             Query query = session.createSQLQuery (" show tables ");
 
@@ -105,10 +91,10 @@ public class RequestsDatabase {
     }
 
 
-    public static int updateInfraStatus (String requestId, String requestStatus, String lastModifiedBy) {
+    public int updateInfraStatus (String requestId, String requestStatus, String lastModifiedBy) {
         long startTime = System.currentTimeMillis ();
         msoLogger.debug ("Update infra request record " + requestId + " with status " + requestStatus);
-        Session session = hibernateUtils.getSessionFactory ().openSession ();
+        Session session = sessionFactoryRequestDB.getSessionFactory ().openSession ();
 
         int result = 0;
         try {
@@ -130,10 +116,10 @@ public class RequestsDatabase {
         return result;
     }
 
-    public static int updateInfraStatus (String requestId, String requestStatus, long progress, String lastModifiedBy) {
+    public int updateInfraStatus (String requestId, String requestStatus, long progress, String lastModifiedBy) {
         long startTime = System.currentTimeMillis ();
         msoLogger.debug ("Update infra request record " + requestId + " with status " + requestStatus);
-        Session session = hibernateUtils.getSessionFactory ().openSession ();
+        Session session = sessionFactoryRequestDB.getSessionFactory ().openSession ();
 
         int result = 0;
         try {
@@ -156,10 +142,10 @@ public class RequestsDatabase {
         return result;
     }
 
-    public static int updateInfraFinalStatus (String requestId, String requestStatus, String statusMessage, long progress, String responseBody, String lastModifiedBy) {
+    public int updateInfraFinalStatus (String requestId, String requestStatus, String statusMessage, long progress, String responseBody, String lastModifiedBy) {
         long startTime = System.currentTimeMillis ();
         msoLogger.debug ("Update infra request record " + requestId + " with status " + requestStatus);
-        Session session = hibernateUtils.getSessionFactory ().openSession ();
+        Session session = sessionFactoryRequestDB.getSessionFactory ().openSession ();
 
         int result = 0;
         try {
@@ -185,14 +171,14 @@ public class RequestsDatabase {
     }
 
     
-    private static List<InfraActiveRequests> executeInfraQuery (List <Criterion> criteria, Order order) {
+    private List<InfraActiveRequests> executeInfraQuery (List <Criterion> criteria, Order order) {
 
         long startTime = System.currentTimeMillis ();
         msoLogger.debug ("Execute query on infra active request table");
         
         List <InfraActiveRequests> results = new ArrayList<InfraActiveRequests>();
 
-        Session session = hibernateUtils.getSessionFactory ().openSession ();
+        Session session = sessionFactoryRequestDB.getSessionFactory ().openSession ();
         try {
             session.beginTransaction ();
             Criteria crit = session.createCriteria (InfraActiveRequests.class);
@@ -213,11 +199,11 @@ public class RequestsDatabase {
         return results;
     }
     
-    public static InfraActiveRequests getRequestFromInfraActive (String requestId) {
+    public InfraActiveRequests getRequestFromInfraActive (String requestId) {
         long startTime = System.currentTimeMillis ();
         msoLogger.debug ("Get request " + requestId + " from InfraActiveRequests DB");
 
-        Session session = hibernateUtils.getSessionFactory ().openSession ();
+        Session session = sessionFactoryRequestDB.getSessionFactory ().openSession ();
         InfraActiveRequests ar = null;
         try {
             session.beginTransaction ();
@@ -233,24 +219,48 @@ public class RequestsDatabase {
         return ar;
     }
     
-    public static InfraActiveRequests checkInstanceNameDuplicate (Map<String,String> instanceIdMap, String instanceName, String requestScope) {
+    public InfraActiveRequests checkInstanceNameDuplicate (HashMap<String,String> instanceIdMap, String instanceName, String requestScope) {
 
         List <Criterion> criteria = new LinkedList <> ();
        
-        if (instanceName != null && !instanceName.equals("")) {
-
-            Arrays.stream(Scope.values()) //
-                    .filter(scope -> scope.type.equals(requestScope)) //
-                    .forEach(scope -> criteria.add(Restrictions.eq(scope.nameColumn, instanceName)));
-
-        } else if (instanceIdMap != null) {
-
-            Arrays.stream(Scope.values()) //
-                    .filter(scope -> scope.type.equals(requestScope) && instanceIdMap.get(scope.idMapKey) != null) //
-                    .forEach(scope -> criteria.add(Restrictions.eq(scope.idColumn, instanceIdMap.get(scope.idMapKey))));
-
+        if(instanceName != null && !instanceName.equals("")) {
+        	
+        	if(requestScope.equals("service")){
+        		criteria.add (Restrictions.eq (SERVICE_INSTANCE_NAME, instanceName));
+        	} else if(requestScope.equals("vnf")){
+        		criteria.add (Restrictions.eq (VNF_INSTANCE_NAME, instanceName));
+        	} else if(requestScope.equals("volumeGroup")){
+        		criteria.add (Restrictions.eq (VOLUME_GROUP_INSTANCE_NAME, instanceName));
+        	} else if(requestScope.equals("vfModule")){
+        		criteria.add (Restrictions.eq (VFMODULE_INSTANCE_NAME, instanceName));
+        	} else if(requestScope.equals("network")){
+        		criteria.add (Restrictions.eq (NETWORK_INSTANCE_NAME, instanceName));
+        	}
+        
+        } else {
+            if(instanceIdMap != null){
+            	if(requestScope.equals("service") && instanceIdMap.get("serviceInstanceId") != null){
+            		criteria.add (Restrictions.eq (SERVICE_INSTANCE_ID, instanceIdMap.get("serviceInstanceId")));
+             	}
+            
+            	if(requestScope.equals("vnf") && instanceIdMap.get("vnfInstanceId") != null){
+            		criteria.add (Restrictions.eq (VNF_INSTANCE_ID, instanceIdMap.get("vnfInstanceId")));
+             	}
+            
+            	if(requestScope.equals("vfModule") && instanceIdMap.get("vfModuleInstanceId") != null){
+            		criteria.add (Restrictions.eq (VFMODULE_INSTANCE_ID, instanceIdMap.get("vfModuleInstanceId")));
+             	}
+            
+            	if(requestScope.equals("volumeGroup") && instanceIdMap.get("volumeGroupInstanceId") != null){
+            		criteria.add (Restrictions.eq (VOLUME_GROUP_INSTANCE_ID, instanceIdMap.get("volumeGroupInstanceId")));
+             	}
+            
+            	if(requestScope.equals("network") && instanceIdMap.get("networkInstanceId") != null){
+            		criteria.add (Restrictions.eq (NETWORK_INSTANCE_ID, instanceIdMap.get("networkInstanceId")));
+            	}
+            }
         }
-
+        
         criteria.add (Restrictions.in ("requestStatus", new String[] { "PENDING", "IN_PROGRESS", "TIMEOUT" }));
         
         Order order = Order.desc (START_TIME);
@@ -266,15 +276,18 @@ public class RequestsDatabase {
         return infraActiveRequests; 
     }
       
-    public static List<InfraActiveRequests> getOrchestrationFiltersFromInfraActive (Map<String, List<String>> orchestrationMap) {
+    public List<InfraActiveRequests> getOrchestrationFiltersFromInfraActive (Map<String, List<String>> orchestrationMap) {
         
     	
     	List <Criterion> criteria = new LinkedList <> ();
     	for (Map.Entry<String, List<String>> entry : orchestrationMap.entrySet())
     	{
     		String mapKey = entry.getKey();
-
-    	    if(mapKey.equalsIgnoreCase("vnfInstanceId")){
+    		if(mapKey.equalsIgnoreCase("serviceInstanceId")) {
+    			mapKey = "serviceInstanceId";
+    		} else if(mapKey.equalsIgnoreCase("serviceInstanceName")) {
+    			mapKey = "serviceInstanceName";
+    		} else if(mapKey.equalsIgnoreCase("vnfInstanceId")){
     	    	mapKey = "vnfId";
      	    } else if(mapKey.equalsIgnoreCase("vnfInstanceName")) {
     	    	mapKey = "vnfName";
@@ -292,9 +305,41 @@ public class RequestsDatabase {
     	    	mapKey = "networkName";
     	    } else if(mapKey.equalsIgnoreCase("lcpCloudRegionId")) {
     	    	mapKey = "aicCloudRegion";
-    	    } 
+    	    } else if(mapKey.equalsIgnoreCase("tenantId")) {
+    	    	mapKey = "tenantId";
+    	    } else if(mapKey.equalsIgnoreCase("modelType")) {
+    	    	mapKey = "requestScope";
+    	    } else if(mapKey.equalsIgnoreCase("requestorId")) {
+    	    	mapKey = "requestorId";
+    	    } else if(mapKey.equalsIgnoreCase("requestExecutionDate")) {    	    	
+    	    	mapKey = "startTime";
+    	    }
     	    
-    	    criteria.add(Restrictions.eq(mapKey, entry.getValue().get(1)));  	    
+    		String propertyValue = entry.getValue().get(1);
+    		if (mapKey.equals("startTime")) {    			
+    			SimpleDateFormat format = new SimpleDateFormat("MM-dd-yyyy");    	        
+    			try {
+	    	        Date thisDate = format.parse(propertyValue);
+	    	        Timestamp minTime = new Timestamp(thisDate.getTime());	    	        
+	    	        Timestamp maxTime = new Timestamp(thisDate.getTime() + TimeUnit.DAYS.toMillis(1));
+	    	        
+	    	        if("DOES_NOT_EQUAL".equalsIgnoreCase(entry.getValue().get(0))) {
+	    	        	criteria.add(Restrictions.or(Restrictions.lt(mapKey, minTime),
+	    	        			Restrictions.ge(mapKey, maxTime)));	        			
+	        		} else {	        			
+	        			criteria.add(Restrictions.between(mapKey, minTime, maxTime));        		       			
+	        		}    
+    			}
+    			catch (Exception e){
+    				msoLogger.debug("Exception in getOrchestrationFiltersFromInfraActive(): + " + e.getMessage());
+    				return null;
+    			}
+    		}
+    		else if("DOES_NOT_EQUAL".equalsIgnoreCase(entry.getValue().get(0))) {
+    			criteria.add(Restrictions.ne(mapKey, propertyValue));
+    		} else {
+    			criteria.add(Restrictions.eq(mapKey, propertyValue));
+    		}
     	    
     	}
     	
@@ -304,13 +349,12 @@ public class RequestsDatabase {
     }
 
 
-    public static List <InfraActiveRequests> getRequestListFromInfraActive (String queryAttributeName,
+    public List <InfraActiveRequests> getRequestListFromInfraActive (String queryAttributeName,
                                                                             String queryValue,
                                                                             String requestType) {
-        long startTime = System.currentTimeMillis ();
         msoLogger.debug ("Get list of infra requests from DB with " + queryAttributeName + " = " + queryValue);
 
-        Session session = hibernateUtils.getSessionFactory ().openSession ();
+        Session session = sessionFactoryRequestDB.getSessionFactory ().openSession ();
         try {
             session.beginTransaction ();
             Criteria crit = session.createCriteria (InfraActiveRequests.class)
@@ -334,11 +378,11 @@ public class RequestsDatabase {
     }
 
 
-    public static InfraActiveRequests getRequestFromInfraActive (String requestId, String requestType) {
+    public InfraActiveRequests getRequestFromInfraActive (String requestId, String requestType) {
         long startTime = System.currentTimeMillis ();
         msoLogger.debug ("Get infra request from DB with id " + requestId);
 
-        Session session = hibernateUtils.getSessionFactory ().openSession ();
+        Session session = sessionFactoryRequestDB.getSessionFactory ().openSession ();
         InfraActiveRequests ar = null;
         try {
             session.beginTransaction ();
@@ -356,13 +400,13 @@ public class RequestsDatabase {
     }
 
 
-    public static InfraActiveRequests checkDuplicateByVnfName (String vnfName, String action, String requestType) {
+    public InfraActiveRequests checkDuplicateByVnfName (String vnfName, String action, String requestType) {
 
         long startTime = System.currentTimeMillis ();
         msoLogger.debug ("Get infra request from DB for VNF " + vnfName + " and action " + action + " and requestType " + requestType);
 
         InfraActiveRequests ar = null;
-        Session session = hibernateUtils.getSessionFactory ().openSession ();
+        Session session = sessionFactoryRequestDB.getSessionFactory ().openSession ();
 
         try {
             session.beginTransaction ();
@@ -385,13 +429,13 @@ public class RequestsDatabase {
         return ar;
     }
 
-    public static InfraActiveRequests checkDuplicateByVnfId (String vnfId, String action, String requestType) {
+    public InfraActiveRequests checkDuplicateByVnfId (String vnfId, String action, String requestType) {
 
         long startTime = System.currentTimeMillis ();
         msoLogger.debug ("Get list of infra requests from DB for VNF " + vnfId + " and action " + action);
 
         InfraActiveRequests ar = null;
-        Session session = hibernateUtils.getSessionFactory ().openSession ();
+        Session session = sessionFactoryRequestDB.getSessionFactory ().openSession ();
 
         try {
             session.beginTransaction ();
@@ -414,7 +458,7 @@ public class RequestsDatabase {
         return ar;
     }
 
-    public static void setMockDB(MockRequestsDatabase mockDB) {
+    public void setMockDB(MockRequestsDatabase mockDB) {
         RequestsDatabase.mockDB = mockDB;
     }
 
@@ -424,10 +468,9 @@ public class RequestsDatabase {
      * @param siteName The unique name of the site
      * @return SiteStatus object or null if none found
      */
-    public static SiteStatus getSiteStatus (String siteName) {
-        Session session = hibernateUtils.getSessionFactory ().openSession ();
+    public SiteStatus getSiteStatus (String siteName) {
+        Session session = sessionFactoryRequestDB.getSessionFactory ().openSession ();
 
-        long startTime = System.currentTimeMillis ();
         SiteStatus siteStatus = null;
         msoLogger.debug ("Request database - get Site Status with Site name:" + siteName);
         try {
@@ -451,8 +494,8 @@ public class RequestsDatabase {
      * @param siteName The unique name of the site
      * @param status The updated status of the Site
      */
-    public static void updateSiteStatus (String siteName, boolean status) {
-        Session session = hibernateUtils.getSessionFactory ().openSession ();
+    public void updateSiteStatus (String siteName, boolean status) {
+        Session session = sessionFactoryRequestDB.getSessionFactory ().openSession ();
         session.beginTransaction ();
 
         long startTime = System.currentTimeMillis ();
@@ -492,13 +535,13 @@ public class RequestsDatabase {
      * @return current progress of the operation
      * @since ONAP Amsterdam Release
      */
-    public static OperationStatus getOperationStatus(String serviceId, String operationId) {
+    public OperationStatus getOperationStatus(String serviceId, String operationId) {
 
         long startTime = System.currentTimeMillis();
         msoLogger.debug("Execute query on infra active request table");
 
         OperationStatus operStatus = null;
-        Session session = hibernateUtils.getSessionFactory().openSession();
+        Session session = sessionFactoryRequestDB.getSessionFactory().openSession();
         try {
             session.beginTransaction();
             String hql = "FROM OperationStatus WHERE SERVICE_ID = :service_id and OPERATION_ID = :operation_id";
@@ -524,8 +567,8 @@ public class RequestsDatabase {
      * @param operstatus the operation object
      * @since ONAP Amsterdam Release
      */
-    public static void updateOperationStatus(OperationStatus operstatus) {
-        Session session = hibernateUtils.getSessionFactory().openSession();
+    public void updateOperationStatus(OperationStatus operstatus) {
+        Session session = sessionFactoryRequestDB.getSessionFactory().openSession();
         session.beginTransaction();
 
         long startTime = System.currentTimeMillis();
@@ -563,13 +606,13 @@ public class RequestsDatabase {
      * @return the progress status of a resource
      * @since ONAP Amsterdam Release
      */
-    public static ResourceOperationStatus getResourceOperationStatus(String serviceId, String operationId,
+    public ResourceOperationStatus getResourceOperationStatus(String serviceId, String operationId,
             String resourceTemplateUUID) {
         long startTime = System.currentTimeMillis();
         msoLogger.debug("Execute query on infra active request table");
 
         ResourceOperationStatus operStatus = null;
-        Session session = hibernateUtils.getSessionFactory().openSession();
+        Session session = sessionFactoryRequestDB.getSessionFactory().openSession();
         try {
             session.beginTransaction();
             String hql =
@@ -597,8 +640,8 @@ public class RequestsDatabase {
      * @param operstatus the resource operation object
      * @since ONAP Amsterdam Release
      */
-    public static void updateResOperStatus(ResourceOperationStatus operStatus) {
-        Session session = hibernateUtils.getSessionFactory().openSession();
+    public void updateResOperStatus(ResourceOperationStatus operStatus) {
+        Session session = sessionFactoryRequestDB.getSessionFactory().openSession();
         session.beginTransaction();
 
         long startTime = System.currentTimeMillis();
@@ -636,8 +679,8 @@ public class RequestsDatabase {
      * @param operStatus the resource operation status
      * @since ONAP Amsterdam Release
      */
-    private static void updateOperationStatusBasedOnResourceStatus(ResourceOperationStatus operStatus) {
-        Session session = hibernateUtils.getSessionFactory().openSession();
+    private void updateOperationStatusBasedOnResourceStatus(ResourceOperationStatus operStatus) {
+        Session session = sessionFactoryRequestDB.getSessionFactory().openSession();
         session.beginTransaction();
 
         long startTime = System.currentTimeMillis();
diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/HibernateUtilsRequestsDb.java b/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/RequestsDbSessionFactoryManager.java
index 09548116c5..efe9e908a2 100644
--- a/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/HibernateUtilsRequestsDb.java
+++ b/mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/RequestsDbSessionFactoryManager.java
@@ -19,12 +19,12 @@
  */
 package org.openecomp.mso.requestsdb;
 
-import org.openecomp.mso.db.HibernateUtils;
+import org.openecomp.mso.db.AbstractSessionFactoryManager;
 import org.openecomp.mso.logger.MessageEnum;
 import org.openecomp.mso.logger.MsoLogger;
 import java.net.URL;
 
-public class HibernateUtilsRequestsDb extends HibernateUtils {
+public class RequestsDbSessionFactoryManager extends AbstractSessionFactoryManager {
 
     private static final MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.APIH);
 
diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/InfraActiveRequestsESTest.java b/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/InfraActiveRequestsESTest.java
deleted file mode 100644
index 96ed0bea83..0000000000
--- a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/InfraActiveRequestsESTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Wed Dec 14 15:13:40 GMT 2016
- */
-
-package org.openecomp.mso.requestsdb;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.junit.runner.RunWith;
-import org.openecomp.mso.requestsdb.InfraActiveRequests;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
-public class InfraActiveRequestsESTest extends InfraActiveRequestsESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test0()  throws Throwable  {
-      InfraActiveRequests infraActiveRequests0 = new InfraActiveRequests();
-      assertNull(infraActiveRequests0.getVolumeGroupId());
-  }
-
-  @Test(timeout = 4000)
-  public void test1()  throws Throwable  {
-      InfraActiveRequests infraActiveRequests0 = new InfraActiveRequests("#)r", "#)r");
-      assertNull(infraActiveRequests0.getNetworkName());
-  }
-}
diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/InfraActiveRequestsESTestscaffolding.java b/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/InfraActiveRequestsESTestscaffolding.java
deleted file mode 100644
index 012b17a4d0..0000000000
--- a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/InfraActiveRequestsESTestscaffolding.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Wed Dec 14 15:13:40 GMT 2016
- */
-
-package org.openecomp.mso.requestsdb;
-
-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;
-import org.evosuite.runtime.sandbox.Sandbox.SandboxMode;
-
-@EvoSuiteClassExclude
-public class InfraActiveRequestsESTestscaffolding {
-
-  @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.requestsdb.InfraActiveRequests"; 
-    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(InfraActiveRequestsESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.requestsdb.InfraActiveRequests",
-      "org.openecomp.mso.requestsdb.InfraRequests"
-    );
-  } 
-
-  private static void resetClasses() {
-    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(InfraActiveRequestsESTestscaffolding.class.getClassLoader()); 
-
-    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
-      "org.openecomp.mso.requestsdb.InfraRequests",
-      "org.openecomp.mso.requestsdb.InfraActiveRequests"
-    );
-  }
-}
diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/InfraRequestsESTest.java b/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/InfraRequestsESTest.java
deleted file mode 100644
index e3f5710833..0000000000
--- a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/InfraRequestsESTest.java
+++ /dev/null
@@ -1,2029 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Wed Dec 14 15:15:48 GMT 2016
- */
-
-package org.openecomp.mso.requestsdb;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.evosuite.runtime.EvoAssertions.*;
-import java.sql.Timestamp;
-import java.time.Clock;
-import java.time.DateTimeException;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.Month;
-import java.time.ZoneId;
-import java.time.ZoneOffset;
-import java.time.temporal.ChronoUnit;
-import java.time.temporal.TemporalUnit;
-import java.time.temporal.UnsupportedTemporalTypeException;
-import java.util.Date;
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.evosuite.runtime.System;
-import org.evosuite.runtime.mock.java.net.MockURI;
-import org.evosuite.runtime.mock.java.time.MockClock;
-import org.evosuite.runtime.mock.java.time.MockInstant;
-import org.evosuite.runtime.mock.java.time.MockLocalDateTime;
-import org.evosuite.runtime.mock.java.util.MockDate;
-import org.junit.runner.RunWith;
-import org.openecomp.mso.requestsdb.InfraRequests;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
-public class InfraRequestsESTest extends InfraRequestsESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test000()  throws Throwable  {
-      System.setCurrentTimeMillis(0L);
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.setRequestStatus("org.openecomp.mso.requestsdb.InfraRequests");
-      Instant instant0 = MockInstant.ofEpochSecond((-1L));
-      Timestamp timestamp0 = Timestamp.from(instant0);
-      infraRequests0.setModifyTime(timestamp0);
-      infraRequests0.setTenantId("7z3rvWw}>");
-      infraRequests0.setVnfParams("7z3rvWw}>");
-      infraRequests0.setVfModuleModelName("H(+:J_^eh02J");
-      InfraRequests infraRequests1 = new InfraRequests("", "zCyMQj^e");
-      infraRequests1.setProvStatus("7z3rvWw}>");
-      infraRequests1.getProgress();
-      infraRequests0.setProgress((Long) null);
-      infraRequests0.setRequestId("");
-      infraRequests0.getStartTime();
-      Timestamp timestamp1 = infraRequests0.getModifyTime();
-      infraRequests0.getEndTime();
-      Timestamp timestamp2 = infraRequests0.getModifyTime();
-      assertSame(timestamp2, timestamp1);
-  }
-
-  @Test(timeout = 4000)
-  public void test001()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("&^pJug .NI><P", "&^pJug .NI><P");
-      infraRequests0.setNetworkType("jxNkugb+TFTHEb");
-      infraRequests0.setVfModuleName("&^pJug .NI><P");
-      Timestamp timestamp0 = new Timestamp(0L);
-      timestamp0.toLocalDateTime();
-      timestamp0.clone();
-      infraRequests0.setStartTime(timestamp0);
-      infraRequests0.setVolumeGroupName("&^pJug .NI><P");
-      infraRequests0.setRequestAction(" g)]V!'`TH5O");
-      infraRequests0.setServiceInstanceId("DfLF%$Jbfi.Q31<");
-      infraRequests0.getStartTime();
-      infraRequests0.getStartTime();
-      infraRequests0.setAicCloudRegion("sz.!~p3obl/");
-      infraRequests0.setClientRequestId("sz.!~p3obl/");
-      infraRequests0.setVnfParams((String) null);
-      infraRequests0.getEndTime();
-      infraRequests0.getStartTime();
-      infraRequests0.getStartTime();
-      infraRequests0.getEndTime();
-      infraRequests0.getModifyTime();
-      infraRequests0.getModifyTime();
-      Timestamp timestamp1 = infraRequests0.getEndTime();
-      assertNull(timestamp1);
-  }
-
-  @Test(timeout = 4000)
-  public void test002()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      Timestamp timestamp0 = new Timestamp(153L);
-      Instant instant0 = timestamp0.toInstant();
-      Timestamp timestamp1 = Timestamp.from(instant0);
-      infraRequests0.setStartTime(timestamp1);
-      Timestamp timestamp2 = infraRequests0.getStartTime();
-      assertNotSame(timestamp2, timestamp0);
-  }
-
-  @Test(timeout = 4000)
-  public void test003()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("", "");
-      Timestamp timestamp0 = new Timestamp((-1852L));
-      infraRequests0.setEndTime(timestamp0);
-      Timestamp timestamp1 = infraRequests0.getEndTime();
-      assertEquals(148000000, timestamp1.getNanos());
-  }
-
-  @Test(timeout = 4000)
-  public void test004()  throws Throwable  {
-      System.setCurrentTimeMillis(0L);
-      InfraRequests infraRequests0 = new InfraRequests((String) null, (String) null);
-      infraRequests0.setAction("");
-      infraRequests0.setLastModifiedBy("et'?MxG");
-      infraRequests0.setSource((String) null);
-      infraRequests0.setRequestStatus("i>Ckz=#\"! &-");
-      infraRequests0.setVnfName((String) null);
-      infraRequests0.setRequestBody("");
-      infraRequests0.setProvStatus("");
-      infraRequests0.setRequestBody((String) null);
-      infraRequests0.setAicCloudRegion("m&WTLl(Z@56C");
-      infraRequests0.getNetworkId();
-      infraRequests0.setNetworkId("zcYzTK3rhfL`Cw");
-      infraRequests0.getStartTime();
-      System.setCurrentTimeMillis(2579L);
-      infraRequests0.getModifyTime();
-      infraRequests0.getStartTime();
-      infraRequests0.setAicCloudRegion("=o7|rLO^");
-      infraRequests0.getEndTime();
-      infraRequests0.getEndTime();
-      infraRequests0.getNetworkId();
-      System.setCurrentTimeMillis(0L);
-      System.setCurrentTimeMillis(0L);
-      infraRequests0.getStartTime();
-      infraRequests0.getSource();
-      String string0 = infraRequests0.getNetworkId();
-      assertEquals("zcYzTK3rhfL`Cw", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test005()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      Long long0 = new Long(1283L);
-      infraRequests0.setProvStatus("'4~OJS*DL/lP");
-      Long.sum((-978L), 1283L);
-      infraRequests0.setProgress(long0);
-      infraRequests0.setServiceInstanceName("'4~OJS*DL/lP");
-      infraRequests0.getSource();
-      infraRequests0.setRequestId("");
-      infraRequests0.getSource();
-      infraRequests0.setVnfParams((String) null);
-      infraRequests0.getNetworkId();
-      infraRequests0.getEndTime();
-      infraRequests0.getNetworkId();
-      infraRequests0.getModifyTime();
-      infraRequests0.getProgress();
-      infraRequests0.getSource();
-      infraRequests0.getModifyTime();
-      infraRequests0.getNetworkId();
-      infraRequests0.getSource();
-      infraRequests0.getModifyTime();
-      infraRequests0.getEndTime();
-      infraRequests0.getEndTime();
-      infraRequests0.getModifyTime();
-      infraRequests0.getProgress();
-      infraRequests0.getProgress();
-      Timestamp timestamp0 = infraRequests0.getStartTime();
-      assertNull(timestamp0);
-  }
-
-  @Test(timeout = 4000)
-  public void test006()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.getEndTime();
-      infraRequests0.setVfModuleModelName("");
-      infraRequests0.setVfModuleId("");
-      infraRequests0.getStartTime();
-      infraRequests0.getVfModuleModelName();
-      infraRequests0.getSource();
-      infraRequests0.setVfModuleModelName("");
-      infraRequests0.setAction("");
-      infraRequests0.setVnfType("32ex<U{");
-      infraRequests0.setVfModuleId("~!_Y!cPw*c_>H$");
-      infraRequests0.getModifyTime();
-      System.setCurrentTimeMillis(0L);
-      infraRequests0.getEndTime();
-      infraRequests0.setRequestStatus("");
-      infraRequests0.setServiceInstanceName("");
-      infraRequests0.getStartTime();
-      infraRequests0.getVfModuleModelName();
-      infraRequests0.setVolumeGroupName("");
-      infraRequests0.getProgress();
-      infraRequests0.setProvStatus("");
-      System.setCurrentTimeMillis(0L);
-      infraRequests0.getStartTime();
-      System.setCurrentTimeMillis(0L);
-      infraRequests0.getVfModuleModelName();
-      infraRequests0.getNetworkId();
-      infraRequests0.getNetworkId();
-      infraRequests0.getVfModuleModelName();
-      System.setCurrentTimeMillis(0L);
-      infraRequests0.getProgress();
-      Timestamp timestamp0 = infraRequests0.getStartTime();
-      assertNull(timestamp0);
-  }
-
-  @Test(timeout = 4000)
-  public void test007()  throws Throwable  {
-      System.setCurrentTimeMillis((-2047L));
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.setVolumeGroupName("k*}2I)_;C'i,[i>aRNU");
-      infraRequests0.setSource("%az=");
-      infraRequests0.getModifyTime();
-      infraRequests0.setRequestAction("");
-      infraRequests0.setClientRequestId("");
-      infraRequests0.setAicNodeClli("");
-      infraRequests0.setCallBackUrl("");
-      infraRequests0.setAction("");
-      infraRequests0.getNetworkId();
-      infraRequests0.getNetworkId();
-      infraRequests0.getProgress();
-      infraRequests0.getProgress();
-      infraRequests0.getNetworkId();
-      infraRequests0.getProgress();
-      infraRequests0.getModifyTime();
-      infraRequests0.setRequestScope("URuw\"b-");
-      infraRequests0.setNetworkName("");
-      infraRequests0.getStartTime();
-      infraRequests0.getAicNodeClli();
-      infraRequests0.getProgress();
-      infraRequests0.setCallBackUrl("");
-      infraRequests0.getEndTime();
-      infraRequests0.setVnfId("");
-      infraRequests0.getProgress();
-      infraRequests0.getNetworkId();
-      Long long0 = infraRequests0.getProgress();
-      assertNull(long0);
-  }
-
-  @Test(timeout = 4000)
-  public void test008()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests((String) null, (String) null);
-      infraRequests0.setClientRequestId((String) null);
-      infraRequests0.setVfModuleModelName((String) null);
-      Long long0 = new Long((-43L));
-      Long.compare((-1L), 0L);
-      Long.compare(819L, (-43L));
-      infraRequests0.setProgress(long0);
-      infraRequests0.getModifyTime();
-      infraRequests0.getStartTime();
-      infraRequests0.setAction("");
-      infraRequests0.getSource();
-      infraRequests0.getSource();
-      infraRequests0.getStartTime();
-      infraRequests0.setNetworkId((String) null);
-      infraRequests0.getNetworkId();
-      Long long1 = infraRequests0.getProgress();
-      assertEquals((-43L), (long)long1);
-  }
-
-  @Test(timeout = 4000)
-  public void test009()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.getStartTime();
-      infraRequests0.setRequestScope("");
-      System.setCurrentTimeMillis(0L);
-      infraRequests0.setVnfType("");
-      infraRequests0.setProvStatus("");
-      infraRequests0.setRequestScope("LB1xoi:3Wz.5'5uxZ");
-      infraRequests0.setVfModuleId("+x66Ol");
-      infraRequests0.setVfModuleModelName("org.openecomp.mso.requestsdb.InfraRequests");
-      infraRequests0.setVnfOutputs("LB1xoi:3Wz.5'5uxZ");
-      infraRequests0.setCorrelator("{%N>'KCKdC");
-      infraRequests0.getEndTime();
-      infraRequests0.getVfModuleModelName();
-      infraRequests0.getSource();
-      infraRequests0.getStartTime();
-      infraRequests0.getNetworkId();
-      infraRequests0.setRequestBody("jBcy6j^");
-      infraRequests0.setAaiServiceId("m,{Gy9PQsY5J/aU!uX");
-      infraRequests0.setVolumeGroupId("");
-      infraRequests0.getEndTime();
-      infraRequests0.getEndTime();
-      infraRequests0.getVfModuleId();
-      infraRequests0.getModifyTime();
-      infraRequests0.getEndTime();
-      infraRequests0.getModifyTime();
-      String string0 = infraRequests0.getSource();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test010()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.getVfModuleId();
-      infraRequests0.getEndTime();
-      infraRequests0.setVfModuleId((String) null);
-      infraRequests0.setServiceType("");
-      infraRequests0.getModifyTime();
-      infraRequests0.getAicNodeClli();
-      infraRequests0.setAaiServiceId((String) null);
-      infraRequests0.getVfModuleModelName();
-      infraRequests0.getVfModuleId();
-      infraRequests0.getEndTime();
-      infraRequests0.setVfModuleModelName((String) null);
-      infraRequests0.getModifyTime();
-      infraRequests0.getVfModuleModelName();
-      infraRequests0.getEndTime();
-      infraRequests0.setVnfName((String) null);
-      infraRequests0.getVfModuleId();
-      infraRequests0.getAicNodeClli();
-      infraRequests0.getAicNodeClli();
-      infraRequests0.getNetworkId();
-      infraRequests0.getVfModuleId();
-      infraRequests0.getSource();
-      infraRequests0.getAicNodeClli();
-      infraRequests0.getSource();
-      infraRequests0.getServiceType();
-      infraRequests0.getModifyTime();
-      String string0 = infraRequests0.getVfModuleId();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test011()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.setVnfName("s4 -bpK");
-      infraRequests0.setLastModifiedBy("");
-      infraRequests0.getProgress();
-      infraRequests0.getServiceType();
-      infraRequests0.setVfModuleName((String) null);
-      infraRequests0.setVnfName("");
-      infraRequests0.setVnfType("");
-      infraRequests0.getVfModuleId();
-      infraRequests0.setResponseBody("");
-      infraRequests0.getStartTime();
-      infraRequests0.setStartTime((Timestamp) null);
-      infraRequests0.setCorrelator("");
-      infraRequests0.getVnfType();
-      infraRequests0.getNetworkId();
-      infraRequests0.setServiceInstanceId("");
-      infraRequests0.getProgress();
-      infraRequests0.getAicNodeClli();
-      infraRequests0.getNetworkId();
-      infraRequests0.setCorrelator((String) null);
-      infraRequests0.getNetworkId();
-      infraRequests0.getVnfType();
-      infraRequests0.getVfModuleModelName();
-      infraRequests0.getAicNodeClli();
-      infraRequests0.setVnfName("");
-      System.setCurrentTimeMillis((-1L));
-      infraRequests0.setProvStatus("");
-      infraRequests0.getVfModuleId();
-      infraRequests0.getSource();
-      infraRequests0.getAicNodeClli();
-      String string0 = infraRequests0.getServiceType();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test012()  throws Throwable  {
-      System.setCurrentTimeMillis(1L);
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.setEndTime((Timestamp) null);
-      infraRequests0.setTenantId("");
-      infraRequests0.setRequestStatus("");
-      infraRequests0.setClientRequestId("");
-      infraRequests0.setAction("");
-      infraRequests0.setCorrelator("");
-      infraRequests0.setAicNodeClli("");
-      infraRequests0.getVnfParams();
-      System.setCurrentTimeMillis(1L);
-      infraRequests0.setVolumeGroupName("");
-      infraRequests0.setVfModuleId((String) null);
-      infraRequests0.setVnfParams("");
-      infraRequests0.getSource();
-      infraRequests0.getVfModuleModelName();
-      infraRequests0.getSource();
-      infraRequests0.getVnfParams();
-      infraRequests0.getServiceType();
-      infraRequests0.setAaiServiceId("i`q1kSghF");
-      infraRequests0.setStatusMessage((String) null);
-      infraRequests0.getProgress();
-      infraRequests0.getModifyTime();
-      infraRequests0.getVnfType();
-      infraRequests0.getProgress();
-      infraRequests0.getServiceType();
-      String string0 = infraRequests0.getVfModuleId();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test013()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.setRequestScope("");
-      infraRequests0.setAaiServiceId(")9?S*`\"0>k");
-      infraRequests0.getEndTime();
-      infraRequests0.setVolumeGroupName("");
-      infraRequests0.setServiceInstanceId("");
-      infraRequests0.getProgress();
-      infraRequests0.getRequestScope();
-      Long long0 = infraRequests0.getProgress();
-      assertNull(long0);
-  }
-
-  @Test(timeout = 4000)
-  public void test014()  throws Throwable  {
-      System.setCurrentTimeMillis(3986L);
-      InfraRequests infraRequests0 = new InfraRequests("", (String) null);
-      infraRequests0.setVnfName((String) null);
-      infraRequests0.getResponseBody();
-      infraRequests0.setAction((String) null);
-      infraRequests0.setCallBackUrl("(tW~,tC");
-      infraRequests0.setClientRequestId("$Y$nNqJ`e'KL#@v>:");
-      infraRequests0.setVolumeGroupId("mSK_k$P)79N/:l");
-      infraRequests0.setResponseBody("");
-      infraRequests0.setSource("(tW~,tC");
-      infraRequests0.setProvStatus((String) null);
-      infraRequests0.setVfModuleName("9");
-      infraRequests0.getServiceType();
-      infraRequests0.getVnfParams();
-      infraRequests0.getVnfType();
-      infraRequests0.getVnfParams();
-      infraRequests0.getStartTime();
-      infraRequests0.getVnfType();
-      infraRequests0.getStartTime();
-      infraRequests0.getSource();
-      infraRequests0.getVfModuleModelName();
-      infraRequests0.getStartTime();
-      infraRequests0.getAicNodeClli();
-      System.setCurrentTimeMillis((-1622L));
-      infraRequests0.getVfModuleModelName();
-      String string0 = infraRequests0.getResponseBody();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test015()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("wkT`'", "kMn9?");
-      infraRequests0.setVfModuleName("");
-      infraRequests0.setNetworkType("");
-      infraRequests0.getVfModuleModelName();
-      infraRequests0.setProvStatus("kMn9?");
-      infraRequests0.getRequestScope();
-      infraRequests0.setVfModuleModelName((String) null);
-      infraRequests0.setAicCloudRegion("wkT`'");
-      infraRequests0.setServiceInstanceName("7Stei0W{<@QDoE9~");
-      infraRequests0.setRequestAction("");
-      infraRequests0.getServiceType();
-      infraRequests0.getVnfParams();
-      infraRequests0.getAicNodeClli();
-      infraRequests0.getRequestScope();
-      infraRequests0.getNetworkType();
-      infraRequests0.getStartTime();
-      infraRequests0.getNetworkType();
-      infraRequests0.getStartTime();
-      infraRequests0.getRequestAction();
-      infraRequests0.setCorrelator("!5");
-      infraRequests0.getSource();
-      infraRequests0.getServiceType();
-      infraRequests0.getVfModuleModelName();
-      infraRequests0.getVnfParams();
-      infraRequests0.getModifyTime();
-      infraRequests0.getVnfParams();
-      infraRequests0.getProvStatus();
-      infraRequests0.getAicNodeClli();
-      infraRequests0.getVfModuleModelName();
-      assertEquals("wkT`'", infraRequests0.getRequestId());
-      assertEquals("kMn9?", infraRequests0.getAction());
-  }
-
-  @Test(timeout = 4000)
-  public void test016()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("", (String) null);
-      infraRequests0.setRequestId("");
-      infraRequests0.setVfModuleId("");
-      infraRequests0.setRequestScope("");
-      infraRequests0.setVfModuleId("");
-      infraRequests0.setSource((String) null);
-      infraRequests0.setClientRequestId("");
-      infraRequests0.setVnfName("3?/m3##");
-      infraRequests0.setVfModuleName("");
-      infraRequests0.setSource("y [b8^A,yt|auh|y");
-      infraRequests0.setRequestScope("y [b8^A,yt|auh|y");
-      infraRequests0.setClientRequestId("");
-      infraRequests0.getEndTime();
-      infraRequests0.setVolumeGroupName("r7szQIK?~Q");
-      infraRequests0.getRequestAction();
-      infraRequests0.getVfModuleModelName();
-      infraRequests0.setServiceInstanceId("y [b8^A,yt|auh|y");
-      infraRequests0.getServiceType();
-      infraRequests0.getNetworkType();
-      System.setCurrentTimeMillis(3509L);
-      infraRequests0.getClientRequestId();
-      infraRequests0.setTenantId((String) null);
-      infraRequests0.getVfModuleModelName();
-      infraRequests0.getVnfType();
-      infraRequests0.getVnfParams();
-      infraRequests0.getServiceType();
-      infraRequests0.getVnfParams();
-      String string0 = infraRequests0.getVfModuleModelName();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test017()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("", "");
-      LocalDateTime localDateTime0 = MockLocalDateTime.of(264, 1, 1, 0, 1, 0);
-      Timestamp timestamp0 = Timestamp.valueOf(localDateTime0);
-      infraRequests0.setEndTime(timestamp0);
-      infraRequests0.setServiceInstanceId("TmMT");
-      infraRequests0.setServiceInstanceName("");
-      infraRequests0.setAicNodeClli(";");
-      infraRequests0.setAicCloudRegion("");
-      infraRequests0.setAction("");
-      infraRequests0.setServiceInstanceId("");
-      infraRequests0.setAaiServiceId("");
-      infraRequests0.getVnfType();
-      infraRequests0.getSource();
-      infraRequests0.getVnfParams();
-      infraRequests0.getVfModuleId();
-      infraRequests0.getStartTime();
-      infraRequests0.getProvStatus();
-      infraRequests0.getServiceType();
-      infraRequests0.getProvStatus();
-      infraRequests0.getServiceType();
-      System.setCurrentTimeMillis(1);
-      infraRequests0.setVnfParams((String) null);
-      infraRequests0.getServiceInstanceName();
-      infraRequests0.getEndTime();
-      infraRequests0.setAicNodeClli((String) null);
-      infraRequests0.getNetworkType();
-      infraRequests0.getEndTime();
-      infraRequests0.getRequestScope();
-      System.setCurrentTimeMillis(0);
-  }
-
-  @Test(timeout = 4000)
-  public void test018()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.setCorrelator("nBvp})-N}");
-      infraRequests0.setSource("dOe#{Gx#~I(,F)0(");
-      infraRequests0.setVnfId("");
-      infraRequests0.getVolumeGroupName();
-      infraRequests0.getCorrelator();
-      infraRequests0.getModifyTime();
-      infraRequests0.getRequestScope();
-      infraRequests0.getVfModuleModelName();
-      String string0 = infraRequests0.getProvStatus();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test019()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("HY7\"yA%CG", "");
-      infraRequests0.setVnfType("");
-      infraRequests0.setAicNodeClli("");
-      infraRequests0.setNetworkId("HY7\"yA%CG");
-      infraRequests0.setAicNodeClli("");
-      infraRequests0.getProgress();
-      infraRequests0.setProgress((Long) null);
-      infraRequests0.setServiceType("");
-      infraRequests0.setLastModifiedBy("");
-      infraRequests0.getRequestScope();
-      infraRequests0.getProvStatus();
-      infraRequests0.setVolumeGroupName((String) null);
-      infraRequests0.getLastModifiedBy();
-      infraRequests0.getProvStatus();
-      infraRequests0.setAicCloudRegion("");
-      infraRequests0.getRequestScope();
-      infraRequests0.getProvStatus();
-      assertEquals("HY7\"yA%CG", infraRequests0.getRequestId());
-      assertEquals("", infraRequests0.getAction());
-  }
-
-  @Test(timeout = 4000)
-  public void test020()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.setRequestBody("");
-      infraRequests0.setTenantId("");
-      infraRequests0.setRequestType("");
-      infraRequests0.setCallBackUrl("");
-      infraRequests0.setRequestAction(">Q'MsuT`)ThP6");
-      infraRequests0.setVfModuleId("");
-      infraRequests0.setResponseBody("");
-      infraRequests0.getVnfName();
-      infraRequests0.getProgress();
-      infraRequests0.setVnfName("");
-      infraRequests0.getVfModuleModelName();
-      infraRequests0.setClientRequestId((String) null);
-      infraRequests0.getServiceType();
-      infraRequests0.getVfModuleId();
-      infraRequests0.getVnfName();
-      infraRequests0.getVfModuleModelName();
-      infraRequests0.getNetworkId();
-      infraRequests0.getRequestAction();
-      infraRequests0.getNetworkType();
-      infraRequests0.getCorrelator();
-      infraRequests0.setLastModifiedBy((String) null);
-      infraRequests0.getCorrelator();
-      infraRequests0.getNetworkId();
-      infraRequests0.getTenantId();
-      infraRequests0.getVolumeGroupName();
-      String string0 = infraRequests0.getVolumeGroupName();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test021()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.getNetworkId();
-      infraRequests0.setRequestAction((String) null);
-      Long long0 = new Long((-965L));
-      infraRequests0.setProgress(long0);
-      infraRequests0.getSource();
-      infraRequests0.setNetworkType("5K\u0002}.V3dm%yU_&r");
-      infraRequests0.setVnfOutputs("5K\u0002}.V3dm%yU_&r");
-      String string0 = infraRequests0.getVnfOutputs();
-      assertEquals("5K\u0002}.V3dm%yU_&r", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test022()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.setRequestBody("");
-      infraRequests0.setNetworkName("K|it");
-      infraRequests0.setAction("hcA}j,");
-      infraRequests0.setLastModifiedBy("");
-      infraRequests0.getCallBackUrl();
-      infraRequests0.getVfModuleId();
-      infraRequests0.getRequestScope();
-      String string0 = infraRequests0.getRequestBody();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test023()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("0", "0");
-      infraRequests0.setNetworkType("0");
-      infraRequests0.getStatusMessage();
-      infraRequests0.getProvStatus();
-      infraRequests0.getVnfParams();
-      infraRequests0.getStatusMessage();
-      infraRequests0.setVfModuleName((String) null);
-      infraRequests0.getResponseBody();
-      infraRequests0.setStatusMessage("[3aRfG;XuP");
-      infraRequests0.setVolumeGroupId((String) null);
-      infraRequests0.setAction("");
-      infraRequests0.getEndTime();
-      infraRequests0.getStartTime();
-      infraRequests0.getServiceType();
-      infraRequests0.getResponseBody();
-      infraRequests0.getVfModuleId();
-      infraRequests0.getServiceInstanceName();
-      infraRequests0.getEndTime();
-      infraRequests0.getNetworkType();
-      infraRequests0.getVnfOutputs();
-      infraRequests0.getVnfType();
-      infraRequests0.getRequestScope();
-      infraRequests0.getStartTime();
-      infraRequests0.getRequestAction();
-      infraRequests0.getProgress();
-      infraRequests0.getLastModifiedBy();
-      infraRequests0.getStatusMessage();
-      infraRequests0.getVolumeGroupName();
-      infraRequests0.getVnfName();
-      System.setCurrentTimeMillis(1480L);
-      String string0 = infraRequests0.getVnfName();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test024()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.setRequestType("2AfD]In8p;DK-]O`8}s");
-      infraRequests0.getClientRequestId();
-      infraRequests0.setClientRequestId((String) null);
-      infraRequests0.setResponseBody("2AfD]In8p;DK-]O`8}s");
-      infraRequests0.setAaiServiceId("2AfD]In8p;DK-]O`8}s");
-      infraRequests0.setRequestBody((String) null);
-      infraRequests0.setVfModuleId("");
-      Timestamp timestamp0 = new Timestamp(0L);
-      infraRequests0.setEndTime(timestamp0);
-      infraRequests0.setVfModuleModelName((String) null);
-      infraRequests0.getAicNodeClli();
-      infraRequests0.getAicNodeClli();
-      infraRequests0.setVnfName("}}xiNsZQ:D73z4dha");
-      Clock clock0 = MockClock.systemDefaultZone();
-      Timestamp timestamp1 = infraRequests0.getEndTime();
-      timestamp0.before(timestamp1);
-      Instant instant0 = MockInstant.now(clock0);
-      Instant instant1 = MockInstant.minusNanos(instant0, (-290L));
-      ChronoUnit chronoUnit0 = ChronoUnit.DECADES;
-      // Undeclared exception!
-      try { 
-        MockInstant.plus(instant1, 0L, (TemporalUnit) chronoUnit0);
-        fail("Expecting exception: UnsupportedTemporalTypeException");
-      
-      } catch(UnsupportedTemporalTypeException e) {
-         //
-         // Unsupported unit: Decades
-         //
-         verifyException("java.time.Instant", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test025()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.getTenantId();
-      infraRequests0.setServiceType("");
-      infraRequests0.getModifyTime();
-      infraRequests0.setModifyTime((Timestamp) null);
-      infraRequests0.getClientRequestId();
-      infraRequests0.setVolumeGroupId((String) null);
-      infraRequests0.getRequestId();
-      infraRequests0.getVfModuleName();
-      infraRequests0.getServiceInstanceName();
-      infraRequests0.setNetworkId("");
-      infraRequests0.setNetworkName((String) null);
-      infraRequests0.getResponseBody();
-      infraRequests0.getNetworkId();
-      Timestamp timestamp0 = infraRequests0.getModifyTime();
-      assertNull(timestamp0);
-  }
-
-  @Test(timeout = 4000)
-  public void test026()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.getVolumeGroupName();
-      infraRequests0.setResponseBody(")Y?y`MhJSG>i");
-      infraRequests0.setVfModuleId((String) null);
-      infraRequests0.setRequestStatus((String) null);
-      infraRequests0.getResponseBody();
-      infraRequests0.setVnfOutputs("q+6_~:+S5N.3.Lge\"");
-      infraRequests0.setVfModuleModelName("q+6_~:+S5N.3.Lge\"");
-      infraRequests0.setSource("q+6_~:+S5N.3.Lge\"");
-      infraRequests0.setServiceInstanceName(")Y?y`MhJSG>i");
-      infraRequests0.getServiceType();
-      infraRequests0.getModifyTime();
-      infraRequests0.setNetworkName("YUNs`H&7xu@i2P/1_");
-      InfraRequests infraRequests1 = new InfraRequests();
-      infraRequests1.setVfModuleModelName("");
-      infraRequests1.setRequestStatus("org.openecomp.mso.requestsdb.InfraRequests");
-      infraRequests0.setRequestId("6A'N2)N@dyHD|PV");
-      infraRequests1.getNetworkType();
-      infraRequests0.getNetworkName();
-      infraRequests1.getLastModifiedBy();
-      infraRequests0.getRequestBody();
-      infraRequests1.setServiceInstanceId("");
-      infraRequests0.setServiceInstanceName(":fK$0REpUY");
-      assertEquals(")Y?y`MhJSG>i", infraRequests0.getResponseBody());
-  }
-
-  @Test(timeout = 4000)
-  public void test027()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.setServiceType("i3b%q%2jvX");
-      infraRequests0.getServiceType();
-      infraRequests0.setClientRequestId("i3b%q%2jvX");
-      infraRequests0.setVnfId("");
-      infraRequests0.getSource();
-      ChronoUnit chronoUnit0 = ChronoUnit.NANOS;
-      // Undeclared exception!
-      try { 
-        MockInstant.plus((Instant) null, (-1L), (TemporalUnit) chronoUnit0);
-        fail("Expecting exception: NullPointerException");
-      
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.evosuite.runtime.mock.java.time.MockInstant", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test028()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("org.openecomp.mso.requestsdb.InfraRequests", "");
-      infraRequests0.setRequestType("");
-      infraRequests0.setRequestBody("org.openecomp.mso.requestsdb.InfraRequests");
-      infraRequests0.setAction("");
-      infraRequests0.getVnfParams();
-      InfraRequests infraRequests1 = new InfraRequests();
-      infraRequests0.setVfModuleName((String) null);
-      infraRequests0.getVfModuleName();
-      infraRequests1.setVfModuleName("?ynVFwCW]h");
-      infraRequests0.setVnfParams("");
-      infraRequests1.setResponseBody((String) null);
-      infraRequests1.setLastModifiedBy((String) null);
-      infraRequests1.setClientRequestId("oCb )W1D3x;e}QaJ");
-      infraRequests0.setServiceInstanceName("");
-      infraRequests0.getVfModuleId();
-      infraRequests1.getClientRequestId();
-      infraRequests1.getModifyTime();
-      infraRequests0.setSource("org.openecomp.mso.requestsdb.InfraRequests");
-      infraRequests1.setVfModuleName("org.openecomp.mso.requestsdb.InfraRequests");
-      String string0 = infraRequests1.getAaiServiceId();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test029()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.setServiceType("");
-      infraRequests0.setVfModuleModelName("QE|");
-      infraRequests0.setStatusMessage("/`_aGH,(,:O9e'");
-      infraRequests0.setStatusMessage("/`_aGH,(,:O9e'");
-      infraRequests0.setLastModifiedBy((String) null);
-      infraRequests0.setServiceInstanceName("QE|");
-      infraRequests0.setCallBackUrl("QE|");
-      infraRequests0.setCallBackUrl("QE|");
-      Long long0 = new Long(0L);
-      Long.getLong("/`_aGH,(,:O9e'", 0L);
-      Long.getLong("QE|", (Long) null);
-      infraRequests0.setProgress(long0);
-      infraRequests0.setVfModuleName("QE|");
-      infraRequests0.setSource("");
-      infraRequests0.setVfModuleId("QE|");
-      infraRequests0.setVolumeGroupId("");
-      infraRequests0.getTenantId();
-      infraRequests0.getClientRequestId();
-      String string0 = infraRequests0.getServiceInstanceName();
-      assertEquals("QE|", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test030()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.getResponseBody();
-      infraRequests0.setServiceInstanceName((String) null);
-      InfraRequests infraRequests1 = new InfraRequests((String) null, ";*MXO3Cx^<r~)I#t");
-      infraRequests1.setSource("H>f%;>>.T7]h8?L]*");
-      infraRequests1.setRequestScope((String) null);
-      infraRequests1.setNetworkName("");
-      infraRequests0.setRequestAction("FLknU%");
-      infraRequests1.setCallBackUrl("");
-      InfraRequests infraRequests2 = new InfraRequests(";*MXO3Cx^<r~)I#t", ";*MXO3Cx^<r~)I#t");
-      infraRequests2.setCorrelator("");
-      infraRequests1.getNetworkName();
-      infraRequests0.setRequestBody((String) null);
-      assertNull(infraRequests0.getRequestScope());
-  }
-
-  @Test(timeout = 4000)
-  public void test031()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.getNetworkId();
-      infraRequests0.setVfModuleModelName((String) null);
-      infraRequests0.setNetworkType((String) null);
-      infraRequests0.setAction((String) null);
-      infraRequests0.setVfModuleModelName("d@?@e`uVahW|y");
-      infraRequests0.setVolumeGroupName("$1");
-      infraRequests0.getResponseBody();
-      infraRequests0.getVnfParams();
-      infraRequests0.getRequestAction();
-      infraRequests0.setClientRequestId("N] J}ueWB9R)u");
-      infraRequests0.getVfModuleId();
-      infraRequests0.getNetworkType();
-      infraRequests0.getModifyTime();
-      infraRequests0.getNetworkId();
-      infraRequests0.getModifyTime();
-      infraRequests0.getVolumeGroupName();
-      infraRequests0.getAicNodeClli();
-      infraRequests0.setVnfOutputs("d@?@e`uVahW|y");
-      infraRequests0.getVfModuleModelName();
-      infraRequests0.getRequestAction();
-      infraRequests0.getRequestAction();
-      infraRequests0.setVnfId("2dCOj.");
-      System.setCurrentTimeMillis(509L);
-      infraRequests0.getNetworkId();
-      infraRequests0.getProgress();
-      infraRequests0.getVfModuleId();
-      infraRequests0.getVfModuleId();
-      infraRequests0.getProgress();
-      String string0 = infraRequests0.getAicNodeClli();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test032()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.setVfModuleName("");
-      infraRequests0.setVfModuleModelName("1Hr");
-      infraRequests0.setNetworkType("");
-      infraRequests0.setCallBackUrl("");
-      infraRequests0.setSource("[@Z");
-      infraRequests0.setRequestBody(">!b;YwVyr(8");
-      infraRequests0.setRequestBody("[@Z");
-      infraRequests0.setServiceInstanceId("1Hr");
-      infraRequests0.setClientRequestId((String) null);
-      infraRequests0.setRequestAction(">!b;YwVyr(8");
-      infraRequests0.setVnfName(">!b;YwVyr(8");
-      infraRequests0.setAicCloudRegion("[@Z");
-      infraRequests0.setNetworkId("OU%$T'av6Ca'8.%");
-      infraRequests0.setCallBackUrl("1Hr");
-      infraRequests0.setServiceInstanceId("");
-      infraRequests0.setNetworkName("OU%$T'av6Ca'8.%");
-      infraRequests0.setNetworkName("gB~~7^R}E0VY*jjv");
-      infraRequests0.getSource();
-      infraRequests0.getLastModifiedBy();
-      infraRequests0.getVfModuleName();
-      String string0 = infraRequests0.getRequestStatus();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test033()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("", "c~]g[*");
-      infraRequests0.setServiceType("");
-      infraRequests0.setAaiServiceId("c~]g[*");
-      infraRequests0.setVnfType("8u=!kEh2}E<wR-=T3Eu");
-      infraRequests0.setAicNodeClli("c~]g[*");
-      infraRequests0.getVnfType();
-      infraRequests0.setVnfName("~x");
-      infraRequests0.setVnfOutputs("8u=!kEh2}E<wR-=T3Eu");
-      infraRequests0.setServiceType("");
-      infraRequests0.setVnfOutputs("CxZIOx,v-");
-      infraRequests0.getVfModuleModelName();
-      infraRequests0.getAicNodeClli();
-      assertEquals("c~]g[*", infraRequests0.getAction());
-      
-      infraRequests0.setAction("Z+$8\"UD&O@G");
-      assertEquals("", infraRequests0.getRequestId());
-  }
-
-  @Test(timeout = 4000)
-  public void test034()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      Timestamp timestamp0 = new Timestamp((-2655L));
-      infraRequests0.setModifyTime(timestamp0);
-      Timestamp timestamp1 = infraRequests0.getModifyTime();
-      timestamp1.after(timestamp0);
-      infraRequests0.setStartTime(timestamp1);
-      infraRequests0.getAaiServiceId();
-      infraRequests0.getRequestStatus();
-      infraRequests0.setRequestStatus("I1e1@rWiu`h-");
-      infraRequests0.setVolumeGroupName("I1e1@rWiu`h-");
-      infraRequests0.setAicNodeClli("H/;N:1&TC[5,}");
-      String string0 = infraRequests0.getClientRequestId();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test035()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.setNetworkType("org.openecomp.mso.requestsdb.InfraRequests");
-      infraRequests0.getVnfOutputs();
-      infraRequests0.getProgress();
-      infraRequests0.setClientRequestId((String) null);
-      infraRequests0.setRequestAction("YN8");
-      infraRequests0.setProvStatus("");
-      infraRequests0.getServiceInstanceId();
-      infraRequests0.getProvStatus();
-      infraRequests0.setRequestScope((String) null);
-      infraRequests0.getAicNodeClli();
-      infraRequests0.getRequestScope();
-      infraRequests0.getServiceInstanceName();
-      infraRequests0.setVnfName((String) null);
-      infraRequests0.getVolumeGroupName();
-      infraRequests0.getTenantId();
-      infraRequests0.getNetworkId();
-      infraRequests0.setStatusMessage((String) null);
-      infraRequests0.setTenantId("org.openecomp.mso.requestsdb.InfraRequests");
-      // Undeclared exception!
-      try { 
-        Timestamp.valueOf((String) null);
-        fail("Expecting exception: IllegalArgumentException");
-      
-      } catch(IllegalArgumentException e) {
-         //
-         // null string
-         //
-         verifyException("java.sql.Timestamp", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test036()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.getVolumeGroupId();
-      infraRequests0.setVnfParams("xeM>h;aPCLLMO/");
-      infraRequests0.setAaiServiceId("xeM>h;aPCLLMO/");
-      infraRequests0.setProvStatus("");
-      infraRequests0.setVfModuleId("xeM>h;aPCLLMO/");
-      infraRequests0.setVnfOutputs("");
-      infraRequests0.setAaiServiceId((String) null);
-      infraRequests0.setClientRequestId("S|%I {=}otjRfuQa8Ab");
-      infraRequests0.setRequestBody("S|%I {=}otjRfuQa8Ab");
-      infraRequests0.setModifyTime((Timestamp) null);
-      infraRequests0.getRequestBody();
-      infraRequests0.setAaiServiceId("");
-      infraRequests0.setRequestId("4_X\":Ety|S,O-RObu");
-      infraRequests0.getCorrelator();
-      infraRequests0.setVnfOutputs("%~+Mc");
-      infraRequests0.getVolumeGroupId();
-      infraRequests0.setVnfId("");
-      assertNull(infraRequests0.getStatusMessage());
-  }
-
-  @Test(timeout = 4000)
-  public void test037()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("org.openecomp.mso.requestsdb.InfraRequests", "YpJ&");
-      infraRequests0.setRequestType("");
-      infraRequests0.setSource("org.openecomp.mso.requestsdb.InfraRequests");
-      infraRequests0.getNetworkId();
-      infraRequests0.getSource();
-      infraRequests0.setVfModuleName("org.openecomp.mso.requestsdb.InfraRequests");
-      infraRequests0.setRequestType((String) null);
-      infraRequests0.getStatusMessage();
-      infraRequests0.getVolumeGroupName();
-      infraRequests0.getVnfName();
-      infraRequests0.getModifyTime();
-      MockDate mockDate0 = new MockDate((-1949L));
-      Instant instant0 = mockDate0.toInstant();
-      Instant instant1 = MockInstant.plusSeconds(instant0, (-1949L));
-      Date.from(instant1);
-      infraRequests0.getRequestBody();
-      infraRequests0.getNetworkId();
-      infraRequests0.setModifyTime((Timestamp) null);
-      infraRequests0.getEndTime();
-      infraRequests0.getProvStatus();
-      infraRequests0.getRequestAction();
-      infraRequests0.getVfModuleName();
-      infraRequests0.getRequestAction();
-      assertEquals("YpJ&", infraRequests0.getAction());
-      assertEquals("org.openecomp.mso.requestsdb.InfraRequests", infraRequests0.getRequestId());
-  }
-
-  @Test(timeout = 4000)
-  public void test038()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("", "");
-      infraRequests0.setAicCloudRegion((String) null);
-      infraRequests0.setRequestType("_P-9");
-      infraRequests0.getRequestBody();
-      infraRequests0.setRequestStatus("");
-      infraRequests0.setCorrelator(".3!");
-      infraRequests0.setRequestId((String) null);
-      String string0 = infraRequests0.getRequestType();
-      assertEquals("_P-9", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test039()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.setAaiServiceId("");
-      infraRequests0.setCallBackUrl("");
-      infraRequests0.setVnfOutputs("]8N<");
-      infraRequests0.setVfModuleId("");
-      infraRequests0.setCorrelator("]8N<");
-      infraRequests0.setResponseBody("");
-      infraRequests0.setNetworkType("]8N<");
-      infraRequests0.getProgress();
-      infraRequests0.setCallBackUrl("");
-      infraRequests0.getCallBackUrl();
-      infraRequests0.setServiceType("]8N<");
-      infraRequests0.getVnfId();
-      infraRequests0.setRequestAction("");
-      infraRequests0.setVnfName("");
-      infraRequests0.setVnfName("x'+i.S`");
-      infraRequests0.getTenantId();
-      infraRequests0.getAicCloudRegion();
-      infraRequests0.getTenantId();
-      infraRequests0.setStartTime((Timestamp) null);
-      infraRequests0.setRequestId("c");
-      infraRequests0.getRequestType();
-      infraRequests0.getEndTime();
-      infraRequests0.setModifyTime((Timestamp) null);
-      String string0 = infraRequests0.getVnfName();
-      assertEquals("x'+i.S`", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test040()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.setNetworkId("8FcIWeVboHbH");
-      infraRequests0.setVnfId("");
-      infraRequests0.setStatusMessage("");
-      infraRequests0.getClientRequestId();
-      infraRequests0.setNetworkName((String) null);
-      infraRequests0.setVnfName((String) null);
-      infraRequests0.setCallBackUrl("sK9}!C'50J,");
-      infraRequests0.setVolumeGroupId("oC");
-      infraRequests0.getVnfOutputs();
-      infraRequests0.setVnfName("sK9}!C'50J,");
-      infraRequests0.setRequestScope("sK9}!C'50J,");
-      infraRequests0.getRequestAction();
-      infraRequests0.setVnfParams("oC");
-      infraRequests0.getVolumeGroupName();
-      infraRequests0.setResponseBody((String) null);
-      infraRequests0.setNetworkId((String) null);
-      infraRequests0.setProvStatus("");
-      infraRequests0.setAicNodeClli("");
-      infraRequests0.getAaiServiceId();
-      infraRequests0.getCallBackUrl();
-      infraRequests0.getResponseBody();
-      infraRequests0.setAaiServiceId((String) null);
-      infraRequests0.getResponseBody();
-      infraRequests0.getEndTime();
-      infraRequests0.setModifyTime((Timestamp) null);
-      infraRequests0.getServiceType();
-      infraRequests0.setResponseBody("");
-      infraRequests0.getServiceInstanceId();
-      infraRequests0.setRequestBody("J2E*wkiH'm}");
-      assertEquals("sK9}!C'50J,", infraRequests0.getCallBackUrl());
-  }
-
-  @Test(timeout = 4000)
-  public void test041()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.setRequestStatus("gUu8 g");
-      infraRequests0.setClientRequestId("org.openecomp.mso.requestsdb.InfraRequests");
-      infraRequests0.setVnfOutputs("");
-      infraRequests0.setResponseBody("");
-      infraRequests0.setVnfId("");
-      infraRequests0.setAaiServiceId("org.openecomp.mso.requestsdb.InfraRequests");
-      infraRequests0.setAicNodeClli("org.openecomp.mso.requestsdb.InfraRequests");
-      infraRequests0.setVnfParams("org.openecomp.mso.requestsdb.InfraRequests");
-      infraRequests0.setResponseBody("");
-      infraRequests0.getModifyTime();
-      infraRequests0.getVnfOutputs();
-      infraRequests0.getRequestStatus();
-      infraRequests0.setVfModuleId("GrYS{|<Q&Zg22qy+qi");
-      infraRequests0.setStartTime((Timestamp) null);
-      infraRequests0.getVnfOutputs();
-      String string0 = infraRequests0.getRequestAction();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test042()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.setServiceInstanceId((String) null);
-      infraRequests0.setAction("niZk9/S^^Ok_H^a{");
-      infraRequests0.setVfModuleId("niZk9/S^^Ok_H^a{");
-      infraRequests0.setVolumeGroupId("");
-      infraRequests0.setNetworkId("");
-      infraRequests0.setVnfId("");
-      infraRequests0.setRequestType("?_I%o");
-      infraRequests0.setProvStatus("niZk9/S^^Ok_H^a{");
-      infraRequests0.setCallBackUrl("");
-      infraRequests0.setServiceInstanceName("XA&Ybqzx!ro6hEU");
-      infraRequests0.setLastModifiedBy("");
-      infraRequests0.setRequestId("");
-      infraRequests0.getRequestScope();
-      infraRequests0.getNetworkName();
-      infraRequests0.getVnfId();
-      infraRequests0.setAaiServiceId("");
-      infraRequests0.setTenantId("XA&Ybqzx!ro6hEU");
-      infraRequests0.setVolumeGroupId("{O)c");
-      infraRequests0.getAction();
-      infraRequests0.getVolumeGroupName();
-      infraRequests0.getTenantId();
-      infraRequests0.setServiceInstanceId("");
-      assertNull(infraRequests0.getNetworkType());
-  }
-
-  @Test(timeout = 4000)
-  public void test043()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("", "");
-      infraRequests0.setTenantId("");
-      infraRequests0.setNetworkName("");
-      infraRequests0.setAction("");
-      Long long0 = new Long(210L);
-      Long.compare(1164L, 210L);
-      infraRequests0.setProgress(long0);
-      infraRequests0.setVfModuleName("");
-      Timestamp timestamp0 = new Timestamp(0L);
-      timestamp0.toInstant();
-      timestamp0.setTime(210L);
-      Instant instant0 = MockInstant.ofEpochMilli(210L);
-      timestamp0.toLocalDateTime();
-      Date.from(instant0);
-      infraRequests0.setModifyTime(timestamp0);
-      infraRequests0.setAicCloudRegion("org.openecomp.mso.requestsdb.InfraRequests");
-      infraRequests0.setRequestAction("qa^[z3j");
-      infraRequests0.setVnfType("");
-      infraRequests0.getEndTime();
-      infraRequests0.setVnfId("wI");
-      infraRequests0.getAicCloudRegion();
-      infraRequests0.setServiceType("");
-      infraRequests0.getAction();
-      Timestamp timestamp1 = infraRequests0.getStartTime();
-      assertNull(timestamp1);
-  }
-
-  @Test(timeout = 4000)
-  public void test044()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("y_J8g=Q8E|gns?USs", "~6yl5nFR7N_I'Tv@.");
-      infraRequests0.setCallBackUrl("_w^p*-dH4_6v");
-      infraRequests0.setVolumeGroupName("y_J8g=Q8E|gns?USs");
-      String string0 = infraRequests0.getAction();
-      assertEquals("~6yl5nFR7N_I'Tv@.", string0);
-      
-      InfraRequests infraRequests1 = new InfraRequests("S?cD1SU", "");
-      assertEquals("S?cD1SU", infraRequests1.getRequestId());
-  }
-
-  @Test(timeout = 4000)
-  public void test045()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.setVolumeGroupName("");
-      infraRequests0.setServiceInstanceName("");
-      infraRequests0.setVfModuleName("");
-      infraRequests0.setStatusMessage("");
-      infraRequests0.setVnfName("GG-<o?t l");
-      infraRequests0.setVnfName("");
-      infraRequests0.setRequestBody("");
-      infraRequests0.setCallBackUrl("");
-      infraRequests0.setRequestAction("");
-      infraRequests0.setVnfType("");
-      infraRequests0.setVnfId("");
-      infraRequests0.setServiceInstanceId("{CyVx7 >*vO|");
-      infraRequests0.setVnfId("");
-      infraRequests0.getProvStatus();
-      infraRequests0.setProvStatus("{CyVx7 >*vO|");
-      infraRequests0.setAicNodeClli("?g9!S#sMQWI4rg");
-      infraRequests0.setVnfParams("");
-      infraRequests0.setRequestAction("GG-<o?t l");
-      infraRequests0.getRequestType();
-      infraRequests0.getVolumeGroupName();
-      infraRequests0.getRequestAction();
-      infraRequests0.getRequestStatus();
-      InfraRequests infraRequests1 = new InfraRequests();
-      String string0 = infraRequests1.getServiceInstanceId();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test046()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("", "");
-      infraRequests0.setVnfName("");
-      infraRequests0.setServiceInstanceId("");
-      infraRequests0.setVolumeGroupId("");
-      infraRequests0.setNetworkId("?");
-      infraRequests0.setVnfName("");
-      infraRequests0.setServiceType("");
-      infraRequests0.setSource("");
-      infraRequests0.getRequestType();
-      InfraRequests infraRequests1 = new InfraRequests();
-      infraRequests1.setVolumeGroupName(")Na<;z");
-      infraRequests1.setRequestAction("");
-      infraRequests1.getAicNodeClli();
-      infraRequests1.setResponseBody((String) null);
-      infraRequests1.setVnfType((String) null);
-      infraRequests1.getVnfName();
-      infraRequests1.getVnfType();
-      infraRequests0.getServiceInstanceId();
-      infraRequests0.setRequestType("");
-      infraRequests1.getVnfName();
-      infraRequests0.getRequestBody();
-      infraRequests1.getVnfType();
-      infraRequests1.setRequestAction("Yy");
-      infraRequests0.setVnfParams("DnrZ78}s");
-      infraRequests0.setServiceInstanceId("]V55Aq\u0003(z<Ct92L`F");
-      infraRequests1.setVfModuleName((String) null);
-      assertNull(infraRequests1.getNetworkId());
-  }
-
-  @Test(timeout = 4000)
-  public void test047()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("", "");
-      infraRequests0.getAction();
-      infraRequests0.setVnfName("");
-      infraRequests0.getNetworkType();
-      infraRequests0.getVnfParams();
-      infraRequests0.setLastModifiedBy((String) null);
-      String string0 = infraRequests0.getAaiServiceId();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test048()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.setNetworkType("");
-      infraRequests0.setStatusMessage("");
-      infraRequests0.setRequestAction("");
-      infraRequests0.setSource("");
-      infraRequests0.setVnfId((String) null);
-      infraRequests0.setLastModifiedBy((String) null);
-      infraRequests0.setVolumeGroupId((String) null);
-      infraRequests0.setRequestScope("");
-      infraRequests0.getServiceType();
-      infraRequests0.setRequestBody((String) null);
-      infraRequests0.getProgress();
-      infraRequests0.setVnfType((String) null);
-      infraRequests0.setSource((String) null);
-      infraRequests0.getVfModuleModelName();
-      infraRequests0.getStatusMessage();
-      infraRequests0.setResponseBody("");
-      infraRequests0.setRequestStatus((String) null);
-      infraRequests0.getAicCloudRegion();
-      Timestamp timestamp0 = new Timestamp(2519L);
-      infraRequests0.setEndTime(timestamp0);
-      String string0 = infraRequests0.getRequestBody();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test049()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("$V/<$XAp+o>Im\"*", "$V/<$XAp+o>Im\"*");
-      infraRequests0.setNetworkName("$V/<$XAp+o>Im\"*");
-      infraRequests0.setVnfName((String) null);
-      infraRequests0.setVfModuleId("");
-      infraRequests0.getServiceInstanceName();
-      infraRequests0.setAaiServiceId("");
-      infraRequests0.setRequestScope("");
-      infraRequests0.getAaiServiceId();
-      infraRequests0.getModifyTime();
-      infraRequests0.setNetworkName((String) null);
-      infraRequests0.setSource("");
-      infraRequests0.getRequestBody();
-      infraRequests0.setVnfType("");
-      infraRequests0.setStatusMessage("");
-      assertNull(infraRequests0.getVolumeGroupId());
-  }
-
-  @Test(timeout = 4000)
-  public void test050()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.setRequestStatus("");
-      infraRequests0.getServiceInstanceName();
-      infraRequests0.setRequestBody((String) null);
-      infraRequests0.getAction();
-      infraRequests0.setVnfParams("");
-      infraRequests0.setAction((String) null);
-      infraRequests0.getSource();
-      infraRequests0.getAicCloudRegion();
-      infraRequests0.getRequestType();
-      infraRequests0.getClientRequestId();
-      infraRequests0.getServiceInstanceId();
-      infraRequests0.setResponseBody("");
-      infraRequests0.getVolumeGroupId();
-      infraRequests0.getRequestStatus();
-      infraRequests0.getRequestScope();
-      infraRequests0.setAicCloudRegion("");
-      Long long0 = new Long(0L);
-      Long.getLong("TQRm 6Q}I>x7UHTd!cH");
-      // Undeclared exception!
-      try { 
-        Long.remainderUnsigned((-1L), 0L);
-        fail("Expecting exception: ArithmeticException");
-      
-      } catch(ArithmeticException e) {
-         //
-         // BigInteger divide by zero
-         //
-         verifyException("java.math.MutableBigInteger", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test051()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("", "");
-      infraRequests0.setProvStatus("");
-      infraRequests0.setClientRequestId("");
-      infraRequests0.setVnfType("BJ@B");
-      infraRequests0.setProvStatus("");
-      infraRequests0.setRequestType("");
-      infraRequests0.setAaiServiceId("k^;d!:UH+Z");
-      infraRequests0.setRequestType("");
-      infraRequests0.setTenantId("");
-      infraRequests0.getCallBackUrl();
-      InfraRequests infraRequests1 = new InfraRequests();
-      infraRequests1.setVnfName("C,,\"N");
-      infraRequests0.setVnfParams((String) null);
-      InfraRequests infraRequests2 = new InfraRequests("", "");
-      infraRequests1.setVolumeGroupId("");
-      infraRequests2.setTenantId("k^;d!:UH+Z");
-      infraRequests1.setVfModuleName("");
-      infraRequests2.setVnfType("eDfR<b$HYx");
-      infraRequests2.setStatusMessage((String) null);
-      infraRequests2.setVnfId("");
-      infraRequests1.getVolumeGroupId();
-      infraRequests0.setAicCloudRegion("BJ@B");
-      infraRequests1.setNetworkType("");
-      String string0 = infraRequests2.getRequestBody();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test052()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("", "");
-      infraRequests0.setRequestStatus("");
-      infraRequests0.getAicNodeClli();
-      infraRequests0.setVolumeGroupName("=xQ^U6%j?LcGU");
-      infraRequests0.setVolumeGroupId("~L$J");
-      infraRequests0.setVnfOutputs("C");
-      infraRequests0.setVnfId("YU GUY+c}[>6+QI83q");
-      infraRequests0.setVfModuleName("");
-      infraRequests0.getRequestId();
-      infraRequests0.setVfModuleModelName("S9h|[hF*h/aEBZ--");
-      infraRequests0.setCallBackUrl("");
-      infraRequests0.getVnfId();
-      infraRequests0.setVnfParams("");
-      infraRequests0.getSource();
-      infraRequests0.getVnfType();
-      InfraRequests infraRequests1 = new InfraRequests("", "");
-      infraRequests0.setAaiServiceId("S9h|[hF*h/aEBZ--");
-      infraRequests0.setVnfParams("");
-      infraRequests1.getRequestBody();
-      Month month0 = Month.MARCH;
-      // Undeclared exception!
-      try { 
-        MockLocalDateTime.of(1, month0, 1, 1, 0, (-1068));
-        fail("Expecting exception: DateTimeException");
-      
-      } catch(DateTimeException e) {
-         //
-         // Invalid value for SecondOfMinute (valid values 0 - 59): -1068
-         //
-         verifyException("java.time.temporal.ValueRange", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test053()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.setLastModifiedBy("M+YL/d");
-      infraRequests0.setCorrelator("M+YL/d");
-      infraRequests0.getLastModifiedBy();
-      Month month0 = Month.MAY;
-      // Undeclared exception!
-      try { 
-        MockLocalDateTime.of((-574), month0, (-574), (-574), 0);
-        fail("Expecting exception: DateTimeException");
-      
-      } catch(DateTimeException e) {
-         //
-         // Invalid value for DayOfMonth (valid values 1 - 28/31): -574
-         //
-         verifyException("java.time.temporal.ValueRange", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test054()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.setRequestType("");
-      infraRequests0.setEndTime((Timestamp) null);
-      Long long0 = new Long(0L);
-      Long.compare(0L, 0L);
-      Long.min(0L, 0L);
-      infraRequests0.setProvStatus("");
-      Long.compare(0L, 0L);
-      Long.max(0, 0L);
-      Long.divideUnsigned((-1239L), 561L);
-      Long.divideUnsigned(0, 31L);
-      Long.sum(0, 31L);
-      Long.getLong("}'{?rnxwE~m.*b/<", (-2588L));
-      infraRequests0.setProgress(long0);
-      infraRequests0.setProvStatus("");
-      infraRequests0.setVnfParams("");
-      infraRequests0.setRequestScope("Gz0xF^~M`");
-      infraRequests0.setRequestType("");
-      infraRequests0.getAaiServiceId();
-      infraRequests0.setCallBackUrl("");
-      infraRequests0.setNetworkName("");
-      infraRequests0.setRequestStatus("No<5t");
-      infraRequests0.setVolumeGroupId("");
-      infraRequests0.getEndTime();
-      infraRequests0.getProgress();
-      String string0 = infraRequests0.getRequestScope();
-      assertEquals("Gz0xF^~M`", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test055()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("K66EFm]%0}Hi", "K66EFm]%0}Hi");
-      infraRequests0.setVnfName("K66EFm]%0}Hi");
-      infraRequests0.getVfModuleModelName();
-      infraRequests0.getProgress();
-      infraRequests0.setStatusMessage("K66EFm]%0}Hi");
-      infraRequests0.setVolumeGroupId((String) null);
-      infraRequests0.setVolumeGroupName("K66EFm]%0}Hi");
-      infraRequests0.setRequestBody("J1UB");
-      assertNull(infraRequests0.getResponseBody());
-  }
-
-  @Test(timeout = 4000)
-  public void test056()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("", "UwUvkc");
-      infraRequests0.setVolumeGroupName("UwUvkc");
-      infraRequests0.getVfModuleId();
-      ZoneOffset zoneOffset0 = ZoneOffset.MIN;
-      ZoneOffset zoneOffset1 = (ZoneOffset)ZoneId.ofOffset("", zoneOffset0);
-      LocalDateTime localDateTime0 = MockLocalDateTime.now((ZoneId) zoneOffset1);
-      Timestamp timestamp0 = Timestamp.valueOf(localDateTime0);
-      infraRequests0.setModifyTime(timestamp0);
-      String string0 = infraRequests0.getRequestId();
-      assertEquals("", string0);
-      
-      infraRequests0.getCorrelator();
-      assertEquals("UwUvkc", infraRequests0.getAction());
-  }
-
-  @Test(timeout = 4000)
-  public void test057()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.getVnfName();
-      infraRequests0.setAction((String) null);
-      infraRequests0.getVfModuleName();
-      infraRequests0.getNetworkId();
-      infraRequests0.getVnfId();
-      infraRequests0.setRequestId((String) null);
-      infraRequests0.setNetworkId((String) null);
-      infraRequests0.setRequestStatus((String) null);
-      infraRequests0.setAaiServiceId("wL6o_:EmO)#");
-      infraRequests0.setSource((String) null);
-      infraRequests0.setVnfType("yMKDqB`W?]q");
-      infraRequests0.setRequestType((String) null);
-      infraRequests0.setRequestType("");
-      infraRequests0.setRequestScope((String) null);
-      infraRequests0.getVfModuleName();
-      infraRequests0.getVolumeGroupName();
-      infraRequests0.getSource();
-      infraRequests0.setAicCloudRegion((String) null);
-      infraRequests0.getSource();
-      infraRequests0.getRequestBody();
-      infraRequests0.getAaiServiceId();
-      infraRequests0.setVnfType((String) null);
-      String string0 = infraRequests0.getClientRequestId();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test058()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("", "");
-      infraRequests0.setSource("c");
-      infraRequests0.setRequestType("*Q}l.yW`VI`i_Q8YL]");
-      infraRequests0.setRequestId("");
-      infraRequests0.setCorrelator("Y;5!~N0v@x");
-      infraRequests0.setNetworkType("");
-      infraRequests0.setRequestAction("Y;5!~N0v@x");
-      infraRequests0.setLastModifiedBy("");
-      infraRequests0.setSource("");
-      infraRequests0.setAction("");
-      infraRequests0.setTenantId("");
-      infraRequests0.setAicCloudRegion("");
-      infraRequests0.getRequestScope();
-      infraRequests0.setAicNodeClli("Y;5!~N0v@x");
-      infraRequests0.getAicCloudRegion();
-      infraRequests0.setVnfId("qn|b,'x[1 h*z\"#h");
-      assertNull(infraRequests0.getRequestScope());
-  }
-
-  @Test(timeout = 4000)
-  public void test059()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("", "");
-      infraRequests0.setVnfType("SRPBs.zeX&dK@&XRQj");
-      infraRequests0.setCallBackUrl("");
-      infraRequests0.setVnfType("%a26GFoFhBEe");
-      infraRequests0.setServiceInstanceName((String) null);
-      infraRequests0.setVfModuleName((String) null);
-      infraRequests0.getLastModifiedBy();
-      infraRequests0.getVnfType();
-      String string0 = infraRequests0.getServiceInstanceName();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test060()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.getEndTime();
-      MockDate mockDate0 = new MockDate(965L);
-      Instant instant0 = mockDate0.toInstant();
-      Date.from(instant0);
-      infraRequests0.setEndTime((Timestamp) null);
-      infraRequests0.getEndTime();
-      infraRequests0.getCorrelator();
-      Long long0 = new Long(965L);
-      infraRequests0.setProgress(long0);
-      String string0 = infraRequests0.getTenantId();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test061()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("qx?)", "qx?)");
-      Timestamp timestamp0 = new Timestamp(1390L);
-      infraRequests0.setStartTime(timestamp0);
-      infraRequests0.getRequestScope();
-      infraRequests0.setVolumeGroupId("qx?)");
-      infraRequests0.getVolumeGroupId();
-      infraRequests0.setProvStatus((String) null);
-      timestamp0.setNanos(0);
-      infraRequests0.setCorrelator("");
-      infraRequests0.setVnfOutputs("");
-      infraRequests0.setModifyTime(timestamp0);
-      infraRequests0.getServiceType();
-      infraRequests0.setVolumeGroupName("5#&B!D");
-      infraRequests0.setVfModuleId("a");
-      infraRequests0.setNetworkName("a");
-      infraRequests0.getClientRequestId();
-      infraRequests0.setRequestScope("qx?)");
-      infraRequests0.setVolumeGroupName((String) null);
-      infraRequests0.getRequestId();
-      infraRequests0.setRequestScope("-W#aB<Km<U(");
-      infraRequests0.getVnfParams();
-      infraRequests0.getServiceInstanceName();
-      infraRequests0.getCorrelator();
-      infraRequests0.setAicNodeClli("");
-      infraRequests0.setAction("");
-      infraRequests0.setStartTime(timestamp0);
-      assertNull(infraRequests0.getServiceInstanceName());
-  }
-
-  @Test(timeout = 4000)
-  public void test062()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("N.Z5|phE", "");
-      infraRequests0.getClientRequestId();
-      assertEquals("N.Z5|phE", infraRequests0.getRequestId());
-      assertEquals("", infraRequests0.getAction());
-  }
-
-  @Test(timeout = 4000)
-  public void test063()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("", "h.");
-      infraRequests0.setRequestStatus("");
-      infraRequests0.getVnfParams();
-      infraRequests0.setNetworkType("");
-      assertEquals("h.", infraRequests0.getAction());
-      assertEquals("", infraRequests0.getRequestId());
-  }
-
-  @Test(timeout = 4000)
-  public void test064()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("", "");
-      infraRequests0.setRequestType("");
-      infraRequests0.getServiceInstanceId();
-      infraRequests0.setVnfParams("`jECciBa[T7M");
-      infraRequests0.setRequestBody("4ap}Bu0R,P");
-      String string0 = infraRequests0.getRequestType();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test065()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      String string0 = infraRequests0.getAicCloudRegion();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test066()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("org.openecomp.mso.requestsdb.InfraRequests", "org.openecomp.mso.requestsdb.InfraRequests");
-      infraRequests0.setRequestStatus("");
-      infraRequests0.getResponseBody();
-      String string0 = infraRequests0.getRequestAction();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test067()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("", (String) null);
-      infraRequests0.setNetworkId("x^qIF~ru");
-      infraRequests0.setServiceInstanceId("IL'5l;^7N^;>0");
-      infraRequests0.setLastModifiedBy("h dET");
-      infraRequests0.setVfModuleModelName("h dET");
-      infraRequests0.setVnfType("");
-      infraRequests0.setVfModuleId("");
-      infraRequests0.setVfModuleName("");
-      infraRequests0.setClientRequestId("");
-      infraRequests0.setVnfId("W1Vd+");
-      infraRequests0.getVnfName();
-      infraRequests0.getNetworkType();
-      infraRequests0.getServiceInstanceId();
-      infraRequests0.setNetworkName("o-");
-      assertNull(infraRequests0.getServiceType());
-  }
-
-  @Test(timeout = 4000)
-  public void test068()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("4E!AHGB", "");
-      infraRequests0.getRequestStatus();
-      String string0 = infraRequests0.getRequestId();
-      assertEquals("4E!AHGB", string0);
-      
-      infraRequests0.setRequestScope("F");
-      infraRequests0.getVfModuleId();
-      infraRequests0.setAicNodeClli("zM4bS");
-      infraRequests0.setServiceInstanceName("4E!AHGB");
-      infraRequests0.setServiceType("");
-      infraRequests0.getVnfType();
-      infraRequests0.setAicNodeClli((String) null);
-      assertEquals("", infraRequests0.getAction());
-  }
-
-  @Test(timeout = 4000)
-  public void test069()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.setServiceInstanceName("}<+55QA6'/xzr");
-      infraRequests0.getModifyTime();
-      infraRequests0.getProvStatus();
-      infraRequests0.setVnfOutputs("");
-      infraRequests0.getAction();
-      infraRequests0.setAicCloudRegion("~W -^JP41(-Dg'.+|p$");
-      assertNull(infraRequests0.getServiceType());
-  }
-
-  @Test(timeout = 4000)
-  public void test070()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.setAaiServiceId("PJ60cl#^59FDR_>aLqF");
-      infraRequests0.setLastModifiedBy("PJ60cl#^59FDR_>aLqF");
-      infraRequests0.setCorrelator("");
-      infraRequests0.getNetworkType();
-      infraRequests0.setAaiServiceId("PJ60cl#^59FDR_>aLqF");
-      infraRequests0.getAicNodeClli();
-      String string0 = infraRequests0.getVnfType();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test071()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests(" ?)Ec.r]zDe6pa).i", "LZP&!xPsP /f");
-      infraRequests0.setVnfType("5YWNFYfj=3.[9u?N");
-      infraRequests0.setSource("LZP&!xPsP /f");
-      infraRequests0.setVfModuleName("9");
-      infraRequests0.getVnfId();
-      Timestamp timestamp0 = new Timestamp(2083L);
-      LocalDateTime localDateTime0 = timestamp0.toLocalDateTime();
-      Timestamp timestamp1 = Timestamp.valueOf(localDateTime0);
-      infraRequests0.setModifyTime(timestamp1);
-      infraRequests0.getCorrelator();
-      infraRequests0.getEndTime();
-      assertEquals(" ?)Ec.r]zDe6pa).i", infraRequests0.getRequestId());
-      assertEquals("LZP&!xPsP /f", infraRequests0.getAction());
-  }
-
-  @Test(timeout = 4000)
-  public void test072()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.setVnfId("");
-      String string0 = infraRequests0.getVnfId();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test073()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("", "");
-      infraRequests0.setAaiServiceId("");
-      String string0 = infraRequests0.getServiceType();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test074()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.setVolumeGroupName("");
-      String string0 = infraRequests0.getVfModuleId();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test075()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.setVnfOutputs("");
-      infraRequests0.setNetworkId("RU^6`fci#/");
-      infraRequests0.getVolumeGroupId();
-      infraRequests0.getModifyTime();
-      infraRequests0.setVnfType((String) null);
-      String string0 = infraRequests0.getNetworkName();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test076()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      Long long0 = new Long((-1725L));
-      infraRequests0.setProgress(long0);
-      Long long1 = infraRequests0.getProgress();
-      assertEquals((-1725L), (long)long1);
-  }
-
-  @Test(timeout = 4000)
-  public void test077()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("\"}G", "");
-      Timestamp timestamp0 = new Timestamp((-231L));
-      infraRequests0.setModifyTime(timestamp0);
-      infraRequests0.getServiceInstanceId();
-      infraRequests0.getVnfName();
-      infraRequests0.setVfModuleName("org.openecomp.mso.requestsdb.InfraRequests");
-      assertEquals("\"}G", infraRequests0.getRequestId());
-      assertEquals("", infraRequests0.getAction());
-  }
-
-  @Test(timeout = 4000)
-  public void test078()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.getAicNodeClli();
-      infraRequests0.getAicNodeClli();
-      String string0 = infraRequests0.getVnfOutputs();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test079()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      InfraRequests infraRequests1 = new InfraRequests();
-      infraRequests1.getEndTime();
-      infraRequests0.setStartTime((Timestamp) null);
-      infraRequests0.setTenantId("#X=o2!~:^_LF!mu%");
-      assertNull(infraRequests0.getVfModuleModelName());
-  }
-
-  @Test(timeout = 4000)
-  public void test080()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.getNetworkId();
-      infraRequests0.setRequestAction((String) null);
-      infraRequests0.getSource();
-      infraRequests0.setVnfOutputs("5K\u0002}.V3dm%yU_&r");
-      assertNull(infraRequests0.getRequestScope());
-  }
-
-  @Test(timeout = 4000)
-  public void test081()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests((String) null, "org.openecomp.mso.requestsdb.InfraRequests");
-      infraRequests0.setVfModuleName((String) null);
-      infraRequests0.setServiceType("org.openecomp.mso.requestsdb.InfraRequests");
-      infraRequests0.getServiceInstanceId();
-      infraRequests0.getRequestId();
-      infraRequests0.getVolumeGroupId();
-      String string0 = infraRequests0.getNetworkType();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test082()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.setVolumeGroupId("<LXzO");
-      assertNull(infraRequests0.getRequestType());
-  }
-
-  @Test(timeout = 4000)
-  public void test083()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.setRequestAction("");
-      infraRequests0.setServiceInstanceId("");
-      infraRequests0.setAicNodeClli("");
-      assertNull(infraRequests0.getServiceType());
-  }
-
-  @Test(timeout = 4000)
-  public void test084()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("", "Z={83xlme_b)?zb8");
-      infraRequests0.setSource("");
-      infraRequests0.getStartTime();
-      infraRequests0.getSource();
-      infraRequests0.getModifyTime();
-      assertEquals("Z={83xlme_b)?zb8", infraRequests0.getAction());
-      assertEquals("", infraRequests0.getRequestId());
-  }
-
-  @Test(timeout = 4000)
-  public void test085()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.setVnfName("d(8}Oc 4|@w8hBNICH");
-      infraRequests0.setRequestScope("d(8}Oc 4|@w8hBNICH");
-      String string0 = infraRequests0.getAaiServiceId();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test086()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.setVfModuleId("bS&'!@{LdL0&");
-      infraRequests0.setRequestStatus("bS&'!@{LdL0&");
-      infraRequests0.setRequestAction((String) null);
-      infraRequests0.setVfModuleModelName("z");
-      infraRequests0.getSource();
-      infraRequests0.getServiceInstanceName();
-      infraRequests0.getVnfName();
-      String string0 = infraRequests0.getAction();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test087()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.getRequestType();
-      infraRequests0.setVnfOutputs((String) null);
-      infraRequests0.getCorrelator();
-      infraRequests0.setCallBackUrl((String) null);
-      infraRequests0.setVnfParams(">'n");
-      assertNull(infraRequests0.getVfModuleModelName());
-  }
-
-  @Test(timeout = 4000)
-  public void test088()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("I\"as", (String) null);
-      infraRequests0.getVolumeGroupName();
-      infraRequests0.getRequestBody();
-      infraRequests0.setTenantId((String) null);
-      infraRequests0.getResponseBody();
-      // Undeclared exception!
-      try { 
-        MockURI.create((String) null);
-        fail("Expecting exception: NullPointerException");
-      
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("java.net.URI$Parser", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test089()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("", "");
-      infraRequests0.setResponseBody("");
-      infraRequests0.setRequestId("");
-      infraRequests0.setNetworkId("");
-      infraRequests0.getEndTime();
-      infraRequests0.getVolumeGroupId();
-      String string0 = infraRequests0.getStatusMessage();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test090()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests((String) null, "&6KF");
-      infraRequests0.setRequestBody("&6KF");
-      assertNull(infraRequests0.getRequestScope());
-  }
-
-  @Test(timeout = 4000)
-  public void test091()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("/WcV", "/WcV");
-      infraRequests0.setVnfParams("\"w");
-      String string0 = infraRequests0.getVnfParams();
-      assertEquals("\"w", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test092()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests(">?ozK", ">?ozK");
-      infraRequests0.setVnfOutputs(">?ozK");
-      infraRequests0.setVnfId("");
-      infraRequests0.getLastModifiedBy();
-      infraRequests0.setAicCloudRegion((String) null);
-      infraRequests0.setProvStatus(">?ozK");
-      infraRequests0.setStatusMessage((String) null);
-      String string0 = infraRequests0.getRequestScope();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test093()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.setEndTime((Timestamp) null);
-      infraRequests0.setRequestType("");
-      assertNull(infraRequests0.getProvStatus());
-  }
-
-  @Test(timeout = 4000)
-  public void test094()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("", "Z={83xlme_b)?zb8");
-      infraRequests0.getStartTime();
-  }
-
-  @Test(timeout = 4000)
-  public void test095()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      String string0 = infraRequests0.getRequestStatus();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test096()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("gpXsJ>b/G", "gpXsJ>b/G");
-      infraRequests0.setClientRequestId("gpXsJ>b/G");
-      infraRequests0.setCallBackUrl("");
-      infraRequests0.setNetworkType("TF3Cf[F..K");
-      assertNull(infraRequests0.getAicNodeClli());
-  }
-
-  @Test(timeout = 4000)
-  public void test097()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.getVfModuleName();
-      infraRequests0.setAicCloudRegion((String) null);
-      String string0 = infraRequests0.getVnfName();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test098()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.setNetworkName("K|it");
-      infraRequests0.setAction("hc}j,");
-      infraRequests0.getServiceInstanceId();
-      infraRequests0.getCallBackUrl();
-      String string0 = infraRequests0.getVfModuleId();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test099()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      String string0 = infraRequests0.getServiceInstanceId();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test100()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      infraRequests0.getProvStatus();
-      String string0 = infraRequests0.getVfModuleId();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test101()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests();
-      String string0 = infraRequests0.getCallBackUrl();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test102()  throws Throwable  {
-      InfraRequests infraRequests0 = new InfraRequests("", "j28UDln3go*x");
-      assertEquals("j28UDln3go*x", infraRequests0.getAction());
-      
-      infraRequests0.setAction("X;{A n=y");
-      infraRequests0.setTenantId("");
-      assertEquals("", infraRequests0.getRequestId());
-  }
-}
diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/InfraRequestsESTestscaffolding.java b/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/InfraRequestsESTestscaffolding.java
deleted file mode 100644
index 9ab77f5ad2..0000000000
--- a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/InfraRequestsESTestscaffolding.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Wed Dec 14 15:15:48 GMT 2016
- */
-
-package org.openecomp.mso.requestsdb;
-
-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;
-import org.evosuite.runtime.sandbox.Sandbox.SandboxMode;
-
-@EvoSuiteClassExclude
-public class InfraRequestsESTestscaffolding {
-
-  @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.requestsdb.InfraRequests"; 
-    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(InfraRequestsESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.requestsdb.InfraRequests"
-    );
-  } 
-
-  private static void resetClasses() {
-    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(InfraRequestsESTestscaffolding.class.getClassLoader()); 
-
-    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
-      "org.openecomp.mso.requestsdb.InfraRequests"
-    );
-  }
-}
diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/RequestsDatabaseESTest.java b/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/RequestsDatabaseESTest.java
deleted file mode 100644
index 7c1b39979a..0000000000
--- a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/RequestsDatabaseESTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Wed Dec 14 15:15:27 GMT 2016
- */
-
-package org.openecomp.mso.requestsdb;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.evosuite.runtime.PrivateAccess;
-import org.junit.runner.RunWith;
-import org.openecomp.mso.requestsdb.RequestsDatabase;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
-public class RequestsDatabaseESTest extends RequestsDatabaseESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test0()  throws Throwable  {
-      RequestsDatabase requestsDatabase0 = (RequestsDatabase)PrivateAccess.callDefaultConstructorOfTheClassUnderTest();
-      assertNotNull(requestsDatabase0);
-  }
-}
diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/RequestsDatabaseESTestscaffolding.java b/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/RequestsDatabaseESTestscaffolding.java
deleted file mode 100644
index 6d5c31ff57..0000000000
--- a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/RequestsDatabaseESTestscaffolding.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Wed Dec 14 15:15:27 GMT 2016
- */
-
-package org.openecomp.mso.requestsdb;
-
-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;
-import org.evosuite.runtime.sandbox.Sandbox.SandboxMode;
-
-@EvoSuiteClassExclude
-public class RequestsDatabaseESTestscaffolding {
-
-  @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.requestsdb.RequestsDatabase"; 
-    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(RequestsDatabaseESTestscaffolding.class.getClassLoader() ,
-      "com.att.eelf.i18n.EELFResourceManager$RESOURCE_TYPES",
-      "com.att.eelf.configuration.EELFLogger",
-      "org.hibernate.engine.spi.Mapping",
-      "org.hibernate.criterion.Order",
-      "org.openecomp.mso.requestsdb.InfraRequests",
-      "org.openecomp.mso.requestsdb.HibernateUtil",
-      "com.att.eelf.configuration.SLF4jWrapper",
-      "org.hibernate.Query",
-      "com.att.eelf.i18n.EELFResourceManager",
-      "org.openecomp.mso.requestsdb.RequestsDatabase",
-      "org.openecomp.mso.logger.MsoLogger$ErrorCode",
-      "org.hibernate.criterion.Criterion",
-      "org.openecomp.mso.requestsdb.InfraActiveRequests",
-      "org.openecomp.mso.logger.MessageEnum",
-      "com.att.eelf.i18n.EELFResolvableErrorEnum",
-      "org.openecomp.mso.logger.MsoLogger$Catalog",
-      "org.openecomp.mso.logger.MsoLogger$StatusCode",
-      "org.hibernate.SessionFactory",
-      "com.att.eelf.configuration.EELFManager",
-      "com.att.eelf.i18n.EELFMsgs",
-      "org.openecomp.mso.entity.MsoRequest",
-      "com.att.eelf.configuration.EELFLogger$Level",
-      "org.hibernate.BasicQueryContract",
-      "org.openecomp.mso.logger.MsoLogger$ResponseCode",
-      "org.openecomp.mso.requestsdb.MockRequestsDatabase",
-      "org.openecomp.mso.requestsdb.SiteStatus",
-      "org.openecomp.mso.logger.MsoLogger"
-    );
-  } 
-
-  private static void resetClasses() {
-    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(RequestsDatabaseESTestscaffolding.class.getClassLoader()); 
-
-    org.evosuite.runtime.classhandling.ClassStateSupport.resetClasses(
-      "com.att.eelf.i18n.EELFResourceManager",
-      "org.openecomp.mso.logger.MessageEnum",
-      "org.openecomp.mso.logger.MsoLogger$Catalog",
-      "org.openecomp.mso.logger.MsoLogger",
-      "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.MsoLogger$ErrorCode",
-      "org.openecomp.mso.requestsdb.HibernateUtil",
-      "org.openecomp.mso.logger.MsoLogger$StatusCode",
-      "org.openecomp.mso.logger.MsoLogger$ResponseCode",
-      "org.openecomp.mso.requestsdb.RequestsDatabase"
-    );
-  }
-}
diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/SiteStatusESTest.java b/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/SiteStatusESTest.java
deleted file mode 100644
index 75d7b19c33..0000000000
--- a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/SiteStatusESTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Wed Dec 14 15:16:15 GMT 2016
- */
-
-package org.openecomp.mso.requestsdb;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-import java.sql.Timestamp;
-import java.time.Instant;
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.evosuite.runtime.mock.java.time.MockInstant;
-import org.junit.runner.RunWith;
-import org.openecomp.mso.requestsdb.SiteStatus;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
-public class SiteStatusESTest extends SiteStatusESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test0()  throws Throwable  {
-      SiteStatus siteStatus0 = new SiteStatus();
-      siteStatus0.setSiteName("h8w;`)o;(SRi+0Q-");
-      String string0 = siteStatus0.getSiteName();
-      assertEquals("h8w;`)o;(SRi+0Q-", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test1()  throws Throwable  {
-      SiteStatus siteStatus0 = new SiteStatus();
-      siteStatus0.setSiteName("");
-      String string0 = siteStatus0.getSiteName();
-      assertEquals("", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test2()  throws Throwable  {
-      SiteStatus siteStatus0 = new SiteStatus();
-      Timestamp timestamp0 = new Timestamp((-1L));
-      siteStatus0.setCreated(timestamp0);
-      Timestamp timestamp1 = siteStatus0.getCreated();
-      assertSame(timestamp1, timestamp0);
-  }
-
-  @Test(timeout = 4000)
-  public void test3()  throws Throwable  {
-      SiteStatus siteStatus0 = new SiteStatus();
-      Instant instant0 = MockInstant.ofEpochSecond(5121L);
-      Timestamp timestamp0 = Timestamp.from(instant0);
-      siteStatus0.setCreated(timestamp0);
-      Timestamp timestamp1 = siteStatus0.getCreated();
-      assertEquals(0, timestamp1.getNanos());
-  }
-
-  @Test(timeout = 4000)
-  public void test4()  throws Throwable  {
-      SiteStatus siteStatus0 = new SiteStatus();
-      boolean boolean0 = siteStatus0.getStatus();
-      assertFalse(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test5()  throws Throwable  {
-      SiteStatus siteStatus0 = new SiteStatus();
-      String string0 = siteStatus0.getSiteName();
-      assertNull(string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test6()  throws Throwable  {
-      SiteStatus siteStatus0 = new SiteStatus();
-      siteStatus0.setStatus(true);
-      boolean boolean0 = siteStatus0.getStatus();
-      assertTrue(boolean0);
-  }
-
-  @Test(timeout = 4000)
-  public void test7()  throws Throwable  {
-      SiteStatus siteStatus0 = new SiteStatus();
-      String string0 = siteStatus0.toString();
-      assertEquals("SiteStatus{status=false, siteName='null', created=null}", string0);
-  }
-
-  @Test(timeout = 4000)
-  public void test8()  throws Throwable  {
-      SiteStatus siteStatus0 = new SiteStatus();
-      Timestamp timestamp0 = siteStatus0.getCreated();
-      assertNull(timestamp0);
-  }
-}
diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/SiteStatusESTestscaffolding.java b/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/SiteStatusESTestscaffolding.java
deleted file mode 100644
index 2d50450c60..0000000000
--- a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/SiteStatusESTestscaffolding.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Wed Dec 14 15:16:15 GMT 2016
- */
-
-package org.openecomp.mso.requestsdb;
-
-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;
-import org.evosuite.runtime.sandbox.Sandbox.SandboxMode;
-
-@EvoSuiteClassExclude
-public class SiteStatusESTestscaffolding {
-
-  @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.requestsdb.SiteStatus"; 
-    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(SiteStatusESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.logger.MessageEnum",
-      "com.att.eelf.i18n.EELFResolvableErrorEnum",
-      "org.openecomp.mso.logger.MsoLogger$Catalog",
-      "org.openecomp.mso.logger.MsoLogger$StatusCode",
-      "com.att.eelf.i18n.EELFResourceManager$RESOURCE_TYPES",
-      "com.att.eelf.configuration.EELFManager",
-      "com.att.eelf.configuration.EELFLogger",
-      "com.att.eelf.i18n.EELFMsgs",
-      "org.openecomp.mso.entity.MsoRequest",
-      "com.att.eelf.configuration.EELFLogger$Level",
-      "org.openecomp.mso.logger.MsoLogger$ResponseCode",
-      "com.att.eelf.configuration.SLF4jWrapper",
-      "com.att.eelf.i18n.EELFResourceManager",
-      "org.openecomp.mso.requestsdb.SiteStatus",
-      "org.openecomp.mso.logger.MsoLogger",
-      "org.openecomp.mso.logger.MsoLogger$ErrorCode"
-    );
-  } 
-
-  private static void resetClasses() {
-    org.evosuite.runtime.classhandling.ClassResetter.getInstance().setClassLoader(SiteStatusESTestscaffolding.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.requestsdb.SiteStatus"
-    );
-  }
-}
diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/adapter/TimestampXMLAdapterESTest.java b/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/adapter/TimestampXMLAdapterESTest.java
deleted file mode 100644
index ea3238916e..0000000000
--- a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/adapter/TimestampXMLAdapterESTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * This file was automatically generated by EvoSuite
- * Wed Dec 14 15:14:31 GMT 2016
- */
-
-package org.openecomp.mso.requestsdb.adapter;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.evosuite.runtime.EvoAssertions.*;
-import java.sql.Timestamp;
-import org.evosuite.runtime.EvoRunner;
-import org.evosuite.runtime.EvoRunnerParameters;
-import org.junit.runner.RunWith;
-import org.openecomp.mso.requestsdb.adapter.TimestampXMLAdapter;
-
-@RunWith(EvoRunner.class) @EvoRunnerParameters(mockJVMNonDeterminism = true, useVFS = true, useVNET = true, resetStaticState = true, useJEE = true) 
-public class TimestampXMLAdapterESTest extends TimestampXMLAdapterESTestscaffolding {
-
-  @Test(timeout = 4000)
-  public void test0()  throws Throwable  {
-      TimestampXMLAdapter timestampXMLAdapter0 = new TimestampXMLAdapter();
-      Long long0 = new Long((-3027L));
-      Timestamp timestamp0 = timestampXMLAdapter0.unmarshal(long0);
-      Long long1 = timestampXMLAdapter0.marshal(timestamp0);
-      assertTrue(long1.equals((Object)long0));
-  }
-
-  @Test(timeout = 4000)
-  public void test1()  throws Throwable  {
-      TimestampXMLAdapter timestampXMLAdapter0 = new TimestampXMLAdapter();
-      Long long0 = new Long(861L);
-      Timestamp timestamp0 = timestampXMLAdapter0.unmarshal(long0);
-      Long long1 = timestampXMLAdapter0.marshal(timestamp0);
-      assertEquals(861L, (long)long1);
-  }
-
-  @Test(timeout = 4000)
-  public void test2()  throws Throwable  {
-      TimestampXMLAdapter timestampXMLAdapter0 = new TimestampXMLAdapter();
-      try { 
-        timestampXMLAdapter0.marshal((Timestamp) null);
-        fail("Expecting exception: NullPointerException");
-      
-      } catch(NullPointerException e) {
-         //
-         // no message in exception (getMessage() returned null)
-         //
-         verifyException("org.openecomp.mso.requestsdb.adapter.TimestampXMLAdapter", e);
-      }
-  }
-
-  @Test(timeout = 4000)
-  public void test3()  throws Throwable  {
-      TimestampXMLAdapter timestampXMLAdapter0 = new TimestampXMLAdapter();
-      Timestamp timestamp0 = timestampXMLAdapter0.unmarshal((Long) null);
-      Long long0 = timestampXMLAdapter0.marshal(timestamp0);
-      assertEquals(0L, (long)long0);
-  }
-
-  @Test(timeout = 4000)
-  public void test4()  throws Throwable  {
-      TimestampXMLAdapter timestampXMLAdapter0 = new TimestampXMLAdapter();
-      Long long0 = new Long(497L);
-      Timestamp timestamp0 = timestampXMLAdapter0.unmarshal(long0);
-      Long long1 = timestampXMLAdapter0.marshal(timestamp0);
-      assertEquals(497L, (long)long1);
-  }
-}
diff --git a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/adapter/TimestampXMLAdapterESTestscaffolding.java b/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/adapter/TimestampXMLAdapterESTestscaffolding.java
deleted file mode 100644
index 0fdfcd2c07..0000000000
--- a/mso-api-handlers/mso-requests-db/src/test/java/org/openecomp/mso/requestsdb/adapter/TimestampXMLAdapterESTestscaffolding.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * Scaffolding file used to store all the setups needed to run 
- * tests automatically generated by EvoSuite
- * Wed Dec 14 15:14:31 GMT 2016
- */
-
-package org.openecomp.mso.requestsdb.adapter;
-
-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;
-import org.evosuite.runtime.sandbox.Sandbox.SandboxMode;
-
-@EvoSuiteClassExclude
-public class TimestampXMLAdapterESTestscaffolding {
-
-  @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.requestsdb.adapter.TimestampXMLAdapter"; 
-    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(TimestampXMLAdapterESTestscaffolding.class.getClassLoader() ,
-      "org.openecomp.mso.requestsdb.adapter.TimestampXMLAdapter"
-    );
-  } 
-
-  private static void resetClasses() {
-  }
-}