diff options
23 files changed, 598 insertions, 222 deletions
diff --git a/plans/ccsdk-oran/polmansuite/FTC1.sh b/plans/ccsdk-oran/polmansuite/FTC1.sh new file mode 100755 index 00000000..26398d55 --- /dev/null +++ b/plans/ccsdk-oran/polmansuite/FTC1.sh @@ -0,0 +1,235 @@ +#!/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================================================= +# + + +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" + +. ../common/testcase_common.sh $@ +. ../common/agent_api_functions.sh +. ../common/ricsimulator_api_functions.sh + +#### TEST BEGIN #### + + +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) +TESTED_PROTOCOLS="HTTP HTTPS" + +for __httpx in $TESTED_PROTOCOLS ; do + for interface in $TESTED_VARIANTS ; do + + echo "#####################################################################" + echo "#####################################################################" + echo "### Testing agent: $interface using $__httpx" + echo "#####################################################################" + echo "#####################################################################" + + #Local vars in test script + ########################## + + if [ $__httpx == "HTTPS" ]; then + # Path to callback receiver + CR_PATH="https://$CR_APP_NAME:$CR_EXTERNAL_SECURE_PORT/callbacks" + use_cr_https + else + # Path to callback receiver + CR_PATH="http://$CR_APP_NAME:$CR_EXTERNAL_PORT/callbacks" + use_cr_http + fi + + # Clean container and start all needed containers # + clean_containers + + if [ $__httpx == "HTTPS" ]; then + #"Using secure ports towards simulators" + use_simulator_https + else + #"Using non-secure ports towards simulators" + use_simulator_http + fi + + start_ric_simulators ricsim_g1 1 OSC_2.1.0 + start_ric_simulators ricsim_g2 1 STD_1.1.3 + + start_mr + + if [ $__httpx == "HTTPS" ]; then + #echo "Using secure ports between agent and MR" + use_mr_https + else + #"Using non-secure ports between agent and MR" + use_mr_http + fi + + start_cr + + if [ $interface == "REST+SDNC" ] || [ $interface == "DMAAP+SDNC" ]; then + + start_sdnc + + if [ $__httpx == "HTTPS" ]; then + # "Using secure ports towards SDNC" + use_sdnc_https + else + #"Using non-secure ports towards SDNC" + use_sdnc_http + fi + fi + + start_consul_cbs + + if [ $interface == "REST+SDNC" ] || [ $interface == "DMAAP+SDNC" ]; then + prepare_consul_config SDNC ".consul_config.json" + else + prepare_consul_config NOSDNC ".consul_config.json" + fi + + consul_config_app ".consul_config.json" + + start_control_panel + + start_policy_agent + + set_agent_debug + + if [ $interface == "DMAAP" ] || [ $interface == "DMAAP+SDNC" ]; then + if [ $__httpx == "HTTPS" ]; then + echo "Using secure ports towards dmaap" + use_agent_dmaap_https + else + echo "Using non-secure ports towards dmaap" + use_agent_dmaap_http + fi + else + if [ $__httpx == "HTTPS" ]; then + echo "Using secure ports towards the agent" + use_agent_rest_https + else + echo "Using non-secure ports towards the agent" + use_agent_rest_http + fi + fi + + + cr_equal received_callbacks 0 + mr_equal requests_submitted 0 + + sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json + + api_equal json:rics 2 60 + + api_equal json:policy_schemas 2 120 + + api_equal json:policy_types 2 + + api_equal json:policies 0 + + api_equal json:policy_ids 0 + + echo "############################################" + echo "############## Health check ################" + echo "############################################" + + api_get_status 200 + + echo "############################################" + echo "##### Service registry and supervision #####" + echo "############################################" + + api_put_service 201 "serv1" 1000 "$CR_PATH/1" + + api_get_service_ids 200 "serv1" + + api_put_services_keepalive 200 "serv1" + + echo "############################################" + echo "############## RIC Repository ##############" + echo "############################################" + + api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1:AVAILABLE ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE" + + echo "############################################" + echo "########### A1 Policy Management ###########" + echo "############################################" + + api_put_policy 201 "serv1" ricsim_g1_1 1 5000 NOTRANSIENT testdata/OSC/pi1_template.json + api_put_policy 200 "serv1" ricsim_g1_1 1 5000 NOTRANSIENT testdata/OSC/pi1_template.json + + api_put_policy 201 "serv1" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT testdata/STD/pi1_template.json + api_put_policy 200 "serv1" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT testdata/STD/pi1_template.json + + api_delete_policy 204 5000 + + api_delete_policy 204 5100 + + api_equal json:policies 0 + + api_equal json:policy_ids 0 + + cr_equal received_callbacks 0 + + if [ $interface == "DMAAP" ] || [ $interface == "DMAAP+SDNC" ]; then + VAL=11 # Number of Agent API calls over DMAAP + mr_equal requests_fetched $VAL + mr_equal responses_submitted $VAL + mr_equal responses_fetched $VAL + mr_equal current_requests 0 + mr_equal current_responses 0 + else + mr_equal requests_submitted 0 + fi + + if [ $interface == "REST+SDNC" ] || [ $interface == "DMAAP+SDNC" ]; then + sim_contains_str ricsim_g1_1 remote_hosts "a1-controller" + sim_contains_str ricsim_g2_1 remote_hosts "a1-controller" + else + sim_contains_str ricsim_g1_1 remote_hosts "policy-agent" + sim_contains_str ricsim_g2_1 remote_hosts "policy-agent" + fi + + check_policy_agent_logs + check_control_panel_logs + + store_logs "${__httpx}__${interface}" + + done + +done + +#### TEST COMPLETE #### + + +print_result + +auto_clean_containers diff --git a/plans/ccsdk-oran/polmansuite/setup.sh b/plans/ccsdk-oran/polmansuite/setup.sh new file mode 100755 index 00000000..c0dfa150 --- /dev/null +++ b/plans/ccsdk-oran/polmansuite/setup.sh @@ -0,0 +1,34 @@ +#!/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================================================= + + +cd $WORKSPACE/archives + +git clone "https://gerrit.o-ran-sc.org/r/nonrtric" + +AUTOTEST_ROOT=$WORKSPACE/archives/nonrtric/test/auto-test + +# Temporary solution to setup the Non-RT RIC components to point to ONAP images and tags +# Shall be removed when the Non-RT RIC test env is moved/copied to ONAP +cp $WORKSPACE/plans/ccsdk-oran/polmansuite/test_env.sh $WORKSPACE/archives/nonrtric/test/common + +# Temporary solution to not test with the SDNC image +cp $WORKSPACE/plans/ccsdk-oran/polmansuite/FTC1.sh $WORKSPACE/archives/nonrtric/test/auto-test/FTC1.sh + +#Make the env vars availble to the robot scripts +ROBOT_VARIABLES="-b debug.log -v AUTOTEST_ROOT:${AUTOTEST_ROOT}" diff --git a/plans/ccsdk-oran/polmansuite/teardown.sh b/plans/ccsdk-oran/polmansuite/teardown.sh new file mode 100755 index 00000000..6b0c5f6b --- /dev/null +++ b/plans/ccsdk-oran/polmansuite/teardown.sh @@ -0,0 +1,26 @@ +#!/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================================================= + +# All started containers stopped and removed by the test case + + +# Fix ownership. Mounted resources to consul changes ownership which prevents csit test cleanup +cd $WORKSPACE/archives/nonrtric/test/simulator-group/ +sudo chown $(id -u):$(id -g) consul_cbs +sudo chown $(id -u):$(id -g) consul_cbs/consul + diff --git a/plans/ccsdk-oran/polmansuite/test_env.sh b/plans/ccsdk-oran/polmansuite/test_env.sh new file mode 100644 index 00000000..e3501f2a --- /dev/null +++ b/plans/ccsdk-oran/polmansuite/test_env.sh @@ -0,0 +1,191 @@ +#!/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 <container-name>_IMAGE, ie with 'LOCAL' or 'REMOTE'. + + +############################################## +## Temporary fix to point to ONAP remote image +############################################## +# Local Policy Agent image and tag +#POLICY_AGENT_LOCAL_IMAGE="o-ran-sc/nonrtric-policy-agent" +#POLICY_AGENT_LOCAL_IMAGE_TAG="2.1.0-SNAPSHOT" +# 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.0-SNAPSHOT" +#POLICY_AGENT_REMOTE_IMAGE="nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-policy-agent" +#POLICY_AGENT_REMOTE_IMAGE_TAG="2.1.0" + + +# Control Panel local image and tag +CONTROL_PANEL_LOCAL_IMAGE="o-ran-sc/nonrtric-controlpanel" +CONTROL_PANEL_LOCAL_IMAGE_TAG="2.0.0-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" + +############################################## +## Temporary fix to point to ONAP remote image +############################################## +# SDNC A1 Controller local image and tag +#SDNC_A1_CONTROLLER_LOCAL_IMAGE="o-ran-sc/nonrtric-a1-controller" +#SDNC_A1_CONTROLLER_LOCAL_IMAGE_TAG="2.1.0-SNAPSHOT" +# 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.1-STAGING-latest" +#SDNC_A1_CONTROLLER_REMOTE_IMAGE="nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-a1-controller" +#SDNC_A1_CONTROLLER_REMOTE_IMAGE_TAG="2.1.0" + + +#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 + + +# SDNC ONAP A1 Adapte remote image and tag +SDNC_ONAP_A1_ADAPTER_REMOTE_IMAGE="nexus3.onap.org:10003/onap/sdnc-image" +SDNC_ONAP_A1_ADAPTER_REMOTE_IMAGE_TAG="1.8-STAGING-latest" +#No local image for the A1 adapter, remote image always used + +#ONAP A1 Adatper remote image and tag +SDNC_ONAP_DB_REMOTE_IMAGE="mysql/mysql-server" +SDNC_ONAP_DB_REMOTE_IMAGE_TAG="5.6" +#No local image for DB, remote image always used + + +# Near RT RIC Simulator local image and tag +RIC_SIM_LOCAL_IMAGE="nexus3.o-ran-sc.org:10004/o-ran-sc/a1-simulator" +RIC_SIM_LOCAL_IMAGE_TAG="latest" +# 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="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 +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 SDNC_ONAP_APP_NAME="a1-adapter" # Name of the ONAP A1 Adapter container +export SDNC_ONAP_EXTERNAL_PORT=8282 # ONAP A1 Adapter container external port (host -> container) +export SDNC_ONAP_INTERNAL_PORT=8181 # ONAP A1 Adapter container internal port (container -> container) +export SDNC_ONAP_EXTERNAL_SECURE_PORT=8443 # SNDC A1 Adapter container external securee port (host -> container) +export SDNC_ONAP_INTERNAL_SECURE_PORT=8343 # SNDC A1 Adapter container internal secure port (container -> container) +export SDNC_ONAP_DB_APP_NAME="sdnc-onap-db" # Name of the ONAP A1 Adapter DB container +SDNC_ONAP_USER="admin" # ONAP A1 Adapter username +SDNC_ONAP_PWD="Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" # ONAP A1 Adapter PWD +SDNC_ONAP_API_URL="/restconf/operations/A1-ADAPTER-API:" # Base url path for ONAP A1 Adapter API +SDNC_ONAP_ALIVE_URL="/apidoc/explorer/" # Base url path for ONAP A1 Adapter API docs (for alive check) +SDNC_ONAP_PROPERTIES_FILE="/opt/onap/ccsdk/data/properties/a1-adapter-api-dg.properties" +SDNC_ONAP_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
\ No newline at end of file diff --git a/plans/ccsdk-oran/polmansuite/testplan.txt b/plans/ccsdk-oran/polmansuite/testplan.txt new file mode 100644 index 00000000..29191bd8 --- /dev/null +++ b/plans/ccsdk-oran/polmansuite/testplan.txt @@ -0,0 +1,24 @@ +#!/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================================================= + + +# Test suites are relative paths under [integration/csit.git]/tests/. +# Place the suites in run order. +# Temporary change to trigger verify job. +ccsdk-oran/polmansuite + diff --git a/plans/ccsdk/oran/functionality1/setup.sh b/plans/ccsdk/oran/functionality1/setup.sh deleted file mode 100755 index f9fe0c55..00000000 --- a/plans/ccsdk/oran/functionality1/setup.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -# -# Copyright 2016-2017 Huawei Technologies 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. -# -# Place the scripts in run order: -source ${WORKSPACE}/scripts/ccsdk/script1.sh - -# CLI internet speed test -curl -s https://raw.githubusercontent.com/sivel/speedtest-cli/master/speedtest.py | python - - -# Test download a 100 MB file to check network speed to nexus.onap.org -wget -O /dev/null https://nexus.onap.org/content/repositories/releases/org/onap/appc/appc-dg-shared-installer/1.3.0/appc-dg-shared-installer-1.3.0.zip - -# Test download a 100 MB file to check network speed to nexus3.onap.org -wget -O /dev/null https://nexus3.onap.org/repository/docker.release/v2/-/blobs/sha256:04dc4b8163487bb1c40df1ce16f349b507c262d6e2f202baa2e66a42eb8c64a1 - diff --git a/plans/ccsdk/oran/functionality1/teardown.sh b/plans/ccsdk/oran/functionality1/teardown.sh deleted file mode 100755 index acf2d097..00000000 --- a/plans/ccsdk/oran/functionality1/teardown.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -# -# Copyright 2016-2017 Huawei Technologies 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. -# - -kill-instance.sh i-mock - - diff --git a/plans/ccsdk/oran/functionality1/testplan.txt b/plans/ccsdk/oran/functionality1/testplan.txt deleted file mode 100644 index e9485b8c..00000000 --- a/plans/ccsdk/oran/functionality1/testplan.txt +++ /dev/null @@ -1,5 +0,0 @@ -# Test suites are relative paths under [integration/csit.git]/tests/. -# Place the suites in run order. -# Temporary change to trigger verify job. -ccsdk/oran/suite1 -ccsdk/oran/suite2 diff --git a/plans/dcaegen2-services-pmsh/testsuite/assets/aai_sim/aai-initializer.json b/plans/dcaegen2-services-pmsh/testsuite/assets/aai_sim/aai-initializer.json index 3b8c127e..5705e325 100644 --- a/plans/dcaegen2-services-pmsh/testsuite/assets/aai_sim/aai-initializer.json +++ b/plans/dcaegen2-services-pmsh/testsuite/assets/aai_sim/aai-initializer.json @@ -1,7 +1,7 @@ [ { "httpRequest": { - "path": "/aai/v19/query.*" + "path": "/aai/v20/query.*" }, "httpResponse": { "statusCode": 200, @@ -49,6 +49,8 @@ "serial-number": "6061ZW3", "ipaddress-v6-oam": "2001:0db8:0:0:0:0:1428:57ab", "resource-version": "1573053304574", + "model-invariant-id": "7129e420-d396-4efb-af02-6b83499b12f8", + "model-version-id": "77c1a3d9-422a-4f78-bd8f-f7a357685b25", "nf-role": "gNB", "orchestration-status": "Active" } @@ -57,5 +59,57 @@ } } } - } + }, + { + "httpRequest":{ + "path":"/aai/v20/service-design-and-creation/models/model.*" + }, + "httpResponse":{ + "statusCode":200, + "headers":{ + "content-type":[ + "application/json" + ] + }, + "body":{ + "type":"JSON", + "json":{ + "model-version-id":"6d25b637-8bca-47e2-af1a-61258424183d", + "model-name":"PNF102", + "model-version":"1.0", + "model-description":"sartgserg", + "sdnc-model-name":"pm_control", + "sdnc-model-version":"1.0.0", + "resource-version":"1598626661947", + "relationship-list":{ + "relationship":[ + { + "related-to":"model-element", + "relationship-label":"org.onap.relationships.inventory.IsA", + "related-link":"/aai/v20/service-design-and-creation/models/model/c1a44771-3aa8-4888-a4f4-be89d1caa0cb/model-vers/model-ver/7256a992-10a7-4ac8-8c2c-63c67e5c48c8/model-elements/model-element/fddc70fe-8343-48c1-af2e-b54f551a32ee/model-elements/model-element/7bff45b7-8254-44e5-b7ad-6e10dee6dfc3", + "relationship-data":[ + { + "relationship-key":"model.model-invariant-id", + "relationship-value":"c1a44771-3aa8-4888-a4f4-be89d1caa0cb" + }, + { + "relationship-key":"model-ver.model-version-id", + "relationship-value":"7256a992-10a7-4ac8-8c2c-63c67e5c48c8" + }, + { + "relationship-key":"model-element.model-element-uuid", + "relationship-value":"fddc70fe-8343-48c1-af2e-b54f551a32ee" + }, + { + "relationship-key":"model-element.model-element-uuid", + "relationship-value":"7bff45b7-8254-44e5-b7ad-6e10dee6dfc3" + } + ] + } + ] + } + } + } + } + } ] diff --git a/plans/dcaegen2-services-pmsh/testsuite/assets/cbs_sim/cbs-initializer.json b/plans/dcaegen2-services-pmsh/testsuite/assets/cbs_sim/cbs-initializer.json index 16d6893a..8caf2001 100644 --- a/plans/dcaegen2-services-pmsh/testsuite/assets/cbs_sim/cbs-initializer.json +++ b/plans/dcaegen2-services-pmsh/testsuite/assets/cbs_sim/cbs-initializer.json @@ -20,13 +20,15 @@ "fileBasedGP": 15, "fileLocation": "/pm/pm.xml", "nfFilter": { - "swVersions": [ - "1.0.0", - "1.0.1" - ], "nfNames": [ "^pnf.*", "^vnf.*" + ], + "modelInvariantUUIDs": [ + "7129e420-d396-4efb-af02-6b83499b12f8" + ], + "modelVersionIDs": [ + ] }, "measurementGroups": [ diff --git a/scripts/ccsdk/oran/mock-hello.sh b/scripts/ccsdk/oran/mock-hello.sh deleted file mode 100755 index a40f8bf9..00000000 --- a/scripts/ccsdk/oran/mock-hello.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -# -# Copyright 2016-2017 Huawei Technologies 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. - -curl -v -X PUT -d @- http://$1:1080/expectation <<EOF -{ - "httpRequest": { - "method": "GET", - "path": "/hello" - }, - "httpResponse": { - "body": "Hello world!", - "statusCode": 200 - } -} -EOF - diff --git a/tests/ccsdk-oran/polmansuite/__init__.robot b/tests/ccsdk-oran/polmansuite/__init__.robot new file mode 100644 index 00000000..bf52713b --- /dev/null +++ b/tests/ccsdk-oran/polmansuite/__init__.robot @@ -0,0 +1,2 @@ +*** Settings *** +Documentation Non-RT RIC Policy Management - polmansuite diff --git a/tests/ccsdk-oran/polmansuite/test.robot b/tests/ccsdk-oran/polmansuite/test.robot new file mode 100644 index 00000000..be396287 --- /dev/null +++ b/tests/ccsdk-oran/polmansuite/test.robot @@ -0,0 +1,16 @@ +*** Settings *** +Library OperatingSystem +Library Process + +*** Test Cases *** + +Functional Test Case 1 + [Documentation] Functional Test Case 1 - FTC1 + Start Process ${AUTOTEST_ROOT}/FTC1.sh remote auto-clean 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 + Should Be Equal As Integers ${ResultFileContent} 0 + + + diff --git a/tests/ccsdk/oran/suite1/__init__.robot b/tests/ccsdk/oran/suite1/__init__.robot deleted file mode 100644 index 09aa0315..00000000 --- a/tests/ccsdk/oran/suite1/__init__.robot +++ /dev/null @@ -1,2 +0,0 @@ -*** Settings *** -Documentation Ccsdk Oran - Suite 1 diff --git a/tests/ccsdk/oran/suite1/test1.robot b/tests/ccsdk/oran/suite1/test1.robot deleted file mode 100644 index 10e68521..00000000 --- a/tests/ccsdk/oran/suite1/test1.robot +++ /dev/null @@ -1,30 +0,0 @@ -*** Settings *** -Library OperatingSystem -Library RequestsLibrary - -*** Variables *** -${MESSAGE} Hello, world! - -*** Test Cases *** -String Equality Test - Should Be Equal ${MESSAGE} Hello, world! - -Dir Test - [Documentation] Check if /tmp exists - Log ${MESSAGE} - CheckDir /tmp - -Url Test - [Documentation] Check if google.com can be reached - CheckUrl http://www.google.com - -*** Keywords *** -CheckDir - [Arguments] ${path} - Directory Should Exist ${path} - -CheckUrl - [Arguments] ${url} - Create Session session ${url} - ${resp}= Get Request session / - Should Be Equal As Integers ${resp.status_code} 200 diff --git a/tests/ccsdk/oran/suite2/__init__.robot b/tests/ccsdk/oran/suite2/__init__.robot deleted file mode 100644 index c9bbad32..00000000 --- a/tests/ccsdk/oran/suite2/__init__.robot +++ /dev/null @@ -1,2 +0,0 @@ -*** Settings *** -Documentation Ccsdk Oran - Suite 2 diff --git a/tests/ccsdk/oran/suite2/test1.robot b/tests/ccsdk/oran/suite2/test1.robot deleted file mode 100644 index 5d354dde..00000000 --- a/tests/ccsdk/oran/suite2/test1.robot +++ /dev/null @@ -1,30 +0,0 @@ -*** Settings *** -Library OperatingSystem -Library RequestsLibrary - -*** Variables *** -${MESSAGE} Hello, world! - -*** Test Cases *** -String Equality Test - Should Be Equal ${MESSAGE} Hello, world! - -Dir Test - [Documentation] Check if /tmp exists - Log ${MESSAGE} - CheckDir /tmp - -Url Test - [Documentation] Check if www.onap.org can be reached - Create Session openo http://www.onap.org - CheckUrl openo / - -*** Keywords *** -CheckDir - [Arguments] ${path} - Directory Should Exist ${path} - -CheckUrl - [Arguments] ${session} ${path} - ${resp}= Get Request ${session} ${path} - Should Be Equal As Integers ${resp.status_code} 200 diff --git a/tests/ccsdk/oran/vCPE/__init__.robot b/tests/ccsdk/oran/vCPE/__init__.robot deleted file mode 100644 index f6230ae5..00000000 --- a/tests/ccsdk/oran/vCPE/__init__.robot +++ /dev/null @@ -1,2 +0,0 @@ -*** Settings *** -Documentation Ccsdk Oran - vCPE diff --git a/tests/ccsdk/oran/vCPE/test1.robot b/tests/ccsdk/oran/vCPE/test1.robot deleted file mode 100644 index d07bf6e4..00000000 --- a/tests/ccsdk/oran/vCPE/test1.robot +++ /dev/null @@ -1,60 +0,0 @@ -*** Settings *** -Suite Setup Suite Setup -Suite Teardown Suite Teardown -Library OperatingSystem -Library RequestsLibrary -Library Process -Library ONAPLibrary.Utilities - -*** Variables *** -${GLOBAL_APPLICATION_ID} csit-vCPE -${GLOBAL_MSO_USERNAME} InfraPortalClient -${GLOBAL_MSO_PASSWORD} password1$ - -*** Test Cases *** -SO ServiceInstance health check - ${auth}= Create List ${GLOBAL_MSO_USERNAME} ${GLOBAL_MSO_PASSWORD} - ${session}= Create Session so http://${SO_IP}:8080 - ${uuid}= Generate UUID4 - ${headers}= Create Dictionary Accept=text/html Content-Type=text/html X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID} - ${resp}= Get Request so /ecomp/mso/infra/globalhealthcheck headers=${headers} - &{headers}= Create Dictionary Authorization=Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA== Content-Type=application/json Accept=application/json - ${resp}= Get Request so /ecomp/mso/infra/orchestrationRequests/v2 headers=${headers} - Should Not Contain ${resp.content} null - -*** Keywords *** -Run Docker - [Arguments] ${image} ${name} ${parameters}=${EMPTY} - ${result}= Run Process docker run --name ${name} ${parameters} -d ${image} shell=True - Should Be Equal As Integers ${result.rc} 0 - Log ${result.stdout} - ${result}= Run Process docker inspect --format '{{ .NetworkSettings.IPAddress }}' ${name} shell=True - Should Be Equal As Integers ${result.rc} 0 - Log ${result.stdout} - [Return] ${result.stdout} - -Kill Docker - [Arguments] ${name} - ${result}= Run Process docker logs ${name} shell=True - Should Be Equal As Integers ${result.rc} 0 - Log ${result.stdout} - ${result}= Run Process docker kill ${name} shell=True - Should Be Equal As Integers ${result.rc} 0 - Log ${result.stdout} - ${result}= Run Process docker rm ${name} shell=True - Should Be Equal As Integers ${result.rc} 0 - Log ${result.stdout} - -CheckUrl - [Arguments] ${url} - Create Session session ${url} disable_warnings=True - ${resp}= Get Request session / - Should Be Equal As Integers ${resp.status_code} 200 - -Suite Setup - ${SO_IP}= Run Docker nexus3.onap.org:10001/openecomp/mso i-so - Wait Until Keyword Succeeds 1 min 5 sec CheckUrl http://${SO_IP}:8080 - Set Suite Variable ${SO_IP} - -Suite Teardown - Kill Docker i-so diff --git a/tests/dcaegen2-services-pmsh/testcases/assets/cbs-expectation-unlocked-config.json b/tests/dcaegen2-services-pmsh/testcases/assets/cbs-expectation-unlocked-config.json index bad79d5f..b67c0cb1 100644 --- a/tests/dcaegen2-services-pmsh/testcases/assets/cbs-expectation-unlocked-config.json +++ b/tests/dcaegen2-services-pmsh/testcases/assets/cbs-expectation-unlocked-config.json @@ -20,13 +20,15 @@ "fileBasedGP": 15, "fileLocation": "/pm/pm.xml", "nfFilter": { - "swVersions": [ - "1.0.0", - "1.0.1" - ], "nfNames": [ "^pnf.*", "^vnf.*" + ], + "modelInvariantUUIDs": [ + "7129e420-d396-4efb-af02-6b83499b12f8" + ], + "modelVersionIDs": [ + ] }, "measurementGroups": [ diff --git a/tests/dcaegen2-services-pmsh/testcases/assets/mr-expectation-aai-pnf-created.json b/tests/dcaegen2-services-pmsh/testcases/assets/mr-expectation-aai-pnf-created.json index 860672f4..b433892a 100644 --- a/tests/dcaegen2-services-pmsh/testcases/assets/mr-expectation-aai-pnf-created.json +++ b/tests/dcaegen2-services-pmsh/testcases/assets/mr-expectation-aai-pnf-created.json @@ -14,7 +14,7 @@ ] }, "body": [ - "{\"cambria.partition\":\"AAI\",\"event-header\":{\"severity\":\"NORMAL\",\"entity-type\":\"pnf\",\"top-entity-type\":\"pnf\",\"entity-link\":\"/aai/v16/network/pnfs/pnf/pnf_newly_discovered\",\"event-type\":\"AAI-EVENT\",\"domain\":\"dev\",\"action\":\"UPDATE\",\"sequence-number\":\"0\",\"id\":\"db09e090-196e-4f84-9645-e449b1cd3640\",\"source-name\":\"dcae-curl\",\"version\":\"v16\",\"timestamp\":\"20200203-15:14:08:807\"},\"entity\":{\"ipaddress-v4-oam\":\"10.10.10.37\",\"nf-role\":\"gNB\",\"equip-type\":\"val8\",\"relationship-list\":{\"relationship\":[{\"related-to\":\"service-instance\",\"relationship-data\":[{\"relationship-value\":\"Demonstration\",\"relationship-key\":\"customer.global-customer-id\"},{\"relationship-value\":\"vCPE\",\"relationship-key\":\"service-subscription.service-type\"},{\"relationship-value\":\"2c03b2a8-e31a-4749-9e99-3089ab441400\",\"relationship-key\":\"service-instance.service-instance-id\"}],\"related-link\":\"/aai/v16/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vCPE/service-instances/service-instance/2c03b2a8-e31a-4749-9e99-3089ab441400\",\"relationship-label\":\"org.onap.relationships.inventory.ComposedOf\",\"related-to-property\":[{\"property-key\":\"service-instance.service-instance-name\",\"property-value\":\"Svc6_1\"}]}]},\"equip-vendor\":\"Ericsson\",\"serial-number\":\"6061ZW3\",\"ipaddress-v6-oam\":\"2001:0db8:0:0:0:0:1428:57ab\",\"equip-model\":\"val6\",\"in-maint\":false,\"resource-version\":\"1578668956804\",\"sw-version\":\"val7\",\"pnf-id\":\"eabcfaf7-b7f3-45fb-94e7-e6112fb3e8b8\",\"pnf-name\":\"pnf_newly_discovered\",\"orchestration-status\":\"Active\"}}" + "{\"cambria.partition\":\"AAI\",\"event-header\":{\"severity\":\"NORMAL\",\"entity-type\":\"pnf\",\"top-entity-type\":\"pnf\",\"entity-link\":\"/aai/v16/network/pnfs/pnf/pnf_newly_discovered\",\"event-type\":\"AAI-EVENT\",\"domain\":\"dev\",\"action\":\"UPDATE\",\"sequence-number\":\"0\",\"id\":\"db09e090-196e-4f84-9645-e449b1cd3640\",\"source-name\":\"dcae-curl\",\"version\":\"v16\",\"timestamp\":\"20200203-15:14:08:807\"},\"entity\":{\"ipaddress-v4-oam\":\"10.10.10.37\",\"nf-role\":\"gNB\",\"equip-type\":\"val8\",\"relationship-list\":{\"relationship\":[{\"related-to\":\"service-instance\",\"relationship-data\":[{\"relationship-value\":\"Demonstration\",\"relationship-key\":\"customer.global-customer-id\"},{\"relationship-value\":\"vCPE\",\"relationship-key\":\"service-subscription.service-type\"},{\"relationship-value\":\"2c03b2a8-e31a-4749-9e99-3089ab441400\",\"relationship-key\":\"service-instance.service-instance-id\"}],\"related-link\":\"/aai/v16/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vCPE/service-instances/service-instance/2c03b2a8-e31a-4749-9e99-3089ab441400\",\"relationship-label\":\"org.onap.relationships.inventory.ComposedOf\",\"related-to-property\":[{\"property-key\":\"service-instance.service-instance-name\",\"property-value\":\"Svc6_1\"}]}]},\"equip-vendor\":\"Ericsson\",\"serial-number\":\"6061ZW3\",\"ipaddress-v6-oam\":\"2001:0db8:0:0:0:0:1428:57ab\",\"equip-model\":\"val6\",\"in-maint\":false,\"resource-version\":\"1578668956804\",\"sw-version\":\"val7\",\"pnf-id\":\"eabcfaf7-b7f3-45fb-94e7-e6112fb3e8b8\",\"pnf-name\":\"pnf_newly_discovered\",\"model-invariant-id\":\"7129e420-d396-4efb-af02-6b83499b12f8\",\"model-version-id\":\"e80a6ae3-cafd-4d24-850d-e14c084a5ca9\",\"orchestration-status\":\"Active\"}}" ] }, "times": { diff --git a/tests/dcaegen2-services-pmsh/testcases/assets/mr-expectation-aai-pnf-deleted.json b/tests/dcaegen2-services-pmsh/testcases/assets/mr-expectation-aai-pnf-deleted.json index 8dd58188..3df66a61 100644 --- a/tests/dcaegen2-services-pmsh/testcases/assets/mr-expectation-aai-pnf-deleted.json +++ b/tests/dcaegen2-services-pmsh/testcases/assets/mr-expectation-aai-pnf-deleted.json @@ -14,7 +14,7 @@ ] }, "body": [ - "{\"cambria.partition\":\"AAI\",\"event-header\":{\"severity\":\"NORMAL\",\"entity-type\":\"pnf\",\"top-entity-type\":\"pnf\",\"entity-link\":\"/aai/v16/network/pnfs/pnf/pnf_newly_discovered\",\"event-type\":\"AAI-EVENT\",\"domain\":\"dev\",\"action\":\"DELETE\",\"sequence-number\":\"0\",\"id\":\"db09e090-196e-4f84-9645-e449b1cd3640\",\"source-name\":\"dcae-curl\",\"version\":\"v16\",\"timestamp\":\"20200203-15:14:08:807\"},\"entity\":{\"ipaddress-v4-oam\":\"10.10.10.37\",\"nf-role\":\"gNB\",\"equip-type\":\"val8\",\"relationship-list\":{\"relationship\":[{\"related-to\":\"service-instance\",\"relationship-data\":[{\"relationship-value\":\"Demonstration\",\"relationship-key\":\"customer.global-customer-id\"},{\"relationship-value\":\"vCPE\",\"relationship-key\":\"service-subscription.service-type\"},{\"relationship-value\":\"2c03b2a8-e31a-4749-9e99-3089ab441400\",\"relationship-key\":\"service-instance.service-instance-id\"}],\"related-link\":\"/aai/v16/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vCPE/service-instances/service-instance/2c03b2a8-e31a-4749-9e99-3089ab441400\",\"relationship-label\":\"org.onap.relationships.inventory.ComposedOf\",\"related-to-property\":[{\"property-key\":\"service-instance.service-instance-name\",\"property-value\":\"Svc6_1\"}]}]},\"equip-vendor\":\"Ericsson\",\"serial-number\":\"6061ZW3\",\"ipaddress-v6-oam\":\"2001:0db8:0:0:0:0:1428:57ab\",\"equip-model\":\"val6\",\"in-maint\":false,\"resource-version\":\"1578668956804\",\"sw-version\":\"val7\",\"pnf-id\":\"eabcfaf7-b7f3-45fb-94e7-e6112fb3e8b8\",\"pnf-name\":\"pnf_newly_discovered\",\"orchestration-status\":\"Active\"}}" + "{\"cambria.partition\":\"AAI\",\"event-header\":{\"severity\":\"NORMAL\",\"entity-type\":\"pnf\",\"top-entity-type\":\"pnf\",\"entity-link\":\"/aai/v16/network/pnfs/pnf/pnf_newly_discovered\",\"event-type\":\"AAI-EVENT\",\"domain\":\"dev\",\"action\":\"DELETE\",\"sequence-number\":\"0\",\"id\":\"db09e090-196e-4f84-9645-e449b1cd3640\",\"source-name\":\"dcae-curl\",\"version\":\"v16\",\"timestamp\":\"20200203-15:14:08:807\"},\"entity\":{\"ipaddress-v4-oam\":\"10.10.10.37\",\"nf-role\":\"gNB\",\"equip-type\":\"val8\",\"relationship-list\":{\"relationship\":[{\"related-to\":\"service-instance\",\"relationship-data\":[{\"relationship-value\":\"Demonstration\",\"relationship-key\":\"customer.global-customer-id\"},{\"relationship-value\":\"vCPE\",\"relationship-key\":\"service-subscription.service-type\"},{\"relationship-value\":\"2c03b2a8-e31a-4749-9e99-3089ab441400\",\"relationship-key\":\"service-instance.service-instance-id\"}],\"related-link\":\"/aai/v16/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vCPE/service-instances/service-instance/2c03b2a8-e31a-4749-9e99-3089ab441400\",\"relationship-label\":\"org.onap.relationships.inventory.ComposedOf\",\"related-to-property\":[{\"property-key\":\"service-instance.service-instance-name\",\"property-value\":\"Svc6_1\"}]}]},\"equip-vendor\":\"Ericsson\",\"serial-number\":\"6061ZW3\",\"ipaddress-v6-oam\":\"2001:0db8:0:0:0:0:1428:57ab\",\"equip-model\":\"val6\",\"in-maint\":false,\"resource-version\":\"1578668956804\",\"sw-version\":\"val7\",\"pnf-id\":\"eabcfaf7-b7f3-45fb-94e7-e6112fb3e8b8\",\"pnf-name\":\"pnf_newly_discovered\",\"model-invariant-id\":\"7129e420-d396-4efb-af02-6b83499b12f8\",\"model-version-id\":\"e80a6ae3-cafd-4d24-850d-e14c084a5ca9\",\"orchestration-status\":\"Active\"}}" ] }, "times": { diff --git a/tests/dcaegen2-services-pmsh/testcases/pmsh.robot b/tests/dcaegen2-services-pmsh/testcases/pmsh.robot index def53caa..2f0e5bf6 100644 --- a/tests/dcaegen2-services-pmsh/testcases/pmsh.robot +++ b/tests/dcaegen2-services-pmsh/testcases/pmsh.robot @@ -55,7 +55,6 @@ Verify PNF detected in AAI when administrative state unlocked ${resp}= Get Request pmsh_session ${SUBSCRIPTIONS_ENDPOINT} Should Be Equal As Strings ${resp.json()[0]['subscription_status']} UNLOCKED Should Be Equal As Strings ${resp.json()[0]['network_functions'][0]['nf_name']} pnf-existing - Should Be Equal As Strings ${resp.json()[0]['network_functions'][0]['orchestration_status']} Active Should Be Equal As Strings ${resp.json()[0]['network_functions'][0]['nf_sub_status']} PENDING_CREATE Verify Policy response on MR is handled @@ -75,7 +74,6 @@ Verify AAI event on MR detailing new PNF being detected is handled Sleep 31 seconds Ensure AAI event on MR is picked up ${resp}= Get Request pmsh_session ${SUBSCRIPTIONS_ENDPOINT} Should Be Equal As Strings ${resp.json()[0]['network_functions'][1]['nf_name']} pnf_newly_discovered - Should Be Equal As Strings ${resp.json()[0]['network_functions'][1]['orchestration_status']} Active Should Be Equal As Strings ${resp.json()[0]['network_functions'][1]['nf_sub_status']} PENDING_CREATE Verify AAI event on MR detailing PNF being deleted is handled |