diff options
| author |   Dominic Lunanuova <dgl@research.att.com> | 2019-04-16 13:31:46 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-04-16 13:31:46 +0000 |
| commit | e43ce2a29d9060da4d7fcea985334a49033c2bdb (patch) | |
| tree | 3978c7f194d0a578d9f50d4a9bc2a0981f1fa50e | |
| parent | ece3a625175df4d74d890d67f584560630e9ed33 (diff) | |
| parent | 2127de5e112223a7871022b9dc67f1e3f8a4362e (diff) | |
Merge "switch to valid aaf url property"
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | etc/dmaapbc.properties | 14 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dbcapi/aaf/AafService.java | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dbcapi/authentication/ApiPerms.java | 8 |
4 files changed, 5 insertions, 21 deletions
@@ -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 71f0b66..fa7f2cd 100644 --- a/etc/dmaapbc.properties +++ b/etc/dmaapbc.properties @@ -179,7 +179,7 @@ ApiPermission.Class: org.onap.dmaap.dbcapi.authentication.AllowAll # # 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()); |