Fix for proper aaf-service url

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

diff --git a/README.md b/README.md
index cefbd42..0a1888a 100644 (file)
--- a/README.md
+++ b/README.md
@@ -111,7 +111,7 @@ DMAAPBC_PGCRED=test234-ftl
 
 DMAAPBC_DRPROV_FQDN=zldciad1vidrps00.simpledemo.openecomp.org
 
 
 DMAAPBC_DRPROV_FQDN=zldciad1vidrps00.simpledemo.openecomp.org
 

-DMAAPBC_AAF_URL=https://aafapi.${CONT_DOMAIN}:8095/proxy/
+DMAAPBC_AAF_URL=https://aafapi.${CONT_DOMAIN}:8100/proxy/

 
 DMAAPBC_TOPICMGR_USER=m99751@dmaapBC.openecomp.org
 DMAAPBC_TOPICMGR_PWD=enc:zyRL9zbI0py3rJAjMS0dFOnYfEw_mJhO
 
 DMAAPBC_TOPICMGR_USER=m99751@dmaapBC.openecomp.org
 DMAAPBC_TOPICMGR_PWD=enc:zyRL9zbI0py3rJAjMS0dFOnYfEw_mJhO


@@ -182,7 +182,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 |
 |-|-|-|-|
 |-|-|-|-|
 |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 | 
 |-|-|-|-|
 |-|-|-|-|
 |aaf.TopicMgrUser      | AAF Identity of Topic Mgr                               | noMechId@domain.netset.com             | dmaap-bc-topic-mgr@dmaap-bc-topic-mgr.onap.org | 
 |-|-|-|-|

diff --git a/dmaap-bc/misc/dmaapbc.properties.tmpl b/dmaap-bc/misc/dmaapbc.properties.tmpl
index 244dd00..c266091 100755 (executable)
--- a/dmaap-bc/misc/dmaapbc.properties.tmpl
+++ b/dmaap-bc/misc/dmaapbc.properties.tmpl
@@ -193,7 +193,7 @@ ApiNamespace: ${DMAAPBC_API_NAMESPACE:-org.onap.dmaap-bc.api}
 #
 # URL of AAF environment to use.
 #
 #
 # URL of AAF environment to use.
 #

-aaf.URL:       ${DMAAPBC_AAF_URL:-https://aaf-onap-test.osaaf.org:8095}
+aaf.URL:       ${DMAAPBC_AAF_URL:-https://aaf-onap-test.osaaf.org:8100}

 #
 # TopicMgr mechid@namespace
 #
 #
 # TopicMgr mechid@namespace
 #

diff --git a/dmaap-bc/misc/opensource.env b/dmaap-bc/misc/opensource.env
index 80d82f8..a74d333 100644 (file)
--- a/dmaap-bc/misc/opensource.env
+++ b/dmaap-bc/misc/opensource.env
@@ -82,7 +82,7 @@ DMAAPBC_DRPROV_FQDN=dcae-drps.${CONT_DOMAIN}
 #
 # URL of AAF environment to use.
 #
 #
 # URL of AAF environment to use.
 #

-DMAAPBC_AAF_URL=https://aafapi.${CONT_DOMAIN}:8095/proxy/
+DMAAPBC_AAF_URL=https://aafapi.${CONT_DOMAIN}:8100/proxy/

 #
 # TopicMgr mechid@namespace
 #
 #
 # TopicMgr mechid@namespace
 #