switch to valid aaf url property

Change-Id: Iea17c7c00b29c994d92ff98e4756bf3d904a2458
Issue-ID: DMAAP-1168
Signed-off-by: Tomek Kaminski <tomasz.kaminski@nokia.com>

4 files changed, 5 insertions, 21 deletions

diff --git a/README.md b/README.md
index ef81b86..14ebef1 100644
--- a/README.md
+++ b/README.md
@@ -107,7 +107,7 @@ The table below lists all the settings, default values (if not set), and shows a
 |-|-|-|-|
 |cadi.properties       | Path to CADI properties file                            | /opt/app/osaaf/local/org.onap.dmaap-bc.props | /opt/app/osaaf/lcoal/org.onap.dmaap-bc.props |
 |-|-|-|-|
-|aaf.URL               | URL of the AAF server                                   | https://authentication.domain.netset.com:8095/proxy/ | https://aaf-authz/ |
+|aaf.URL               | URL of the AAF server                                   | https://authentication.domain.netset.com:8100/proxy/ | https://aaf-service.onap:8100/ |
 |-|-|-|-|
 |aaf.TopicMgrUser      | AAF Identity of Topic Mgr                               | noMechId@domain.netset.com             | dmaap-bc-topic-mgr@dmaap-bc-topic-mgr.onap.org | 
 |-|-|-|-|
diff --git a/etc/dmaapbc.properties b/etc/dmaapbc.properties
index b0dc7de..15af191 100644
--- a/etc/dmaapbc.properties
+++ b/etc/dmaapbc.properties
@@ -179,7 +179,7 @@ CredentialCodecKeyfile:	etc/LocalKey
 #
 # URL of AAF environment to use.
 #
-aaf.URL:	https://localhost:8095/proxy/
+aaf.URL:	https://localhost:8100/proxy
 #
 # TopicMgr mechid@namespace
 #
@@ -202,18 +202,6 @@ aaf.AdminPassword:	pwdNotSet
 #################
 # PolicyEngine Properties
 #
-# Flag to turn on/off Authentication
-UsePE: false
-#
-# Argument to decisionAttributes.put("AAF_ENVIRONMENT", X); 
-# where X is:  TEST= UAT, PROD = PROD, DEVL = TEST
-#
-PeAafEnvironment: DEVL
-PeAafUrl.DEVL:  https://localhost:8095/proxy/
-PeAafUrl.TEST:  https://aafist..onap.org:8095/proxy/
-PeAafUrl.PROD:  https://aafprod.onap.org:8095/proxy/
-
-#
 # Name of PolicyEngineApi properties file
 PolicyEngineProperties: config/PolicyEngineApi.properties
 #
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 253ad11..9d8776a 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/aaf/AafService.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/aaf/AafService.java
@@ -87,7 +87,7 @@ public class AafService extends BaseLoggingClass {
 	
 	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 ) {
diff --git a/src/main/java/org/onap/dmaap/dbcapi/authentication/ApiPerms.java b/src/main/java/org/onap/dmaap/dbcapi/authentication/ApiPerms.java
index bcadf40..33cc327 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/authentication/ApiPerms.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/authentication/ApiPerms.java
@@ -88,12 +88,8 @@ public  class ApiPerms extends BaseLoggingClass {
 
 			DmaapConfig p = (DmaapConfig)DmaapConfig.getConfig();
 			String api = p.getProperty("ApiNamespace", "apiNamespace.not.set");
-			
-			// this is needed because PE AAF may be a different instance than AAF used by MR
-			String peEnv = p.getProperty("PeAafEnvironment", "notSet");
-			String url = p.getProperty( new String( "PeAafUrl." + peEnv ), "URL.not.set" );
-			logger.info( "PeAafEnvironment=" + peEnv + " using URL " + url);
-			AafService aaf = new AafService(ServiceType.AAF_Admin, url );
+
+			AafService aaf = new AafService(ServiceType.AAF_Admin);
 			
 			for ( int i = 0; i < pmap.length ; i++ ) {
 				String uri = new String( api + "." + pmap[i].getUri());