diff options
9 files changed, 23 insertions, 3 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 cc753118..772fb6f0 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/tests/so/etsi/etsi_package_onboarding_tests.robot b/tests/so/etsi/etsi_package_onboarding_tests.robot index 96c9896d..e4694e01 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 |