diff options
| author |   Kishore Reddy, Gujja (kg811t) <kishore.reddy.gujja@att.com> | 2018-10-12 16:53:15 -0400 |
|---|---|---|
| committer | Kishore Reddy, Gujja (kg811t) <kishore.reddy.gujja@att.com> | 2018-10-12 16:55:08 -0400 |
| commit | 1c3cc6fb0e4d2f4f2278240ff0387596c776b9c9 (patch) | |
| tree | 0886d1c0a36056fbc790b200b3c759e4368505c6 | |
| parent | 2c658b3e35fa4f0c7b87bbd211de6bedbbe13852 (diff) | |
ExtAccessRolesServiceImpl.class and sql2.3.0
Issue-ID: PORTAL-389
Fixed AAF sync roles to onap portal
Change-Id: Ibd36737deda72fe7c6984c89001d72ca1a5126c5
Signed-off-by: Kishore Reddy, Gujja (kg811t) <kishore.reddy.gujja@att.com>
| -rw-r--r-- | ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImpl.java | 4 | ||||
| -rw-r--r-- | ecomp-portal-DB-common/PortalDDLMySql_2_1_Common.sql | 2 |
2 files changed, 2 insertions, 4 deletions
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 f83a8e34..c528e55e 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 @@ -841,6 +841,7 @@ public class ExternalAccessRolesServiceImpl implements ExternalAccessRolesServic if (EcompPortalUtils.checkIfRemoteCentralAccessAllowed()) { addNewRoleInExternalSystem(getRoleCreated, app); } + result = true; } else { // if role already exists then update it EPRole globalRole = null; List<EPRole> applicationRoles; @@ -2819,9 +2820,6 @@ public class ExternalAccessRolesServiceImpl implements ExternalAccessRolesServic JSONObject Role = (JSONObject) extRole.get(i); String name = extRole.getJSONObject(i).getString(ROLE_NAME); String actualRoleName = name.substring(app.getNameSpace().length() + 1); - if (extRole.getJSONObject(i).has(EXTERNAL_AUTH_ROLE_DESCRIPTION)) { - actualRoleName = extRole.getJSONObject(i).getString(EXTERNAL_AUTH_ROLE_DESCRIPTION); - } SortedSet<ExternalAccessPerms> externalAccessPermsOfRole = new TreeSet<>(); if (extRole.getJSONObject(i).has(EXTERNAL_AUTH_PERMS)) { JSONArray extPerm = (JSONArray) Role.get(EXTERNAL_AUTH_PERMS); diff --git a/ecomp-portal-DB-common/PortalDDLMySql_2_1_Common.sql b/ecomp-portal-DB-common/PortalDDLMySql_2_1_Common.sql index cabca678..6cb26434 100644 --- a/ecomp-portal-DB-common/PortalDDLMySql_2_1_Common.sql +++ b/ecomp-portal-DB-common/PortalDDLMySql_2_1_Common.sql @@ -1280,7 +1280,7 @@ create table ep_endpoints_basic_auth_account ( CREATE TABLE ep_app_function ( app_id INT(11) NOT NULL, function_cd VARCHAR(250) NOT NULL, -function_name VARCHAR(50) NOT NULL, +function_name VARCHAR(250) NOT NULL, PRIMARY KEY (function_cd, app_id), INDEX fk_ep_app_function_app_id (app_id), CONSTRAINT fk_ep_app_function_app_id FOREIGN KEY (app_id) REFERENCES fn_app (app_id) |