From e43e03d4da9bd760d67d746a949efbb7e5d102a8 Mon Sep 17 00:00:00 2001 From: "Christopher Lott (cl778h)" Date: Fri, 25 Aug 2017 15:31:33 -0400 Subject: Enable junit test cases and fix defects. Clean internal company domain names. Repair defect for picking Role in Widget onboarding for assigned app. Issue: PORTAL-50, PORTAL-82, PORTAL-86 Change-Id: I0826ddbfad1dc8a9bb6f3b8096b9748f887c1c65 Signed-off-by: Christopher Lott (cl778h) --- .../portalapp/portal/service/EPAppCommonServiceImpl.java | 15 +++++++++++++++ .../portal/controller/shared-context-test.properties | 6 +++--- 2 files changed, 18 insertions(+), 3 deletions(-) (limited to 'ecomp-portal-BE-common') diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPAppCommonServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPAppCommonServiceImpl.java index 6a0da9ba..b51ea1a1 100644 --- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPAppCommonServiceImpl.java +++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPAppCommonServiceImpl.java @@ -770,6 +770,21 @@ public class EPAppCommonServiceImpl implements EPAppService { logQuery(sql); query = localSession.createSQLQuery(sql); query.executeUpdate(); + + + // Remove all roles, rolefunctions, appid records from ep_app_role_function + // that are associated with this app + sql = "DELETE FROM ep_app_role_function WHERE app_id='" + appid + "'"; + logger.debug(EELFLoggerDelegate.debugLogger, "Executing query: " + sql); + query = localSession.createSQLQuery(sql); + query.executeUpdate(); + + //Remove all rolefunctions, appid records from ep_app_function + // that are associated with this app + sql = "DELETE FROM ep_app_function WHERE app_id='" + appid + "'"; + logger.debug(EELFLoggerDelegate.debugLogger, "Executing query: " + sql); + query = localSession.createSQLQuery(sql); + query.executeUpdate(); // Remove all records from fn_user_role associated with this app sql = "delete from fn_user_role where app_id='" + appid + "'"; diff --git a/ecomp-portal-BE-common/src/test/java/org/openecomp/portalapp/portal/controller/shared-context-test.properties b/ecomp-portal-BE-common/src/test/java/org/openecomp/portalapp/portal/controller/shared-context-test.properties index f6315ab5..d527c522 100644 --- a/ecomp-portal-BE-common/src/test/java/org/openecomp/portalapp/portal/controller/shared-context-test.properties +++ b/ecomp-portal-BE-common/src/test/java/org/openecomp/portalapp/portal/controller/shared-context-test.properties @@ -18,11 +18,11 @@ # ================================================================================ ### -hostname= ecomp.homer.att.com +hostname= www.portal.onap.org # port = 80 secure = true appname = ecompportal restpath = context uebkey = xgnLrmNmkfCRnIwa -username = Default -password = AppPassword!1 +username = username +password = password -- cgit 1.2.3-korg