Merge "Add roles to user"

3 files changed, 14 insertions, 20 deletions

diff --git a/ecomp-portal-BE-os/README.md b/ecomp-portal-BE-os/README.md
index 682dbfce..7f4358f4 100644
--- a/ecomp-portal-BE-os/README.md
+++ b/ecomp-portal-BE-os/README.md
@@ -44,6 +44,8 @@ Version 2.2
 - [Portal-220] Fix to delete a portal admin, removed the OS test case
 - [Portal-248] Id value fix in in Add App Account Management modal
 - [Portal-211] High memory Usage by Portal, SDK, Cassandra
+- [Portal-202] Remove files that have GPL or other license issues - b2b-library.min.js
+- [Portal-432]Push userroles even if the app is centralized(ASDC)
 
 Version 1.1.0 (Amsterdam), November 2017
 - [Portal-6] Updates to License and Trademark in the PORTAL Source Code
diff --git a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
index e9c48251..ac7c3f72 100644
--- a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
+++ b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
@@ -162,23 +162,15 @@ public class ExternalAppConfig extends AppConfig implements Configurable {
 			MDC.put(MDC_ALERT_SEVERITY, AlarmSeverityEnum.INFORMATIONAL.severity());
 			MDC.put(MDC_INSTANCE_UUID, SystemProperties.getProperty(SystemProperties.INSTANCE_UUID));
 			
-			//			if("true".equalsIgnoreCase(remotecentralizedsystemaccess)){
-			//				importFromExternalAuth();
-			//			}			
+			if("true".equalsIgnoreCase(remotecentralizedsystemaccess)){
+				importFromExternalAuth();
+			}			
 		} catch (Exception e) {
 			logger.error(EELFLoggerDelegate.errorLogger, "init failed", e);
 		}
 	}
 
-	/**
-	 * Does a sync on functions, roles and role functions based on namespace 
-	 * for all the centralized applications between AAF and ONAP, updates
-	 * fn_user and fn_user_role with user information from AAF.
-	 * 
-	 * This is being handled in AAF directly, so it has been deprecated
-	 * 
-	 */
-	@Deprecated
+	
 	private void importFromExternalAuth() throws Exception {
 		JSONArray aafAppRoles = new JSONArray();
 		JSONArray aafUserList = new JSONArray();
@@ -195,8 +187,8 @@ public class ExternalAppConfig extends AppConfig implements Configurable {
 					for(int j = 0; j < aafAppRoles.length(); j++){
 						ObjectMapper mapper = new ObjectMapper();
 						String name = aafAppRoles.getJSONObject(j).getString("name");
-						String desc = aafAppRoles.getJSONObject(j).getString("description");
-						ExternalRoleDescription externalRoleDescription = mapper.readValue(desc, ExternalRoleDescription.class);
+						//String desc = aafAppRoles.getJSONObject(j).getString("description");
+						//ExternalRoleDescription externalRoleDescription = mapper.readValue(desc, ExternalRoleDescription.class);
 						aafUserList = externalAccessRolesService.getAllUsersByRole(name);	
 						if(aafUserList != null && aafUserList.length() > 0){
 							for(int k = 0; k < aafUserList.length(); k++){
diff --git a/ecomp-portal-BE-os/src/main/resources/music.properties b/ecomp-portal-BE-os/src/main/resources/music.properties
index fdf6e499..87c4c942 100644
--- a/ecomp-portal-BE-os/src/main/resources/music.properties
+++ b/ecomp-portal-BE-os/src/main/resources/music.properties
@@ -12,19 +12,19 @@ music.atomic.put = false
 music.cleanup.frequency = 6
 #how old of session need to be cleaned up (hour)
 music.cleanup.threshold = 10
-cassandra.host=135.197.226.103
-zookeeper.host=135.197.226.103, 135.197.226.108, 135.197.226.119
+cassandra.host=localhost
+zookeeper.host=localhost
 cassandra.user=cassandra
 cassandra.password=cassandra
 
 #Music API 
-#music.endpoint = http://vm-ep-dev4.research.att.com/MUSIC/rest/
+#music.endpoint = localhost
 #music.version = v2
 #music.keyspace = keyspaces
 #music.x.minor.version = 3
 #music.x.patch.version = 0 
-#music.ns = com.att.ecomp.portal.demeter
-#music.user.id = m00468@portal.ecomp.att.com
-#music.password = friedG33nS-
+#music.ns = org.onap.portal
+#music.user.id = xxxxxx@portal.onap.org
+#music.password = xxxxxx
 #music.consistency.info = type
 #music.consistency.info.value = eventual
\ No newline at end of file