X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Faaf%2FAafService.java;h=9d8776ad18245966269c7def24d8a0e1a334834e;hb=2127de5e112223a7871022b9dc67f1e3f8a4362e;hp=112ab111617265bf40af2a04383113b856ac1de0;hpb=cc850447295af953bdcf07521130555d8a877e85;p=dmaap%2Fdbcapi.git

diff --git a/src/main/java/org/onap/dmaap/dbcapi/aaf/AafService.java b/src/main/java/org/onap/dmaap/dbcapi/aaf/AafService.java
index 112ab11..9d8776a 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/aaf/AafService.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/aaf/AafService.java
@@ -36,9 +36,21 @@ public class AafService extends BaseLoggingClass {
 	private AafConnection aaf;
 	private ServiceType ctype;
 	private String aafURL ;
+	private	String identity;
 	private boolean useAAF = false;
 	
 	
+	
+	public String getIdentity() {
+		return identity;
+	}
+
+
+	public void setIdentity(String identity) {
+		this.identity = identity;
+	}
+
+
 	private String getCred( boolean wPwd ) {
 		String mechIdProperty = null;
 		String pwdProperty = null;
@@ -55,7 +67,7 @@ public class AafService extends BaseLoggingClass {
 			logger.error( "Unexpected case for AAF credential type: " + ctype );
 			return null;
 		}
-		String user = p.getProperty( mechIdProperty, "noMechId@domain.netset.com" );
+		identity = p.getProperty( mechIdProperty, "noMechId@domain.netset.com" );
 
 		String pwd = "";
 		String encPwd = p.getProperty( pwdProperty, "notSet" );
@@ -64,17 +76,18 @@ public class AafService extends BaseLoggingClass {
 		pwd = decryptor.decrypt(encPwd);
 		
 		if ( wPwd ) {
-			return user + ":" + pwd;
+			return identity + ":" + pwd;
 		} else {
-			return user;
+			return identity;
 		}
 		
 		
 	}
 	
+	
 	public AafService(ServiceType t ) {
 		DmaapConfig p = (DmaapConfig)DmaapConfig.getConfig();
-		aafURL = p.getProperty( "aaf.URL", "https://authentication.domain.netset.com:8095/proxy/");
+		aafURL = p.getProperty( "aaf.URL", "https://authentication.domain.netset.com:8100/proxy/");
 		initAafService( t );
 	}
 	public AafService( ServiceType t, String url ) {
@@ -92,70 +105,16 @@ public class AafService extends BaseLoggingClass {
 	}
 	
 	public int addPerm(DmaapPerm perm) {
-
-		int rc = -1;
 		logger.info( "entry: addPerm() "  );
-		String pURL = aafURL + "authz/perm";
-		logger.info( "addPerm=" + useAAF );
-		if ( useAAF ) {
-			logger.info( "addPerm: " + perm.toJSON());
-			rc = aaf.postAaf( perm, pURL );
-		} else {
-			rc = 201;
-		}
-        switch( rc ) {
-    	case 401:
-    	case 403:
-       		errorLogger.error(DmaapbcLogMessageEnum.AAF_CREDENTIAL_ERROR,  getCred( false ) );
-    		System.exit(1);
-    	case 409:
-    		logger.warn( "Perm already exists. Possible conflict.");
-    		break;
- 		
-    	case 201:
-    		logger.info( "expected response: " + rc);
-    		break;
-       	default :
-    		logger.error( "Unexpected response: " + rc );
-    		break;
-        }
-		
-		return rc;
+		return doPost( perm, "authz/perm", 201);
 	}
 	public int addGrant(DmaapGrant grant ) {
-
-		int rc = -1;
 		logger.info( "entry: addGrant() "  );
-
-		String pURL = aafURL + "authz/role/perm";
-		logger.info( "addGrant: useAAF=" + useAAF );
-		if ( useAAF ) {
-			logger.info( "addGrant: " + grant.toJSON() );
-			rc = aaf.postAaf( grant, pURL );
-		} else {
-			rc = 201;
-		}
-		
-        switch( rc ) {
-    	case 401:
-    	case 403:
-       		errorLogger.error(DmaapbcLogMessageEnum.AAF_CREDENTIAL_ERROR,  getCred( false ) );
-    		System.exit(1);
-    		break;
-
-    	case 409:
-    		logger.warn( "Perm already exists. Possible conflict.");
-    		break;
- 		
-    	case 201:
-    		logger.info( "expected response" );
-    		break;
-       	default :
-    		logger.error( "Unexpected response: " + rc );
-    		break;
-        }
-		
-		return rc;
+		return doPost( grant, "authz/role/perm", 201 );
+	}
+	public int addUserRole( AafUserRole ur ) {
+		logger.info( "entry: addUserRole() "  );
+		return doPost( ur, "authz/userRole", 201 );
 	}
 
 	public int delGrant( DmaapGrant grant ) {
@@ -191,5 +150,49 @@ public class AafService extends BaseLoggingClass {
 		return rc;
 	}
 
+	public int addRole(AafRole role) {
+		logger.info( "entry: addRole() "  );
+		return doPost( role, "authz/role", 201 );
+	}
+
+	
+	
+	public int addNamespace(AafNamespace ns) {
+		logger.info( "entry: addNamespace() "  );
+		return doPost( ns, "authz/ns", 201 );
+	}
+
+	
+	private int doPost( AafObject obj, String uri, int expect ) {
+		int rc = -1;
+		logger.info( "entry: doPost() "  );
+		String pURL = aafURL + uri;
+		logger.info( "doPost: useAAF=" + useAAF );
+		if ( useAAF ) {
+			logger.info( "doPost: " + obj.toJSON());
+			rc = aaf.postAaf( obj, pURL );
+		} else {
+			rc = expect;
+		}
+        switch( rc ) {
+    	case 401:
+    	case 403:
+       		errorLogger.error(DmaapbcLogMessageEnum.AAF_CREDENTIAL_ERROR,  getCred( false ) );
+    		System.exit(1);
+    	case 409:
+    		logger.warn( "Object for " + uri + " already exists. Possible conflict.");
+    		break;
+ 		
 
+       	default :
+       		if ( rc == expect ) {
+       			logger.info( "expected response: " + rc);
+       		} else {
+       			logger.error( "Unexpected response: " + rc );
+       		}
+    		break;
+        }
+        
+        return rc;
+	}
 }