diff options
39 files changed, 473 insertions, 795 deletions
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/.env b/plans/dcaegen2-collectors-hv-ves/testsuites/.env index 7e2fffcf..e0286167 100644 --- a/plans/dcaegen2-collectors-hv-ves/testsuites/.env +++ b/plans/dcaegen2-collectors-hv-ves/testsuites/.env @@ -1,3 +1,20 @@ +# ============LICENSE_START======================================================= +# dcaegen2-collectors-veshv +# ================================================================================ +# Copyright (C) 2018-2019 NOKIA +# ================================================================================ +# 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========================================================= HV_VES_COLLECTOR_NAMESPACE=onap HV_VES_GROUP_ID=org.onap.dcaegen2.collectors.hv-ves @@ -9,4 +26,8 @@ DCAE_APP_SIMULATOR_IMAGE=hv-collector-dcae-app-simulator HV_VES_VERSION=1.1-SNAPSHOT HV_VES_HEALTHCHECK_CMD=curl --request GET --fail --silent --show-error localhost:6060/health/ready && nc -vz localhost 6061 -HV_VES_MAIN_CLASS=org.onap.dcae.collectors.veshv.main.MainKt + +JAVA_OPTS=-Dio.netty.leakDetection.level=paranoid +CONSUL_HOST=consul-server +CONFIG_BINDING_SERVICE=config-binding-service +HV_VES_HOSTNAME=dcae-hv-ves-collector
\ No newline at end of file diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/insecure.json b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/insecure.json new file mode 100644 index 00000000..9af02ffd --- /dev/null +++ b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/insecure.json @@ -0,0 +1,28 @@ +{ + "server": { + "listenPort": 6061, + "idleTimeoutSec": 60, + "maxPayloadSizeBytes": 1048576 + }, + "cbs": { + "firstRequestDelaySec": 5, + "requestIntervalSec": 10 + }, + "security": { + "sslDisable": true + }, + "collector": { + "maxRequestSizeBytes": 1048576, + "kafkaServers": [ + "kafka:9092" + ], + "routing": [ + { + "fromDomain": "perf3gpp", + "toTopic": "TEST_HV_VES_PERF3GPP" + } + ], + "dummyMode": false + }, + "logLevel": "DEBUG" +}
\ No newline at end of file diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/secure.json b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/secure.json new file mode 100644 index 00000000..5aa2b0aa --- /dev/null +++ b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/secure.json @@ -0,0 +1,34 @@ +{ + "server": { + "listenPort": 6061, + "idleTimeoutSec": 60, + "maxPayloadSizeBytes": 1048576 + }, + "cbs": { + "firstRequestDelaySec": 5, + "requestIntervalSec": 10 + }, + "security": { + "sslDisable": false, + "keys": { + "keyStoreFile": "/etc/hv-ves/ssl/server.p12", + "keyStorePassword": "onaponap", + "trustStoreFile": "/etc/hv-ves/ssl/trust.p12", + "trustStorePassword": "onaponap" + } + }, + "collector": { + "maxRequestSizeBytes": 1048576, + "kafkaServers": [ + "kafka:9092" + ], + "routing": [ + { + "fromDomain": "perf3gpp", + "toTopic": "TEST_HV_VES_PERF3GPP" + } + ], + "dummyMode": false + }, + "logLevel": "DEBUG" +}
\ No newline at end of file diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/ssl/.gitignore b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/ssl/.gitignore index 0729569c..0729569c 100644 --- a/plans/dcaegen2-collectors-hv-ves/testsuites/ssl/.gitignore +++ b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/ssl/.gitignore diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/ssl/Makefile-openssl b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/ssl/Makefile-openssl index a32d30dd..a32d30dd 100644 --- a/plans/dcaegen2-collectors-hv-ves/testsuites/ssl/Makefile-openssl +++ b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/ssl/Makefile-openssl diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/ssl/README.md b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/ssl/README.md index c2819d24..c2819d24 100644 --- a/plans/dcaegen2-collectors-hv-ves/testsuites/ssl/README.md +++ b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/ssl/README.md diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/ssl/gen-certs.sh b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/ssl/gen-certs.sh index 34572f7a..9f6bea20 100755 --- a/plans/dcaegen2-collectors-hv-ves/testsuites/ssl/gen-certs.sh +++ b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/ssl/gen-certs.sh @@ -1,4 +1,22 @@ #!/usr/bin/env bash +# ============LICENSE_START======================================================= +# csit-dcaegen2-collectors-hv-ves +# ================================================================================ +# Copyright (C) 2018 NOKIA +# ================================================================================ +# 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 -eu -o pipefail -o xtrace diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/consul.d/cbs.json b/plans/dcaegen2-collectors-hv-ves/testsuites/consul.d/cbs.json deleted file mode 100644 index 0761c7e5..00000000 --- a/plans/dcaegen2-collectors-hv-ves/testsuites/consul.d/cbs.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "service": { - "name": "cbs", - "tags": [ - "cbs" - ], - "port": 10000, - "address": "config-binding-service" - } -} diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/consul/configuration.hcl b/plans/dcaegen2-collectors-hv-ves/testsuites/consul/configuration.hcl new file mode 100644 index 00000000..12ed138a --- /dev/null +++ b/plans/dcaegen2-collectors-hv-ves/testsuites/consul/configuration.hcl @@ -0,0 +1,33 @@ +/* + * ============LICENSE_START======================================================= + * csit-dcaegen2-collectors-hv-ves + * ================================================================================ + * Copyright (C) 2019 NOKIA + * ================================================================================ + * 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========================================================= + */ + +server = true +bootstrap = true +client_addr = "0.0.0.0" + +service { + # name under which hv-ves collector should seek cbs + # usually set as CONFIG_BINDING_SERVICE environment variable + Name = "config-binding-service" + # address of CBS as seen by hv-ves collector + Address = "config-binding-service" + Port = 10000 +} + diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml index ac07eb78..bc7105ec 100644 --- a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml +++ b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml @@ -1,4 +1,22 @@ version: "3" +# ============LICENSE_START======================================================= +# csit-dcaegen2-collectors-hv-ves +# ================================================================================ +# Copyright (C) 2018-2019 NOKIA +# ================================================================================ +# 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========================================================= + networks: ves-hv-default: @@ -34,7 +52,6 @@ services: networks: - ves-hv-default - # # Consul / CBS # @@ -43,26 +60,22 @@ services: image: docker.io/consul:1.0.6 ports: - "8500:8500" - command: ["agent","-bootstrap", "-client=0.0.0.0", "-server", "-ui", "-config-dir=/consul/consul.d"] volumes: - - ./consul.d/:/consul/consul.d + - ./consul/:/consul/config networks: - ves-hv-default: - aliases: - - consul + - ves-hv-default config-binding-service: image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding.app-app:2.2.4 ports: - "10000:10000" environment: - CONSUL_HOST: "consul-server" + - CONSUL_HOST depends_on: - consul-server networks: - ves-hv-default: - aliases: - - cbs + - ves-hv-default + # # DCAE HV VES Collector # @@ -72,22 +85,19 @@ services: ports: - "6060:6060" - "6061:6061/tcp" - command: ["--listen-port", "6061", - "--kafka-bootstrap-servers", "kafka:9092", - "--key-store-password", "onaponap", - "--trust-store-password", "onaponap"] + command: ["--configuration-file", "/etc/hv-ves/configuration/secure.json"] environment: - JAVA_OPTS: "-Dio.netty.leakDetection.level=paranoid" - CONSUL_HOST: "consul-server" - CONFIG_BINDING_SERVICE: "cbs" - HOSTNAME: "dcae-hv-ves-collector" + - JAVA_OPTS + - HOSTNAME=${HV_VES_HOSTNAME} + - CONSUL_HOST + - CONFIG_BINDING_SERVICE healthcheck: interval: 10s timeout: 5s retries: 2 test: ${HV_VES_HEALTHCHECK_CMD} volumes: - - ./ssl/:/etc/ves-hv/ + - ./collector/:/etc/hv-ves/ depends_on: - config-binding-service - kafka @@ -99,21 +109,19 @@ services: ports: - "7060:6060" - "7061:6061/tcp" - command: ["--listen-port", "6061", - "--kafka-bootstrap-servers", "kafka:9092", - "--ssl-disable"] + command: ["--configuration-file", "/etc/hv-ves/configuration/insecure.json"] environment: - JAVA_OPTS: "-Dio.netty.leakDetection.level=paranoid" - CONSUL_HOST: "consul-server" - CONFIG_BINDING_SERVICE: "cbs" - HOSTNAME: "dcae-hv-ves-collector" + - JAVA_OPTS + - HOSTNAME=${HV_VES_HOSTNAME} + - CONSUL_HOST + - CONFIG_BINDING_SERVICE healthcheck: interval: 10s timeout: 5s retries: 2 test: ${HV_VES_HEALTHCHECK_CMD} volumes: - - ./ssl/:/etc/ves-hv/ + - ./collector/:/etc/hv-ves/ depends_on: - config-binding-service - kafka @@ -133,7 +141,5 @@ services: depends_on: - kafka networks: - ves-hv-default: - aliases: - - dcae-app-simulator + - ves-hv-default diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh b/plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh index 587b2680..34baae8e 100755 --- a/plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh +++ b/plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh @@ -1,4 +1,21 @@ #!/usr/bin/env bash +# ============LICENSE_START======================================================= +# csit-dcaegen2-collectors-hv-ves +# ================================================================================ +# Copyright (C) 2018-2019 NOKIA +# ================================================================================ +# 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 -euo pipefail @@ -13,7 +30,7 @@ else pip uninstall -y docker-py pip install docker - COMPOSE_VERSION=1.22.0 + COMPOSE_VERSION=1.23.2 COMPOSE_LOCATION='/usr/local/bin/docker-compose' sudo curl -L https://github.com/docker/compose/releases/download/${COMPOSE_VERSION}/docker-compose-$(uname -s)-$(uname -m) -o ${COMPOSE_LOCATION} sudo chmod +x ${COMPOSE_LOCATION} @@ -29,9 +46,9 @@ export CONTAINERS_NETWORK=ves-hv-default echo "Creating network for containers: ${CONTAINERS_NETWORK}" docker network create ${CONTAINERS_NETWORK} -cd ssl +cd collector/ssl ./gen-certs.sh -cd .. +cd ../.. docker-compose up -d diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/teardown.sh b/plans/dcaegen2-collectors-hv-ves/testsuites/teardown.sh index fe922ed0..ec392154 100755 --- a/plans/dcaegen2-collectors-hv-ves/testsuites/teardown.sh +++ b/plans/dcaegen2-collectors-hv-ves/testsuites/teardown.sh @@ -1,8 +1,25 @@ #!/usr/bin/env bash +# ============LICENSE_START======================================================= +# csit-dcaegen2-collectors-hv-ves +# ================================================================================ +# Copyright (C) 2018-2019 NOKIA +# ================================================================================ +# 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 ssl +cd collector/ssl ./gen-certs.sh clean -cd .. +cd ../.. COMPOSE_LOGS_FILE=${WORKSPACE}/archives/containers_logs/docker-compose.log docker-compose logs > ${COMPOSE_LOGS_FILE} diff --git a/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-e2e.yml b/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-e2e.yml index bf02465b..99361d40 100644 --- a/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-e2e.yml +++ b/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-e2e.yml @@ -62,7 +62,7 @@ services: buscontroller: container_name: buscontroller - image: nexus3.onap.org:10001/onap/dmaap/dmaap-bc:1.1.1 + image: nexus3.onap.org:10001/onap/dmaap/dmaap-bc:latest ports: - "18080:8080" - "18443:8443" diff --git a/plans/msb/iag-redirect-discovery/setup.sh b/plans/msb/iag-redirect-discovery/setup.sh index 70614c5c..8d2d20d8 100644 --- a/plans/msb/iag-redirect-discovery/setup.sh +++ b/plans/msb/iag-redirect-discovery/setup.sh @@ -18,7 +18,7 @@ source ${SCRIPTS}/common_functions.sh #start msb -docker run -d -p 8500:8500 --name msb_consul consul:0.9.3 +docker run -d -p 8500:8500 --name msb_consul consul:1.4.3 MSB_CONSUL_IP=`get-instance-ip.sh msb_consul` echo MSB_CONSUL_IP=${MSB_CONSUL_IP} @@ -52,4 +52,4 @@ curl -X POST \ "http://${MSB_IAG_IP}:80/api/microservices/v1/services" # Pass any variables required by Robot suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v MSB_DISCOVERY_IP:${MSB_DISCOVERY_IP} -v REST_EXAMPLE_IP:${REST_EXAMPLE_IP}"
\ No newline at end of file +ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v MSB_DISCOVERY_IP:${MSB_DISCOVERY_IP} -v REST_EXAMPLE_IP:${REST_EXAMPLE_IP}" diff --git a/plans/msb/rest-service/setup.sh b/plans/msb/rest-service/setup.sh index 8d344db8..9e77e64a 100644 --- a/plans/msb/rest-service/setup.sh +++ b/plans/msb/rest-service/setup.sh @@ -18,7 +18,7 @@ source ${SCRIPTS}/common_functions.sh #start msb -docker run -d -p 8500:8500 --name msb_consul consul:0.9.3 +docker run -d -p 8500:8500 --name msb_consul consul:1.4.3 MSB_CONSUL_IP=`get-instance-ip.sh msb_consul` echo MSB_CONSUL_IP=${MSB_CONSUL_IP} @@ -52,4 +52,4 @@ curl -X POST \ "http://${MSB_DISCOVERY_IP}:10081/api/microservices/v1/services" # Pass any variables required by Robot suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v MSB_DISCOVERY_IP:${MSB_DISCOVERY_IP} -v REST_EXAMPLE_IP:${REST_EXAMPLE_IP}"
\ No newline at end of file +ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v MSB_DISCOVERY_IP:${MSB_DISCOVERY_IP} -v REST_EXAMPLE_IP:${REST_EXAMPLE_IP}" diff --git a/plans/msb/sanity-check/setup.sh b/plans/msb/sanity-check/setup.sh index e44f4371..d6e38fbe 100644 --- a/plans/msb/sanity-check/setup.sh +++ b/plans/msb/sanity-check/setup.sh @@ -18,7 +18,7 @@ source ${SCRIPTS}/common_functions.sh #start msb -docker run -d -p 8500:8500 --name msb_consul consul:0.9.3 +docker run -d -p 8500:8500 --name msb_consul consul:1.4.3 MSB_CONSUL_IP=`get-instance-ip.sh msb_consul` echo MSB_CONSUL_IP=${MSB_CONSUL_IP} diff --git a/plans/msb/tcp-service/setup.sh b/plans/msb/tcp-service/setup.sh index ea2bafdf..2ebb830f 100644 --- a/plans/msb/tcp-service/setup.sh +++ b/plans/msb/tcp-service/setup.sh @@ -18,7 +18,7 @@ source ${SCRIPTS}/common_functions.sh #start msb -docker run -d -p 8500:8500 --name msb_consul consul:0.9.3 +docker run -d -p 8500:8500 --name msb_consul consul:1.4.3 MSB_CONSUL_IP=`get-instance-ip.sh msb_consul` echo MSB_CONSUL_IP=${MSB_CONSUL_IP} @@ -50,4 +50,4 @@ curl -H "Content-Type: application/json" -X POST -d '{"serviceName": "ActiveMQ", # Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v MSB_DISCOVERY_IP:${MSB_DISCOVERY_IP} -v ACTIVEMQ_IP:${ACTIVEMQ_IP}"
\ No newline at end of file +ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v MSB_DISCOVERY_IP:${MSB_DISCOVERY_IP} -v ACTIVEMQ_IP:${ACTIVEMQ_IP}" diff --git a/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml b/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml index 3ee96355..8f1abb51 100644 --- a/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml +++ b/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml @@ -70,7 +70,7 @@ services: ves: container_name: vescollector - image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.4.1 + image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:latest environment: DMAAPHOST: @@ -94,7 +94,7 @@ services: buscontroller: container_name: buscontroller - image: nexus3.onap.org:10001/onap/dmaap/dmaap-bc:1.1.1 + image: nexus3.onap.org:10001/onap/dmaap/dmaap-bc:latest ports: - "18080:8080" - "18443:8443" diff --git a/scripts/clamp/clone_clamp_and_change_dockercompose.sh b/scripts/clamp/clone_clamp_and_change_dockercompose.sh index c2c0de4d..4e3eb582 100755 --- a/scripts/clamp/clone_clamp_and_change_dockercompose.sh +++ b/scripts/clamp/clone_clamp_and_change_dockercompose.sh @@ -31,7 +31,7 @@ which firefox # Clone Clamp repo to get extra folder that has all needed to run docker with docker-compose to start DB and Clamp mkdir -p $WORKSPACE/archives/clamp-clone cd $WORKSPACE/archives/clamp-clone -git clone --depth 1 http://gerrit.onap.org/r/clamp -b master +git clone --depth 1 http://gerrit.onap.org/r/clamp -b $GERRIT_BRANCH cd clamp/extra/docker/clamp/ # Pull the Clamp docker image from nexus instead of local image by default in the docker-compose.yml diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/__init__.robot b/tests/dcaegen2-collectors-hv-ves/testcases/__init__.robot index 2b6a5786..54d3e1c8 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/__init__.robot +++ b/tests/dcaegen2-collectors-hv-ves/testcases/__init__.robot @@ -1,3 +1,21 @@ +# ============LICENSE_START======================================================= +# csit-dcaegen2-collectors-hv-ves +# ================================================================================ +# Copyright (C) 2018-2019 NOKIA +# ================================================================================ +# 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========================================================= + *** Settings *** Library DcaeAppSimulatorLibrary Library ConsulLibrary @@ -38,7 +56,7 @@ Configure Dcae App *** Variables *** ${HTTP_METHOD_URL} http:// -${CONSUL_CONTAINER_HOST} consul +${CONSUL_CONTAINER_HOST} consul-server ${CONSUL_CONTAINER_PORT} 8500 ${CONSUL_VES_HV_CONFIGURATION_KEY_PATH} /v1/kv/dcae-hv-ves-collector diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/authorization.robot b/tests/dcaegen2-collectors-hv-ves/testcases/authorization.robot index be24a87a..d5fc1e99 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/authorization.robot +++ b/tests/dcaegen2-collectors-hv-ves/testcases/authorization.robot @@ -1,3 +1,21 @@ +# ============LICENSE_START======================================================= +# csit-dcaegen2-collectors-hv-ves +# ================================================================================ +# Copyright (C) 2018 NOKIA +# ================================================================================ +# 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========================================================= + *** Settings *** Library DcaeAppSimulatorLibrary diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/libraries/ConsulLibrary.py b/tests/dcaegen2-collectors-hv-ves/testcases/libraries/ConsulLibrary.py index 52d7e0ea..295c4721 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/libraries/ConsulLibrary.py +++ b/tests/dcaegen2-collectors-hv-ves/testcases/libraries/ConsulLibrary.py @@ -1,3 +1,20 @@ +# ============LICENSE_START======================================================= +# csit-dcaegen2-collectors-hv-ves +# ================================================================================ +# Copyright (C) 2018 NOKIA +# ================================================================================ +# 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========================================================= from robot.api import logger import HttpRequests diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/libraries/DcaeAppSimulatorLibrary.py b/tests/dcaegen2-collectors-hv-ves/testcases/libraries/DcaeAppSimulatorLibrary.py index 9edad2cc..3d811e49 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/libraries/DcaeAppSimulatorLibrary.py +++ b/tests/dcaegen2-collectors-hv-ves/testcases/libraries/DcaeAppSimulatorLibrary.py @@ -1,3 +1,20 @@ +# ============LICENSE_START======================================================= +# csit-dcaegen2-collectors-hv-ves +# ================================================================================ +# Copyright (C) 2018 NOKIA +# ================================================================================ +# 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========================================================= import HttpRequests from robot.api import logger diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/libraries/HttpRequests.py b/tests/dcaegen2-collectors-hv-ves/testcases/libraries/HttpRequests.py index c0dcd81d..4aa55d6c 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/libraries/HttpRequests.py +++ b/tests/dcaegen2-collectors-hv-ves/testcases/libraries/HttpRequests.py @@ -1,3 +1,20 @@ +# ============LICENSE_START======================================================= +# csit-dcaegen2-collectors-hv-ves +# ================================================================================ +# Copyright (C) 2018 NOKIA +# ================================================================================ +# 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========================================================= import requests from robot.api import logger diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/libraries/VesHvContainersUtilsLibrary.py b/tests/dcaegen2-collectors-hv-ves/testcases/libraries/VesHvContainersUtilsLibrary.py index 989a796c..3e7d48bd 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/libraries/VesHvContainersUtilsLibrary.py +++ b/tests/dcaegen2-collectors-hv-ves/testcases/libraries/VesHvContainersUtilsLibrary.py @@ -1,3 +1,20 @@ +# ============LICENSE_START======================================================= +# csit-dcaegen2-collectors-hv-ves +# ================================================================================ +# Copyright (C) 2018 NOKIA +# ================================================================================ +# 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========================================================= from time import time from robot.api import logger diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py b/tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py index 06bd42ea..3f69f6ab 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py +++ b/tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py @@ -1,3 +1,21 @@ +# ============LICENSE_START======================================================= +# csit-dcaegen2-collectors-hv-ves +# ================================================================================ +# Copyright (C) 2018-2019 NOKIA +# ================================================================================ +# 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========================================================= + import HttpRequests import os import docker @@ -11,7 +29,7 @@ SIMULATOR_IMAGE_NAME = HV_VES_COLLECTOR_NAMESPACE + "/" + HV_VES_GROUP_ID + ".hv HV_VES_VERSION="1.1-SNAPSHOT" SIMULATOR_IMAGE_FULL_NAME = os.getenv("DOCKER_REGISTRY_PREFIX") + SIMULATOR_IMAGE_NAME + ":" + HV_VES_VERSION WORKSPACE_ENV = os.getenv("WORKSPACE") -certificates_dir_path = WORKSPACE_ENV + "/plans/dcaegen2-collectors-hv-ves/testsuites/ssl/" +certificates_dir_path = WORKSPACE_ENV + "/plans/dcaegen2-collectors-hv-ves/testsuites/collector/ssl/" collector_certs_lookup_dir = "/etc/ves-hv/" ONE_SECOND_IN_NANOS = 10 ** 9 diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/message-routing.robot b/tests/dcaegen2-collectors-hv-ves/testcases/message-routing.robot index c22c936f..15c8ee8b 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/message-routing.robot +++ b/tests/dcaegen2-collectors-hv-ves/testcases/message-routing.robot @@ -1,3 +1,21 @@ +# ============LICENSE_START======================================================= +# csit-dcaegen2-collectors-hv-ves +# ================================================================================ +# Copyright (C) 2018-2019 NOKIA +# ================================================================================ +# 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========================================================= + *** Settings *** Library DcaeAppSimulatorLibrary Library XnfSimulatorLibrary diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/multiple-clients.robot b/tests/dcaegen2-collectors-hv-ves/testcases/multiple-clients.robot index 442639e2..09b62c78 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/multiple-clients.robot +++ b/tests/dcaegen2-collectors-hv-ves/testcases/multiple-clients.robot @@ -1,3 +1,21 @@ +# ============LICENSE_START======================================================= +# csit-dcaegen2-collectors-hv-ves +# ================================================================================ +# Copyright (C) 2018 NOKIA +# ================================================================================ +# 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========================================================= + *** Settings *** Library DcaeAppSimulatorLibrary 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 58f5cbc1..3a37c9b0 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/resources/common-keywords.robot +++ b/tests/dcaegen2-collectors-hv-ves/testcases/resources/common-keywords.robot @@ -1,3 +1,21 @@ +# ============LICENSE_START======================================================= +# csit-dcaegen2-collectors-hv-ves +# ================================================================================ +# Copyright (C) 2018 NOKIA +# ================================================================================ +# 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========================================================= + *** Settings *** Library XnfSimulatorLibrary Library VesHvContainersUtilsLibrary diff --git a/tests/dcaegen2-pmmapper/pmmapper/assets/valid_pm.xml b/tests/dcaegen2-pmmapper/pmmapper/assets/valid_pm.xml deleted file mode 100644 index 989b241f..00000000 --- a/tests/dcaegen2-pmmapper/pmmapper/assets/valid_pm.xml +++ /dev/null @@ -1,678 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet type="text/xsl" href="MeasDataCollection.xsl"?> -<measCollecFile xmlns="http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec"> - <fileHeader dnPrefix="SubNetwork=NETSimW,MeContext=LTE73dg2ERBS00019" vendorName="Ericsson AB" fileFormatVersion="32.435 V10.0"> - <fileSender localDn="Dublin"/> - <measCollec beginTime="2018-10-02T12:00:00Z"/> - </fileHeader> - <measData> - <managedElement swVersion="r0.1" localDn="Dublin"/> - <measInfo measInfoId="ENodeBFunction"> - <job jobId="1_USERDEF.ALL_COUNTERS.Profile_1.Continuous_Y.MEASJOB"/> - <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/> - <repPeriod duration="PT900S"/> - <measType p="1">pmLicConnectedUsersLevSamp</measType> - <measType p="2">pmPagS1Discarded</measType> - <measType p="3">pmRrcConnBrEnbMax</measType> - <measType p="4">pmLic5MHzSectorCarrierActual</measType> - <measType p="5">pmLic5Plus5MHzScTddActual</measType> - <measType p="6">pmZtemporary34</measType> - <measType p="7">pmLicDlCapLicense</measType> - <measType p="8">pmPagS1EdrxReceived</measType> - <measType p="9">pmZtemporary35</measType> - <measType p="10">pmLicConnectedUsersLevSum</measType> - <measType p="11">pmLicDlPrbCapLicense</measType> - <measType p="12">pmPagS1RecDistr</measType> - <measType p="13">pmRrcConnBrEnbLevSamp</measType> - <measType p="14">pmLicUlPrbCapLicense</measType> - <measType p="15">pmPagS1EdrxDiscarded</measType> - <measType p="16">pmRimAssocMax</measType> - <measType p="17">pmLicUlCapLicense</measType> - <measType p="18">pmLicConnectedUsersDistr</measType> - <measType p="19">pmMoFootprintMax</measType> - <measType p="20">pmLic5Plus5MHzScFddActual</measType> - <measType p="21">pmLicConnectedUsersTimeCong</measType> - <measType p="22">pmPagS1Received</measType> - <measType p="23">pmPagS1DiscDistr</measType> - <measType p="24">pmRimReportErr</measType> - <measType p="25">pmLicConnectedUsersMax</measType> - <measType p="26">pmRrcConnBrEnbLevSum</measType> - <measType p="27">pmLicConnectedUsersActual</measType> - <measType p="28">pmLicConnectedUsersLicense</measType> - <measValue measObjLdn="ManagedElement=LTE73dg2ERBS00019,ENodeBFunction=1"> - <r p="1">4</r> - <r p="2">6</r> - <r p="3">68</r> - <r p="4">2759</r> - <r p="5">2738</r> - <r p="6">50</r> - <r p="7">20</r> - <r p="8">8</r> - <r p="9">45</r> - <r p="10">9</r> - <r p="11">87</r> - <r p="12">86,87,2,6,77,96,75,33,24</r> - <r p="13">40</r> - <r p="14">90</r> - <r p="15">2</r> - <r p="16">98</r> - <r p="17">75</r> - <r p="18">36,30,45,68,74,44,64,83,17,52,36,99,46,59,71,24,49,33,83,75,43,30,74,28</r> - <r p="19">83</r> - <r p="20">2634</r> - <r p="21">10</r> - <r p="22">69</r> - <r p="23">58,2,40,80,81,47,73,100,91</r> - <r p="24">32</r> - <r p="25">37</r> - <r p="26">16</r> - <r p="27">38</r> - <r p="28">92</r> - <suspect>false</suspect> - </measValue> - </measInfo> - <measInfo measInfoId="EUtranCellRelation"> - <job jobId="1_USERDEF.ALL_COUNTERS.Profile_1.Continuous_Y.MEASJOB"/> - <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/> - <repPeriod duration="PT900S"/> - <measType p="1">pmHoExeSuccLteInterFRedirectCsg</measType> - <measType p="2">pmHoPrepSuccNonMob</measType> - <measType p="3">pmZtemporary73</measType> - <measType p="4">pmHoOscInterF</measType> - <measType p="5">pmLbQualifiedUe</measType> - <measType p="6">pmHoPrepAttLteInterFRedirectCsg</measType> - <measType p="7">pmZtemporary74</measType> - <measType p="8">pmLbTpAcceptedUe</measType> - <measType p="9">pmHoExeSuccLteInterF</measType> - <measType p="10">pmHoExeAttLteIntraFTuneOut</measType> - <measType p="11">pmHoPrepSuccLteIntraF</measType> - <measType p="12">pmLbTpEvalUe</measType> - <measType p="13">pmHoPrepAttLteInterFMbms</measType> - <measType p="14">pmHoExeAttLteSpifho</measType> - <measType p="15">pmCaRedirectQualifiedUe</measType> - <measType p="16">pmHoWrongCellReestIntraF</measType> - <measType p="17">pmAtoQualifiedUe</measType> - <measType p="18">pmHoWrongCellInterF</measType> - <measType p="19">pmHoExeAttLteInterFMbms</measType> - <measType p="20">pmHoExeAttLteIntraF</measType> - <measType p="21">pmZtemporary76</measType> - <measType p="22">pmHoExeAttNonMob</measType> - <measType p="23">pmHoExeSuccNonMob</measType> - <measType p="24">pmHoTooEarlyHoIntraF</measType> - <measType p="25">pmCaRedirectMeasRepUe</measType> - <measType p="26">pmHoPrepSuccLteInterFUl</measType> - <measType p="27">pmHoExeSuccLteInterFLb</measType> - <measType p="28">pmHoExeSuccLteIntraF</measType> - <measType p="29">pmHoExeSuccLteInterFMbms</measType> - <measType p="30">pmHoWrongCellReestInterF</measType> - <measType p="31">pmHoPrepSuccLteInterFRedirectCsg</measType> - <measType p="32">pmHoExeAttLteInterFRedirectCsg</measType> - <measType p="33">pmSpifhoReportedUe</measType> - <measType p="34">pmZtemporary75</measType> - <measType p="35">pmZtemporary79</measType> - <measType p="36">pmHoPrepAttLteSpifho</measType> - <measType p="37">pmAtoMeasRepUe</measType> - <measType p="38">pmHoTooEarlyHoInterF</measType> - <measType p="39">pmZtemporary78</measType> - <measType p="40">pmHoPrepAttLteInterFUl</measType> - <measType p="41">pmHoExeOutAttLteInterFQci1</measType> - <measType p="42">pmHoExeAttLteInterF</measType> - <measType p="43">pmZtemporary36</measType> - <measType p="44">pmZtemporary77</measType> - <measType p="45">pmHoPrepAttLteInterF</measType> - <measType p="46">pmHoPrepSuccLteInterFCaRedirect</measType> - <measType p="47">pmHoPrepSuccLteInterFLb</measType> - <measType p="48">pmZtemporary72</measType> - <measType p="49">pmHoExeSuccLteIntraFTuneOut</measType> - <measType p="50">pmHoExecSuccLteInterFCaRedirect</measType> - <measType p="51">pmHoExecAttLteInterFCaRedirect</measType> - <measType p="52">pmHoPrepAttLteInterFLb</measType> - <measType p="53">pmHoOscIntraF</measType> - <measType p="54">pmHoPrepAttLteIntraF</measType> - <measType p="55">pmHoPrepSuccLteInterF</measType> - <measType p="56">pmHoTooLateHoInterF</measType> - <measType p="57">pmHoPrepAttLteInterFCaRedirect</measType> - <measType p="58">pmHoExeAttLteInterFLb</measType> - <measType p="59">pmHoTooLateHoIntraF</measType> - <measType p="60">pmHoPrepSuccLteInterFMbms</measType> - <measType p="61">pmHoPrepAttNonMob</measType> - <measType p="62">pmLbTpUlAcceptedUe</measType> - <measType p="63">pmHoExeSuccLteSpifho</measType> - <measType p="64">pmHoExeOutSuccLteInterFQci1</measType> - <measType p="65">pmLbMeasRepUe</measType> - <measType p="66">pmHoPrepSuccLteSpifho</measType> - <measType p="67">pmHoWrongCellIntraF</measType> -<measValue measObjLdn="ManagedElement=LTE73dg2ERBS00019,ENodeBFunction=1,EUtranCellFDD=LTE73dg2ERBS00019-1,EUtranFreqRelation=1,EUtranCellRelation=3"> - <r p="1">2</r> - <r p="2">5</r> - <r p="3">91</r> - <r p="4">4</r> - <r p="5">37</r> - <r p="6">57</r> - <r p="7">23</r> - <r p="8">57</r> - <r p="9">94</r> - <r p="10">1</r> - <r p="11">88</r> - <r p="12">88</r> - <r p="13">92</r> - <r p="14">54</r> - <r p="15">43</r> - <r p="16">15</r> - <r p="17">97</r> - <r p="18">58</r> - <r p="19">40</r> - <r p="20">57</r> - <r p="21">24</r> - <r p="22">94</r> - <r p="23">92</r> - <r p="24">40</r> - <r p="25">2</r> - <r p="26">52</r> - <r p="27">17</r> - <r p="28">70</r> - <r p="29">40</r> - <r p="30">24</r> - <r p="31">64</r> - <r p="32">49</r> - <r p="33">11</r> - <r p="34">52</r> - <r p="35">74</r> - <r p="36">73</r> - <r p="37">45</r> - <r p="38">26</r> - <r p="39">74</r> - <r p="40">16</r> - <r p="41">80</r> - <r p="42">41</r> - <r p="43">99</r> - <r p="44">36</r> - <r p="45">73</r> - <r p="46">86</r> - <r p="47">92</r> - <r p="48">49</r> - <r p="49">22</r> - <r p="50">36</r> - <r p="51">43</r> - <r p="52">98</r> - <r p="53">74</r> - <r p="54">23</r> - <r p="55">76</r> - <r p="56">78</r> - <r p="57">22</r> - <r p="58">57</r> - <r p="59">37</r> - <r p="60">78</r> - <r p="61">56</r> - <r p="62">21</r> - <r p="63">44</r> - <r p="64">70</r> - <r p="65">6</r> - <r p="66">29</r> - <r p="67">75</r> - <suspect>false</suspect> - </measValue> -<measValue measObjLdn="ManagedElement=LTE73dg2ERBS00019,ENodeBFunction=1,EUtranCellFDD=LTE73dg2ERBS00019-1,EUtranFreqRelation=1,EUtranCellRelation=4"> - <r p="1">22</r> - <r p="2">59</r> - <r p="3">10</r> - <r p="4">79</r> - <r p="5">17</r> - <r p="6">20</r> - <r p="7">47</r> - <r p="8">92</r> - <r p="9">41</r> - <r p="10">11</r> - <r p="11">6</r> - <r p="12">9</r> - <r p="13">54</r> - <r p="14">37</r> - <r p="15">8</r> - <r p="16">66</r> - <r p="17">96</r> - <r p="18">65</r> - <r p="19">66</r> - <r p="20">91</r> - <r p="21">44</r> - <r p="22">73</r> - <r p="23">86</r> - <r p="24">7</r> - <r p="25">33</r> - <r p="26">54</r> - <r p="27">97</r> - <r p="28">54</r> - <r p="29">39</r> - <r p="30">3</r> - <r p="31">28</r> - <r p="32">20</r> - <r p="33">65</r> - <r p="34">85</r> - <r p="35">59</r> - <r p="36">53</r> - <r p="37">41</r> - <r p="38">9</r> - <r p="39">60</r> - <r p="40">65</r> - <r p="41">55</r> - <r p="42">12</r> - <r p="43">83</r> - <r p="44">44</r> - <r p="45">96</r> - <r p="46">30</r> - <r p="47">16</r> - <r p="48">64</r> - <r p="49">58</r> - <r p="50">53</r> - <r p="51">80</r> - <r p="52">58</r> - <r p="53">66</r> - <r p="54">13</r> - <r p="55">51</r> - <r p="56">44</r> - <r p="57">93</r> - <r p="58">82</r> - <r p="59">38</r> - <r p="60">38</r> - <r p="61">17</r> - <r p="62">26</r> - <r p="63">64</r> - <r p="64">49</r> - <r p="65">63</r> - <r p="66">43</r> - <r p="67">46</r> - <suspect>false</suspect> - </measValue> -<measValue measObjLdn="ManagedElement=LTE73dg2ERBS00019,ENodeBFunction=1,EUtranCellFDD=LTE73dg2ERBS00019-1,EUtranFreqRelation=1,EUtranCellRelation=5"> - <r p="1">78</r> - <r p="2">37</r> - <r p="3">1</r> - <r p="4">11</r> - <r p="5">85</r> - <r p="6">26</r> - <r p="7">13</r> - <r p="8">1</r> - <r p="9">75</r> - <r p="10">3</r> - <r p="11">92</r> - <r p="12">4</r> - <r p="13">33</r> - <r p="14">93</r> - <r p="15">41</r> - <r p="16">70</r> - <r p="17">14</r> - <r p="18">52</r> - <r p="19">81</r> - <r p="20">82</r> - <r p="21">72</r> - <r p="22">38</r> - <r p="23">26</r> - <r p="24">52</r> - <r p="25">65</r> - <r p="26">93</r> - <r p="27">59</r> - <r p="28">59</r> - <r p="29">70</r> - <r p="30">3</r> - <r p="31">22</r> - <r p="32">40</r> - <r p="33">94</r> - <r p="34">19</r> - <r p="35">92</r> - <r p="36">11</r> - <r p="37">73</r> - <r p="38">51</r> - <r p="39">6</r> - <r p="40">71</r> - <r p="41">43</r> - <r p="42">64</r> - <r p="43">49</r> - <r p="44">88</r> - <r p="45">74</r> - <r p="46">15</r> - <r p="47">67</r> - <r p="48">42</r> - <r p="49">94</r> - <r p="50">16</r> - <r p="51">10</r> - <r p="52">38</r> - <r p="53">18</r> - <r p="54">7</r> - <r p="55">20</r> - <r p="56">99</r> - <r p="57">51</r> - <r p="58">87</r> - <r p="59">69</r> - <r p="60">74</r> - <r p="61">34</r> - <r p="62">74</r> - <r p="63">8</r> - <r p="64">15</r> - <r p="65">66</r> - <r p="66">84</r> - <r p="67">71</r> - <suspect>false</suspect> - </measValue> -<measValue measObjLdn="ManagedElement=LTE73dg2ERBS00019,ENodeBFunction=1,EUtranCellFDD=LTE73dg2ERBS00019-1,EUtranFreqRelation=1,EUtranCellRelation=6"> - <r p="1">70</r> - <r p="2">3</r> - <r p="3">65</r> - <r p="4">56</r> - <r p="5">36</r> - <r p="6">62</r> - <r p="7">97</r> - <r p="8">82</r> - <r p="9">18</r> - <r p="10">82</r> - <r p="11">41</r> - <r p="12">80</r> - <r p="13">31</r> - <r p="14">84</r> - <r p="15">44</r> - <r p="16">34</r> - <r p="17">78</r> - <r p="18">35</r> - <r p="19">3</r> - <r p="20">76</r> - <r p="21">41</r> - <r p="22">64</r> - <r p="23">51</r> - <r p="24">30</r> - <r p="25">49</r> - <r p="26">56</r> - <r p="27">72</r> - <r p="28">25</r> - <r p="29">43</r> - <r p="30">51</r> - <r p="31">84</r> - <r p="32">99</r> - <r p="33">71</r> - <r p="34">74</r> - <r p="35">28</r> - <r p="36">44</r> - <r p="37">28</r> - <r p="38">47</r> - <r p="39">43</r> - <r p="40">78</r> - <r p="41">56</r> - <r p="42">7</r> - <r p="43">66</r> - <r p="44">65</r> - <r p="45">29</r> - <r p="46">19</r> - <r p="47">47</r> - <r p="48">48</r> - <r p="49">21</r> - <r p="50">25</r> - <r p="51">32</r> - <r p="52">58</r> - <r p="53">64</r> - <r p="54">88</r> - <r p="55">23</r> - <r p="56">22</r> - <r p="57">98</r> - <r p="58">37</r> - <r p="59">80</r> - <r p="60">52</r> - <r p="61">30</r> - <r p="62">27</r> - <r p="63">26</r> - <r p="64">65</r> - <r p="65">71</r> - <r p="66">91</r> - <r p="67">64</r> - <suspect>false</suspect> - </measValue> - </measInfo> - <measInfo measInfoId="EUtranFreqRelation"> - <job jobId="1_USERDEF.ALL_COUNTERS.Profile_1.Continuous_Y.MEASJOB"/> - <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/> - <repPeriod duration="PT900S"/> - <measType p="1">pmCaRedirectMeasuredUe</measType> - <measType p="2">pmMbmsInterestIndicationNonServ</measType> - <measType p="3">pmMbmsInterestIndication</measType> - <measType p="4">pmLbMeasuredUe</measType> - <measType p="5">pmMbmsInterestIndicationPCell</measType> - <measType p="6">pmMbmsInterestIndicationSCell</measType> - <measType p="7">pmSpifhoMeasuredUe</measType> - <measType p="8">pmAtoMeasuredUe</measType> -<measValue measObjLdn="ManagedElement=LTE73dg2ERBS00019,ENodeBFunction=1,EUtranCellFDD=LTE73dg2ERBS00019-1,EUtranFreqRelation=1"> - <r p="1">14</r> - <r p="2">25</r> - <r p="3">60</r> - <r p="4">63</r> - <r p="5">10</r> - <r p="6">71</r> - <r p="7">16</r> - <r p="8">43</r> - <suspect>false</suspect> - </measValue> - </measInfo> - <measInfo measInfoId="EnergyMeter"> - <job jobId="1_USERDEF.ALL_COUNTERS.Profile_1.Continuous_Y.MEASJOB"/> - <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/> - <repPeriod duration="PT900S"/> - <measType p="1">pmPowerConsumption</measType> - <measType p="2">pmVoltage</measType> - <measType p="3">pmConsumedEnergy</measType> - <measType p="4">pmConsumedEnergyAccumulated</measType> - <measValue measObjLdn="ManagedElement=LTE73dg2ERBS00019,Equipment=1,FieldReplaceableUnit=1,EFuse=1,EnergyMeter=1"> - <r p="1">44,88,3,61,33,74,92,10,14,83,96,34,13,7,6,92,77,1,69,5,85,19,11,11,12,56,93,94,0,48,96,50,83,20,66,31,90,9,97,11,30,40,89,20,64,84,7,24,76,61,5,39,55,39,31,70,96,58,38,38,39,48,20,55,9,71,49,56,39,59,91,45,2,81,5,31,35,34,8,91,20,65,8,57,89,45,5,83,12,55,84,3,20,54,73,96,45,35,99,52,42,17,92,47,86,87,29,93,34,59,66,50,46,40,84,76,72,90,75,28,98,87,36,44,24,0,57,35,77,34,29,69,90,86,47,61,76,39,22,59,15,4,80,7,99,83,54,25,25,53</r> - <r p="2">19,69,83,75,92,1,65,86,80,24,2,89,61,38,47,76,4,80,19,57,76,28,74,20,19,49,10,99,50,98,7,57,2,1,28,97,92,56,39,48,33,72,58,86,77,91,15,14,78,50,10,78,67,5,76,98,50,4,80,38,13,16,63,27,68,72,95,33,98,60,50,26,91,52,61,57,89,23,81,10,54,85,30,25,69,54,86,28,33,67,1,92,61,38,78,24,78,49,65,15,39,71,49,70,2,20,33,39,9,23,94,25,95,40,66,13,59,91,27,27,16,63,81,84,68,84,87,21,86,70,69,55,97,66,35,49,7,70,37,69,51,42,13,5,84,1,63,47,77,71</r> - <r p="3">39</r> - <r p="4">2460</r> - <suspect>false</suspect> - </measValue> - </measInfo> - <measInfo measInfoId="EthernetPort"> - <job jobId="1_USERDEF.ALL_COUNTERS.Profile_1.Continuous_Y.MEASJOB"/> - <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/> - <repPeriod duration="PT900S"/> - <measType p="1">ifHCOutBroadcastPkts</measType> - <measType p="2">ifHCOutUcastPkts</measType> - <measType p="3">ifOutErrors</measType> - <measType p="4">ifHCInUcastPkts</measType> - <measType p="5">ifInErrors</measType> - <measType p="6">ifHCInBroadcastPkts</measType> - <measType p="7">ifOutDiscards</measType> - <measType p="8">ifInUnknownTags</measType> - <measType p="9">ifInOctetRatePercentiles</measType> - <measType p="10">ifHCInMulticastPkts</measType> - <measType p="11">ifHCOutOctets</measType> - <measType p="12">ifHCInOctets</measType> - <measType p="13">ifInUnknownProtos</measType> - <measType p="14">ifTotalLossOfSignalDuration</measType> - <measType p="15">ifInDiscards</measType> - <measType p="16">ifHCOutMulticastPkts</measType> - <measType p="17">ifMaxLossOfSignalDuration</measType> - <measType p="18">ifHCLossOfSignal</measType> - <measType p="19">ifOutOctetRatePercentiles</measType> - <measType p="20">ifMinLossOfSignalDuration</measType> - <measValue measObjLdn="ManagedElement=LTE73dg2ERBS00019,Transport=1,EthernetPort=1"> - <r p="1">86</r> - <r p="2">67</r> - <r p="3">14</r> - <r p="4">17</r> - <r p="5">5</r> - <r p="6">6</r> - <r p="7">82</r> - <r p="8">51</r> - <r p="9">72,28,74,73,54,70,74</r> - <r p="10">98</r> - <r p="11">35</r> - <r p="12">96</r> - <r p="13">90</r> - <r p="14">43</r> - <r p="15">24</r> - <r p="16">36</r> - <r p="17">93</r> - <r p="18">21</r> - <r p="19">67,33,63,55,85,18,76</r> - <r p="20">63</r> - <suspect>false</suspect> - </measValue> - </measInfo> - <measInfo measInfoId="ExternalENodeBFunction"> - <job jobId="1_USERDEF.ALL_COUNTERS.Profile_1.Continuous_Y.MEASJOB"/> - <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/> - <repPeriod duration="PT900S"/> - <measType p="1">pmZtemporary222</measType> - <measType p="2">pmEranCaPartnerBlock</measType> - <measType p="3">pmEenbPktLateDlCa</measType> - <measType p="4">pmCaCrntiUnavail</measType> - <measType p="5">pmEenbPktLostDlCa</measType> - <measType p="6">pmEenbPktDiscDlCa</measType> - <measType p="7">pmZtemporary223</measType> - <measType p="8">pmEenbPktTransDlCa</measType> - <measType p="9">pmEenbPktRecDlCa</measType> - <measType p="10">pmZtemporary206</measType> - <measValue measObjLdn="ManagedElement=LTE73dg2ERBS00019,ENodeBFunction=1,EUtraNetwork=1,ExternalENodeBFunction=1"> - <r p="1">30</r> - <r p="2">66</r> - <r p="3">51</r> - <r p="4">20</r> - <r p="5">95</r> - <r p="6">69</r> - <r p="7">83</r> - <r p="8">0</r> - <r p="9">100</r> - <r p="10">44</r> - <suspect>false</suspect> - </measValue> - </measInfo> - <measInfo measInfoId="ExternalGeranCell"> - <job jobId="1_USERDEF.ALL_COUNTERS.Profile_1.Continuous_Y.MEASJOB"/> - <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/> - <repPeriod duration="PT900S"/> - <measType p="1">pmRimAssocAtt</measType> - <measType p="2">pmRimAssocAttRetry</measType> - <measType p="3">pmRimUpdateReceived</measType> - <measType p="4">pmRimAssocRemoved</measType> - <measType p="5">pmZtemporary99</measType> - <measType p="6">pmZtemporary98</measType> - <measType p="7">pmRimAssocTO</measType> - <measType p="8">pmRimAssocSucc</measType> - <measType p="9">pmRimUpdateAckSent</measType> - <measType p="10">pmRimReportErr</measType> - <measValue measObjLdn="ManagedElement=LTE73dg2ERBS00019,ENodeBFunction=1,GeraNetwork=1,ExternalGeranCell=1"> - <r p="1">89</r> - <r p="2">4</r> - <r p="3">70</r> - <r p="4">48</r> - <r p="5">89</r> - <r p="6">72</r> - <r p="7">38</r> - <r p="8">1</r> - <r p="9">2</r> - <r p="10">10</r> - <suspect>false</suspect> - </measValue> - </measInfo> - <measInfo measInfoId="ExternalUtranCellFDD"> - <job jobId="1_USERDEF.ALL_COUNTERS.Profile_1.Continuous_Y.MEASJOB"/> - <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/> - <repPeriod duration="PT900S"/> - <measType p="1">pmRimAssocSucc</measType> - <measType p="2">pmRimAssocRemoved</measType> - <measType p="3">pmZtemporary100</measType> - <measType p="4">pmRimUpdateReceived</measType> - <measType p="5">pmRimAssocTO</measType> - <measType p="6">pmRimUpdateAckSent</measType> - <measType p="7">pmZtemporary101</measType> - <measType p="8">pmRimAssocAttRetry</measType> - <measType p="9">pmRimReportErr</measType> - <measType p="10">pmRimAssocAtt</measType> - <measValue measObjLdn="ManagedElement=LTE73dg2ERBS00019,ENodeBFunction=1,UtraNetwork=1,UtranFrequency=1,ExternalUtranCellFDD=1"> - <r p="1">62</r> - <r p="2">46</r> - <r p="3">45</r> - <r p="4">68</r> - <r p="5">39</r> - <r p="6">37</r> - <r p="7">81</r> - <r p="8">19</r> - <r p="9">73</r> - <r p="10">49</r> - <suspect>false</suspect> - </measValue> - </measInfo> - <measInfo measInfoId="NodeBFunction"> - <job jobId="1_USERDEF.ALL_COUNTERS.Profile_1.Continuous_Y.MEASJOB"/> - <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/> - <repPeriod duration="PT900S"/> - <measType p="1">pmCapacityOfNodeBUlCeExt</measType> - <measType p="2">pmCapacityOfNodeBDlCe</measType> - <measType p="3">pmCapacityNodeBLimitUlCe</measType> - <measType p="4">pmCapacityNodeBLimitDlCe</measType> - <measType p="5">pmCapacityOfNodeBUlCe</measType> - <measValue measObjLdn="ManagedElement=LTE73dg2ERBS00019,NodeBFunction=1"> - <r p="1">51,27,56,76,61,76,24,1,24,52,61,6,85,94,53,97,14,80,60,79,58,88,69,81,98,94,78,70,26,10,61,9,94,46,33,55,51,3,31,67,11,39,33,22,3,9,94</r> - <r p="2">14,46,49,30,86,1,55,50,52,41</r> - <r p="3">2620</r> - <r p="4">2849</r> - <r p="5">87,4,90,14,22,9,36,94,60,72</r> - <suspect>false</suspect> - </measValue> - </measInfo> - <measInfo measInfoId="NodeBLocalCellGroup"> - <job jobId="1_USERDEF.ALL_COUNTERS.Profile_1.Continuous_Y.MEASJOB"/> - <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/> - <repPeriod duration="PT900S"/> - <measType p="1">pmSumCapacityUlCe</measType> - <measType p="2">pmSetupRejSwLoad</measType> - <measType p="3">pmCapacityOfDlCe</measType> - <measType p="4">pmCapacityOfUlCeExt</measType> - <measType p="5">pmCapacityAllocAttDlCe</measType> - <measType p="6">pmNoUlHwLimitEul</measType> - <measType p="7">pmCapacityLimitDlCe</measType> - <measType p="8">pmCapacityAllocRejDlCe</measType> - <measType p="9">pmSetupAttempts</measType> - <measType p="10">pmCpcUlActivityFactor</measType> - <measType p="11">pmSumCapacityUlCeEulFach</measType> - <measType p="12">pmCapacityOfUlCe</measType> - <measType p="13">pmCapacityAllocAttUlCe</measType> - <measType p="14">pmSamplesCapacityUlCe</measType> - <measType p="15">pmCapacityAllocRejUlCe</measType> - <measType p="16">pmIsUsersRatio</measType> - <measType p="17">pmSamplesCapacityDlCe</measType> - <measType p="18">pmSumCapacityUlCeStatic</measType> - <measType p="19">pmCapacityUlCeEulFach</measType> - <measType p="20">pmHwCePoolEul</measType> - <measType p="21">pmSetupFailures</measType> - <measType p="22">pmCapacityLimitUlCe</measType> - <measType p="23">pmStaticHwCePoolEul</measType> - <measType p="24">pmSumCapacityDlCe</measType> - <measType p="25">pmSamplesCapacityUlCeStatic</measType> - <measValue measObjLdn="ManagedElement=LTE73dg2ERBS00019,NodeBFunction=1,NodeBLocalCellGroup=1"> - <r p="1">91</r> - <r p="2">5</r> - <r p="3">61,11,27,47,65,88,67,59,78,51</r> - <r p="4">97,81,23,87,89,44,11,68,77,0,72,5,45,11,11,56,11,1,87,86,83,5,36,37,82,25,99,77,5,72,90,23,74,99,53,72,48,13,52,24,90,74,2,15,63,96,27</r> - <r p="5">2</r> - <r p="6">72</r> - <r p="7">2503</r> - <r p="8">70</r> - <r p="9">24</r> - <r p="10">33,38,12,21,91,0,52,84,99,32,40,8,15,39,92,27,41,43,63,41</r> - <r p="11">93</r> - <r p="12">10,100,48,71,68,59,69,36,64,66</r> - <r p="13">14</r> - <r p="14">88</r> - <r p="15">75</r> - <r p="16">18</r> - <r p="17">84</r> - <r p="18">17</r> - <r p="19">90,24,50,62,83,25,7,36,85,70,63</r> - <r p="20">6,63,96,1,94,85,82,17,30,46,39,59,11,14,7,60,61,36,1,39,20,82,77,95,50,26,43,81,2,95,84,32,1,70,31,48,11,24,2,43,74,94,46,99,63,47,68,28,62,22,54,91,84,81,46,50,45,32,25,100,14,67,86,62,85,22,80,18,19,21,45,59,41,81,70,65,43,28,93,91,36,20,17,56,9,78,31,98,44,97,45,2,72,85,61,65,21,23,95,36,90,10,19,60,41,96,84,25,96,91,33,73,48,46,92,82,8,80,8,88,21,95,61,86,58,89,48,86,63</r> - <r p="21">83</r> - <r p="22">2824</r> - <r p="23">7,66,20,8,41,18,98,71,57,28,13,53,53,77,70,31,99,62,50,19,63,3,75,43,17,91,30,34,21,62,77,67,90,11,66,11,77,51,27,55,95,66,98,45,67,60,76,42,55,94,17,87,61,8,52,24,71,7,36,5,73,63,59</r> - <r p="24">38</r> - <r p="25">65</r> - <suspect>false</suspect> - </measValue> - </measInfo> - </measData> - <fileFooter> - <measCollec endTime="2018-10-02T12:15:00Z"/> - </fileFooter> -</measCollecFile>
\ No newline at end of file diff --git a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_IPV6.json b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_IPV6.json index 5a67dfe1..7fdef4fc 100644 --- a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_IPV6.json +++ b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_IPV6.json @@ -9,7 +9,8 @@ "serialNumber":"NOkkaaa123", "vendorName":"equipVendor", "modelNumber":"equipModel", - "unitType":"equipType" + "unitType":"equipType", + "additionalFields": {} } } } diff --git a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_all_fields.json b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_all_fields.json index f55b2f9c..eb4dfaf9 100644 --- a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_all_fields.json +++ b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_all_fields.json @@ -10,7 +10,12 @@ "serialNumber":"serialNumber", "vendorName":"vendorName", "modelNumber":"modelNumber", - "unitType":"unitType" + "unitType":"unitType", + "additionalFields": { + "attachmentPoint": "bla-bla-30-3", + "svlan": "1005", + "cvlan": "678" + } } } } diff --git a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_sourceName.json b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_sourceName.json index 74425ec2..2bae7e64 100644 --- a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_sourceName.json +++ b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_sourceName.json @@ -9,7 +9,8 @@ "serialNumber":"", "vendorName":"", "modelNumber":"", - "unitType":"" + "unitType":"", + "additionalFields": {} } } } diff --git a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_optional_registration_fields_all_filled.json b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_optional_registration_fields_all_filled.json index 492d6071..39fadb8a 100644 --- a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_optional_registration_fields_all_filled.json +++ b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_optional_registration_fields_all_filled.json @@ -11,7 +11,12 @@ "serialNumber":"sn1234", "vendorName":"vendorName", "modelNumber":"modelNumber", - "unitType":"unitType" + "unitType":"unitType", + "additionalFields": { + "attachmentPoint": "bla-bla-30-3", + "svlan": "1005", + "cvlan": "678" + } } } } diff --git a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_optional_registration_fields_empty.json b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_optional_registration_fields_empty.json index 48363a47..986b992d 100644 --- a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_optional_registration_fields_empty.json +++ b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_optional_registration_fields_empty.json @@ -1,7 +1,7 @@ { "event": { "commonEventHeader": { - "sourceName":"NOK6061ZW1", + "sourceName":"NOK6061ZW3", "nfNamingCode": "" }, "pnfRegistrationFields": { @@ -10,7 +10,8 @@ "serialNumber":"", "vendorName":"", "modelNumber":"", - "unitType":"" + "unitType":"", + "additionalFields": {} } } } diff --git a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_optional_registration_fields_missing_partial.json b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_optional_registration_fields_missing_partial.json index ede956f5..c10f0d61 100644 --- a/tests/dcaegen2/prh-testcases/assets/json_events/event_with_optional_registration_fields_missing_partial.json +++ b/tests/dcaegen2/prh-testcases/assets/json_events/event_with_optional_registration_fields_missing_partial.json @@ -4,7 +4,7 @@ "sourceName":"NOK6061ZW4" }, "pnfRegistrationFields": { - "oamV4IpAddress":"", + "oamV4IpAddress":"10.16.123.234", "oamV6IpAddress":"", "serialNumber":"123", "modelNumber":"sn123243", diff --git a/tests/dcaegen2/prh-testcases/prh_tests.robot b/tests/dcaegen2/prh-testcases/prh_tests.robot index 77278d47..e485f587 100644 --- a/tests/dcaegen2/prh-testcases/prh_tests.robot +++ b/tests/dcaegen2/prh-testcases/prh_tests.robot @@ -35,6 +35,10 @@ Valid DMaaP event can be converted to PNF_READY notification ${EVENT_WITH_IPV4} ${EVENT_WITH_IPV6} ${EVENT_WITHOUT_IPV6_FILED} + ${EVENT_WITH_OPTIONAL_REGISTRATION_FIELDS_ALL_FILLED} + ${EVENT_WITH_OPTIONAL_REGISTRATION_FIELDS_EMPTY} + ${EVENT_WITH_OPTIONAL_REGISTRATION_FIELDS_MISSING_ALL} + ${EVENT_WITH_OPTIONAL_REGISTRATION_FIELDS_MISSING_PARTIAL} Invalid DMaaP event cannot be converted to PNF_READY notification [Documentation] PRH get invalid event from DMaaP with missing required fields - PRH does not produce PNF_READY notification diff --git a/tests/dcaegen2/prh-testcases/resources/PrhLibrary.py b/tests/dcaegen2/prh-testcases/resources/PrhLibrary.py index 1a3875b9..6667bd78 100644 --- a/tests/dcaegen2/prh-testcases/resources/PrhLibrary.py +++ b/tests/dcaegen2/prh-testcases/resources/PrhLibrary.py @@ -13,73 +13,80 @@ class PrhLibrary(object): def check_for_log(search_for): client = docker.from_env() container = client.containers.get('prh') - #print ("Check for log searches for pattern: ", search_for ) + print ("Check for log searches for pattern: ", search_for ) for line in container.logs(stream=True): - #print ("Check for log analysis line: ", line ) + print ("Check for log analysis line: ", line ) if search_for in line.strip(): return True else: return False @staticmethod - def create_pnf_ready_notification_from_ves(json_file): + def create_invalid_notification(json_file): json_to_python = json.loads(json_file) - ipv4 = PrhLibrary.extract_ip_v4(json_to_python) - ipv6 = PrhLibrary.extract_ip_v6(json_to_python) - correlation_id = PrhLibrary.extract_correlation_id(json_to_python) - serial_number = PrhLibrary.extract_serial_number(json_to_python) - vendor_name = PrhLibrary.extract_vendor_name(json_to_python) - model_number = PrhLibrary.extract_model_number(json_to_python) - unit_type = PrhLibrary.extract_unit_type(json_to_python) - - str_json = '{"correlationId":"' + correlation_id + '","ipaddress-v4-oam":"' + ipv4 + '","ipaddress-v6-oam":"' + ipv6 + '","serialNumber":"' + serial_number + '","vendorName":"' + vendor_name + '","modelNumber":"' + model_number + '","unitType":"' + unit_type + '"}' - python_to_json = json.dumps(str_json) - return python_to_json.replace("\\", "")[1:-1] + correlation_id = PrhLibrary.extract_correlation_id_value(json_to_python, "correlationId") + ipv4 = PrhLibrary.extract_value_from_pnfRegistrationFields(json_to_python, "oamV4IpAddress", "oamV4IpAddress") + ipv6 = PrhLibrary.extract_value_from_pnfRegistrationFields(json_to_python, "oamV6IpAddress", "oamV6IpAddress") + serial_number = PrhLibrary.extract_value_from_pnfRegistrationFields(json_to_python, "serialNumber", "serialNumber") + vendor_name = PrhLibrary.extract_value_from_pnfRegistrationFields(json_to_python, "vendorName", "vendorName") + model_number = PrhLibrary.extract_value_from_pnfRegistrationFields(json_to_python, "modelNumber", "modelNumber") + unit_type = PrhLibrary.extract_value_from_pnfRegistrationFields(json_to_python, "unitType", "unitType") + + additional_fields = PrhLibrary.extract_additional_fields(json_to_python) + + str_json = '{' + correlation_id + ipv4 + ipv6 + serial_number + vendor_name + model_number + unit_type + '"nfNamingCode":""' + "," + '"softwareVersion":"",' + additional_fields + return json.dumps(str_json).replace("\\", "")[1:-1].replace("\":", "\": ").rstrip(',') + '\\n}' @staticmethod def create_pnf_ready_notification_as_pnf_ready(json_file): json_to_python = json.loads(json_file) - ipv4 = PrhLibrary.extract_ip_v4(json_to_python) - ipv6 = PrhLibrary.extract_ip_v6(json_to_python) - correlation_id = PrhLibrary.extract_correlation_id(json_to_python) - serial_number = PrhLibrary.extract_serial_number(json_to_python) - vendor_name = PrhLibrary.extract_vendor_name(json_to_python) - model_number = PrhLibrary.extract_model_number(json_to_python) - unit_type = PrhLibrary.extract_unit_type(json_to_python) + correlation_id = PrhLibrary.extract_correlation_id_value(json_to_python, "correlationId") + serial_number = PrhLibrary.extract_value_from_pnfRegistrationFields(json_to_python, "serial-number", "serialNumber") + vendor_name = PrhLibrary.extract_value_from_pnfRegistrationFields(json_to_python, "equip-vendor", "vendorName") + model_number = PrhLibrary.extract_value_from_pnfRegistrationFields(json_to_python, "equip-model", "modelNumber") + unit_type = PrhLibrary.extract_value_from_pnfRegistrationFields(json_to_python, "equip-type", "unitType") + + additional_fields = PrhLibrary.extract_additional_fields_value(json_to_python) nf_role = json_to_python.get("event").get("commonEventHeader").get("nfNamingCode") if "nfNamingCode" in json_to_python["event"]["commonEventHeader"] else "" - str_json = '{"correlationId":"' + correlation_id + '","ipaddress-v4-oam":"' + ipv4 + '","ipaddress-v6-oam":"' + ipv6 + '","serial-number":"' + serial_number + '","equip-vendor":"' + vendor_name + '","equip-model":"' + model_number + '","equip-type":"' + unit_type + '","nf-role":"' + nf_role + '","sw-version":""}' - python_to_json = json.dumps(str_json) - return python_to_json.replace("\\", "")[1:-1] + str_json = '{' + correlation_id + serial_number + vendor_name + model_number + unit_type + '"nf-role":"' + nf_role + '","sw-version":"",' + additional_fields - @staticmethod - def extract_ip_v4(content): - return content.get("event").get("pnfRegistrationFields").get("oamV4IpAddress") if "oamV4IpAddress" in content["event"]["pnfRegistrationFields"] else "" + return json.dumps(str_json.rstrip(',') + '}').replace("\\", "")[1:-1] @staticmethod - def extract_ip_v6(content): - return content.get("event").get("pnfRegistrationFields").get("oamV6IpAddress") if "oamV6IpAddress" in content["event"]["pnfRegistrationFields"] else "" + def extract_additional_fields_value(content): + fields = PrhLibrary.get_additional_fields_as_key_value_pairs(content) + if len(fields) == 0: + return "" + return PrhLibrary.build_additional_fields_json(fields) @staticmethod - def extract_correlation_id(content): - return content.get("event").get("commonEventHeader").get("sourceName") if "sourceName" in content["event"]["commonEventHeader"] else "" + def extract_additional_fields(content): + fields = PrhLibrary.get_additional_fields_as_key_value_pairs(content) + if fields == []: + return '"additionalFields":null' + return PrhLibrary.build_additional_fields_json(fields) @staticmethod - def extract_serial_number(content): - return content.get("event").get("pnfRegistrationFields").get("serialNumber") if "serialNumber" in content["event"]["pnfRegistrationFields"] else "" + def get_additional_fields_as_key_value_pairs(content): + return content.get("event").get("pnfRegistrationFields").get( + "additionalFields") if "additionalFields" in content["event"]["pnfRegistrationFields"] else [] @staticmethod - def extract_vendor_name(content): - return content.get("event").get("pnfRegistrationFields").get("vendorName") if "vendorName" in content["event"]["pnfRegistrationFields"] else "" + def build_additional_fields_json(fields): + res = '"additionalFields":{' + for f in fields: + res += '"' + f + '":"' + fields.get(f) + '",' + return res.rstrip(',') + '},' @staticmethod - def extract_model_number(content): - return content.get("event").get("pnfRegistrationFields").get("modelNumber") if "modelNumber" in content["event"]["pnfRegistrationFields"] else "" + def extract_value_from_pnfRegistrationFields(content, name, key): + return '"' + name + '":"' + (content.get("event").get("pnfRegistrationFields").get(key) + '",' if key in content["event"]["pnfRegistrationFields"] else '",') @staticmethod - def extract_unit_type(content): - return content.get("event").get("pnfRegistrationFields").get("unitType") if "unitType" in content["event"]["pnfRegistrationFields"] else "" + def extract_correlation_id_value(content, name): + return '"' + name + '":"' + (content.get("event").get("commonEventHeader").get("sourceName") + '",' if "sourceName" in content["event"]["commonEventHeader"] else '",') @staticmethod def create_pnf_name(json_file): @@ -126,10 +133,3 @@ class PrhLibrary(object): @staticmethod def is_in_status(client, name, status): return len(client.containers.list(all=True, filters={"name": "^/"+name+"$", "status": status})) == 1 - - - def create_invalid_notification(self, json_file): - invalidate_input = self.create_pnf_ready_notification_from_ves(json_file).replace("\":", "\": ") \ - .replace("ipaddress-v4-oam", "oamV4IpAddress").replace("ipaddress-v6-oam","oamV6IpAddress").replace("}",'') - invalidate_input__and_add_additional_fields = invalidate_input + ',"nfNamingCode": ""' + "," + '"softwareVersion": ""' +"\\n" - return invalidate_input__and_add_additional_fields diff --git a/tests/dcaegen2/prh-testcases/resources/prh_library.robot b/tests/dcaegen2/prh-testcases/resources/prh_library.robot index 105365c3..4f64694d 100644 --- a/tests/dcaegen2/prh-testcases/resources/prh_library.robot +++ b/tests/dcaegen2/prh-testcases/resources/prh_library.robot @@ -29,10 +29,9 @@ Invalid event processing Wait Until Keyword Succeeds 100x 100ms Check PRH log ${notification} Valid event processing - [Arguments] ${input_valid_event_in_dmaap} + [Arguments] ${input_valid__ves_event_in_dmaap} [Timeout] 30s - ${data}= Get Data From File ${input_valid_event_in_dmaap} - ${posted_event_to_dmaap}= create pnf ready notification from ves ${data} + ${data}= Get Data From File ${input_valid__ves_event_in_dmaap} ${pnf_name}= Create PNF name ${data} Set PNF name in AAI ${pnf_name} Set event in DMaaP ${data} @@ -45,9 +44,9 @@ Check PRH log Should Be Equal As Strings ${status} True Check PNF_READY notification - [Arguments] ${posted_event_to_dmaap} + [Arguments] ${expected_event_pnf_ready_in_dpaap} ${resp}= Get Request ${dmaap_setup_session} /events/pnfReady headers=${suite_headers} - Should Be Equal ${resp.text} ${posted_event_to_dmaap} + Should Be Equal ${resp.text} ${expected_event_pnf_ready_in_dpaap} Set PNF name in AAI [Arguments] ${pnfs_name} |