From 6a40bca642e9213cd2f90d35fd58f35ce39a34b4 Mon Sep 17 00:00:00 2001
From: dglFromAtt <dgl@research.att.com>
Date: Fri, 12 Oct 2018 20:56:43 +0000
Subject: [PATCH] Use dbcapi for AAF ONAP

Change-Id: Icc4218d2ab331168adfb057e12012804263c5ae8
Signed-off-by: dglFromAtt <dgl@research.att.com>
Issue-ID: DMAAP-846
---
 misc/dmaapbc.properties.tmpl | 21 +++++++++++----------
 pom.xml                      |  4 ++--
 version.properties           |  2 +-
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/misc/dmaapbc.properties.tmpl b/misc/dmaapbc.properties.tmpl
index 7214497..40ce8f5 100644
--- a/misc/dmaapbc.properties.tmpl
+++ b/misc/dmaapbc.properties.tmpl
@@ -114,7 +114,7 @@ MR.multisite:  false
 #   Value of the CNAME DNS entry which resolves to the primary central MR cluster (when there are more than one central clusters).
 #   if there is only one MR cluster in an environment, set this to the DNS name for that cluster
 #
-MR.CentralCname:  ${DMAAPBC_MR_CNAME:-dmaap.onap}
+MR.CentralCname:  ${DMAAPBC_MR_CNAME:-message-router}
 #
 #   MR Client Delete Level thoroughness:
 #   0 = don't delete
@@ -127,7 +127,7 @@ MR.ClientDeleteLevel: 1
 MR.TopicFactoryNS: org.onap.dcae.dmaap.topicFactory
 #
 #   MR TopicMgr Role
-MR.TopicMgrRole:    org.onap.dmaapBC.TopicMgr
+MR.TopicMgrRole:    org.onap.dmaap-bc-topic-mgr.client
 
 #   MR topic name style
 MR.topicStyle:	FQTN_LEGACY_FORMAT
@@ -142,13 +142,13 @@ MR.projectID:  23456
 #	The Role and credentials of the MirrorMaker Provisioner.  This is used by DMaaP Bus Controller to pub to the provisioning topic
 #   Not part of 1701
 #
-MM.ProvRole: ${DMAAPBC_MMPROV_ROLE:-org.onap.dmaapBC.MMprov.prov}
-MM.ProvUserMechId: ${DMAAPBC_MMPROV_ID:-idNotSet@namespaceNotSet}
-MM.ProvUserPwd: ${DMAAPBC_MMPROV_PWD:-pwdNotSet}
+MM.ProvRole: ${DMAAPBC_MMPROV_ROLE:-org.onap.dmaap-bc-mm-prov.prov}
+MM.ProvUserMechId: ${DMAAPBC_MMPROV_ID:-dmaap-bc-mm-prov@dmaap-bc-mm-prov.onap.org}
+MM.ProvUserPwd: ${DMAAPBC_MMPROV_PWD:-demo123456!}
 #
 #	The Role of the MirrorMaker Agent. This is used by MM to sub to provisioning topic
 #
-MM.AgentRole: ${DMAAPBC_MMAGENT_ROLE:-org.onap.dmaapBC.MMagent.agent}
+MM.AgentRole: ${DMAAPBC_MMAGENT_ROLE:-org.onap.dmaap-bc-mm-prov.agent}
 #################
 #
 # path to cadi.properties
@@ -157,6 +157,7 @@ cadi.properties: /opt/app/osaaf/local/org.onap.dmaap-bc.props
 
 #################
 # AAF Properties:
+UseAAF: ${DMAAPBC_USEAAF:-false}
 #
 # regarding password encryption:
 # In the dependencies that Maven retrieves (e.g., under dcae_dmaapbc/target/deps/ is a jar file cadi-core-version.jar.  Generate the key file with:
@@ -186,6 +187,9 @@ CredentialCodecKeyfile:	${DMAAPBC_CODEC_KEYFILE:-etc/LocalKey}
 # This allows for a plugin policy check, if needed
 #ApiPermission.Class: com.company.policy.DecisionPolicy
 
+# Namespace for URI values for API used to create AAF permissions
+# e.g. if ApiNamespace is X.Y..dmaapBC.api then for URI /topics we create an AAF perm X.Y..dmaapBC.api.topics
+ApiNamespace: ${DMAAPBC_API_NAMESPACE:-org.onap.dmaap-bc.api}
 #
 # URL of AAF environment to use.
 #
@@ -193,7 +197,7 @@ aaf.URL:	${DMAAPBC_AAF_URL:-https://aaf-onap-test.osaaf.org:8095}
 #
 # TopicMgr mechid@namespace
 #
-aaf.TopicMgrUser:	${DMAAPBC_TOPICMGR_USER:-topic_mgr@dmaap-bc.onap.org}
+aaf.TopicMgrUser:	${DMAAPBC_TOPICMGR_USER:-dmaap-bc-topic-mgr@dmaap-bc-topic-mgr.onap.org}
 #
 # TopicMgr password
 # 
@@ -208,9 +212,6 @@ aaf.AdminUser:	${DMAAPBC_ADMIN_USER:-aaf_admin@people.osaag.org}
 aaf.AdminPassword:	${DMAAPBC_ADMIN_PWD:-demo123456!}
 
 
-# Namespace for URI values for API used to create AAF permissions
-# e.g. if ApiNamespace is X.Y..dmaapBC.api then for URI /topics we create an AAF perm X.Y..dmaapBC.api.topics
-ApiNamespace: ${DMAAPBC_API_NAMESPACE:-org.onap.dmaap-bc.api}
 #
 # endof AAF Properties
 #################
diff --git a/pom.xml b/pom.xml
index 90cee24..ccf82e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -330,7 +330,7 @@
     <dependency>
       <groupId>org.onap.dmaap.dbcapi</groupId>
       <artifactId>dbcapi</artifactId>
-      <version>1.0.15-SNAPSHOT</version>
+      <version>1.0.16-SNAPSHOT</version>
     </dependency>
   </dependencies>
   <reporting>
@@ -365,7 +365,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <jettyVersion>9.3.8.RC0</jettyVersion>
     <eelf.version>0.0.1</eelf.version>
-    <artifact.version>1.0.20</artifact.version>
+    <artifact.version>1.0.21</artifact.version>
     <!--  SONAR  -->
     <jacoco.version>0.7.7.201606060606</jacoco.version>
     <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
diff --git a/version.properties b/version.properties
index b51743c..acfc935 100644
--- a/version.properties
+++ b/version.properties
@@ -27,7 +27,7 @@
 
 major=1
 minor=0
-patch=20
+patch=21
 base_version=${major}.${minor}.${patch}
 
 # Release must be completed with git revision # in Jenkins
-- 
2.16.6