fixes for supporting non-gui application access provisioning

Issue-ID: PORTAL-909

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

36 files changed, 1117 insertions, 836 deletions

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/AppsController.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/AppsController.java
index 6a6b3a65..0655412f 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/AppsController.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/AppsController.java
@@ -667,7 +667,7 @@ public class AppsController extends EPRestrictedBaseController {
 			String appId = request.getParameter("appParam");
 			app = appService.getApp(Long.valueOf(appId));
 			if(!EcompPortalUtils.checkIfRemoteCentralAccessAllowed()) {
-				app.setCentralAuth(false);
+				app.setRolesInAAF(false);
 			}
 			if (user != null && (adminRolesService.isAccountAdminOfApplication(user, app)
 					|| (adminRolesService.isSuperAdmin(user) && app.getId().equals(PortalConstants.PORTAL_APP_ID))))
@@ -721,7 +721,7 @@ public class AppsController extends EPRestrictedBaseController {
 	/**
 	 * 
 	 * @param request
-	 *            HTTP servlet request
+	 *            HTTP servlet request‰
 	 * @param response
 	 *            HTTP servlet response
 	 * @param modifiedOnboardingApp
@@ -734,7 +734,7 @@ public class AppsController extends EPRestrictedBaseController {
 			@RequestBody OnboardingApp modifiedOnboardingApp, HttpServletResponse response) {
 		FieldsValidator fieldsValidator = null;
 		EPUser user = null;
-		EPApp oldEPApp = appService.getApp(modifiedOnboardingApp.id);
+		EPApp oldEPApp = appService.getApp(modifiedOnboardingApp.getId());
 		
 		try {
 			user = EPUserUtils.getUserSession(request);
@@ -746,7 +746,7 @@ public class AppsController extends EPRestrictedBaseController {
 												response.getStatus());
 				return fieldsValidator;
 			} else {
-				if((oldEPApp.getCentralAuth() && modifiedOnboardingApp.isCentralAuth && !oldEPApp.getNameSpace().equalsIgnoreCase(modifiedOnboardingApp.nameSpace) && modifiedOnboardingApp.nameSpace!= null ) || (!oldEPApp.getCentralAuth() && modifiedOnboardingApp.isCentralAuth && modifiedOnboardingApp.nameSpace!= null))
+				if((oldEPApp.getRolesInAAF() && modifiedOnboardingApp.getRolesInAAF() && !oldEPApp.getNameSpace().equalsIgnoreCase(modifiedOnboardingApp.getNameSpace()) && modifiedOnboardingApp.getNameSpace()!= null ) || (!oldEPApp.getRolesInAAF() && modifiedOnboardingApp.getRolesInAAF() && modifiedOnboardingApp.getNameSpace() != null))
 				{
 					checkIfNameSpaceIsValid(modifiedOnboardingApp, fieldsValidator, response);
 				}	
@@ -795,7 +795,7 @@ public class AppsController extends EPRestrictedBaseController {
 				EcompPortalUtils.setBadPermissions(user, response, "postOnboardingApps");
 			} else {
 				newOnboardingApp.normalize();
-				if(newOnboardingApp.isCentralAuth != null && newOnboardingApp.isCentralAuth)
+				if(newOnboardingApp.getRolesInAAF() != null && newOnboardingApp.getRolesInAAF())
 					checkIfNameSpaceIsValid(newOnboardingApp, fieldsValidator, response);
 				fieldsValidator = appService.addOnboardingApp(newOnboardingApp, user);
 				response.setStatus(fieldsValidator.httpStatusCode.intValue());
@@ -911,7 +911,7 @@ public class AppsController extends EPRestrictedBaseController {
 	private void checkIfNameSpaceIsValid(OnboardingApp modifiedOnboardingApp, FieldsValidator fieldsValidator, HttpServletResponse response)
 		throws InvalidApplicationException {
 		try {
-			ResponseEntity<String> res  = appService.checkIfNameSpaceIsValid(modifiedOnboardingApp.nameSpace);
+			ResponseEntity<String> res  = appService.checkIfNameSpaceIsValid(modifiedOnboardingApp.getNameSpace());
 		} catch (HttpClientErrorException e) {
 			logger.error(EELFLoggerDelegate.errorLogger, "checkIfNameSpaceExists failed", e);
 			EPLogUtil.logExternalAuthAccessAlarm(logger, e.getStatusCode());
diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/AppsControllerExternalRequest.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/AppsControllerExternalRequest.java
index ce29900f..a88728a0 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/AppsControllerExternalRequest.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/AppsControllerExternalRequest.java
@@ -208,7 +208,7 @@ public class AppsControllerExternalRequest implements BasicAuthenticationControl
 		@PathVariable("appId") Long appId) {
 		EPApp epApp = appService.getApp(appId);
 		OnboardingApp obApp = new OnboardingApp();
-		epApp.setAppPassword(EPCommonSystemProperties.APP_DISPLAY_PASSWORD); //to hide password from get request
+		epApp.setAppBasicAuthPassword(EPCommonSystemProperties.APP_DISPLAY_PASSWORD); //to hide password from get request
 		appService.createOnboardingFromApp(epApp, obApp);
 		EcompPortalUtils.logAndSerializeObject(logger, "getOnboardAppExternal", RESPONSE, obApp);
 		return obApp;
@@ -252,7 +252,7 @@ public class AppsControllerExternalRequest implements BasicAuthenticationControl
 				return portalResponse;
 		}
 		// Validate fields
-		if (newOnboardApp.id != null) {
+		if (newOnboardApp.getId() != null) {
 			portalResponse.setStatus(PortalRestStatusEnum.ERROR);
 			portalResponse.setMessage("Unexpected field: id");
 			return portalResponse;
@@ -266,10 +266,10 @@ public class AppsControllerExternalRequest implements BasicAuthenticationControl
 
 		try {
 		    List<EPUser> userList;
-			userList = userService.getUserByUserId(newOnboardApp.myLoginsAppOwner);
+			userList = userService.getUserByUserId(newOnboardApp.getMyLoginsAppOwner());
 			if (userList == null || userList.size() != 1) {
                 portalResponse.setStatus(PortalRestStatusEnum.ERROR);
-				portalResponse.setMessage("Failed to find user: " + newOnboardApp.myLoginsAppOwner);
+				portalResponse.setMessage("Failed to find user: " + newOnboardApp.getMyLoginsAppOwner());
 
 				return portalResponse;
 			}
@@ -343,7 +343,7 @@ public class AppsControllerExternalRequest implements BasicAuthenticationControl
 
 		// Validate fields.
 
-		if (appId == null || !appId.equals(oldOnboardApp.id)) {
+		if (appId == null || !appId.equals(oldOnboardApp.getId())) {
 			portalResponse.setStatus(PortalRestStatusEnum.ERROR);
 			portalResponse.setMessage("Unexpected value for field: id");
 			return portalResponse;
@@ -358,10 +358,10 @@ public class AppsControllerExternalRequest implements BasicAuthenticationControl
 
 		try {
             List<EPUser> userList;
-			userList = userService.getUserByUserId(oldOnboardApp.myLoginsAppOwner);
+			userList = userService.getUserByUserId(oldOnboardApp.getMyLoginsAppOwner());
 			if (userList == null || userList.size() != 1) {
                 portalResponse.setStatus(PortalRestStatusEnum.ERROR);
-				portalResponse.setMessage("Failed to find user: " + oldOnboardApp.myLoginsAppOwner);
+				portalResponse.setMessage("Failed to find user: " + oldOnboardApp.getMyLoginsAppOwner());
 
 				return portalResponse;
             }
@@ -398,15 +398,15 @@ public class AppsControllerExternalRequest implements BasicAuthenticationControl
 	}
 
 	private boolean checkIfFieldsAreNull(OnboardingApp onboardingApp) {
-		return onboardingApp.name == null || onboardingApp.url == null || onboardingApp.restUrl == null
-			|| onboardingApp.myLoginsAppOwner == null || onboardingApp.restrictedApp == null
-			|| onboardingApp.isOpen == null || onboardingApp.isEnabled == null;
+		return onboardingApp.getAppName() == null || onboardingApp.getLandingPage() == null || onboardingApp.getRestUrl() == null
+			|| onboardingApp.getMyLoginsAppOwner() == null || onboardingApp.getRestrictedApp() == null
+			|| onboardingApp.getIsOpen() == null || onboardingApp.getIsEnabled() == null;
 	}
 
 	private boolean checkIfFieldsAreEmpty(OnboardingApp onboardingApp) {
-		return onboardingApp.name.trim().isEmpty()
-			|| onboardingApp.url.trim().isEmpty()
-			|| onboardingApp.restUrl.trim().isEmpty()
-			|| onboardingApp.myLoginsAppOwner.trim().isEmpty();
+		return onboardingApp.getAppName().trim().isEmpty()
+			|| onboardingApp.getLandingPage().trim().isEmpty()
+			|| onboardingApp.getRestUrl().trim().isEmpty()
+			|| onboardingApp.getMyLoginsAppOwner().trim().isEmpty();
 	}
 }
diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/ExternalAccessRolesController.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/ExternalAccessRolesController.java
index 83b5155d..67e71c50 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/ExternalAccessRolesController.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/ExternalAccessRolesController.java
@@ -851,7 +851,7 @@ public class ExternalAccessRolesController implements BasicAuthenticationControl
 		if(app.isEmpty()){
 			throw new Exception(INVALID_UEB_KEY);
 		}
-		if(!app.isEmpty() && app.get(0).getCentralAuth()){
+		if(!app.isEmpty() && app.get(0).getRolesInAAF()){
 			ResponseEntity<String> response = externalAccessRolesService.getNameSpaceIfExists(app.get(0));
 			if (response.getStatusCode().value() == HttpServletResponse.SC_NOT_FOUND)
 				throw new Exception("Invalid NameSpace");
diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/RoleManageController.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/RoleManageController.java
index e308182c..4d2abb83 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/RoleManageController.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/RoleManageController.java
@@ -166,7 +166,7 @@ public class RoleManageController extends EPRestrictedBaseController {
 			EPApp requestedApp = appService.getApp(appId);
 			if (isAuthorizedUser(user, requestedApp)) {
 				fieldsValidation(requestedApp);
-				if (requestedApp.getCentralAuth()) {
+				if (requestedApp.getRolesInAAF()) {
 					List<CentralV2Role> answer = null;
 					Map<String, Object> model = new HashMap<>();
 					ObjectMapper mapper = new ObjectMapper();
@@ -244,7 +244,7 @@ public class RoleManageController extends EPRestrictedBaseController {
 			requestedApp = appService.getApp(appId);
 			if (isAuthorizedUser(user, requestedApp)) {
 				fieldsValidation(requestedApp);
-				if (requestedApp.getCentralAuth()) {
+				if (requestedApp.getRolesInAAF()) {
 					externalRequestFieldsValidator = externalAccessRolesService.deleteDependencyRoleRecord(roleId,
 							requestedApp.getUebKey(), user.getOrgUserId());
 					boolean deleteResponse = externalRequestFieldsValidator.isResult();
@@ -307,7 +307,7 @@ public class RoleManageController extends EPRestrictedBaseController {
 			EPApp requestedApp = appService.getApp(appId);
 			if (isAuthorizedUser(user, requestedApp)) {
 				fieldsValidation(requestedApp);
-				if (requestedApp != null && requestedApp.getCentralAuth().equals(true)) {
+				if (requestedApp != null && requestedApp.getRolesInAAF().equals(true)) {
 					ObjectMapper mapper = new ObjectMapper();
 					mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 					JsonNode root = mapper.readTree(request.getReader());
@@ -450,7 +450,7 @@ public class RoleManageController extends EPRestrictedBaseController {
 			EPApp requestedApp = appService.getApp(appId);
 			if (isAuthorizedUser(user, requestedApp)) {
 				fieldsValidation(requestedApp);
-				if (requestedApp.getCentralAuth()) {
+				if (requestedApp.getRolesInAAF()) {
 					CentralV2Role answer = externalAccessRolesService.getRoleInfo(roleId, requestedApp.getUebKey());
 					logger.info(EELFLoggerDelegate.applicationLogger, "role_id" + roleId);
 					Map<String, Object> model = new HashMap<>();
@@ -483,7 +483,7 @@ public class RoleManageController extends EPRestrictedBaseController {
 			EPApp requestedApp = appService.getApp(appId);
 			if (isAuthorizedUser(user, requestedApp)) {
 				fieldsValidation(requestedApp);
-				if (requestedApp.getCentralAuth()) {
+				if (requestedApp.getRolesInAAF()) {
 					List<CentralV2RoleFunction> answer = null;
 					Map<String, Object> model = new HashMap<>();
 					ObjectMapper mapper = new ObjectMapper();
@@ -525,7 +525,7 @@ public class RoleManageController extends EPRestrictedBaseController {
 			EPApp requestedApp = appService.getApp(appId);
 			if (isAuthorizedUser(user, requestedApp)) {
 				fieldsValidation(requestedApp);
-				if (requestedApp.getCentralAuth() && roleFunc!=null) {
+				if (requestedApp.getRolesInAAF() && roleFunc!=null) {
 					String code = roleFunc.getType() + PIPE + roleFunc.getCode() + PIPE + roleFunc.getAction();
 					CentralV2RoleFunction domainRoleFunction = externalAccessRolesService.getRoleFunction(code,
 							requestedApp.getUebKey());
@@ -624,7 +624,7 @@ public class RoleManageController extends EPRestrictedBaseController {
 			EPApp requestedApp = appService.getApp(appId);
 			if (isAuthorizedUser(user, requestedApp)) {
 				fieldsValidation(requestedApp);
-				if (requestedApp.getCentralAuth()) {
+				if (requestedApp.getRolesInAAF()) {
 					ObjectMapper mapper = new ObjectMapper();
 					String data = roleFunc;
 					boolean getDelFuncResponse = false;
@@ -811,7 +811,7 @@ public class RoleManageController extends EPRestrictedBaseController {
 			throw new InvalidApplicationException("Invalid credentials");
 		}
 		if (!appInfo.isEmpty() && EcompPortalUtils.checkIfRemoteCentralAccessAllowed()
-				&& appInfo.get(0).getCentralAuth()) {
+				&& appInfo.get(0).getRolesInAAF()) {
 			ResponseEntity<String> response = externalAccessRolesService.getNameSpaceIfExists(appInfo.get(0));
 			if (response.getStatusCode().value() == HttpServletResponse.SC_NOT_FOUND)
 				throw new InvalidApplicationException("Invalid NameSpace");
diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/domain/EPApp.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/domain/EPApp.java
index 8227d9ab..61fcfaee 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/domain/EPApp.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/domain/EPApp.java
@@ -52,45 +52,72 @@ import org.onap.portalsdk.core.domain.support.DomainVo;
 public class EPApp extends DomainVo {
 
 	private static final long serialVersionUID = 1L;
+
 	@SafeHtml
 	private String name;
+
 	@SafeHtml
 	private String imageUrl;
+
 	@SafeHtml
-	private String description;
+	private String appDescription;
+
 	@SafeHtml
-	private String notes;
+	private String appNotes;
+
 	@SafeHtml
-	private String url;
+	private String landingPage;
+
 	@SafeHtml
-	private String alternateUrl;
+	private String alternateLandingPage;
+
 	@SafeHtml
 	private String appRestEndpoint;
+
 	@SafeHtml
 	private String mlAppName;
+
 	@SafeHtml
 	private String mlAppAdminId;
 	private Long motsId;
+
 	@SafeHtml
-	private String username;
+	private String appBasicAuthUsername;
+
 	@SafeHtml
-	private String appPassword;
+	private String appBasicAuthPassword;
+
 	@Lob
 	private byte[] thumbnail;
+
 	private Boolean open;
+
 	private Boolean enabled;
+
 	@SafeHtml
 	private String uebTopicName;
+
 	@SafeHtml
 	private String uebKey;
+
 	@SafeHtml
 	private String uebSecret;
+
 	private Integer appType;
+
 	@Valid
 	private AppContactUs contactUs;
-	private Boolean centralAuth;
+
+	private Boolean rolesInAAF;
 	@SafeHtml
-	private String	nameSpace;
+	private String nameSpace;
+
+	@SafeHtml
+	private String modeOfIntegration;
+
+	private Boolean appAck;
+
+	private Boolean usesCadi;
 
 	public EPApp() {
 		// Attention!!!
@@ -102,8 +129,8 @@ public class EPApp extends DomainVo {
 		this.name = "";
 		this.mlAppName = "";
 		this.mlAppAdminId = "";
-		this.username = "";
-		this.appPassword = "";
+		this.appBasicAuthUsername = "";
+		this.appBasicAuthPassword = "";
 		this.open = new Boolean(false);
 		this.enabled = new Boolean(true);
 		this.uebTopicName = "";
@@ -131,8 +158,6 @@ public class EPApp extends DomainVo {
 		this.imageUrl = imageUrl;
 	}
 
-
-
 	public byte[] getThumbnail() {
 		return this.thumbnail;
 	}
@@ -141,36 +166,36 @@ public class EPApp extends DomainVo {
 		this.thumbnail = thumbnail;
 	}
 
-	public String getDescription() {
-		return description;
+	public String getAppDescription() {
+		return appDescription;
 	}
 
-	public void setDescription(String description) {
-		this.description = description;
+	public void setAppDescription(String appDescription) {
+		this.appDescription = appDescription;
 	}
 
-	public String getNotes() {
-		return notes;
+	public String getAppNotes() {
+		return appNotes;
 	}
 
-	public void setNotes(String notes) {
-		this.notes = notes;
+	public void setAppNotes(String appNotes) {
+		this.appNotes = appNotes;
 	}
 
-	public String getUrl() {
-		return url;
+	public String getLandingPage() {
+		return landingPage;
 	}
 
-	public void setUrl(String url) {
-		this.url = url;
+	public void setLandingPage(String landingPage) {
+		this.landingPage = landingPage;
 	}
 
-	public String getAlternateUrl() {
-		return alternateUrl;
+	public String getAlternateLandingPage() {
+		return alternateLandingPage;
 	}
 
-	public void setAlternateUrl(String alternateUrl) {
-		this.alternateUrl = alternateUrl;
+	public void setAlternateLandingPage(String alternateLandingPage) {
+		this.alternateLandingPage = alternateLandingPage;
 	}
 
 	public String getAppRestEndpoint() {
@@ -211,25 +236,25 @@ public class EPApp extends DomainVo {
 		this.motsId = motsId;
 	}
 
-	public String getUsername() {
-		return username;
+	public String getAppBasicAuthUsername() {
+		return appBasicAuthUsername;
 	}
 
-	public void setUsername(String username) {
-		this.username = username;
+	public void setAppBasicAuthUsername(String appBasicAuthUsername) {
+		this.appBasicAuthUsername = appBasicAuthUsername;
 	}
 
-	public String getAppPassword() {
-		return appPassword;
+	public String getAppBasicAuthPassword() {
+		return appBasicAuthPassword;
 	}
 
-	public void setAppPassword(String appPassword) {
-		if (StringUtils.isEmpty(appPassword)) {
-			appPassword = "";
+	public void setAppBasicAuthPassword(String appBasicAuthPassword) {
+		if (StringUtils.isEmpty(appBasicAuthPassword)) {
+			appBasicAuthPassword = "";
 		}
-		this.appPassword = appPassword;
+		this.appBasicAuthPassword = appBasicAuthPassword;
 	}
-
+	
 	public Boolean getOpen() {
 		return open;
 	}
@@ -252,25 +277,6 @@ public class EPApp extends DomainVo {
 		this.enabled = enabled;
 	}
 
-	public Integer getAppType() {
-		return appType;
-	}
-
-	public void setAppType(Integer appType) {
-		if (appType == null) {
-			appType = new Integer(1);
-		}
-		this.appType = appType;
-	}
-
-	public void setRestrictedApp(Boolean restrictedApp) {
-		Integer result = 1;
-		if (restrictedApp) {
-			result = 2;
-		}
-		this.appType = result;
-	}
-
 	public Boolean isRestrictedApp() {
 		return (this.appType == 2 ? true : false);
 	}
@@ -308,6 +314,14 @@ public class EPApp extends DomainVo {
 		return this.uebSecret;
 	}
 
+	public Integer getAppType() {
+		return appType;
+	}
+
+	public void setAppType(Integer appType) {
+		this.appType = appType;
+	}
+
 	public void setUebSecret(String uebSecret) {
 		if (StringUtils.isEmpty(uebSecret)) {
 			this.uebSecret = "";
@@ -322,18 +336,18 @@ public class EPApp extends DomainVo {
 	public void setContactUs(AppContactUs contactUs) {
 		this.contactUs = contactUs;
 	}
-	
-	public Boolean getCentralAuth() {
-		return centralAuth;
+
+	public Boolean getRolesInAAF() {
+		return rolesInAAF;
 	}
 
-	public void setCentralAuth(Boolean centralAuth) {
-		if (centralAuth == null) {
-			centralAuth = new Boolean(false);
+	public void setRolesInAAF(Boolean rolesInAAF) {
+		if (rolesInAAF == null) {
+			rolesInAAF = new Boolean(false);
 		}
-		this.centralAuth = centralAuth;
+		this.rolesInAAF = rolesInAAF;
 	}
-	
+
 	public String getNameSpace() {
 		return nameSpace;
 	}
@@ -345,38 +359,71 @@ public class EPApp extends DomainVo {
 		this.nameSpace = nameSpace;
 	}
 
+	public String getModeOfIntegration() {
+		return modeOfIntegration;
+	}
+
+	public void setModeOfIntegration(String modeOfIntegration) {
+		this.modeOfIntegration = modeOfIntegration;
+	}
+
+	public Boolean getAppAck() {
+		return appAck;
+	}
+
+	public void setAppAck(Boolean appAck) {
+		this.appAck = appAck;
+	}
+
+	public Boolean getUsesCadi() {
+		return usesCadi;
+	}
+
+	public void setUsesCadi(Boolean usesCadi) {
+		this.usesCadi = usesCadi;
+	}
+	
 	@Override
 	public String toString() {
-		String str = "[" + getId() + ":" + getName() + "]";
-		return str;
+		return "EPApp [name=" + name + ", imageUrl=" + imageUrl + ", appDescription=" + appDescription + ", appNotes="
+				+ appNotes + ", landingPage=" + landingPage + ", alternateLandingPage=" + alternateLandingPage
+				+ ", appRestEndpoint=" + appRestEndpoint + ", mlAppName=" + mlAppName + ", mlAppAdminId=" + mlAppAdminId
+				+ ", motsId=" + motsId + ", appBasicAuthUsername=" + appBasicAuthUsername + ", appBasicAuthPassword="
+				+ appBasicAuthPassword + ", thumbnail=" + Arrays.toString(thumbnail) + ", open=" + open + ", enabled="
+				+ enabled + ", uebTopicName=" + uebTopicName + ", uebKey=" + uebKey + ", uebSecret=" + uebSecret
+				+ ", appType=" + appType + ", contactUs=" + contactUs + ", rolesInAAF=" + rolesInAAF + ", nameSpace="
+				+ nameSpace + ", modeOfIntegration=" + modeOfIntegration + ", appAck=" + appAck + ", usesCadi="
+				+ usesCadi + "]";
 	}
 
 	@Override
 	public int hashCode() {
 		final int prime = 31;
 		int result = 1;
-		result = prime * result + ((alternateUrl == null) ? 0 : alternateUrl.hashCode());
-		result = prime * result + ((appPassword == null) ? 0 : appPassword.hashCode());
+		result = prime * result + ((alternateLandingPage == null) ? 0 : alternateLandingPage.hashCode());
+		result = prime * result + ((appAck == null) ? 0 : appAck.hashCode());
+		result = prime * result + ((appBasicAuthPassword == null) ? 0 : appBasicAuthPassword.hashCode());
+		result = prime * result + ((appBasicAuthUsername == null) ? 0 : appBasicAuthUsername.hashCode());
+		result = prime * result + ((appDescription == null) ? 0 : appDescription.hashCode());
+		result = prime * result + ((appNotes == null) ? 0 : appNotes.hashCode());
 		result = prime * result + ((appRestEndpoint == null) ? 0 : appRestEndpoint.hashCode());
 		result = prime * result + ((appType == null) ? 0 : appType.hashCode());
-		result = prime * result + ((centralAuth == null) ? 0 : centralAuth.hashCode());
-		result = prime * result + ((contactUs == null) ? 0 : contactUs.hashCode());
-		result = prime * result + ((description == null) ? 0 : description.hashCode());
 		result = prime * result + ((enabled == null) ? 0 : enabled.hashCode());
 		result = prime * result + ((imageUrl == null) ? 0 : imageUrl.hashCode());
+		result = prime * result + ((landingPage == null) ? 0 : landingPage.hashCode());
 		result = prime * result + ((mlAppAdminId == null) ? 0 : mlAppAdminId.hashCode());
 		result = prime * result + ((mlAppName == null) ? 0 : mlAppName.hashCode());
+		result = prime * result + ((modeOfIntegration == null) ? 0 : modeOfIntegration.hashCode());
 		result = prime * result + ((motsId == null) ? 0 : motsId.hashCode());
 		result = prime * result + ((name == null) ? 0 : name.hashCode());
 		result = prime * result + ((nameSpace == null) ? 0 : nameSpace.hashCode());
-		result = prime * result + ((notes == null) ? 0 : notes.hashCode());
 		result = prime * result + ((open == null) ? 0 : open.hashCode());
+		result = prime * result + ((rolesInAAF == null) ? 0 : rolesInAAF.hashCode());
 		result = prime * result + Arrays.hashCode(thumbnail);
 		result = prime * result + ((uebKey == null) ? 0 : uebKey.hashCode());
 		result = prime * result + ((uebSecret == null) ? 0 : uebSecret.hashCode());
 		result = prime * result + ((uebTopicName == null) ? 0 : uebTopicName.hashCode());
-		result = prime * result + ((url == null) ? 0 : url.hashCode());
-		result = prime * result + ((username == null) ? 0 : username.hashCode());
+		result = prime * result + ((usesCadi == null) ? 0 : usesCadi.hashCode());
 		return result;
 	}
 
@@ -384,45 +431,50 @@ public class EPApp extends DomainVo {
 	public boolean equals(Object obj) {
 		if (this == obj)
 			return true;
-		if (obj == null)
+		if (!super.equals(obj))
 			return false;
-		if (getClass() != obj.getClass())
+		if (!(obj instanceof EPApp))
 			return false;
 		EPApp other = (EPApp) obj;
-		if (alternateUrl == null) {
-			if (other.alternateUrl != null)
+		if (alternateLandingPage == null) {
+			if (other.alternateLandingPage != null)
 				return false;
-		} else if (!alternateUrl.equals(other.alternateUrl))
+		} else if (!alternateLandingPage.equals(other.alternateLandingPage))
 			return false;
-		if (appPassword == null) {
-			if (other.appPassword != null)
+		if (appAck == null) {
+			if (other.appAck != null)
 				return false;
-		} else if (!appPassword.equals(other.appPassword))
+		} else if (!appAck.equals(other.appAck))
 			return false;
-		if (appRestEndpoint == null) {
-			if (other.appRestEndpoint != null)
+		if (appBasicAuthPassword == null) {
+			if (other.appBasicAuthPassword != null)
 				return false;
-		} else if (!appRestEndpoint.equals(other.appRestEndpoint))
+		} else if (!appBasicAuthPassword.equals(other.appBasicAuthPassword))
 			return false;
-		if (appType == null) {
-			if (other.appType != null)
+		if (appBasicAuthUsername == null) {
+			if (other.appBasicAuthUsername != null)
 				return false;
-		} else if (!appType.equals(other.appType))
+		} else if (!appBasicAuthUsername.equals(other.appBasicAuthUsername))
 			return false;
-		if (centralAuth == null) {
-			if (other.centralAuth != null)
+		if (appDescription == null) {
+			if (other.appDescription != null)
 				return false;
-		} else if (!centralAuth.equals(other.centralAuth))
+		} else if (!appDescription.equals(other.appDescription))
 			return false;
-		if (contactUs == null) {
-			if (other.contactUs != null)
+		if (appNotes == null) {
+			if (other.appNotes != null)
 				return false;
-		} else if (!contactUs.equals(other.contactUs))
+		} else if (!appNotes.equals(other.appNotes))
 			return false;
-		if (description == null) {
-			if (other.description != null)
+		if (appRestEndpoint == null) {
+			if (other.appRestEndpoint != null)
 				return false;
-		} else if (!description.equals(other.description))
+		} else if (!appRestEndpoint.equals(other.appRestEndpoint))
+			return false;
+		if (appType == null) {
+			if (other.appType != null)
+				return false;
+		} else if (!appType.equals(other.appType))
 			return false;
 		if (enabled == null) {
 			if (other.enabled != null)
@@ -434,6 +486,11 @@ public class EPApp extends DomainVo {
 				return false;
 		} else if (!imageUrl.equals(other.imageUrl))
 			return false;
+		if (landingPage == null) {
+			if (other.landingPage != null)
+				return false;
+		} else if (!landingPage.equals(other.landingPage))
+			return false;
 		if (mlAppAdminId == null) {
 			if (other.mlAppAdminId != null)
 				return false;
@@ -444,6 +501,11 @@ public class EPApp extends DomainVo {
 				return false;
 		} else if (!mlAppName.equals(other.mlAppName))
 			return false;
+		if (modeOfIntegration == null) {
+			if (other.modeOfIntegration != null)
+				return false;
+		} else if (!modeOfIntegration.equals(other.modeOfIntegration))
+			return false;
 		if (motsId == null) {
 			if (other.motsId != null)
 				return false;
@@ -459,16 +521,16 @@ public class EPApp extends DomainVo {
 				return false;
 		} else if (!nameSpace.equals(other.nameSpace))
 			return false;
-		if (notes == null) {
-			if (other.notes != null)
-				return false;
-		} else if (!notes.equals(other.notes))
-			return false;
 		if (open == null) {
 			if (other.open != null)
 				return false;
 		} else if (!open.equals(other.open))
 			return false;
+		if (rolesInAAF == null) {
+			if (other.rolesInAAF != null)
+				return false;
+		} else if (!rolesInAAF.equals(other.rolesInAAF))
+			return false;
 		if (!Arrays.equals(thumbnail, other.thumbnail))
 			return false;
 		if (uebKey == null) {
@@ -486,16 +548,13 @@ public class EPApp extends DomainVo {
 				return false;
 		} else if (!uebTopicName.equals(other.uebTopicName))
 			return false;
-		if (url == null) {
-			if (other.url != null)
-				return false;
-		} else if (!url.equals(other.url))
-			return false;
-		if (username == null) {
-			if (other.username != null)
+		if (usesCadi == null) {
+			if (other.usesCadi != null)
 				return false;
-		} else if (!username.equals(other.username))
+		} else if (!usesCadi.equals(other.usesCadi))
 			return false;
 		return true;
 	}
+
+	
 }
diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/domain/EpAppType.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/domain/EpAppType.java
new file mode 100644
index 00000000..ae6d12cd
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/domain/EpAppType.java
@@ -0,0 +1,48 @@
+/*-
+ * ============LICENSE_START==========================================
+ * ONAP Portal
+ * ===================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ============LICENSE_END============================================
+ *
+ * 
+ */
+package org.onap.portalapp.portal.domain;
+
+public interface EpAppType {
+	public static final int GUI = 1;
+	public static final int HYPERLINK = 2;
+	public static final int NONGUI = 3;
+
+	public static final String GUI_STR = "gui";
+	public static final String HYPERLINK_STR = "hyperlink";
+	public static final String NONGUI_STR = "nongui";
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/interceptor/PortalResourceInterceptor.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/interceptor/PortalResourceInterceptor.java
index 78b40473..5a57e094 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/interceptor/PortalResourceInterceptor.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/interceptor/PortalResourceInterceptor.java
@@ -253,7 +253,7 @@ public class PortalResourceInterceptor extends ResourceInterceptor {
 							throw new Exception("Invalid credentials!");
 						}
 						else {
-							final String appUsername = application.getUsername();
+							final String appUsername = application.getAppBasicAuthUsername();
 							logger.debug(EELFLoggerDelegate.debugLogger, "appUsername : {}",appUsername);
 
 							String[] accountNamePassword = EcompPortalUtils.getUserNamePassword(authHeader);
@@ -317,8 +317,8 @@ public class PortalResourceInterceptor extends ResourceInterceptor {
 					throw new Exception("Invalid credentials!");
 				}
 				else {
-					final String appUsername = application.getUsername();
-					final String dbDecryptedPwd = CipherUtil.decryptPKC(application.getAppPassword());
+					final String appUsername = application.getAppBasicAuthUsername();
+					final String dbDecryptedPwd = CipherUtil.decryptPKC(application.getAppBasicAuthPassword());
 					if (appUsername.equals(accountNamePassword[0]) && dbDecryptedPwd.equals(accountNamePassword[1])) {
 						return true;
 					}
diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/AdminRolesServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/AdminRolesServiceImpl.java
index 6950bdda..969ccc5f 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/AdminRolesServiceImpl.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/AdminRolesServiceImpl.java
@@ -349,7 +349,7 @@ public class AdminRolesServiceImpl implements AdminRolesService {
 			for (AppNameIdIsAdmin appNameIdIsAdmin : newAppsWhereUserIsAdmin) {
 				EPApp app = (EPApp) localSession.get(EPApp.class, appNameIdIsAdmin.id);
 				try {
-					if (app.getCentralAuth()) {
+					if (app.getRolesInAAF()) {
 						String extRole = app.getNameSpace() + "." + PortalConstants.ADMIN_ROLE.replaceAll(" ", "_");
 						HttpEntity<String> entity = new HttpEntity<>(headers);
 						String name = "";
diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ApplicationsRestClientServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ApplicationsRestClientServiceImpl.java
index 09d78046..959e392f 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ApplicationsRestClientServiceImpl.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ApplicationsRestClientServiceImpl.java
@@ -176,8 +176,8 @@ public class ApplicationsRestClientServiceImpl implements ApplicationsRestClient
 		
 		if (externalApp != null) {
 			String appBaseUri = (type == SystemType.APPLICATION) ? externalApp.getAppRestEndpoint() : "";
-			String username = (type == SystemType.APPLICATION) ? externalApp.getUsername(): "";
-			String encriptedPwd = (type == SystemType.APPLICATION) ? externalApp.getAppPassword(): "";
+			String username = (type == SystemType.APPLICATION) ? externalApp.getAppBasicAuthUsername(): "";
+			String encriptedPwd = (type == SystemType.APPLICATION) ? externalApp.getAppBasicAuthPassword(): "";
 
 			String appName = (type == SystemType.APPLICATION) ? externalApp.getName(): "";
 			String decreptedAppPwd = StringUtils.EMPTY;
@@ -202,16 +202,16 @@ public class ApplicationsRestClientServiceImpl implements ApplicationsRestClient
 			WebClient client = createClientForPath(appBaseUri, restPath);
 			
 			
-			if(externalApp.getAppPassword().isEmpty() || externalApp.getAppPassword()==null){
+			if(externalApp.getAppBasicAuthPassword().isEmpty() || externalApp.getAppBasicAuthPassword()==null){
 				logger.debug(EELFLoggerDelegate.debugLogger, "Entering in the externalApp get app password contains null : {}");
 
 				externalApp = appsCacheService.getApp(1L);
 				logger.debug(EELFLoggerDelegate.debugLogger, "external App Information : {}",externalApp);
 
-				String mechidUsername=externalApp.getUsername();
+				String mechidUsername=externalApp.getAppBasicAuthUsername();
 				logger.debug(EELFLoggerDelegate.debugLogger, "external App mechidUsername Information : {}",mechidUsername);
 
-				String password=externalApp.getAppPassword();
+				String password=externalApp.getAppBasicAuthPassword();
 				String decreptedexternalAppPwd = StringUtils.EMPTY;
 				try {
 					decreptedexternalAppPwd = CipherUtil.decryptPKC(password,
diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/EPAppCommonServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/EPAppCommonServiceImpl.java
index 126d6276..539ada26 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/EPAppCommonServiceImpl.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/EPAppCommonServiceImpl.java
@@ -147,17 +147,17 @@ public class EPAppCommonServiceImpl implements EPAppService {
 	public Boolean onboardingAppFieldsValidation(OnboardingApp onboardingApp) {
 		//FieldsValidator fieldsValidator = new FieldsValidator();
 
-		if ((!onboardingApp.restrictedApp) &&( onboardingApp.name == null || onboardingApp.name.length() == 0 || onboardingApp.restrictedApp == null
-				|| onboardingApp.url == null || onboardingApp.url.length() == 0 || onboardingApp.restUrl == null || onboardingApp.restUrl.length() == 0
-			    || onboardingApp.username == null || onboardingApp.username.length() == 0
-				|| onboardingApp.isOpen == null
-				|| (onboardingApp.id != null && onboardingApp.id.equals(ECOMP_APP_ID)))
+		if ((!onboardingApp.getRestrictedApp()) &&( onboardingApp.getAppName() == null || onboardingApp.getAppName().length() == 0 || onboardingApp.getRestrictedApp() == null
+				|| onboardingApp.getLandingPage() == null || onboardingApp.getLandingPage().length() == 0 || onboardingApp.getRestUrl() == null || onboardingApp.getRestUrl().length() == 0
+			    || onboardingApp.getAppBasicAuthUsername() == null || onboardingApp.getAppBasicAuthUsername().length() == 0
+				|| onboardingApp.getIsOpen() == null
+				|| (onboardingApp.getId() != null && onboardingApp.getId().equals(ECOMP_APP_ID)))
 				// For a normal app (appType == PortalConstants.PortalAppId),
 				// these fields must be filled
 				// in.
 				// For a restricted app (appType==2), they will be empty.
-				|| ((onboardingApp.restrictedApp) && (onboardingApp.name == null || onboardingApp.name.length() == 0
-						|| onboardingApp.url == null || onboardingApp.url.length() == 0 || onboardingApp.isOpen == null))) {
+				|| ((onboardingApp.getRestrictedApp()) && (onboardingApp.getAppName() == null || onboardingApp.getAppName().length() == 0
+						|| onboardingApp.getLandingPage() == null || onboardingApp.getLandingPage().length() == 0 || onboardingApp.getIsOpen() == null))) {
 			return false;
 		}
 		return true;
@@ -165,8 +165,8 @@ public class EPAppCommonServiceImpl implements EPAppService {
 	}
 	
 	private Boolean onboardingInactiveAppFieldsForValidation(OnboardingApp onboardingApp) {
-		if (onboardingApp.name == null || onboardingApp.name.length() == 0
-				|| onboardingApp.isOpen == null) {
+		if (onboardingApp.getAppName() == null || onboardingApp.getAppName().length() == 0
+				|| onboardingApp.getIsOpen() == null) {
 			return false;
 		}
 		return true;
@@ -174,28 +174,28 @@ public class EPAppCommonServiceImpl implements EPAppService {
 
 	protected FieldsValidator onboardingAppFieldsChecker(OnboardingApp onboardingApp) {
 		FieldsValidator fieldsValidator = new FieldsValidator();
-		if (onboardingApp.isCentralAuth) {
-			if (!onboardingApp.isEnabled) {
+		if (onboardingApp.getRolesInAAF()) {
+			if (!onboardingApp.getIsEnabled()) {
 				if (!onboardingInactiveAppFieldsForValidation(onboardingApp)) {
 					fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_BAD_REQUEST);
 				}
-			} else if (onboardingApp.isEnabled) {
-				if (onboardingAppFieldsValidation(onboardingApp) == false || onboardingApp.nameSpace == null
-						|| onboardingApp.nameSpace.length() == 0) {
+			} else if (onboardingApp.getIsEnabled()) {
+				if (onboardingAppFieldsValidation(onboardingApp) == false || onboardingApp.getNameSpace() == null
+						|| onboardingApp.getNameSpace().length() == 0) {
 					fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_BAD_REQUEST);
 				}
 			}
 		} else {
-			if (!onboardingApp.isEnabled) {
+			if (!onboardingApp.getIsEnabled()) {
 				if (!onboardingInactiveAppFieldsForValidation(onboardingApp)) {
 					fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_BAD_REQUEST);
 				}
-			} else if (onboardingApp.isEnabled) {
-				if(onboardingApp.restrictedApp && onboardingAppFieldsValidation(onboardingApp) == false){
+			} else if (onboardingApp.getIsEnabled()) {
+				if(onboardingApp.getRestrictedApp() && onboardingAppFieldsValidation(onboardingApp) == false){
 					fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_BAD_REQUEST);
 				}
-				else if (!onboardingApp.restrictedApp && (onboardingAppFieldsValidation(onboardingApp) == false || onboardingApp.appPassword == null
-						|| onboardingApp.appPassword.length() == 0)) {
+				else if (!onboardingApp.getRestrictedApp() && (onboardingAppFieldsValidation(onboardingApp) == false || onboardingApp.getAppBasicAuthPassword() == null
+						|| onboardingApp.getAppBasicAuthPassword().length() == 0)) {
 					fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_BAD_REQUEST);
 				}
 			}
@@ -268,15 +268,15 @@ public class EPAppCommonServiceImpl implements EPAppService {
 			ecompApp.setId(app.getId());
 			ecompApp.setName(app.getName());
 			ecompApp.setImageUrl(app.getImageUrl());
-			ecompApp.setDescription(app.getDescription());
-			ecompApp.setNotes(app.getNotes());
-			ecompApp.setUrl(app.getUrl());
-			ecompApp.setAlternateUrl(app.getAlternateUrl());
+			ecompApp.setDescription(app.getAppDescription());
+			ecompApp.setNotes(app.getAppNotes());
+			ecompApp.setUrl(app.getLandingPage());
+			ecompApp.setAlternateUrl(app.getAlternateLandingPage());
 			ecompApp.setUebTopicName(app.getUebTopicName());
 			//ecompApp.setUebKey(app.getUebKey());
 			ecompApp.setUebSecret(app.getUebSecret());
 			ecompApp.setEnabled(app.getEnabled());
-			ecompApp.setCentralAuth(app.getCentralAuth());
+			ecompApp.setCentralAuth(app.getRolesInAAF());
 			ecompApp.setNameSpace(app.getNameSpace());
 			ecompApp.setRestrictedApp(app.isRestrictedApp());
 			ecompAppList.add(ecompApp);
@@ -381,7 +381,7 @@ public class EPAppCommonServiceImpl implements EPAppService {
 			if (apps.size() > 0) {
 				EPApp app = apps.get(0);
 				if (!EcompPortalUtils.checkIfRemoteCentralAccessAllowed()) {
-					app.setCentralAuth(false);
+					app.setRolesInAAF(false);
 				}
 				return app;
 			} else{
@@ -582,14 +582,14 @@ public class EPAppCommonServiceImpl implements EPAppService {
 		FieldsValidator fieldsValidator = new FieldsValidator();
 		if(onboardingApp.isCentralAuth){
 		if (onboardingApp.name == null || onboardingApp.name.length() == 0 || onboardingApp.url == null
-				|| onboardingApp.url.length() == 0 || onboardingApp.restrictedApp == null
-				|| onboardingApp.isOpen == null || onboardingApp.isEnabled == null
-				|| (onboardingApp.id != null && ECOMP_APP_ID.equals(onboardingApp.id.toString()))
+				|| onboardingApp.url.length() == 0 || onboardingApp.getRestrictedApp() == null
+				|| onboardingApp.getIsOpen() == null || onboardingApp.getIsEnabled() == null
+				|| (onboardingApp.getId() != null && ECOMP_APP_ID.equals(onboardingApp.getId().toString()))
 				// For a normal app (appType == PortalConstants.PortalAppId),
 				// these fields must be filled
 				// in.
 				// For a restricted app (appType==2), they will be empty.
-				|| ((!onboardingApp.restrictedApp) && (onboardingApp.myLoginsAppName == null
+				|| ((!onboardingApp.getRestrictedApp()) && (onboardingApp.myLoginsAppName == null
 						|| onboardingApp.myLoginsAppName.length() == 0 || onboardingApp.myLoginsAppOwner == null
 						|| onboardingApp.myLoginsAppOwner.length() == 0 || onboardingApp.username == null
 						|| onboardingApp.username.length() == 0 ))) {
@@ -598,14 +598,14 @@ public class EPAppCommonServiceImpl implements EPAppService {
 		}else{
 
 			if (onboardingApp.name == null || onboardingApp.name.length() == 0 || onboardingApp.url == null
-					|| onboardingApp.url.length() == 0 || onboardingApp.restrictedApp == null
-					|| onboardingApp.isOpen == null || onboardingApp.isEnabled == null
-					|| (onboardingApp.id != null && ECOMP_APP_ID.equals(onboardingApp.id.toString()))
+					|| onboardingApp.url.length() == 0 || onboardingApp.getRestrictedApp() == null
+					|| onboardingApp.getIsOpen() == null || onboardingApp.getIsEnabled() == null
+					|| (onboardingApp.getId() != null && ECOMP_APP_ID.equals(onboardingApp.getId().toString()))
 					// For a normal app (appType == PortalConstants.PortalAppId),
 					// these fields must be filled
 					// in.
 					// For a restricted app (appType==2), they will be empty.
-					|| ((!onboardingApp.restrictedApp) && (onboardingApp.myLoginsAppName == null
+					|| ((!onboardingApp.getRestrictedApp()) && (onboardingApp.myLoginsAppName == null
 							|| onboardingApp.myLoginsAppName.length() == 0 || onboardingApp.myLoginsAppOwner == null
 							|| onboardingApp.myLoginsAppOwner.length() == 0 || onboardingApp.username == null
 							|| onboardingApp.username.length() == 0 || onboardingApp.appPassword == null
@@ -815,7 +815,7 @@ public class EPAppCommonServiceImpl implements EPAppService {
 		}
 		return finalsortedAppsByManual;
 	}
-
+	
 	@Override
 	public List<OnboardingApp> getOnboardingApps() {
 		@SuppressWarnings("unchecked")
@@ -823,7 +823,7 @@ public class EPAppCommonServiceImpl implements EPAppService {
 		List<OnboardingApp> onboardingAppsList = new ArrayList<OnboardingApp>();
 		for (EPApp app : apps) {
 			OnboardingApp onboardingApp = new OnboardingApp();
-			app.setAppPassword(EPCommonSystemProperties.APP_DISPLAY_PASSWORD);//to hide password from get request
+			app.setAppBasicAuthPassword(EPCommonSystemProperties.APP_DISPLAY_PASSWORD);//to hide password from get request
 			createOnboardingFromApp(app, onboardingApp);
 			onboardingAppsList.add(onboardingApp);
 		}
@@ -846,7 +846,7 @@ public class EPAppCommonServiceImpl implements EPAppService {
 		onboardingAppsList = getOnboardingApps();
 		
 		final List<Integer> userAdminApps1 = userAdminApps;
-		List<OnboardingApp> userApplicationAdmins = onboardingAppsList.stream().filter(x -> userAdminApps1.contains((int) (long)x.id)).collect(Collectors.toList());
+		List<OnboardingApp> userApplicationAdmins = onboardingAppsList.stream().filter(x -> userAdminApps1.contains((int) (long)x.getId())).collect(Collectors.toList());
 		
         return userApplicationAdmins;
 	}
@@ -870,13 +870,13 @@ public class EPAppCommonServiceImpl implements EPAppService {
 		boolean duplicatedNameSpace = false;
 		boolean duplicatedName = false;
 		List<EPApp> apps;
-		if (onboardingApp.id == null) {
+		if (onboardingApp.getId() == null) {
 			List<Criterion> restrictionsList = new ArrayList<Criterion>();
-			Criterion nameCrit = Restrictions.eq("name",onboardingApp.name);
+			Criterion nameCrit = Restrictions.eq("name",onboardingApp.getAppName());
 			Criterion nameSpaceCrit = null;
 			Criterion	orCrit = null;
-			if (onboardingApp.isCentralAuth) {
-				nameSpaceCrit = Restrictions.eq("nameSpace", onboardingApp.nameSpace);
+			if (onboardingApp.getRolesInAAF()) {
+				nameSpaceCrit = Restrictions.eq("nameSpace", onboardingApp.getNameSpace());
 				orCrit = Restrictions.or(nameCrit, nameSpaceCrit);
 			} else
 				orCrit = Restrictions.or(nameCrit);
@@ -884,12 +884,12 @@ public class EPAppCommonServiceImpl implements EPAppService {
 			apps = (List<EPApp>) dataAccessService.getList(EPApp.class, null, restrictionsList, null);
 		} else {
 			List<Criterion> restrictionsList = new ArrayList<Criterion>();
-			Criterion idCrit =Restrictions.eq("id", onboardingApp.id);
-			Criterion nameCrit = Restrictions.eq("name",onboardingApp.name);
+			Criterion idCrit =Restrictions.eq("id", onboardingApp.getId());
+			Criterion nameCrit = Restrictions.eq("name",onboardingApp.getAppName());
 			Criterion nameSpaceCrit = null;
 			Criterion orCrit= null;
-			if (onboardingApp.isCentralAuth) {
-				nameSpaceCrit = Restrictions.eq("nameSpace",onboardingApp.nameSpace);
+			if (onboardingApp.getRolesInAAF()) {
+				nameSpaceCrit = Restrictions.eq("nameSpace",onboardingApp.getNameSpace());
 				orCrit = Restrictions.or(idCrit, nameSpaceCrit, nameCrit);
 			}
 			else
@@ -900,16 +900,16 @@ public class EPAppCommonServiceImpl implements EPAppService {
 			
 		}
 		for (EPApp app : apps) {
-			if (onboardingApp.id != null && onboardingApp.id.equals(app.getId())) {
+			if (onboardingApp.getId() != null && onboardingApp.getId().equals(app.getId())) {
 				continue;
 			}
-			if (!duplicatedName && app.getName().equalsIgnoreCase(onboardingApp.name)) {
+			if (!duplicatedName && app.getName().equalsIgnoreCase(onboardingApp.getAppName())) {
 				duplicatedName = true;
 				if (duplicatedName) {
 					break;
 				}
 			}
-			if (!duplicatedNameSpace && app.getNameSpace().equalsIgnoreCase(onboardingApp.nameSpace)) {
+			if (!duplicatedNameSpace && app.getNameSpace().equalsIgnoreCase(onboardingApp.getNameSpace())) {
 				duplicatedNameSpace = true;
 				if (duplicatedNameSpace) {
 					break;
@@ -937,8 +937,8 @@ public class EPAppCommonServiceImpl implements EPAppService {
 			validateOnboardingApp(modifiedOnboardingApp, fieldsValidator);
 		}
 		if (fieldsValidator.httpStatusCode.intValue() == HttpServletResponse.SC_OK) {
-			if (modifiedOnboardingApp.id != null) {
-				updateApp(modifiedOnboardingApp.id, modifiedOnboardingApp, fieldsValidator, user);
+			if (modifiedOnboardingApp.getId() != null) {
+				updateApp(modifiedOnboardingApp.getId(), modifiedOnboardingApp, fieldsValidator, user);
 			} else {
 				fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_BAD_REQUEST);
 			}
@@ -953,7 +953,7 @@ public class EPAppCommonServiceImpl implements EPAppService {
 			validateOnboardingApp(newOnboardingApp, fieldsValidator);
 		}
 		if (fieldsValidator.httpStatusCode.intValue() == HttpServletResponse.SC_OK) {
-			if (newOnboardingApp.id == null) {
+			if (newOnboardingApp.getId() == null) {
 				updateApp(null, newOnboardingApp, fieldsValidator, user);
 			} else {
 				fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_BAD_REQUEST);
@@ -1211,7 +1211,7 @@ public class EPAppCommonServiceImpl implements EPAppService {
 		logger.debug(EELFLoggerDelegate.debugLogger, "LR: entering updateApp");
 		// Separate out the code for a restricted app, since it doesn't need any
 		// of the UEB code.
-		if (onboardingApp.restrictedApp) {
+		if (Boolean.TRUE.equals(onboardingApp.getRestrictedApp())) {
 			boolean result = false;
 			Session localSession = null;
 			Transaction transaction = null;
@@ -1234,7 +1234,7 @@ public class EPAppCommonServiceImpl implements EPAppService {
 				createAppFromOnboarding(app, onboardingApp, localSession);
 				localSession.saveOrUpdate(app);
 				// Enable or disable all menu items associated with this app
-				setFunctionalMenuItemsEnabled(localSession, onboardingApp.isEnabled, appId);
+				setFunctionalMenuItemsEnabled(localSession, onboardingApp.getIsEnabled(), appId);
 				transaction.commit();
 				result = true;
 			} catch (Exception e) {
@@ -1300,7 +1300,7 @@ public class EPAppCommonServiceImpl implements EPAppService {
 				logger.debug(EELFLoggerDelegate.debugLogger,
 						"updateRestrictedApp: finished calling localSession.saveOrUpdate");
 				// Enable or disable all menu items associated with this app
-				setFunctionalMenuItemsEnabled(localSession, onboardingApp.isEnabled, appId);
+				setFunctionalMenuItemsEnabled(localSession, onboardingApp.getIsEnabled(), appId);
 				logger.debug(EELFLoggerDelegate.debugLogger,
 						"updateRestrictedApp: finished calling setFunctionalMenuItemsEnabled");
 				transaction.commit();
@@ -1405,10 +1405,10 @@ public class EPAppCommonServiceImpl implements EPAppService {
 							topicManager.createTopic(
 									PortalApiProperties.getProperty(PortalApiConstants.UEB_APP_KEY),
 									PortalApiProperties.getProperty(PortalApiConstants.UEB_APP_SECRET),
-									appMailboxName, "ECOMP outbox for app" + onboardingApp.name);
+									appMailboxName, "ECOMP outbox for app" + onboardingApp.getAppName());
 							successfullyCreatedMailbox = true;
 							logger.debug(EELFLoggerDelegate.debugLogger,
-									"Successfully created " + appMailboxName + " for App " + onboardingApp.name);
+									"Successfully created " + appMailboxName + " for App " + onboardingApp.getAppName());
 							logger.debug(EELFLoggerDelegate.debugLogger, "    Key = " + appKey + " Secret = "
 									+ appSecret + " generated using = " + user.getEmail());
 							break;
@@ -1487,7 +1487,7 @@ public class EPAppCommonServiceImpl implements EPAppService {
 				logger.debug(EELFLoggerDelegate.debugLogger,
 						"LR: updateApp: finished calling localSession.saveOrUpdate");
 				// Enable or disable all menu items associated with this app
-				setFunctionalMenuItemsEnabled(localSession, onboardingApp.isEnabled, appId);
+				setFunctionalMenuItemsEnabled(localSession, onboardingApp.getIsEnabled(), appId);
 				logger.debug(EELFLoggerDelegate.debugLogger,
 						"LR: updateApp: finished calling setFunctionalMenuItemsEnabled");
 				transaction.commit();
@@ -1528,27 +1528,35 @@ public class EPAppCommonServiceImpl implements EPAppService {
 	 */
 	@Override
 	public void createOnboardingFromApp(EPApp app, OnboardingApp onboardingApp) {
-		onboardingApp.id = app.getId();
-		onboardingApp.name = app.getName();
-		onboardingApp.imageUrl = app.getImageUrl();
-		onboardingApp.description = app.getDescription();
-		onboardingApp.notes = app.getNotes();
-		onboardingApp.url = app.getUrl();
-		onboardingApp.alternateUrl = app.getAlternateUrl();
-		onboardingApp.restUrl = app.getAppRestEndpoint();
-		onboardingApp.isOpen = app.getOpen();
-		onboardingApp.isEnabled = app.getEnabled();
-		onboardingApp.username = app.getUsername();
-		onboardingApp.appPassword = (app.getAppPassword().equals(EPCommonSystemProperties.APP_DISPLAY_PASSWORD)) ? EPCommonSystemProperties.APP_DISPLAY_PASSWORD :decryptedPassword(app.getAppPassword(), app);
-		onboardingApp.uebTopicName = app.getUebTopicName();
-		onboardingApp.uebKey = app.getUebKey();
-		onboardingApp.uebSecret = app.getUebSecret();
-		onboardingApp.isCentralAuth = app.getCentralAuth();
-		onboardingApp.nameSpace = app.getNameSpace();
+		onboardingApp.setId(app.getId());
+		onboardingApp.setAppName(app.getName());
+		onboardingApp.setImageUrl(app.getImageUrl());
+		onboardingApp.setAppDescription(app.getAppDescription());
+		onboardingApp.setAppNotes(app.getAppNotes());
+		onboardingApp.setLandingPage(app.getLandingPage());
+		onboardingApp.setAlternateLandingPage(app.getAlternateLandingPage());
+		onboardingApp.setRestUrl(app.getAppRestEndpoint());
+		onboardingApp.setIsOpen(app.getOpen());
+		onboardingApp.setIsEnabled(app.getEnabled());
+		onboardingApp.setAppBasicAuthUsername(app.getAppBasicAuthUsername());
+		
+		String effectivePwd = null;
+		if (app.getAppBasicAuthPassword().equals(EPCommonSystemProperties.APP_DISPLAY_PASSWORD))
+			effectivePwd = EPCommonSystemProperties.APP_DISPLAY_PASSWORD;
+		else
+			effectivePwd = decryptedPassword(app.getAppBasicAuthPassword(), app);
+		
+		onboardingApp.setAppBasicAuthPassword(effectivePwd);
+		onboardingApp.setUebTopicName(app.getUebTopicName());
+		onboardingApp.setUebKey(app.getUebKey());
+		onboardingApp.setUebSecret(app.getUebSecret());
+		onboardingApp.setRolesInAAF(app.getRolesInAAF());
+		onboardingApp.setNameSpace(app.getNameSpace());
 		onboardingApp.setRestrictedApp(app.isRestrictedApp());
-		// if (app.getThumbnail() != null)
-		// onboardingApp.thumbnail = new
-		// String(Base64.getEncoder().encode(app.getThumbnail()));
+		onboardingApp.setModeOfIntegration(app.getModeOfIntegration());
+		onboardingApp.setAppAck(app.getAppAck());
+		onboardingApp.setUsesCadi(app.getUsesCadi());
+		onboardingApp.setApplicationType(app.getAppType().toString());
 	}
 
 	/**
@@ -1561,26 +1569,31 @@ public class EPAppCommonServiceImpl implements EPAppService {
 	 * @return The first argument.
 	 */
 	protected EPApp createAppFromOnboarding(EPApp app, OnboardingApp onboardingApp, Session localSession) {
-		app.setName(onboardingApp.name);
-		app.setDescription(onboardingApp.description);
-		app.setNotes(onboardingApp.notes);
-		app.setUrl(onboardingApp.url);
-		app.setAlternateUrl(onboardingApp.alternateUrl);
-		app.setAppRestEndpoint(onboardingApp.restUrl);
-		app.setOpen(onboardingApp.isOpen);
-		app.setEnabled(onboardingApp.isEnabled);
-		app.setUsername(onboardingApp.username);
-		if(!onboardingApp.appPassword.equals(EPCommonSystemProperties.APP_DISPLAY_PASSWORD))
-		app.setAppPassword(this.encryptedPassword(onboardingApp.appPassword, app));
+		app.setName(onboardingApp.getAppName());
+		app.setAppDescription(onboardingApp.getAppDescription());
+		app.setAppNotes(onboardingApp.getAppNotes());
+		app.setLandingPage(onboardingApp.getLandingPage());
+		app.setAlternateLandingPage(onboardingApp.getAlternateLandingPage());
+		app.setAppRestEndpoint(onboardingApp.getRestUrl());
+		app.setOpen(onboardingApp.getIsOpen());
+		app.setEnabled(onboardingApp.getIsEnabled());
+		app.setAppBasicAuthUsername(onboardingApp.getAppBasicAuthUsername());
+		if(!onboardingApp.getAppBasicAuthPassword().equals(EPCommonSystemProperties.APP_DISPLAY_PASSWORD))
+		app.setAppBasicAuthPassword(this.encryptedPassword(onboardingApp.getAppBasicAuthPassword(), app));
 		//app.setUebTopicName(onboardingApp.uebTopicName);
-		app.setUebKey(onboardingApp.uebKey);
-		app.setUebSecret(onboardingApp.uebSecret);
-		app.setCentralAuth(onboardingApp.isCentralAuth);
-		app.setNameSpace(onboardingApp.nameSpace);
-		app.setRestrictedApp(onboardingApp.restrictedApp);
-		if (!StringUtils.isEmpty(onboardingApp.thumbnail)) {
+		app.setUebKey(onboardingApp.getUebKey());
+		app.setUebSecret(onboardingApp.getUebSecret());
+		app.setRolesInAAF(onboardingApp.getRolesInAAF());
+		app.setNameSpace(onboardingApp.getNameSpace());
+		app.setAppType(new Integer(onboardingApp.getApplicationType()));		
+		app.setModeOfIntegration(onboardingApp.getModeOfIntegration());
+		app.setAppAck(onboardingApp.getAppAck());
+		app.setUsesCadi(onboardingApp.getUsesCadi());
+		
+		
+		if (!StringUtils.isEmpty(onboardingApp.getThumbnail())) {
 			logger.debug(EELFLoggerDelegate.debugLogger, "createAppFromOnboarding: onboarding thumbnail is NOT empty");
-			String[] splitBase64Thumbnail = onboardingApp.thumbnail.split("base64,");
+			String[] splitBase64Thumbnail = onboardingApp.getThumbnail().split("base64,");
 			logger.debug(EELFLoggerDelegate.debugLogger,
 					"createAppFromOnboarding: length of splitBase64Thumbnail: " + splitBase64Thumbnail.length);
 			if (splitBase64Thumbnail.length > 1) {
@@ -1592,7 +1605,7 @@ public class EPAppCommonServiceImpl implements EPAppService {
 				app.setImageUrl(constructImageName(onboardingApp));
 				app.setThumbnail(decodedImage);
 			}
-		} else if (app.getThumbnail() != null && onboardingApp.imageLink == null) {
+		} else if (app.getThumbnail() != null && onboardingApp.getImageLink() == null) {
 			// The thumbnail that came in from the json is empty; the previous
 			// thumbnail is NOT empty. Must delete it.
 			logger.debug(EELFLoggerDelegate.debugLogger,
@@ -1607,7 +1620,7 @@ public class EPAppCommonServiceImpl implements EPAppService {
 	}
 
 	protected String constructImageName(OnboardingApp onboardingApp) {
-		return "portal_" + String.valueOf(onboardingApp.url.hashCode() + "_" + (int) (Math.random() * 100000.0))
+		return "portal_" + String.valueOf(onboardingApp.getLandingPage().hashCode() + "_" + (int) (Math.random() * 100000.0))
 				+ ".png";
 	}
 
@@ -1929,9 +1942,11 @@ public class EPAppCommonServiceImpl implements EPAppService {
 		logger.debug(EELFLoggerDelegate.debugLogger, "checkIfNameSpaceExists: Connecting to External Auth system for : "+namespace);
 		ResponseEntity<String> response = null;
 		try {
-			response = template
-					.exchange(SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_URL)
-							+ "nss/" + namespace, HttpMethod.GET, entity, String.class);
+			
+			String namespaceUrl = SystemProperties.
+					getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_ACCESS_URL) + "nss/" + namespace;
+			
+			response = template.exchange(namespaceUrl, HttpMethod.GET, entity, String.class);
 			logger.debug(EELFLoggerDelegate.debugLogger, "checkIfNameSpaceExists for"+ namespace ,
 					response.getStatusCode().value());
 			if (response.getStatusCode().value() == 200) {
diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImpl.java
index 241468c3..ad06dd96 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImpl.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImpl.java
@@ -1183,13 +1183,13 @@ public class ExternalAccessRolesServiceImpl implements ExternalAccessRolesServic
                                 .setModified(epApp.getModified()).setCreatedId(epApp.getCreatedId())
                                 .setModifiedId(epApp.getModifiedId()).setRowNum(epApp.getRowNum())
                                 .setName(epApp.getName()).setImageUrl(epApp.getImageUrl())
-                                .setDescription(epApp.getDescription()).setNotes(epApp.getNotes())
-                                .setUrl(epApp.getUrl()).setAlternateUrl(epApp.getAlternateUrl())
+                                .setDescription(epApp.getAppDescription()).setNotes(epApp.getAppNotes())
+                                .setUrl(epApp.getLandingPage()).setAlternateUrl(epApp.getLandingPage())
                                 .setRestEndpoint(epApp.getAppRestEndpoint()).setMlAppName(epApp.getMlAppName())
                                 .setMlAppAdminId(epApp.getMlAppAdminId()).setMotsId(String.valueOf(epApp.getMotsId()))
-                                .setAppPassword(epApp.getAppPassword()).setOpen(String.valueOf(epApp.getOpen()))
+                                .setAppPassword(epApp.getAppBasicAuthPassword()).setOpen(String.valueOf(epApp.getOpen()))
                                 .setEnabled(String.valueOf(epApp.getEnabled())).setThumbnail(epApp.getThumbnail())
-                                .setUsername(epApp.getUsername()).setUebKey(epApp.getUebKey())
+                                .setUsername(epApp.getAppBasicAuthUsername()).setUebKey(epApp.getUebKey())
                                 .setUebSecret(epApp.getUebSecret()).setUebTopicName(epApp.getUebTopicName())
                                 .createCentralApp();
 						cenApp.setAppPassword(EPCommonSystemProperties.APP_DISPLAY_PASSWORD);
@@ -3005,7 +3005,7 @@ public class ExternalAccessRolesServiceImpl implements ExternalAccessRolesServic
 		params.put("uebKey", app.getUebKey());
 		List<BulkUploadUserRoles> userRolesList = null;
 		Integer userRolesAdded = 0;
-		if (app.getCentralAuth()) {
+		if (app.getRolesInAAF()) {
 			userRolesList = dataAccessService.executeNamedQuery("getBulkUserRoles", params, null);
 			for (BulkUploadUserRoles userRolesUpload : userRolesList) {
 				if (!userRolesUpload.getOrgUserId().equals("su1234")) {
@@ -3602,7 +3602,7 @@ public class ExternalAccessRolesServiceImpl implements ExternalAccessRolesServic
 		params.put("roleId", String.valueOf(roleId));
 		List<BulkUploadUserRoles> userRolesList = null;
 		Integer userRolesAdded = 0;
-		if (app.getCentralAuth()) {
+		if (app.getRolesInAAF()) {
 			userRolesList = dataAccessService.executeNamedQuery("getBulkUsersForSingleRole", params, null);
 			for (BulkUploadUserRoles userRolesUpload : userRolesList) {
 				userRolesUpload.setRoleName(modifiedRoleName);
diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/UserRolesCommonServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/UserRolesCommonServiceImpl.java
index 4924e654..db860057 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/UserRolesCommonServiceImpl.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/UserRolesCommonServiceImpl.java
@@ -376,7 +376,7 @@ public class UserRolesCommonServiceImpl  {
 								.setParameter("appId",appId)
 								.list();
 						for (EPRole role : roles) {
-							if (!extRequestValue && app.getCentralAuth()) {
+							if (!extRequestValue && app.getRolesInAAF()) {
 								rolesMap.put(role.getId(), role);
 							} else {
 								rolesMap.put(role.getAppRoleId(), role);
@@ -1091,7 +1091,7 @@ public class UserRolesCommonServiceImpl  {
 
 				Boolean systemUser = (newAppRolesForUser.getIsSystemUser() != null ? newAppRolesForUser.getIsSystemUser() : false);
 
-				if ((app.getCentralAuth() || app.getId().equals(PortalConstants.PORTAL_APP_ID)) && systemUser) {
+				if ((app.getRolesInAAF() || app.getId().equals(PortalConstants.PORTAL_APP_ID)) && systemUser) {
 
 					Set<EcompRole> userRolesInLocalApp = postUsersRolesToLocalApp(roleInAppForUserList, mapper,
 							applicationsRestClientService, appId, userId);
@@ -1108,12 +1108,12 @@ public class UserRolesCommonServiceImpl  {
 					result = applyChangesInUserRolesForAppToEcompDB(rolesInAppForUser, epRequestValue, "Portal",
 							systemUser,rolesGotDeletedByApprover,false);
 
-				}else if (!app.getCentralAuth() && systemUser)
+				}else if (!app.getRolesInAAF() && systemUser)
 				{
 					throw new Exception("For non-centralized application we cannot add systemUser");
 				}
 				else{	// if centralized app
-				if (app.getCentralAuth()) {
+				if (app.getRolesInAAF()) {
 					if (!app.getId().equals(PortalConstants.PORTAL_APP_ID)) {
 						pushRemoteUser(roleInAppForUserList, userId, app, mapper, searchService,
 									applicationsRestClientService,false);
@@ -1133,7 +1133,7 @@ public class UserRolesCommonServiceImpl  {
 					result = applyChangesInUserRolesForAppToEcompDB(rolesInAppForUser, epRequestValue, "Portal", systemUser,rolesGotDeletedFromApprover,checkIfUserisOnlyRoleAdmin);
 				} 
 				// In case if portal is not centralized then follow existing approach
-				else if(!app.getCentralAuth() && app.getId().equals(PortalConstants.PORTAL_APP_ID)){
+				else if(!app.getRolesInAAF() && app.getId().equals(PortalConstants.PORTAL_APP_ID)){
 					Set<EcompRole> userRolesInLocalApp = postUsersRolesToLocalApp(roleInAppForUserList, mapper,
 							applicationsRestClientService, appId, userId);	
 					RolesInAppForUser rolesInAppForUser = constructRolesInAppForUserUpdate(userId, appId,
@@ -1142,7 +1142,7 @@ public class UserRolesCommonServiceImpl  {
 					result = applyChangesInUserRolesForAppToEcompDB(rolesInAppForUser, epRequestValue, "Portal",false,rolesGotDeletedByApprover,false);
 				} else{// remote app
 					EPUser remoteAppUser = null;
-					if(!app.getCentralAuth() && !app.getId().equals(PortalConstants.PORTAL_APP_ID)){
+					if(!app.getRolesInAAF() && !app.getId().equals(PortalConstants.PORTAL_APP_ID)){
 						
 						remoteAppUser = checkIfRemoteUserExits(userId, app, applicationsRestClientService);
 		
@@ -1620,7 +1620,7 @@ public class UserRolesCommonServiceImpl  {
 				}
 				
 				//If Non-Centralized app make sure you sync app roles before assigning to user
-				if (!app.getId().equals(PortalConstants.PORTAL_APP_ID) && !app.getCentralAuth()) {
+				if (!app.getId().equals(PortalConstants.PORTAL_APP_ID) && !app.getRolesInAAF()) {
 					logger.debug(EELFLoggerDelegate.debugLogger, "setExternalRequestUserAppRole: Starting GET roles for app {}",app.getId());
 					EcompRole[] appRoles = applicationsRestClientService.get(EcompRole[].class, app.getId(), "/roles");
 					logger.debug(EELFLoggerDelegate.debugLogger, "setExternalRequestUserAppRole: Finshed GET roles for app {} and payload {}",app.getId(), appRoles);
@@ -1647,7 +1647,7 @@ public class UserRolesCommonServiceImpl  {
 							.anyMatch(roleList -> roleList.getRoleId().equals(PortalConstants.ACCOUNT_ADMIN_ROLE_ID));
 				}
 				// if Centralized app
-				if (app.getCentralAuth()) {
+				if (app.getRolesInAAF()) {
 					// We should add If user does not exist in remote application
 					try {
 						// If adding just account admin role dont make remote application user call or
@@ -1686,7 +1686,7 @@ public class UserRolesCommonServiceImpl  {
 					result = applyChangesInUserRolesForAppToEcompDB(rolesInAppForUser, externalSystemRequest, reqType,false,rolesGotDeletedByApprover,false);
 				} 
 				// If local application is not centralized 
-				else if(!app.getCentralAuth() && app.getId().equals(PortalConstants.PORTAL_APP_ID)){
+				else if(!app.getRolesInAAF() && app.getId().equals(PortalConstants.PORTAL_APP_ID)){
 					Set<EcompRole> userRolesInLocalApp = postUsersRolesToLocalApp(roleInAppForUserList, mapper,
 							applicationsRestClientService, app.getId(), orgUserId);	
 					RolesInAppForUser rolesInAppForUser = constructRolesInAppForUserUpdate(orgUserId, app.getId(),
@@ -1896,7 +1896,7 @@ public class UserRolesCommonServiceImpl  {
 		// for onap portal app, no need to make a remote call
 		List<Role> roleList = new ArrayList<>();
 		if (appId == PortalConstants.PORTAL_APP_ID) {		
-			if(app.getCentralAuth()){
+			if(app.getRolesInAAF()){
 				List<CentralV2Role> cenRoleList = externalAccessRolesService.getRolesForApp(app.getUebKey());
 				for(CentralV2Role cenRole : cenRoleList){
 					Role role = new Role();
@@ -1935,7 +1935,7 @@ public class UserRolesCommonServiceImpl  {
 		EcompRole[] appRoles = null;
 		boolean checkIfUserisApplicationAccAdmin = false;
 		List<EcompRole> roles = new ArrayList<>();
-			if (app.getCentralAuth()) {
+			if (app.getRolesInAAF()) {
 				final Map<String, Long> appParams = new HashMap<>();
 				appParams.put("appId", app.getId());
 				List<EPRole> applicationRoles = dataAccessService.executeNamedQuery("getActiveRolesOfApplication",
@@ -2038,14 +2038,14 @@ public class UserRolesCommonServiceImpl  {
 		// If there is an exception in the rest client api, then null will
 		// be returned.
 		if (appRoles != null) {
-			if(!app.getCentralAuth()) {
+			if(!app.getRolesInAAF()) {
 			syncAppRoles(sessionFactory, appId, appRoles);
 			}
 			EcompRole[] userAppRoles = null;
 			try {
 				try {
 					
-					if(app.getCentralAuth()){
+					if(app.getRolesInAAF()){
 						final Map<String, String> params = new HashMap<>();
 						final Map<String, Long> userParams = new HashMap<>();
 						params.put("orgUserIdValue", userId);
@@ -2315,7 +2315,7 @@ public class UserRolesCommonServiceImpl  {
 		
 		EPApp app = appsService.getApp(appId);
 		//If local or centralized application
-		if (appId == PortalConstants.PORTAL_APP_ID || app.getCentralAuth()) {
+		if (appId == PortalConstants.PORTAL_APP_ID || app.getRolesInAAF()) {
 			Map<String, Object> params = new HashMap<>();
 			params.put("id", app.getId());
 			params.put("active", true);
diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/transport/OnboardingApp.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/transport/OnboardingApp.java
index 37ad5add..d1b2a568 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/transport/OnboardingApp.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/transport/OnboardingApp.java
@@ -38,6 +38,7 @@
 package org.onap.portalapp.portal.transport;
 
 import org.hibernate.validator.constraints.SafeHtml;
+import org.onap.portalapp.portal.domain.EpAppType;
 
 /**
  * Model of rows in the fn_app table; serialized as a message add or update an
@@ -45,81 +46,301 @@ import org.hibernate.validator.constraints.SafeHtml;
  */
 public class OnboardingApp {
 
-	public Long id;
+	private Long id;
 	@SafeHtml
-	public String name;
+	private String appName;
 	@SafeHtml
-	public String imageUrl;
+	private String imageUrl;
 	@SafeHtml
-	public String imageLink;
+	private String imageLink;
 	@SafeHtml
-	public String description;
+	private String appDescription;
 	@SafeHtml
-	public String notes;
+	private String appNotes;
 	@SafeHtml
-	public String url;
+	private String landingPage;
 	@SafeHtml
-	public String alternateUrl;
+	private String alternateLandingPage;
 	@SafeHtml
-	public String restUrl;
+	private String restUrl;
 
-	public Boolean isOpen;
+	@SafeHtml
+	private String applicationType;
+	
+	private Boolean isOpen;
 
-	public Boolean isEnabled;
+	private Boolean isEnabled;
 
-	public Long motsId;
+	private Long motsId;
 	@SafeHtml
-	public String myLoginsAppName;
+	private String myLoginsAppName;
 	@SafeHtml
-	public String myLoginsAppOwner;
+	private String myLoginsAppOwner;
 	@SafeHtml
-	public String username;
+	private String appBasicAuthUsername;
 	@SafeHtml
-	public String appPassword;
+	private String appBasicAuthPassword;
 	@SafeHtml
-	public String thumbnail;
+	private String thumbnail;
 	@SafeHtml
-	public String uebTopicName;
+	private String uebTopicName;
 	@SafeHtml
-	public String uebKey;
+	private String uebKey;
 	@SafeHtml
-	public String uebSecret;
+	private String uebSecret;
 
-	public Boolean restrictedApp;
+	private Boolean restrictedApp;
 	
-	public Boolean isCentralAuth;
+	private Boolean rolesInAAF;
+	@SafeHtml
+	private String nameSpace;
+
 	@SafeHtml
-	public String nameSpace;
+	private String modeOfIntegration;
 
+	private Boolean appAck;
+
+	private Boolean usesCadi;
+	
 	/**
 	 * Sets the name, myLoginsAppName, myLoginsAppOwner, username and
 	 * appPassword fields to the empty string OR trims leading/trailing space,
 	 * as appropriate.
 	 */
 	public void normalize() {
-		this.name = (this.name == null) ? "" : this.name.trim();
+		this.appName = (this.appName == null) ? "" : this.appName.trim();
 		this.myLoginsAppName = (this.myLoginsAppName == null) ? "" : this.myLoginsAppName.trim();
 		this.myLoginsAppOwner = (this.myLoginsAppOwner == null) ? "" : this.myLoginsAppOwner.trim();
-		this.username = (this.username == null) ? "" : this.username.trim();
-		this.appPassword = (this.appPassword == null) ? "" : this.appPassword.trim();
+		this.appBasicAuthUsername = (this.appBasicAuthUsername == null) ? "" : this.appBasicAuthUsername.trim();
+		this.appBasicAuthPassword = (this.appBasicAuthPassword == null) ? "" : this.appBasicAuthPassword.trim();
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getAppName() {
+		return appName;
+	}
+
+	public void setAppName(String appName) {
+		this.appName = appName;
+	}
+
+	public String getImageUrl() {
+		return imageUrl;
+	}
+
+	public void setImageUrl(String imageUrl) {
+		this.imageUrl = imageUrl;
+	}
+
+	public String getImageLink() {
+		return imageLink;
+	}
+
+	public void setImageLink(String imageLink) {
+		this.imageLink = imageLink;
+	}
+
+	public String getAppDescription() {
+		return appDescription;
+	}
+
+	public void setAppDescription(String appDescription) {
+		this.appDescription = appDescription;
+	}
+
+	public String getAppNotes() {
+		return appNotes;
+	}
+
+	public void setAppNotes(String appNotes) {
+		this.appNotes = appNotes;
+	}
+
+	public String getLandingPage() {
+		return landingPage;
+	}
+
+	public void setLandingPage(String landingPage) {
+		this.landingPage = landingPage;
 	}
 
-	public void setUebTopicName(String topicName) {
-		this.uebTopicName = topicName;
+	public String getAlternateLandingPage() {
+		return alternateLandingPage;
 	}
 
-	public void setUebKey(String key) {
-		this.uebKey = key;
+	public void setAlternateLandingPage(String alternateLandingPage) {
+		this.alternateLandingPage = alternateLandingPage;
 	}
 
-	public void setUebSecret(String secret) {
-		this.uebSecret = secret;
+	public String getRestUrl() {
+		return restUrl;
 	}
 
-	// Hide the implementation of restricted and normal app from the front end.
-	// The json sent and received will include restrictedApp but not appType.
+	public void setRestUrl(String restUrl) {
+		this.restUrl = restUrl;
+	}
+
+	public Boolean getIsOpen() {
+		return isOpen;
+	}
+
+	public void setIsOpen(Boolean isOpen) {
+		this.isOpen = isOpen;
+	}
+
+	public Boolean getIsEnabled() {
+		return isEnabled;
+	}
+
+	public void setIsEnabled(Boolean isEnabled) {
+		this.isEnabled = isEnabled;
+	}
+
+	public Long getMotsId() {
+		return motsId;
+	}
+
+	public void setMotsId(Long motsId) {
+		this.motsId = motsId;
+	}
+
+	public String getMyLoginsAppName() {
+		return myLoginsAppName;
+	}
+
+	public void setMyLoginsAppName(String myLoginsAppName) {
+		this.myLoginsAppName = myLoginsAppName;
+	}
+
+	public String getMyLoginsAppOwner() {
+		return myLoginsAppOwner;
+	}
+
+	public void setMyLoginsAppOwner(String myLoginsAppOwner) {
+		this.myLoginsAppOwner = myLoginsAppOwner;
+	}
+
+	public String getAppBasicAuthUsername() {
+		return appBasicAuthUsername;
+	}
+
+	public void setAppBasicAuthUsername(String appBasicAuthUsername) {
+		this.appBasicAuthUsername = appBasicAuthUsername;
+	}
+
+	public String getAppBasicAuthPassword() {
+		return appBasicAuthPassword;
+	}
+
+	public void setAppBasicAuthPassword(String appBasicAuthPassword) {
+		this.appBasicAuthPassword = appBasicAuthPassword;
+	}
+
+	public String getThumbnail() {
+		return thumbnail;
+	}
+
+	public void setThumbnail(String thumbnail) {
+		this.thumbnail = thumbnail;
+	}
+
+	public String getUebTopicName() {
+		return uebTopicName;
+	}
+
+	public void setUebTopicName(String uebTopicName) {
+		this.uebTopicName = uebTopicName;
+	}
+
+	public String getUebKey() {
+		return uebKey;
+	}
+
+	public void setUebKey(String uebKey) {
+		this.uebKey = uebKey;
+	}
+
+	public String getUebSecret() {
+		return uebSecret;
+	}
+
+	public void setUebSecret(String uebSecret) {
+		this.uebSecret = uebSecret;
+	}
+
+	public Boolean getRestrictedApp() {
+		return restrictedApp;
+	}
 
 	public void setRestrictedApp(Boolean restrictedApp) {
 		this.restrictedApp = restrictedApp;
 	}
+
+	public Boolean getRolesInAAF() {
+		return rolesInAAF;
+	}
+
+	public void setRolesInAAF(Boolean rolesInAAF) {
+		this.rolesInAAF = rolesInAAF;
+	}
+
+	public String getNameSpace() {
+		return nameSpace;
+	}
+
+	public void setNameSpace(String nameSpace) {
+		this.nameSpace = nameSpace;
+	}
+
+	public String getModeOfIntegration() {
+		return modeOfIntegration;
+	}
+
+	public void setModeOfIntegration(String modeOfIntegration) {
+		this.modeOfIntegration = modeOfIntegration;
+	}
+
+	public Boolean getAppAck() {
+		return appAck;
+	}
+
+	public void setAppAck(Boolean appAck) {
+		this.appAck = appAck;
+	}
+
+	public Boolean getUsesCadi() {
+		return usesCadi;
+	}
+
+	public void setUsesCadi(Boolean usesCadi) {
+		this.usesCadi = usesCadi;
+	}
+
+	public String getApplicationType() {
+		return applicationType;
+	}
+
+	public void setApplicationType(String applicationType) {
+		this.applicationType = applicationType;
+	}
+	
+	public Integer appTypePersistedValue() {
+		switch (this.getApplicationType()) {
+		case EpAppType.GUI_STR:
+			return EpAppType.GUI;
+		case EpAppType.HYPERLINK_STR:
+			return EpAppType.HYPERLINK;
+		case EpAppType.NONGUI_STR:
+			return EpAppType.NONGUI;
+		default:
+			return 0;
+		}
+	}
 }
diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/service/sessionmgt/SessionCommunication.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/service/sessionmgt/SessionCommunication.java
index 14616b31..441e99a7 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/service/sessionmgt/SessionCommunication.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/service/sessionmgt/SessionCommunication.java
@@ -85,12 +85,12 @@ public class SessionCommunication {
 		String appResponse = "";
 		String appName = "";
 		int responseCode = 0;
-		if (app != null && app.name != null && app.name != "") {
+		if (app != null && app.getAppName() != null && app.getAppName() != "") {
 			try {
-				appName = app.name;
-				String url = app.restUrl + "/sessionTimeOuts";
-				String encriptedPwdDB = app.appPassword;
-				String appUserName = app.username;
+				appName = app.getAppName();
+				String url = app.getRestUrl() + "/sessionTimeOuts";
+				String encriptedPwdDB = app.getAppBasicAuthPassword();
+				String appUserName = app.getAppBasicAuthUsername();
 
 				setLocalMDCContext(app, "/sessionTimeOuts", url);
 
@@ -157,12 +157,12 @@ public class SessionCommunication {
 		try {
 			if (app == null)
 				throw new Exception("SessionCommunication.pingSession: app is null");
-			if (app != null && app.name != null && app.name != "") {
-				appName = app.name;
+			if (app != null && app.getAppName() != null && app.getAppName() != "") {
+				appName = app.getAppName();
 			}
-			String url = app.restUrl + "/updateSessionTimeOuts";
-			String encriptedPwdDB = app.appPassword;
-			String appUserName = app.username;
+			String url = app.getRestUrl() + "/updateSessionTimeOuts";
+			String encriptedPwdDB = app.getAppBasicAuthPassword();
+			String appUserName = app.getAppBasicAuthUsername();
 
 			setLocalMDCContext(app, "/updateSessionTimeOuts", url);
 
@@ -218,13 +218,13 @@ public class SessionCommunication {
 	public Boolean timeoutSession(OnboardingApp app, String portalJSessionId) throws Exception {
 		String appName = "Unknwon";
 		int responseCode = 0;
-		if (app != null && app.name != null && app.name != "") {
+		if (app != null && app.getAppName() != null && app.getAppName() != "") {
 			try {
-				appName = app.name;
-				String url = app.restUrl + "/timeoutSession" + "?portalJSessionId=" + portalJSessionId;
+				appName = app.getAppName();
+				String url = app.getRestUrl() + "/timeoutSession" + "?portalJSessionId=" + portalJSessionId;
 
-				String encriptedPwdDB = app.appPassword;
-				String appUserName = app.username;
+				String encriptedPwdDB = app.getAppBasicAuthPassword();
+				String appUserName = app.getAppBasicAuthUsername();
 				// String decreptedPwd = CipherUtil.decrypt(encriptedPwdDB,
 				// SystemProperties.getProperty(SystemProperties.Decryption_Key));
 
@@ -287,7 +287,7 @@ public class SessionCommunication {
 			MDC.put(EPCommonSystemProperties.PROTOCOL, EPCommonSystemProperties.HTTPS);
 		}
 		MDC.put(EPCommonSystemProperties.FULL_URL, url);
-		MDC.put(EPCommonSystemProperties.TARGET_ENTITY, app.myLoginsAppName);
+		MDC.put(EPCommonSystemProperties.TARGET_ENTITY, app.getMyLoginsAppName());
 		MDC.put(EPCommonSystemProperties.TARGET_SERVICE_NAME, restPath);
 	}
 
@@ -332,15 +332,15 @@ public class SessionCommunication {
 		 Map<String,String> headersMap = new HashMap<>();
 		EPApp externalApp = null;
 
-		if(app.appPassword.isEmpty() || app.appPassword==null){
+		if(app.getAppBasicAuthPassword().isEmpty() || app.getAppBasicAuthPassword()==null){
 			logger.debug(EELFLoggerDelegate.debugLogger, "Entering in the externalApp get app password contains null : {}");
 			externalApp = appsCacheService.getApp(1L);
 			logger.debug(EELFLoggerDelegate.debugLogger, "external App Information : {}",externalApp);
 
-			String mechidUsername=externalApp.getUsername();
+			String mechidUsername=externalApp.getAppBasicAuthUsername();
 			logger.debug(EELFLoggerDelegate.debugLogger, "external App mechidUsername Information : {}",mechidUsername);
 
-			String password=externalApp.getAppPassword();
+			String password=externalApp.getAppBasicAuthPassword();
 			String decreptedexternalAppPwd = StringUtils.EMPTY;
 			try {
 				decreptedexternalAppPwd = CipherUtil.decryptPKC(password,
@@ -353,8 +353,8 @@ public class SessionCommunication {
 			encriptedPwdDB = decreptedexternalAppPwd;
 		
 		}else{
-			appUserName = app.username;
-			encriptedPwdDB = app.appPassword;
+			appUserName = app.getAppBasicAuthUsername();
+			encriptedPwdDB = app.getAppBasicAuthPassword();
 		}
 		
 		headersMap.put("username", appUserName);
diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/service/sessionmgt/TimeoutHandler.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/service/sessionmgt/TimeoutHandler.java
index a60266cf..2b8d6d43 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/service/sessionmgt/TimeoutHandler.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/service/sessionmgt/TimeoutHandler.java
@@ -132,19 +132,19 @@ public class TimeoutHandler extends QuartzJobBean {
 			Map<Long, Map<String, TimeoutVO>> appSessionTimeOutMap = new Hashtable<Long, Map<String, TimeoutVO>>();
 			// determine the Max TimeOut Time for each of the managed sessions
 			for (OnboardingApp app : appList) {
-				if (app.restUrl == null) {
-					logger.info(EELFLoggerDelegate.debugLogger, "Session Management: null restUrl, not fetching from app " + app.name);
+				if (app.getRestUrl() == null) {
+					logger.info(EELFLoggerDelegate.debugLogger, "Session Management: null restUrl, not fetching from app " + app.getAppName());
 					continue;
 				}
-				logger.info(EELFLoggerDelegate.debugLogger, "Session Management: Calling App " + app.name + " at URL " + app.restUrl);
+				logger.info(EELFLoggerDelegate.debugLogger, "Session Management: Calling App " + app.getAppName() + " at URL " + app.getRestUrl());
 				String jsonSessionStr = fetchAppSessions(app);
-				logger.info(EELFLoggerDelegate.debugLogger, "Session Management: App " + app.name + " returned  " + jsonSessionStr);
+				logger.info(EELFLoggerDelegate.debugLogger, "Session Management: App " + app.getAppName() + " returned  " + jsonSessionStr);
 				if (jsonSessionStr == null || jsonSessionStr.isEmpty())
 					continue;
 
 				try {
 					Map<String, TimeoutVO> sessionTimeoutMap = mapper.readValue(jsonSessionStr, typeRef);
-					appSessionTimeOutMap.put(app.id, sessionTimeoutMap);
+					appSessionTimeOutMap.put(app.getId(), sessionTimeoutMap);
 					for (String portalJSessionId : sessionTimeoutMap.keySet()) {
 						final TimeoutVO maxTimeoutVO = portalSessionTimeoutMap.get(portalJSessionId);
 						final TimeoutVO compareTimeoutVO = sessionTimeoutMap.get(portalJSessionId);
@@ -168,12 +168,12 @@ public class TimeoutHandler extends QuartzJobBean {
 
 			// post the updated session timeouts back to the Apps
 			for (OnboardingApp app : appList) {
-				if (app.restUrl == null) {
-					logger.warn(EELFLoggerDelegate.errorLogger, "Session Management: null restUrl, not posting back to app " + app.name);
+				if (app.getRestUrl() == null) {
+					logger.warn(EELFLoggerDelegate.errorLogger, "Session Management: null restUrl, not posting back to app " + app.getAppName());
 					continue;
 				}
 
-				Map<String, TimeoutVO> sessionTimeoutMap = appSessionTimeOutMap.get(app.id);
+				Map<String, TimeoutVO> sessionTimeoutMap = appSessionTimeOutMap.get(app.getId());
 				if (sessionTimeoutMap == null || sessionTimeoutMap.isEmpty())
 					continue;
 
@@ -184,7 +184,7 @@ public class TimeoutHandler extends QuartzJobBean {
 						if (maxTimeoutVO == null || setTimeoutVO == null) {
 							String message = String.format(
 									"Session Management: Failed to update the session timeouts for the app: %s and the sessionId: %s.",
-									app.name, portalJSessionId);
+									app.getAppName(), portalJSessionId);
 							logger.warn(EELFLoggerDelegate.errorLogger, message);
 							continue;
 						}
@@ -194,7 +194,7 @@ public class TimeoutHandler extends QuartzJobBean {
 						continue;
 					}
 				}
-				logger.info(EELFLoggerDelegate.debugLogger, "Session Management: Updating App " + app.restUrl);
+				logger.info(EELFLoggerDelegate.debugLogger, "Session Management: Updating App " + app.getRestUrl());
 				String sessionTimeoutMapStr = "";
 				try {
 					sessionTimeoutMapStr = mapper.writeValueAsString(sessionTimeoutMap);
diff --git a/ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/orm/EP.hbm.xml b/ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/orm/EP.hbm.xml
index 961006cc..5401ee95 100644
--- a/ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/orm/EP.hbm.xml
+++ b/ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/orm/EP.hbm.xml
@@ -328,10 +328,10 @@
 			<column name="app_name" not-null="true" default="?"></column>
 		</property>
 		<property name="imageUrl" column="app_image_url" />
-		<property name="description" column="app_description" />
-		<property name="notes" column="app_notes" />
-		<property name="url" column="app_url" />
-		<property name="alternateUrl" column="app_alternate_url" />
+		<property name="appDescription" column="app_description" />
+		<property name="appNotes" column="app_notes" />
+		<property name="landingPage" column="app_url" />
+		<property name="alternateLandingPage" column="app_alternate_url" />
 		<property name="appRestEndpoint" column="app_rest_endpoint" />
 		<property name="mlAppName" type="string">
 			<column name="ml_app_name" not-null="true" default="?"></column>
@@ -340,11 +340,11 @@
 			<column name="ml_app_admin_id" not-null="true" default="?"></column>
 		</property>
 		<property name="motsId" column="mots_id" />
-		<property name="appPassword" type="string">
+		<property name="appBasicAuthPassword" type="string">
 			<column name="app_password" not-null="true" default="?"></column>
 		</property>
 		<property name="thumbnail" column="thumbnail" />
-		<property name="username" type="string">
+		<property name="appBasicAuthUsername" type="string">
 			<column name="app_username" not-null="true" default="?"></column>
 		</property>
 		<property name="open" type="yes_no">
@@ -365,12 +365,22 @@
 		<property name="appType" type="integer">
 			<column name="app_type"></column>
 		</property>
-		<property name="centralAuth" type="yes_no">
+		<property name="rolesInAAF" type="yes_no">
 			<column name="auth_central"></column>
 		</property>
 		<property name="nameSpace" type="string">
 			<column name="auth_namespace"></column>
 		</property>
+		<property name="modeOfIntegration" type="string">
+			<column name="mode_of_integration"></column>
+		</property>
+		<property name="appAck" type="yes_no">
+			<column name="ack_app"></column>
+		</property>
+		<property name="usesCadi" type="yes_no">
+			<column name="uses_cadi"></column>
+		</property>
+
 		<one-to-one name="contactUs" class="AppContactUs" cascade="save-update"></one-to-one>
 
 	</class>
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";