From 339668d8382568eb043709ea9eb16f4b2ea7d072 Mon Sep 17 00:00:00 2001 From: dglFromAtt Date: Mon, 28 Jan 2019 17:15:33 +0000 Subject: [PATCH] Support DR API diverge Change-Id: Ie4d58731706a4d41202cf42cdaad2d460d73fc2f Signed-off-by: dglFromAtt Issue-ID: DMAAP-1000 --- README.md | 11 ++++++++++- pom.xml | 4 ++-- version.properties | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 85880d5..bd8a327 100644 --- a/README.md +++ b/README.md @@ -132,7 +132,7 @@ However, a java argument -DConfigFile can be set to a different path. (Our kub The table below lists all the settings, default values (if not set), and shows any explicit setting in ONAP oom kubernetes deployment. |-|-|-|-| -| Property | Description | Default | Kubernetes Setting | +| Property | Description | Default | ONAP Kubernetes Setting | |-|-|-|-| |UseAAF | Flag for whether AAF authz API is to be used | false | false | |-|-|-|-| @@ -188,6 +188,7 @@ The table below lists all the settings, default values (if not set), and shows a |aaf.AdminPassword | AAF credential of AdminUser | notSet | demo123456! | |-|-|-|-| |aaf.NsOwnerIdentity | AAF Identity to be used as topic Namespace owner | notSet | aaf_admin@people.osaaf.org | +|topicNsRoot | AAF namespace value used to create FQTN | org.onap.dcae.dmaap | org.onap.dcae.dmaap | |-|-|-|-| |CredentialCodeKeyfile | location of the codec keyfile used to decrypt passwords | LocalKey | etc/LocalKey | | | in this properties file before they are passed to AAF | LocalKey | etc/LocalKey | @@ -206,6 +207,14 @@ The table below lists all the settings, default values (if not set), and shows a |-|-|-|-| |MM.AgentRole | AAF Role of client susbcribing to MM command topic | notSet | org.onal.dmaap-bc-mm-prov.agent | |-|-|-|-| +|DR.provApi | Version name of DR API (ONAP or AT&T) | ONAP | ONAP | +|-|-|-|-| +|DR.onBehalfHeader | String for "On Behalf Of" HTTP Header in DR API | X-DR-ON-BEHALF-OF | X-DR-ON-BEHALF-OF | +|-|-|-|-| +|DR.feedContentType | Value for Content-Type Header in DR Feed API | application/vnd.dr.feed | application/vnd.dr.feed | +|-|-|-|-| +|DR subContentType | Value for Content-Type Header in DR Subscription API | application/vnd.dr.subscription | application/vnd.dr.subscription | +|-|-|-|-| |HttpAllowed | flag indicating whether http is supported | false | true | |-|-|-|-| |IntHttpPort | Internal port for http service | 80 | 8080 | diff --git a/pom.xml b/pom.xml index ef634bd..d8b6cd6 100644 --- a/pom.xml +++ b/pom.xml @@ -326,7 +326,7 @@ org.onap.dmaap.dbcapi dbcapi - 1.0.20-SNAPSHOT + 1.0.21-SNAPSHOT @@ -362,7 +362,7 @@ 9.4.12.RC2 1.0.0 1.5.19 - 1.0.25 + 1.0.26 0.7.7.201606060606 3.2 diff --git a/version.properties b/version.properties index 19905f9..8db0bb1 100644 --- a/version.properties +++ b/version.properties @@ -27,7 +27,7 @@ major=1 minor=0 -patch=25 +patch=26 base_version=${major}.${minor}.${patch} # Release must be completed with git revision # in Jenkins -- 2.16.6