aboutsummaryrefslogtreecommitdiffstats
path: root/development
diff options
context:
space:
mode:
authorFilip Krzywka <filip.krzywka@nokia.com>2019-02-28 17:33:02 +0100
committerFilip Krzywka <filip.krzywka@nokia.com>2019-03-11 14:51:58 +0100
commit1422bed4c1a002e663fd7c2c4c204831e5f7aa9a (patch)
tree18247d0af6cb8aa615934969c24249227e07d9a2 /development
parentcc581b7f4833fe47ad3eb846d432ca0ffa1c66f4 (diff)
Use CBS by means of SDK in place of Consul
- changed IO creation in main to fix error with too early calling changeState method on collector HealthState - increased coverage a little with few tests - corrected coverage-report pom file to include new modules - temporarily changed to 1.1.4-SNAPSHOT version of sdk due to need of new version of CBSLookup Change-Id: Ic73b46cf881ab4fabf52bef0327b09082aa90dc6 Issue-ID: DCAEGEN2-1302 Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
Diffstat (limited to 'development')
-rw-r--r--development/consul.d/cbs.json10
-rw-r--r--development/docker-compose.yml73
2 files changed, 53 insertions, 30 deletions
diff --git a/development/consul.d/cbs.json b/development/consul.d/cbs.json
new file mode 100644
index 00000000..0761c7e5
--- /dev/null
+++ b/development/consul.d/cbs.json
@@ -0,0 +1,10 @@
+{
+ "service": {
+ "name": "cbs",
+ "tags": [
+ "cbs"
+ ],
+ "port": 10000,
+ "address": "config-binding-service"
+ }
+}
diff --git a/development/docker-compose.yml b/development/docker-compose.yml
index c93100ef..708c8f3e 100644
--- a/development/docker-compose.yml
+++ b/development/docker-compose.yml
@@ -8,13 +8,13 @@ services:
message-router-zookeeper:
image: wurstmeister/zookeeper
ports:
- - "2181:2181"
+ - "2181:2181"
message-router-kafka:
-# image: nexus3.onap.org:10001/onap/dmaap/kafka01101:0.0.1
+ # image: nexus3.onap.org:10001/onap/dmaap/kafka01101:0.0.1
image: wurstmeister/kafka
ports:
- - "9092:9092"
+ - "9092:9092"
environment:
KAFKA_AUTO_CREATE_TOPICS_ENABLE: 'true'
KAFKA_ZOOKEEPER_CONNECT: "message-router-zookeeper:2181"
@@ -23,9 +23,9 @@ services:
KAFKA_LISTENERS: "INTERNAL_PLAINTEXT://0.0.0.0:9092"
KAFKA_INTER_BROKER_LISTENER_NAME: "INTERNAL_PLAINTEXT"
volumes:
- - /var/run/docker.sock:/var/run/docker.sock
+ - /var/run/docker.sock:/var/run/docker.sock
depends_on:
- - message-router-zookeeper
+ - message-router-zookeeper
#
@@ -35,23 +35,34 @@ services:
consul-server:
image: docker.io/consul:1.0.6
ports:
- - "8500:8500"
- command: ["agent","-bootstrap", "-client=0.0.0.0", "-server", "-ui"]
+ - "8500:8500"
+ command: ["agent","-bootstrap", "-client=0.0.0.0", "-server", "-ui", "-config-dir=/consul/consul.d"]
+ volumes:
+ - ./consul.d/:/consul/consul.d
consul-config:
image: consul
- depends_on:
- - consul-server
restart: on-failure
- command: ["kv", "put", "-http-addr=http://consul-server:8500", "veshv-config", '{
+ command: ["kv", "put", "-http-addr=http://consul-server:8500", "dcae-hv-ves-collector", '{
"collector.routing": [
{
"fromDomain": "perf3gpp",
"toTopic": "HV_VES_PERF3GPP"
}
]
- }']
+ }'
+ ]
+ depends_on:
+ - consul-server
+ config-binding-service:
+ image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding.app-app:2.2.4
+ ports:
+ - "10000:10000"
+ environment:
+ CONSUL_HOST: "consul-server"
+ depends_on:
+ - consul-config
#
# DCAE HV VES Collector
@@ -60,30 +71,32 @@ services:
ves-hv-collector:
image: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:latest
ports:
- - "6060:6060"
- - "6061:6061/tcp"
+ - "6060:6060"
+ - "6061:6061/tcp"
command: ["--listen-port", "6061",
"--health-check-api-port", "6060",
- "--config-url", "http://consul-server:8500/v1/kv/veshv-config?raw=true",
"--kafka-bootstrap-servers", "message-router-kafka:9092",
"--key-store-password", "onaponap",
"--trust-store-password", "onaponap",
- "--first-request-delay", "2",
+ "--first-request-delay", "5",
"--log-level", "DEBUG"]
environment:
JAVA_OPTS: "-Dio.netty.leakDetection.level=paranoid -Dlogback.configurationFile=/etc/ONAP/dcae-hv-ves-collector/logback.xml"
+ CONSUL_HOST: "consul-server"
+ CONFIG_BINDING_SERVICE: "cbs"
+ HOSTNAME: "dcae-hv-ves-collector"
healthcheck:
test: ./healthcheck.sh || exit 1
interval: 10s
timeout: 3s
retries: 3
- start_period: 20s
+ start_period: 15s
depends_on:
- - message-router-kafka
- - consul-config
+ - message-router-kafka
+ - config-binding-service
volumes:
- - ./ssl/:/etc/ves-hv/
- - ./logs:/var/log/ONAP/dcae-hv-ves-collector
+ - ./ssl/:/etc/ves-hv/
+ - ./logs:/var/log/ONAP/dcae-hv-ves-collector
#
@@ -93,8 +106,8 @@ services:
xnf-simulator:
image: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-xnf-simulator
ports:
- - "6062:6062/tcp"
- - "6063:6063"
+ - "6062:6062/tcp"
+ - "6063:6063"
command: ["--listen-port", "6062",
"--health-check-api-port", "6063",
"--ves-host", "ves-hv-collector",
@@ -109,19 +122,19 @@ services:
retries: 3
start_period: 10s
depends_on:
- - ves-hv-collector
+ - ves-hv-collector
volumes:
- ./ssl/:/etc/ves-hv/
dcae-app-simulator:
image: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-dcae-app-simulator
ports:
- - "6064:6064/tcp"
+ - "6064:6064/tcp"
command: ["--listen-port", "6064",
"--kafka-bootstrap-servers", "message-router-kafka:9092",
"--kafka-topics", "HV_VES_PERF3GPP"]
depends_on:
- - message-router-kafka
+ - message-router-kafka
#
# Monitoring
@@ -136,16 +149,16 @@ services:
grafana:
image: grafana/grafana
ports:
- - "3000:3000"
+ - "3000:3000"
environment:
GF_AUTH_DISABLE_LOGIN_FORM: "true"
GF_AUTH_DISABLE_SIGNOUT_MENU: "true"
GF_AUTH_ANONYMOUS_ENABLED: "true"
GF_AUTH_ANONYMOUS_ORG_ROLE: "Admin"
volumes:
- - ./grafana/datasources:/etc/grafana/provisioning/datasources
- - ./grafana/dashboards-providers:/etc/grafana/provisioning/dashboards
- # defined in ./grafana/dashboards-providers/dasboard-providers.yaml
- - ./grafana/dashboards:/var/lib/grafana/dashboards/hv-ves
+ - ./grafana/datasources:/etc/grafana/provisioning/datasources
+ - ./grafana/dashboards-providers:/etc/grafana/provisioning/dashboards
+ # defined in ./grafana/dashboards-providers/dasboard-providers.yaml
+ - ./grafana/dashboards:/var/lib/grafana/dashboards/hv-ves