Remove Dmaap configurations from CSITs
Issue-ID: POLICY-4880
Change-Id: I4f973ef1f7a173eaf5f196d9991d67d584e235fe
Signed-off-by: rameshiyer27 <ramesh.murugan.iyer@est.tech>
diff --git a/compose/config/drools-applications/custom/feature-lifecycle.properties b/compose/config/drools-applications/custom/feature-lifecycle.properties
index ec23bee..053cd06 100644
--- a/compose/config/drools-applications/custom/feature-lifecycle.properties
+++ b/compose/config/drools-applications/custom/feature-lifecycle.properties
@@ -32,10 +32,8 @@
kafka.source.topics.policy-pdp-pap.effectiveTopic=${envd:POLICY_PDP_PAP_TOPIC}
kafka.source.topics.policy-pdp-pap.apiKey=${envd:POLICY_PDP_PAP_API_KEY}
kafka.source.topics.policy-pdp-pap.apiSecret=${envd:POLICY_PDP_PAP_API_SECRET}
-kafka.source.topics.policy-pdp-pap.https=${envd:DMAAP_HTTPS:false}
kafka.sink.topics.policy-pdp-pap.servers=kafka:9092
kafka.sink.topics.policy-pdp-pap.effectiveTopic=${envd:POLICY_PDP_PAP_TOPIC}
kafka.sink.topics.policy-pdp-pap.apiKey=${envd:POLICY_PDP_PAP_API_KEY}
kafka.sink.topics.policy-pdp-pap.apiSecret=${envd:POLICY_PDP_PAP_API_SECRET}
-kafka.sink.topics.policy-pdp-pap.https=${envd:DMAAP_HTTPS:false}
diff --git a/compose/config/drools-applications/env/base.conf b/compose/config/drools-applications/env/base.conf
index 0b92602..76e4257 100644
--- a/compose/config/drools-applications/env/base.conf
+++ b/compose/config/drools-applications/env/base.conf
@@ -70,7 +70,7 @@
LIVENESS_CONTROLLERS=*
-# PDP-D DMaaP configuration channel
+# PDP-D Kafka configuration channel
PDPD_CONFIGURATION_TOPIC=pdpd-configuration
PDPD_CONFIGURATION_API_KEY=
@@ -101,16 +101,12 @@
PDP_PASSWORD=zb!XztG34
PDP_HTTPS=false
-# DCAE DMaaP
+# DCAE Kafka
DCAE_TOPIC=unauthenticated.dcae_cl_output
DCAE_SERVERS=kafka:9092
DCAE_CONSUMER_GROUP=dcae.policy.shared
-# Open DMaaP
-
-DMAAP_SERVERS=kafka:9092
-DMAAP_HTTPS=false
# AAI
@@ -126,7 +122,7 @@
SO_HOST=so-sim
SO_PORT=6669
SO_CONTEXT_URI=
-SO_URL=http://message-router:6669/
+SO_URL=http://so-sim:6669/
SO_USERNAME=InfraPortalClient
SO_PASSWORD='password1$'
diff --git a/compose/config/drools-applications/env/feature-pooling-dmaap.conf b/compose/config/drools-applications/env/feature-pooling-kafka.conf
similarity index 100%
rename from compose/config/drools-applications/env/feature-pooling-dmaap.conf
rename to compose/config/drools-applications/env/feature-pooling-kafka.conf
diff --git a/compose/config/drools-pdp/custom/noop.pre.sh b/compose/config/drools-pdp/custom/noop.pre.sh
index 2be3398..7a7759f 100755
--- a/compose/config/drools-pdp/custom/noop.pre.sh
+++ b/compose/config/drools-pdp/custom/noop.pre.sh
@@ -16,8 +16,5 @@
# limitations under the License.
# ============LICENSE_END=========================================================
-sed -i "s/^dmaap/kafka/g" \
- ${POLICY_HOME}/config/engine.properties \
- ${POLICY_HOME}/config/feature-lifecycle.properties
chmod 644 ${POLICY_HOME}/config/engine.properties ${POLICY_HOME}/config/feature-lifecycle.properties
diff --git a/compose/config/drools-pdp/env/base.conf b/compose/config/drools-pdp/env/base.conf
index d301d83..2625b76 100644
--- a/compose/config/drools-pdp/env/base.conf
+++ b/compose/config/drools-pdp/env/base.conf
@@ -67,7 +67,7 @@
HTTP_SERVER_HTTPS=false
PROMETHEUS=true
-# PDP-D DMaaP configuration channel
+# PDP-D Kafka configuration channel
PDPD_CONFIGURATION_TOPIC=pdpd-configuration
PDPD_CONFIGURATION_API_KEY=
@@ -100,16 +100,16 @@
PDP_ENVIRONMENT=
GUARD_DISABLED=false
-# DCAE DMaaP
+# DCAE Kafka
DCAE_TOPIC=unauthenticated.dcae_cl_output
DCAE_SERVERS=
DCAE_CONSUMER_GROUP=dcae.policy.shared
-# Open DMaaP
+# kafka server
-DMAAP_SERVERS=kafka:9092
-DMAAP_HTTPS=false
+KAFKA_SERVERS=kafka:9092
+
# AAI
diff --git a/compose/config/sim-all/simParameters.json b/compose/config/sim-all/simParameters.json
index 2bc5812..b54db25 100644
--- a/compose/config/sim-all/simParameters.json
+++ b/compose/config/sim-all/simParameters.json
@@ -1,17 +1,6 @@
{
- "dmaapProvider": {
- "name": "DMaaP simulator",
- "topicSweepSec": 300
- },
"restServers": [
{
- "name": "DMaaP simulator",
- "providerClass": "org.onap.policy.models.sim.dmaap.rest.DmaapSimRestControllerV1",
- "host": "0.0.0.0",
- "port": 3904,
- "https": false
- },
- {
"name": "A&AI simulator",
"providerClass": "org.onap.policy.simulators.AaiSimulatorJaxRs",
"host": "0.0.0.0",
@@ -45,56 +34,7 @@
"https": false
}
],
- "topicSinks": [
- {
- "topic": "appc-cl",
- "servers": ["${HOST_NAME}"],
- "topicCommInfrastructure": "DMAAP",
- "useHttps": false,
- "apiKey": "some-key",
- "apiSecret": "some-secret"
- },
- {
- "topic": "appc-lcm-write",
- "servers": ["${HOST_NAME}"],
- "topicCommInfrastructure": "DMAAP",
- "useHttps": false,
- "apiKey": "some-key",
- "apiSecret": "some-secret"
- }
- ],
- "topicSources": [
- {
- "topic": "appc-cl",
- "servers": ["${HOST_NAME}"],
- "topicCommInfrastructure": "DMAAP",
- "useHttps": false,
- "apiKey": "some-key",
- "apiSecret": "some-secret"
- },
- {
- "topic": "appc-lcm-read",
- "servers": ["${HOST_NAME}"],
- "topicCommInfrastructure": "DMAAP",
- "useHttps": false,
- "apiKey": "some-key",
- "apiSecret": "some-secret"
- }
- ],
- "topicServers": [
- {
- "name": "APPC Legacy simulator",
- "providerClass": "org.onap.policy.simulators.AppcLegacyTopicServer",
- "sink": "appc-cl",
- "source": "appc-cl"
- },
- {
- "name": "appc-lcm-simulator",
- "providerClass": "org.onap.policy.simulators.AppcLcmTopicServer",
- "sink": "appc-lcm-write",
- "source": "appc-lcm-read"
- }
- ],
+
"grpcServer": {
"name": "CDS simulator",
"providerClass": "org.onap.policy.simulators.CdsSimulator",
diff --git a/compose/docker-compose.pdp.scale.yml b/compose/docker-compose.pdp.scale.yml
index 53376ab..104de3c 100644
--- a/compose/docker-compose.pdp.scale.yml
+++ b/compose/docker-compose.pdp.scale.yml
@@ -23,6 +23,7 @@
depends_on:
- mariadb
- simulator
+ - kafka
- pap
hostname: policy-apex-pdp
expose:
@@ -39,7 +40,7 @@
command: [
'-c', '/opt/app/policy/apex-pdp/bin/apexOnapPf.sh -c /opt/app/policy/apex-pdp/etc/onappf/config/OnapPfConfig.json',
'mariadb', '3306',
- 'message-router', '3904',
+ 'kafka', '9092',
'pap', '6969'
]
nginx:
@@ -50,3 +51,27 @@
- apexpdp
ports:
- ${APEX_PORT}:${APEX_PORT}
+
+ zookeeper:
+ image: confluentinc/cp-zookeeper:latest
+ environment:
+ ZOOKEEPER_CLIENT_PORT: 2181
+ ZOOKEEPER_TICK_TIME: 2000
+ ports:
+ - 2181:2181
+
+ kafka:
+ image: confluentinc/cp-kafka:latest
+ container_name: kafka
+ depends_on:
+ - zookeeper
+ ports:
+ - 29092:29092
+ - 9092:9092
+ environment:
+ KAFKA_BROKER_ID: 1
+ KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+ KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092,PLAINTEXT_HOST://localhost:29092
+ KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
+ KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
+ KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
diff --git a/compose/docker-compose.postgres.yml b/compose/docker-compose.postgres.yml
index 4fe4002..1f32dba 100644
--- a/compose/docker-compose.postgres.yml
+++ b/compose/docker-compose.postgres.yml
@@ -73,7 +73,7 @@
- 6670
- 6680
ports:
- - ${DMAAP_PORT}:3904
+ - ${SIMULATOR_PORT}:3904
api:
image: ${CONTAINER_LOCATION}onap/policy-api:${POLICY_API_VERSION}
container_name: policy-api
diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml
index dbd6298..5effc25 100644
--- a/compose/docker-compose.yml
+++ b/compose/docker-compose.yml
@@ -73,7 +73,7 @@
- 6670
- 6680
ports:
- - ${DMAAP_PORT}:3904
+ - ${SIMULATOR_PORT}:6666
api:
image: ${CONTAINER_LOCATION}onap/policy-api:${POLICY_API_VERSION}
container_name: policy-api
@@ -177,7 +177,7 @@
env_file:
- ./config/drools-applications/env/base.conf
- ./config/drools-applications/env/feature-healthcheck.conf
- - ./config/drools-applications/env/feature-pooling-dmaap.conf
+ - ./config/drools-applications/env/feature-pooling-kafka.conf
entrypoint: /opt/app/policy/bin/wait_for_port.sh
command: [
'-c', '/opt/app/policy/bin/pdpd-cl-entrypoint.sh boot',
diff --git a/compose/export-ports.sh b/compose/export-ports.sh
index a55f755..1648863 100755
--- a/compose/export-ports.sh
+++ b/compose/export-ports.sh
@@ -43,7 +43,7 @@
export SIM_PARTICIPANT_PORT=30011
export DROOLS_APPS_PORT=30009
export DROOLS_APPS_TELEMETRY_PORT=30219
-export DMAAP_PORT=30904
+export SIMULATOR_PORT=30904
export KAFKA_PORT=9092
export PROMETHEUS_PORT=30259
export GRAFANA_PORT=30269