Disable TLS in DataRouter (CSIT)
Issue-ID: DCAEGEN2-3037
Signed-off-by: Tomasz Wrobel <tomasz.wrobel@nokia.com>
Change-Id: I01dd54ac173ed2bf705071e2bca118a068680f0a
diff --git a/csit/plans/pmmapper/assets/addSubscriber.json b/csit/plans/pmmapper/assets/addSubscriber.json
index 0666a7d..5d40973 100644
--- a/csit/plans/pmmapper/assets/addSubscriber.json
+++ b/csit/plans/pmmapper/assets/addSubscriber.json
@@ -9,12 +9,7 @@
"metadataOnly":false,
"suspend":false,
"groupid":0,
- "links":{
- "self": "https://dmaap-dr-prov/subscribe/1",
- "log": "https://dmaap-dr-prov/feedlog/1",
- "feed": "https://dmaap-dr-prov/feed/1"
- },
"subscriber":"pmmapper",
"decompress":true,
"privilegedSubscriber": true
- }
\ No newline at end of file
+ }
diff --git a/csit/plans/pmmapper/assets/config.yaml b/csit/plans/pmmapper/assets/config.yaml
index c535113..8b54aa8 100644
--- a/csit/plans/pmmapper/assets/config.yaml
+++ b/csit/plans/pmmapper/assets/config.yaml
@@ -5,7 +5,7 @@
key_store_pass_path: "/opt/app/pm-mapper/etc/certs/jks.pass"
trust_store_path: "/opt/app/pm-mapper/etc/certs/trust.jks"
trust_store_pass_path: "/opt/app/pm-mapper/etc/certs/trust.pass"
-dmaap_dr_delete_endpoint: https://dmaap-dr-node:8443/delete
+dmaap_dr_delete_endpoint: http://dmaap-dr-node:8080/delete
dmaap_dr_feed_name: '1'
aaf_identity: aaf_admin@people.osaaf.org
aaf_password: demo123456!
diff --git a/csit/plans/pmmapper/assets/node.properties b/csit/plans/pmmapper/assets/node.properties
index ddd4ebc..dd796e7 100644
--- a/csit/plans/pmmapper/assets/node.properties
+++ b/csit/plans/pmmapper/assets/node.properties
@@ -3,6 +3,7 @@
# * org.onap.dmaap
# * ===========================================================================
# * Copyright � 2017 AT&T Intellectual Property. All rights reserved.
+# * Copyright (C) 2022 Nokia Intellectual Property
# * ===========================================================================
# * Licensed under the Apache License, Version 2.0 (the "License");
# * you may not use this file except in compliance with the License.
@@ -24,10 +25,10 @@
# Configuration parameters set at startup for the DataRouter node
#
# URL to retrieve dynamic configuration
-ProvisioningURL = https://dmaap-dr-prov:8443/internal/prov
+ProvisioningURL = http://dmaap-dr-prov:8080/internal/prov
#
# URL to upload PUB/DEL/EXP logs
-LogUploadURL = https://dmaap-dr-prov:8443/internal/logs
+LogUploadURL = http://dmaap-dr-prov:8080/internal/logs
#
# The port number for http as seen within the server
IntHttpPort = 8080
@@ -84,4 +85,6 @@
CadiEnabled = false
#
# AAF Props file path
-AAFPropsFilePath = /opt/app/osaaf/local/org.onap.dmaap-dr.props
\ No newline at end of file
+AAFPropsFilePath = /opt/app/osaaf/local/org.onap.dmaap-dr.props
+
+TlsEnabled = false
diff --git a/csit/plans/pmmapper/assets/provserver.properties b/csit/plans/pmmapper/assets/provserver.properties
index 20b5cb9..2f75257 100644
--- a/csit/plans/pmmapper/assets/provserver.properties
+++ b/csit/plans/pmmapper/assets/provserver.properties
@@ -3,6 +3,7 @@
# * org.onap.dmaap
# * ===========================================================================
# * Copyright � 2017 AT&T Intellectual Property. All rights reserved.
+# * Copyright (C) 2022 Nokia Intellectual Property
# * ===========================================================================
# * Licensed under the Apache License, Version 2.0 (the "License");
# * you may not use this file except in compliance with the License.
@@ -23,7 +24,9 @@
#Jetty Server properties
org.onap.dmaap.datarouter.provserver.http.port = 8080
+org.onap.dmaap.datarouter.nodeserver.http.port = 8080
org.onap.dmaap.datarouter.provserver.https.port = 8443
+org.onap.dmaap.datarouter.nodeserver.https.port = 8443
org.onap.dmaap.datarouter.provserver.https.relaxation = true
org.onap.dmaap.datarouter.provserver.aafprops.path = /opt/app/osaaf/local/org.onap.dmaap-dr.props
@@ -36,6 +39,7 @@
#DMAAP-597 (Tech Dept) REST request source IP auth
# relaxation to accommodate OOM kubernetes deploy
org.onap.dmaap.datarouter.provserver.isaddressauthenabled = false
+org.onap.dmaap.datarouter.provserver.tlsenabled = false
#Localhost address config
org.onap.dmaap.datarouter.provserver.localhost = 127.0.0.1
@@ -57,4 +61,4 @@
org.onap.dmaap.datarouter.provserver.aaf.sub.type = org.onap.dmaap-dr.sub
org.onap.dmaap.datarouter.provserver.aaf.instance = legacy
org.onap.dmaap.datarouter.provserver.aaf.action.publish = publish
-org.onap.dmaap.datarouter.provserver.aaf.action.subscribe = subscribe
\ No newline at end of file
+org.onap.dmaap.datarouter.provserver.aaf.action.subscribe = subscribe