diff options
-rw-r--r-- | plans/vfc-nfvo-catalog/sanity-check/setup.sh | 2 | ||||
-rw-r--r-- | plans/vfc-nfvo-catalog/sanity-check/teardown.sh | 1 | ||||
-rwxr-xr-x | run-csit.sh | 4 | ||||
-rw-r--r-- | scripts/sdc/kill_dcae_containers.sh | 31 | ||||
-rw-r--r-- | tests/dcaegen2/prh-testcases/resources/docker-compose.yml | 26 | ||||
-rw-r--r-- | tests/externalapi-nbi/healthcheck/healthcheck.robot | 2 |
6 files changed, 49 insertions, 17 deletions
diff --git a/plans/vfc-nfvo-catalog/sanity-check/setup.sh b/plans/vfc-nfvo-catalog/sanity-check/setup.sh index 344214ff..94f21e14 100644 --- a/plans/vfc-nfvo-catalog/sanity-check/setup.sh +++ b/plans/vfc-nfvo-catalog/sanity-check/setup.sh @@ -72,5 +72,7 @@ cat config.py docker cp vfc-catalog:/service/vfc/nfvo/catalog/logs/runtime_catalog.log ./ cat runtime_catalog.log +docker logs vfc-catalog + # Pass any variables required by Robot test suites in ROBOT_VARIABLES ROBOT_VARIABLES="-v MSB_IP:${MSB_IP} -v CATALOG_IP:${CATALOG_IP} -v MSB_DISCOVERY_IP:${DISCOVERY_IP} -v SCRIPTS:${SCRIPTS}" diff --git a/plans/vfc-nfvo-catalog/sanity-check/teardown.sh b/plans/vfc-nfvo-catalog/sanity-check/teardown.sh index cfccb3ff..c328f5ea 100644 --- a/plans/vfc-nfvo-catalog/sanity-check/teardown.sh +++ b/plans/vfc-nfvo-catalog/sanity-check/teardown.sh @@ -16,6 +16,7 @@ # # print log file for catalog +docker logs vfc-catalog docker cp vfc-catalog:/service/vfc/nfvo/catalog/logs/runtime_catalog.log ./ cat runtime_catalog.log diff --git a/run-csit.sh b/run-csit.sh index 93f4b7e2..eeb8d59f 100755 --- a/run-csit.sh +++ b/run-csit.sh @@ -97,9 +97,7 @@ pip install robotframework-selenium2library==1.8.0 robotframework-extendedseleni # install eteutils mkdir -p ${ROBOT_VENV}/src/onap rm -rf ${ROBOT_VENV}/src/onap/testsuite -git clone https://gerrit.onap.org/r/testsuite/python-testing-utils.git ${ROBOT_VENV}/src/onap/testsuite/python-testing-utils -git -C ${ROBOT_VENV}/src/onap/testsuite/python-testing-utils checkout master -pip install --upgrade ${ROBOT_VENV}/src/onap/testsuite/python-testing-utils/robotframework-onap +pip install --upgrade --extra-index-url="https://nexus3.onap.org/repository/PyPi.staging/simple" 'robotframework-onap==0.4' pip freeze diff --git a/scripts/sdc/kill_dcae_containers.sh b/scripts/sdc/kill_dcae_containers.sh new file mode 100644 index 00000000..5e11372d --- /dev/null +++ b/scripts/sdc/kill_dcae_containers.sh @@ -0,0 +1,31 @@ +#!/bin/bash +# +# Copyright 2019 © Samsung Electronics Co., Ltd. +# +# 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. +# + +# +# Note! This is only temporary solution for killing SDC DCAE plugin's +# docker containers that must be currently used whenever docker_run.sh is used +# with -dcae option - See SDC-2338 for related image naming issue +# +# DCAE plugin-related parts will also have to be refactored under dedicated +# directories in the future +# + +echo "This is ${WORKSPACE}/scripts/sdc/kill_dcae_containers.sh" + +# kill and remove all sdc dcae dockers +docker stop $(docker ps -a -q --filter="name=dcae") +docker rm $(docker ps -a -q --filter="name=dcae") diff --git a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml index a8e5d566..6459ad27 100644 --- a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml +++ b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml @@ -55,11 +55,11 @@ services: image: consul:1.0.6 restart: on-failure command: ["kv", "put", "-http-addr=http://consul:8500", "dcae-prh", '{ - "dmaap.dmaapConsumerConfiguration.dmaapUrl":"http://dmaap-mr:2222/events/unauthenticated.VES_PNFREG_OUTPUT", + "dmaap.dmaapConsumerConfiguration.dmaapUrl":"https://dmaap-mr:2223/events/unauthenticated.VES_PNFREG_OUTPUT", "dmaap.dmaapConsumerConfiguration.dmaapHostName":"dmaap-mr", - "dmaap.dmaapConsumerConfiguration.dmaapPortNumber":2222, + "dmaap.dmaapConsumerConfiguration.dmaapPortNumber":2223, "dmaap.dmaapConsumerConfiguration.dmaapTopicName": "events/unauthenticated.VES_PNFREG_OUTPUT", - "dmaap.dmaapConsumerConfiguration.dmaapProtocol":"http", + "dmaap.dmaapConsumerConfiguration.dmaapProtocol":"https", "dmaap.dmaapConsumerConfiguration.dmaapUserName":"admin", "dmaap.dmaapConsumerConfiguration.dmaapUserPassword":"admin", "dmaap.dmaapConsumerConfiguration.dmaapContentType": "application/json", @@ -68,20 +68,20 @@ services: "dmaap.dmaapConsumerConfiguration.timeoutMs": -1, "dmaap.dmaapConsumerConfiguration.messageLimit": -1, - "dmaap.dmaapProducerConfiguration.dmaapUrl":"http://dmaap-mr:2222/events/unauthenticated.PNF_READY", + "dmaap.dmaapProducerConfiguration.dmaapUrl":"https://dmaap-mr:2223/events/unauthenticated.PNF_READY", "dmaap.dmaapProducerConfiguration.dmaapHostName":"dmaap-mr", - "dmaap.dmaapProducerConfiguration.dmaapPortNumber":2222, + "dmaap.dmaapProducerConfiguration.dmaapPortNumber":2223, "dmaap.dmaapProducerConfiguration.dmaapTopicName": "events/unauthenticated.PNF_READY", - "dmaap.dmaapProducerConfiguration.dmaapProtocol":"http", + "dmaap.dmaapProducerConfiguration.dmaapProtocol":"https", "dmaap.dmaapProducerConfiguration.dmaapUserName":"admin", "dmaap.dmaapProducerConfiguration.dmaapUserPassword":"admin", "dmaap.dmaapProducerConfiguration.dmaapContentType": "application/json", - "dmaap.dmaapUpdateProducerConfiguration.dmaapUrl":"http://dmaap-mr:2222/events/unauthenticated.PNF_UPDATE", + "dmaap.dmaapUpdateProducerConfiguration.dmaapUrl":"https://dmaap-mr:2223/events/unauthenticated.PNF_UPDATE", "dmaap.dmaapUpdateProducerConfiguration.dmaapHostName": "dmaap-mr", - "dmaap.dmaapUpdateProducerConfiguration.dmaapPortNumber": 2222, + "dmaap.dmaapUpdateProducerConfiguration.dmaapPortNumber": 2223, "dmaap.dmaapUpdateProducerConfiguration.dmaapTopicName": "events/unauthenticated.PNF_UPDATE", - "dmaap.dmaapUpdateProducerConfiguration.dmaapProtocol": "http", + "dmaap.dmaapUpdateProducerConfiguration.dmaapProtocol": "https", "dmaap.dmaapUpdateProducerConfiguration.dmaapUserName": "admin", "dmaap.dmaapUpdateProducerConfiguration.dmaapUserPassword": "admin", "dmaap.dmaapUpdateProducerConfiguration.dmaapContentType": "application/json", @@ -109,19 +109,19 @@ services: "security.keyStorePath":"/tmp/certs/keystore.p12", "security.keyStorePasswordPath":"/tmp/certs/keystore.password", "security.enableAaiCertAuth":true, - "security.enableDmaapCertAuth":false, + "security.enableDmaapCertAuth":true, "streams_publishes":{ "pnf-update":{ "type": "message_router", "dmaap_info":{ - "topic_url":"http://dmaap-mr:2222/events/unauthenticated.PNF_UPDATE" + "topic_url":"https://dmaap-mr:2223/events/unauthenticated.PNF_UPDATE" } }, "pnf-ready":{ "type": "message_router", "dmaap_info":{ - "topic_url":"http://dmaap-mr:2222/events/unauthenticated.PNF_READY" + "topic_url":"https://dmaap-mr:2223/events/unauthenticated.PNF_READY" } } }, @@ -129,7 +129,7 @@ services: "ves-reg-output":{ "type": "message_router", "dmaap_info":{ - "topic_url":"http://dmaap-mr:2222/events/unauthenticated.VES_PNFREG_OUTPUT" + "topic_url":"https://dmaap-mr:2223/events/unauthenticated.VES_PNFREG_OUTPUT" } } } diff --git a/tests/externalapi-nbi/healthcheck/healthcheck.robot b/tests/externalapi-nbi/healthcheck/healthcheck.robot index 6c3ec296..b91a6710 100644 --- a/tests/externalapi-nbi/healthcheck/healthcheck.robot +++ b/tests/externalapi-nbi/healthcheck/healthcheck.robot @@ -7,7 +7,7 @@ Library Collections ${GLOBAL_NBI_SERVER_PROTOCOL} http ${GLOBAL_INJECTED_NBI_IP_ADDR} localhost ${GLOBAL_NBI_SERVER_PORT} 8080 -${NBI_HEALTH_CHECK_PATH} /nbi/api/v3/status +${NBI_HEALTH_CHECK_PATH} /nbi/api/v4/status ${NBI_ENDPOINT} ${GLOBAL_NBI_SERVER_PROTOCOL}://${GLOBAL_INJECTED_NBI_IP_ADDR}:${GLOBAL_NBI_SERVER_PORT} *** Test Cases *** |