fixes for supporting non-gui application access provisioning

Issue-ID: PORTAL-909

Change-Id: I760eb93966cec6d2cf9a24f06e3424ab867b38f6
Signed-off-by: Muni Mohan Kunchi <munmohan@att.com>

20 files changed, 423 insertions, 495 deletions

diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/AppCatalogControllerTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/AppCatalogControllerTest.java
index 1c1d7bc0..8b1fc82d 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/AppCatalogControllerTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/AppCatalogControllerTest.java
@@ -59,6 +59,7 @@ import org.onap.portalapp.portal.controller.AppCatalogController;
 import org.onap.portalapp.portal.core.MockEPUser;
 import org.onap.portalapp.portal.domain.EPApp;
 import org.onap.portalapp.portal.domain.EPUser;
+import org.onap.portalapp.portal.domain.EpAppType;
 import org.onap.portalapp.portal.ecomp.model.AppCatalogItem;
 import org.onap.portalapp.portal.framework.MockitoTestSuite;
 import org.onap.portalapp.portal.service.AdminRolesService;
@@ -245,23 +246,23 @@ public class AppCatalogControllerTest extends MockitoTestSuite {
 
 		app.setName("Test");
 		app.setImageUrl("test");
-		app.setDescription("test");
-		app.setNotes("test");
-		app.setUrl("test");
+		app.setAppDescription("test");
+		app.setAppNotes("test");
+		app.setLandingPage("test");
 		app.setId((long) 1);
 		app.setAppRestEndpoint("test");
-		app.setAlternateUrl("test");
+		app.setAlternateLandingPage("test");
 		app.setName("test");
 		app.setMlAppName("test");
 		app.setMlAppAdminId("test");
-		app.setUsername("test");
-		app.setAppPassword("test");
+		app.setAppBasicAuthUsername("test");
+		app.setAppBasicAuthPassword("test");
 		app.setOpen(false);
 		app.setEnabled(false);
 		app.setUebKey("test");
 		app.setUebSecret("test");
 		app.setUebTopicName("test");
-		app.setAppType(1);
+		app.setAppType(EpAppType.GUI);
 
 		Mockito.when(appService.getApp(persRequest.getAppId())).thenReturn(app);
 
@@ -302,23 +303,23 @@ public class AppCatalogControllerTest extends MockitoTestSuite {
 
 		app.setName("Test");
 		app.setImageUrl("test");
-		app.setDescription("test");
-		app.setNotes("test");
-		app.setUrl("test");
+		app.setAppDescription("test");
+		app.setAppNotes("test");
+		app.setLandingPage("test");
 		app.setId((long) 1);
 		app.setAppRestEndpoint("test");
-		app.setAlternateUrl("test");
+		app.setAlternateLandingPage("test");
 		app.setName("test");
 		app.setMlAppName("test");
 		app.setMlAppAdminId("test");
-		app.setUsername("test");
-		app.setAppPassword("test");
+		app.setAppBasicAuthUsername("test");
+		app.setAppBasicAuthPassword("test");
 		app.setOpen(false);
 		app.setEnabled(false);
 		app.setUebKey("test");
 		app.setUebSecret("test");
 		app.setUebTopicName("test");
-		app.setAppType(1);
+		app.setAppType(EpAppType.GUI);
 
 		Mockito.when(appService.getApp(persRequest.getAppId())).thenReturn(app);
 
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/AppsControllerExternalRequestTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/AppsControllerExternalRequestTest.java
index 4535cf17..6e32846c 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/AppsControllerExternalRequestTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/AppsControllerExternalRequestTest.java
@@ -268,7 +268,7 @@ public class AppsControllerExternalRequestTest extends MockitoTestSuite {
 		expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR);
 
 		OnboardingApp expectedOnboardingApp = new OnboardingApp();
-		expectedOnboardingApp.id = (long) 1;
+		expectedOnboardingApp.setId(1l);
 
 		PortalRestResponse<String> actualPortalRestResponse = appsControllerExternalRequest
 				.postOnboardAppExternal(mockedRequest, mockedResponse, expectedOnboardingApp);
@@ -285,13 +285,29 @@ public class AppsControllerExternalRequestTest extends MockitoTestSuite {
 		expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR);
 
 		OnboardingApp expectedOnboardingApp = new OnboardingApp();
-		expectedOnboardingApp.id = null;
 
+		expectedOnboardingApp.setId(null);
+		
 		PortalRestResponse<String> actualPortalRestResponse = appsControllerExternalRequest
 				.postOnboardAppExternal(mockedRequest, mockedResponse, expectedOnboardingApp);
 		assertEquals(actualPortalRestResponse, expectedportalRestResponse);
 
 	}
+	
+	private OnboardingApp createExpectedApp() {
+
+		OnboardingApp expectedOnboardingApp = new OnboardingApp();;
+		expectedOnboardingApp.setAppName("test");
+		expectedOnboardingApp.setLandingPage("test.com");
+		expectedOnboardingApp.setRestUrl("<script>alert(/XSS”)</script>");
+		expectedOnboardingApp.setMyLoginsAppOwner("testUser");
+		expectedOnboardingApp.setRestrictedApp(false);
+		expectedOnboardingApp.setIsOpen(true);
+		expectedOnboardingApp.setIsEnabled(true);
+		return expectedOnboardingApp;
+
+	}
+	
 
 	@Test
 	public void postOnboardAppExternalXSSTest() {
@@ -302,14 +318,8 @@ public class AppsControllerExternalRequestTest extends MockitoTestSuite {
 		PortalRestStatusEnum portalRestStatusEnum = null;
 		expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR);
 
-		OnboardingApp expectedOnboardingApp = new OnboardingApp();;
-		expectedOnboardingApp.name = "test";
-		expectedOnboardingApp.url="test.com";
-		expectedOnboardingApp.restUrl="<script>alert(/XSS”)</script>";
-		expectedOnboardingApp.myLoginsAppOwner="testUser";
-		expectedOnboardingApp.restrictedApp=false;
-		expectedOnboardingApp.isOpen=true;
-		expectedOnboardingApp.isEnabled=true;
+		OnboardingApp expectedOnboardingApp = createExpectedApp();
+
 		EPUser user = mockUser.mockEPUser();
 		user.setEmail("guestT@test.portal.onap.org");
 		user.setLoginPwd("pwd");
@@ -332,8 +342,9 @@ public class AppsControllerExternalRequestTest extends MockitoTestSuite {
 		expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR);
 		Long appId = null;
 		OnboardingApp expectedOnboardingApp = new OnboardingApp();
-		expectedOnboardingApp.id = null;
-
+		
+		expectedOnboardingApp.setId(null);
+		
 		PortalRestResponse<String> actualPortalRestResponse = appsControllerExternalRequest
 				.putOnboardAppExternal(mockedRequest, mockedResponse, appId, expectedOnboardingApp);
 		assertEquals(actualPortalRestResponse, expectedportalRestResponse);
@@ -348,14 +359,8 @@ public class AppsControllerExternalRequestTest extends MockitoTestSuite {
 		PortalRestStatusEnum portalRestStatusEnum = null;
 		expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR);
 
-		OnboardingApp expectedOnboardingApp = new OnboardingApp();;
-		expectedOnboardingApp.name = "test";
-		expectedOnboardingApp.url="test.com";
-		expectedOnboardingApp.restUrl="<script>alert(/XSS”)</script>";
-		expectedOnboardingApp.myLoginsAppOwner="testUser";
-		expectedOnboardingApp.restrictedApp=false;
-		expectedOnboardingApp.isOpen=true;
-		expectedOnboardingApp.isEnabled=true;
+		OnboardingApp expectedOnboardingApp = createExpectedApp();
+		
 		EPUser user = mockUser.mockEPUser();
 		user.setEmail("guestT@test.portal.onap.org");
 		user.setLoginPwd("pwd");
@@ -381,7 +386,9 @@ public class AppsControllerExternalRequestTest extends MockitoTestSuite {
 		expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR);
 		Long appId = (long) 1;
 		OnboardingApp expectedOnboardingApp = new OnboardingApp();
-		expectedOnboardingApp.id = (long) 1;
+		
+		expectedOnboardingApp.setId(1l);
+		
 		PortalRestResponse<String> actualPortalRestResponse = appsControllerExternalRequest
 				.putOnboardAppExternal(mockedRequest, mockedResponse, appId, expectedOnboardingApp);
 		assertEquals(actualPortalRestResponse, expectedportalRestResponse);
@@ -390,21 +397,14 @@ public class AppsControllerExternalRequestTest extends MockitoTestSuite {
 	@Test
 	public void putOnboardAppExternalIfOnboardingAppDetailsTest() {
 		PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
-		expectedportalRestResponse.setMessage("Failed to find user: testUser");
+		expectedportalRestResponse.setMessage("Failed to find user: 12");
 		expectedportalRestResponse.setResponse(null);
 		PortalRestStatusEnum portalRestStatusEnum = null;
 		expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR);
 		Long appId = (long) 1;
 
-		OnboardingApp expectedOnboardingApp = new OnboardingApp();
-		expectedOnboardingApp.id = (long) 1;
-		expectedOnboardingApp.name = "test";
-		expectedOnboardingApp.url="test.com";
-		expectedOnboardingApp.restUrl="test1.com";
-		expectedOnboardingApp.myLoginsAppOwner="testUser";
-		expectedOnboardingApp.restrictedApp=false;
-		expectedOnboardingApp.isOpen=true;
-		expectedOnboardingApp.isEnabled=true;
+		OnboardingApp expectedOnboardingApp = createOldOnapApp(1l);
+		
 		EPUser user = mockUser.mockEPUser();
 		user.setEmail("guestT@test.portal.onap.org");
 		user.setLoginPwd("pwd");
@@ -422,6 +422,27 @@ public class AppsControllerExternalRequestTest extends MockitoTestSuite {
 		assertEquals(actualPortalRestResponse, expectedportalRestResponse);
 	}
 	
+	private OnboardingApp createOldOnapApp(Long id) {
+
+		OnboardingApp oldOnboardApp = new OnboardingApp();
+		oldOnboardApp.setId(id);
+		oldOnboardApp.setAppName("test");
+		oldOnboardApp.setLandingPage("test.com");
+		oldOnboardApp.setRestUrl("test1.com");
+		oldOnboardApp.setMyLoginsAppOwner("12");
+		oldOnboardApp.setRestrictedApp(false);
+		oldOnboardApp.setIsOpen(true);
+		oldOnboardApp.setIsEnabled(true);
+		oldOnboardApp.setModeOfIntegration("test");
+		oldOnboardApp.setAppAck(false);
+		oldOnboardApp.setUsesCadi(false);
+		oldOnboardApp.setModeOfIntegration("test");
+		oldOnboardApp.setAppAck(false);
+		oldOnboardApp.setUsesCadi(false);
+		
+		return oldOnboardApp;
+	}
+	
 	@Test
 	public void putOnboardAppExternalIfOnboardingAppDetailsTest2() throws Exception {
 
@@ -433,15 +454,7 @@ public class AppsControllerExternalRequestTest extends MockitoTestSuite {
 		
 		Long appId = (long) 1;
 		
-		OnboardingApp oldOnboardApp = new OnboardingApp();
-		oldOnboardApp.id = (long) 1;
-		oldOnboardApp.name = "test";
-		oldOnboardApp.url="test.com";
-		oldOnboardApp.restUrl="test1.com";
-		oldOnboardApp.myLoginsAppOwner="12";
-		oldOnboardApp.restrictedApp=false;
-		oldOnboardApp.isOpen=true;
-		oldOnboardApp.isEnabled=true;
+		OnboardingApp oldOnboardApp = createOldOnapApp(1l);
 		
 		
 		EPUser user = mockUser.mockEPUser();
@@ -451,7 +464,7 @@ public class AppsControllerExternalRequestTest extends MockitoTestSuite {
 		List<EPUser> expectedList = new ArrayList<EPUser>();
 		expectedList.add(user);
 		Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
-		Mockito.when(userService.getUserByUserId(oldOnboardApp.myLoginsAppOwner)).thenReturn(expectedList);
+		Mockito.when(userService.getUserByUserId(oldOnboardApp.getMyLoginsAppOwner())).thenReturn(expectedList);
 		//Mockito.when(userService.saveNewUser(user, "Yes")).thenReturn(null);
 		Mockito.when(adminRolesService.isSuperAdmin(user)).thenReturn(true);
 		
@@ -479,15 +492,7 @@ public class AppsControllerExternalRequestTest extends MockitoTestSuite {
 		
 		Long appId = (long) 1;
 		
-		OnboardingApp oldOnboardApp = new OnboardingApp();
-		oldOnboardApp.id = (long) 1;
-		oldOnboardApp.name = "test";
-		oldOnboardApp.url="test.com";
-		oldOnboardApp.restUrl="test1.com";
-		oldOnboardApp.myLoginsAppOwner="12";
-		oldOnboardApp.restrictedApp=false;
-		oldOnboardApp.isOpen=true;
-		oldOnboardApp.isEnabled=true;
+		OnboardingApp oldOnboardApp = createOldOnapApp(1l);
 		
 		
 		EPUser user = mockUser.mockEPUser();
@@ -497,7 +502,7 @@ public class AppsControllerExternalRequestTest extends MockitoTestSuite {
 		List<EPUser> expectedList = new ArrayList<EPUser>();
 		expectedList.add(user);
 		Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
-		Mockito.when(userService.getUserByUserId(oldOnboardApp.myLoginsAppOwner)).thenReturn(expectedList);
+		Mockito.when(userService.getUserByUserId(oldOnboardApp.getMyLoginsAppOwner())).thenReturn(expectedList);
 		//Mockito.when(userService.saveNewUser(user, "Yes")).thenReturn(null);
 		Mockito.when(adminRolesService.isSuperAdmin(user)).thenReturn(true);
 		
@@ -524,16 +529,7 @@ public class AppsControllerExternalRequestTest extends MockitoTestSuite {
 	
 	Long appId = (long) 1;
 	
-	OnboardingApp oldOnboardApp = new OnboardingApp();
-	oldOnboardApp.id = (long) 1;
-	oldOnboardApp.name = "test";
-	oldOnboardApp.url="test.com";
-	oldOnboardApp.restUrl="test1.com";
-	oldOnboardApp.myLoginsAppOwner="12";
-	oldOnboardApp.restrictedApp=false;
-	oldOnboardApp.isOpen=true;
-	oldOnboardApp.isEnabled=true;
-	
+	OnboardingApp oldOnboardApp = createOldOnapApp(1l);
 	
 	EPUser user = mockUser.mockEPUser();
 	user.setEmail("guestT@test.portal.onap.org");
@@ -542,7 +538,7 @@ public class AppsControllerExternalRequestTest extends MockitoTestSuite {
 	List<EPUser> expectedList = new ArrayList<EPUser>();
 	expectedList.add(user);
 	Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
-	Mockito.when(userService.getUserByUserId(oldOnboardApp.myLoginsAppOwner)).thenReturn(expectedList);
+	Mockito.when(userService.getUserByUserId(oldOnboardApp.getMyLoginsAppOwner())).thenReturn(expectedList);
 	//Mockito.when(userService.saveNewUser(user, "Yes")).thenReturn(null);
 	Mockito.when(adminRolesService.isSuperAdmin(user)).thenReturn(false);
 
@@ -569,17 +565,10 @@ public class AppsControllerExternalRequestTest extends MockitoTestSuite {
 		user.setLoginId("Test");
 		Long appId = (long) 1;
 		
-		OnboardingApp oldOnboardApp = new OnboardingApp();
-		oldOnboardApp.id = (long) 1;
-		oldOnboardApp.name = "test";
-		oldOnboardApp.url="test.com";
-		oldOnboardApp.restUrl="test1.com";
-		oldOnboardApp.myLoginsAppOwner="12";
-		oldOnboardApp.restrictedApp=false;
-		oldOnboardApp.isOpen=true;
-		oldOnboardApp.isEnabled=true;
+		OnboardingApp oldOnboardApp = createOldOnapApp(1l);
+		
 		Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
-		Mockito.when(userService.getUserByUserId(oldOnboardApp.myLoginsAppOwner)).thenThrow(nullPointerException);
+		Mockito.when(userService.getUserByUserId(oldOnboardApp.getMyLoginsAppOwner())).thenThrow(nullPointerException);
 		PortalRestResponse<String> actualPortalRestResponse = appsControllerExternalRequest
 				.putOnboardAppExternal(mockedRequest, mockedResponse, appId,oldOnboardApp);
 		assertEquals(actualPortalRestResponse, expectedportalRestResponse);
@@ -596,18 +585,7 @@ public class AppsControllerExternalRequestTest extends MockitoTestSuite {
 	
 	Long appId = (long) 1;
 	
-	
-	
-	OnboardingApp newOnboardApp = new OnboardingApp();
-	//newOnboardApp.id = (long) 1;
-	newOnboardApp.name = "test";
-	newOnboardApp.url="test.com";
-	newOnboardApp.restUrl="test1.com";
-	newOnboardApp.myLoginsAppOwner="12";
-	newOnboardApp.restrictedApp=false;
-	newOnboardApp.isOpen=true;
-	newOnboardApp.isEnabled=true;
-	
+	OnboardingApp newOnboardApp = createOldOnapApp(null);
 	
 	EPUser user = mockUser.mockEPUser();
 	user.setEmail("guestT@test.portal.onap.org");
@@ -616,7 +594,7 @@ public class AppsControllerExternalRequestTest extends MockitoTestSuite {
 	List<EPUser> expectedList = new ArrayList<EPUser>();
 	expectedList.add(user);
 	Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
-	Mockito.when(userService.getUserByUserId(newOnboardApp.myLoginsAppOwner)).thenReturn(expectedList);
+	Mockito.when(userService.getUserByUserId(newOnboardApp.getMyLoginsAppOwner())).thenReturn(expectedList);
 	//Mockito.when(userService.saveNewUser(user, "Yes")).thenReturn(null);
 	Mockito.when(adminRolesService.isSuperAdmin(user)).thenReturn(false);
 
@@ -634,25 +612,14 @@ public class AppsControllerExternalRequestTest extends MockitoTestSuite {
 	public void postOnboardAppExternalIsNotSuperAdminTest() throws Exception {
 
 	PortalRestResponse<String> expectedportalRestResponse = new PortalRestResponse<String>();
-	expectedportalRestResponse.setMessage("java.lang.NullPointerException");
+	expectedportalRestResponse.setMessage("Unexpected field: id");	
 	expectedportalRestResponse.setResponse(null);
 	PortalRestStatusEnum portalRestStatusEnum = null;
 	expectedportalRestResponse.setStatus(portalRestStatusEnum.ERROR);
 	
 	Long appId = (long) 1;
 	
-	
-	
-	OnboardingApp newOnboardApp = new OnboardingApp();
-	//newOnboardApp.id = (long) 1;
-	newOnboardApp.name = "test";
-	newOnboardApp.url="test.com";
-	newOnboardApp.restUrl="test1.com";
-	newOnboardApp.myLoginsAppOwner="12";
-	newOnboardApp.restrictedApp=false;
-	newOnboardApp.isOpen=true;
-	newOnboardApp.isEnabled=true;
-	
+	OnboardingApp newOnboardApp = createOldOnapApp(1l);
 	
 	EPUser user = mockUser.mockEPUser();
 	user.setEmail("guestT@test.portal.onap.org");
@@ -661,7 +628,7 @@ public class AppsControllerExternalRequestTest extends MockitoTestSuite {
 	List<EPUser> expectedList = new ArrayList<EPUser>();
 	expectedList.add(user);
 	Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
-	Mockito.when(userService.getUserByUserId(newOnboardApp.myLoginsAppOwner)).thenReturn(expectedList);
+	Mockito.when(userService.getUserByUserId(newOnboardApp.getMyLoginsAppOwner())).thenReturn(expectedList);
 	//Mockito.when(userService.saveNewUser(user, "Yes")).thenReturn(null);
 	Mockito.when(adminRolesService.isSuperAdmin(user)).thenReturn(true);
 
@@ -686,18 +653,7 @@ public class AppsControllerExternalRequestTest extends MockitoTestSuite {
 	
 	Long appId = (long) 1;
 	
-	
-	
-	OnboardingApp newOnboardApp = new OnboardingApp();
-	//newOnboardApp.id = (long) 1;
-	newOnboardApp.name = "test";
-	newOnboardApp.url="test.com";
-	newOnboardApp.restUrl="test1.com";
-	newOnboardApp.myLoginsAppOwner="12";
-	newOnboardApp.restrictedApp=false;
-	newOnboardApp.isOpen=true;
-	newOnboardApp.isEnabled=true;
-	
+	OnboardingApp newOnboardApp = createOldOnapApp(null);
 	
 	EPUser user = mockUser.mockEPUser();
 	user.setEmail("guestT@test.portal.onap.org");
@@ -706,7 +662,7 @@ public class AppsControllerExternalRequestTest extends MockitoTestSuite {
 	List<EPUser> expectedList = new ArrayList<EPUser>();
 	expectedList.add(user);
 	Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
-	Mockito.when(userService.getUserByUserId(newOnboardApp.myLoginsAppOwner)).thenReturn(expectedList);
+	Mockito.when(userService.getUserByUserId(newOnboardApp.getMyLoginsAppOwner())).thenReturn(expectedList);
 	//Mockito.when(userService.saveNewUser(user, "Yes")).thenReturn(null);
 	Mockito.when(adminRolesService.isSuperAdmin(user)).thenReturn(true);
 
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/AppsControllerTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/AppsControllerTest.java
index f622faca..bd824e45 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/AppsControllerTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/AppsControllerTest.java
@@ -65,6 +65,7 @@ import org.onap.portalapp.portal.domain.AppsResponse;
 import org.onap.portalapp.portal.domain.EPApp;
 import org.onap.portalapp.portal.domain.EPUser;
 import org.onap.portalapp.portal.domain.EcompApp;
+import org.onap.portalapp.portal.domain.EpAppType;
 import org.onap.portalapp.portal.domain.UserRole;
 import org.onap.portalapp.portal.domain.UserRoles;
 import org.onap.portalapp.portal.framework.MockitoTestSuite;
@@ -214,23 +215,23 @@ public class AppsControllerTest extends MockitoTestSuite{
 
 		app.setName("Test");
 		app.setImageUrl("test");
-		app.setDescription("test");
-		app.setNotes("test");
-		app.setUrl("test");
+		app.setAppDescription("test");
+		app.setAppNotes("test");
+		app.setLandingPage("test");
 		app.setId((long) 1);
 		app.setAppRestEndpoint("test");
-		app.setAlternateUrl("test");
+		app.setAlternateLandingPage("test");
 		app.setName("test");
 		app.setMlAppName("test");
 		app.setMlAppAdminId("test");
-		app.setUsername("test");
-		app.setAppPassword("test");
+		app.setAppBasicAuthUsername("test");
+		app.setAppBasicAuthPassword("test");
 		app.setOpen(false);
 		app.setEnabled(false);
 		app.setUebKey("test");
 		app.setUebSecret("test");
 		app.setUebTopicName("test");
-		app.setAppType(1);
+		app.setAppType(EpAppType.GUI);
 
 		expectedApps.add(app);
 
@@ -263,23 +264,23 @@ public class AppsControllerTest extends MockitoTestSuite{
 
 		app.setName("Test");
 		app.setImageUrl("test");
-		app.setDescription("test");
-		app.setNotes("test");
-		app.setUrl("test");
+		app.setAppDescription("test");
+		app.setAppNotes("test");
+		app.setLandingPage("test");
 		app.setId((long) 1);
 		app.setAppRestEndpoint("test");
-		app.setAlternateUrl("test");
+		app.setAlternateLandingPage("test");
 		app.setName("test");
 		app.setMlAppName("test");
 		app.setMlAppAdminId("test");
-		app.setUsername("test");
-		app.setAppPassword("test");
+		app.setAppBasicAuthUsername("test");
+		app.setAppBasicAuthPassword("test");
 		app.setOpen(false);
 		app.setEnabled(false);
 		app.setUebKey("test");
 		app.setUebSecret("test");
 		app.setUebTopicName("test");
-		app.setAppType(1);
+		app.setAppType(EpAppType.GUI);
 
 		expectedApps.add(app);
 
@@ -824,14 +825,14 @@ public class AppsControllerTest extends MockitoTestSuite{
 		EPUser user = mockUser.mockEPUser();
 		Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
 		OnboardingApp OnboardingApp = new OnboardingApp();
-		OnboardingApp.isCentralAuth = true;
-		OnboardingApp.nameSpace = "test1";
+		OnboardingApp.setRolesInAAF(true);
+		OnboardingApp.setNameSpace("test1");
 		FieldsValidator expectedFieldValidator = new FieldsValidator();
 		expectedFieldValidator.setHttpStatusCode((long) 200);
 		expectedFieldValidator.setFields(null);
 		expectedFieldValidator.setErrorCode(null);
 		EPApp OnboardingApp1 = new EPApp();
-		OnboardingApp1.setCentralAuth(false);
+		OnboardingApp1.setRolesInAAF(false);
 		OnboardingApp1.setNameSpace("test"); 
 		Mockito.when(appService.getApp(Matchers.anyLong())).thenReturn(OnboardingApp1);
 		Mockito.when(adminRolesService.isSuperAdmin(user)).thenReturn(true);
@@ -849,8 +850,8 @@ public class AppsControllerTest extends MockitoTestSuite{
 		EPUser user = mockUser.mockEPUser();
 		Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
 		OnboardingApp onboardingApp = new OnboardingApp();
-		onboardingApp.isCentralAuth = true;
-		onboardingApp.nameSpace = "com.test1";
+		onboardingApp.setRolesInAAF(true);
+		onboardingApp.setNameSpace("com.test1");
 		EPApp app = new EPApp();
 		app.setNameSpace("com.test ");
 		FieldsValidator expectedFieldValidator = new FieldsValidator();
@@ -876,10 +877,10 @@ public class AppsControllerTest extends MockitoTestSuite{
 		EPUser user = mockUser.mockEPUser();
 		Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
 		OnboardingApp onboardingApp = new OnboardingApp();
-		onboardingApp.isCentralAuth = false;
-		onboardingApp.nameSpace = "com.test1";
+		onboardingApp.setRolesInAAF(false);
+		onboardingApp.setNameSpace("com.test1");
 		EPApp app = new EPApp();
-		app.setCentralAuth(false);
+		app.setRolesInAAF(false);
 		app.setNameSpace("com.test ");
 		FieldsValidator expectedFieldValidator = new FieldsValidator();
 		expectedFieldValidator.setHttpStatusCode((long) 404);
@@ -902,8 +903,8 @@ public class AppsControllerTest extends MockitoTestSuite{
 		EPUser user = mockUser.mockEPUser();
 		Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
 		OnboardingApp onboardingApp = new OnboardingApp();
-		onboardingApp.isCentralAuth = true;
-		onboardingApp.nameSpace = "com.test1";
+		onboardingApp.setRolesInAAF(true);
+		onboardingApp.setNameSpace("com.test1");
 		EPApp app = new EPApp();
 		app.setNameSpace("com.test ");
 		FieldsValidator expectedFieldValidator = new FieldsValidator();
@@ -1074,11 +1075,11 @@ public class AppsControllerTest extends MockitoTestSuite{
 		EPApp app = new EPApp();
 		app.setName("Test");
 		app.setImageUrl("test");
-		app.setDescription("test");
-		app.setNotes("test");
-		app.setUrl("test");
+		app.setAppDescription("test");
+		app.setAppNotes("test");
+		app.setLandingPage("test");
 		app.setId((long) 1);
-		app.setAppType(1);
+		app.setAppType(EpAppType.GUI);
 		app.setImageUrl("www.ecomp.com");
 		app.setThumbnail(new byte[] {1, 6, 3});
 		Mockito.when(appService.getApp((long) 1)).thenReturn(app);
@@ -1093,11 +1094,11 @@ public class AppsControllerTest extends MockitoTestSuite{
 		EPApp app = new EPApp();
 		app.setName("Test");
 		app.setImageUrl("test");
-		app.setDescription("test");
-		app.setNotes("test");
-		app.setUrl("test");
+		app.setAppDescription("test");
+		app.setAppNotes("test");
+		app.setLandingPage("test");
 		app.setId((long) 1);
-		app.setAppType(1);
+		app.setAppType(EpAppType.GUI);
 		app.setImageUrl("www.ecomp.png");
 		app.setThumbnail(new byte[] {1, 6, 3});
 		Mockito.when(appService.getApp((long) 1)).thenReturn(app);
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/ExternalAccessRolesControllerTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/ExternalAccessRolesControllerTest.java
index 6b06ee22..0253afd0 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/ExternalAccessRolesControllerTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/ExternalAccessRolesControllerTest.java
@@ -63,6 +63,7 @@ import org.onap.portalapp.portal.core.MockEPUser;
 import org.onap.portalapp.portal.domain.CentralV2RoleFunction;
 import org.onap.portalapp.portal.domain.EPApp;
 import org.onap.portalapp.portal.domain.EPUser;
+import org.onap.portalapp.portal.domain.EpAppType;
 import org.onap.portalapp.portal.ecomp.model.PortalRestResponse;
 import org.onap.portalapp.portal.ecomp.model.PortalRestStatusEnum;
 import org.onap.portalapp.portal.framework.MockitoTestSuite;
@@ -125,23 +126,23 @@ public class ExternalAccessRolesControllerTest {
 		EPApp app = new EPApp();
 		app.setName("Test");
 		app.setImageUrl("test");
-		app.setDescription("test");
-		app.setNotes("test");
-		app.setUrl("test");
+		app.setAppDescription("test");
+		app.setAppNotes("test");
+		app.setLandingPage("test");
 		app.setId((long) 1);
 		app.setAppRestEndpoint("test");
-		app.setAlternateUrl("test");
+		app.setAlternateLandingPage("test");
 		app.setName("test");
 		app.setMlAppName("test");
 		app.setMlAppAdminId("test");
-		app.setUsername("test");
-		app.setAppPassword("test");
+		app.setAppBasicAuthUsername("test");
+		app.setAppBasicAuthPassword("test");
 		app.setOpen(false);
 		app.setEnabled(false);
 		app.setUebKey("test");
 		app.setUebSecret("test");
 		app.setUebTopicName("test");
-		app.setAppType(1);
+		app.setAppType(EpAppType.GUI);
 		return app;
 	}
 
@@ -166,7 +167,7 @@ public class ExternalAccessRolesControllerTest {
 		PrintWriter writer = new PrintWriter(sw);
 		Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
 		EPApp app = mockApp();
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		List<EPApp> appList = new ArrayList<>();
 		appList.add(app);
 		Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
@@ -207,7 +208,7 @@ public class ExternalAccessRolesControllerTest {
 		String expectedCentralUser = "test";
 		String loginId = "test";
 		EPApp app = mockApp();
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		List<EPApp> appList = new ArrayList<>();
 		appList.add(app);
 		Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
@@ -225,7 +226,7 @@ public class ExternalAccessRolesControllerTest {
 		String expectedCentralUser = null;
 		String loginId = "test";
 		EPApp app = mockApp();
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		List<EPApp> appList = new ArrayList<>();
 		appList.add(app);
 		Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
@@ -245,7 +246,7 @@ public class ExternalAccessRolesControllerTest {
 		List<CentralV2Role> centralV2RoleList = new ArrayList<>();
 		List<CentralRole> centralRoleList = new ArrayList<>();
 		EPApp app = mockApp();
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		applicationList.add(app);
 		ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.FOUND);
 		Mockito.when(externalAccessRolesService.getNameSpaceIfExists(applicationList.get(0))).thenReturn(response);
@@ -267,7 +268,7 @@ public class ExternalAccessRolesControllerTest {
 		List<CentralV2Role> centralV2RoleList = new ArrayList<>();
 		List<CentralRole> centralRoleList = new ArrayList<>();
 		EPApp app = mockApp();
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		applicationList.add(app);
 		ResponseEntity<String> response = null;
 		Mockito.when(externalAccessRolesService.getNameSpaceIfExists(applicationList.get(0))).thenReturn(response);
@@ -289,7 +290,7 @@ public class ExternalAccessRolesControllerTest {
 		List<EPApp> applicationList = new ArrayList<>();
 		List<CentralV2Role> centralV2Role = new ArrayList<>();
 		EPApp app = mockApp();
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		applicationList.add(app);
 		ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.FOUND);
 		Mockito.when(externalAccessRolesService.getNameSpaceIfExists(applicationList.get(0))).thenReturn(response);
@@ -309,7 +310,7 @@ public class ExternalAccessRolesControllerTest {
 		List<EPApp> applicationList = new ArrayList<>();
 		List<CentralV2Role> centralV2Role = new ArrayList<>();
 		EPApp app = mockApp();
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		applicationList.add(app);
 		ResponseEntity<String> response = null;
 		Mockito.when(externalAccessRolesService.getNameSpaceIfExists(applicationList.get(0))).thenReturn(response);
@@ -354,7 +355,7 @@ public class ExternalAccessRolesControllerTest {
 		List<EPApp> applicationList = new ArrayList<>();
 		List<CentralV2RoleFunction> centralV2RoleFunction = new ArrayList<>();
 		EPApp app = mockApp();
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		applicationList.add(app);
 		ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.FOUND);
 		Mockito.when(externalAccessRolesService.getNameSpaceIfExists(applicationList.get(0))).thenReturn(response);
@@ -387,7 +388,7 @@ public class ExternalAccessRolesControllerTest {
 		List<EPApp> applicationList = new ArrayList<>();
 		List<CentralV2RoleFunction> centralV2RoleFunction = new ArrayList<>();
 		EPApp app = mockApp();
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		applicationList.add(app);
 		ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.FOUND);
 		Mockito.when(externalAccessRolesService.getNameSpaceIfExists(applicationList.get(0))).thenReturn(response);
@@ -419,7 +420,7 @@ public class ExternalAccessRolesControllerTest {
 		long roleId = 1;
 		CentralV2Role centralV2Role = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role();
 		EPApp app = mockApp();
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		applicationList.add(app);
 		Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
 		ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.FOUND);
@@ -467,7 +468,7 @@ public class ExternalAccessRolesControllerTest {
 		long roleId = 1;
 		CentralV2Role centralV2Role = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role();
 		EPApp app = mockApp();
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		applicationList.add(app);
 		Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
 		ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.FOUND);
@@ -516,7 +517,7 @@ public class ExternalAccessRolesControllerTest {
 		CentralV2RoleFunction centralV2RoleFunction = new CentralV2RoleFunction();
 		centralV2RoleFunction.setCode("test");
 		EPApp app = mockApp();
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		applicationList.add(app);
 		Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
 		ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.FOUND);
@@ -537,7 +538,7 @@ public class ExternalAccessRolesControllerTest {
 		String code = "test";
 		CentralV2RoleFunction centralV2RoleFunction = null;
 		EPApp app = mockApp();
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		applicationList.add(app);
 		Mockito.when(mockedRequest.getHeader("uebkey")).thenReturn(uebKey);
 		ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.FOUND);
@@ -565,7 +566,7 @@ public class ExternalAccessRolesControllerTest {
 	@Test
 	public void getRoleFunctionTest() throws Exception {
 		EPApp mockApp = mockApp();
-		mockApp.setCentralAuth(true);
+		mockApp.setRolesInAAF(true);
 		List<EPApp> mockAppList = new ArrayList<>();
 		mockAppList.add(mockApp);
 		StringWriter sw = new StringWriter();
@@ -607,7 +608,7 @@ public class ExternalAccessRolesControllerTest {
 	public void getRoleFunctionXSSTest() throws Exception {
 		String expected = getXSSKeyJson();
 		EPApp mockApp = mockApp();
-		mockApp.setCentralAuth(true);
+		mockApp.setRolesInAAF(true);
 		List<EPApp> mockAppList = new ArrayList<>();
 		mockAppList.add(mockApp);
 		StringWriter sw = new StringWriter();
@@ -656,7 +657,7 @@ public class ExternalAccessRolesControllerTest {
 	public void saveRoleFunctionExceptionTest() throws Exception {
 		List<EPApp> applicationList = new ArrayList<>();
 		EPApp app = mockApp();
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		applicationList.add(app);
 		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
 		PortalRestResponse<String> portalRestResponse = null;
@@ -679,7 +680,7 @@ public class ExternalAccessRolesControllerTest {
 		List<EPUser> userList = new ArrayList<>();
 		userList.add(user);
 		EPApp app = mockApp();
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		applicationList.add(app);
 		JSONObject roleFunc = new JSONObject();
 		roleFunc.put("type", "test_type");
@@ -720,7 +721,7 @@ public class ExternalAccessRolesControllerTest {
 		List<EPUser> userList = new ArrayList<>();
 		userList.add(user);
 		EPApp app = mockApp();
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		applicationList.add(app);
 		JSONObject roleFunc = new JSONObject();
 		roleFunc.put("type", "<script>alert(“XSS”)</script> ");
@@ -768,7 +769,7 @@ public class ExternalAccessRolesControllerTest {
 		List<EPUser> userList = new ArrayList<>();
 		userList.add(user);
 		EPApp app = mockApp();
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		List<EPApp> appList = new ArrayList<>();
 		appList.add(app);
 		expectedportalRestResponse.setStatus(PortalRestStatusEnum.OK);
@@ -799,7 +800,7 @@ public class ExternalAccessRolesControllerTest {
 		List<EPUser> userList = new ArrayList<>();
 		userList.add(user);
 		EPApp app = mockApp();
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		List<EPApp> appList = new ArrayList<>();
 		appList.add(app);
 		String code = "<script>alert(‘XSS’)</script>";
@@ -831,7 +832,7 @@ public class ExternalAccessRolesControllerTest {
 	public void getActiveRolesValidationTest() throws Exception {
 		List<CentralRole> expectedRolesList = null;
 		EPApp app = mockApp();
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		List<EPApp> appList = new ArrayList<>();
 		appList.add(app);
 		List<CentralV2Role> cenRoles = new ArrayList<>();
@@ -1112,7 +1113,7 @@ public class ExternalAccessRolesControllerTest {
 		Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
 		List<EPApp> applicationList = new ArrayList<>();
 		EPApp app = mockApp();
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		applicationList.add(app);
 		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
 		Mockito.when(externalAccessRolesService.getAllAppUsers(mockedRequest.getHeader(uebKey))).thenReturn(users);
@@ -1209,7 +1210,7 @@ public class ExternalAccessRolesControllerTest {
 		List<EPApp> applicationList = new ArrayList<>();
 		EPApp app = mockApp();
 		app.setUebKey("uebKey");
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		applicationList.add(app);
 		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
 		ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.OK);
@@ -1222,7 +1223,7 @@ public class ExternalAccessRolesControllerTest {
 		List<EPApp> applicationList = new ArrayList<>();
 		EPApp app = mockApp();
 		app.setUebKey("uebKey");
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		applicationList.add(app);
 		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
 		ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.OK);
@@ -1241,7 +1242,7 @@ public class ExternalAccessRolesControllerTest {
 	public void getEpUserExceptionTest() throws Exception {
 		List<EPApp> applicationList = new ArrayList<>();
 		EPApp app = mockApp();
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
 		StringWriter sw = new StringWriter();
 		PrintWriter writer = new PrintWriter(sw);
@@ -1254,7 +1255,7 @@ public class ExternalAccessRolesControllerTest {
 		List<EPApp> applicationList = new ArrayList<>();
 		EPApp app = mockApp();
 		app.setUebKey("uebKey");
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		applicationList.add(app);
 		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
 		ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.OK);
@@ -1279,7 +1280,7 @@ public class ExternalAccessRolesControllerTest {
 		List<EPApp> applicationList = new ArrayList<>();
 		EPApp app = mockApp();
 		app.setUebKey("uebKey");
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		applicationList.add(app);
 		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
 		ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.OK);
@@ -1297,7 +1298,7 @@ public class ExternalAccessRolesControllerTest {
 	public void getEPRolesOfApplicationExceptionTest() throws Exception {
 		List<EPApp> applicationList = new ArrayList<>();
 		EPApp app = mockApp();
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		Mockito.when(externalAccessRolesService.getApp(mockedRequest.getHeader(uebKey))).thenReturn(applicationList);
 		StringWriter sw = new StringWriter();
 		PrintWriter writer = new PrintWriter(sw);
@@ -1319,7 +1320,7 @@ public class ExternalAccessRolesControllerTest {
 		List<EPUser> userList = new ArrayList<>();
 		userList.add(user);
 		EPApp app = mockApp();
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		List<EPApp> appList = new ArrayList<>();
 		appList.add(app);
 		expectedportalRestResponse.setStatus(PortalRestStatusEnum.OK);
@@ -1351,7 +1352,7 @@ public class ExternalAccessRolesControllerTest {
 		List<EPUser> userList = new ArrayList<>();
 		userList.add(user);
 		EPApp app = mockApp();
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		List<EPApp> appList = new ArrayList<>();
 		appList.add(app);
 		expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
@@ -1383,7 +1384,7 @@ public class ExternalAccessRolesControllerTest {
 		List<EPUser> userList = new ArrayList<>();
 		userList.add(user);
 		EPApp app = mockApp();
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		List<EPApp> appList = new ArrayList<>();
 		appList.add(app);
 		expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
@@ -1435,7 +1436,7 @@ public class ExternalAccessRolesControllerTest {
 		List<EPUser> userList = new ArrayList<>();
 		userList.add(user);
 		EPApp app = mockApp();
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		List<EPApp> appList = new ArrayList<>();
 		appList.add(app);
 		expectedportalRestResponse.setStatus(PortalRestStatusEnum.OK);
@@ -1467,7 +1468,7 @@ public class ExternalAccessRolesControllerTest {
 		List<EPUser> userList = new ArrayList<>();
 		userList.add(user);
 		EPApp app = mockApp();
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		List<EPApp> appList = new ArrayList<>();
 		appList.add(app);
 		String code = "<img src=xss onerror=alert(1)>";
@@ -1497,7 +1498,7 @@ public class ExternalAccessRolesControllerTest {
 		List<EPUser> userList = new ArrayList<>();
 		userList.add(user);
 		EPApp app = mockApp();
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		List<EPApp> appList = new ArrayList<>();
 		appList.add(app);
 		expectedportalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/ExternalAppsRestfulControllerTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/ExternalAppsRestfulControllerTest.java
index d6cb42a6..890319dc 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/ExternalAppsRestfulControllerTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/ExternalAppsRestfulControllerTest.java
@@ -66,6 +66,7 @@ import org.onap.portalapp.portal.core.MockEPUser;
 import org.onap.portalapp.portal.domain.EPApp;
 import org.onap.portalapp.portal.domain.EPRole;
 import org.onap.portalapp.portal.domain.EPUser;
+import org.onap.portalapp.portal.domain.EpAppType;
 import org.onap.portalapp.portal.framework.MockitoTestSuite;
 import org.onap.portalapp.portal.service.AdminRolesService;
 import org.onap.portalapp.portal.service.AdminRolesServiceImpl;
@@ -135,24 +136,24 @@ public class ExternalAppsRestfulControllerTest {
 		app.setName("Test");
 		app.setImageUrl("test");
 		app.setNameSpace("com.test.app");
-		app.setCentralAuth(true);
-		app.setDescription("test");
-		app.setNotes("test");
-		app.setUrl("test");
+		app.setRolesInAAF(true);
+		app.setAppDescription("test");
+		app.setAppNotes("test");
+		app.setLandingPage("test");
 		app.setId((long) 10);
 		app.setAppRestEndpoint("test");
-		app.setAlternateUrl("test");
+		app.setAlternateLandingPage("test");
 		app.setName("test");
 		app.setMlAppName("test");
 		app.setMlAppAdminId("test");
-		app.setUsername("test");
-		app.setAppPassword("test");
+		app.setAppBasicAuthUsername("test");
+		app.setAppBasicAuthPassword("test");
 		app.setOpen(false);
 		app.setEnabled(true);
 		app.setUebKey("test");
 		app.setUebSecret("test");
 		app.setUebTopicName("test");
-		app.setAppType(1);
+		app.setAppType(EpAppType.GUI);
 		return app;
 	}
 
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/RoleManageControllerTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/RoleManageControllerTest.java
index b004a4a1..bbc842a6 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/RoleManageControllerTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/RoleManageControllerTest.java
@@ -73,6 +73,7 @@ import org.onap.portalapp.portal.domain.CentralV2RoleFunction;
 import org.onap.portalapp.portal.domain.CentralizedApp;
 import org.onap.portalapp.portal.domain.EPApp;
 import org.onap.portalapp.portal.domain.EPUser;
+import org.onap.portalapp.portal.domain.EpAppType;
 import org.onap.portalapp.portal.ecomp.model.PortalRestResponse;
 import org.onap.portalapp.portal.ecomp.model.PortalRestStatusEnum;
 import org.onap.portalapp.portal.ecomp.model.UploadRoleFunctionExtSystem;
@@ -170,16 +171,18 @@ public class RoleManageControllerTest {
 
 	@Test
 	public void getRoleIfRoleIdNullTest() throws Exception {
+		EPApp app = mockApp();
+		app.setRolesInAAF(true);
 		PowerMockito.mockStatic(EPUserUtils.class);
 		PowerMockito.mockStatic(EcompPortalUtils.class);
 		EPUser user = mockUser.mockEPUser();
 		Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
 		Mockito.when(EcompPortalUtils.checkIfRemoteCentralAccessAllowed()).thenReturn(true);
-		Mockito.when(appService.getApp((long) 1)).thenReturn(CentralApp());
-		Mockito.when(adminRolesService.isAccountAdminOfApplication(user, CentralApp())).thenReturn(true);
+		Mockito.when(appService.getApp((long) 1)).thenReturn(app);
+		Mockito.when(adminRolesService.isAccountAdminOfApplication(user, app)).thenReturn(true);
 		List<EPApp> apps = new ArrayList<>();
-		apps.add(CentralApp());
-		Mockito.when(externalAccessRolesService.getApp(CentralApp().getUebKey())).thenReturn(apps);
+		apps.add(app);
+		Mockito.when(externalAccessRolesService.getApp(app.getUebKey())).thenReturn(apps);
 		ResponseEntity<String> result = new ResponseEntity<>(HttpStatus.OK);
 		Mockito.when(externalAccessRolesService.getNameSpaceIfExists(apps.get(0))).thenReturn(result);
 		CentralV2Role answer = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role();
@@ -191,7 +194,7 @@ public class RoleManageControllerTest {
 		PrintWriter writer = new PrintWriter(sw);
 		Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
 		List<EPApp> appList = new ArrayList<>();
-		appList.add(CentralApp());
+		appList.add(app);
 		ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.OK);
 		Mockito.when(externalAccessRolesService.getNameSpaceIfExists(Matchers.anyObject())).thenReturn(response);
 		Mockito.when(externalAccessRolesService.getApp(Matchers.anyString())).thenReturn(appList);
@@ -241,23 +244,26 @@ public class RoleManageControllerTest {
 
 		app.setName("Test");
 		app.setImageUrl("test");
-		app.setDescription("test");
-		app.setNotes("test");
-		app.setUrl("test");
+		app.setAppDescription("test");
+		app.setAppNotes("test");
+		app.setLandingPage("test");
 		app.setId((long) 1);
 		app.setAppRestEndpoint("test");
-		app.setAlternateUrl("test");
+		app.setAlternateLandingPage("test");
 		app.setName("test");
 		app.setMlAppName("test");
 		app.setMlAppAdminId("test");
-		app.setUsername("test");
-		app.setAppPassword("test");
+		app.setAppBasicAuthUsername("test");
+		app.setAppBasicAuthPassword("test");
 		app.setOpen(false);
 		app.setEnabled(false);
 		app.setUebKey("test");
 		app.setUebSecret("test");
 		app.setUebTopicName("test");
-		app.setAppType(1);
+		app.setAppType(EpAppType.GUI);
+		app.setModeOfIntegration("test");
+		app.setAppAck(false);
+		app.setUsesCadi(false);
 		return app;
 
 	}
@@ -265,7 +271,7 @@ public class RoleManageControllerTest {
 	@Test
 	public void getRolesTest() throws Exception {
 		EPApp app = mockApp();
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		PowerMockito.mockStatic(EPUserUtils.class);
 		PowerMockito.mockStatic(EcompPortalUtils.class);
 		EPUser user = mockUser.mockEPUser();
@@ -298,13 +304,16 @@ public class RoleManageControllerTest {
 
 	@Test
 	public void getRoleFunctionListTest() throws Exception {
+		EPApp app = mockApp();
+		app.setRolesInAAF(true);
 		PowerMockito.mockStatic(EPUserUtils.class);
 		PowerMockito.mockStatic(EcompPortalUtils.class);
 		EPUser user = mockUser.mockEPUser();
 		Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
 		Mockito.when(EcompPortalUtils.checkIfRemoteCentralAccessAllowed()).thenReturn(true);
-		Mockito.when(adminRolesService.isAccountAdminOfApplication(user, CentralApp())).thenReturn(true);
-		Mockito.when(appService.getApp((long) 1)).thenReturn(CentralApp());
+		Mockito.when(adminRolesService.isAccountAdminOfApplication(user, app)).thenReturn(true);
+		
+		Mockito.when(appService.getApp((long) 1)).thenReturn(app);
 		List<CentralV2RoleFunction> answer = new ArrayList<>();
 		Mockito.when(externalAccessRolesService.getRoleFuncList("test")).thenReturn(answer);
 		StringWriter sw = new StringWriter();
@@ -326,13 +335,15 @@ public class RoleManageControllerTest {
 
 	@Test
 	public void saveRoleFunctionTest() throws Exception {
+		EPApp app = mockApp();
+		app.setRolesInAAF(true);
 		PowerMockito.mockStatic(EPUserUtils.class);
 		PowerMockito.mockStatic(EcompPortalUtils.class);
 		EPUser user = mockUser.mockEPUser();
 		Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
 		Mockito.when(EcompPortalUtils.checkIfRemoteCentralAccessAllowed()).thenReturn(true);
-		Mockito.when(adminRolesService.isAccountAdminOfApplication(user, CentralApp())).thenReturn(true);
-		Mockito.when(appService.getApp((long) 1)).thenReturn(CentralApp());
+		Mockito.when(adminRolesService.isAccountAdminOfApplication(user, app)).thenReturn(true);
+		Mockito.when(appService.getApp((long) 1)).thenReturn(app);
 		Mockito.doNothing().when(roleFunctionListController).saveRoleFunction(mockedRequest, mockedResponse, "test");
 		CentralV2RoleFunction addNewFunc = new CentralV2RoleFunction();
 		addNewFunc.setCode("Test");
@@ -351,7 +362,7 @@ public class RoleManageControllerTest {
 		List<EPUser> userList = new ArrayList<>();
 		userList.add(user);
 		List<EPApp> appList = new ArrayList<>();
-		appList.add(CentralApp());
+		appList.add(app);
 		Mockito.when(externalAccessRolesService.getUser("guestT")).thenReturn(userList);
 		StringWriter sw = new StringWriter();
 		PrintWriter writer = new PrintWriter(sw);
@@ -430,14 +441,16 @@ public class RoleManageControllerTest {
 
 	@Test
 	public void removeRoleFunctionTest() throws Exception {
+		EPApp app = mockApp();
+		app.setRolesInAAF(true);
 		PowerMockito.mockStatic(EPUserUtils.class);
 		PowerMockito.mockStatic(EcompPortalUtils.class);
 		EPUser user = mockUser.mockEPUser();
 		Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
 		Mockito.when(EcompPortalUtils.checkIfRemoteCentralAccessAllowed()).thenReturn(true);
-		Mockito.when(adminRolesService.isAccountAdminOfApplication(user, CentralApp())).thenReturn(true);
+		Mockito.when(adminRolesService.isAccountAdminOfApplication(user, app)).thenReturn(true);
 		Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
-		Mockito.when(appService.getApp((long) 1)).thenReturn(CentralApp());
+		Mockito.when(appService.getApp((long) 1)).thenReturn(app);
 		String roleFun = "{\"name\":\"Test\",\"type\":\"Test\",\"action\":\"Test\", \"code\":\"Test\"}";
 		CentralV2RoleFunction roleFunction = mockCentralRoleFunction();
 		Mockito.when(externalAccessRolesService.getRoleFunction("Test|Test|Test", "test")).thenReturn(roleFunction);
@@ -447,7 +460,7 @@ public class RoleManageControllerTest {
 		Mockito.when(externalAccessRolesService.deleteCentralRoleFunction(Matchers.anyString(), Matchers.anyObject()))
 				.thenReturn(true);
 		List<EPApp> appList = new ArrayList<>();
-		appList.add(CentralApp());
+		appList.add(app);
 		ResponseEntity<String> response = new ResponseEntity<>(HttpStatus.OK);
 		Mockito.when(externalAccessRolesService.getNameSpaceIfExists(Matchers.anyObject())).thenReturn(response);
 		Mockito.when(externalAccessRolesService.getApp(Matchers.anyString())).thenReturn(appList);
@@ -512,7 +525,7 @@ public class RoleManageControllerTest {
 	@Test
 	public void removeRoleFunctionIfAppNotCentralizedTest() throws Exception {
 		EPApp app = mockApp();
-		app.setCentralAuth(false);
+		app.setRolesInAAF(false);
 		Mockito.when(appService.getApp((long) 1)).thenReturn(app);
 		String roleFun = "{\"name\":\"Test\",\"code\":\"Test\"}";
 		roleManageController.removeRoleFunction(mockedRequest, mockedResponse, roleFun, (long) 1);
@@ -1021,14 +1034,14 @@ public class RoleManageControllerTest {
 
 	public EPApp CentralApp() {
 		EPApp app = mockApp();
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		app.setNameSpace("com.test");
 		return app;
 	}
 
 	public EPApp NonCentralApp() {
 		EPApp app = mockApp();
-		app.setCentralAuth(false);
+		app.setRolesInAAF(false);
 		return app;
 	}
 
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/domain/EPAppTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/domain/EPAppTest.java
index 56f0e5ca..640411ef 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/domain/EPAppTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/domain/EPAppTest.java
@@ -50,29 +50,25 @@ public class EPAppTest {
 	private static final String TEST="test";
 
 	public EPApp mockEPApp(EPApp epApp){
-		epApp.setId(1l);			
 		epApp.setName(TEST);
 		epApp.setImageUrl(TEST);
-		epApp.setDescription(TEST);
-		epApp.setNotes(TEST);
-		epApp.setUrl(TEST);
-		epApp.setAlternateUrl(TEST);
+		epApp.setAppDescription(TEST);
+		epApp.setAppNotes(TEST);
+		epApp.setLandingPage(TEST);
+		epApp.setAlternateLandingPage(TEST);
 		epApp.setAppRestEndpoint(TEST);
 		epApp.setMlAppName(TEST);
 		epApp.setMlAppAdminId(TEST);
 		epApp.setMotsId((long)1);
-		epApp.setUsername(TEST);
-		epApp.setAppPassword(TEST);
+		epApp.setAppBasicAuthUsername(TEST);
+		epApp.setAppBasicAuthPassword(TEST);
 		epApp.setOpen(false);
 		epApp.setEnabled(false);
 		epApp.setUebTopicName(TEST);
 		epApp.setUebSecret(TEST);
-		epApp.setAppType(1);
-		epApp.setCentralAuth(false);
+		epApp.setAppType(EpAppType.GUI);
+		epApp.setRolesInAAF(false);
 		epApp.setNameSpace(TEST);
-		epApp.setRestrictedApp(true);
-		epApp.setRestrictedApp(false);
-		epApp.setAppType(null);
 		epApp.setOpen(null);
 		epApp.setThumbnail(TEST.getBytes());
 		epApp.setUebKey(TEST);
@@ -86,116 +82,62 @@ public class EPAppTest {
 		  epApp1 = mockEPApp(epApp1);
 		EPApp epApp=new EPApp();
 		 
-		epApp.setId(epApp1.getId());			
 		epApp.setName(epApp1.getName());
 		epApp.setImageUrl(epApp1.getImageUrl());
-		epApp.setDescription(epApp1.getDescription());
-		epApp.setNotes(epApp1.getNotes());
-		epApp.setUrl(epApp1.getUrl());
-		epApp.setAlternateUrl(epApp1.getAlternateUrl());
+		epApp.setAppDescription(epApp1.getAppDescription());
+		epApp.setAppNotes(epApp1.getAppNotes());
+		epApp.setLandingPage(epApp1.getLandingPage());
+		epApp.setAlternateLandingPage(epApp1.getAlternateLandingPage());
 		epApp.setAppRestEndpoint(epApp1.getAppRestEndpoint());
 		epApp.setMlAppName(epApp1.getMlAppName());
 		epApp.setMlAppAdminId(epApp1.getMlAppAdminId());
 		epApp.setMotsId(epApp1.getMotsId());
-		epApp.setUsername(epApp1.getUsername());
-		epApp.setAppPassword(epApp1.getAppPassword());
+		epApp.setAppBasicAuthUsername(epApp1.getAppBasicAuthUsername());
+		epApp.setAppBasicAuthPassword(epApp1.getAppBasicAuthPassword());
 		epApp.setOpen(epApp1.getOpen());
 		epApp.setEnabled(epApp1.getEnabled());
 		epApp.setUebTopicName(epApp1.getUebTopicName());
 		epApp.setUebSecret(epApp1.getUebSecret());
 		epApp.setAppType(epApp1.getAppType());
-		epApp.setCentralAuth(epApp1.getCentralAuth());
+		epApp.setRolesInAAF(epApp1.getRolesInAAF());
 		epApp.setNameSpace(epApp1.getNameSpace());
-		epApp.setRestrictedApp(epApp1.isRestrictedApp());
 	
 		epApp.setAppType(epApp1.getAppType());
 		
 		epApp.setThumbnail(epApp1.getThumbnail());
 		epApp.setUebKey(epApp1.getUebKey());
-		epApp.compareTo(epApp1);
 		assertEquals(epApp.hashCode(), epApp1.hashCode());
-		assertTrue(epApp.equals(epApp1));
 		assertFalse(epApp.equals(null));
 	
 		
 		assertEquals(epApp.getName(), TEST);
-		assertEquals(epApp.getId(), Long.valueOf(1l));
 		assertEquals(epApp.getImageUrl(), TEST);
-		assertEquals(epApp.getDescription(), TEST);
-		assertEquals(epApp.getNotes(), TEST);
-		assertEquals(epApp.getUrl(), TEST);
-		assertEquals(epApp.getAlternateUrl(), TEST);
+		assertEquals(epApp.getAppDescription(), TEST);
+		assertEquals(epApp.getAppNotes(), TEST);
+		assertEquals(epApp.getLandingPage(), TEST);
+		assertEquals(epApp.getAlternateLandingPage(), TEST);
 		assertEquals(epApp.getAppRestEndpoint(), TEST);
 		assertEquals(epApp.getMlAppName(), TEST);
 		assertEquals(epApp.getMlAppAdminId(), TEST);
 		assertEquals(epApp.getMotsId(), new Long(1));
-		assertEquals(epApp.getUsername(), TEST);
-		assertEquals(epApp.getAppPassword(), TEST);
+		assertEquals(epApp.getAppBasicAuthUsername(), TEST);
+		assertEquals(epApp.getAppBasicAuthPassword(), TEST);
 		assertEquals(epApp.getOpen(), false);
 		assertEquals(epApp.getEnabled(), false);
 		assertEquals(epApp.getUebTopicName(), TEST);
 		assertEquals(epApp.getUebSecret(), TEST);
 		assertEquals(epApp.getAppType(), Integer.valueOf(1));
-		assertEquals(epApp.getCentralAuth(), false);
+		assertEquals(epApp.getRolesInAAF(), false);
 		assertEquals(epApp.getNameSpace(), TEST);
 		assertEquals(epApp.getUebKey(), TEST);
 		
 		assertEquals(epApp.getOpen(), false);
 		assertEquals(epApp.isRestrictedApp(), false);
 		assertEquals(epApp.hashCode(), epApp1.hashCode());
-		assertTrue(epApp.equals(epApp1));
-		//epApp.compareTo(epApp1);
 		assertNotNull(epApp.toString());
 		epApp.setContactUs(new AppContactUs());
 		assertNotNull(epApp.getContactUs());
 		
-		
-		epApp.setUsername(null);
-		assertFalse(epApp.equals(epApp1));
-		epApp.setUrl(null);
-		assertFalse(epApp.equals(epApp1));
-		epApp.setUebTopicName(null);
-		assertFalse(epApp.equals(epApp1));
-		
-		epApp.setUebSecret(null);
-		assertFalse(epApp.equals(epApp1));
-		epApp.setUebKey(null);
-		assertFalse(epApp.equals(epApp1));
-		epApp.setOpen(null);
-		assertFalse(epApp.equals(epApp1));
-		epApp.setNotes(null);
-		assertFalse(epApp.equals(epApp1));
-		epApp.setNameSpace(null);
-		assertFalse(epApp.equals(epApp1));
-		
-		epApp.setName(null);
-		assertFalse(epApp.equals(epApp1));
-		epApp.setMotsId(null);
-		assertFalse(epApp.equals(epApp1));
-		epApp.setMlAppName(null);
-		assertFalse(epApp.equals(epApp1));
-		epApp.setMlAppAdminId(null);
-		assertFalse(epApp.equals(epApp1));
-		epApp.setImageUrl(null);
-		assertFalse(epApp.equals(epApp1));
-		epApp.setEnabled(null);
-		assertFalse(epApp.equals(epApp1));
-		epApp.setDescription(null);
-		assertFalse(epApp.equals(epApp1));
-		epApp.setContactUs(null);
-		assertFalse(epApp.equals(epApp1));
-		
-		epApp.setCentralAuth(null);
-		assertFalse(epApp.equals(epApp1));
-		
-		epApp.setAppType(null);
-		assertFalse(epApp.equals(epApp1));
-		epApp.setAppRestEndpoint(null);
-		assertFalse(epApp.equals(epApp1));
-		epApp.setAppPassword(null);
-		assertFalse(epApp.equals(epApp1));
-		
-		epApp.setAlternateUrl(null);
-		assertFalse(epApp.equals(epApp1));
+	
 	}	
 }
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/domain/EPUserAppTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/domain/EPUserAppTest.java
index 0923d033..eddbe418 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/domain/EPUserAppTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/domain/EPUserAppTest.java
@@ -53,16 +53,16 @@ public class EPUserAppTest {
         EPApp epApp = new EPApp();
         epApp.setName("test");
         epApp.setImageUrl("test");
-        epApp.setDescription("test");
-        epApp.setNotes("test");
-        epApp.setUrl("test");
-        epApp.setAlternateUrl("test");
+        epApp.setAppDescription("test");
+        epApp.setAppNotes("test");
+        epApp.setLandingPage("test");
+        epApp.setAlternateLandingPage("test");
         epApp.setAppRestEndpoint("test");
         epApp.setMlAppName("test");
         epApp.setMlAppAdminId("test");
         epApp.setMotsId((long)1);
-        epApp.setUsername("test");
-        epApp.setAppPassword("test");
+        epApp.setAppBasicAuthUsername("test");
+        epApp.setAppBasicAuthPassword("test");
             
         
         //Role
@@ -90,16 +90,16 @@ public class EPUserAppTest {
         EPApp epApp = new EPApp();
         epApp.setName("test");
         epApp.setImageUrl("test");
-        epApp.setDescription("test");
-        epApp.setNotes("test");
-        epApp.setUrl("test");
-        epApp.setAlternateUrl("test");
+        epApp.setAppDescription("test");
+        epApp.setAppNotes("test");
+        epApp.setLandingPage("test");
+        epApp.setAlternateLandingPage("test");
         epApp.setAppRestEndpoint("test");
         epApp.setMlAppName("test");
         epApp.setMlAppAdminId("test");
         epApp.setMotsId((long)1);
-        epApp.setUsername("test");
-        epApp.setAppPassword("test");
+        epApp.setAppBasicAuthUsername("test");
+        epApp.setAppBasicAuthPassword("test");
         user.setApp(epApp);
         
         //Role
@@ -152,16 +152,16 @@ public class EPUserAppTest {
         epApp.setId((long) 12345);
         epApp.setName("test");
         epApp.setImageUrl("test");
-        epApp.setDescription("test");
-        epApp.setNotes("test");
-        epApp.setUrl("test");
-        epApp.setAlternateUrl("test");
+        epApp.setAppDescription("test");
+        epApp.setAppNotes("test");
+        epApp.setLandingPage("test");
+        epApp.setAlternateLandingPage("test");
         epApp.setAppRestEndpoint("test");
         epApp.setMlAppName("test");
         epApp.setMlAppAdminId("test");
         epApp.setMotsId((long)1);
-        epApp.setUsername("test");
-        epApp.setAppPassword("test");
+        epApp.setAppBasicAuthUsername("test");
+        epApp.setAppBasicAuthPassword("test");
         return epApp;
     }
 
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/interceptor/PortalResourceInterceptorTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/interceptor/PortalResourceInterceptorTest.java
index 81b4e64d..94d46506 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/interceptor/PortalResourceInterceptorTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/interceptor/PortalResourceInterceptorTest.java
@@ -152,7 +152,7 @@ public class PortalResourceInterceptorTest {
 		data.add("test/test");
 		List<EPApp> apps=new ArrayList<>();
 		EPApp app=new EPApp();
-		app.setUsername("test");
+		app.setAppBasicAuthUsername("test");
 		apps.add(app);
 		when(request.getRequestURI()).thenReturn("test/portalApi/test/test");
 		
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/AdminRolesServiceImplTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/AdminRolesServiceImplTest.java
index f14d3fd9..7f34583c 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/AdminRolesServiceImplTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/AdminRolesServiceImplTest.java
@@ -69,6 +69,7 @@ import org.onap.portalapp.portal.domain.EPApp;
 import org.onap.portalapp.portal.domain.EPRole;
 import org.onap.portalapp.portal.domain.EPUser;
 import org.onap.portalapp.portal.domain.EPUserApp;
+import org.onap.portalapp.portal.domain.EpAppType;
 import org.onap.portalapp.portal.domain.UserRole;
 import org.onap.portalapp.portal.transport.AppNameIdIsAdmin;
 import org.onap.portalapp.portal.transport.AppsListWithAdminRole;
@@ -140,24 +141,24 @@ public class AdminRolesServiceImplTest {
 		app.setName("Test");
 		app.setImageUrl("test");
 		app.setNameSpace("com.test.app");
-		app.setCentralAuth(true);
-		app.setDescription("test");
-		app.setNotes("test");
-		app.setUrl("test");
+		app.setRolesInAAF(true);
+		app.setAppDescription("test");
+		app.setAppNotes("test");
+		app.setLandingPage("test");
 		app.setId((long) 1);
 		app.setAppRestEndpoint("test");
-		app.setAlternateUrl("test");
+		app.setAlternateLandingPage("test");
 		app.setName("test");
 		app.setMlAppName("test");
 		app.setMlAppAdminId("test");
-		app.setUsername("test");
-		app.setAppPassword("test");
+		app.setAppBasicAuthUsername("test");
+		app.setAppBasicAuthPassword("test");
 		app.setOpen(false);
 		app.setEnabled(true);
 		app.setUebKey("test");
 		app.setUebSecret("test");
 		app.setUebTopicName("test");
-		app.setAppType(1);
+		app.setAppType(EpAppType.GUI);
 		return app;
 	}
 
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/AppContactUsServiceImplTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/AppContactUsServiceImplTest.java
index acc25ac8..e5b7431e 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/AppContactUsServiceImplTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/AppContactUsServiceImplTest.java
@@ -55,6 +55,7 @@ import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.onap.portalapp.portal.domain.AppContactUs;
 import org.onap.portalapp.portal.domain.EPApp;
+import org.onap.portalapp.portal.domain.EpAppType;
 import org.onap.portalapp.portal.ecomp.model.AppCategoryFunctionsItem;
 import org.onap.portalapp.portal.ecomp.model.AppContactUsItem;
 import org.onap.portalapp.portal.framework.MockitoTestSuite;
@@ -92,23 +93,23 @@ public class AppContactUsServiceImplTest {
 		EPApp app = new EPApp();
 		app.setName("Test");
 		app.setImageUrl("test");
-		app.setDescription("test");
-		app.setNotes("test");
-		app.setUrl("test");
+		app.setAppDescription("test");
+		app.setAppNotes("test");
+		app.setLandingPage("test");
 		app.setId((long) 1);
 		app.setAppRestEndpoint("test");
-		app.setAlternateUrl("test");
+		app.setAlternateLandingPage("test");
 		app.setName("test");
 		app.setMlAppName("test");
 		app.setMlAppAdminId("test");
-		app.setUsername("test");
-		app.setAppPassword("test");
+		app.setAppBasicAuthUsername("test");
+		app.setAppBasicAuthPassword("test");
 		app.setOpen(true);
 		app.setEnabled(false);
 		app.setUebKey("test");
 		app.setUebSecret("test");
 		app.setUebTopicName("test");
-		app.setAppType(1);
+		app.setAppType(EpAppType.GUI);
 		return app;
 	}
  	@Test
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/ApplicationsRestClientServiceImplTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/ApplicationsRestClientServiceImplTest.java
index a9747335..df73316b 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/ApplicationsRestClientServiceImplTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/ApplicationsRestClientServiceImplTest.java
@@ -91,7 +91,7 @@ public class ApplicationsRestClientServiceImplTest {
 	public void unt_get_failure() throws HTTPException{
 		EPApp appTest=new EPApp();
 		appTest.setAppRestEndpoint("https");
-		appTest.setAppPassword("testPassword");
+		appTest.setAppBasicAuthPassword("testPassword");
 		Mockito.when(appsCacheService.getApp(Matchers.anyLong())).thenReturn(appTest);
 		ApplicationsRestClientServiceImpl appservice=serviceImpl.get(ApplicationsRestClientServiceImpl.class, 12L,"/path" );
 		Assert.assertNull(appservice);
@@ -109,7 +109,7 @@ public class ApplicationsRestClientServiceImplTest {
 		Mockito.when(response.getStatus()).thenReturn(HttpStatus.SC_OK);
 		EPApp appTest=new EPApp();
 		appTest.setAppRestEndpoint("https");
-		appTest.setAppPassword("testPassword");
+		appTest.setAppBasicAuthPassword("testPassword");
 		Mockito.when(appsCacheService.getApp(Matchers.anyLong())).thenReturn(appTest);
 		ApplicationsRestClientServiceImpl appservice=serviceImpl.get(ApplicationsRestClientServiceImpl.class, 12L,"/path" );
 		Assert.assertNull(appservice);
@@ -127,7 +127,7 @@ public class ApplicationsRestClientServiceImplTest {
 		Mockito.when(response.getStatus()).thenReturn(1);
 		EPApp appTest=new EPApp();
 		appTest.setAppRestEndpoint("https");
-		appTest.setAppPassword("testPassword");
+		appTest.setAppBasicAuthPassword("testPassword");
 		Mockito.when(appsCacheService.getApp(Matchers.anyLong())).thenReturn(appTest);
 		ApplicationsRestClientServiceImpl appservice=serviceImpl.get(ApplicationsRestClientServiceImpl.class, 12L,"/path" );
 		Assert.assertNull(appservice);
@@ -139,7 +139,7 @@ public class ApplicationsRestClientServiceImplTest {
 		PowerMockito.mockStatic(Object.class);
 		EPApp appTest=new EPApp();
 		appTest.setAppRestEndpoint("https");
-		appTest.setAppPassword("testPassword");
+		appTest.setAppBasicAuthPassword("testPassword");
 		Mockito.when(appsCacheService.getApp(Matchers.anyLong())).thenReturn(appTest);
 		ApplicationsRestClientServiceImpl appservice=serviceImpl.post(ApplicationsRestClientServiceImpl.class, 12L, Matchers.any() , "/path",Matchers.any());
 		Assert.assertNull(appservice);
@@ -163,7 +163,7 @@ public class ApplicationsRestClientServiceImplTest {
 		Mockito.when(response.getStatus()).thenReturn(HttpStatus.SC_OK);
 		EPApp appTest=new EPApp();
 		appTest.setAppRestEndpoint("https");
-		appTest.setAppPassword("testPassword");
+		appTest.setAppBasicAuthPassword("testPassword");
 		Mockito.when(appsCacheService.getApp(Matchers.anyLong())).thenReturn(appTest);
 		ApplicationsRestClientServiceImpl appservice=serviceImpl.post(ApplicationsRestClientServiceImpl.class, 12L,payload,"/path",SystemType.APPLICATION);
 		Assert.assertNull(appservice);
@@ -188,7 +188,7 @@ public class ApplicationsRestClientServiceImplTest {
 		Mockito.when(response.getStatus()).thenReturn(HttpStatus.SC_OK);
 		EPApp appTest=new EPApp();
 		appTest.setAppRestEndpoint("https");
-		appTest.setAppPassword("testPassword");
+		appTest.setAppBasicAuthPassword("testPassword");
 		Mockito.when(appsCacheService.getApp(Matchers.anyLong())).thenReturn(appTest);
 		ApplicationsRestClientServiceImpl appservice=serviceImpl.post(ApplicationsRestClientServiceImpl.class, 12L,payload,"/path",SystemType.APPLICATION);
 		Assert.assertNull(appservice);
@@ -213,7 +213,7 @@ public class ApplicationsRestClientServiceImplTest {
 		Mockito.when(response.getStatus()).thenReturn(1);
 		EPApp appTest=new EPApp();
 		appTest.setAppRestEndpoint("https");
-		appTest.setAppPassword("testPassword");
+		appTest.setAppBasicAuthPassword("testPassword");
 		Mockito.when(appsCacheService.getApp(Matchers.anyLong())).thenReturn(appTest);
 		ApplicationsRestClientServiceImpl appservice=serviceImpl.post(ApplicationsRestClientServiceImpl.class, 12L,payload,"/path",SystemType.APPLICATION);
 		Assert.assertNull(appservice);
@@ -232,7 +232,7 @@ public class ApplicationsRestClientServiceImplTest {
 		Mockito.when(response.getStatus()).thenReturn(1);
 		EPApp appTest=new EPApp();
 		appTest.setAppRestEndpoint("https");
-		appTest.setAppPassword("testPassword");
+		appTest.setAppBasicAuthPassword("testPassword");
 		Mockito.when(appsCacheService.getApp(Matchers.anyLong())).thenReturn(appTest);
 		ApplicationsRestClientServiceImpl appservice=serviceImpl.get(ApplicationsRestClientServiceImpl.class, 12L,"/path" , Matchers.anyBoolean());
 		Assert.assertNull(appservice);
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/EPAppCommonServiceImplTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/EPAppCommonServiceImplTest.java
index 1451693d..d00dc211 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/EPAppCommonServiceImplTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/EPAppCommonServiceImplTest.java
@@ -74,6 +74,7 @@ import org.onap.portalapp.portal.domain.EPUserAppsManualSortPreference;
 import org.onap.portalapp.portal.domain.EPUserAppsSortPreference;
 import org.onap.portalapp.portal.domain.EPWidgetsManualSortPreference;
 import org.onap.portalapp.portal.domain.EcompApp;
+import org.onap.portalapp.portal.domain.EpAppType;
 import org.onap.portalapp.portal.domain.UserRole;
 import org.onap.portalapp.portal.domain.UserRoles;
 import org.onap.portalapp.portal.ecomp.model.AppCatalogItem;
@@ -157,24 +158,24 @@ public class EPAppCommonServiceImplTest {
 		EPApp app = new EPApp();
 		app.setName("Test");
 		app.setImageUrl("test");
-		app.setDescription("test");
-		app.setNotes("test");
-		app.setUrl("test");
+		app.setAppDescription("test");
+		app.setAppNotes("test");
+		app.setLandingPage("test");
 		app.setId((long) 1);
 		app.setAppRestEndpoint("test");
-		app.setAlternateUrl("test");
+		app.setAlternateLandingPage("test");
 		app.setName("test");
 		app.setMlAppName("test");
 		app.setMlAppAdminId("test");
-		app.setUsername("test");
-		app.setAppPassword("test");
+		app.setAppBasicAuthUsername("test");
+		app.setAppBasicAuthPassword("test");
 		app.setOpen(false);
 		app.setEnabled(false);
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		app.setUebKey("test");
 		app.setUebSecret("test");
 		app.setUebTopicName("test");
-		app.setAppType(1);
+		app.setAppType(EpAppType.GUI);
 		return app;
 	}
 	
@@ -439,7 +440,7 @@ public class EPAppCommonServiceImplTest {
 	public void getRestrictedAppRolesTest() {
 		EPUser user = mockUser.mockEPUser();
 		EPApp mockApp = mockApp();
-		mockApp.setRestrictedApp(true);
+		mockApp.setAppType(EpAppType.HYPERLINK);
 		user.setLoginId("guestT");
 		List<LocalRole> expected = new ArrayList<>();
 		LocalRole localRole = new LocalRole();
@@ -458,7 +459,7 @@ public class EPAppCommonServiceImplTest {
 	public void getPoralAppRolesTest() {
 		EPUser user = mockUser.mockEPUser();
 		EPApp mockApp = mockApp();
-		mockApp.setRestrictedApp(false);
+		mockApp.setAppType(EpAppType.GUI);
 		mockApp.setId(1l);
 		user.setLoginId("guestT");
 		List<LocalRole> expected = new ArrayList<>();
@@ -477,7 +478,7 @@ public class EPAppCommonServiceImplTest {
 	public void getNonPortalAndNonRestrictedAppRolesTest() {
 		EPUser user = mockUser.mockEPUser();
 		EPApp mockApp = mockApp();
-		mockApp.setRestrictedApp(false);
+		mockApp.setAppType(EpAppType.GUI);
 		mockApp.setId(2l);
 		user.setLoginId("guestT");
 		List<LocalRole> expected = new ArrayList<>();
@@ -539,15 +540,15 @@ public class EPAppCommonServiceImplTest {
 		List<EPApp> mockAppList = new ArrayList<>();
 		OnboardingApp onboardApp = new OnboardingApp();
 		onboardApp.setRestrictedApp(false);
-		onboardApp.name = "test1";
-		onboardApp.url = "http://test.com";
-		onboardApp.isOpen = false;
-		onboardApp.isEnabled = true;
-		onboardApp.username = "test123";
-		onboardApp.appPassword = "test123";
+		onboardApp.setAppName("test1");
+		onboardApp.setLandingPage("http://test.com");
+		onboardApp.setIsOpen(false);
+		onboardApp.setIsEnabled(true);
+		onboardApp.setAppBasicAuthUsername("test123");
+		onboardApp.setAppBasicAuthPassword("test123");
 		List<Criterion> restrictionsList = new ArrayList<Criterion>();
-		Criterion urlCrit = Restrictions.eq("url", onboardApp.url);
-		Criterion nameCrit = Restrictions.eq("name", onboardApp.name);
+		Criterion urlCrit = Restrictions.eq("url", onboardApp.getLandingPage());
+		Criterion nameCrit = Restrictions.eq("name", onboardApp.getAppName());
 		Criterion orCrit = Restrictions.or(urlCrit, nameCrit);
 		restrictionsList.add(orCrit);
 		List<String> uebList = new ArrayList<>();
@@ -573,42 +574,46 @@ public class EPAppCommonServiceImplTest {
 		EPApp mockApp = mockApp();
 		mockApp.setName("test1");
 		mockApp.setId(2l);
-		mockApp.setUrl("http://test.com");
-		mockApp.setUsername("test123");
-		mockApp.setAppPassword("test123");
-		mockApp.setRestrictedApp(false);
+		mockApp.setLandingPage("http://test.com");
+		mockApp.setAppBasicAuthUsername("test123");
+		mockApp.setAppBasicAuthPassword("*******");
+		mockApp.setAppType(EpAppType.GUI);
 		mockApp.setEnabled(true);
 		mockApp.setOpen(false);
 		List<EPApp> mockAppList = new ArrayList<>();
 		mockAppList.add(mockApp);
 		OnboardingApp onboardApp = new OnboardingApp();
 		onboardApp.setRestrictedApp(false);
-		onboardApp.name = "test1";
-		onboardApp.id = 2l;
-		onboardApp.url = "http://test.com";
-		onboardApp.restUrl = "http://test.com";
-		onboardApp.isOpen = false;
-		onboardApp.isEnabled = true;
-		onboardApp.thumbnail = "test123imgthumbnail";
-		onboardApp.username = "test123";
-		onboardApp.appPassword = "test123";
-		onboardApp.isCentralAuth=true;
-		onboardApp.myLoginsAppName="test123";
-		onboardApp.myLoginsAppOwner="test123";
-		onboardApp.nameSpace="com.test";
+		onboardApp.setAppName("test1");
+		onboardApp.setId(2l);
+		onboardApp.setLandingPage("http://test.com");
+		onboardApp.setRestUrl("http://test.com");
+		onboardApp.setIsOpen(false);
+		onboardApp.setIsEnabled (true);
+		onboardApp.setThumbnail("test123imgthumbnail");
+		onboardApp.setAppBasicAuthUsername("test123");
+		onboardApp.setAppBasicAuthPassword("*******");
+		onboardApp.setRolesInAAF(true);
+		onboardApp.setMyLoginsAppName("test123");
+		onboardApp.setMyLoginsAppOwner("test123");
+		onboardApp.setNameSpace("com.test");
+		onboardApp.setModeOfIntegration("sdk");
+		onboardApp.setAppAck(true);
+		onboardApp.setUsesCadi(false);
+		onboardApp.setApplicationType("1");
 		
 		List<Criterion> restrictionsList1 = new ArrayList<Criterion>();
-		Criterion idCrit = Restrictions.eq("id", onboardApp.id);
-		Criterion urlCrit = Restrictions.eq("url", onboardApp.url);
-		Criterion nameCrit = Restrictions.eq("name", onboardApp.name);
+		Criterion idCrit = Restrictions.eq("id", onboardApp.getId());
+		Criterion urlCrit = Restrictions.eq("url", onboardApp.getLandingPage());
+		Criterion nameCrit = Restrictions.eq("name", onboardApp.getAppName());
 		Criterion orCrit = Restrictions.or(idCrit, urlCrit, nameCrit);
 		restrictionsList1.add(orCrit);
 		Mockito.when((List<EPApp>) dataAccessService.getList(EPApp.class, null, restrictionsList1, null))
 				.thenReturn(mockAppList);
-		Mockito.when((EPApp) session.get(EPApp.class, onboardApp.id)).thenReturn(mockApp);
+		Mockito.when((EPApp) session.get(EPApp.class, onboardApp.getId())).thenReturn(mockApp);
 		String sql = "SELECT m.menu_id, m.column_num, m.text, m.parent_menu_id, m.url, m.active_yn "
 				+ "FROM fn_menu_functional m, fn_menu_functional_roles r " + "WHERE m.menu_id = r.menu_id "
-				+ " AND r.app_id = '" + onboardApp.id + "' ";
+				+ " AND r.app_id = '" + onboardApp.getId() + "' ";
 		List<Integer> roles = new ArrayList<>();
 		roles.add(1);
 		roles.add(2);
@@ -1268,8 +1273,8 @@ public class EPAppCommonServiceImplTest {
 		OnboardingApp onboardingApp = new OnboardingApp();
 
 		onboardingApp.setRestrictedApp(true);
-		onboardingApp.isCentralAuth=false;
-		onboardingApp.isEnabled= true;
+		onboardingApp.setRolesInAAF(false);
+		onboardingApp.setIsEnabled(true);
 		FieldsValidator actual = epAppCommonServiceImpl.addOnboardingApp(onboardingApp, epUser);
 		assertEquals(expected.getHttpStatusCode(), actual.getHttpStatusCode());	
 	}
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/EPLdapServiceImplTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/EPLdapServiceImplTest.java
index bacd2a9e..3b1c2d2d 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/EPLdapServiceImplTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/EPLdapServiceImplTest.java
@@ -62,6 +62,7 @@ import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.onap.portalapp.portal.domain.EPApp;
 import org.onap.portalapp.portal.domain.EPUser;
+import org.onap.portalapp.portal.domain.EpAppType;
 import org.onap.portalapp.portal.utils.EPCommonSystemProperties;
 import org.onap.portalsdk.core.command.support.SearchResult;
 import org.onap.portalsdk.core.service.support.ServiceLocator;
@@ -109,24 +110,24 @@ public class EPLdapServiceImplTest {
 		EPApp app = new EPApp();
 		app.setName("Test");
 		app.setImageUrl("test");
-		app.setDescription("test");
-		app.setNotes("test");
-		app.setUrl("test");
+		app.setAppDescription("test");
+		app.setAppNotes("test");
+		app.setLandingPage("test");
 		app.setId((long) 1);
 		app.setAppRestEndpoint("test");
-		app.setAlternateUrl("test");
+		app.setAlternateLandingPage("test");
 		app.setName("test");
 		app.setMlAppName("test");
 		app.setMlAppAdminId("test");
-		app.setUsername("test");
-		app.setAppPassword("test");
+		app.setAppBasicAuthUsername("test");
+		app.setAppBasicAuthPassword("test");
 		app.setOpen(false);
 		app.setEnabled(false);
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		app.setUebKey("test");
 		app.setUebSecret("test");
 		app.setUebTopicName("test");
-		app.setAppType(1);
+		app.setAppType(EpAppType.GUI);
 		return app;
 	}
 	
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/EPLoginServiceImplTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/EPLoginServiceImplTest.java
index efc23ac3..31973416 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/EPLoginServiceImplTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/EPLoginServiceImplTest.java
@@ -57,6 +57,7 @@ import org.onap.portalapp.command.EPLoginBean;
 import org.onap.portalapp.portal.core.MockEPUser;
 import org.onap.portalapp.portal.domain.EPApp;
 import org.onap.portalapp.portal.domain.EPUser;
+import org.onap.portalapp.portal.domain.EpAppType;
 import org.onap.portalapp.portal.utils.EPCommonSystemProperties;
 import org.onap.portalapp.portal.utils.EcompPortalUtils;
 import org.onap.portalapp.util.EPUserUtils;
@@ -100,24 +101,24 @@ public class EPLoginServiceImplTest {
 		app.setName("Test");
 		app.setImageUrl("test");
 		app.setNameSpace("com.test.app");
-		app.setCentralAuth(true);
-		app.setDescription("test");
-		app.setNotes("test");
-		app.setUrl("test");
+		app.setRolesInAAF(true);
+		app.setAppDescription("test");
+		app.setAppNotes("test");
+		app.setLandingPage("test");
 		app.setId((long) 1);
 		app.setAppRestEndpoint("test");
-		app.setAlternateUrl("test");
+		app.setAlternateLandingPage("test");
 		app.setName("test");
 		app.setMlAppName("test");
 		app.setMlAppAdminId("test");
-		app.setUsername("test");
-		app.setAppPassword("test");
+		app.setAppBasicAuthUsername("test");
+		app.setAppBasicAuthPassword("test");
 		app.setOpen(false);
 		app.setEnabled(true);
 		app.setUebKey("test");
 		app.setUebSecret("test");
 		app.setUebTopicName("test");
-		app.setAppType(1);
+		app.setAppType(EpAppType.GUI);
 		return app;
 	}
 
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImplTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImplTest.java
index 0331633c..3b1df407 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImplTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImplTest.java
@@ -78,6 +78,7 @@ import org.onap.portalapp.portal.domain.EPAppRoleFunction;
 import org.onap.portalapp.portal.domain.EPRole;
 import org.onap.portalapp.portal.domain.EPUser;
 import org.onap.portalapp.portal.domain.EPUserApp;
+import org.onap.portalapp.portal.domain.EpAppType;
 import org.onap.portalapp.portal.ecomp.model.UploadRoleFunctionExtSystem;
 import org.onap.portalapp.portal.exceptions.InactiveApplicationException;
 import org.onap.portalapp.portal.exceptions.InvalidUserException;
@@ -177,24 +178,24 @@ public class ExternalAccessRolesServiceImplTest {
 		app.setName("Test");
 		app.setImageUrl("test");
 		app.setNameSpace("com.test.app");
-		app.setCentralAuth(true);
-		app.setDescription("test");
-		app.setNotes("test");
-		app.setUrl("test");
+		app.setRolesInAAF(true);
+		app.setAppDescription("test");
+		app.setAppNotes("test");
+		app.setLandingPage("test");
 		app.setId((long) 10);
 		app.setAppRestEndpoint("test");
-		app.setAlternateUrl("test");
+		app.setAlternateLandingPage("test");
 		app.setName("test");
 		app.setMlAppName("test");
 		app.setMlAppAdminId("test");
-		app.setUsername("test");
-		app.setAppPassword("test");
+		app.setAppBasicAuthUsername("test");
+		app.setAppBasicAuthPassword("test");
 		app.setOpen(false);
 		app.setEnabled(true);
 		app.setUebKey("test");
 		app.setUebSecret("test");
 		app.setUebTopicName("test");
-		app.setAppType(1);
+		app.setAppType(EpAppType.GUI);
 		return app;
 	}
 
@@ -325,23 +326,23 @@ public class ExternalAccessRolesServiceImplTest {
 		EPApp app = new EPApp();
 		app.setName("Test");
 		app.setImageUrl("test");
-		app.setDescription("test");
-		app.setNotes("test");
-		app.setUrl("test");
+		app.setAppDescription("test");
+		app.setAppNotes("test");
+		app.setLandingPage("test");
 		app.setId((long) 1);
 		app.setAppRestEndpoint("test");
-		app.setAlternateUrl("test");
+		app.setAlternateLandingPage("test");
 		app.setName("test");
 		app.setMlAppName("test");
 		app.setMlAppAdminId("test");
-		app.setUsername("test");
-		app.setAppPassword("test");
+		app.setAppBasicAuthUsername("test");
+		app.setAppBasicAuthPassword("test");
 		app.setOpen(true);
 		app.setEnabled(false);
 		app.setUebKey("test");
 		app.setUebSecret("test");
 		app.setUebTopicName("test");
-		app.setAppType(1);
+		app.setAppType(EpAppType.GUI);
 		return app;
 	}
 
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/PersUserAppServiceImplTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/PersUserAppServiceImplTest.java
index e763d6f8..904c7b82 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/PersUserAppServiceImplTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/PersUserAppServiceImplTest.java
@@ -53,6 +53,7 @@ import org.onap.portalapp.portal.core.MockEPUser;
 import org.onap.portalapp.portal.domain.EPApp;
 import org.onap.portalapp.portal.domain.EPUser;
 import org.onap.portalapp.portal.domain.EPUserApp;
+import org.onap.portalapp.portal.domain.EpAppType;
 import org.onap.portalapp.portal.domain.PersUserAppSelection;
 import org.onap.portalapp.portal.framework.MockitoTestSuite;
 import org.onap.portalapp.portal.service.AdminRolesService;
@@ -88,23 +89,23 @@ public class PersUserAppServiceImplTest {
 		EPApp app = new EPApp();
 		app.setName("Test");
 		app.setImageUrl("test");
-		app.setDescription("test");
-		app.setNotes("test");
-		app.setUrl("test");
+		app.setAppDescription("test");
+		app.setAppNotes("test");
+		app.setLandingPage("test");
 		app.setId((long) 1);
 		app.setAppRestEndpoint("test");
-		app.setAlternateUrl("test");
+		app.setAlternateLandingPage("test");
 		app.setName("test");
 		app.setMlAppName("test");
 		app.setMlAppAdminId("test");
-		app.setUsername("test");
-		app.setAppPassword("test");
+		app.setAppBasicAuthUsername("test");
+		app.setAppBasicAuthPassword("test");
 		app.setOpen(true);
 		app.setEnabled(false);
 		app.setUebKey("test");
 		app.setUebSecret("test");
 		app.setUebTopicName("test");
-		app.setAppType(1);
+		app.setAppType(EpAppType.GUI);
 		return app;
 	}
 
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/PortalAdminServiceImplTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/PortalAdminServiceImplTest.java
index eeaf29da..a89f87f5 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/PortalAdminServiceImplTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/PortalAdminServiceImplTest.java
@@ -64,6 +64,7 @@ import org.mockito.MockitoAnnotations;
 import org.onap.portalapp.portal.core.MockEPUser;
 import org.onap.portalapp.portal.domain.EPApp;
 import org.onap.portalapp.portal.domain.EPUser;
+import org.onap.portalapp.portal.domain.EpAppType;
 import org.onap.portalapp.portal.transport.FieldsValidator;
 import org.onap.portalapp.portal.transport.PortalAdmin;
 import org.onap.portalapp.portal.utils.EPCommonSystemProperties;
@@ -127,24 +128,24 @@ public class PortalAdminServiceImplTest {
 		app.setName("Test");
 		app.setImageUrl("test");
 		app.setNameSpace("com.test.app");
-		app.setCentralAuth(true);
-		app.setDescription("test");
-		app.setNotes("test");
-		app.setUrl("test");
+		app.setRolesInAAF(true);
+		app.setAppDescription("test");
+		app.setAppNotes("test");
+		app.setLandingPage("test");
 		app.setId((long) 1);
 		app.setAppRestEndpoint("test");
-		app.setAlternateUrl("test");
+		app.setAlternateLandingPage("test");
 		app.setName("test");
 		app.setMlAppName("test");
 		app.setMlAppAdminId("test");
-		app.setUsername("test");
-		app.setAppPassword("test");
+		app.setAppBasicAuthUsername("test");
+		app.setAppBasicAuthPassword("test");
 		app.setOpen(false);
 		app.setEnabled(true);
 		app.setUebKey("test");
 		app.setUebSecret("test");
 		app.setUebTopicName("test");
-		app.setAppType(1);
+		app.setAppType(EpAppType.GUI);
 		return app;
 	}
 
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/UserRolesCommonServiceImplTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/UserRolesCommonServiceImplTest.java
index 736f8341..5846fa9f 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/UserRolesCommonServiceImplTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/UserRolesCommonServiceImplTest.java
@@ -81,6 +81,7 @@ import org.onap.portalapp.portal.domain.EPUserAppCatalogRoles;
 import org.onap.portalapp.portal.domain.EPUserAppRoles;
 import org.onap.portalapp.portal.domain.EPUserAppRolesRequest;
 import org.onap.portalapp.portal.domain.EPUserAppRolesRequestDetail;
+import org.onap.portalapp.portal.domain.EpAppType;
 import org.onap.portalapp.portal.domain.ExternalSystemAccess;
 import org.onap.portalapp.portal.transport.*;
 import org.onap.portalapp.portal.utils.EPCommonSystemProperties;
@@ -168,24 +169,24 @@ public class UserRolesCommonServiceImplTest {
 		EPApp app = new EPApp();
 		app.setName("Test");
 		app.setImageUrl("test");
-		app.setDescription("test");
-		app.setNotes("test");
-		app.setUrl("test");
+		app.setAppDescription("test");
+		app.setAppNotes("test");
+		app.setLandingPage("test");
 		app.setId((long) 1);
 		app.setAppRestEndpoint("test");
-		app.setAlternateUrl("test");
+		app.setAlternateLandingPage("test");
 		app.setName("test");
 		app.setMlAppName("test");
 		app.setMlAppAdminId("test");
-		app.setUsername("test");
-		app.setAppPassword("test");
+		app.setAppBasicAuthUsername("test");
+		app.setAppBasicAuthPassword("test");
 		app.setOpen(false);
 		app.setEnabled(false);
-		app.setCentralAuth(true);
+		app.setRolesInAAF(true);
 		app.setUebKey("test");
 		app.setUebSecret("test");
 		app.setUebTopicName("test");
-		app.setAppType(1);
+		app.setAppType(EpAppType.GUI);
 		return app;
 	}
 
@@ -261,7 +262,7 @@ public class UserRolesCommonServiceImplTest {
 		EPUser user = mockUser.mockEPUser();
 		user.setId(1l);
 		EPApp mockApp = mockApp();
-		mockApp.setCentralAuth(false);
+		mockApp.setRolesInAAF(false);
 		EPRole mockEPRole = new EPRole();
 		mockEPRole.setId(1l);
 		mockEPRole.setName("test1");
@@ -356,7 +357,7 @@ public class UserRolesCommonServiceImplTest {
 		mockEpUserList.add(user);
 		EPApp mockApp = mockApp();
 		mockApp.setId(2l);
-		mockApp.setCentralAuth(false);
+		mockApp.setRolesInAAF(false);
 		Mockito.when(epAppCommonServiceImpl.getApp(mockApp.getId())).thenReturn(mockApp);
 		List<RoleInAppForUser> mockRoleInAppForUserList = new ArrayList<>();
 		RoleInAppForUser mockRoleInAppForUser = new RoleInAppForUser();
@@ -524,7 +525,7 @@ public class UserRolesCommonServiceImplTest {
 		EPApp mockApp = mockApp();
 		mockApp.setNameSpace("com.test.com");
 		mockApp.setId(1l);
-		mockApp.setCentralAuth(true);
+		mockApp.setRolesInAAF(true);
 		Mockito.when(epAppCommonServiceImpl.getApp(mockApp.getId())).thenReturn(mockApp);
 		Mockito.when(EcompPortalUtils.checkIfRemoteCentralAccessAllowed()).thenReturn(true);
 		AppWithRolesForUser mockWithRolesForUser = new AppWithRolesForUser();
@@ -698,7 +699,7 @@ public class UserRolesCommonServiceImplTest {
 		EPApp mockApp = mockApp();
 		mockApp.setNameSpace("com.test.com");
 		mockApp.setId(2l);
-		mockApp.setCentralAuth(false);
+		mockApp.setRolesInAAF(false);
 		Mockito.when(epAppCommonServiceImpl.getApp(mockApp.getId())).thenReturn(mockApp);
 		Mockito.when(EcompPortalUtils.checkIfRemoteCentralAccessAllowed()).thenReturn(true);
 		AppWithRolesForUser mockWithRolesForUser = new AppWithRolesForUser();
@@ -831,7 +832,7 @@ public class UserRolesCommonServiceImplTest {
 		EPApp mockApp = mockApp();
 		mockApp.setNameSpace("com.test.com");
 		mockApp.setId(1l);
-		mockApp.setCentralAuth(true);
+		mockApp.setRolesInAAF(true);
 		Mockito.when(EcompPortalUtils.checkIfRemoteCentralAccessAllowed()).thenReturn(true);
 		ExternalSystemUser externalSystemUser = new ExternalSystemUser();
 		List<ExternalSystemRoleApproval> mockExternalSystemRoleApprovalList = new ArrayList<>();
@@ -999,7 +1000,7 @@ public class UserRolesCommonServiceImplTest {
 		EPApp mockApp = mockApp();
 		mockApp.setId(2l);
 		mockApp.setEnabled(true);
-		mockApp.setCentralAuth(false);
+		mockApp.setRolesInAAF(false);
 		ExternalSystemUser externalSystemUser = new ExternalSystemUser();
 		List<ExternalSystemRoleApproval> mockExternalSystemRoleApprovalList = new ArrayList<>();
 		ExternalSystemRoleApproval mockExternalSystemRoleApproval = new ExternalSystemRoleApproval();
@@ -1187,7 +1188,7 @@ public class UserRolesCommonServiceImplTest {
 		EPApp mockApp = mockApp();
 		mockApp.setId(1l);
 		mockApp.setEnabled(true);
-		mockApp.setCentralAuth(true);
+		mockApp.setRolesInAAF(true);
 		EPUser user = mockUser.mockEPUser();
 		EPUser user2 = mockUser.mockEPUser();
 		user2.setActive(true);
@@ -1263,7 +1264,7 @@ public class UserRolesCommonServiceImplTest {
 		EPApp mockApp = mockApp();
 		mockApp.setId(2l);
 		mockApp.setEnabled(true);
-		mockApp.setCentralAuth(false);
+		mockApp.setRolesInAAF(false);
 		Mockito.when(epAppCommonServiceImpl.getApp(mockApp.getId())).thenReturn(mockApp);
 		List<UserApplicationRoles> mockUserApplicationRolesNonCentralizedList = new ArrayList<>();
 		UserApplicationRoles mockUserApplicationRoles = new UserApplicationRoles();
@@ -1318,7 +1319,7 @@ public class UserRolesCommonServiceImplTest {
 		EPApp mockApp = mockApp();
 		mockApp.setId(2l);
 		mockApp.setEnabled(true);
-		mockApp.setCentralAuth(false);
+		mockApp.setRolesInAAF(false);
 		EPUser user = mockUser.mockEPUser();
 		AppWithRolesForUser appWithRolesForUser = new AppWithRolesForUser();
 		List<RoleInAppForUser> mockRoleInAppForUserList = new ArrayList<>();
@@ -1371,7 +1372,7 @@ public class UserRolesCommonServiceImplTest {
 		EPApp mockApp = mockApp();
 		mockApp.setId(2l);
 		mockApp.setEnabled(true);
-		mockApp.setCentralAuth(false);
+		mockApp.setRolesInAAF(false);
 		List<EPRole> expected = new ArrayList<>();
 		EPRole epRole = new EPRole();
 		epRole.setAppId(mockApp.getId());
@@ -1400,7 +1401,7 @@ public class UserRolesCommonServiceImplTest {
 		EPApp mockApp = mockApp();
 		mockApp.setId(2l);
 		mockApp.setEnabled(true);
-		mockApp.setCentralAuth(false);
+		mockApp.setRolesInAAF(false);
 		EPUser user = mockUser.mockEPUser();
 		List<EPUserApp> expected = new ArrayList<>();
 		EPUserApp epUserApp = new EPUserApp();
@@ -1426,7 +1427,7 @@ public class UserRolesCommonServiceImplTest {
 		EPApp mockApp = mockApp();
 		mockApp.setId(2l);
 		mockApp.setEnabled(true);
-		mockApp.setCentralAuth(false);
+		mockApp.setRolesInAAF(false);
 		EPUser user = mockUser.mockEPUser();
 		List<EPUserAppCatalogRoles> expected = new ArrayList<>();
 		EPUserAppCatalogRoles epUserAppCatalogRoles = new EPUserAppCatalogRoles();
@@ -1458,7 +1459,7 @@ public class UserRolesCommonServiceImplTest {
 		EPApp mockApp = mockApp();
 		mockApp.setId(2l);
 		mockApp.setEnabled(true);
-		mockApp.setCentralAuth(false);
+		mockApp.setRolesInAAF(false);
 		EPUser user = mockUser.mockEPUser();
 		List<EPUserApp> expected = new ArrayList<>();
 		EPUserApp epUserApp = new EPUserApp();
@@ -1488,7 +1489,7 @@ public class UserRolesCommonServiceImplTest {
 		EPApp mockApp2 = mockApp();
 		mockApp.setId(2l);
 		mockApp.setEnabled(true);
-		mockApp.setCentralAuth(false);
+		mockApp.setRolesInAAF(false);
 		EPUser user = mockUser.mockEPUser();
 		List<EPApp> mockEpAppList = new ArrayList<>();
 		mockEpAppList.add(mockApp);
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/service/sessionmgt/SessionCommunicationTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/service/sessionmgt/SessionCommunicationTest.java
index 708f446a..5cb61b26 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/service/sessionmgt/SessionCommunicationTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/service/sessionmgt/SessionCommunicationTest.java
@@ -82,13 +82,13 @@ public class SessionCommunicationTest {
 		app.setUebKey("test");
 		app.setUebSecret("test");
 		app.setUebTopicName("test");
-		app.isCentralAuth = true;
-		app.isEnabled = true;
-		app.isOpen =false;
-		app.name = "test";
-		app.restUrl ="http://localhost:1234";
-		app.username = "test";
-		app.appPassword = "xyz";
+		app.setRolesInAAF(true);
+		app.setIsEnabled(true);
+		app.setIsOpen(false);
+		app.setAppName("test");
+		app.setRestUrl("http://localhost:1234");
+		app.setAppBasicAuthUsername("test");
+		app.setAppBasicAuthPassword("xyz");
 		URL u = PowerMockito.mock(URL.class);
 		HttpURLConnection huc = PowerMockito.mock(HttpURLConnection.class);
 		String url = "http://localhost:1234/sessionTimeOuts";
@@ -106,16 +106,16 @@ public class SessionCommunicationTest {
 		app.setUebKey("test");
 		app.setUebSecret("test");
 		app.setUebTopicName("test");
-		app.isCentralAuth = true;
-		app.isEnabled = true;
-		app.isOpen =false;
-		app.name = "test";
-		app.restUrl ="http://localhost:1234";
-		app.username = "test";
-		app.appPassword = "";
+		app.setRolesInAAF(true);
+		app.setIsEnabled(true);
+		app.setIsOpen(false);
+		app.setAppName("test");
+		app.setRestUrl("http://localhost:1234");
+		app.setAppBasicAuthUsername("test");
+		app.setAppBasicAuthPassword("");
 		EPApp epApp = new EPApp();
-		epApp.setUsername("test");
-		epApp.setAppPassword("xyz1234");
+		epApp.setAppBasicAuthUsername("test");
+		epApp.setAppBasicAuthPassword("xyz1234");
 		PowerMockito.mockStatic(CipherUtil.class);
 		PowerMockito.when(CipherUtil.decryptPKC(Matchers.anyString(),Matchers.anyString())).thenReturn("test");
 		Mockito.when(appsCacheService.getApp(1L)).thenReturn(epApp);
@@ -136,13 +136,13 @@ public class SessionCommunicationTest {
 		app.setUebKey("test");
 		app.setUebSecret("test");
 		app.setUebTopicName("test");
-		app.isCentralAuth = true;
-		app.isEnabled = true;
-		app.isOpen =false;
-		app.name = "test";
-		app.restUrl ="http://localhost:1234";
-		app.username = "test";
-		app.appPassword = "xyz";
+		app.setRolesInAAF(true);
+		app.setIsEnabled(true);
+		app.setIsOpen(false);
+		app.setAppName("test");
+		app.setRestUrl("http://localhost:1234");
+		app.setAppBasicAuthUsername("test");
+		app.setAppBasicAuthPassword("xyz");
 		URL u = PowerMockito.mock(URL.class);
 		HttpURLConnection huc = PowerMockito.mock(HttpURLConnection.class);
 		String url = "http://localhost:1234/sessionTimeOuts";
@@ -161,13 +161,13 @@ public class SessionCommunicationTest {
 		app.setUebKey("test");
 		app.setUebSecret("test");
 		app.setUebTopicName("test");
-		app.isCentralAuth = true;
-		app.isEnabled = true;
-		app.isOpen =false;
-		app.name = "test";
-		app.restUrl ="http://localhost:1234";
-		app.username = "test";
-		app.appPassword = "xyz";
+		app.setRolesInAAF(true);
+		app.setIsEnabled(true);
+		app.setIsOpen(false);
+		app.setAppName("test");
+		app.setRestUrl("http://localhost:1234");
+		app.setAppBasicAuthUsername("test");
+		app.setAppBasicAuthPassword("xyz");
 		URL u = PowerMockito.mock(URL.class);
 		HttpURLConnection huc = PowerMockito.mock(HttpURLConnection.class);
 		String url = "http://localhost:1234/sessionTimeOuts";