diff options
12 files changed, 36 insertions, 14 deletions
diff --git a/plans/so/integration-etsi-testing/config/env b/plans/so/integration-etsi-testing/config/env index c0d8210a..0a20fdb9 100644 --- a/plans/so/integration-etsi-testing/config/env +++ b/plans/so/integration-etsi-testing/config/env @@ -5,3 +5,4 @@ TIME_OUT_DEFAULT_VALUE_SEC=1200 PROJECT_NAME=etsiintegrationtesting DEFAULT_NETWORK_NAME=etsiintegrationtesting_default ETSI_CATALOG_IMAGE_VERSION=1.0.9 +SOL_003_ADAPTER_IMAGE_VERSION=1.8.0-STAGING-latest diff --git a/plans/so/integration-etsi-testing/docker-compose.local.yml b/plans/so/integration-etsi-testing/docker-compose.local.yml index 26b45a3d..c7c37aa0 100644 --- a/plans/so/integration-etsi-testing/docker-compose.local.yml +++ b/plans/so/integration-etsi-testing/docker-compose.local.yml @@ -26,7 +26,7 @@ services: image: onap/so/so-monitoring:${TAG} ################################################################################ so-vnfm-adapter: - image: onap/so/vnfm-adapter:${TAG} + image: onap/so/vnfm-adapter:${SOL_003_ADAPTER_IMAGE_VERSION} ################################################################################ modeling-etsicatalog: image: ${NEXUS_DOCKER_REPO_MSO}/onap/modeling/etsicatalog:${ETSI_CATALOG_IMAGE_VERSION} diff --git a/plans/so/integration-etsi-testing/docker-compose.yml b/plans/so/integration-etsi-testing/docker-compose.yml index 1d51221c..6aea906b 100644 --- a/plans/so/integration-etsi-testing/docker-compose.yml +++ b/plans/so/integration-etsi-testing/docker-compose.yml @@ -220,7 +220,7 @@ services: - request-db-adapter ################################################################################ so-vnfm-adapter: - image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/vnfm-adapter:${TAG} + image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/vnfm-adapter:${SOL_003_ADAPTER_IMAGE_VERSION} ports: - "9092:9092" volumes: diff --git a/plans/so/integration-etsi-testing/setup.sh b/plans/so/integration-etsi-testing/setup.sh index 98fa1e32..51cc8480 100755 --- a/plans/so/integration-etsi-testing/setup.sh +++ b/plans/so/integration-etsi-testing/setup.sh @@ -49,7 +49,7 @@ echo "Running $SCRIPT_HOME/$SCRIPT_NAME ..." export $(egrep -v '^#' $ENV_FILE | xargs) -MANDATORY_VARIABLES_NAMES=( "NEXUS_DOCKER_REPO_MSO" "DOCKER_ENVIRONMENT" "TAG" "TIME_OUT_DEFAULT_VALUE_SEC" "PROJECT_NAME" "DEFAULT_NETWORK_NAME", "ETSI_CATALOG_IMAGE_VERSION") +MANDATORY_VARIABLES_NAMES=( "NEXUS_DOCKER_REPO_MSO" "DOCKER_ENVIRONMENT" "TAG" "TIME_OUT_DEFAULT_VALUE_SEC" "PROJECT_NAME" "DEFAULT_NETWORK_NAME", "ETSI_CATALOG_IMAGE_VERSION", "SOL_003_ADAPTER_IMAGE_VERSION") for var in "${MANDATORY_VARIABLES_NAMES[@]}" do diff --git a/plans/usecases-5G-bulkpm/5G-bulkpm/assets/dfc/datafile_endpoints.json b/plans/usecases-5G-bulkpm/5G-bulkpm/assets/dfc/datafile_endpoints.json index 8aaca058..c845b2db 100644 --- a/plans/usecases-5G-bulkpm/5G-bulkpm/assets/dfc/datafile_endpoints.json +++ b/plans/usecases-5G-bulkpm/5G-bulkpm/assets/dfc/datafile_endpoints.json @@ -1,10 +1,10 @@ { "config": { "//description": "This file is only used for testing purposes", - "dmaap.ftpesConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks", - "dmaap.ftpesConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass", - "dmaap.ftpesConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks", - "dmaap.ftpesConfig.trustedCaPasswordPath": "/opt/app/datafile/etc/cert/trust.pass", + "dmaap.certificateConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks", + "dmaap.certificateConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass", + "dmaap.certificateConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks", + "dmaap.certificateConfig.trustedCaPasswordPath": "/opt/app/datafile/etc/cert/trust.pass", "dmaap.security.trustStorePath": "/opt/app/datafile/etc/cert/trust.jks", "dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass", "dmaap.security.keyStorePath": "/opt/app/datafile/etc/cert/cert.jks", diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/message-routing.robot b/tests/dcaegen2-collectors-hv-ves/testcases/message-routing.robot index 40923aab..9898a968 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/message-routing.robot +++ b/tests/dcaegen2-collectors-hv-ves/testcases/message-routing.robot @@ -2,6 +2,7 @@ # csit-dcaegen2-collectors-hv-ves # ================================================================================ # Copyright (C) 2018-2019 NOKIA +# Modification copyright (C) 2021 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. @@ -37,7 +38,7 @@ Message Routing Suite Setup *** Test Cases *** Correct Messages Routing [Documentation] VES-HV Collector should route all valid messages to topics specified in configuration - ... and do not change message payload generated in XNF simulator + ... without changing message payload generated in xNF simulator Send Messages From xNF Simulators ${XNF_SIMULATOR} ${XNF_FIXED_PAYLOAD_REQUEST} @@ -47,7 +48,7 @@ Correct Messages Routing Too big payload message handling - [Documentation] VES-HV Collector should interrupt the stream when encountered message with too big payload + [Documentation] VES-HV Collector should interrupt the stream when a message with too big payload is encountered Send Messages From xNF Simulators ${XNF_SIMULATOR} ${XNF_TOO_BIG_PAYLOAD_REQUEST} diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/common-keywords.robot b/tests/dcaegen2-collectors-hv-ves/testcases/resources/common-keywords.robot index fee8bfd8..bab8a907 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/resources/common-keywords.robot +++ b/tests/dcaegen2-collectors-hv-ves/testcases/resources/common-keywords.robot @@ -2,6 +2,7 @@ # csit-dcaegen2-collectors-hv-ves # ================================================================================ # Copyright (C) 2018-2019 NOKIA +# Modification copyright (C) 2021 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. @@ -53,11 +54,11 @@ Get xNF Simulators Using Valid Certificates Send Messages From xNF Simulators [Arguments] ${XNF_HOSTS_LIST} ${MESSAGE_FILEPATH} - :FOR ${HOST} IN @{XNF_HOSTS_LIST} - \ ${XNF_SIM_API_ACCESS}= Get xNF Sim Api Access Url ${HTTP_METHOD_URL} ${HOST} - \ ${XNF_SIM_API_URL}= Catenate SEPARATOR= ${XNF_SIM_API_ACCESS} ${XNF_SIM_API_PATH} - \ Send messages ${XNF_SIM_API_URL} ${MESSAGE_FILEPATH} - + FOR ${HOST} IN @{XNF_HOSTS_LIST} + ${XNF_SIM_API_ACCESS}= Get xNF Sim Api Access Url ${HTTP_METHOD_URL} ${HOST} + ${XNF_SIM_API_URL}= Catenate SEPARATOR= ${XNF_SIM_API_ACCESS} ${XNF_SIM_API_PATH} + Send messages ${XNF_SIM_API_URL} ${MESSAGE_FILEPATH} + END VES-HV Collector Test Shutdown Reset DCAE App Simulator ${DEFAULT_PERF3GPP_TOPIC} diff --git a/tests/so/etsi/etsi_package_onboarding_tests.robot b/tests/so/etsi/etsi_package_onboarding_tests.robot index 2b2054d2..c48101c8 100644 --- a/tests/so/etsi/etsi_package_onboarding_tests.robot +++ b/tests/so/etsi/etsi_package_onboarding_tests.robot @@ -3,6 +3,11 @@ Library Collections Library RequestsLibrary Library OperatingSystem Library json +Documentation Test cases for onboarding and distributing a VNF package +... Note: onboarded VNF package is used in later VNF tests including: +... -etsi_vnf_lcm_tests.robot +... -etsi_vnf_package_management_tests.robot +... -etsi_vnf_notification_tests.robot *** Variables *** ${SLEEP_INTERVAL_SEC}= 5 diff --git a/tests/so/etsi/etsi_vnf_lcm_tests.robot b/tests/so/etsi/etsi_vnf_lcm_tests.robot index fcfb515a..e7b291cb 100644 --- a/tests/so/etsi/etsi_vnf_lcm_tests.robot +++ b/tests/so/etsi/etsi_vnf_lcm_tests.robot @@ -3,6 +3,9 @@ Library Collections Library RequestsLibrary Library OperatingSystem Library json +Documentation Test cases for VNF lifecycle management operations +... Note, relies on: +... -package being onboarded in etsi_package_onboarding_tests *** Variables *** ${SLEEP_INTERVAL_SEC}= 5 diff --git a/tests/so/etsi/etsi_vnf_notification_tests.robot b/tests/so/etsi/etsi_vnf_notification_tests.robot index 0d1eb41c..0c3d5bc9 100644 --- a/tests/so/etsi/etsi_vnf_notification_tests.robot +++ b/tests/so/etsi/etsi_vnf_notification_tests.robot @@ -3,6 +3,11 @@ Library Collections Library RequestsLibrary Library OperatingSystem Library json +Documentation Test cases for VNF package subscription notifications and subscription cleanup +... Test include checking that VNF package notification was received and deleting the subscription +... Note, relies on: +... -subscription being created in etsi_vnf_subscription_tests and +... -package being onboarded in etsi_package_onboarding_tests *** Variables *** ${SLEEP_INTERVAL_SEC}= 5 diff --git a/tests/so/etsi/etsi_vnf_package_management_tests.robot b/tests/so/etsi/etsi_vnf_package_management_tests.robot index b7cd337f..000148f8 100644 --- a/tests/so/etsi/etsi_vnf_package_management_tests.robot +++ b/tests/so/etsi/etsi_vnf_package_management_tests.robot @@ -4,6 +4,9 @@ Library RequestsLibrary Library OperatingSystem Library json Library ArchiveLibrary +Documentation Test cases for VNF package management operations including get packages, package, content and artifacts +... Note, relies on: +... -package being onboarded in etsi_package_onboarding_tests *** Variables *** ${VNF_PACKAGE_ID}= 73522444-e8e9-49c1-be29-d355800aa349 diff --git a/tests/so/etsi/etsi_vnf_subscription_tests.robot b/tests/so/etsi/etsi_vnf_subscription_tests.robot index 3bf22628..34913f0a 100644 --- a/tests/so/etsi/etsi_vnf_subscription_tests.robot +++ b/tests/so/etsi/etsi_vnf_subscription_tests.robot @@ -3,6 +3,9 @@ Library Collections Library RequestsLibrary Library OperatingSystem Library json +Documentation Test cases that tests subscription functionality for VNF package onboarding/change notifications +... Tests include subscribing for notifications, and querying that the subscriptions have been created +... Note: creates ACCESS_TOKEN and SUBSCRIPTION_ID variables used in later etsi_vnf_notification_tests *** Variables *** ${SLEEP_INTERVAL_SEC}= 5 |