Integrated gateway and updated kube support
Restructured the test env to decouple the test engine from the components
Issue-ID: NONRTRIC-441
Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>
Change-Id: I07c746741b1c5c964679545f0a12861e5e9f6292
diff --git a/test/simulator-group/dmaapmr/docker-compose.yaml b/test/simulator-group/dmaapmr/docker-compose.yml
similarity index 93%
rename from test/simulator-group/dmaapmr/docker-compose.yaml
rename to test/simulator-group/dmaapmr/docker-compose.yml
index b418028..c468b2f 100644
--- a/test/simulator-group/dmaapmr/docker-compose.yaml
+++ b/test/simulator-group/dmaapmr/docker-compose.yml
@@ -42,6 +42,9 @@
- ./mnt/zk/zk_server_jaas.conf:/etc/zookeeper/secrets/jaas/zk_server_jaas.conf
networks:
- default
+ labels:
+ - "nrttest_app=DMAAPMR"
+ - "nrttest_dp=ZooKeeper"
kafka:
image: $ONAP_KAFKA_IMAGE
@@ -66,9 +69,12 @@
volumes:
- ./mnt/kafka/zk_client_jaas.conf:/etc/kafka/secrets/jaas/zk_client_jaas.conf
networks:
- - default
+ - default
depends_on:
- zookeeper
+ labels:
+ - "nrttest_app=DMAAPMR"
+ - "nrttest_dp=Kafka"
dmaap:
image: $ONAP_DMAAPMR_IMAGE
@@ -87,3 +93,6 @@
depends_on:
- zookeeper
- kafka
+ labels:
+ - "nrttest_app=DMAAPMR"
+ - "nrttest_dp=DMAAP Message Router"
diff --git a/test/simulator-group/dmaapmr/mnt/kafka/zk_client_jaas.conf b/test/simulator-group/dmaapmr/mnt/kafka/zk_client_jaas.conf
index d4ef1eb..dca46d5 100644
--- a/test/simulator-group/dmaapmr/mnt/kafka/zk_client_jaas.conf
+++ b/test/simulator-group/dmaapmr/mnt/kafka/zk_client_jaas.conf
@@ -2,4 +2,5 @@
org.apache.zookeeper.server.auth.DigestLoginModule required
username="kafka"
password="kafka_secret";
- };
\ No newline at end of file
+ };
+
diff --git a/test/simulator-group/dmaapmr/mnt/mr/KUBE-MsgRtrApi.properties b/test/simulator-group/dmaapmr/mnt/mr/KUBE-MsgRtrApi.properties
index 66c7db1..e174b6f 100644
--- a/test/simulator-group/dmaapmr/mnt/mr/KUBE-MsgRtrApi.properties
+++ b/test/simulator-group/dmaapmr/mnt/mr/KUBE-MsgRtrApi.properties
@@ -1,8 +1,8 @@
# LICENSE_START=======================================================
# org.onap.dmaap
# ================================================================================
-# Copyright © 2020 Nordix Foundation. All rights reserved.
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2020 Nordix Foundation. All rights reserved.
+# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -170,4 +170,5 @@
kafka.max.poll.interval.ms=300000
kafka.heartbeat.interval.ms=60000
kafka.session.timeout.ms=240000
-kafka.max.poll.records=1000
\ No newline at end of file
+kafka.max.poll.records=1000
+
diff --git a/test/simulator-group/dmaapmr/mnt/mr/MsgRtrApi.properties b/test/simulator-group/dmaapmr/mnt/mr/MsgRtrApi.properties
index 573a81a..dc5ddd7 100644
--- a/test/simulator-group/dmaapmr/mnt/mr/MsgRtrApi.properties
+++ b/test/simulator-group/dmaapmr/mnt/mr/MsgRtrApi.properties
@@ -1,8 +1,8 @@
# LICENSE_START=======================================================
# org.onap.dmaap
# ================================================================================
-# Copyright © 2020 Nordix Foundation. All rights reserved.
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2020 Nordix Foundation. All rights reserved.
+# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -170,4 +170,5 @@
kafka.max.poll.interval.ms=300000
kafka.heartbeat.interval.ms=60000
kafka.session.timeout.ms=240000
-kafka.max.poll.records=1000
\ No newline at end of file
+kafka.max.poll.records=1000
+
diff --git a/test/simulator-group/dmaapmr/mnt/mr/cadi.properties b/test/simulator-group/dmaapmr/mnt/mr/cadi.properties
index dca56c8..4d28b52 100644
--- a/test/simulator-group/dmaapmr/mnt/mr/cadi.properties
+++ b/test/simulator-group/dmaapmr/mnt/mr/cadi.properties
@@ -16,4 +16,5 @@
cadi_loglevel=INFO
cadi_protocols=TLSv1.1,TLSv1.2
cadi_latitude=37.78187
-cadi_longitude=-122.26147
\ No newline at end of file
+cadi_longitude=-122.26147
+
diff --git a/test/simulator-group/dmaapmr/mnt/mr/logback.xml b/test/simulator-group/dmaapmr/mnt/mr/logback.xml
index 8471208..02499fb 100644
--- a/test/simulator-group/dmaapmr/mnt/mr/logback.xml
+++ b/test/simulator-group/dmaapmr/mnt/mr/logback.xml
@@ -1,7 +1,7 @@
<!--
============LICENSE_START=======================================================
- Copyright © 2020 Nordix Foundation. All rights reserved.
- Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ Copyright © 2020 Nordix Foundation. All rights reserved.
+ Copyright © 2019 AT&T Intellectual Property. All rights reserved.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -207,3 +207,4 @@
</root>
</configuration>
+
diff --git a/test/simulator-group/dmaapmr/mnt/zk/zk_server_jaas.conf b/test/simulator-group/dmaapmr/mnt/zk/zk_server_jaas.conf
index 26bf460..9a32a72 100644
--- a/test/simulator-group/dmaapmr/mnt/zk/zk_server_jaas.conf
+++ b/test/simulator-group/dmaapmr/mnt/zk/zk_server_jaas.conf
@@ -1,4 +1,5 @@
Server {
org.apache.zookeeper.server.auth.DigestLoginModule required
user_kafka=kafka_secret;
-};
\ No newline at end of file
+};
+