From d8d052917c3b3f745dbd9586ac36accafec91b0b Mon Sep 17 00:00:00 2001 From: BjornMagnussonXA Date: Fri, 2 Oct 2020 10:54:51 +0200 Subject: [PATCH] Modified to run both on guilin and master branch Issue-ID: CCSDK-2861 Signed-off-by: BjornMagnussonXA Change-Id: I49ba43e2c4a2c4e2c5738ed9b9f70e1d124e26b7 --- plans/ccsdk-oran/polmansuite/FTC1.sh | 13 +- plans/ccsdk-oran/polmansuite/FTC150.sh | 6 +- plans/ccsdk-oran/polmansuite/setup.sh | 4 +- plans/ccsdk-oran/polmansuite/test_env-guilin.sh | 147 +++++++++++++++++++++ .../{test_env.sh => test_env-master.sh} | 0 tests/ccsdk-oran/polmansuite/test.robot | 4 +- 6 files changed, 157 insertions(+), 17 deletions(-) create mode 100644 plans/ccsdk-oran/polmansuite/test_env-guilin.sh rename plans/ccsdk-oran/polmansuite/{test_env.sh => test_env-master.sh} (100%) diff --git a/plans/ccsdk-oran/polmansuite/FTC1.sh b/plans/ccsdk-oran/polmansuite/FTC1.sh index 26398d55..1ccb425e 100755 --- a/plans/ccsdk-oran/polmansuite/FTC1.sh +++ b/plans/ccsdk-oran/polmansuite/FTC1.sh @@ -20,8 +20,8 @@ TC_ONELINE_DESCR="Sanity test, create service and then create,update and delete a policy using http/https and Agent REST/DMAAP with/without SDNC controller" -#App names to exclude checking pulling images for, space separated list -EXCLUDED_IMAGES="SDNC SDNC_ONAP" +#App names to include in the test, space separated list +INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM SDNC" . ../common/testcase_common.sh $@ . ../common/agent_api_functions.sh @@ -32,15 +32,6 @@ EXCLUDED_IMAGES="SDNC SDNC_ONAP" generate_uuid -#################################### -#################################### -######## LIMITED TEST SCOPE ######## -######## THIS FILE SHALL ######## -######## BE REMOVED WHEN ######## -######## THE SDNC IMAGE ######## -######## IS OK ######## -#################################### -#################################### # Tested variants of REST/DMAAP/SDNC config TESTED_VARIANTS="REST DMAAP" #Test agent and simulator protocol versions (others are http only) diff --git a/plans/ccsdk-oran/polmansuite/FTC150.sh b/plans/ccsdk-oran/polmansuite/FTC150.sh index b65b3a5f..c6c690d1 100755 --- a/plans/ccsdk-oran/polmansuite/FTC150.sh +++ b/plans/ccsdk-oran/polmansuite/FTC150.sh @@ -20,8 +20,8 @@ TC_ONELINE_DESCR="Sample tests of the SDNC A1 controller restconf API using http/https (no agent)" -#App names to exclude checking pulling images for, space separated list -EXCLUDED_IMAGES="PA CP SDNC_ONAP" +#App names to include in the test, space separated list +INCLUDED_IMAGES="RICSIM SDNC" . ../common/testcase_common.sh $@ . ../common/controller_api_functions.sh @@ -32,7 +32,7 @@ EXCLUDED_IMAGES="PA CP SDNC_ONAP" generate_uuid #Test agent and simulator protocol versions (others are http only) -NB_TESTED_PROTOCOLS="HTTP" +NB_TESTED_PROTOCOLS="HTTP HTTPS" SB_TESTED_PROTOCOLS="HTTP HTTPS" for __nb_httpx in $NB_TESTED_PROTOCOLS ; do diff --git a/plans/ccsdk-oran/polmansuite/setup.sh b/plans/ccsdk-oran/polmansuite/setup.sh index 10fed96f..b02d9db3 100755 --- a/plans/ccsdk-oran/polmansuite/setup.sh +++ b/plans/ccsdk-oran/polmansuite/setup.sh @@ -28,6 +28,8 @@ POLMAN_PLANS=$WORKSPACE/plans/ccsdk-oran/polmansuite cp $POLMAN_PLANS/FTC1.sh $WORKSPACE/archives/nonrtric/test/auto-test/FTC1.sh cp $POLMAN_PLANS/FTC150.sh $WORKSPACE/archives/nonrtric/test/auto-test/FTC150.sh +TEST_ENV=$POLMAN_PLANS/test_env-${GERRIT_BRANCH}.sh + #Make the env vars availble to the robot scripts -ROBOT_VARIABLES="-b debug.log -v AUTOTEST_ROOT:${AUTOTEST_ROOT} -v POLMAN_PLANS:${POLMAN_PLANS}" +ROBOT_VARIABLES="-b debug.log -v AUTOTEST_ROOT:${AUTOTEST_ROOT} -v TEST_ENV:${TEST_ENV}" diff --git a/plans/ccsdk-oran/polmansuite/test_env-guilin.sh b/plans/ccsdk-oran/polmansuite/test_env-guilin.sh new file mode 100644 index 00000000..e7a90303 --- /dev/null +++ b/plans/ccsdk-oran/polmansuite/test_env-guilin.sh @@ -0,0 +1,147 @@ +#!/bin/bash + +# ============LICENSE_START=============================================== +# Copyright (C) 2020 Nordix Foundation. 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================================================= +# + +# Set up the image and tags for the test. Do not add the image tag to the image names. + +# NOTE: A env var for each container is created by the test script. +# This var will point to the local or remote var depending on how +# the test script is started. The name format is _IMAGE, ie with 'LOCAL' or 'REMOTE'. + +# Tag for guilin branch +# Remote Policy Agent image and tag +POLICY_AGENT_REMOTE_IMAGE="nexus3.onap.org:10003/onap/ccsdk-oran-a1policymanagementservice" +POLICY_AGENT_REMOTE_IMAGE_TAG="1.0.1-SNAPSHOT" + + +# Control Panel remote image and tag +CONTROL_PANEL_REMOTE_IMAGE="nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-controlpanel" +CONTROL_PANEL_REMOTE_IMAGE_TAG="2.0.0" + +# Tag for guilin branch +# SDNC A1 Controller remote image and tag +SDNC_A1_CONTROLLER_REMOTE_IMAGE="nexus3.onap.org:10003/onap/sdnc-image" +SDNC_A1_CONTROLLER_REMOTE_IMAGE_TAG="2.0.2-STAGING-latest" + + +#SDNC DB remote image and tag +SDNC_DB_REMOTE_IMAGE="mysql/mysql-server" +SDNC_DB_REMOTE_IMAGE_TAG="5.6" +#No local image for DB, remote image always used + + +# Near RT RIC Simulator remote image and tag +RIC_SIM_REMOTE_IMAGE="nexus3.o-ran-sc.org:10004/o-ran-sc/a1-simulator" +RIC_SIM_REMOTE_IMAGE_TAG="2.0.0" + + +#Consul remote image and tag +CONSUL_REMOTE_IMAGE="consul" +CONSUL_REMOTE_IMAGE_TAG="1.7.2" +#No local image for Consul, remote image always used + + +#CBS remote image and tag +CBS_REMOTE_IMAGE="nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding.app-app" +CBS_REMOTE_IMAGE_TAG="2.3.0" +#No local image for CBS, remote image always used + + +#MR stub image and tag +MRSTUB_LOCAL_IMAGE="mrstub" +MRSTUB_LOCAL_IMAGE_TAG="latest" +#No remote image for MR stub, local image always used + +#Callback receiver image and tag +CR_LOCAL_IMAGE="callback-receiver" +CR_LOCAL_IMAGE_TAG="latest" +#No remote image for CR, local image always used + +# Common env var for auto-test. Vars used by docker-compose need to be exported +export DOCKER_SIM_NWNAME="nonrtric-docker-net" # Name of docker private network + +export POLICY_AGENT_EXTERNAL_PORT=8081 # Policy Agent container external port (host -> container) +export POLICY_AGENT_INTERNAL_PORT=8081 # Policy Agent container internal port (container -> container) +export POLICY_AGENT_EXTERNAL_SECURE_PORT=8433 # Policy Agent container external secure port (host -> container) +export POLICY_AGENT_INTERNAL_SECURE_PORT=8433 # Policy Agent container internal secure port (container -> container) + +export POLICY_AGENT_APP_NAME="policy-agent" # Name for Policy Agent container +POLICY_AGENT_LOGPATH="/var/log/policy-agent/application.log" # Path the application log in the Policy Agent container +export POLICY_AGENT_APP_NAME_ALIAS="policy-agent-container" # Alias name, name used by the control panel + +export MR_EXTERNAL_PORT=3905 # MR stub container external port (host -> container) +export MR_INTERNAL_PORT=3905 # MR stub container internal port (container -> container) +export MR_EXTERNAL_SECURE_PORT=3906 # MR stub container external secure port (host -> container) +export MR_INTERNAL_SECURE_PORT=3906 # MR stub container internal secure port (container -> container) +export MR_APP_NAME="message-router" # Name for the MR +export MR_READ_URL="/events/A1-POLICY-AGENT-READ/users/policy-agent?timeout=15000&limit=100" # Path to read messages from MR +export MR_WRITE_URL="/events/A1-POLICY-AGENT-WRITE" # Path write messages to MR + +export CR_EXTERNAL_PORT=8090 # Callback receiver container external port (host -> container) +export CR_INTERNAL_PORT=8090 # Callback receiver container internal port (container -> container) +export CR_EXTERNAL_SECURE_PORT=8091 # Callback receiver container external secure port (host -> container) +export CR_INTERNAL_SECURE_PORT=8091 # Callback receiver container internal secure port (container -> container) +export CR_APP_NAME="callback-receiver" # Name for the Callback receiver + +export CONSUL_HOST="consul-server" # Host name of consul +export CONSUL_EXTERNAL_PORT=8500 # Consul container external port (host -> container) +export CONSUL_INTERNAL_PORT=8500 # Consul container internal port (container -> container) +export CONSUL_APP_NAME="polman-consul" # Name for consul container + +export CBS_APP_NAME="polman-cbs" # Name for CBS container +export CBS_EXTERNAL_PORT=10000 # CBS container external port (host -> container) +export CBS_INTERNAL_PORT=10000 # CBS container internal port (container -> container) +export CONFIG_BINDING_SERVICE="config-binding-service" # Host name of CBS + +export RIC_SIM_BASE="g" # Base name of the RIC Simulator container, shall be the group code + # Note, a prefix is added to each container name by the .env file in the 'ric' dir +RIC_SIM_PREFIX="ricsim" # Prefix added to ric container name, added in the .env file in the 'ric' dir + # This prefix can be changed from the command line +export RIC_SIM_INTERNAL_PORT=8085 # RIC Simulator container internal port (container -> container). + # (external ports allocated by docker) +export RIC_SIM_INTERNAL_SECURE_PORT=8185 # RIC Simulator container internal secure port (container -> container). + # (external ports allocated by docker) + +export SDNC_APP_NAME="a1-controller" # Name of the SNDC A1 Controller container +export SDNC_EXTERNAL_PORT=8282 # SNDC A1 Controller container external port (host -> container) +export SDNC_INTERNAL_PORT=8181 # SNDC A1 Controller container internal port (container -> container) +export SDNC_EXTERNAL_SECURE_PORT=8443 # SNDC A1 Controller container external securee port (host -> container) +export SDNC_INTERNAL_SECURE_PORT=8443 # SNDC A1 Controller container internal secure port (container -> container) +export SDNC_DB_APP_NAME="sdnc-db" # Name of the SDNC DB container +export SDNC_A1_TRUSTSTORE_PASSWORD="a1adapter" # SDNC truststore password +SDNC_USER="admin" # SDNC username +SDNC_PWD="Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" # SNDC PWD +SDNC_API_URL="/restconf/operations/A1-ADAPTER-API:" # Base url path for SNDC API +SDNC_ALIVE_URL="/apidoc/explorer/" # Base url path for SNDC API docs (for alive check) +SDNC_KARAF_LOG="/opt/opendaylight/data/log/karaf.log" # Path to karaf log + + +export CONTROL_PANEL_APP_NAME="control-panel" # Name of the Control Panel container +export CONTROL_PANEL_EXTERNAL_PORT=8080 # Control Panel container external port (host -> container) +export CONTROL_PANEL_INTERNAL_PORT=8080 # Control Panel container external port (host -> container) +CONTROL_PANEL_LOGPATH="/logs/nonrtric-controlpanel.log" # Path the application log in the Control Panel container + +UUID="" # UUID used as prefix to the policy id to simulate a real UUID + # Testscript need to set the UUID to use other this empty prefix is used + +RESTBASE="http://localhost:"$POLICY_AGENT_EXTERNAL_PORT # Base url to the Agent NB REST interface +RESTBASE_SECURE="https://localhost:"$POLICY_AGENT_EXTERNAL_SECURE_PORT # Base url to the secure Agent NB REST interface +DMAAPBASE="http://localhost:"$MR_EXTERNAL_PORT # Base url to the Dmaap adapter, http +DMAAPBASE_SECURE="https://localhost:"$MR_EXTERNAL_SECURE_PORT # Base url to the Dmaap adapter, https +ADAPTER=$RESTBASE # Adapter holds the address the agent R-APP interface (REST OR DMAAP) + # The values of this var is swiched between the two base url when needed diff --git a/plans/ccsdk-oran/polmansuite/test_env.sh b/plans/ccsdk-oran/polmansuite/test_env-master.sh similarity index 100% rename from plans/ccsdk-oran/polmansuite/test_env.sh rename to plans/ccsdk-oran/polmansuite/test_env-master.sh diff --git a/tests/ccsdk-oran/polmansuite/test.robot b/tests/ccsdk-oran/polmansuite/test.robot index 1390a8c6..eebe478b 100644 --- a/tests/ccsdk-oran/polmansuite/test.robot +++ b/tests/ccsdk-oran/polmansuite/test.robot @@ -6,7 +6,7 @@ Library Process Functional Test Case 1 [Documentation] Functional Test Case 1 - FTC1 - Start Process ${AUTOTEST_ROOT}/FTC1.sh remote auto-clean --env-file ${POLMAN_PLANS}/test_env.sh shell=true cwd=${AUTOTEST_ROOT} + Start Process ${AUTOTEST_ROOT}/FTC1.sh remote auto-clean --env-file ${TEST_ENV} shell=true cwd=${AUTOTEST_ROOT} ${cli_cmd_output}= Wait For Process timeout=3600 Should Be Equal as Integers ${cli_cmd_output.rc} 0 ${ResultFileContent}= Get File ${AUTOTEST_ROOT}/.resultFTC1.txt @@ -14,7 +14,7 @@ Functional Test Case 1 Functional Test Case 2 [Documentation] Functional Test Case 2 - FTC150 - Start Process ${AUTOTEST_ROOT}/FTC150.sh remote auto-clean --env-file ${POLMAN_PLANS}/test_env.sh shell=true cwd=${AUTOTEST_ROOT} + Start Process ${AUTOTEST_ROOT}/FTC150.sh remote auto-clean --env-file ${TEST_ENV} shell=true cwd=${AUTOTEST_ROOT} ${cli_cmd_output}= Wait For Process timeout=3600 Should Be Equal as Integers ${cli_cmd_output.rc} 0 ${ResultFileContent}= Get File ${AUTOTEST_ROOT}/.resultFTC150.txt -- 2.16.6