X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=plans%2Fdcaegen2-collectors-hv-ves%2Ftestsuites%2Fdocker-compose.yml;h=441ad35c657880d0dd5a6b03777146cf040610cc;hb=70d73b28bf67092efc4c7983ac04ad759f5056e9;hp=67178353c0e1e1d137cd643e0c576c30e2ca092a;hpb=7f2c6664854b295eb6779e8df749ac2204f66453;p=integration%2Fcsit.git

diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
index 67178353..441ad35c 100644
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
@@ -1,97 +1,133 @@
 version: "3"
+# ============LICENSE_START=======================================================
+# csit-dcaegen2-collectors-hv-ves
+# ================================================================================
+# Copyright (C) 2018-2019 NOKIA
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+
 
 networks:
-  ves-hv-default:
+  hv-ves-default:
     external:
       name: $CONTAINERS_NETWORK
 
 services:
+
+  #
+  # DMaaP Message Router
+  #
+
   zookeeper:
-    image: wurstmeister/zookeeper
+    image: ${ZOOKEEPER_IMAGE_FULL_NAME}
     ports:
-    - "2181:2181"
+      - "2181:2181"
     networks:
-    - ves-hv-default
+      - hv-ves-default
 
   kafka:
-    image: wurstmeister/kafka
+    image: ${KAFKA_IMAGE_FULL_NAME}
     ports:
-    - "9092:9092"
+      - "9092:9092"
+      - "9093:9093"
     environment:
-      KAFKA_ADVERTISED_HOST_NAME: "kafka"
-      KAFKA_AUTO_CREATE_TOPICS_ENABLE: 'true'
+      HOST_IP: 127.0.0.1
+      KAFKA_BROKER_ID: 0
+      ENDPOINT_PORT: 30490
       KAFKA_ZOOKEEPER_CONNECT: "zookeeper:2181"
-      KAFKA_ADVERTISED_LISTENERS: "PLAINTEXT://kafka:9092"
+      KAFKA_AUTO_CREATE_TOPICS_ENABLE: "true"
+      KAFKA_DELETE_TOPIC_ENABLE: "true"
+
+      KAFKA_LISTENERS: "INTERNAL_SASL_PLAINTEXT://0.0.0.0:9092,EXTERNAL_SASL_PLAINTEXT://0.0.0.0:9093"
+      KAFKA_ADVERTISED_LISTENERS: "INTERNAL_SASL_PLAINTEXT://:9092,EXTERNAL_SASL_PLAINTEXT://:9093"
+      KAFKA_ADVERTISED_HOST_NAME: "kafka"
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "INTERNAL_SASL_PLAINTEXT:SASL_PLAINTEXT,EXTERNAL_SASL_PLAINTEXT:SASL_PLAINTEXT"
+      KAFKA_INTER_BROKER_LISTENER_NAME: "INTERNAL_SASL_PLAINTEXT"
+      KAFKA_SASL_ENABLED_MECHANISMS: "PLAIN"
+      KAFKA_SASL_MECHANISM_INTER_BROKER_PROTOCOL: "PLAIN"
+      KAFKA_AUTHORIZER_CLASS_NAME: "org.onap.dmaap.kafkaAuthorize.KafkaCustomAuthorizer"
+
+      aaf_locate_url: https://aaf-locate:8095
+      KAFKA_LOG_DIRS: /opt/kafka/data
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_DEFAULT_REPLICATION_FACTOR: 1
+      KAFKA_NUM_PARTITIONS: 1
     volumes:
-    - /var/run/docker.sock:/var/run/docker.sock
+      - /var/run/docker.sock:/var/run/docker.sock
     depends_on:
-    - zookeeper
+      - zookeeper
     networks:
-    - ves-hv-default
+      - hv-ves-default
 
-  consul:
-    image: progrium/consul
-    ports:
-    - "8500:8500"
-    environment:
-    - CONSUL_BIND_INTERFACE=eth0
-    networks:
-      ves-hv-default:
-        aliases:
-        - consul
-    command: ["-server", "-bootstrap"]
+  #
+  # DCAE HV VES Collector
+  #
 
