|-|-|-|-|
|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 |
|-|-|-|-|
#
# URL of AAF environment to use.
#
-aaf.URL: https://localhost:8095/proxy/
+aaf.URL: https://localhost:8100/proxy
#
# TopicMgr mechid@namespace
#
#################
#################
# 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
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 ) {
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());