[DMAAP-BC] Upgrade packages for London rel2.0.12

Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: I65e2a2e7e344c6575168ed020cd7adab2d6606ee
Issue-ID: DMAAP-1844

4 files changed, 16 insertions, 13 deletions

diff --git a/csit/scripts/dmaap-buscontroller/dmaapbc-init.sh b/csit/scripts/dmaap-buscontroller/dmaapbc-init.sh
index 5e9cbb1..1cabb95 100755
--- a/csit/scripts/dmaap-buscontroller/dmaapbc-init.sh
+++ b/csit/scripts/dmaap-buscontroller/dmaapbc-init.sh
@@ -8,7 +8,7 @@ cat << EOF > $JSON
 {
     "version": "1",
     "topicNsRoot": "org.onap.dmaap",
-    "drProvUrl": "https://dmaap-dr-prov:8443",
+    "drProvUrl": "http://dmaap-dr-prov:8080",
     "dmaapName": "onapCSIT",
     "bridgeAdminTopic": "MM_AGENT_PROV"
 
@@ -16,7 +16,7 @@ cat << EOF > $JSON
 EOF
 
 echo "Initializing /dmaap endpoint"
-curl -v -k  -X POST -d @${JSON} -H "Content-Type: application/json" https://$1:8443/webapi/dmaap
+curl -v -k  -X POST -d @${JSON} -H "Content-Type: application/json" http://$1:8080/webapi/dmaap
 
 
 # INITIALIZE: dcaeLocation object
@@ -32,7 +32,7 @@ cat << EOF > $JSON
 EOF
 
 echo "Initializing /dcaeLocations endpoint"
-curl -v -k  -X POST -d @${JSON} -H "Content-Type: application/json" https://$1:8443/webapi/dcaeLocations
+curl -v -k  -X POST -d @${JSON} -H "Content-Type: application/json" http://$1:8080/webapi/dcaeLocations
 
 
 # INITIALIZE: MR object in 1 site
@@ -55,4 +55,4 @@ cat << EOF > $JSON
 EOF
 
 echo "Initializing /mr_clusters endpoint"
-curl -v -k  -X POST -d @${JSON} -H "Content-Type: application/json" https://$1:8443/webapi/mr_clusters
+curl -v -k  -X POST -d @${JSON} -H "Content-Type: application/json" http://$1:8080/webapi/mr_clusters
diff --git a/csit/scripts/dmaap-buscontroller/dmaapbc-launch.sh b/csit/scripts/dmaap-buscontroller/dmaapbc-launch.sh
index 6f46845..6bd1cf3 100755
--- a/csit/scripts/dmaap-buscontroller/dmaapbc-launch.sh
+++ b/csit/scripts/dmaap-buscontroller/dmaapbc-launch.sh
@@ -12,10 +12,12 @@ function dmaapbc_launch() {
       export dmaap_mr_ip=$1
     fi
 
-    docker-compose -f ${WORKSPACE}/scripts/dmaap-buscontroller/docker-compose/docker-compose-bc.yml up -d
-
+    docker-compose -f ${WORKSPACE}/scripts/dmaap-buscontroller/docker-compose/docker-compose-bc.yml up -d dbc-pg-primary
+    sleep 5
+    DMAAP_BC_PG_IP=`get-instance-ip.sh dbc-pg`
+    export dbc_pg_ip=${DMAAP_BC_PG_IP}
+    docker-compose -f ${WORKSPACE}/scripts/dmaap-buscontroller/docker-compose/docker-compose-bc.yml up -d dmaap-bc
     sleep 10
-
     DMAAP_BC_IP=`get-instance-ip.sh dmaap-bc`
 
     # Wait for initialization
diff --git a/csit/scripts/dmaap-buscontroller/docker-compose/dmaapbc.properties b/csit/scripts/dmaap-buscontroller/docker-compose/dmaapbc.properties
index 32c67fb..aa39539 100644
--- a/csit/scripts/dmaap-buscontroller/docker-compose/dmaapbc.properties
+++ b/csit/scripts/dmaap-buscontroller/docker-compose/dmaapbc.properties
@@ -6,7 +6,7 @@
 #####################################################
 # Indicator for whether to use AAF for authentication
 UseAAF: false
-
+enableCADI: false
 # Stub out southbound calls for Unit Test cases to run.  e.g. not timeout
 # Comment out in other environments to get default (No)
 #UnitTest: Yes
@@ -95,7 +95,7 @@ MR.TopicMgrRole: org.onap.dmaap-bc-topic-mgr.client
 MR.projectID:  mr
 
 # Use Basic Authentication when provisioning topics
-MR.authentication: basicAuth
+MR.authentication: none
 
 # MR topic name style (default is FQTN_LEGACY_FORMAT)
 #MR.topicStyle: FQTN_LEGACY_FORMAT
@@ -126,7 +126,7 @@ ApiPermission.Class: org.onap.dmaap.dbcapi.authentication.AllowAll
 # Indicates how we are expecting certificates to be provided:
 #  cadi - a set of artifacts will be downloaded from AAF at deployment time, and details will be in a cadi properties file
 #  legacy (default) - artifacts will be installed manually or some other way and details will be in this file
-CertificateManagement: cadi
+CertificateManagement: legacy
 
 # When CertificateManagement is cadi, then this is where all the cadi properties will be.
 # Note that the cadi properties include where the cert is, and the encrypted passwords to read.
@@ -147,4 +147,4 @@ IntHttpPort: 8080
 
 # listen to https port within this container (server)
 # set to 0 if no certificates are available.
-IntHttpsPort: 8443
+IntHttpsPort: 0
diff --git a/csit/scripts/dmaap-buscontroller/docker-compose/docker-compose-bc.yml b/csit/scripts/dmaap-buscontroller/docker-compose/docker-compose-bc.yml
index 79cbde5..a4d8486 100644
--- a/csit/scripts/dmaap-buscontroller/docker-compose/docker-compose-bc.yml
+++ b/csit/scripts/dmaap-buscontroller/docker-compose/docker-compose-bc.yml
@@ -24,14 +24,14 @@ services:
   dmaap-bc:
     container_name: dmaap-bc
     hostname: dmaap-bc
-    image: onap/dmaap/dmaap-bc
+    image: onap/dmaap/dmaap-bc:latest
     ports:
     - "30241:8080"
     - "30242:8443"
     volumes:
     - ./buscontroller.env:/opt/app/config/conf/buscontroller.env
     - ./dmaapbc.properties:/opt/app/config/conf/dmaapbc.properties
-    - ./cadi_aaf:/opt/app/osaaf/local
+    #- ./cadi_aaf:/opt/app/osaaf/local
     - ./logback.xml:/opt/app/dmaapbc/etc/logback.xml
     networks:
       dockercompose_net:
@@ -40,6 +40,7 @@ services:
     extra_hosts:
       - dmaap-dr-prov:$dmaap_prov_ip
       - message-router:$dmaap_prov_ip
+      - dbc-pg:$dbc_pg_ip
 
 networks:
   dockercompose_net: