[POLICY-73] replace openecomp for policy-engine

Change-Id: I54072f6bcd388c0e05562614ee89b4ae7ad67004
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

5 files changed, 0 insertions, 2901 deletions

diff --git a/ECOMP-PAP-REST/src/test/java/org/openecomp/policy/pap/ia/DbAuditCompareEntriesTest.java b/ECOMP-PAP-REST/src/test/java/org/openecomp/policy/pap/ia/DbAuditCompareEntriesTest.java
deleted file mode 100644
index 2fef9a7cb..000000000
--- a/ECOMP-PAP-REST/src/test/java/org/openecomp/policy/pap/ia/DbAuditCompareEntriesTest.java
+++ /dev/null
@@ -1,450 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.pap.ia;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Properties;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.Persistence;
-
-import org.apache.commons.lang3.SerializationUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.openecomp.policy.common.ia.DbAudit;
-import org.openecomp.policy.common.ia.DbDAO;
-import org.openecomp.policy.common.ia.IntegrityAuditProperties;
-import org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity;
-import org.openecomp.policy.common.im.jpa.ForwardProgressEntity;
-import org.openecomp.policy.common.im.jpa.ResourceRegistrationEntity;
-import org.openecomp.policy.common.im.jpa.StateManagementEntity;
-import org.openecomp.policy.jpa.BackUpMonitorEntity;
-
-public class DbAuditCompareEntriesTest {
-
-	private static Log logger = LogFactory.getLog(DbAuditCompareEntriesTest.class);
-	private DbDAO dbDAO;
-	private String persistenceUnit;
-	private Properties properties;
-	private String resourceName;
-	private String dbDriver;
-	private String dbUrl;
-	private String dbUser;
-	private String dbPwd;
-	private String siteName;
-	private String nodeType;
-	
-	@Before
-	public void setUp() throws Exception {
-		logger.info("setUp: Entering");
-
-		properties = new Properties();
-		properties.put(IntegrityAuditProperties.DB_DRIVER, IntegrityAuditProperties.DEFAULT_DB_DRIVER);
-		properties.put(IntegrityAuditProperties.DB_URL, "jdbc:h2:file:./sql/xacmlTest");
-		properties.put(IntegrityAuditProperties.DB_USER, IntegrityAuditProperties.DEFAULT_DB_USER);
-		properties.put(IntegrityAuditProperties.DB_PWD, IntegrityAuditProperties.DEFAULT_DB_PWD);
-		properties.put(IntegrityAuditProperties.SITE_NAME, "SiteA");
-		properties.put(IntegrityAuditProperties.NODE_TYPE, "pap");
-
-		dbDriver = IntegrityAuditProperties.DEFAULT_DB_DRIVER;
-		dbUrl = "jdbc:h2:file:./sql/xacmlTest";
-		dbUser = IntegrityAuditProperties.DEFAULT_DB_USER;
-		dbPwd = IntegrityAuditProperties.DEFAULT_DB_PWD;
-		siteName = "SiteA";
-		nodeType = "pap";
-		persistenceUnit = "testPapPU";
-		resourceName = "siteA.pap1";
-		
-		//Clean the iaTest DB table for IntegrityAuditEntity entries
-		cleanDb(persistenceUnit, properties);
-		
-		logger.info("setUp: Exiting");
-	}
-
-	@After
-	public void tearDown() throws Exception {
-		logger.info("tearDown: Entering");
-		//nothing to do
-		logger.info("tearDown: Exiting");
-	}
-	
-	public void cleanDb(String persistenceUnit, Properties properties){
-		logger.debug("cleanDb: enter");
-
-		EntityManagerFactory emf = Persistence.createEntityManagerFactory(persistenceUnit, properties);
-		
-		EntityManager em = emf.createEntityManager();
-		// Start a transaction
-		EntityTransaction et = em.getTransaction();
-
-		et.begin();
-
-		// Clean up the DB
-		em.createQuery("Delete from IntegrityAuditEntity").executeUpdate();
-
-		// commit transaction
-		et.commit();
-		em.close();
-		logger.debug("cleanDb: exit");
-	}
-	
-
-	/*
-	 * Tests that a comparison between hashsets is successful if
-	 * the entries match
-	 */
-	@Test
-	public void runAllTests() throws Exception {
-		logger.info("runAllTests: Entering");
-		
-		
-		testIntegrityAuditEntity();
-		testBackupMonitorEntity();
-		testStateManagementEntity();
-		testForwardProgressEntity();
-		testResourceRegistrationEntity();
-		
-		//clean up the IntegrityAuditEntity table
-		cleanDb(persistenceUnit, properties);
-		
-		logger.info("runAllTests: Exit");
-	}
-
-
-	public void testIntegrityAuditEntity() throws Exception {
-		logger.info("testIntegrityAuditEntity: Entering");
-		
-		dbDAO = new DbDAO(resourceName, persistenceUnit, properties);
-		DbAudit dbAudit = new DbAudit(dbDAO);
-		
-		String className = null;
-		//There is only one entry IntegrityAuditEntity, but we will check anyway
-		HashSet<String> classNameSet = dbDAO.getPersistenceClassNames();
-		for(String c : classNameSet){
-			if (c.equals("org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity")){
-				className = c;
-			}
-		}
-		String resourceName1 = resourceName;
-		String resourceName2 = resourceName;
-		
-		IntegrityAuditEntity entry1 = new IntegrityAuditEntity();
-		IntegrityAuditEntity entry2 = new IntegrityAuditEntity();
-		Date date = new Date();
-		
-		/*
-		 * Two entries with the same field values
-		 */
-		entry1.setDesignated(false);
-		entry1.setJdbcDriver(dbDriver);
-		entry1.setJdbcPassword(dbPwd);
-		entry1.setJdbcUrl(dbUrl);
-		entry1.setJdbcUser(dbUser);
-		entry1.setLastUpdated(date);
-		entry1.setNodeType(nodeType);
-		entry1.setPersistenceUnit(persistenceUnit);
-		entry1.setResourceName(resourceName1);
-		entry1.setSite(siteName);
-		
-		entry2 = SerializationUtils.clone(entry1);
-		
-		dbAudit.writeAuditDebugLog(className, resourceName1, resourceName2, entry1, entry2);
-		
-		HashMap<Object, Object> myEntries = new HashMap<>();
-		HashMap<Object, Object> theirEntries = new HashMap<>();
-		
-		myEntries.put("pdp1", entry1);
-		theirEntries.put("pdp1", entry2);
-				
-		HashSet<Object> result = dbAudit.compareEntries(myEntries, theirEntries);
-		
-		/*
-		 * Assert that there are no mismatches returned
-		 */
-		assertTrue(result.isEmpty());
-		
-		/*
-		 * ************************************
-		 * Now test with a mis-matched entry
-		 * ************************************
-		 */
-		
-		/*
-		 * Change the entry2 to different designated value
-		 */
-		entry2.setDesignated(true);
-				
-		myEntries = new HashMap<>();
-		theirEntries = new HashMap<>();
-		
-		myEntries.put("pdp1", entry1);
-		theirEntries.put("pdp1", entry2);
-		
-		result = dbAudit.compareEntries(myEntries, theirEntries);
-		
-		/*
-		 * Assert that there was one mismatch
-		 */
-		assertEquals(1, result.size());
-		logger.info("testIntegrityAuditEntity: Exit");
-	}
-	
-	void testBackupMonitorEntity() throws Exception {
-		logger.info("testBackupMonitorEntity: Entering");
-		
-		dbDAO = new DbDAO(resourceName, persistenceUnit, properties);
-		DbAudit dbAudit = new DbAudit(dbDAO);
-		
-		BackUpMonitorEntity entry1 = new BackUpMonitorEntity();
-		BackUpMonitorEntity entry2 = new BackUpMonitorEntity();
-		
-		// Two entries with the same field values
-		 
-		
-		entry1.setFlag("flag1");
-		entry1.setResoruceNodeName("node1");
-		entry1.setResourceName("resourceName");
-		entry1.setTimeStamp(new Date());
-		
-		// Clone the first entry
-		entry2 = SerializationUtils.clone(entry1);
-		
-		HashMap<Object, Object> myEntries = new HashMap<>();
-		HashMap<Object, Object> theirEntries = new HashMap<>();
-		
-		myEntries.put("pdp1", entry1);
-		theirEntries.put("pdp1", entry2);
-				
-		HashSet<Object> result = dbAudit.compareEntries(myEntries, theirEntries);
-		
-		
-		// Assert that there are no mismatches returned
-		 
-		assertTrue(result.isEmpty());
-		
-		
-		 /* ************************************
-		 * Now test with a mis-matched entry
-		 * ************************************/
-		 
-		
-		
-		// Change a field on entry2
-		 
-		entry2.setFlag("flag2");
-				
-		myEntries = new HashMap<>();
-		theirEntries = new HashMap<>();
-		
-		myEntries.put("pdp1", entry1);
-		theirEntries.put("pdp1", entry2);
-		
-		result = dbAudit.compareEntries(myEntries, theirEntries);
-		
-		
-		//Assert that there was one mismatch
-		 
-		assertEquals(1, result.size());
-		logger.info("testBackupMonitorEntity: Exit");
-	}
-
-	void testStateManagementEntity() throws Exception {
-		logger.info("testStateManagementEntity: Entering");
-		
-		dbDAO = new DbDAO(resourceName, persistenceUnit, properties);
-		DbAudit dbAudit = new DbAudit(dbDAO);
-		
-		StateManagementEntity entry1 = new StateManagementEntity();
-		StateManagementEntity entry2 = new StateManagementEntity();
-		
-		// Two entries with the same field values
-		
-		entry1.setAdminState("locked");
-		entry1.setAvailStatus("null");
-		entry1.setModifiedDate(new Date());
-		entry1.setOpState("enabled");
-		entry1.setResourceName("myResource");
-		entry1.setStandbyStatus("coldstandby");
-		
-		// Clone the first entry
-		entry2 = SerializationUtils.clone(entry1);
-		
-		HashMap<Object, Object> myEntries = new HashMap<>();
-		HashMap<Object, Object> theirEntries = new HashMap<>();
-		
-		myEntries.put("pdp1", entry1);
-		theirEntries.put("pdp1", entry2);
-				
-		HashSet<Object> result = dbAudit.compareEntries(myEntries, theirEntries);
-		
-		
-		// Assert that there are no mismatches returned
-		 
-		assertTrue(result.isEmpty());
-		
-		
-		 /* ************************************
-		 * Now test with a mis-matched entry
-		 * ************************************/
-		 
-		
-		
-		// Change a field on entry2
-		 
-		entry2.setAdminState("unlocked");
-				
-		myEntries = new HashMap<>();
-		theirEntries = new HashMap<>();
-		
-		myEntries.put("pdp1", entry1);
-		theirEntries.put("pdp1", entry2);
-		
-		result = dbAudit.compareEntries(myEntries, theirEntries);
-		
-		
-		//Assert that there was one mismatch
-		 
-		assertEquals(1, result.size());
-		logger.info("testStateManagementEntity: Exit");
-	}
-	
-	void testForwardProgressEntity() throws Exception {
-		logger.info("testForwardProgressEntity: Entering");
-		
-		dbDAO = new DbDAO(resourceName, persistenceUnit, properties);
-		DbAudit dbAudit = new DbAudit(dbDAO);
-		
-		ForwardProgressEntity entry1 = new ForwardProgressEntity();
-		ForwardProgressEntity entry2 = new ForwardProgressEntity();
-
-		// Two entries with the same field values
-		
-		entry1.setFpcCount(123L);
-		entry1.setLastUpdated(new Date());
-		entry1.setResourceName("myResource");
-		
-		// Clone the first entry
-		entry2 = SerializationUtils.clone(entry1);
-		
-		HashMap<Object, Object> myEntries = new HashMap<Object, Object>();
-		HashMap<Object, Object> theirEntries = new HashMap<Object, Object>();
-		
-		myEntries.put("pdp1", entry1);
-		theirEntries.put("pdp1", entry2);
-				
-		HashSet<Object> result = dbAudit.compareEntries(myEntries, theirEntries);
-		
-		
-		// Assert that there are no mismatches returned
-		 
-		assertTrue(result.isEmpty());
-		
-		
-		 /* ************************************
-		 * Now test with a mis-matched entry
-		 * ************************************/
-		
-		// Change a field on entry2
-		 
-		entry2.setFpcCount(321L);
-				
-		myEntries = new HashMap<>();
-		theirEntries = new HashMap<>();
-		
-		myEntries.put("pdp1", entry1);
-		theirEntries.put("pdp1", entry2);
-		
-		result = dbAudit.compareEntries(myEntries, theirEntries);
-		
-		
-		//Assert that there was one mismatch
-		 
-		assertEquals(1, result.size());
-		logger.info("testForwardProgressEntity: Exit");
-	}
-
-	void testResourceRegistrationEntity() throws Exception {
-		logger.info("testResourceRegistrationEntity: Entering");
-		
-		dbDAO = new DbDAO(resourceName, persistenceUnit, properties);
-		DbAudit dbAudit = new DbAudit(dbDAO);
-		
-		ResourceRegistrationEntity entry1 = new ResourceRegistrationEntity();
-		ResourceRegistrationEntity entry2 = new ResourceRegistrationEntity();
-		
-		// Two entries with the same field values
-		
-		entry1.setNodeType("pap");
-		entry1.setLastUpdated(new Date());
-		entry1.setResourceName("myResource");
-		entry1.setResourceUrl("http://nowhere.com");
-		entry1.setSite("site_1");
-		
-		// Clone the first entry
-		entry2 = SerializationUtils.clone(entry1);
-		
-		HashMap<Object, Object> myEntries = new HashMap<>();
-		HashMap<Object, Object> theirEntries = new HashMap<>();
-		
-		myEntries.put("pdp1", entry1);
-		theirEntries.put("pdp1", entry2);
-				
-		HashSet<Object> result = dbAudit.compareEntries(myEntries, theirEntries);
-		
-		
-		// Assert that there are no mismatches returned
-		 
-		assertTrue(result.isEmpty());
-		
-		
-		 /* ************************************
-		 * Now test with a mis-matched entry
-		 * ************************************/
-		
-		// Change a field on entry2
-		 
-		entry2.setSite("site_1a");
-				
-		myEntries = new HashMap<>();
-		theirEntries = new HashMap<>();
-		
-		myEntries.put("pdp1", entry1);
-		theirEntries.put("pdp1", entry2);
-		
-		result = dbAudit.compareEntries(myEntries, theirEntries);
-		
-		
-		//Assert that there was one mismatch
-		 
-		assertEquals(1, result.size());
-		logger.info("testResourceRegistrationEntity: Exit");
-	}
-}
\ No newline at end of file
diff --git a/ECOMP-PAP-REST/src/test/java/org/openecomp/policy/pap/xacml/rest/components/PolicyDBDaoTest.java b/ECOMP-PAP-REST/src/test/java/org/openecomp/policy/pap/xacml/rest/components/PolicyDBDaoTest.java
deleted file mode 100644
index 9d7fae209..000000000
--- a/ECOMP-PAP-REST/src/test/java/org/openecomp/policy/pap/xacml/rest/components/PolicyDBDaoTest.java
+++ /dev/null
@@ -1,636 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.pap.xacml.rest.components;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Paths;
-import java.util.Date;
-import java.util.List;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
-import javax.persistence.PersistenceException;
-import javax.persistence.Query;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-import org.junit.After;
-import org.junit.Assert;
-//import org.apache.commons.logging.Log;
-//import org.apache.commons.logging.LogFactory;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.pap.xacml.rest.components.PolicyDBDao.PolicyDBDaoTestClass;
-import org.openecomp.policy.rest.XACMLRestProperties;
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
-import org.openecomp.policy.rest.jpa.GroupEntity;
-import org.openecomp.policy.rest.jpa.PdpEntity;
-import org.openecomp.policy.rest.jpa.PolicyEntity;
-import org.openecomp.policy.xacml.api.pap.EcompPDPGroup;
-import org.openecomp.policy.xacml.std.pap.StdPDPGroup;
-import org.openecomp.policy.xacml.util.XACMLPolicyWriter;
-
-import com.att.research.xacml.api.pap.PAPException;
-import com.att.research.xacml.util.XACMLProperties;
-
-import oasis.names.tc.xacml._3_0.core.schema.wd_17.PolicyType;
-
-public class PolicyDBDaoTest {
-
-	private static Logger logger = FlexLogger.getLogger(PolicyDBDaoTest.class);
-	
-	PolicyDBDaoTestClass d;
-	PolicyDBDao dbd;
-	PolicyDBDao dbd2;
-	EntityManagerFactory emf;
-	@Before
-	public void init(){
-		System.setProperty(XACMLProperties.XACML_PROPERTIES_NAME,"xacml.pap.properties");
-		emf = Persistence.createEntityManagerFactory("testPapPU");
-		EntityManager em = emf.createEntityManager();
-		em.getTransaction().begin();
-		try{	
-			em.createQuery("DELETE FROM PolicyDBDaoEntity").executeUpdate();
-			em.createQuery("DELETE FROM PolicyEntity").executeUpdate();
-			em.createQuery("DELETE FROM ConfigurationDataEntity").executeUpdate();
-			em.createQuery("DELETE FROM ActionBodyEntity").executeUpdate();
-			em.createQuery("DELETE FROM PdpEntity").executeUpdate();
-			em.createQuery("DELETE FROM GroupEntity").executeUpdate();
-
-			em.getTransaction().commit();
-		} catch(Exception e){
-			logger.error("Exception Occured"+e);
-			em.getTransaction().rollback();
-		}
-		em.close();
-		try {
-			dbd = PolicyDBDao.getPolicyDBDaoInstance(emf);
-			dbd2 = PolicyDBDao.getPolicyDBDaoInstance(emf);
-		} catch (Exception e) {
-			//logger.error("Exception Occured"+e);
-			Assert.fail();
-		}
-
-		d = PolicyDBDao.getPolicyDBDaoTestClass();
-	}
-	
-	@After
-	public void cleanUp(){
-		EntityManager em = emf.createEntityManager();
-		em.getTransaction().begin();
-		try{	
-		em.createQuery("DELETE FROM PolicyDBDaoEntity").executeUpdate(); 
-		em.createQuery("DELETE FROM PolicyEntity").executeUpdate(); 
-		em.createQuery("DELETE FROM ConfigurationDataEntity").executeUpdate();
-		em.createQuery("DELETE FROM ActionBodyEntity").executeUpdate();
-		em.createQuery("DELETE FROM PdpEntity").executeUpdate();
-		em.createQuery("DELETE FROM GroupEntity").executeUpdate();
-
-		em.getTransaction().commit();
-		} catch(Exception e){
-			em.getTransaction().rollback();
-		}
-		em.close();
-		try {
-			FileUtils.forceDelete(new File("src/test/resources/junitTestCreatedDirectory"));
-		} catch (IOException e) {
-			//could not delete
-		}
-
-	}
-	
-	@Test
-	public void computeScopeTest(){
-		Assert.assertEquals("com",d.computeScope("C:\\Users\\testuser\\admin\\repo\\com\\", "C:\\Users\\testuser\\admin\\repo"));
-		Assert.assertEquals("org.openecomp.policy",d.computeScope("/Users/testuser/admin/repo/org/openecomp/policy", "/Users/testuser/admin/repo"));
-	}
-	@Test
-	public void getConfigFileTest(){
-		PolicyRestAdapter pra = new PolicyRestAdapter();
-		pra.setConfigType(ConfigPolicy.JSON_CONFIG);
-		String configFile = d.getConfigFile("Config_mypolicy.xml", "org.openecomp", pra);
-		Assert.assertEquals("org.openecomp.Config_mypolicy.json", configFile);
-		//yes, we can do action files too even though they don't have configs
-		configFile = d.getConfigFile("Action_mypolicy.xml", "org.openecomp", pra);
-		Assert.assertEquals("org.openecomp.Action_mypolicy.json", configFile);
-	}
-	
-	@Ignore
-	@Test
-	public void createFromPolicyObject(){
-		String workspaceDir = "src/test/resources/";
-		File parentPath = new File(workspaceDir+"/com");
-		Policy policyObject = new ConfigPolicy();
-		policyObject.policyAdapter = new PolicyRestAdapter();
-		policyObject.policyAdapter.setConfigName("testpolicy1");
-		policyObject.policyAdapter.setParentPath(parentPath.getAbsolutePath());
-		policyObject.policyAdapter.setPolicyDescription("my description");
-		policyObject.policyAdapter.setConfigBodyData("this is my test config file");
-		policyObject.policyAdapter.setPolicyName("testpolicy1");
-		policyObject.policyAdapter.setConfigType(ConfigPolicy.OTHER_CONFIG);
-		policyObject.policyAdapter.setPolicyType("Config");
-		policyObject.policyAdapter.setDomainDir("org.openecomp");
-		PolicyType policyTypeObject = new PolicyType();
-		policyObject.policyAdapter.setPolicyData(policyTypeObject);
-		PolicyDBDaoTransaction transaction = dbd.getNewTransaction();
-		try{
-			transaction.createPolicy(policyObject, "testuser1");
-			transaction.commitTransaction();
-		} catch(Exception e){
-			transaction.rollbackTransaction();
-			Assert.fail();
-		}
-		
-		EntityManager getData = emf.createEntityManager();
-		Query getDataQuery = getData.createQuery("SELECT p FROM PolicyEntity p WHERE p.scope=:scope AND p.policyName=:name");
-		getDataQuery.setParameter("scope", "org.openecomp");
-		getDataQuery.setParameter("name","Config_testpolicy1.xml");
-		PolicyEntity result = null;
-		try{
-		result = (PolicyEntity)getDataQuery.getSingleResult();
-		} catch(Exception e){
-			logger.error("Exception Occured"+e);
-			Assert.fail();
-		}
-		String expectedData;
-		try {
-			expectedData = IOUtils.toString(XACMLPolicyWriter.getXmlAsInputStream(policyTypeObject));
-		} catch (IOException e1) {
-			expectedData = "";
-		}
-		Assert.assertEquals(expectedData, result.getPolicyData());
-		getData.close();
-		result = null;
-		File policyFile = new File(workspaceDir+"/org/openecomp/Config_testpolicy1.xml");
-		try{
-			transaction = dbd.getNewTransaction();
-			transaction.deletePolicy(policyFile.getAbsolutePath());
-		} catch(Exception e){
-			logger.error("Exception Occured"+e);
-			Assert.fail();
-		}
-		Assert.assertTrue(transaction.isTransactionOpen());
-		try{				
-			transaction.deletePolicy(policyFile.getAbsolutePath());
-			Assert.fail();
-		} catch(IllegalStateException e){
-			//pass
-		} catch(Exception e){
-			Assert.fail();
-		}
-		transaction.commitTransaction();
-		Assert.assertFalse(transaction.isTransactionOpen());
-		try{
-			transaction = dbd.getNewTransaction();
-			transaction.deletePolicy(policyFile.getAbsolutePath());
-		} catch(Exception e){
-			logger.error("Exception Occured"+e);
-			Assert.fail();
-		}
-		//Assert.assertFalse(transaction.isTransactionOpen());
-		transaction.commitTransaction();
-	}
-
-	@Ignore
-	@Test
-	public void groupTransactions(){		
-		PolicyDBDaoTransaction group = dbd.getNewTransaction();
-		String groupName = "test group 1";
-		try{
-			group.createGroup(PolicyDBDao.createNewPDPGroupId(groupName), groupName, "this is a test group","testuser");
-			group.commitTransaction();
-		} catch(Exception e){
-			group.rollbackTransaction();
-			logger.error("Exception Occured"+e);
-			Assert.fail();
-		}
-		EntityManager em = emf.createEntityManager();
-		Query getGroup = em.createQuery("SELECT g FROM GroupEntity g WHERE g.groupId=:groupId AND g.deleted=:deleted");
-		getGroup.setParameter("groupId", PolicyDBDao.createNewPDPGroupId(groupName));
-		getGroup.setParameter("deleted", false);
-		List<?> groups = getGroup.getResultList();
-		if(groups.size() != 1){
-			Assert.fail();
-		}
-		GroupEntity groupEntity = (GroupEntity)groups.get(0);
-		em.close();
-		Assert.assertEquals(groupName, groupEntity.getgroupName());
-		Assert.assertEquals("this is a test group", groupEntity.getDescription());
-		group = dbd.getNewTransaction();
-		try{
-			EcompPDPGroup groupToDelete = new StdPDPGroup(PolicyDBDao.createNewPDPGroupId(groupName),Paths.get("/"));			
-			group.deleteGroup(groupToDelete, null,"testuser");
-			group.commitTransaction();
-		} catch(Exception e){
-			group.rollbackTransaction();
-			logger.error("Exception Occured"+e);
-			Assert.fail();
-		}
-		em = emf.createEntityManager();
-		getGroup = em.createQuery("SELECT g FROM GroupEntity g WHERE g.groupId=:groupId AND g.deleted=:deleted");
-		getGroup.setParameter("groupId", PolicyDBDao.createNewPDPGroupId(groupName));
-		getGroup.setParameter("deleted", false);
-		groups = getGroup.getResultList();
-		if(groups.size() != 0){
-			System.out.println("Group size: "+groups.size());
-			Assert.fail();
-		}
-		em.close();
-		//add a pdp to a group
-		group = dbd.getNewTransaction();
-		try{
-			group.createGroup(PolicyDBDao.createNewPDPGroupId(groupName), groupName, "test group", "testuser");
-			group.commitTransaction();
-		} catch(Exception e){
-			group.rollbackTransaction();
-			logger.error("Exception Occured"+e);
-			Assert.fail();
-		}
-		group = dbd.getNewTransaction();
-		try{
-			group.addPdpToGroup("http://localhost:4344/pdp/", PolicyDBDao.createNewPDPGroupId(groupName), "primary", "the main pdp", 3232, "testuser");
-			group.commitTransaction();
-		} catch(Exception e){
-			group.rollbackTransaction();
-			logger.error("Exception Occured"+e);
-			Assert.fail();
-		}
-		em = emf.createEntityManager();
-		Query getPdp = em.createQuery("SELECT p FROM PdpEntity p WHERE p.pdpId=:pdpId AND p.deleted=:deleted");
-		getPdp.setParameter("pdpId", "http://localhost:4344/pdp/");
-		getPdp.setParameter("deleted", false);
-		List<?> pdps = getPdp.getResultList();
-		if(pdps.size() != 1){
-			System.out.println("Group size: "+pdps.size());
-			Assert.fail();
-		}
-		PdpEntity pdp = (PdpEntity)pdps.get(0);
-		Assert.assertEquals(groupName, pdp.getGroup().getgroupName());
-		Assert.assertEquals(pdp.getPdpName(), "primary");
-		em.close();
-		group = dbd.getNewTransaction();
-		try{
-			group.removePdpFromGroup("http://localhost:4344/pdp/","testuser");
-			group.commitTransaction();
-		} catch(Exception e){
-			group.rollbackTransaction();
-			logger.error("Exception Occured"+e);
-			Assert.fail();
-		}
-		em = emf.createEntityManager();
-		getPdp = em.createQuery("SELECT p FROM PdpEntity p WHERE p.pdpId=:pdpId AND p.deleted=:deleted");
-		getPdp.setParameter("pdpId", "http://localhost:4344/pdp/");
-		getPdp.setParameter("deleted", false);
-		pdps = getPdp.getResultList();
-		if(pdps.size() != 0){
-			System.out.println("Group size: "+pdps.size());
-			Assert.fail();
-		}
-		em.close();
-		
-		//add some pdps to groups
-		group = dbd.getNewTransaction();
-		try{
-			group.createGroup(PolicyDBDao.createNewPDPGroupId("testgroup1"), "testgroup1", "test group", "testuser");
-			group.commitTransaction();
-		} catch(Exception e){
-			group.rollbackTransaction();
-			logger.error("Exception Occured"+e);
-			Assert.fail();
-		}
-		group = dbd.getNewTransaction();
-		try{
-			group.createGroup(PolicyDBDao.createNewPDPGroupId("testgroup2"), "testgroup2", "test group", "testuser");
-			group.commitTransaction();
-		} catch(Exception e){
-			group.rollbackTransaction();
-			logger.error("Exception Occured"+e);
-			Assert.fail();
-		}
-		
-		group = dbd.getNewTransaction();
-		try{
-			group.addPdpToGroup("http://localhost:4344/pdp/", PolicyDBDao.createNewPDPGroupId("testgroup1"), "primary", "the main pdp", 3232, "testuser");
-			group.commitTransaction();
-		} catch(Exception e){
-			group.rollbackTransaction();
-			logger.error("Exception Occured"+e);
-			Assert.fail();
-		}
-		group = dbd.getNewTransaction();
-		try{
-			group.addPdpToGroup("http://localhost:4345/pdp/", PolicyDBDao.createNewPDPGroupId("testgroup1"), "secondary", "the second pdp", 3233, "testuser");
-			group.commitTransaction();
-		} catch(Exception e){
-			group.rollbackTransaction();
-			logger.error("Exception Occured"+e);
-			Assert.fail();
-		}
-		em = emf.createEntityManager();
-		getPdp = em.createQuery("SELECT p FROM PdpEntity p WHERE p.deleted=:deleted");
-		getPdp.setParameter("deleted", false);
-		pdps = getPdp.getResultList();
-		for(Object o : pdps){
-			Assert.assertEquals("testgroup1",((PdpEntity)o).getGroup().getgroupName());
-		}
-		em.close();
-		
-		group = dbd.getNewTransaction();
-		try{
-			EcompPDPGroup groupToDelete = new StdPDPGroup(PolicyDBDao.createNewPDPGroupId("testgroup1"),Paths.get("/"));
-			EcompPDPGroup groupToMoveTo = new StdPDPGroup(PolicyDBDao.createNewPDPGroupId("testgroup2"),Paths.get("/"));	
-			group.deleteGroup(groupToDelete, groupToMoveTo,"testuser");
-			group.commitTransaction();
-		} catch(Exception e){
-			group.rollbackTransaction();
-			logger.error("Exception Occured"+e);
-			Assert.fail();
-		}
-		em = emf.createEntityManager();
-		getGroup = em.createQuery("SELECT g FROM GroupEntity g WHERE g.groupId=:groupId AND g.deleted=:deleted");
-		getGroup.setParameter("groupId", "testgroup1");
-		getGroup.setParameter("deleted", false);
-		groups = getGroup.getResultList();
-		if(groups.size() != 0){
-			System.out.println("Group size: "+groups.size());
-			Assert.fail();
-		}
-		em.close();
-		
-		em = emf.createEntityManager();
-		getPdp = em.createQuery("SELECT p FROM PdpEntity p WHERE p.deleted=:deleted");
-		getPdp.setParameter("deleted", false);
-		pdps = getPdp.getResultList();
-		for(Object o : pdps){
-			Assert.assertEquals("testgroup2",((PdpEntity)o).getGroup().getgroupName());
-		}
-		em.close();
-		
-		group = dbd.getNewTransaction();
-		try{
-			EcompPDPGroup groupToDelete = new StdPDPGroup(PolicyDBDao.createNewPDPGroupId("testgroup2"),Paths.get("/"));
-			EcompPDPGroup groupToMoveTo = null;	
-			group.deleteGroup(groupToDelete, groupToMoveTo,"testuser");
-			group.commitTransaction();
-			Assert.fail();
-		} catch(PAPException pe){
-			//good, can't delete group with pdps
-			group.rollbackTransaction();
-		} catch(Exception e){
-			group.rollbackTransaction();
-			logger.error("Exception Occured"+e);
-			Assert.fail();
-		}
-		
-		
-		//add policy to group
-		
-		//update group
-		EcompPDPGroup pdpGroup = new StdPDPGroup("testgroup2", false, "newtestgroup2", "this is my new description", Paths.get("/"));
-		group = dbd.getNewTransaction();
-		try{
-			group.updateGroup(pdpGroup, "testuser");
-			group.commitTransaction();
-		}catch (Exception e){
-			logger.error("Exception Occured"+e);
-			group.rollbackTransaction();
-			Assert.fail();
-		}
-		em = emf.createEntityManager();
-		getGroup = em.createQuery("SELECT g FROM GroupEntity g WHERE g.groupId=:groupId AND g.deleted=:deleted");
-		getGroup.setParameter("groupId", "newtestgroup2");
-		getGroup.setParameter("deleted", false);
-		groups = getGroup.getResultList();
-		if(groups.size() != 1){
-			System.out.println("Group size: "+groups.size());
-			Assert.fail();
-		}
-		em.close();
-		em = emf.createEntityManager();
-		getGroup = em.createQuery("SELECT g FROM GroupEntity g WHERE g.groupId=:groupId AND g.deleted=:deleted");
-		getGroup.setParameter("groupId", "testgroup2");
-		getGroup.setParameter("deleted", false);
-		groups = getGroup.getResultList();
-		if(groups.size() != 0){
-			System.out.println("Group size: "+groups.size());
-			Assert.fail();
-		}
-		em.close();
-	}
-	
-	@Test
-	public void encryptionTest(){
-		try {
-			String encr = d.encryptPassword("testpassword");
-			System.out.println("original password: "+"testpassword");
-			System.out.println("Encrypted password: "+encr);
-			String decr = d.decryptPassword(encr);
-			System.out.println("Decrypted password: "+decr);
-			Assert.assertEquals("testpassword", decr);
-		} catch (Exception e) {
-			logger.error("Exception Occured"+e);
-			Assert.fail();
-		}
-		
-	}
-	@Test
-	public void getDescriptionFromXacmlTest(){
-		String myTestDesc = "hello this is a test";
-		String desc = d.getDescriptionFromXacml("<Description>"+myTestDesc+"</Description>");
-		Assert.assertEquals(myTestDesc, desc);
-	}
-	@Ignore
-	@Test
-	public void threadingStabilityTest(){
-		if(logger.isDebugEnabled()){
-			logger.debug("\n\n****************************"
-					+ "threadingStabilityTest() entry"
-					+ "******************************\n\n");
-		}
-			
-		PolicyDBDaoTransaction t = dbd.getNewTransaction();
-		Assert.assertTrue(t.isTransactionOpen());
-		try {
-			//Add 1000 ms to the timeout just to be sure it actually times out
-			int sleepTime = Integer.parseInt(XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_TRANS_TIMEOUT)) + 1000;
-			if(logger.isDebugEnabled()){
-				Date date= new java.util.Date();
-				logger.debug("\n\nPolicyDBDaoTest.threadingStabilityTest() "
-						+ "\n   sleepTime =  " + sleepTime 
-						+ "\n   TimeStamp = " + date.getTime()
-						+ "\n\n");
-			}
-			Thread.sleep(sleepTime);
-		} catch (InterruptedException e) {
-			logger.error("Exception Occured"+e);
-		}
-		if(logger.isDebugEnabled()){
-			Date date= new java.util.Date();
-			logger.debug("\n\nPolicyDBDaoTest.threadingStabilityTest() "
-					+ "\n   Assert.assertFalse(t.isTransactionOpen() = " + t.isTransactionOpen() + ")"
-					+ "\n   TimeStamp = " + date.getTime()
-					+ "\n\n");
-		}
-		Assert.assertFalse(t.isTransactionOpen());
-		
-		
-		if(logger.isDebugEnabled()){
-			Date date= new java.util.Date();
-			logger.debug("\n\nPolicyDBDaoTest.threadingStabilityTest() "
-					+ "\n   a = dbd.getNewTransaction() " 
-					+ "\n   TimeStamp = " + date.getTime()
-					+ "\n\n");
-		}
-		PolicyDBDaoTransaction a = dbd.getNewTransaction();
-		if(logger.isDebugEnabled()){
-			Date date= new java.util.Date();
-			logger.debug("\n\nPolicyDBDaoTest.threadingStabilityTest() "
-					+ "\n   Assert.assertTrue(a.isTransactionOpen() = " + a.isTransactionOpen() + ")"
-					+ "\n   TimeStamp = " + date.getTime()
-					+ "\n\n");
-		}
-		Assert.assertTrue(a.isTransactionOpen());
-
-		try {
-			//Add 1000 ms to the timeout just to be sure it actually times out
-			int sleepTime = Integer.parseInt(XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_TRANS_TIMEOUT)) + 1000;
-			if(logger.isDebugEnabled()){
-				Date date= new java.util.Date();
-				logger.debug("\n\nPolicyDBDaoTest.threadingStabilityTest() "
-						+ "\n   sleepTime =  " + sleepTime 
-						+ "\n   TimeStamp = " + date.getTime()
-						+ "\n\n");
-			}
-			Thread.sleep(sleepTime);
-		} catch (InterruptedException e) {
-			logger.error("Exception Occured"+e);
-		}
-		if(logger.isDebugEnabled()){
-			Date date= new java.util.Date();
-			logger.debug("\n\nPolicyDBDaoTest.threadingStabilityTest() "
-					+ "\n   b = dbd.getNewTransaction() " 
-					+ "\n   TimeStamp = " + date.getTime()
-					+ "\n\n");
-		}
-		PolicyDBDaoTransaction b = dbd.getNewTransaction();
-		if(logger.isDebugEnabled()){
-			Date date= new java.util.Date();
-			logger.debug("\n\nPolicyDBDaoTest.threadingStabilityTest() "
-					+ "\n   Assert.assertFalse(a.isTransactionOpen() = " + a.isTransactionOpen() + ")"
-					+ "\n   TimeStamp = " + date.getTime()
-					+ "\n\n");
-		}
-		Assert.assertFalse(a.isTransactionOpen());
-		if(logger.isDebugEnabled()){
-			Date date= new java.util.Date();
-			logger.debug("\n\nPolicyDBDaoTest.threadingStabilityTest() "
-					+ "\n   Assert.assertTrue(b.isTransactionOpen() = " + b.isTransactionOpen() + ")"
-					+ "\n   TimeStamp = " + date.getTime()
-					+ "\n\n");
-		}
-		Assert.assertTrue(b.isTransactionOpen());
-		b.close();
-		
-		
-				
-		//Now let's test the transaction wait time timeout. Shorten the wait time to 1000 ms
-		System.setProperty(XACMLRestProperties.PROP_PAP_TRANS_WAIT,"1000");
-		//And let's lengthen the transaction timeout to 5000 ms
-		System.setProperty(XACMLRestProperties.PROP_PAP_TRANS_TIMEOUT,"5000");
-		//get a transacton
-		PolicyDBDaoTransaction t1 = dbd.getNewTransaction();
-		if(logger.isDebugEnabled()){
-			Date date= new java.util.Date();
-			logger.debug("\n\nPolicyDBDaoTest.threadingStabilityTest() "
-					+ "\n   Assert.assertTrue(t1.isTransactionOpen() = " + t1.isTransactionOpen() + ")"
-					+ "\n   TimeStamp = " + date.getTime()
-					+ "\n\n");
-		}
-		Assert.assertTrue(t1.isTransactionOpen());
-		//while it is open, get another from a different DB Dao so it will not collide on the synchronized code segment
-		//but will collide at the DB. Remember that the wait time is only 1000 ms
-		try {
-			//Now the 2nd transaction has a wait timeout in 1000 ms
-			PolicyDBDaoTransaction t2 = dbd2.getNewTransaction();
-			/* 
-			 * Give it plenty of time to time out the second transaction
-			 * It will actually hang right here until it either gets the lock from the DB or the
-			 * request for the DB lock times out. The timers are very sloppy so, I have given
-			 * this plenty of leeway.
-			 */
-			
-			if(logger.isDebugEnabled()){
-				Date date= new java.util.Date();
-				logger.debug("\n\nPolicyDBDaoTest.threadingStabilityTest() "
-						+ "\n   Thread.sleep(3000)" 
-						+ "\n   TimeStamp = " + date.getTime()
-						+ "\n\n");
-			}
-			Thread.sleep(3000);
-			if(logger.isDebugEnabled()){
-				Date date= new java.util.Date();
-				logger.debug("\n\nPolicyDBDaoTest.threadingStabilityTest() "
-						+ "\n   Assert.assertTrue(t1.isTransactionOpen() = " + t1.isTransactionOpen() + ")"
-						+ "\n   Assert.assertFalse(t2.isTransactionOpen() = " + t2.isTransactionOpen() + ")"
-						+ "\n   TimeStamp = " + date.getTime()
-						+ "\n\n");
-			}
-			//Assert.assertTrue(t1.isTransactionOpen());
-			//Assert.assertFalse(t2.isTransactionOpen());
-			
-			Assert.fail("\n\nTransaction timeout of 1000 ms exceeded without a PersistenceException\n\n");
-		} catch (PersistenceException e) {
-			//success
-			if(logger.isDebugEnabled()){
-				Date date= new java.util.Date();
-				logger.debug("\n\nPolicyDBDaoTest.threadingStabilityTest() "
-						+ "\n   SUCCESS! Transaction Wait Timeout worked!"
-						+ "\n   Caught PersistenceException = " + e
-						+ "\n   TimeStamp = " + date.getTime()
-						+ "\n\n");
-			}
-		} catch (Exception e) {
-			// failure due to some other reason
-			if(logger.isDebugEnabled()){
-				Date date= new java.util.Date();
-				logger.debug("\n\nPolicyDBDaoTest.threadingStabilityTest() FAILURE"
-						+ "\n   Caught Exception = " + e
-						+ "\n   TimeStamp = " + date.getTime()
-						+ "\n\n");
-			}
-			logger.error("Exception Occured"+e);
-			Assert.fail();
-		}
-		
-		if(logger.isDebugEnabled()){
-			Date date= new java.util.Date();
-			logger.debug("\n\nthreadingStabilityTest() exit"
-					+ "\n   TimeStamp = " + date.getTime()
-					+ "\n\n");
-		}
-	}
-
-}
diff --git a/ECOMP-PAP-REST/src/test/java/org/openecomp/policy/pap/xacml/rest/controller/DictionaryControllerTest.java b/ECOMP-PAP-REST/src/test/java/org/openecomp/policy/pap/xacml/rest/controller/DictionaryControllerTest.java
deleted file mode 100644
index 82427e8cb..000000000
--- a/ECOMP-PAP-REST/src/test/java/org/openecomp/policy/pap/xacml/rest/controller/DictionaryControllerTest.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-
-package org.openecomp.policy.pap.xacml.rest.controller;
-
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.io.BufferedReader;
-import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.servlet.http.HttpServletRequest;
-
-import org.json.JSONObject;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.rest.adapter.PolicyRestAdapter;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.Attribute;
-import org.openecomp.policy.rest.jpa.MicroServiceModels;
-import org.openecomp.policy.rest.jpa.PolicyEditorScopes;
-import org.springframework.mock.web.MockHttpServletResponse;
-
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.fge.jackson.JsonLoader;
-
-/**
- * The class <code>DictionaryControllerTest</code> contains tests
- * for the class {@link <code>DictionaryController</code>}*
- *
- * All JUnits are designed to run in the local development environment
- * where they have write privileges and can execute time-sensitive
- * tasks.
- */
-public class DictionaryControllerTest {
-	
-	private static Logger logger = FlexLogger.getLogger(DictionaryControllerTest.class);
-	private static CommonClassDao commonClassDao;
-	private String jsonString = null;
-	private String configBodyString = null;
-	private HttpServletRequest request = null;
-	private DictionaryController controller = null;
-	private BufferedReader br = null;
-
-	@Before
-	public void setUp() throws Exception {
-		logger.info("setUp: Entering");
-        commonClassDao = Mockito.mock(CommonClassDao.class);
-	    HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
-   
-        List<Object> microServiceModelsData = new ArrayList<Object>();
-        MicroServiceModels testData = new MicroServiceModels();
-        testData.setVersion("1707.4.1.2-Junit");        
-
-        //--- mock the getDataByColumn() call
-        List<String>  microList = new ArrayList<String>();
-        microList.add("123");
-        List<Object>  listId = new ArrayList<Object>();
-        when(commonClassDao.getDataByColumn(Attribute.class, "xacmlId")).thenReturn(microList);
-        PolicyEditorScopes editorScope = new PolicyEditorScopes();
-        doNothing().when(commonClassDao).save(editorScope);
-        doNothing().when(commonClassDao).update(editorScope);
-        
-        when(commonClassDao.getData(Attribute.class)).thenReturn(listId);
-        
-		jsonString = "{\"attributeDictionaryDatas\": {\"error\": \"\",	\"inprocess\": false,\"model\": {\"name\": \"testingdata\", "
-				+ " \"subScopename\": \"\",\"path\": [],\"type\": \"dir\",\"size\": 0,\"date\": \"2017-04-12T21:26:57.000Z\", "
-				+ " \"version\": \"\",\"createdBy\": \"someone\",	\"modifiedBy\": \"someone\",	\"content\": \"\",\"recursive\": false},"
-				+ " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"	},"
-				+ " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-				+ "	\"policyDescription\": \"testing input\", \"ecompName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
-				+ "	\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [	[\"fileId\"]],\"ttlDate\": null}}, "
-				+ "	\"policyJSON\": {\"pmTableName\": \"test\",	\"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
-
-		configBodyString = "{\"service\":\"SniroPolicyEntityTest\",\"policyName\":\"someone\",\"description\":\"test\",\"templateVersion\":\"1607\",\"version\":\"HD\","
-				+ "\"priority\":\"2\",\"content\":{\"lastPolled\":\"1\",\"boolen-test\":\"true\",\"created\":\"test\",\"retiredDate\":\"test\",\"scope\":\"SNIRO_PLACEMENT_VDHV\","
-				+ "\"name\":\"test\",\"lastModified\":\"test\",\"state\":\"CREATED\",\"type\":\"CONFIG\",\"intent\":\"test\",\"target\":\"SNIRO\"}}";
-
-		request = mock(HttpServletRequest.class);        
-        BufferedReader br = new BufferedReader(new StringReader(jsonString));
-        //--- mock the getReader() call
-        when(request.getReader()).thenReturn(br);   
-        
-        controller = new DictionaryController(commonClassDao);
-        
-        logger.info("setUp: exit");
-	}
-
-	@After
-	public void tearDown() throws Exception {
-	}
-
-	@Test
-	public void testGetAttributeDictionaryEntityDatabyAttributeName() {
-		logger.info("testGetAttributeDictionaryEntityDatabyAttributeName: Entering");
-
-		MockHttpServletResponse response =  new MockHttpServletResponse();
-
-		controller.getAttributeDictionaryEntityDatabyAttributeName(request, response);
-		
-		try {
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("attributeDictionaryDatas"));
-			logger.info("response.getContentAsString(): " + response.getContentAsString());
-		} catch (UnsupportedEncodingException e) {
-			fail("Exception: " + e);
-		}
-		
-		logger.info("testGetAttributeDictionaryEntityDatabyAttributeName: exit");
-	}
-
-	@Test
-	public void testGetAttributeDictionaryEntityData() {
-		logger.info("testGetAttributeDictionaryEntityData: Entering");
-
-		MockHttpServletResponse response =  new MockHttpServletResponse();
-
-		controller.getAttributeDictionaryEntityData(request, response);
-		
-		try {
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("attributeDictionaryDatas"));
-			logger.info("response.getContentAsString(): " + response.getContentAsString());
-		} catch (UnsupportedEncodingException e) {
-			fail("Exception: " + e);
-		}
-		
-		logger.info("testGetAttributeDictionaryEntityData: exit");
-	}
-
-	@Test
-	public void testSaveAttributeDictionary() {
-		logger.info("testSaveAttributeDictionary: Entering");
-
-		MockHttpServletResponse response =  new MockHttpServletResponse();
-	    request = mock(HttpServletRequest.class);  
-        
-		try {
-		    // mock the getReader() call
-			jsonString = "{\"attributeDictionaryData\": {\"userDataTypeValues\": [{\"attributeValues\": \"Values1\"}, {\"attributeValues\": \"Values2\"}],	\"datatypeBean\": {\"type\": \"C\"},\"model\": {\"name\": \"testingdata\", "
-					+ " \"subScopename\": \"\",\"userDataTypeValues\": [\"user-type\"],\"type\": \"dir\",\"size\": 0,\"date\": \"2017-04-12T21:26:57.000Z\", "
-					+ " \"version\": \"\",\"createdBy\": \"someone\",	\"modifiedBy\": \"someone\",	\"content\": \"\",\"recursive\": false},"
-					+ " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"	},"
-					+ " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-					+ "	\"policyDescription\": \"testing input\", \"ecompName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
-					+ "	\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [	[\"fileId\"]],\"ttlDate\": null}}, "
-					+ "	\"policyJSON\": {\"some\": \"test\",	\"dmdTopic\": \"1\",\"fileId\": \"56\"}, \"userid\":\"smetest\", \"userDataTypeValues\":[\"type-one\"]}";
-			
-			BufferedReader br = new BufferedReader(new StringReader(jsonString));
-			when(request.getReader()).thenReturn(br); 		    
-			controller.saveAttributeDictionary(request, response);
-			logger.info("response.getContentAsString(): " + response.getContentAsString());
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("attributeDictionaryDatas"));
-
-		} catch (Exception e) {
-			fail("Exception: " + e);
-		}
-		
-		logger.info("testSaveAttributeDictionary: exit");
-	}
-
-	@Test
-	public void testRemoveAttributeDictionary() {
-		logger.info("testRemoveAttributeDictionary: Entering");
-
-		MockHttpServletResponse response =  new MockHttpServletResponse();
-	    request = mock(HttpServletRequest.class);   
-	
-		try {
-		    // mock the getReader() call
-			jsonString = "{\"data\": {\"modelName\": \"test\",	\"inprocess\": false,\"model\": {\"name\": \"testingdata\", "
-					+ " \"subScopename\": \"\",\"path\": [],\"type\": \"dir\",\"size\": 0,\"date\": \"2017-04-12T21:26:57.000Z\", "
-					+ " \"version\": \"\",\"createdBy\": \"someone\",	\"modifiedBy\": \"someone\",	\"content\": \"\",\"recursive\": false},"
-					+ " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"	},"
-					+ " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-					+ "	\"policyDescription\": \"testing input\", \"ecompName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
-					+ "	\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [	[\"fileId\"]],\"ttlDate\": null}}, "
-					+ "	\"policyJSON\": {\"pmTableName\": \"test\",	\"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
-			BufferedReader br = new BufferedReader(new StringReader(jsonString));
-			when(request.getReader()).thenReturn(br); 		    
-			controller.removeAttributeDictionary(request, response);
-			logger.info("response.getContentAsString(): " + response.getContentAsString());
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("attributeDictionaryDatas"));
-
-		} catch (Exception e) {
-			fail("Exception: " + e);
-		}
-		
-		logger.info("testRemoveAttributeDictionary: exit");
-	}
-
-	@Test
-	public void testGetEcompNameDictionaryByNameEntityData() {
-		logger.info("testGetEcompNameDictionaryByNameEntityData: Entering");
-
-		MockHttpServletResponse response =  new MockHttpServletResponse();
-
-		controller.getEcompNameDictionaryByNameEntityData(request, response);
-		
-		try {
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("ecompNameDictionaryDatas"));
-			logger.info("response.getContentAsString(): " + response.getContentAsString());
-		} catch (UnsupportedEncodingException e) {
-			fail("Exception: " + e);
-		}
-		
-		logger.info("testGetEcompNameDictionaryByNameEntityData: exit");
-	}
-
-	@Test
-	public void testGetEcompNameDictionaryEntityData() {
-		logger.info("testGetEcompNameDictionaryEntityData: Entering");
-
-		MockHttpServletResponse response =  new MockHttpServletResponse();
-
-		controller.getEcompNameDictionaryEntityData(request, response);
-		
-		try {
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("ecompNameDictionaryDatas"));
-			logger.info("response.getContentAsString(): " + response.getContentAsString());
-		} catch (UnsupportedEncodingException e) {
-			fail("Exception: " + e);
-		}
-		
-		logger.info("testGetEcompNameDictionaryEntityData: exit");
-	}
-
-	@Test
-	public void testSaveEcompDictionary() {
-		
-		logger.info("testSaveEcompDictionary: Entering");
-
-		MockHttpServletResponse response =  new MockHttpServletResponse();
-	    request = mock(HttpServletRequest.class);  
-        
-		try {
-		    // mock the getReader() call
-			jsonString = "{\"ecompNameDictionaryData\": {\"userDataTypeValues\": [{\"attributeValues\": \"Values1\"}, {\"attributeValues\": \"Values2\"}],	\"datatypeBean\": {\"type\": \"C\"},\"model\": {\"name\": \"testingdata\", "
-					+ " \"subScopename\": \"\",\"userDataTypeValues\": [\"user-type\"],\"type\": \"dir\",\"size\": 0,\"date\": \"2017-04-12T21:26:57.000Z\", "
-					+ " \"version\": \"\",\"createdBy\": \"someone\",	\"modifiedBy\": \"someone\",	\"content\": \"\",\"recursive\": false},"
-					+ " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"	},"
-					+ " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-					+ "	\"policyDescription\": \"testing input\", \"ecompName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
-					+ "	\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [	[\"fileId\"]],\"ttlDate\": null}}, "
-					+ "	\"policyJSON\": {\"some\": \"test\",	\"dmdTopic\": \"1\",\"fileId\": \"56\"}, \"userid\":\"smetest\", \"userDataTypeValues\":[\"type-one\"]}";
-			
-			BufferedReader br = new BufferedReader(new StringReader(jsonString));
-			when(request.getReader()).thenReturn(br); 		    
-			controller.saveEcompDictionary(request, response);
-			logger.info("response.getContentAsString(): " + response.getContentAsString());
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("ecompNameDictionaryDatas"));
-
-		} catch (Exception e) {
-			fail("Exception: " + e);
-		}
-		
-		logger.info("testSaveEcompDictionary: exit");		
-	}
-
-	@Test
-	public void testRemoveEcompDictionary() {
-		logger.info("testRemoveEcompDictionary: Entering");
-
-		MockHttpServletResponse response =  new MockHttpServletResponse();
-	    request = mock(HttpServletRequest.class);   
-	
-		try {
-		    // mock the getReader() call
-			jsonString = "{\"data\": {\"modelName\": \"test\",	\"inprocess\": false,\"model\": {\"name\": \"testingdata\", "
-					+ " \"subScopename\": \"\",\"path\": [],\"type\": \"dir\",\"size\": 0,\"date\": \"2017-04-12T21:26:57.000Z\", "
-					+ " \"version\": \"\",\"createdBy\": \"someone\",	\"modifiedBy\": \"someone\",	\"content\": \"\",\"recursive\": false},"
-					+ " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"	},"
-					+ " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-					+ "	\"policyDescription\": \"testing input\", \"ecompName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
-					+ "	\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [	[\"fileId\"]],\"ttlDate\": null}}, "
-					+ "	\"policyJSON\": {\"pmTableName\": \"test\",	\"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
-			BufferedReader br = new BufferedReader(new StringReader(jsonString));
-			when(request.getReader()).thenReturn(br); 		    
-			controller.removeEcompDictionary(request, response);
-			logger.info("response.getContentAsString(): " + response.getContentAsString());
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("ecompNameDictionaryDatas"));
-
-		} catch (Exception e) {
-			fail("Exception: " + e);
-		}
-		
-		logger.info("testRemoveEcompDictionary: exit");
-	}
-
-}
diff --git a/ECOMP-PAP-REST/src/test/java/org/openecomp/policy/pap/xacml/rest/controller/MicroServiceDictionaryControllerTest.java b/ECOMP-PAP-REST/src/test/java/org/openecomp/policy/pap/xacml/rest/controller/MicroServiceDictionaryControllerTest.java
deleted file mode 100644
index c1f2973d3..000000000
--- a/ECOMP-PAP-REST/src/test/java/org/openecomp/policy/pap/xacml/rest/controller/MicroServiceDictionaryControllerTest.java
+++ /dev/null
@@ -1,693 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-
-package org.openecomp.policy.pap.xacml.rest.controller;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.io.BufferedReader;
-import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.rest.dao.CommonClassDao;
-import org.openecomp.policy.rest.jpa.DCAEuuid;
-import org.openecomp.policy.rest.jpa.MicroServiceLocation;
-import org.openecomp.policy.rest.jpa.MicroServiceModels;
-import org.openecomp.policy.rest.jpa.UserInfo;
-import org.springframework.mock.web.MockHttpServletResponse;
-
-/**
- * The class <code>MicroServiceDictionaryControllerTest</code> contains tests
- * for the class {@link <code>MicroServiceDictionaryController</code>}*
- *
- * All JUnits are designed to run in the local development environment
- * where they have write privileges and can execute time-sensitive
- * tasks.
- */
-
-public class MicroServiceDictionaryControllerTest {
-	
-	private static Logger logger = FlexLogger.getLogger(MicroServiceDictionaryControllerTest.class);
-	private static CommonClassDao commonClassDao;
-	private String jsonString = null;
-	private String configBodyString = null;
-	private HttpServletRequest request = null;
-	private MicroServiceDictionaryController controller = null;
-	 BufferedReader br = null;
-
-	@Before
-	public void setUp() throws Exception {
-		logger.info("setUp: Entering");
-        commonClassDao = Mockito.mock(CommonClassDao.class);
-        UserInfo userInfo = new UserInfo();
-        userInfo.setUserLoginId("testUserId");
-        userInfo.setUserName("John");
-        when(commonClassDao.getEntityItem(UserInfo.class, "userLoginId", "testing")).thenReturn(userInfo);
-        
-        List<String>  listIds = new ArrayList<String>();
-        listIds.add("Jack");
-        when(commonClassDao.getDataByColumn(DCAEuuid.class, "name")).thenReturn(listIds);
-        
-        List<String>  microList = new ArrayList<String>();
-        microList.add("MC-Model");
-        when(commonClassDao.getDataByColumn(MicroServiceLocation.class, "name")).thenReturn(microList);
-        
-        List<Object>  listId = new ArrayList<Object>();
-        listId.add("smith");
-        when(commonClassDao.getData(DCAEuuid.class)).thenReturn(listId);
-        MicroServiceModels microServiceModels = new MicroServiceModels();
-        
-        doNothing().when(commonClassDao).delete(microServiceModels);
-		
-		MicroServiceDictionaryController.setCommonClassDao(commonClassDao);	
-		
-		controller = new MicroServiceDictionaryController();
-       
-        HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
-        
-		jsonString = "{\"microServiceModelsDictionaryData\": {\"modelName\": \"test\",	\"inprocess\": false,\"model\": {\"name\": \"testingdata\", "
-				+ " \"subScopename\": \"\",\"path\": [],\"type\": \"dir\",\"size\": 0,\"date\": \"2017-04-12T21:26:57.000Z\", "
-				+ " \"version\": \"\",\"createdBy\": \"someone\",	\"modifiedBy\": \"someone\",	\"content\": \"\",\"recursive\": false},"
-				+ " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"	},"
-				+ " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-				+ "	\"policyDescription\": \"testing input\", \"ecompName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
-				+ "	\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [	[\"fileId\"]],\"ttlDate\": null}}, "
-				+ "	\"policyJSON\": {\"pmTableName\": \"test\",	\"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
-
-		configBodyString = "{\"service\":\"SniroPolicyEntityTest\",\"policyName\":\"someone\",\"description\":\"test\",\"templateVersion\":\"1607\",\"version\":\"HD\","
-				+ "\"priority\":\"2\",\"content\":{\"lastPolled\":\"1\",\"boolen-test\":\"true\",\"created\":\"test\",\"retiredDate\":\"test\",\"scope\":\"SNIRO_PLACEMENT_VDHV\","
-				+ "\"name\":\"test\",\"lastModified\":\"test\",\"state\":\"CREATED\",\"type\":\"CONFIG\",\"intent\":\"test\",\"target\":\"SNIRO\"}}";
-    
-        br = new BufferedReader(new StringReader(jsonString));
-        //--- mock the getReader() call
-        when(request.getReader()).thenReturn(br);   
-                
-        logger.info("setUp: exit");
-	}
-
-	@After
-	public void tearDown() throws Exception {
-	}
-
-
-	@Test
-	public void testGetUserInfo() {
-		
-		logger.info("testGetUserInfo: Entering");		
-
-		UserInfo userInfo = controller.getUserInfo("testing");
-		logger.info("userInfo.getUserName() : " + userInfo.getUserName());
-		
-		assertEquals("John", userInfo.getUserName());
-	
-		logger.info("testGetUserInfo: exit");		
-	}
-
-	@Test
-	public void testGetDCAEUUIDDictionaryByNameEntityData() {
-		
-		logger.info("testGetDCAEUUIDDictionaryByNameEntityData: Entering");
-
-		MockHttpServletResponse response =  new MockHttpServletResponse();
-
-		controller.getDCAEUUIDDictionaryByNameEntityData(request, response);
-		
-		try {
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("dcaeUUIDDictionaryDatas"));
-			logger.info("response.getContentAsString(): " + response.getContentAsString());
-		} catch (UnsupportedEncodingException e) {
-			fail("Exception: " + e);
-		}
-		
-		logger.info("testGetDCAEUUIDDictionaryByNameEntityData: exit");
-	}
-
-	@Test
-	public void testGetDCAEUUIDDictionaryEntityData() {
-		
-		logger.info("testGetDCAEUUIDDictionaryEntityData: Entering");
-
-		MockHttpServletResponse response =  new MockHttpServletResponse();
-		
-		controller.getDCAEUUIDDictionaryEntityData(request, response);
-		
-		try {
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("dcaeUUIDDictionaryDatas"));
-			logger.info("response.getContentAsString(): " + response.getContentAsString());
-		} catch (UnsupportedEncodingException e) {
-			fail("Exception: " + e);
-		}
-		
-		logger.info("testGetDCAEUUIDDictionaryEntityData: exit");
-	}
-
-	@Test
-	public void testSaveDCAEUUIDDictionary() {
-		logger.info("testSaveDCAEUUIDDictionary: Entering");
-
-		MockHttpServletResponse response =  new MockHttpServletResponse();
-	    request = mock(HttpServletRequest.class);   
-	
-		try {
-		    // mock the getReader() call
-			jsonString = "{\"dcaeUUIDDictionaryData\": {\"modelName\": \"test\",	\"inprocess\": false,\"model\": {\"name\": \"testingdata\", "
-					+ " \"subScopename\": \"\",\"path\": [],\"type\": \"dir\",\"size\": 0,\"date\": \"2017-04-12T21:26:57.000Z\", "
-					+ " \"version\": \"\",\"createdBy\": \"someone\",	\"modifiedBy\": \"someone\",	\"content\": \"\",\"recursive\": false},"
-					+ " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"	},"
-					+ " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-					+ "	\"policyDescription\": \"testing input\", \"ecompName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
-					+ "	\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [	[\"fileId\"]],\"ttlDate\": null}}, "
-					+ "	\"policyJSON\": {\"pmTableName\": \"test\",	\"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
-			BufferedReader br = new BufferedReader(new StringReader(jsonString));
-			when(request.getReader()).thenReturn(br); 		    
-			controller.saveDCAEUUIDDictionary(request, response);
-			logger.info("response.getContentAsString(): " + response.getContentAsString());
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("dcaeUUIDDictionaryDatas"));
-
-		} catch (Exception e) {
-			fail("Exception: " + e);
-		}
-		
-		logger.info("testSaveDCAEUUIDDictionary: exit");
-	}
-
-	@Test
-	public void testRemoveDCAEUUIDDictionary() {
-		logger.info("testRemoveDCAEUUIDDictionary: Entering");
-
-		MockHttpServletResponse response =  new MockHttpServletResponse();
-	    request = mock(HttpServletRequest.class);   
-	
-		try {
-		    // mock the getReader() call
-			jsonString = "{\"data\": {\"modelName\": \"test\",	\"inprocess\": false,\"model\": {\"name\": \"testingdata\", "
-					+ " \"subScopename\": \"\",\"path\": [],\"type\": \"dir\",\"size\": 0,\"date\": \"2017-04-12T21:26:57.000Z\", "
-					+ " \"version\": \"\",\"createdBy\": \"someone\",	\"modifiedBy\": \"someone\",	\"content\": \"\",\"recursive\": false},"
-					+ " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"	},"
-					+ " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-					+ "	\"policyDescription\": \"testing input\", \"ecompName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
-					+ "	\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [	[\"fileId\"]],\"ttlDate\": null}}, "
-					+ "	\"policyJSON\": {\"pmTableName\": \"test\",	\"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
-			BufferedReader br = new BufferedReader(new StringReader(jsonString));
-			when(request.getReader()).thenReturn(br); 		    
-			controller.removeMicroServiceConfigNameDictionary(request, response);
-			logger.info("response.getContentAsString(): " + response.getContentAsString());
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceCongigNameDictionaryDatas"));
-
-		} catch (Exception e) {
-			fail("Exception: " + e);
-		}
-		
-		logger.info("testRemoveDCAEUUIDDictionary: exit");
-	}
-
-	@Test
-	public void testGetMicroServiceConfigNameByNameDictionaryEntityData() {
-		logger.info("testGetMicroServiceConfigNameByNameDictionaryEntityData: Entering");
-
-		MockHttpServletResponse response =  new MockHttpServletResponse();
-		
-		controller.getMicroServiceConfigNameByNameDictionaryEntityData(request, response);
-		
-		try {
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceCongigNameDictionaryDatas"));
-			logger.info("response.getContentAsString(): " + response.getContentAsString());
-		} catch (UnsupportedEncodingException e) {
-			fail("Exception: " + e);
-		}
-		
-		logger.info("testGetMicroServiceConfigNameByNameDictionaryEntityData: exit");
-	}
-
-	@Test
-	public void testGetMicroServiceConfigNameDictionaryEntityData() {
-		logger.info("testGetMicroServiceConfigNameByNameDictionaryEntityData: Entering");
-
-		MockHttpServletResponse response =  new MockHttpServletResponse();
-		
-		controller.getMicroServiceConfigNameDictionaryEntityData(request, response);
-		
-		try {
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceCongigNameDictionaryDatas"));
-			logger.info("response.getContentAsString(): " + response.getContentAsString());
-		} catch (UnsupportedEncodingException e) {
-			fail("Exception: " + e);
-		}
-		
-		logger.info("testGetMicroServiceConfigNameDictionaryEntityData: exit");
-	}
-
-	@Test
-	public void testSaveMicroServiceConfigNameDictionary() {
-		logger.info("testSaveMicroServiceConfigNameDictionary: Entering");
-
-		MockHttpServletResponse response =  new MockHttpServletResponse();
-	    request = mock(HttpServletRequest.class);   
-	
-		try {
-		    // mock the getReader() call
-			jsonString = "{\"microServiceCongigNameDictionaryData\": {\"modelName\": \"test\",	\"inprocess\": false,\"model\": {\"name\": \"testingdata\", "
-					+ " \"subScopename\": \"\",\"path\": [],\"type\": \"dir\",\"size\": 0,\"date\": \"2017-04-12T21:26:57.000Z\", "
-					+ " \"version\": \"\",\"createdBy\": \"someone\",	\"modifiedBy\": \"someone\",	\"content\": \"\",\"recursive\": false},"
-					+ " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"	},"
-					+ " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-					+ "	\"policyDescription\": \"testing input\", \"ecompName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
-					+ "	\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [	[\"fileId\"]],\"ttlDate\": null}}, "
-					+ "	\"policyJSON\": {\"pmTableName\": \"test\",	\"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
-			BufferedReader br = new BufferedReader(new StringReader(jsonString));
-			when(request.getReader()).thenReturn(br); 		    
-			controller.saveMicroServiceConfigNameDictionary(request, response);
-			logger.info("response.getContentAsString(): " + response.getContentAsString());
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceCongigNameDictionaryDatas"));
-
-		} catch (Exception e) {
-			fail("Exception: " + e);
-		}
-		
-		logger.info("testSaveMicroServiceConfigNameDictionary: exit");
-	}
-
-	@Test
-	public void testRemoveMicroServiceConfigNameDictionary() {
-		logger.info("testRemoveMicroServiceConfigNameDictionary: Entering");
-
-		MockHttpServletResponse response =  new MockHttpServletResponse();
-	    request = mock(HttpServletRequest.class);   
-	
-		try {
-		    // mock the getReader() call
-			jsonString = "{\"data\": {\"modelName\": \"test\",	\"inprocess\": false,\"model\": {\"name\": \"testingdata\", "
-					+ " \"subScopename\": \"\",\"path\": [],\"type\": \"dir\",\"size\": 0,\"date\": \"2017-04-12T21:26:57.000Z\", "
-					+ " \"version\": \"\",\"createdBy\": \"someone\",	\"modifiedBy\": \"someone\",	\"content\": \"\",\"recursive\": false},"
-					+ " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"	},"
-					+ " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-					+ "	\"policyDescription\": \"testing input\", \"ecompName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
-					+ "	\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [	[\"fileId\"]],\"ttlDate\": null}}, "
-					+ "	\"policyJSON\": {\"pmTableName\": \"test\",	\"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
-			BufferedReader br = new BufferedReader(new StringReader(jsonString));
-			when(request.getReader()).thenReturn(br); 		    
-			controller.removeMicroServiceConfigNameDictionary(request, response);
-			logger.info("response.getContentAsString(): " + response.getContentAsString());
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceCongigNameDictionaryDatas"));
-
-		} catch (Exception e) {
-			fail("Exception: " + e);
-		}
-		
-		logger.info("testRemoveMicroServiceConfigNameDictionary: exit");
-	}
-
-	@Test
-	public void testGetMicroServiceLocationByNameDictionaryEntityData() {
-		
-		logger.info("testGetMicroServiceLocationByNameDictionaryEntityData: Entering");
-
-		MockHttpServletResponse response =  new MockHttpServletResponse();
-		
-		controller.getMicroServiceLocationByNameDictionaryEntityData(request, response);
-		
-		try {
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceLocationDictionaryDatas"));
-			logger.info("response.getContentAsString(): " + response.getContentAsString());
-		} catch (UnsupportedEncodingException e) {
-			fail("Exception: " + e);
-		}
-		
-		logger.info("testGetMicroServiceLocationByNameDictionaryEntityData: exit");
-	}
-
-	@Test
-	public void testGetMicroServiceLocationDictionaryEntityData() {
-		logger.info("testGetMicroServiceLocationDictionaryEntityData: Entering");
-
-		MockHttpServletResponse response =  new MockHttpServletResponse();
-		
-		controller.getMicroServiceLocationDictionaryEntityData(request, response);
-		
-		try {
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceLocationDictionaryDatas"));
-			logger.info("response.getContentAsString(): " + response.getContentAsString());
-		} catch (UnsupportedEncodingException e) {
-			fail("Exception: " + e);
-		}
-		
-		logger.info("testGetMicroServiceLocationDictionaryEntityData: exit");
-	}
-
-	@Test
-	public void testSaveMicroServiceLocationDictionary() {
-		logger.info("testSaveMicroServiceLocationDictionary: Entering");
-
-		MockHttpServletResponse response =  new MockHttpServletResponse();
-	    request = mock(HttpServletRequest.class);   
-	
-		try {
-		    // mock the getReader() call
-			jsonString = "{\"microServiceLocationDictionaryData\": {\"modelName\": \"test\",	\"inprocess\": false,\"model\": {\"name\": \"testingdata\", "
-					+ " \"subScopename\": \"\",\"path\": [],\"type\": \"dir\",\"size\": 0,\"date\": \"2017-04-12T21:26:57.000Z\", "
-					+ " \"version\": \"\",\"createdBy\": \"someone\",	\"modifiedBy\": \"someone\",	\"content\": \"\",\"recursive\": false},"
-					+ " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"	},"
-					+ " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-					+ "	\"policyDescription\": \"testing input\", \"ecompName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
-					+ "	\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [	[\"fileId\"]],\"ttlDate\": null}}, "
-					+ "	\"policyJSON\": {\"pmTableName\": \"test\",	\"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
-			BufferedReader br = new BufferedReader(new StringReader(jsonString));
-			when(request.getReader()).thenReturn(br); 		    
-			controller.saveMicroServiceLocationDictionary(request, response);
-			logger.info("response.getContentAsString(): " + response.getContentAsString());
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceLocationDictionaryDatas"));
-
-		} catch (Exception e) {
-			fail("Exception: " + e);
-		}
-		
-		logger.info("testSaveMicroServiceLocationDictionary: exit");
-	}
-
-	@Test
-	public void testRemoveMicroServiceLocationDictionary() {
-		logger.info("testRemoveMicroServiceLocationDictionary: Entering");
-
-		MockHttpServletResponse response =  new MockHttpServletResponse();
-	    request = mock(HttpServletRequest.class);   
-	
-		try {
-		    // mock the getReader() call
-			jsonString = "{\"data\": {\"modelName\": \"test\",	\"inprocess\": false,\"model\": {\"name\": \"testingdata\", "
-					+ " \"subScopename\": \"\",\"path\": [],\"type\": \"dir\",\"size\": 0,\"date\": \"2017-04-12T21:26:57.000Z\", "
-					+ " \"version\": \"\",\"createdBy\": \"someone\",	\"modifiedBy\": \"someone\",	\"content\": \"\",\"recursive\": false},"
-					+ " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"	},"
-					+ " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-					+ "	\"policyDescription\": \"testing input\", \"ecompName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
-					+ "	\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [	[\"fileId\"]],\"ttlDate\": null}}, "
-					+ "	\"policyJSON\": {\"pmTableName\": \"test\",	\"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
-			BufferedReader br = new BufferedReader(new StringReader(jsonString));
-
-			when(request.getReader()).thenReturn(br); 		    
-			controller.removeMicroServiceLocationDictionary(request, response);
-			logger.info("response.getContentAsString(): " + response.getContentAsString());
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceLocationDictionaryDatas"));
-
-		} catch (Exception e) {
-			fail("Exception: " + e);
-		}
-		
-		logger.info("testRemoveMicroServiceLocationDictionary: exit");
-	}
-
-	@Test
-	public void testGetMicroServiceAttributeByNameDictionaryEntityData() {
-		logger.info("testGetMicroServiceAttributeByNameDictionaryEntityData: Entering");
-
-		MockHttpServletResponse response =  new MockHttpServletResponse();
-		
-		controller.getMicroServiceAttributeByNameDictionaryEntityData(request, response);
-		
-		try {
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceAttributeDictionaryDatas"));
-			logger.info("response.getContentAsString(): " + response.getContentAsString());
-		} catch (UnsupportedEncodingException e) {
-			fail("Exception: " + e);
-		}
-		
-		logger.info("testGetMicroServiceAttributeByNameDictionaryEntityData: exit");
-	}
-
-	@Test
-	public void testGetMicroServiceAttributeDictionaryEntityData() {
-		logger.info("testGetMicroServiceAttributeDictionaryEntityData: Entering");
-
-		MockHttpServletResponse response =  new MockHttpServletResponse();
-		
-		controller.getMicroServiceAttributeDictionaryEntityData(request, response);
-		
-		try {
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceAttributeDictionaryDatas"));
-			logger.info("response.getContentAsString(): " + response.getContentAsString());
-		} catch (UnsupportedEncodingException e) {
-			fail("Exception: " + e);
-		}
-		
-		logger.info("testGetMicroServiceAttributeDictionaryEntityData: exit");
-	}
-
-	@Test
-	public void testSaveMicroServiceAttributeDictionary() {
-		logger.info("testSaveMicroServiceAttributeDictionary: Entering");
-
-		MockHttpServletResponse response =  new MockHttpServletResponse();
-	    request = mock(HttpServletRequest.class);   
-	
-		try {
-		    // mock the getReader() call
-			jsonString = "{\"modelAttributeDictionaryData\": {\"modelName\": \"test\",	\"inprocess\": false,\"model\": {\"name\": \"testingdata\", "
-					+ " \"subScopename\": \"\",\"path\": [],\"type\": \"dir\",\"size\": 0,\"date\": \"2017-04-12T21:26:57.000Z\", "
-					+ " \"version\": \"\",\"createdBy\": \"someone\",	\"modifiedBy\": \"someone\",	\"content\": \"\",\"recursive\": false},"
-					+ " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"	},"
-					+ " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-					+ "	\"policyDescription\": \"testing input\", \"ecompName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
-					+ "	\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [	[\"fileId\"]],\"ttlDate\": null}}, "
-					+ "	\"policyJSON\": {\"pmTableName\": \"test\",	\"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
-			BufferedReader br = new BufferedReader(new StringReader(jsonString));
-			when(request.getReader()).thenReturn(br); 		    
-			controller.saveMicroServiceAttributeDictionary(request, response);
-			logger.info("response.getContentAsString(): " + response.getContentAsString());
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceAttributeDictionaryDatas"));
-
-		} catch (Exception e) {
-			fail("Exception: " + e);
-		}
-		
-		logger.info("testSaveMicroServiceAttributeDictionary: exit");
-	}
-
-	@Test
-	public void testRemoveMicroServiceAttributeDictionary() {
-		logger.info("testRemoveMicroServiceAttributeDictionary: Entering");
-
-		MockHttpServletResponse response =  new MockHttpServletResponse();
-	    request = mock(HttpServletRequest.class);   
-	
-		try {
-		    // mock the getReader() call
-			jsonString = "{\"data\": {\"modelName\": \"test\",	\"inprocess\": false,\"model\": {\"name\": \"testingdata\", "
-					+ " \"subScopename\": \"\",\"path\": [],\"type\": \"dir\",\"size\": 0,\"date\": \"2017-04-12T21:26:57.000Z\", "
-					+ " \"version\": \"\",\"createdBy\": \"someone\",	\"modifiedBy\": \"someone\",	\"content\": \"\",\"recursive\": false},"
-					+ " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"	},"
-					+ " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-					+ "	\"policyDescription\": \"testing input\", \"ecompName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
-					+ "	\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [	[\"fileId\"]],\"ttlDate\": null}}, "
-					+ "	\"policyJSON\": {\"pmTableName\": \"test\",	\"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
-			BufferedReader br = new BufferedReader(new StringReader(jsonString));
-			when(request.getReader()).thenReturn(br); 		    
-			controller.removeMicroServiceAttributeDictionary(request, response);
-			logger.info("response.getContentAsString(): " + response.getContentAsString());
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceAttributeDictionaryDatas"));
-
-		} catch (Exception e) {
-			fail("Exception: " + e);
-		}
-		
-		logger.info("testRemoveMicroServiceAttributeDictionary: exit");
-	}
-
-	@Test
-	public void testGetMicroServiceModelsDictionaryByNameEntityData() {
-		logger.info("testGetMicroServiceModelsDictionaryByNameEntityData: Entering");
-
-		MockHttpServletResponse response =  new MockHttpServletResponse();
-		
-		controller.getMicroServiceModelsDictionaryByNameEntityData(request, response);
-		
-		try {
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceModelsDictionaryDatas"));
-			logger.info("response.getContentAsString(): " + response.getContentAsString());
-		} catch (UnsupportedEncodingException e) {
-			fail("Exception: " + e);
-		}
-		
-		logger.info("testGetMicroServiceModelsDictionaryByNameEntityData: exit");
-	}
-
-	@Test
-	public void testGetMicroServiceModelsDictionaryByVersionEntityData() {
-		logger.info("testGetMicroServiceModelsDictionaryByVersionEntityData: Entering");
-
-		MockHttpServletResponse response =  new MockHttpServletResponse();
-		String msModelJson = "{\"microServiceModelsDictionaryData\":[\"modelName\"]}";
-	        
-	    BufferedReader br = new BufferedReader(new StringReader(msModelJson));
-	    request = mock(HttpServletRequest.class);   
-	
-		try {
-		    // mock the getReader() call
-			when(request.getReader()).thenReturn(br); 		    
-			controller.getMicroServiceModelsDictionaryByVersionEntityData(request, response);
-			logger.info("response.getContentAsString(): " + response.getContentAsString());
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("No model name given"));
-
-		} catch (Exception e) {
-			fail("Exception: " + e);
-		}
-		
-		logger.info("testGetMicroServiceModelsDictionaryByVersionEntityData: exit");
-	}
-
-	@Test
-	public void testGetMicroServiceModelsDictionaryEntityData() {
-		logger.info("testGetMicroServiceModelsDictionaryEntityData: Entering");
-
-		MockHttpServletResponse response =  new MockHttpServletResponse();
-		String msModelJson = "{\"microServiceModelsDictionaryData\":[\"modelName\"]}";
-	        
-	    BufferedReader br = new BufferedReader(new StringReader(msModelJson));
-	    request = mock(HttpServletRequest.class);   
-	
-		try {
-		    // mock the getReader() call
-			when(request.getReader()).thenReturn(br); 		    
-			controller.getMicroServiceModelsDictionaryEntityData(request, response);
-			logger.info("response.getContentAsString(): " + response.getContentAsString());
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceModelsDictionaryDatas"));
-
-		} catch (Exception e) {
-			fail("Exception: " + e);
-		}
-		
-		logger.info("testGetMicroServiceModelsDictionaryEntityData: exit");
-	}
-
-	@Test
-	public void testGetMicroServiceModelsDictionaryEntityDataServiceVersion() {
-		logger.info("testGetMicroServiceModelsDictionaryEntityDataServiceVersion: Entering");
-
-		MockHttpServletResponse response =  new MockHttpServletResponse();
-		String msModelJson = "{\"microServiceModelsDictionaryData\":[\"modelName\"]}";
-	        
-	    BufferedReader br = new BufferedReader(new StringReader(msModelJson));
-	    request = mock(HttpServletRequest.class);   
-	
-		try {
-		    // mock the getReader() call
-			when(request.getReader()).thenReturn(br); 		    
-			controller.getMicroServiceModelsDictionaryEntityDataServiceVersion(request, response);
-			logger.info("response.getContentAsString(): " + response.getContentAsString());
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceModelsDictionaryDatas"));
-
-		} catch (Exception e) {
-			fail("Exception: " + e);
-		}
-		
-		logger.info("testGetMicroServiceModelsDictionaryEntityDataServiceVersion: exit");
-	}
-
-	@Test
-	public void testGetMicroServiceModelsDictionaryClassEntityData() {
-		logger.info("testGetMicroServiceModelsDictionaryClassEntityData: Entering");
-
-		MockHttpServletResponse response =  new MockHttpServletResponse();
-		String msModelJson = "{\"microServiceModelsDictionaryData\":[\"modelName\"]}";
-	        
-	    BufferedReader br = new BufferedReader(new StringReader(msModelJson));
-	    request = mock(HttpServletRequest.class);   
-	
-		try {
-		    // mock the getReader() call
-			when(request.getReader()).thenReturn(br); 		    
-			controller.getMicroServiceModelsDictionaryClassEntityData(request, response);
-			logger.info("response.getContentAsString(): " + response.getContentAsString());
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceModelsDictionaryClassDatas"));
-
-		} catch (Exception e) {
-			fail("Exception: " + e);
-		}
-		
-		logger.info("testGetMicroServiceModelsDictionaryClassEntityData: exit");
-	}
-
-	@Test
-	public void testSaveMicroServiceModelsDictionary() {
-		logger.info("testSaveMicroServiceModelsDictionary: Entering");
-
-		MockHttpServletResponse response =  new MockHttpServletResponse();
-	    request = mock(HttpServletRequest.class);   
-	
-		try {
-		    // mock the getReader() call
-			when(request.getReader()).thenReturn(br); 		    
-			controller.saveMicroServiceModelsDictionary(request, response);
-			logger.info("response.getContentAsString(): " + response.getContentAsString());
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceModelsDictionaryDatas"));
-
-		} catch (Exception e) {
-			fail("Exception: " + e);
-		}
-		
-		logger.info("testSaveMicroServiceModelsDictionary: exit");
-	}
-
-	@Test
-	public void testRemoveMicroServiceModelsDictionary() {
-		logger.info("testRemoveMicroServiceModelsDictionary: Entering");
-
-		MockHttpServletResponse response =  new MockHttpServletResponse();
-	    request = mock(HttpServletRequest.class);   
-	
-		try {
-		    // mock the getReader() call
-			jsonString = "{\"data\": {\"modelName\": \"test\",	\"inprocess\": false,\"model\": {\"name\": \"testingdata\", "
-					+ " \"subScopename\": \"\",\"path\": [],\"type\": \"dir\",\"size\": 0,\"date\": \"2017-04-12T21:26:57.000Z\", "
-					+ " \"version\": \"\",\"createdBy\": \"someone\",	\"modifiedBy\": \"someone\",	\"content\": \"\",\"recursive\": false},"
-					+ " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"	},"
-					+ " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-					+ "	\"policyDescription\": \"testing input\", \"ecompName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
-					+ "	\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [	[\"fileId\"]],\"ttlDate\": null}}, "
-					+ "	\"policyJSON\": {\"pmTableName\": \"test\",	\"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
-			
-			BufferedReader br = new BufferedReader(new StringReader(jsonString));
-			when(request.getReader()).thenReturn(br); 		    
-			controller.removeMicroServiceModelsDictionary(request, response);
-			logger.info("response.getContentAsString(): " + response.getContentAsString());
-			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceModelsDictionaryDatas"));
-
-		} catch (Exception e) {
-			fail("Exception: " + e);
-		}
-		
-		logger.info("testRemoveMicroServiceModelsDictionary: exit");
-	}
-
-}
diff --git a/ECOMP-PAP-REST/src/test/java/org/openecomp/policy/pap/xacml/rest/jpa/PolicyEntityTest.java b/ECOMP-PAP-REST/src/test/java/org/openecomp/policy/pap/xacml/rest/jpa/PolicyEntityTest.java
deleted file mode 100644
index 04ddd66e5..000000000
--- a/ECOMP-PAP-REST/src/test/java/org/openecomp/policy/pap/xacml/rest/jpa/PolicyEntityTest.java
+++ /dev/null
@@ -1,803 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP-PAP-REST
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.pap.xacml.rest.jpa;
-
-import static org.junit.Assert.*;
-
-//import org.apache.commons.logging.Log;
-//import org.apache.commons.logging.LogFactory;
-import org.junit.*;
-import org.openecomp.policy.rest.XACMLRestProperties;
-import org.openecomp.policy.rest.jpa.ActionBodyEntity;
-import org.openecomp.policy.rest.jpa.ConfigurationDataEntity;
-import org.openecomp.policy.rest.jpa.PolicyDBDaoEntity;
-import org.openecomp.policy.rest.jpa.PolicyEntity;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.Persistence;
-import javax.persistence.Query;
-
-import java.util.Date;
-import java.util.List;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger; 
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-
-import java.util.Properties;
-
-public class PolicyEntityTest {
-	
-	private static Logger logger = FlexLogger.getLogger(PolicyEntityTest.class);
-	
-    @Test
-    public void testAllOps(){
-    	Properties properties = new Properties();
-    	properties.put(XACMLRestProperties.PROP_PAP_DB_DRIVER,"org.h2.Driver");
-    	properties.put(XACMLRestProperties.PROP_PAP_DB_URL, "jdbc:h2:file:./sql/xacmlTest");
-    	properties.put(XACMLRestProperties.PROP_PAP_DB_USER, "sa");
-    	properties.put(XACMLRestProperties.PROP_PAP_DB_PASSWORD, "");
-    	EntityManagerFactory emf = Persistence.createEntityManagerFactory("testPapPU", properties);
-    	EntityManager em = emf.createEntityManager();
-        // Start a transaction
-        EntityTransaction et = em.getTransaction();
-
-        et.begin();
-        //Make sure the DB is clean
-        em.createQuery("DELETE FROM PolicyDBDaoEntity").executeUpdate();
-        em.createQuery("DELETE FROM PolicyEntity").executeUpdate();
-        em.createQuery("DELETE FROM ConfigurationDataEntity").executeUpdate();
-        em.createQuery("DELETE FROM ActionBodyEntity").executeUpdate();
-
-        //Create a policy object
-        PolicyEntity p1 = new PolicyEntity();
-        
-        //persist the policy    
-        em.persist(p1);
-
-        long policyId1 = p1.getPolicyId();
-        
-        String policyName1 = p1.getPolicyName();
-        
-        int version1 = p1.getVersion();
-        
-        String policyData1 = p1.getPolicyData();
-        
-        ConfigurationDataEntity configData1 = p1.getConfigurationData();
-        String configDataStr1 = (configData1!=null ? "configurationDataId = " + configData1.getConfigurationDataId() : "configurationData is null");
-        
-        ActionBodyEntity actionBody1 = p1.getActionBodyEntity();
-        String actionBodyStr1 = (actionBody1!=null ? "actionBodyId = " + actionBody1.getActionBodyId() : "actionBody is null");
-        
-        String createdBy1 = p1.getCreatedBy();
-        
-        Date createdDate1 = p1.getCreatedDate();
-        String createdDateStr1 = (createdDate1 != null ? createdDate1.toString() : "createdDate is null");
-        
-        String description = p1.getDescription();
-        
-        String modifiedBy1 = p1.getModifiedBy();
-        
-        Date modifiedDate1 = p1.getModifiedDate();
-        String modifiedDateStr1 = (modifiedDate1 != null ? modifiedDate1.toString() : "modifiedDate is null");
-        
-        
-        logger.debug("\n\n********PolicyEntityTest: Local PolicyEntity and Configuration objects before persist*********"
-        		+ "\npolicyId1 = " + policyId1
-        		+ "\npolicyName1 = " + policyName1
-        		+ "\nversion1 = " + version1
-        		+ "\npolicyData1 = " + policyData1
-        		+ "\nconfigDataStr1 = " + configDataStr1
-        		+ "\nactionBodyStr1 = " + actionBodyStr1
-           		+ "\nscope = " + p1.getScope()
-        		+ "\ncreatedBy1 = " + createdBy1
-        		+ "\ncreatedDateStr1 = " + createdDateStr1
-        		+ "\ndescription = " + description
-        		+ "\nmodifiedBy1 = " + modifiedBy1
-        		+ "\nmodifiedDateStr1 = " + modifiedDateStr1
-        		+ "\ndeleted = " + p1.isDeleted());
-        
-        //Set policyID
-        p1.setPolicyName("testPID2");
-        
-        //Set policyData
-        p1.setPolicyData("<policy>PolicyData</policy>");
-        
-        //We will NOT set the ConfigurationDataEntity or ActionBodyEntity object just to test that it is optional
-        
-        //set createdBy
-        p1.setCreatedBy("kevin");
-        
-        //createdDate will be set when it is persisted
-        
-        //set scope
-        p1.setScope("mckiou.kevin");
-        
-        //set description
-        p1.setDescription("PolicyEntity Description");
-        
-        //set modifiedBy
-        p1.setModifiedBy("kevin");
-        
-        //modifiedDate will be set when it is persisted
-      
-        //Flush to the DB
-        em.flush();
-        
-        //Now lets get some attribute values
-  
-        policyId1 = p1.getPolicyId();
-        
-        policyName1 = p1.getPolicyName();
-        
-        version1 = p1.getVersion();
-        
-        policyData1 = p1.getPolicyData();
-        
-        configData1 = p1.getConfigurationData();
-        configDataStr1 = (configData1!=null ?  "configurationDataId = " + configData1.getConfigurationDataId() : "configurationData is null");
-        
-        actionBody1 = p1.getActionBodyEntity();
-        actionBodyStr1 = (actionBody1!=null ? "actionBodyId = " + actionBody1.getActionBodyId() : "actionBody is null");
-        
-        createdBy1 = p1.getCreatedBy();
-        
-        createdDate1 = p1.getCreatedDate();
-        createdDateStr1 = (createdDate1 != null ? createdDate1.toString() : "createdDate is null");
-        
-        description = p1.getDescription();
-        
-        modifiedBy1 = p1.getModifiedBy();
-        
-        modifiedDate1 = p1.getModifiedDate();
-        modifiedDateStr1 = (modifiedDate1 != null ? modifiedDate1.toString() : "modifiedDate is null");
-        
-        logger.debug("\n\n********PolicyEntityTest: Local PolicyEntity and Configuration objects after persist*********"
-        		+ "\npolicyId1 = " + policyId1
-        		+ "\npolicyName1 = " + policyName1
-        		+ "\nversion1 = " + version1
-        		+ "\npolicyData1 = " + policyData1
-        		+ "\nconfigDataStr1 = " + configDataStr1
-        		+ "\nactionBodyStr1 = " + actionBodyStr1
-        		+ "\nscopeId = " + p1.getScope()
-        		+ "\ncreatedBy1 = " + createdBy1
-        		+ "\ncreatedDateStr1 = " + createdDateStr1
-        		+ "\ndescription = " + description
-        		+ "\nmodifiedBy1 = " + modifiedBy1
-        		+ "\nmodifiedDateStr1 = " + modifiedDateStr1
-        		+ "\ndeleted = " + p1.isDeleted());
-
-        //Now lets fully configure the configurationData and actionBody
-        
-        //Create a ConfigurationDataEntity object and set ID
-      ConfigurationDataEntity c1 = new ConfigurationDataEntity();      
-      
-      ActionBodyEntity a1 = new ActionBodyEntity();
-      
-        //persist the configuration Data
-      	em.persist(c1);        
-        
-        c1.setConfigType("OTHER");
-        
-        c1.setConfigBody("ABC");
-        
-        c1.setDescription("ConfigurationDataEntity Description");
-        
-        c1.setCreatedBy("kevin");
-        
-        //c1.setModifiedBy("kevin");
-        
-        c1.setDeleted(true);
-        
-        //persist the action Body
-        
-        em.persist(a1);
-        
-        a1.setActionBody("myActionBody");
-        
-        a1.setActionBodyName("myActionBodyName");
-        
-        a1.setCreatedBy("kevin");
-        
-        a1.setModifiedBy("kevin");
-        
-        a1.setDeleted(false);
-        
-        
-        long configurationDataId = c1.getConfigurationDataId();
-        
-        int cdVersion = c1.getVersion();
-        
-        String cdConfigType = c1.getConfigType();
-        
-        String cdConfigBody = c1.getConfigBody();
-        
-        String cdCreatedBy = c1.getCreatedBy();
-        
-        Date cdCreatedDate = c1.getCreatedDate();
-        
-        String cdDescription = c1.getDescription();
-        
-        String cdModifiedBy = c1.getModifiedBy();
-        
-        Date cdModifiedDate = c1.getModifiedDate();
-        
-        logger.debug("\n\n********PolicyEntityTest: Local Configuration object after setting values *********"
-        		+ "\nconfigurationDataId = " + configurationDataId
-        		+ "\ncdVersion = " + cdVersion
-        		+ "\ncdConfigType = " + cdConfigType
-        		+ "\ncdConfigBody = " + cdConfigBody
-        		+ "\ncdCreatedBy = " + cdCreatedBy
-        		+ "\ncdCreatedDate = " + cdCreatedDate
-        		+ "\ncdDescription = " + cdDescription
-        		+ "\ncdModifiedBy = " + cdModifiedBy
-        		+ "\ncdModifiedDate = " + cdModifiedDate
-        		+ "\ndeleted = " + c1.isDeleted());        
-        
-
-        
-        logger.debug("\n\n********PolicyEntityTest: Local Action Body object after setting values *********"
-        		+ "\nactionBodyId = " + a1.getActionBodyId()
-        		+ "\nactionBodyVersion = " + a1.getVersion()
-        		+ "\nactionBody = " + a1.getActionBody()
-        		+ "\nactionBodyCeatedBy = " + a1.getCreatedBy()
-        		+ "\nactionBodyCreatedDate = " + a1.getCreatedDate()
-        		+ "\nactionBodyModifiedBy = " + a1.getModifiedBy()
-        		+ "\nactionBodyModifiedDate = " + a1.getModifiedDate()
-        		+ "\nactionBodyDeleted = " + a1.isDeleted());        
-
-        p1.setScope("mckiou.kevin.kim");        
-        
-        //flush to the db
-        em.flush();
-        
-        //Perform policy selects
-        
-        Query query = em.createQuery("Select p from PolicyEntity p where p.policyId=:pid");
-        Query queryscope = em.createQuery("Select p from PolicyEntity p where p.scope=:s");
-        
-        query.setParameter("pid", p1.getPolicyId());
-        queryscope.setParameter("s", "mckiou.kevin.kim");
-        
-        //Just test that we are retrieving the right object
-        @SuppressWarnings("rawtypes")
-        List psList = queryscope.getResultList();
-        PolicyEntity px = null;
-        if(!psList.isEmpty()){
-        	//ignores multiple results
-        	px = (PolicyEntity) psList.get(0);
-        }else{
-        	fail("\nPolicyEntityTest: No PolicyEntity using scope DB entry found");
-        }
-        
-        //The scope object on the retrieved policy object should be same as the one we used to find it
-        assertSame(p1,px);
-        
-       
-        //Because getSingleResult() throws an unchecked exception which is an indication of a 
-        //programming error, we are not going to use it.
-        @SuppressWarnings("rawtypes")
-		List resultList = query.getResultList();
-        PolicyEntity p2 = null;
-        if(!resultList.isEmpty()){
-            // ignores multiple results
-            p2 = (PolicyEntity) resultList.get(0);
-        }else{
-        	fail("\nPolicyEntityTest: No PolicyEntity DB entry found");
-        }
-        
-        logger.debug("\n\n********PolicyEntityTest: PolicyEntity object after retrieving from DB BEFORE assigning configurationData*********"
-        		+ "\npolicyId2 = " + p2.getPolicyId()
-        		+ "\npolicyName2 = " + p2.getPolicyName()
-        		+ "\nversion2 = " + p2.getVersion()
-        		+ "\npolicyData2 = " + p2.getPolicyData()
-        		+ "\nconfigurationData2 = " + (p2.getConfigurationData()!=null ? "configurationDataId = " + p2.getConfigurationData().getConfigurationDataId() : "configurationData is null")
-        		+ "\nactionBody2 = " + (p2.getActionBodyEntity()!=null ? "actionBodyId = " + p2.getActionBodyEntity().getActionBodyId() : "actionBody is null")
-        		+ "\nscope2 = " + p2.getScope()
-        		+ "\ncreatedBy2 = " + p2.getCreatedBy()
-        		+ "\ncreatedDate2 = " + p2.getCreatedDate()
-        		+ "\ndescription2 = " + p2.getDescription()
-        		+ "\nmodifiedBy2 = " + p2.getModifiedBy()
-        		+ "\nmodifiedDate2 = " + p2.getModifiedDate()
-        		+ "\ndeleted2 = " + p2.isDeleted());
-
-        //Confirm that the retrieved policy object is the same as the persisted object
-        assertSame(p1,p2);
-        
-        //Perform configurationData selects
-        Query query2 = em.createQuery("Select c from ConfigurationDataEntity c where c.configurationDataId=:cid");
-        
-        query2.setParameter("cid", c1.getConfigurationDataId());
-        
-        //Get the database version of the Configuration Data
-		resultList = query2.getResultList();
-        ConfigurationDataEntity c2 = null;
-        if(!resultList.isEmpty()){
-            // ignores multiple results
-            c2 = (ConfigurationDataEntity) resultList.get(0);
-        }else{
-        	fail("\nPolicyEntityTest: No ConfigurationDataEntity DB entry found");
-        }
-        
-        logger.debug("\n\n********PolicyEntityTest: Configuration object after retrieving from DB BEFORE assigning to policy*********"
-        		+ "\nconfigurationDataId2 = " + c2.getConfigurationDataId()
-        		+ "\nversion2 = " + c2.getVersion()
-        		+ "\nconfigType2 = " + c2.getConfigType()
-        		+ "\nconfigBody2 = " + c2.getConfigBody()
-        		+ "\ncreatedBy2 = " + c2.getCreatedBy()
-        		+ "\ncreatedDate2 = " + c2.getCreatedDate()
-        		+ "\ndescription2 = " + c2.getDescription()
-        		+ "\nmodifiedBy2 = " + c2.getModifiedBy()
-        		+ "\nmodifiedDate2 = " + c2.getModifiedDate()
-        		+ "\ndeleted2 = " + c2.isDeleted());
-        
-        //Confirm the retrieved ConfigurationDataEntity object is the same as the persisted
-        assertSame(c1,c2);
-        
-        //Now assign the configurationData to the policy 
-        p1.setConfigurationData(c1);
-        
-        //Perform actionBody selects
-        Query querya2 = em.createQuery("Select a from ActionBodyEntity a where a.actionBodyId=:aid");
-        
-        querya2.setParameter("aid", a1.getActionBodyId());
-        
-        //Get the database version of the Action Body
-		resultList = querya2.getResultList();
-        ActionBodyEntity a2 = null;
-        if(!resultList.isEmpty()){
-            // ignores multiple results
-            a2 = (ActionBodyEntity) resultList.get(0);
-        }else{
-        	fail("\nPolicyEntityTest: No ActionBodyEntity DB entry found");
-        }
-        
-        
-        logger.debug("\n\n********PolicyEntityTest: Local Action Body object after retrieving from DB BEFORE assigning to policy *********"
-        		+ "\nactionBodyId2 = " + a2.getActionBodyId()
-        		+ "\nactionBodyVersion2 = " + a2.getVersion()
-        		+ "\nactionBody2 = " + a2.getActionBody()
-        		+ "\nactionBodyCeatedBy2 = " + a2.getCreatedBy()
-        		+ "\nactionBodyCreatedDate2 = " + a2.getCreatedDate()
-        		+ "\nactionBodyModifiedBy2 = " + a2.getModifiedBy()
-        		+ "\nactionBodyModifiedDate2 = " + a2.getModifiedDate()
-        		+ "\nactionBodyDeleted2 = " + a2.isDeleted());        
-
-        
-        //Confirm the retrieved ActionBodyEntity object is the same as the persisted
-        assertSame(a1,a2);
-        
-        //Now assign the ActionBodyEntity to the policy 
-        p1.setActionBodyEntity(a1);
-
-        em.flush();
-        
-        //Let's retrieve the policy, configurationData and actionBody from the DB and look at them
-        //Here is the policy object
-        resultList = query.getResultList();
-        p2 = null;
-        if(!resultList.isEmpty()){
-            // ignores multiple results
-            p2 = (PolicyEntity) resultList.get(0);
-        }else{
-        	fail("PolicyEntityTest: No PolicyEntity DB entry found");
-        }
-        
-        logger.debug("\n\n********PolicyEntityTest: PolicyEntity object after retrieving from DB AFTER assigning configurationData*********"
-        		+ "\npolicyId2 = " + p2.getPolicyId()
-        		+ "\npolicyName2 = " + p2.getPolicyName()
-        		+ "\nversion2 = " + p2.getVersion()
-        		+ "\npolicyData2 = " + p2.getPolicyData()
-        		+ "\nconfigurationData2 = " + (p2.getConfigurationData()!=null ? "configurationDataId = " + p2.getConfigurationData().getConfigurationDataId() : "configurationData is null")
-        		+ "\nactionBody2 = " + (p2.getActionBodyEntity()!=null ? "actionBodyId = " + p2.getActionBodyEntity().getActionBodyId() : "actionBody is null")
-        		+ "\nscope2 = " + p2.getScope()
-        		+ "\ncreatedBy2 = " + p2.getCreatedBy()
-        		+ "\ncreatedDate2 = " + p2.getCreatedDate()
-        		+ "\ndescription2 = " + p2.getDescription()
-        		+ "\nmodifiedBy2 = " + p2.getModifiedBy()
-        		+ "\nmodifiedDate2 = " + p2.getModifiedDate()
-        		+ "\ndeleted2 = " + p2.isDeleted());
-
-        //And now the ConfigurationDataEntity object
-		resultList = query2.getResultList();
-        c2 = null;
-        if(!resultList.isEmpty()){
-            // ignores multiple results
-            c2 = (ConfigurationDataEntity) resultList.get(0);
-        }else{
-        	fail("\nPolicyEntityTest: No ConfigurationDataEntity DB entry found");
-        }
-        
-        logger.debug("\n\n********PolicyEntityTest: Configuration object after retrieving from DB AFTER assigning to policy*********"
-        		+ "\nconfigurationDataId2 = " + c2.getConfigurationDataId()
-        		+ "\nversion2 = " + c2.getVersion()
-        		+ "\nconfigType2 = " + c2.getConfigType()
-        		+ "\nconfigBody2 = " + c2.getConfigBody()
-        		+ "\ncreatedBy2 = " + c2.getCreatedBy()
-        		+ "\ncreatedDate2 = " + c2.getCreatedDate()
-        		+ "\ndescription2 = " + c2.getDescription()
-        		+ "\nmodifiedBy = " + c2.getModifiedBy()
-        		+ "\nmodifiedDate = " + c2.getModifiedDate()
-        		+ "\ndeleted2 = " + c2.isDeleted());
-        
-        
-        //Get the database version of the Action Body
-		resultList = querya2.getResultList();
-        a2 = null;
-        if(!resultList.isEmpty()){
-            // ignores multiple results
-            a2 = (ActionBodyEntity) resultList.get(0);
-        }else{
-        	fail("\nPolicyEntityTest: No ActionBodyEntity DB entry found");
-        }
-        
-        
-        logger.debug("\n\n********PolicyEntityTest: Local Action Body object after retrieving from DB AFTER assigning to policy *********"
-        		+ "\nactionBodyId2 = " + a2.getActionBodyId()
-        		+ "\nactionBodyVersion2 = " + a2.getVersion()
-        		+ "\nactionBody2 = " + a2.getActionBody()
-        		+ "\nactionBodyCeatedBy2 = " + a2.getCreatedBy()
-        		+ "\nactionBodyCreatedDate2 = " + a2.getCreatedDate()
-        		+ "\nactionBodyModifiedBy2 = " + a2.getModifiedBy()
-        		+ "\nactionBodyModifiedDate2 = " + a2.getModifiedDate()
-        		+ "\nactionBodyDeleted2 = " + a2.isDeleted());        
-
-        
-        //****Now lets see if the orphanRemoval=true does anything useful***
-        //Remove the configurationData from the policy relationship
-        
-        p1.setConfigurationData(null);
-        
-        p1.setActionBodyEntity(null);
-        
-        //flush the update to the DB
-        em.flush();
-        
-        //Attempt to retrieve the configuration data object from the db. It should not be there
-        //Reusing the previous query
-		resultList = query2.getResultList();
-        c2 = null;
-        if(resultList.isEmpty()){
-        	logger.debug("\n\n********PolicyEntityTest: orphanRemoval=true******"
-        			+ "\n Success!! No ConfigurationDataEntity DB entry found");
-            
-        }else{
-        	c2 = (ConfigurationDataEntity) resultList.get(0);
-        	fail("\nPolicyEntityTest: ConfigurationDataEntity DB entry found - and none should exist"
-        			+ "\nconfigurationDataId = " + c2.getConfigurationDataId());
-        }
-        
-        //Attempt to retrieve the actionBody data object from the db. It should not be there
-        //Reusing the previous query
-		resultList = querya2.getResultList();
-        a2 = null;
-        if(resultList.isEmpty()){
-        	logger.debug("\n\n********PolicyEntityTest: orphanRemoval=true******"
-        			+ "\n Success!! No ActionBodyEntity DB entry found");
-            
-        }else{
-        	a2 = (ActionBodyEntity) resultList.get(0);
-        	fail("\nPolicyEntityTest: ActionBodyEntity DB entry found - and none should exist"
-        			+ "\nactionBodyId = " + a2.getActionBodyId());
-        }
-        
-        //Now lets put the configurationData and actionBody back into the policy object and see what appears
-        //in the DB after a flush
-        
-        //put c1 back into the persistence context since the orphanRemoval removed it.
-        em.persist(c1);
-        p1.setConfigurationData(c1);
-        
-        em.persist(a1);
-        p1.setActionBodyEntity(a1);
-        
-        em.flush();
-        
-        //retrieve the policy object
-		resultList = query.getResultList();
-        p2 = null;
-        if(!resultList.isEmpty()){
-            // ignores multiple results
-            p2 = (PolicyEntity) resultList.get(0);
-        }else{
-        	fail("\nPolicyEntityTest: No PolicyEntity DB entry found");
-        }
-        
-        //output what we policy object found
-        logger.debug("\n\n********PolicyEntityTest: PolicyEntity object after again adding ConfigurationDataEntity and retrieving from DB*********"
-        		+ "\npolicyId2 = " + p2.getPolicyId()
-        		+ "\npolicyName2 = " + p2.getPolicyName()
-        		+ "\nversion2 = " + p2.getVersion()
-        		+ "\npolicyData2 = " + p2.getPolicyData()
-        		+ "\nconfigurationData2 = " + (p2.getConfigurationData()!=null ? "configurationDataId = " + p2.getConfigurationData().getConfigurationDataId() : "configurationData is null")
-        		+ "\nactionBody2 = " + (p2.getActionBodyEntity()!=null ? "actionBodyId = " + p2.getActionBodyEntity().getActionBodyId() : "actionBody is null")
-        		+  "\nscope2 = " + p2.getScope()
-        		+ "\ncreatedBy2 = " + p2.getCreatedBy()
-        		+ "\ncreatedDate2 = " + p2.getCreatedDate()
-        		+ "\ndescription2 = " + p2.getDescription()
-        		+ "\nmodifiedBy2 = " + p2.getModifiedBy()
-        		+ "\nmodifiedDate2 = " + p2.getModifiedDate()
-        		+ "\ndeleted2 = " + p2.isDeleted());
-
-
-        //now lets see if it put the configurationData c1 back into the table
-		resultList = query2.getResultList();
-        c2 = null;
-        if(!resultList.isEmpty()){
-            // ignores multiple results
-            c2 = (ConfigurationDataEntity) resultList.get(0);
-        }else{
-        	fail("\nPolicyEntityTest - Check re-entry of configurationData into DB"
-        			+ "No ConfigurationDataEntity DB entry found");
-        }
-        
-        //output what configurationData object we found
-        logger.debug("\n\n********PolicyEntityTest: Configuration object after re-enter into policy object and retrieving from DB *********"
-        		+ "\nconfigurationDataId2 = " + c2.getConfigurationDataId()
-        		+ "\nversion2 = " + c2.getVersion()
-        		+ "\nconfigType2 = " + c2.getConfigType()
-        		+ "\nconfigBody2 = " + c2.getConfigBody()
-        		+ "\ncreatedBy2 = " + c2.getCreatedBy()
-        		+ "\ncreatedDate2 = " + c2.getCreatedDate()
-        		+ "\ndescription2 = " + c2.getDescription()
-        		+ "\nmodifiedBy = " + c2.getModifiedBy()
-        		+ "\nmodifiedDate = " + c2.getModifiedDate()
-        		+ "\ndeleted2 = " + c2.isDeleted());
-
-        //now lets see if it put the actionBody a1 back into the table
-        //Get the database version of the Action Body
- 		resultList = querya2.getResultList();
-         a2 = null;
-         if(!resultList.isEmpty()){
-             // ignores multiple results
-             a2 = (ActionBodyEntity) resultList.get(0);
-         }else{
-         	fail("\nPolicyEntityTest - Check re-entry of actionBody into DB"
-        			+ "No ActionBodyEntity DB entry found");
-         }
-         
-         logger.debug("\n\n********PolicyEntityTest: Local Action Body object after re-enter into policy object and retrieving from DB *********"
-         		+ "\nactionBodyId2 = " + a2.getActionBodyId()
-         		+ "\nactionBodyVersion2 = " + a2.getVersion()
-         		+ "\nactionBody2 = " + a2.getActionBody()
-         		+ "\nactionBodyCeatedBy2 = " + a2.getCreatedBy()
-         		+ "\nactionBodyCreatedDate2 = " + a2.getCreatedDate()
-         		+ "\nactionBodyModifiedBy2 = " + a2.getModifiedBy()
-         		+ "\nactionBodyModifiedDate2 = " + a2.getModifiedDate()
-         		+ "\nactionBodyDeleted2 = " + a2.isDeleted());        
-
-        //I want to save all the above in the DB
-        try{
-        	et.commit();
-        	logger.debug("\n\n***********PolicyEntityTest: et.commit Succeeded********");
-        }catch(Exception e){
-        	logger.debug("\n\n***********PolicyEntityTest: et.commit Failed********"
-        			+ "\nTRANSACTION ROLLBACK "
-        			+ "\n   with exception: " + e);
-        }
-
-        // Start a new transaction
-        EntityTransaction et2 = em.getTransaction();
-
-        et2.begin();
-        
-        //Let's test if the PolicyEntity uniqueConstraint for policyName and scopeId hold
-        PolicyEntity p3 = new PolicyEntity();
-        em.persist(p3);
-
-    	
-    	//first let's assure that you can save with the same name but a different scope
-    	p3.setPolicyName(p1.getPolicyName());
-    	p3.setScope("mckiou.kevin.kory");
-    	em.flush();
-    	logger.debug("\n\n***********PolicyEntityTest: PolicyEntity Unique test for policyName and scope********"
-    			+ "\nSuccess!  PolicyEntity uniqueness constraint allowed "
-    			+ "\n   policyId1 " + p1.getPolicyId() 
-    			+ "\n   policyName1 " + p1.getPolicyName() 
-    			+ "\n   scope1 = " + p1.getScope()
-    			+ "\n   policyId3 " + p3.getPolicyId() 
-    			+ "\n   policyName3 " + p3.getPolicyName() 
-    			+ "\n   scope3 = " + p3.getScope());
-
-    	//Assert that the policyIds are NOT the same to show that the automatic sequencing is working
-    	assert(p1.getPolicyId() != p3.getPolicyId());
-
-    	try{
-        	//Now set the scope the same to verify the uniqueness constraint will be enforced
-        	p3.setScope(p1.getScope());
-        	
-        	em.flush();
-        	logger.debug("\n\n***********PolicyEntityTest: PolicyEntity Unique test for policyName and scope********"
-        			+ "\nFailed! PolicyEntity Uniqueness constraint FAILED and DID allow "
-        			+ "\n   policyId1 " + p1.getPolicyId() 
-        			+ "\n   policyName1 " + p1.getPolicyName() 
-        			+ "\n   scope1 = " + p1.getScope()
-        			+ "\n   policyId3 " + p3.getPolicyId() 
-        			+ "\n   policyName3 " + p3.getPolicyName() 
-        			+ "\n   scope3 = " + p3.getScope());;
-        }
-        catch(Exception e){
-        	//Success
-        	logger.debug("\n\n***********PolicyEntityTest: PolicyEntity Unique test for policyName and scope********"
-        			+ "\nSuccess!  PolicyEntity Uniqueness constraint SUCCEEDED and did NOT allow "
-        			+ "\n   policyId1 " + p1.getPolicyId() 
-        			+ "\n   policyName1 " + p1.getPolicyName() 
-        			+ "\n   scope1 = " + p1.getScope()
-        			+ "\n   policyId3 " + p3.getPolicyId() 
-        			+ "\n   policyName3 " + p3.getPolicyName() 
-        			+ "\n   scope3 = " + p3.getScope()
-        			+ "\n   with excpetion: " + e);
-        }
-
-    	
-        try{
-        	et2.commit();
-        	logger.debug("\n\n***********PolicyEntityTest: et2.commit Succeeded********");
-        }catch(Exception e){
-        	logger.debug("\n\n***********PolicyEntityTest: et2.commit Failed********"
-        			+ "\nTRANSACTION ROLLBACK "
-        			+ "\n   with exception: " + e);
-        }
-        
-        //****************Test the PolicyDBDaoEntity************************
-        
-        //Create a transaction
-        EntityTransaction et3 = em.getTransaction();
-
-        et3.begin();
-        
-        //create one 
-        PolicyDBDaoEntity pe1 = new PolicyDBDaoEntity();
-        em.persist(pe1);
-        
-        pe1.setDescription("This is pe1");
-        
-        pe1.setPolicyDBDaoUrl("http://123.45.2.456:2345");
-        
-        //push it to the DB
-        em.flush();
-        
-        //create another
-        PolicyDBDaoEntity pe2 = new PolicyDBDaoEntity();
-        em.persist(pe2);
-        
-        pe2.setDescription("This is pe2");
-        
-        pe2.setPolicyDBDaoUrl("http://789.01.2.345:2345");
-        
-        //Print them to the log before flushing
-        logger.debug("\n\n***********PolicyEntityTest: PolicyDBDaoEntity objects before flush********"
-    			+ "\n   policyDBDaoUrl-1 = " + pe1.getPolicyDBDaoUrl()
-    			+ "\n   description-1 = " + pe1.getDescription()
-    			+ "\n   createdDate-1 = " + pe1.getCreatedDate()
-    			+ "\n   modifiedDate-1 " + pe1.getModifiedDate()
-    			+ "\n*****************************************"
-    			+ "\n   policyDBDaoUrl-2 = " + pe2.getPolicyDBDaoUrl()
-    			+ "\n   description-2 = " + pe2.getDescription()
-    			+ "\n   createdDate-2 = " + pe2.getCreatedDate()
-    			+ "\n   modifiedDate-2 " + pe2.getModifiedDate()
-        		);
-        
-        //push it to the DB
-        em.flush();
-        
-        //Now let's retrieve them from the DB using the named query
-        
-		resultList = em.createNamedQuery("PolicyDBDaoEntity.findAll").getResultList();
-
-		PolicyDBDaoEntity pex = null;
-		PolicyDBDaoEntity pey = null;
-		
-        if(!resultList.isEmpty()){
-        	if (resultList.size() != 2){
-        		fail("\nPolicyEntityTest: Number of PolicyDBDaoEntity entries = " + resultList.size() + " instead of 2");
-        	}
-        	for(Object policyDBDaoEntity: resultList){
-        		PolicyDBDaoEntity pdbdao = (PolicyDBDaoEntity)policyDBDaoEntity;
-        		if(pdbdao.getPolicyDBDaoUrl().equals("http://123.45.2.456:2345")){
-        			pex = pdbdao;
-        		}else if(pdbdao.getPolicyDBDaoUrl().equals("http://789.01.2.345:2345")){
-        			pey = pdbdao;
-        		}
-        	}
-        	
-            //Print them to the log before flushing
-            logger.debug("\n\n***********PolicyEntityTest: PolicyDBDaoEntity objects retrieved from DB********"
-        			+ "\n   policyDBDaoUrl-x = " + pex.getPolicyDBDaoUrl()
-        			+ "\n   description-x = " + pex.getDescription()
-        			+ "\n   createdDate-x = " + pex.getCreatedDate()
-        			+ "\n   modifiedDate-x " + pex.getModifiedDate()
-        			+ "\n*****************************************"
-        			+ "\n   policyDBDaoUrl-y = " + pey.getPolicyDBDaoUrl()
-        			+ "\n   description-y = " + pey.getDescription()
-        			+ "\n   createdDate-y = " + pey.getCreatedDate()
-        			+ "\n   modifiedDate-y " + pey.getModifiedDate()
-            		);
-        	//Verify the retrieved objects are the same as the ones we stored in the DB
-        	if(pex.getPolicyDBDaoUrl().equals("http://123.45.2.456:2345")){
-        		assertSame(pe1,pex);
-        		assertSame(pe2,pey);
-        	}else{
-        		assertSame(pe2,pex);
-        		assertSame(pe1,pey);
-        	}
-            
-        }else{
-        	fail("\nPolicyEntityTest: No PolicyDBDaoEntity DB entry found");
-        }
-       
-        //Now let's see if we can do an update on the PolicyDBDaoEntity which we retrieved.
-        //em.persist(pex);
-        pex.setDescription("This is pex");
-        em.flush();
-        
-        //retrieve it
-        Query createPolicyQuery = em.createQuery("SELECT p FROM PolicyDBDaoEntity p WHERE p.description=:desc");
-		resultList = createPolicyQuery.setParameter("desc", "This is pex").getResultList();
-		
-		PolicyDBDaoEntity pez = null;
-        
-        if(!resultList.isEmpty()){
-        	if (resultList.size() != 1){
-        		fail("\nPolicyEntityTest: Update Test - Number of PolicyDBDaoEntity entries = " + resultList.size() + " instead of 1");
-        	}
-        	pez = (PolicyDBDaoEntity) resultList.get(0);
-        	
-            //Print them to the log before flushing
-            logger.debug("\n\n***********PolicyEntityTest: Update Test - PolicyDBDaoEntity objects retrieved from DB********"
-        			+ "\n   policyDBDaoUrl-x = " + pex.getPolicyDBDaoUrl()
-        			+ "\n   description-x = " + pex.getDescription()
-        			+ "\n   createdDate-x = " + pex.getCreatedDate()
-        			+ "\n   modifiedDate-x " + pex.getModifiedDate()
-        			+ "\n*****************************************"
-        			+ "\n   policyDBDaoUrl-z = " + pez.getPolicyDBDaoUrl()
-        			+ "\n   description-z = " + pez.getDescription()
-        			+ "\n   createdDate-z = " + pez.getCreatedDate()
-        			+ "\n   modifiedDate-z " + pez.getModifiedDate()
-            		);
-        	//Verify the retrieved objects are the same as the ones we stored in the DB
-       		assertSame(pex,pez);
-        }else{
-        	fail("\nPolicyEntityTest: Update Test - No PolicyDBDaoEntity DB updated entry found");
-        }
-        
-        //Clean up the DB
-        em.createQuery("DELETE FROM PolicyDBDaoEntity").executeUpdate();
-        em.createQuery("DELETE FROM PolicyEntity").executeUpdate();
-        em.createQuery("DELETE FROM ConfigurationDataEntity").executeUpdate();
-        em.createQuery("DELETE FROM ActionBodyEntity").executeUpdate();
-        
-        //Wrap up the transaction
-        try{
-        	et3.commit();
-        	logger.debug("\n\n***********PolicyEntityTest: et3.commit Succeeded********");
-        }catch(Exception e){
-        	logger.debug("\n\n***********PolicyEntityTest: et3.commit Failed********"
-        			+ "\nTRANSACTION ROLLBACK "
-        			+ "\n   with exception: " + e);
-        }
-         
-        
-        //Tidy up
-        em.close();
-    }
-    
-}