-  ves-hv-collector:
+  hv-ves-collector:
     image: ${DOCKER_REGISTRY}/${HV_VES_COLLECTOR_NAMESPACE}/${HV_VES_GROUP_ID}.${HV_VES_IMAGE}:${HV_VES_VERSION}
     ports:
-    - "6060:6060"
-    - "6061:6061/tcp"
-    command: ["--listen-port", "6061",
-              "--config-url", "${HV_VES_CONFIG_URL}",
-              "--kafka-bootstrap-servers", "kafka:9092",
-              "--key-store-password", "onaponap",
-              "--trust-store-password", "onaponap"]
+      - "6060:6060"
+      - "6061:6061/tcp"
+    command: ["--configuration-file", "/etc/ves-hv/configuration/secure.json"]
     environment:
-      JAVA_OPTS: "-Dio.netty.leakDetection.level=paranoid"
+      - JAVA_OPTS
+      - HOSTNAME=${HV_VES_HOSTNAME}
+      - CONSUL_HOST
+      - CONFIG_BINDING_SERVICE
+      - CONFIG_BINDING_SERVICE_SERVICE_PORT
+      - CBS_CLIENT_CONFIG_PATH
     healthcheck:
       interval: 10s
       timeout: 5s
       retries: 2
       test: ${HV_VES_HEALTHCHECK_CMD}
-    depends_on:
-    - kafka
     volumes:
-    - ./ssl/:/etc/ves-hv/
+      - ./collector/:/etc/ves-hv/
+    depends_on:
+      - kafka
     networks:
-    - ves-hv-default
+      - hv-ves-default
 
-  unencrypted-ves-hv-collector:
+  unencrypted-hv-ves-collector:
     image: ${DOCKER_REGISTRY}/${HV_VES_COLLECTOR_NAMESPACE}/${HV_VES_GROUP_ID}.${HV_VES_IMAGE}:${HV_VES_VERSION}
     ports:
-    - "7060:6060"
-    - "7061:6061/tcp"
-    command: ["--listen-port", "6061",
-              "--config-url", "${HV_VES_CONFIG_URL}",
-              "--kafka-bootstrap-servers", "kafka:9092",
-              "--ssl-disable"]
+      - "7060:6060"
+      - "7061:6061/tcp"
+    command: ["--configuration-file", "/etc/ves-hv/configuration/insecure.json"]
     environment:
-      JAVA_OPTS: "-Dio.netty.leakDetection.level=paranoid"
+      - JAVA_OPTS
+      - HOSTNAME=${HV_VES_HOSTNAME}
+      - CONSUL_HOST
+      - CONFIG_BINDING_SERVICE
+      - CONFIG_BINDING_SERVICE_SERVICE_PORT
+      - CBS_CLIENT_CONFIG_PATH
     healthcheck:
       interval: 10s
       timeout: 5s
       retries: 2
       test: ${HV_VES_HEALTHCHECK_CMD}
-    depends_on:
-    - kafka
     volumes:
-    - ./ssl/:/etc/ves-hv/
+      - ./collector/:/etc/ves-hv/
+    depends_on:
+      - kafka
     networks:
-    - ves-hv-default
+      - hv-ves-default
 
   dcae-app-simulator:
     image: ${DOCKER_REGISTRY}/${HV_VES_COLLECTOR_NAMESPACE}/${HV_VES_GROUP_ID}.${DCAE_APP_SIMULATOR_IMAGE}:${HV_VES_VERSION}
     ports:
-    - "6063:6063/tcp"
+      - "6063:6063/tcp"
     command: ["--listen-port", "6063", "--kafka-bootstrap-servers", "kafka:9092", "--kafka-topics", "non-existing-topic"]
     healthcheck:
       interval: 10s
@@ -99,9 +135,7 @@ services:
       retries: 2
       test: "curl --request GET --fail --silent --show-error localhost:6063/healthcheck"
     depends_on:
-    - kafka
+      - kafka
     networks:
-      ves-hv-default:
-        aliases:
-        - dcae-app-simulator
+      - hv-ves-default