diff options
39 files changed, 352 insertions, 64 deletions
diff --git a/sanitycheck/Makefile b/sanitycheck/Makefile index 85800a0..84b3483 100644 --- a/sanitycheck/Makefile +++ b/sanitycheck/Makefile @@ -8,48 +8,57 @@ build: @echo "##### DONE #####" start: build - @echo "##### start (dmaap sim,ves,ves-client sim) #####" + @echo "##### Starting #####" + make -C ./ves-client start make -C ves start - make -C ../../ves-client start + make -C ./https-server start + make -C ./netconf start @echo "##### DONE #####" stop: - @echo "##### Stop (dmaap sim,ves,ves-client sim) #####" + @echo "##### Stoping #####" make -C ves stop - make -C ../../ves-client stop + make -C ./https-server stop + make -C ./netconf stop + make -C ./ves-client stop + docker network rm nf-simulator-network @echo "##### DONE #####" -upload-file-http-server: - @echo "##### Upload file to Http server #####" - curl -F "uploaded_file=@./resources/E_VES_bulkPM_IF_3GPP_3_example_1.xml.gz" -u demo:demo123456! http://localhost:32080/upload.php - @echo "\n##### DONE #####" + +# ves client +reconfigure-ves-url: + make -C ./ves-client reconfigure-ves-url generate-event: - @echo "##### Trigger VES client to generate event #####" - curl -X POST http://localhost:5000/simulator/event -d @events/eventToVes.json --header "Content-Type: application/json" - @echo "\n##### DONE #####" + make -C ./ves-client generate-event -generate-event-http-server: - @echo "##### Trigger VES client to generate event with Http Server #####" - curl -X POST http://localhost:5000/simulator/event -d @events/eventToVesWithHttpServer.json --header "Content-Type: application/json" - @echo "\n##### DONE #####" +generate-multiple-events: + make -C ./ves-client generate-multiple-events -reconfigure-ves-url: - @echo "##### Change VES address configuration in VES client#####" - curl -X PUT http://localhost:5000/simulator/config -d @events/vesAddressConfiguration.json --header "Content-Type: application/json" - @echo "\n##### DONE #####" -generate-multiple-events: - @echo "\n##### Trigger VES client to generate multiple events #####" - curl -X POST http://localhost:5000/simulator/start -d @events/fewEventsToVes.json --header "Content-Type: application/json" - @echo "\n##### DONE #####" +# http server +upload-file-http-server: + make -C ./https-server upload-file-http-server + +generate-event-http-server: + make -C ./https-server generate-event-http-server generate-multiple-events-http-server: - @echo "\n##### Trigger VES client to generate multiple events with http server#####" - curl -X POST http://localhost:5000/simulator/start -d @events/fewEventsToVesWithHttpServer.json --header "Content-Type: application/json" - @echo "\n##### DONE #####" + make -C ./https-server generate-multiple-events-http-server + +# netconf server +change-config: + make -C ./netconf change-config + + +# dmaap check-dmaap: @echo "##### Check dmaap simulator for collected events #####" make -C dmaap-simulator get-data @echo "\n##### DONE #####" + +clean-dmaap: + @echo "##### Check dmaap simulator for collected events #####" + make -C dmaap-simulator clean-data + @echo "\n##### DONE #####" diff --git a/sanitycheck/README.md b/sanitycheck/README.md index 643db18..10f7cf1 100644 --- a/sanitycheck/README.md +++ b/sanitycheck/README.md @@ -1,68 +1,105 @@ -### Run test case ves client -> ves collector -> dmaap simulator +# Sanity check for NF simulator -### Prerequisites -* Check your docker network ip: -``` -ip a | grep docker0 | grep inet -``` -If the IP address is different than 172.17.0.1/16: -inet 172.17.0.1/16 brd 172.17.255.255 scope global docker0 +## Build and run NF simulator -You have to change the IP address in file events/vesAddressConfiguration.json -``` -{ - "vesServerUrl": "http://<IP_Address>:8080/eventListener/v7" -} -``` +### 1. Build and start projects +**In order to start NF simulator for testing local images are required**: +- onap/org.onap.integration.nfsimulator.vesclient +- onap/org.onap.integration.nfsimulator.netconfserver +- onap/org.onap.integration.nfsimulator.avcnmanager +- onap/org.onap.integration.nfsimulator.pmhttpsserver -If you want use event with http server files: -``` -make upload-file-http-server -``` -### 1. Build Projects ``` make start ``` + ### 2. Reconfigure ves url +if this command returns `curl: (56) Recv failure: Connection reset by peer`, +it means VES-Client is not ready yet. Pleas try again after few seconds. ``` make reconfigure-ves-url ``` -### 2.1 Check dmaap sim should return empty list ``` make check-dmaap ``` -### 3. Send one event -### 3.1 Send events: + + +## Run test case: +### ves-client -> ves-collector -> dmaap-simulator + +### 1. Send one event ``` make generate-event ``` -send event with files from Http Server +dmaap should return list containing 1 event +``` +make check-dmaap +``` +``` +make clean-dmaap +``` +### 2. Send one http event ``` generate-event-http-server ``` -### 3.2 Check dmaap sim -should return list containing 1 event +dmaap should return list containing 1 event ``` make check-dmaap ``` -### 4. Send few events: -### 4.1 Send events +``` +make clean-dmaap +``` +### 3. Send few events: this will send 4 event with interval 1 second ``` make generate-multiple-events ``` +dmaap should return list containing 4 event, +if run least 4 seconds after `generate-multiple-events` +``` +make check-dmaap +``` +``` +make clean-dmaap +``` +### 3. Send few Http events: this event will send 2 events with files from Http Server with interval 5 second ``` make generate-multiple-events-http-server ``` -### 4.2 Check dmaap sim -should return list containing 5 event (1 from point 3.1 and 4 from point 4.1) +dmaap should return list containing 2 event, +if run least 10 seconds after `generate-multiple-events-http-server` +``` +make check-dmaap +``` +``` +make clean-dmaap +``` + + +## Run test case: +### netconf-server -> kafka -> avcn-manager -> ves-client -> ves-collector -> dmaap-simulator + +### 1. Change configuration of network model +This command will change configuration of test model. +In case new configuration is same as old, no event will be generated. +In that case please change numeric values in file +`./netconf/test_models/test-model.data.xml` +``` +make change-config +``` +dmaap should return list containing 3 event ``` make check-dmaap ``` -### 5. Clear environment +``` +make clean-dmaap +``` + + +## Stop project and clear environment ``` make stop ``` diff --git a/sanitycheck/dmaap-simulator/Makefile b/sanitycheck/dmaap-simulator/Makefile index af8f162..27aedcd 100644 --- a/sanitycheck/dmaap-simulator/Makefile +++ b/sanitycheck/dmaap-simulator/Makefile @@ -21,3 +21,8 @@ get-data: @echo "##### Get data fetched by dmaap-simulator #####\n" curl -i -H "Accept: application/json" -H "Content-Type: application/json" -X GET http://localhost:3904/events @echo "\n\n##### DONE #####" + +clean-data: + @echo "##### Clean data saved by dmaap-simulator #####\n" + curl -i -H "Accept: application/json" -H "Content-Type: application/json" -X DELETE http://localhost:3904/events + @echo "\n\n##### DONE #####" diff --git a/sanitycheck/dmaap-simulator/simulator.py b/sanitycheck/dmaap-simulator/simulator.py index 6a06266..136afb8 100644 --- a/sanitycheck/dmaap-simulator/simulator.py +++ b/sanitycheck/dmaap-simulator/simulator.py @@ -22,6 +22,12 @@ def get_events(): return resp +@app.route("/events", methods=['DELETE']) +def clear_events(): + events.clear() + return {}, 200 + + @app.route("/events/<path:topic>", methods=['GET']) def get_events_from_topic(topic): resp = Response(json.dumps(get_events_from_map(topic))) diff --git a/sanitycheck/events/vesAddressConfiguration.json b/sanitycheck/events/vesAddressConfiguration.json deleted file mode 100644 index 9c6aa22..0000000 --- a/sanitycheck/events/vesAddressConfiguration.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "vesServerUrl": "http://172.17.0.1:8080/eventListener/v7" -} diff --git a/sanitycheck/https-server/Makefile b/sanitycheck/https-server/Makefile new file mode 100644 index 0000000..00bd3d9 --- /dev/null +++ b/sanitycheck/https-server/Makefile @@ -0,0 +1,28 @@ +all: start + +.PHONY: start + +start: + @echo "##### Start HTTPS server #####" + docker-compose up -d + @echo "##### DONE #####" + +stop: + @echo "##### Stop HTTPS server #####" + docker-compose down + @echo "##### DONE #####" + +upload-file-http-server: + @echo "##### Upload file to Http server #####" + curl -F "uploaded_file=@./resources/E_VES_bulkPM_IF_3GPP_3_example_1.xml.gz" -u demo:demo123456! http://localhost:32080/upload.php + @echo "\n##### DONE #####" + +generate-event-http-server: + @echo "##### Trigger VES client to generate event with Http Server #####" + curl -X POST http://localhost:5000/simulator/event -d @events/eventToVesWithHttpServer.json --header "Content-Type: application/json" + @echo "\n##### DONE #####" + +generate-multiple-events-http-server: + @echo "\n##### Trigger VES client to generate multiple events with http server#####" + curl -X POST http://localhost:5000/simulator/start -d @events/fewEventsToVesWithHttpServer.json --header "Content-Type: application/json" + @echo "\n##### DONE #####" diff --git a/sanitycheck/https-server/docker-compose.yml b/sanitycheck/https-server/docker-compose.yml new file mode 100644 index 0000000..fabce9a --- /dev/null +++ b/sanitycheck/https-server/docker-compose.yml @@ -0,0 +1,33 @@ +version: "2.1" + +services: + + http-server: + image: onap/org.onap.integration.nfsimulator.pmhttpsserver + ports: + - "32080:80" + - "38080:8080" + - "32443:443" + - "32000:32000" + - "32100:32100" + networks: + - nf-simulator-network + volumes: + - ./volumes/httpservervolumes/:/usr/local/apache2/htdocs + - ./volumes/logs:/var/log/apache2 + command: bash -c " + echo 'Http Server start'; + while [[ $$(ls -1 /etc/apache2/certs/ | wc -l) != '3' ]]; do echo 'Waiting for certs...'; sleep 3; done; + chmod 777 /usr/local/apache2/htdocs; + cp /usr/local/apache2/conf/upload.php /usr/local/apache2/htdocs/upload.php; + touch /usr/local/apache2/htdocs/index.html; + /usr/sbin/apache2ctl -D FOREGROUND; + " + restart: on-failure + +# +# external network +networks: + nf-simulator-network: + external: + name: nf-simulator-network diff --git a/sanitycheck/events/eventToVesWithHttpServer.json b/sanitycheck/https-server/events/eventToVesWithHttpServer.json index a5e0a27..a5e0a27 100644 --- a/sanitycheck/events/eventToVesWithHttpServer.json +++ b/sanitycheck/https-server/events/eventToVesWithHttpServer.json diff --git a/sanitycheck/events/fewEventsToVesWithHttpServer.json b/sanitycheck/https-server/events/fewEventsToVesWithHttpServer.json index de3f100..de3f100 100644 --- a/sanitycheck/events/fewEventsToVesWithHttpServer.json +++ b/sanitycheck/https-server/events/fewEventsToVesWithHttpServer.json diff --git a/sanitycheck/resources/E_VES_bulkPM_IF_3GPP_3_example_1.xml.gz b/sanitycheck/https-server/resources/E_VES_bulkPM_IF_3GPP_3_example_1.xml.gz Binary files differindex 3af5ea8..3af5ea8 100644 --- a/sanitycheck/resources/E_VES_bulkPM_IF_3GPP_3_example_1.xml.gz +++ b/sanitycheck/https-server/resources/E_VES_bulkPM_IF_3GPP_3_example_1.xml.gz diff --git a/sanitycheck/netconf/Makefile b/sanitycheck/netconf/Makefile new file mode 100644 index 0000000..b880202 --- /dev/null +++ b/sanitycheck/netconf/Makefile @@ -0,0 +1,22 @@ +all: start + +.PHONY: start + +start: + @echo "##### Start NETCONF server with AVCN manager #####" + docker-compose up -d + @echo "##### DONE #####" + +stop: + @echo "##### Stop NETCONF server with AVCN manager #####" + docker-compose down + @echo "##### DONE #####" + +health-check: + @echo "##### NETCONF simulator Health check #####\n" + curl -i -H "Accept: application/json" -H "Content-Type: application/json" -X GET http://localhost:6555/readiness + +change-config: + @echo "##### Trigger config change for model test-model #####" + curl -X POST http://localhost:6555/change_config/test-model -d @test_models/test-model.data.xml --header "Content-Type: application/xml" + @echo "\n##### DONE #####" diff --git a/sanitycheck/netconf/docker-compose.yml b/sanitycheck/netconf/docker-compose.yml new file mode 100644 index 0000000..6db483d --- /dev/null +++ b/sanitycheck/netconf/docker-compose.yml @@ -0,0 +1,75 @@ +version: '3.5' + +services: + +# +# Kafka + + zookeeper: + image: wurstmeister/zookeeper + ports: + - "2181:2181" + networks: + - nf-simulator-network + + kafka1: + image: wurstmeister/kafka:1.1.0 + ports: + - "9092:9092" + hostname: kafka1 + networks: + - nf-simulator-network + environment: + KAFKA_ADVERTISED_PORT: 9092 + KAFKA_ADVERTISED_HOST_NAME: kafka1 + KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181 + KAFKA_CREATE_TOPICS: "config:1:1" + KAFKA_DELETE_RETENTION_MS: 604800000 + KAFKA_LOG_CLEANER_DELETE_RETENTION_MS: 604800000 + depends_on: + - zookeeper + +# +# NETCONF - server + + netconf-server: + container_name: netconf-server + image: onap/org.onap.integration.nfsimulator.netconfserver:latest + ports: + - "830:830" + - "6513:6513" + - "6555:6555" + volumes: + - ./test_models:/resources/models + networks: + - nf-simulator-network + depends_on: + - zookeeper + - kafka1 + +# +# AVCN - manager + avcn-manager: + image: onap/org.onap.integration.nfsimulator.avcnmanager:latest + ports: + - "9090:8080" + restart: on-failure + hostname: avcn-manager + networks: + - nf-simulator-network + environment: + REST_CLIENT_VES_ENDPOINT: https://sample1:sample1@ves:8443/eventListener/v7 + KAFKA_BOOTSTRAP_SERVERS: kafka1:9092 + KAFKA_SOURCE_TOPIC: config + KAFKA_APPLICATION_ID: avcn-manager + REST_CLIENT_PNFSIMULATOR_ENDPOINT: http://ves-client:5000/simulator/start + depends_on: + - zookeeper + - kafka1 + +# +# external network +networks: + nf-simulator-network: + external: + name: nf-simulator-network diff --git a/sanitycheck/netconf/test_models/models-configuration.ini b/sanitycheck/netconf/test_models/models-configuration.ini new file mode 100644 index 0000000..1fee0aa --- /dev/null +++ b/sanitycheck/netconf/test_models/models-configuration.ini @@ -0,0 +1,2 @@ +[SUBSCRIPTION] +models = test-model diff --git a/sanitycheck/netconf/test_models/test-model.data.xml b/sanitycheck/netconf/test_models/test-model.data.xml new file mode 100644 index 0000000..8f30188 --- /dev/null +++ b/sanitycheck/netconf/test_models/test-model.data.xml @@ -0,0 +1,25 @@ +<!-- + ============LICENSE_START======================================================= + Simulator + ================================================================================ + Copyright (C) 2021 Nokia. 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. + 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========================================================= + --> + +<config xmlns="http://onap.org/test-model"> + <itemValue1>45</itemValue1> + <itemValue2>37</itemValue2> + <itemValue3>58</itemValue3> +</config> diff --git a/sanitycheck/netconf/test_models/test-model.yang b/sanitycheck/netconf/test_models/test-model.yang new file mode 100644 index 0000000..0f4e699 --- /dev/null +++ b/sanitycheck/netconf/test_models/test-model.yang @@ -0,0 +1,10 @@ +module test-model { + namespace "http://onap.org/test-model"; + prefix config; + container config { + config true; + leaf itemValue1 {type uint32;} + leaf itemValue2 {type uint32;} + leaf itemValue3 {type uint32;} + } +} diff --git a/sanitycheck/ves-client/Makefile b/sanitycheck/ves-client/Makefile new file mode 100644 index 0000000..23f10b4 --- /dev/null +++ b/sanitycheck/ves-client/Makefile @@ -0,0 +1,28 @@ +all: start + +.PHONY: start + +start: + @echo "##### start (dmaap sim,ves,ves-client sim) #####" + make -C ../../ves-client start + @echo "##### DONE #####" + +stop: + @echo "##### Stop (dmaap sim,ves,ves-client sim) #####" + make -C ../../ves-client stop + @echo "##### DONE #####" + +reconfigure-ves-url: + @echo "##### Change VES address configuration in VES client#####" + curl -X PUT http://localhost:5000/simulator/config -d @events/vesAddressConfiguration.json --header "Content-Type: application/json" + @echo "\n##### DONE #####" + +generate-event: + @echo "##### Trigger VES client to generate event #####" + curl -X POST http://localhost:5000/simulator/event -d @events/eventToVes.json --header "Content-Type: application/json" + @echo "\n##### DONE #####" + +generate-multiple-events: + @echo "\n##### Trigger VES client to generate multiple events #####" + curl -X POST http://localhost:5000/simulator/start -d @events/fewEventsToVes.json --header "Content-Type: application/json" + @echo "\n##### DONE #####" diff --git a/sanitycheck/events/eventToVes.json b/sanitycheck/ves-client/events/eventToVes.json index 8d37f5a..8d37f5a 100644 --- a/sanitycheck/events/eventToVes.json +++ b/sanitycheck/ves-client/events/eventToVes.json diff --git a/sanitycheck/events/fewEventsToVes.json b/sanitycheck/ves-client/events/fewEventsToVes.json index 9733469..9733469 100644 --- a/sanitycheck/events/fewEventsToVes.json +++ b/sanitycheck/ves-client/events/fewEventsToVes.json diff --git a/sanitycheck/ves-client/events/vesAddressConfiguration.json b/sanitycheck/ves-client/events/vesAddressConfiguration.json new file mode 100644 index 0000000..c819637 --- /dev/null +++ b/sanitycheck/ves-client/events/vesAddressConfiguration.json @@ -0,0 +1,3 @@ +{ + "vesServerUrl": "https://sample1:sample1@ves:8443/eventListener/v7" +} diff --git a/sanitycheck/vesclient-secured/README.md b/sanitycheck/ves-client/vesclient-secured/README.md index f791afb..f791afb 100644 --- a/sanitycheck/vesclient-secured/README.md +++ b/sanitycheck/ves-client/vesclient-secured/README.md diff --git a/sanitycheck/vesclient-secured/certman/Makefile b/sanitycheck/ves-client/vesclient-secured/certman/Makefile index d75b5d0..d75b5d0 100644 --- a/sanitycheck/vesclient-secured/certman/Makefile +++ b/sanitycheck/ves-client/vesclient-secured/certman/Makefile diff --git a/sanitycheck/vesclient-secured/certman/README.md b/sanitycheck/ves-client/vesclient-secured/certman/README.md index 92985f8..92985f8 100644 --- a/sanitycheck/vesclient-secured/certman/README.md +++ b/sanitycheck/ves-client/vesclient-secured/certman/README.md diff --git a/sanitycheck/vesclient-secured/certman/docker-compose.yml b/sanitycheck/ves-client/vesclient-secured/certman/docker-compose.yml index 2714751..2714751 100644 --- a/sanitycheck/vesclient-secured/certman/docker-compose.yml +++ b/sanitycheck/ves-client/vesclient-secured/certman/docker-compose.yml diff --git a/sanitycheck/vesclient-secured/certservice/Makefile b/sanitycheck/ves-client/vesclient-secured/certservice/Makefile index 0f41b0e..0f41b0e 100644 --- a/sanitycheck/vesclient-secured/certservice/Makefile +++ b/sanitycheck/ves-client/vesclient-secured/certservice/Makefile diff --git a/sanitycheck/vesclient-secured/certservice/README.md b/sanitycheck/ves-client/vesclient-secured/certservice/README.md index a0fc5cb..a0fc5cb 100644 --- a/sanitycheck/vesclient-secured/certservice/README.md +++ b/sanitycheck/ves-client/vesclient-secured/certservice/README.md diff --git a/sanitycheck/vesclient-secured/certservice/docker-compose-certservice-clients.yml b/sanitycheck/ves-client/vesclient-secured/certservice/docker-compose-certservice-clients.yml index d721561..d721561 100644 --- a/sanitycheck/vesclient-secured/certservice/docker-compose-certservice-clients.yml +++ b/sanitycheck/ves-client/vesclient-secured/certservice/docker-compose-certservice-clients.yml diff --git a/sanitycheck/vesclient-secured/certservice/docker-compose-certservice-ejbca.yml b/sanitycheck/ves-client/vesclient-secured/certservice/docker-compose-certservice-ejbca.yml index a400eb9..a400eb9 100644 --- a/sanitycheck/vesclient-secured/certservice/docker-compose-certservice-ejbca.yml +++ b/sanitycheck/ves-client/vesclient-secured/certservice/docker-compose-certservice-ejbca.yml diff --git a/sanitycheck/vesclient-secured/certservice/docker-compose-ves-dmaap.yml b/sanitycheck/ves-client/vesclient-secured/certservice/docker-compose-ves-dmaap.yml index 86f0202..86f0202 100644 --- a/sanitycheck/vesclient-secured/certservice/docker-compose-ves-dmaap.yml +++ b/sanitycheck/ves-client/vesclient-secured/certservice/docker-compose-ves-dmaap.yml diff --git a/sanitycheck/vesclient-secured/certservice/docker-compose-vesclient.yml b/sanitycheck/ves-client/vesclient-secured/certservice/docker-compose-vesclient.yml index f99330b..f99330b 100644 --- a/sanitycheck/vesclient-secured/certservice/docker-compose-vesclient.yml +++ b/sanitycheck/ves-client/vesclient-secured/certservice/docker-compose-vesclient.yml diff --git a/sanitycheck/vesclient-secured/certservice/resources/certs/.gitignore b/sanitycheck/ves-client/vesclient-secured/certservice/resources/certs/.gitignore index 385dcde..385dcde 100644 --- a/sanitycheck/vesclient-secured/certservice/resources/certs/.gitignore +++ b/sanitycheck/ves-client/vesclient-secured/certservice/resources/certs/.gitignore diff --git a/sanitycheck/vesclient-secured/certservice/resources/certs/Makefile b/sanitycheck/ves-client/vesclient-secured/certservice/resources/certs/Makefile index 507a23c..507a23c 100644 --- a/sanitycheck/vesclient-secured/certservice/resources/certs/Makefile +++ b/sanitycheck/ves-client/vesclient-secured/certservice/resources/certs/Makefile diff --git a/sanitycheck/vesclient-secured/certservice/resources/certservice-client/.gitignore b/sanitycheck/ves-client/vesclient-secured/certservice/resources/certservice-client/.gitignore index ef10692..ef10692 100644 --- a/sanitycheck/vesclient-secured/certservice/resources/certservice-client/.gitignore +++ b/sanitycheck/ves-client/vesclient-secured/certservice/resources/certservice-client/.gitignore diff --git a/sanitycheck/vesclient-secured/certservice/resources/certservice-client/client-configuration-for-httpserver.env b/sanitycheck/ves-client/vesclient-secured/certservice/resources/certservice-client/client-configuration-for-httpserver.env index 8e8eb34..8e8eb34 100644 --- a/sanitycheck/vesclient-secured/certservice/resources/certservice-client/client-configuration-for-httpserver.env +++ b/sanitycheck/ves-client/vesclient-secured/certservice/resources/certservice-client/client-configuration-for-httpserver.env diff --git a/sanitycheck/vesclient-secured/certservice/resources/certservice-client/client-configuration-for-ves.env b/sanitycheck/ves-client/vesclient-secured/certservice/resources/certservice-client/client-configuration-for-ves.env index e06d147..e06d147 100644 --- a/sanitycheck/vesclient-secured/certservice/resources/certservice-client/client-configuration-for-ves.env +++ b/sanitycheck/ves-client/vesclient-secured/certservice/resources/certservice-client/client-configuration-for-ves.env diff --git a/sanitycheck/vesclient-secured/certservice/resources/certservice-client/client-configuration-for-vesclient.env b/sanitycheck/ves-client/vesclient-secured/certservice/resources/certservice-client/client-configuration-for-vesclient.env index c5f33b6..c5f33b6 100644 --- a/sanitycheck/vesclient-secured/certservice/resources/certservice-client/client-configuration-for-vesclient.env +++ b/sanitycheck/ves-client/vesclient-secured/certservice/resources/certservice-client/client-configuration-for-vesclient.env diff --git a/sanitycheck/vesclient-secured/certservice/resources/certservice/cmpServers.json b/sanitycheck/ves-client/vesclient-secured/certservice/resources/certservice/cmpServers.json index 7256494..7256494 100644 --- a/sanitycheck/vesclient-secured/certservice/resources/certservice/cmpServers.json +++ b/sanitycheck/ves-client/vesclient-secured/certservice/resources/certservice/cmpServers.json diff --git a/sanitycheck/vesclient-secured/certservice/resources/ejbca/ejbca-configuration.sh b/sanitycheck/ves-client/vesclient-secured/certservice/resources/ejbca/ejbca-configuration.sh index 77f5c55..77f5c55 100755 --- a/sanitycheck/vesclient-secured/certservice/resources/ejbca/ejbca-configuration.sh +++ b/sanitycheck/ves-client/vesclient-secured/certservice/resources/ejbca/ejbca-configuration.sh diff --git a/sanitycheck/ves/Makefile b/sanitycheck/ves/Makefile index 4fe5e4b..0f631aa 100644 --- a/sanitycheck/ves/Makefile +++ b/sanitycheck/ves/Makefile @@ -21,3 +21,4 @@ health-check: @echo "\n\n##### VES is ready #####\n" curl -i -H "Accept: application/json" -H "Content-Type: application/json" -X GET GET http://localhost:8080/healthcheck @echo "\n\n##### DONE #####" + diff --git a/sanitycheck/ves/docker-compose.yml b/sanitycheck/ves/docker-compose.yml index d9666d8..bffa8b8 100644 --- a/sanitycheck/ves/docker-compose.yml +++ b/sanitycheck/ves/docker-compose.yml @@ -1,5 +1,7 @@ -version: '3' +version: '3.5' + services: + ves: container_name: ves image: nexus3.onap.org:10003/onap/org.onap.dcaegen2.collectors.ves.vescollector:latest @@ -7,14 +9,19 @@ services: - "8080:8080" - "8443:8443" networks: - - vesnetwork + - nf-simulator-network + onap-dmaap: container_name: dmaap image: dmaap-simulator ports: - "3904:3904" networks: - - vesnetwork + - nf-simulator-network + +# +# external network networks: - vesnetwork: - driver: bridge + nf-simulator-network: + external: + name: nf-simulator-network |