Remove DMaaP from Solution

VES Collector writes to Kafka directly

VES Collector exposes https

Issue-ID: OAM-434
Change-Id: I1433123e4a5fdaa67f06b629d99771c26dd10aad
Signed-off-by: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>

diff --git a/solution/README.md b/solution/README.md
index 9d89613..5386d7d 100644 (file)
--- a/solution/README.md
+++ b/solution/README.md
@@ -87,7 +87,7 @@ A python parser package is required.
 ```
 python3 -m venv .oam
 source .oam/bin/activate
-pip3 install requirements.txt
+pip3 install -r requirements.txt
 ```
 
 ### ETC Host (DNS function)

diff --git a/solution/smo/oam/.env b/solution/smo/oam/.env
index 88f44bb..12c098d 100644 (file)
--- a/solution/smo/oam/.env
+++ b/solution/smo/oam/.env
@@ -39,10 +39,11 @@ SDNC_WEB_IMAGE=nexus3.onap.org:10001/onap/sdnc-web-image:2.6.1
 SDNC_WEB_PORT=8080
 
 ## VES Collector
-VES_COLLECTOR_IMAGE=nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.10.1
+VES_COLLECTOR_IMAGE=nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.12.5
 VES_COMMON_HEADER_VERSION=7.2.1
 VES_ENDPOINT_PROTOCOL=http
 VES_ENDPOINT_PORT=8080
 VES_ENDPOINT_AUTH_METHOD=basic-auth
 VES_ENDPOINT_USERNAME=sample1
 VES_ENDPOINT_PASSWORD=sample1
+VES_KAFKA_BOOTSTRAP_SERVERS=kafka:9092

diff --git a/solution/smo/oam/docker-compose.yaml b/solution/smo/oam/docker-compose.yaml
index f7dce3a..7a57601 100755 (executable)
--- a/solution/smo/oam/docker-compose.yaml
+++ b/solution/smo/oam/docker-compose.yaml
@@ -140,7 +140,7 @@ services:
       timeout: 4s
       retries: 5
     environment:
-      DMAAPHOST: messages
+      BOOTSTRAP_SERVERS: ${VES_KAFKA_BOOTSTRAP_SERVERS}
     volumes:
       - ./ves-collector/collector.properties:/opt/app/VESCollector/etc/collector.properties
       - ./ves-collector/ves-dmaap-config.json:/opt/app/VESCollector/etc/ves-dmaap-config.json