ExtAccessRolesServiceImpl.class and sql

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>

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 f83a8e3..c528e55 100644 (file)
--- 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);
                                }
                                if (EcompPortalUtils.checkIfRemoteCentralAccessAllowed()) {
                                        addNewRoleInExternalSystem(getRoleCreated, app);
                                }

+                               result = true;

                        } else { // if role already exists then update it
                                EPRole globalRole = null;
                                List<EPRole> applicationRoles;
                        } 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); 
                        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);
                        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 cabca67..6cb2643 100644 (file)
--- 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,
 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)
 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)