+++ /dev/null
-#!/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 include in the test, space separated list
-INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM SDNC"
-
-#Supported test env file (profile)
-SUPPORTED_PROFILES="ONAP-MASTER ONAP-GUILIN"
-
-. ../common/testcase_common.sh $@
-. ../common/agent_api_functions.sh
-. ../common/ricsimulator_api_functions.sh
-. ../common/cr_api_functions.sh
-
-#### TEST BEGIN ####
-
-
-generate_uuid
-
-# 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 "#####################################################################"
-
- # Clean container and start all needed containers #
- clean_containers
-
- if [ $__httpx == "HTTPS" ]; then
- use_cr_https
- #echo "Using secure ports between agent and MR"
- use_mr_https
- #"Using secure ports towards simulators"
- use_simulator_https
- use_agent_rest_https
- else
- use_cr_http
- #"Using non-secure ports between agent and MR"
- use_mr_http
- #"Using non-secure ports towards simulators"
- use_simulator_http
- use_agent_rest_http
- fi
-
- start_ric_simulators ricsim_g1 1 OSC_2.1.0
- start_ric_simulators ricsim_g2 1 STD_1.1.3
-
- start_mr
-
- start_cr
-
- start_policy_agent
-
- set_agent_debug
-
- # Create service to be able to receive events when rics becomes available
- # Must use rest towards the agent since dmaap is not configured yet
- api_put_service 201 "ric-registration" 0 "$CR_PATH/ric-registration"
-
- 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
-
- cr_equal received_callbacks 0
-
- 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
-
- 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
-
- mr_equal requests_submitted 0
-
- sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json
-
- if [ "$PMS_VERSION" == "V2" ]; then
- api_equal json:rics 2 60
-
- api_equal json:policy-types 2 120
-
- api_equal json:policies 0
-
- api_equal json:policy-instances 0
- else
- 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
- fi
-
- 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" "ric-registration"
-
- 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 "############################################"
-
- if [ "$PMS_VERSION" == "V2" ]; then
- notificationurl=$CR_PATH/2
- else
- notificationurl=""
- fi
- api_put_policy 201 "serv1" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json
- api_put_policy 200 "serv1" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json
-
- api_put_policy 201 "serv1" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json
- api_put_policy 200 "serv1" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json
-
- api_delete_policy 204 5000
-
- api_delete_policy 204 5100
-
- api_equal json:policies 0
-
- if [ "$PMS_VERSION" == "V2" ]; then
- api_equal json:policy-instances 0
- else
- api_equal json:policy_ids 0
- fi
-
- if [ "$PMS_VERSION" == "V2" ]; then
- cr_equal received_callbacks?id=ric-registration 2
-
- cr_api_check_all_sync_events 200 ric-registration ricsim_g1_1 ricsim_g2_1
- fi
-
- 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
+++ /dev/null
-#!/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="Sample tests of the SDNC A1 controller restconf API using http/https (no agent)"
-
-#App names to include in the test, space separated list
-INCLUDED_IMAGES="RICSIM SDNC"
-
-#SUPPORTED TEST ENV FILE
-SUPPORTED_PROFILES="ONAP-MASTER ONAP-GUILIN"
-
-. ../common/testcase_common.sh $@
-. ../common/controller_api_functions.sh
-. ../common/ricsimulator_api_functions.sh
-
-#### TEST BEGIN ####
-
-generate_uuid
-
-#Test agent and simulator protocol versions (others are http only)
-NB_TESTED_PROTOCOLS="HTTP HTTPS"
-SB_TESTED_PROTOCOLS="HTTP HTTPS"
-
-for __nb_httpx in $NB_TESTED_PROTOCOLS ; do
- for __sb_httpx in $SB_TESTED_PROTOCOLS ; do
-
- echo "#####################################################################"
- echo "#####################################################################"
- echo "### Testing SDNC using Northbound: $__nb_httpx and Southbound: $__sb_httpx"
- echo "#####################################################################"
- echo "#####################################################################"
-
-
- # Clean container and start all needed containers #
- clean_containers
-
- start_ric_simulators ricsim_g1 1 OSC_2.1.0
- start_ric_simulators ricsim_g2 1 STD_1.1.3
-
- start_sdnc
-
- if [ $__nb_httpx == "HTTPS" ]; then
- # "Using secure ports towards SDNC"
- use_sdnc_https
- else
- #"Using non-secure ports towards SDNC"
- use_sdnc_http
- fi
-
- if [ $__sb_httpx == "HTTPS" ]; then
- # "Using secure ports towards SDNC"
- use_simulator_https
- else
- #"Using non-secure ports towards SDNC"
- use_simulator_http
- fi
-
- # API tests
-
- controller_api_get_A1_policy_type 404 OSC ricsim_g1_1 1
-
- sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json
-
-
- controller_api_get_A1_policy_ids 200 OSC ricsim_g1_1 1
- controller_api_get_A1_policy_ids 200 STD ricsim_g2_1
-
- controller_api_get_A1_policy_type 200 OSC ricsim_g1_1 1
- controller_api_get_A1_policy_type 200 OSC ricsim_g1_1 1 testdata/OSC/sim_1.json
- controller_api_get_A1_policy_type 404 OSC ricsim_g1_1 99
-
- controller_api_put_A1_policy 200 OSC ricsim_g1_1 1 4000 testdata/OSC/pi1_template.json
- controller_api_put_A1_policy 404 OSC ricsim_g1_1 5 1001 testdata/OSC/pi1_template.json
- controller_api_put_A1_policy 200 STD ricsim_g2_1 5000 testdata/STD/pi1_template.json
-
- controller_api_get_A1_policy_ids 200 OSC ricsim_g1_1 1 4000
- controller_api_get_A1_policy_ids 200 STD ricsim_g2_1 5000
-
- controller_api_get_A1_policy_status 200 OSC ricsim_g1_1 1 4000
- controller_api_get_A1_policy_status 200 STD ricsim_g2_1 5000
-
- VAL='NOT IN EFFECT'
- controller_api_get_A1_policy_status 200 OSC ricsim_g1_1 1 4000 "$VAL" "false"
- controller_api_get_A1_policy_status 200 STD ricsim_g2_1 5000 "UNDEFINED"
-
- controller_api_delete_A1_policy 200 OSC ricsim_g1_1 1 4000
- controller_api_delete_A1_policy 200 STD ricsim_g2_1 5000
-
- store_logs "NB_"$__nb_httpx"_SB_"$__sb_httpx
-
- done
-
-done
-
-#### TEST COMPLETE ####
-
-print_result
-
-auto_clean_containers
\ No newline at end of file
--- /dev/null
+{
+ "config":{
+ "//description":"Application configuration",
+ "ric":[
+ {
+ "name":"ric1",
+ "baseUrl":"https://a1-sim-OSC:8185/",
+ "managedElementIds":[
+ "kista_1",
+ "kista_2"
+ ]
+ },
+ {
+ "name":"ric2",
+ "baseUrl":"https://a1-sim-STD-v2:8185/",
+ "managedElementIds":[
+ "kista_1",
+ "kista_2"
+ ]
+ }
+ ],
+ "streams_publishes":{
+ "dmaap_publisher":{
+ "type":"message_router",
+ "dmaap_info":{
+ "topic_url":"http://dmaap-mr:3904/events/A1-POLICY-AGENT-WRITE"
+ }
+ }
+ },
+ "streams_subscribes":{
+ "dmaap_subscriber":{
+ "type":"message_router",
+ "dmaap_info":{
+ "topic_url":"http://dmaap-mr:3904/events/A1-POLICY-AGENT-READ/users/policy-agent?timeout=15000&limit=100"
+ }
+ }
+ }
+ }
+ }
\ No newline at end of file
--- /dev/null
+{
+ "config":{
+ "controller": [
+ {
+ "name": "controller1",
+ "baseUrl": "https://a1-controller:8443",
+ "userName": "admin",
+ "password": "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
+ }
+ ],
+ "ric":[
+ {
+ "name":"ric1",
+ "controller": "controller1",
+ "baseUrl":"https://a1-sim-OSC:8185/",
+ "managedElementIds":[
+ "kista_1",
+ "kista_2"
+ ]
+ },
+ {
+ "name":"ric2",
+ "controller": "controller1",
+ "baseUrl":"https://a1-sim-STD-v2:8185/",
+ "managedElementIds":[
+ "kista_1",
+ "kista_2"
+ ]
+ }
+ ],
+ "streams_publishes":{
+ "dmaap_publisher":{
+ "type":"message_router",
+ "dmaap_info":{
+ "topic_url":"http://dmaap-mr:3904/events/A1-POLICY-AGENT-WRITE"
+ }
+ }
+ },
+ "streams_subscribes":{
+ "dmaap_subscriber":{
+ "type":"message_router",
+ "dmaap_info":{
+ "topic_url":"http://dmaap-mr:3904/events/A1-POLICY-AGENT-READ/users/policy-agent?timeout=15000&limit=100"
+ }
+ }
+ }
+ }
+ }
--- /dev/null
+#!/bin/bash
+
+# ============LICENSE_START===============================================
+# Copyright (C) 2021 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=================================================
+#
+
+# The scripts in data/ will generate some dummy data in the running system.
+# It will create:
+# one policy type in a1-sim-OSC
+# one service in policy agent
+# one policy in a1-sim-OSC
+# one policy in a1-sim-STD
+
+# Run command:
+# ./preparePmsData.sh [policy-agent port] [a1-sim-OSC port] [a1-sim-STD port] [http/https]
+
+policy_agent_port=${1:-8081}
+a1_sim_OSC_port=${2:-30001}
+a1_sim_STD_port=${3:-30005}
+httpx=${4:-"http"}
+SHELL_FOLDER=$(cd "$(dirname "$0")";pwd)
+
+echo "using policy_agent port: "$policy_agent_port
+echo "using a1-sim-OSC port: "$a1_sim_OSC_port
+echo "using a1-sim-STD port: "$a1_sim_STD_port
+echo "using protocol: "$httpx
+echo -e "\n"
+
+checkRes (){
+ if [ "$res" != "$expect" ]; then
+ echo "$res is not expected! exit!"
+ exit 1;
+ fi
+}
+
+echo "policy agent status:"
+curlString="curl -skw %{http_code} $httpx://localhost:$policy_agent_port/status"
+res=$($curlString)
+echo "$res"
+expect="hunky dory200"
+checkRes
+echo -e "\n"
+
+echo "ric1 version:"
+curlString="curl -skw %{http_code} $httpx://localhost:$a1_sim_OSC_port/counter/interface"
+res=$($curlString)
+echo "$res"
+expect="OSC_2.1.0200"
+checkRes
+echo -e "\n"
+
+echo "ric2 version:"
+curlString="curl -skw %{http_code} $httpx://localhost:$a1_sim_STD_port/counter/interface"
+res=$($curlString)
+echo "$res"
+expect="STD_2.0.0200"
+checkRes
+echo -e "\n"
+
+echo "create policy type 1 to ric1:"
+curlString="curl -X PUT -skw %{http_code} $httpx://localhost:$a1_sim_OSC_port/policytype?id=1 -H Content-Type:application/json --data-binary @${SHELL_FOLDER}/testdata/OSC/policy_type.json"
+res=$($curlString)
+echo "$res"
+expect="Policy type 1 is OK.201"
+checkRes
+echo -e "\n"
+
+echo "create policy type 2 to ric2:"
+curlString="curl -skw %{http_code} $httpx://localhost:$a1_sim_STD_port/policytype?id=2 -X PUT -H Accept:application/json -H Content-Type:application/json -H X-Requested-With:XMLHttpRequest --data-binary @${SHELL_FOLDER}/testdata/v2/policy_type.json"
+res=$($curlString)
+echo "$res"
+expect="Policy type 2 is OK.201"
+checkRes
+echo -e "\n"
+
+for i in {1..30}; do
+ echo "policy types from policy agent:"
+ curlString="curl -skw %{http_code} $httpx://localhost:$policy_agent_port/a1-policy/v2/policy-types"
+ res=$($curlString)
+ echo "$res"
+ expect="{\"policytype_ids\":[\"1\",\"2\"]}200"
+ if [ "$res" == "$expect" ]; then
+ echo -e "\n"
+ break;
+ else
+ sleep $i
+ fi
+done
+
+echo "create service ric-registration to policy agent:"
+curlString="curl -k -X PUT -sw %{http_code} -H accept:application/json -H Content-Type:application/json "$httpx://localhost:$policy_agent_port/a1-policy/v2/services" --data-binary @${SHELL_FOLDER}/testdata/v2/service.json"
+res=$($curlString)
+echo "$res"
+expect="201"
+checkRes
+echo -e "\n"
+
+echo "create policy aa8feaa88d944d919ef0e83f2172a5000 to ric1 with type 1 and service controlpanel via policy agent:"
+curlString="curl -k -X PUT -sw %{http_code} -H accept:application/json -H Content-Type:application/json "$httpx://localhost:$policy_agent_port/a1-policy/v2/policies" --data-binary @${SHELL_FOLDER}/testdata/v2/policy_osc.json"
+res=$($curlString)
+echo "$res"
+expect="201"
+checkRes
+echo -e "\n"
+
+echo "policy numbers from ric1:"
+curlString="curl -skw %{http_code} $httpx://localhost:$a1_sim_OSC_port/counter/num_instances"
+res=$($curlString)
+echo "$res"
+expect="1200"
+checkRes
+echo -e "\n"
+
+echo "create policy aa8feaa88d944d919ef0e83f2172a5100 to ric2 with type 2 and service controlpanel via policy agent:"
+curlString="curl -k -X PUT -sw %{http_code} -H accept:application/json -H Content-Type:application/json "$httpx://localhost:$policy_agent_port/a1-policy/v2/policies" --data-binary @${SHELL_FOLDER}/testdata/v2/policy_std_v2.json"
+res=$($curlString)
+echo "$res"
+expect="201"
+checkRes
+echo -e "\n"
+
+echo "policy numbers from ric2:"
+curlString="curl -skw %{http_code} $httpx://localhost:$a1_sim_STD_port/counter/num_instances"
+res=$($curlString)
+echo "$res"
+expect="1200"
+checkRes
+echo -e "\n"
+
+echo "policy id aa8feaa88d944d919ef0e83f2172a5000 from policy agent:"
+curlString="curl -s -o /dev/null -I -w %{http_code} $httpx://localhost:$policy_agent_port/a1-policy/v2/policies/aa8feaa88d944d919ef0e83f2172a5000"
+res=$($curlString)
+echo "$res"
+expect="200"
+checkRes
+echo -e "\n"
+
+echo "policy id aa8feaa88d944d919ef0e83f2172a5100 from policy agent:"
+curlString="curl -s -o /dev/null -I -w %{http_code} $httpx://localhost:$policy_agent_port/a1-policy/v2/policies/aa8feaa88d944d919ef0e83f2172a5100"
+res=$($curlString)
+echo "$res"
+expect="200"
+checkRes
+echo -e "\n"
--- /dev/null
+{
+ "name": "pt1",
+ "description": "pt1 policy type",
+ "policy_type_id": 1,
+ "create_schema": {
+ "$schema": "http://json-schema.org/draft-07/schema#",
+ "title": "OSC_Type1_1.0.0",
+ "description": "Type 1 policy type",
+ "type": "object",
+ "properties": {
+ "scope": {
+ "type": "object",
+ "properties": {
+ "ueId": {
+ "type": "string"
+ },
+ "qosId": {
+ "type": "string"
+ }
+ },
+ "additionalProperties": false,
+ "required": [
+ "ueId",
+ "qosId"
+ ]
+ },
+ "qosObjectives": {
+ "type": "object",
+ "properties": {
+ "priorityLevel": {
+ "type": "number"
+ }
+ },
+ "additionalProperties": false,
+ "required": [
+ "priorityLevel"
+ ]
+ }
+ },
+ "additionalProperties": false,
+ "required": [
+ "scope", "qosObjectives"
+ ]
+ }
+}
--- /dev/null
+{
+ "scope": {
+ "ueId": "ue3100",
+ "qosId": "qos3100"
+ },
+ "qosObjectives": {
+ "priorityLevel": 3100
+ }
+}
--- /dev/null
+{
+ "callbackUrl": "https://callback-receiver:8091/callbacks/1",
+ "keepAliveIntervalSeconds": "3600",
+ "serviceName": "service1"
+}
--- /dev/null
+{
+ "ric_id": "ric1",
+ "policy_id": "aa8feaa88d944d919ef0e83f2172a5100",
+ "service_id": "controlpanel",
+ "policytype_id": "1",
+ "status_notification_uri": "http://callback-receiver:8090/callbacks/test",
+ "policy_data": {
+ "scope": {
+ "ueId": "ue5100",
+ "qosId": "qos5100"
+ },
+ "qosObjectives": {
+ "priorityLevel": 5100
+ }
+ }
+}
\ No newline at end of file
--- /dev/null
+{
+ "ric_id": "ric2",
+ "policy_id": "aa8feaa88d944d919ef0e83f2172a5000",
+ "service_id": "controlpanel",
+ "policytype_id": "2",
+ "status_notification_uri": "http://callback-receiver:8090/callbacks/test",
+ "policy_data": {
+ "scope": {
+ "ueId": "ue5000",
+ "qosId": "qos5000"
+ },
+ "qosObjectives": {
+ "priorityLevel": 5000
+ }
+ }
+}
\ No newline at end of file
--- /dev/null
+{
+ "policySchema": {
+ "$schema": "http://json-schema.org/draft-07/schema#",
+ "title": "STD_QOS_0_2_0",
+ "description": "STD QOS policy type",
+ "type": "object",
+ "properties": {
+ "scope": {
+ "type": "object",
+ "properties": {
+ "ueId": {
+ "type": "string"
+ },
+ "qosId": {
+ "type": "string"
+ }
+ },
+ "additionalProperties": false,
+ "required": [
+ "ueId",
+ "qosId"
+ ]
+ },
+ "qosObjectives": {
+ "type": "object",
+ "properties": {
+ "priorityLevel": {
+ "type": "number"
+ }
+ },
+ "additionalProperties": false,
+ "required": [
+ "priorityLevel"
+ ]
+ }
+ }
+ },
+ "statusSchema": {
+ "$schema": "http://json-schema.org/draft-07/schema#",
+ "title": "STD_QOS_0.2.0",
+ "description": "STD QOS policy type status",
+ "type": "object",
+ "properties": {
+ "enforceStatus": {
+ "type": "string"
+ },
+ "enforceReason": {
+ "type": "string"
+ },
+ "additionalProperties": false,
+ "required": [
+ "enforceStatus"
+ ]
+ }
+ }
+ }
\ No newline at end of file
--- /dev/null
+{
+ "callback_url": "http://callback-receiver:8090/callbacks/ric-registration",
+ "keep_alive_interval_seconds": "0",
+ "service_id": "ric-registration"
+}
\ No newline at end of file
--- /dev/null
+# Copyright (C) 2021 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=================================================
+#
+version: '3'
+
+networks:
+ default:
+ driver: bridge
+
+services:
+ policy-agent:
+ image: nexus3.onap.org:10003/onap/ccsdk-oran-a1policymanagementservice:1.1.1-STAGING-latest
+ container_name: policy-agent
+ networks:
+ default:
+ aliases:
+ - policy-agent-container
+ ports:
+ - 8081:8081
+ - 8433:8433
+ volumes:
+ - ./config/application_configuration.json:/opt/app/policy-agent/data/application_configuration.json:ro
+ # For using own certs instead of the default ones (built into the container),
+ # place them in config/ directory, update the application-policyagent.yaml file, and uncomment the following lines
+ # - ./config/keystore-policyagent.jks:/opt/app/policy-agent/etc/cert/keystore.jks:ro
+ # - ./config/truststore-policyagent.jks:/opt/app/policy-agent/etc/cert/truststore.jks:ro
+ # - ./config/application-policyagent.yaml:/opt/app/policy-agent/config/application.yaml:ro
+
+ a1-sim-OSC:
+ image: nexus3.o-ran-sc.org:10004/o-ran-sc/a1-simulator:2.1.0
+ container_name: a1-sim-OSC
+ networks:
+ - default
+ ports:
+ - 30001:8085
+ - 30002:8185
+ environment:
+ - A1_VERSION=OSC_2.1.0
+ - REMOTE_HOSTS_LOGGING=1
+ - ALLOW_HTTP=true
+
+ a1-sim-STD:
+ image: nexus3.o-ran-sc.org:10004/o-ran-sc/a1-simulator:2.1.0
+ container_name: a1-sim-STD
+ networks:
+ - default
+ ports:
+ - 30003:8085
+ - 30004:8185
+ environment:
+ - A1_VERSION=STD_1.1.3
+ - REMOTE_HOSTS_LOGGING=1
+ - ALLOW_HTTP=true
+
+ a1-sim-STD-v2:
+ image: nexus3.o-ran-sc.org:10004/o-ran-sc/a1-simulator:2.1.0
+ container_name: a1-sim-STD-v2
+ networks:
+ - default
+ ports:
+ - 30005:8085
+ - 30006:8185
+ environment:
+ - A1_VERSION=STD_2.0.0
+ - REMOTE_HOSTS_LOGGING=1
+ - ALLOW_HTTP=true
--- /dev/null
+# ========================LICENSE_START=================================
+# O-RAN-SC
+# %%
+# Copyright (C) 2021 Nordix Foundation
+# %%
+# 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===================================
+
+key-store=/etc/ssl/certs/java/keystore.jks
+key-password=sdnc-a1-controller
+keystore-password=sdnc-a1-controller
+isTrustStoreUsed=true
+trust-store=/etc/ssl/certs/java/truststore.jks
+truststore-password=sdnc-a1-controller
--- /dev/null
+# Copyright (C) 2021 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=================================================
+#
+version: '3'
+
+networks:
+ default:
+ driver: bridge
+
+services:
+ db:
+ image: mysql/mysql-server:5.6
+ container_name: sdnc-db
+ networks:
+ - default
+ ports:
+ - "3306"
+ environment:
+ - MYSQL_ROOT_PASSWORD=openECOMP1.0
+ - MYSQL_ROOT_HOST=%
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "30m"
+ max-file: "5"
+
+ a1-controller:
+ image: onap/sdnc-image:2.1.0
+ depends_on :
+ - db
+ container_name: a1-controller
+ networks:
+ - default
+ entrypoint: ["/opt/onap/sdnc/bin/startODL.sh"]
+ ports:
+ - 8282:8181
+ - 8443:8443
+ links:
+ - db:dbhost
+ - db:sdnctldb01
+ - db:sdnctldb02
+ environment:
+ - MYSQL_ROOT_PASSWORD=openECOMP1.0
+ - SDNC_DB_INIT=true
+ - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
+ - A1_TRUSTSTORE_PASSWORD=a1adapter
+ # For using own certs instead of the default ones (built into the container),
+ # place them in config/ directory, update the https-props-a1controller.properties file, and uncomment the following lines
+ #volumes:
+ # - ./sdnc/config/keystore-a1controller.jks:/etc/ssl/certs/java/keystore.jks:ro
+ # - ./sdnc/config/truststore-a1controller.jks:/etc/ssl/certs/java/truststore.jks:ro
+ # - ./sdnc/config/https-props-a1controller.properties:/opt/onap/sdnc/data/properties/https-props.properties:ro
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "30m"
+ max-file: "5"
#!/bin/bash
# ============LICENSE_START===============================================
-# Copyright (C) 2020 Nordix Foundation. All rights reserved.
+# Copyright (C) 2021 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.
cd $WORKSPACE/archives
-git clone "https://gerrit.o-ran-sc.org/r/nonrtric" -b cherry
-
-AUTOTEST_ROOT=$WORKSPACE/archives/nonrtric/test/auto-test
POLMAN_PLANS=$WORKSPACE/plans/ccsdk-oran/polmansuite
+ARCHIVES=$WORKSPACE/archives
-#Copy test script, adapted to ONAP images
-cp $POLMAN_PLANS/FTC1.sh $WORKSPACE/archives/nonrtric/test/auto-test/FTC1.sh
-cp $POLMAN_PLANS/FTC150.sh $WORKSPACE/archives/nonrtric/test/auto-test/FTC150.sh
-
-TEST_ENV=$POLMAN_PLANS/test_env-${GERRIT_BRANCH}.sh
+#Copy test script
+cp $POLMAN_PLANS/docker-compose.yml $WORKSPACE/archives/docker-compose.yml
+cp -rf $POLMAN_PLANS/config/ $WORKSPACE/archives/config/
+cp -rf $POLMAN_PLANS/data/ $WORKSPACE/archives/data/
+cp -rf $POLMAN_PLANS/test/ $WORKSPACE/archives/test/
+cp -rf $POLMAN_PLANS/sdnc/ $WORKSPACE/archives/sdnc/
#Make the env vars availble to the robot scripts
-ROBOT_VARIABLES="-b debug.log -v AUTOTEST_ROOT:${AUTOTEST_ROOT} -v TEST_ENV:${TEST_ENV}"
+ROBOT_VARIABLES="-b debug.log -v ARCHIVES:${ARCHIVES}"
#!/bin/bash
# ============LICENSE_START===============================================
-# Copyright (C) 2020 Nordix Foundation. All rights reserved.
+# Copyright (C) 2021 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.
# ============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
-
+docker stop $(docker ps -aq)
+docker system prune -f
--- /dev/null
+#!/bin/bash
+
+# ============LICENSE_START===============================================
+# Copyright (C) 2021 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=================================================
+
+SHELL_FOLDER=$(cd "$(dirname "$0")";pwd)
+docker stop $(docker ps -aq)
+docker system prune -f
+
+cd ${SHELL_FOLDER}/../config
+cp application_configuration.json.nosdnc application_configuration.json
+
+cd ${SHELL_FOLDER}/../
+docker-compose up -d
+
+checkStatus(){
+ for i in {1..20}; do
+ res=$($1)
+ echo "$res"
+ expect=$2
+ if [ "$res" == "$expect" ]; then
+ echo -e "$3 is alive!\n"
+ break;
+ else
+ sleep $i
+ fi
+ done
+}
+# Healthcheck docker containers
+
+# check SIM1 status
+echo "check SIM1 status:"
+checkStatus "curl -skw %{http_code} http://localhost:30001/" "OK200" "SIM1"
+
+# check SIM2 status
+echo "check SIM2 status:"
+checkStatus "curl -skw %{http_code} http://localhost:30003/" "OK200" "SIM2"
+
+# check SIM3 status
+echo "check SIM3 status:"
+checkStatus "curl -skw %{http_code} http://localhost:30005/" "OK200" "SIM3"
+
+# check PMS status
+echo "check PMS status:"
+checkStatus "curl -skw %{http_code} http://localhost:8081/status" "hunky dory200" "PMS"
+
+cd ${SHELL_FOLDER}/../data
+./preparePmsData.sh
+
--- /dev/null
+#!/bin/bash
+
+# ============LICENSE_START===============================================
+# Copyright (C) 2021 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=================================================
+
+SHELL_FOLDER=$(cd "$(dirname "$0")";pwd)
+docker stop $(docker ps -aq)
+docker system prune -f
+
+cd ${SHELL_FOLDER}/../config
+cp application_configuration.json.sdnc application_configuration.json
+
+cd ${SHELL_FOLDER}/../
+docker-compose -f docker-compose.yml -f sdnc/docker-compose.yml up -d
+
+checkStatus(){
+ for i in {1..20}; do
+ res=$($1)
+ echo "$res"
+ expect=$2
+ if [ "$res" == "$expect" ]; then
+ echo -e "$3 is alive!\n"
+ break;
+ else
+ sleep $i
+ fi
+ done
+}
+# Healthcheck docker containers
+
+# check SIM1 status
+echo "check SIM1 status:"
+checkStatus "curl -skw %{http_code} http://localhost:30001/" "OK200" "SIM1"
+
+# check SIM2 status
+echo "check SIM2 status:"
+checkStatus "curl -skw %{http_code} http://localhost:30003/" "OK200" "SIM2"
+
+# check SIM3 status
+echo "check SIM3 status:"
+checkStatus "curl -skw %{http_code} http://localhost:30005/" "OK200" "SIM3"
+
+# check PMS status
+echo "check PMS status:"
+checkStatus "curl -skw %{http_code} http://localhost:8081/status" "hunky dory200" "PMS"
+
+# check SDNC status
+echo "check SDNC status:"
+checkStatus "curl -s -o /dev/null -I -w %{http_code} http://localhost:8282/apidoc/explorer/" "200" "SDNC"
+
+cd ${SHELL_FOLDER}/../data
+./preparePmsData.sh
+
+++ /dev/null
-#!/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=================================================
-#
-
-#Profile for guilin release
-TEST_ENV_PROFILE="ONAP-GUILIN"
-NEXUS_PROXY_REPO="nexus3.onap.org:10001/"
-
-# 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'.
-
-# Tag for guilin branch
-# Remote Policy Agent image and tag
-POLICY_AGENT_REMOTE_IMAGE="nexus3.onap.org:10003/onap/ccsdk-oran-a1policymanagementservice"
-POLICY_AGENT_REMOTE_IMAGE_TAG="1.0.2-SNAPSHOT"
-
-
-# Control Panel remote image and tag
-CONTROL_PANEL_REMOTE_IMAGE="nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-controlpanel"
-CONTROL_PANEL_REMOTE_IMAGE_TAG="2.0.0"
-
-# Tag for guilin branch
-# SDNC A1 Controller remote image and tag
-SDNC_A1_CONTROLLER_REMOTE_IMAGE="nexus3.onap.org:10003/onap/sdnc-image"
-SDNC_A1_CONTROLLER_REMOTE_IMAGE_TAG="2.0.3-STAGING-latest"
-
-
-#SDNC DB remote image and tag
-SDNC_DB_REMOTE_IMAGE=$NEXUS_PROXY_REPO"mysql/mysql-server"
-SDNC_DB_REMOTE_IMAGE_TAG="5.6"
-#No local image for DB, remote image always used
-
-
-# Near RT RIC Simulator remote image and tag
-RIC_SIM_REMOTE_IMAGE="nexus3.o-ran-sc.org:10004/o-ran-sc/a1-simulator"
-RIC_SIM_REMOTE_IMAGE_TAG="2.0.0"
-
-
-#Consul remote image and tag
-CONSUL_REMOTE_IMAGE=$NEXUS_PROXY_REPO"consul"
-CONSUL_REMOTE_IMAGE_TAG="1.7.2"
-#No local image for Consul, remote image always used
-
-
-#CBS remote image and tag
-CBS_REMOTE_IMAGE="nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding.app-app"
-CBS_REMOTE_IMAGE_TAG="2.3.0"
-#No local image for CBS, remote image always used
-
-
-#MR stub image and tag
-MRSTUB_LOCAL_IMAGE="mrstub"
-MRSTUB_LOCAL_IMAGE_TAG="latest"
-#No remote image for MR stub, local image always used
-
-#Callback receiver image and tag
-CR_LOCAL_IMAGE="callback-receiver"
-CR_LOCAL_IMAGE_TAG="latest"
-#No remote image for CR, local image always used
-
-# Common env var for auto-test. Vars used by docker-compose need to be exported
-export DOCKER_SIM_NWNAME="nonrtric-docker-net" # Name of docker private network
-
-export POLICY_AGENT_EXTERNAL_PORT=8081 # Policy Agent container external port (host -> container)
-export POLICY_AGENT_INTERNAL_PORT=8081 # Policy Agent container internal port (container -> container)
-export POLICY_AGENT_EXTERNAL_SECURE_PORT=8433 # Policy Agent container external secure port (host -> container)
-export POLICY_AGENT_INTERNAL_SECURE_PORT=8433 # Policy Agent container internal secure port (container -> container)
-
-export POLICY_AGENT_APP_NAME="policy-agent" # Name for Policy Agent container
-POLICY_AGENT_LOGPATH="/var/log/policy-agent/application.log" # Path the application log in the Policy Agent container
-export POLICY_AGENT_APP_NAME_ALIAS="policy-agent-container" # Alias name, name used by the control panel
-
-export MR_EXTERNAL_PORT=3905 # MR stub container external port (host -> container)
-export MR_INTERNAL_PORT=3905 # MR stub container internal port (container -> container)
-export MR_EXTERNAL_SECURE_PORT=3906 # MR stub container external secure port (host -> container)
-export MR_INTERNAL_SECURE_PORT=3906 # MR stub container internal secure port (container -> container)
-export MR_APP_NAME="message-router" # Name for the MR
-export MR_READ_URL="/events/A1-POLICY-AGENT-READ/users/policy-agent?timeout=15000&limit=100" # Path to read messages from MR
-export MR_WRITE_URL="/events/A1-POLICY-AGENT-WRITE" # Path write messages to MR
-
-export CR_EXTERNAL_PORT=8090 # Callback receiver container external port (host -> container)
-export CR_INTERNAL_PORT=8090 # Callback receiver container internal port (container -> container)
-export CR_EXTERNAL_SECURE_PORT=8091 # Callback receiver container external secure port (host -> container)
-export CR_INTERNAL_SECURE_PORT=8091 # Callback receiver container internal secure port (container -> container)
-export CR_APP_NAME="callback-receiver" # Name for the Callback receiver
-export CR_APP_CALLBACK="/callbacks" # Url for callbacks
-
-export CONSUL_HOST="consul-server" # Host name of consul
-export CONSUL_EXTERNAL_PORT=8500 # Consul container external port (host -> container)
-export CONSUL_INTERNAL_PORT=8500 # Consul container internal port (container -> container)
-export CONSUL_APP_NAME="polman-consul" # Name for consul container
-
-export CBS_APP_NAME="polman-cbs" # Name for CBS container
-export CBS_EXTERNAL_PORT=10000 # CBS container external port (host -> container)
-export CBS_INTERNAL_PORT=10000 # CBS container internal port (container -> container)
-export CONFIG_BINDING_SERVICE="config-binding-service" # Host name of CBS
-
-export RIC_SIM_BASE="g" # Base name of the RIC Simulator container, shall be the group code
- # Note, a prefix is added to each container name by the .env file in the 'ric' dir
-RIC_SIM_PREFIX="ricsim" # Prefix added to ric container name, added in the .env file in the 'ric' dir
- # This prefix can be changed from the command line
-export RIC_SIM_INTERNAL_PORT=8085 # RIC Simulator container internal port (container -> container).
- # (external ports allocated by docker)
-export RIC_SIM_INTERNAL_SECURE_PORT=8185 # RIC Simulator container internal secure port (container -> container).
- # (external ports allocated by docker)
-
-export SDNC_APP_NAME="a1-controller" # Name of the SNDC A1 Controller container
-export SDNC_EXTERNAL_PORT=8282 # SNDC A1 Controller container external port (host -> container)
-export SDNC_INTERNAL_PORT=8181 # SNDC A1 Controller container internal port (container -> container)
-export SDNC_EXTERNAL_SECURE_PORT=8443 # SNDC A1 Controller container external securee port (host -> container)
-export SDNC_INTERNAL_SECURE_PORT=8443 # SNDC A1 Controller container internal secure port (container -> container)
-export SDNC_DB_APP_NAME="sdnc-db" # Name of the SDNC DB container
-export SDNC_A1_TRUSTSTORE_PASSWORD="a1adapter" # SDNC truststore password
-SDNC_USER="admin" # SDNC username
-SDNC_PWD="Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" # SNDC PWD
-SDNC_API_URL="/restconf/operations/A1-ADAPTER-API:" # Base url path for SNDC API
-SDNC_ALIVE_URL="/apidoc/explorer/" # Base url path for SNDC API docs (for alive check)
-SDNC_KARAF_LOG="/opt/opendaylight/data/log/karaf.log" # Path to karaf log
-
-
-export CONTROL_PANEL_APP_NAME="control-panel" # Name of the Control Panel container
-export CONTROL_PANEL_EXTERNAL_PORT=8080 # Control Panel container external port (host -> container)
-export CONTROL_PANEL_INTERNAL_PORT=8080 # Control Panel container external port (host -> container)
-CONTROL_PANEL_LOGPATH="/logs/nonrtric-controlpanel.log" # Path the application log in the Control Panel container
-
-UUID="" # UUID used as prefix to the policy id to simulate a real UUID
- # Testscript need to set the UUID to use other this empty prefix is used
-
-RESTBASE="http://localhost:"$POLICY_AGENT_EXTERNAL_PORT # Base url to the Agent NB REST interface
-RESTBASE_SECURE="https://localhost:"$POLICY_AGENT_EXTERNAL_SECURE_PORT # Base url to the secure Agent NB REST interface
-DMAAPBASE="http://localhost:"$MR_EXTERNAL_PORT # Base url to the Dmaap adapter, http
-DMAAPBASE_SECURE="https://localhost:"$MR_EXTERNAL_SECURE_PORT # Base url to the Dmaap adapter, https
-ADAPTER=$RESTBASE # Adapter holds the address the agent R-APP interface (REST OR DMAAP)
- # The values of this var is swiched between the two base url when needed
-
-CR_RESTBASE="http://localhost:"$CR_EXTERNAL_PORT # Base url to the Callback receiver REST interface
-CR_RESTBASE_SECURE="https://localhost:"$CR_EXTERNAL_SECURE_PORT # Base url to the secure Callback receiver REST interface
-CR_ADAPTER=$CR_RESTBASE # Adapter holds the address the CR admin interface (REST only)
- # The values of this var is swiched between the two base url when needed
\ No newline at end of file
+++ /dev/null
-#!/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=================================================
-#
-
-#Profile for current master branch
-TEST_ENV_PROFILE="ONAP-MASTER"
-NEXUS_PROXY_REPO="nexus3.onap.org:10001/"
-
-# 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'.
-
-
-# Remote Policy Agent image and tag
-POLICY_AGENT_REMOTE_IMAGE="nexus3.onap.org:10003/onap/ccsdk-oran-a1policymanagementservice"
-POLICY_AGENT_REMOTE_IMAGE_TAG="1.1.1-SNAPSHOT"
-
-
-# Control Panel remote image and tag
-CONTROL_PANEL_REMOTE_IMAGE="nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-controlpanel"
-CONTROL_PANEL_REMOTE_IMAGE_TAG="2.2.0"
-
-
-# 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.1.1-STAGING-latest"
-
-
-#SDNC DB remote image and tag
-SDNC_DB_REMOTE_IMAGE=$NEXUS_PROXY_REPO"mysql/mysql-server"
-SDNC_DB_REMOTE_IMAGE_TAG="5.6"
-#No local image for DB, remote image always used
-
-
-# Near RT RIC Simulator remote image and tag
-RIC_SIM_REMOTE_IMAGE="nexus3.o-ran-sc.org:10004/o-ran-sc/a1-simulator"
-RIC_SIM_REMOTE_IMAGE_TAG="2.1.0"
-
-
-#Consul remote image and tag
-CONSUL_REMOTE_IMAGE=$NEXUS_PROXY_REPO"consul"
-CONSUL_REMOTE_IMAGE_TAG="1.7.2"
-#No local image for Consul, remote image always used
-
-
-#CBS remote image and tag
-CBS_REMOTE_IMAGE="nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding.app-app"
-CBS_REMOTE_IMAGE_TAG="2.3.0"
-#No local image for CBS, remote image always used
-
-
-#MR stub image and tag
-MRSTUB_LOCAL_IMAGE="mrstub"
-MRSTUB_LOCAL_IMAGE_TAG="latest"
-#No remote image for MR stub, local image always used
-
-#Callback receiver image and tag
-CR_LOCAL_IMAGE="callback-receiver"
-CR_LOCAL_IMAGE_TAG="latest"
-#No remote image for CR, local image always used
-
-# Common env var for auto-test. Vars used by docker-compose need to be exported
-export DOCKER_SIM_NWNAME="nonrtric-docker-net" # Name of docker private network
-
-export POLICY_AGENT_EXTERNAL_PORT=8081 # Policy Agent container external port (host -> container)
-export POLICY_AGENT_INTERNAL_PORT=8081 # Policy Agent container internal port (container -> container)
-export POLICY_AGENT_EXTERNAL_SECURE_PORT=8433 # Policy Agent container external secure port (host -> container)
-export POLICY_AGENT_INTERNAL_SECURE_PORT=8433 # Policy Agent container internal secure port (container -> container)
-export PMS_VERSION="V2"
-
-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 CR_APP_CALLBACK="/callbacks" # Url for callbacks
-
-export CONSUL_HOST="consul-server" # Host name of consul
-export CONSUL_EXTERNAL_PORT=8500 # Consul container external port (host -> container)
-export CONSUL_INTERNAL_PORT=8500 # Consul container internal port (container -> container)
-export CONSUL_APP_NAME="polman-consul" # Name for consul container
-
-export CBS_APP_NAME="polman-cbs" # Name for CBS container
-export CBS_EXTERNAL_PORT=10000 # CBS container external port (host -> container)
-export CBS_INTERNAL_PORT=10000 # CBS container internal port (container -> container)
-export CONFIG_BINDING_SERVICE="config-binding-service" # Host name of CBS
-
-export RIC_SIM_BASE="g" # Base name of the RIC Simulator container, shall be the group code
- # Note, a prefix is added to each container name by the .env file in the 'ric' dir
-RIC_SIM_PREFIX="ricsim" # Prefix added to ric container name, added in the .env file in the 'ric' dir
- # This prefix can be changed from the command line
-export RIC_SIM_INTERNAL_PORT=8085 # RIC Simulator container internal port (container -> container).
- # (external ports allocated by docker)
-export RIC_SIM_INTERNAL_SECURE_PORT=8185 # RIC Simulator container internal secure port (container -> container).
- # (external ports allocated by docker)
-
-export SDNC_APP_NAME="a1-controller" # Name of the SNDC A1 Controller container
-export SDNC_EXTERNAL_PORT=8282 # SNDC A1 Controller container external port (host -> container)
-export SDNC_INTERNAL_PORT=8181 # SNDC A1 Controller container internal port (container -> container)
-export SDNC_EXTERNAL_SECURE_PORT=8443 # SNDC A1 Controller container external securee port (host -> container)
-export SDNC_INTERNAL_SECURE_PORT=8443 # SNDC A1 Controller container internal secure port (container -> container)
-export SDNC_DB_APP_NAME="sdnc-db" # Name of the SDNC DB container
-export SDNC_A1_TRUSTSTORE_PASSWORD="a1adapter" # SDNC truststore password
-SDNC_USER="admin" # SDNC username
-SDNC_PWD="Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" # SNDC PWD
-SDNC_API_URL="/restconf/operations/A1-ADAPTER-API:" # Base url path for SNDC API
-SDNC_ALIVE_URL="/apidoc/explorer/" # Base url path for SNDC API docs (for alive check)
-SDNC_KARAF_LOG="/opt/opendaylight/data/log/karaf.log" # Path to karaf log
-
-
-export CONTROL_PANEL_APP_NAME="control-panel" # Name of the Control Panel container
-export CONTROL_PANEL_EXTERNAL_PORT=8080 # Control Panel container external port (host -> container)
-export CONTROL_PANEL_INTERNAL_PORT=8080 # Control Panel container external port (host -> container)
-CONTROL_PANEL_LOGPATH="/logs/nonrtric-controlpanel.log" # Path the application log in the Control Panel container
-
-UUID="" # UUID used as prefix to the policy id to simulate a real UUID
- # Testscript need to set the UUID to use other this empty prefix is used
-
-RESTBASE="http://localhost:"$POLICY_AGENT_EXTERNAL_PORT # Base url to the Agent NB REST interface
-RESTBASE_SECURE="https://localhost:"$POLICY_AGENT_EXTERNAL_SECURE_PORT # Base url to the secure Agent NB REST interface
-DMAAPBASE="http://localhost:"$MR_EXTERNAL_PORT # Base url to the Dmaap adapter, http
-DMAAPBASE_SECURE="https://localhost:"$MR_EXTERNAL_SECURE_PORT # Base url to the Dmaap adapter, https
-ADAPTER=$RESTBASE # Adapter holds the address the agent R-APP interface (REST OR DMAAP)
- # The values of this var is swiched between the two base url when needed
-
-CR_RESTBASE="http://localhost:"$CR_EXTERNAL_PORT # Base url to the Callback receiver REST interface
-CR_RESTBASE_SECURE="https://localhost:"$CR_EXTERNAL_SECURE_PORT # Base url to the secure Callback receiver REST interface
-CR_ADAPTER=$CR_RESTBASE # Adapter holds the address the CR admin interface (REST only)
- # The values of this var is swiched between the two base url when needed
\ No newline at end of file
cd ../ftpes-sftp-server
docker build -t ftpes_vsftpd:latest -f Dockerfile-ftpes .
+cd ../http-https-server
+docker build -t http_httpd:latest -f Dockerfile-http .
#All containers will be started and stopped via the robot tests.
# Test suites are relative paths under [integration/csit.git]/tests/.
# Place the suites in run order.
-dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite
+dcaegen2-collectors-datafile/testsuites/Functional-Single-File-Ftp-suite
+dcaegen2-collectors-datafile/testsuites/Functional-Single-File-Http-suite
dcaegen2-collectors-datafile/testsuites/Strict-Host-Checking-suite
"dmaap_info": {
"client_id": "1475976809466",
"client_role": "org.onap.dcae.pmPublisher",
- "topic_url": "https://mr-sim:3095/events/unauthenticated.DCAE_CL_OUTPUT",
+ "topic_url": "http://dmaap:3904/events/unauthenticated.DCAE_CL_OUTPUT",
"location": "san-francisco"
},
"type": "message_router"
"dmaap_info": {
"client_id": "1575976809466",
"client_role": "org.onap.dcae.aaiSub",
- "topic_url": "https://mr-sim:3095/events/AAI_EVENT",
+ "topic_url": "http://dmaap:3904/events/AAI_EVENT",
"location": "san-francisco"
}
},
"policy_pm_subscriber": {
"dmaap_info": {
"location": "san-francisco",
- "topic_url": "https://mr-sim:3095/events/unauthenticated.PMSH_CL_INPUT",
+ "topic_url": "http://dmaap:3904/events/unauthenticated.PMSH_CL_INPUT",
"client_role": "org.onap.dcae.pmSubscriber",
"client_id": "1575876809456"
},
+++ /dev/null
-[
- {
- "httpRequest": {
- "path": "/events/AAI_EVENT/.*",
- "queryStringParameters" : {
- "timeout" : [ "1000" ]
- }
- },
- "httpResponse": {
- "statusCode": 200,
- "headers": {
- "content-type": [
- "application/json"
- ]
- },
- "body": []
- }
- },
- {
- "httpRequest": {
- "path": "/events/unauthenticated.DCAE_CL_OUTPUT",
- "queryStringParameters" : {
- "timeout" : [ "1000" ]
- }
- },
- "httpResponse": {
- "statusCode": 200,
- "headers": {
- "content-type": [
- "application/json"
- ]
- },
- "body": []
- }
- },
- {
- "httpRequest": {
- "path": "/events/unauthenticated.PMSH_CL_INPUT/.*",
- "queryStringParameters" : {
- "timeout" : [ "1000" ]
- }
- },
- "httpResponse": {
- "statusCode": 200,
- "headers": {
- "content-type": [
- "application/json"
- ]
- },
- "body": []
- }
- }
-]
+++ /dev/null
-#######################################
-# MockServer & Proxy Example Settings #
-#######################################
-
-# Socket & Port Settings
-
-# socket timeout in milliseconds (default 120000)
-mockserver.maxSocketTimeout=120000
-
-# Certificate Generation
-
-# delete KeyStore file on JVM shutdown (default true)
-mockserver.deleteGeneratedKeyStoreOnExit=true
-# certificate domain name (default "localhost")
-mockserver.sslCertificateDomainName=localhost
-# comma separated list of domain names for Subject Alternative Name domain names (default empty list)
-mockserver.sslSubjectAlternativeNameDomains=www.example.com,www.another.com
-# comma separated list of ip addresses for Subject Alternative Name ips (default empty list)
-mockserver.sslSubjectAlternativeNameIps=127.0.0.1
-
-# CORS
-
-# enable CORS for MockServer REST API
-mockserver.enableCORSForAPI=true
-# enable CORS for all responses
-mockserver.enableCORSForAllResponses=true
POSTGRES_PASSWORD: $DB_PASSWORD
POSTGRES_USER: $DB_USER
networks:
- pmsh-network:
+ dockercompose_net:
+ aliases:
+ - db
aai:
container_name: aai-sim
- ./assets/ssl_certs/mock_server_cacert.pem:/var/tmp/mock_server_cacert.pem
- ./assets/ssl_certs/mock_server_key.pem:/var/tmp/mock_server_key.pem
networks:
- pmsh-network:
+ dockercompose_net:
+ aliases:
+ - aai-sim
cbs-sim:
container_name: cbs-sim
- ./assets/ssl_certs/mock_server_cacert.pem:/var/tmp/mock_server_cacert.pem
- ./assets/ssl_certs/mock_server_key.pem:/var/tmp/mock_server_key.pem
networks:
- pmsh-network:
-
- mr-sim:
- container_name: mr-sim
- image: mockserver/mockserver:mockserver-5.9.0
- environment:
- MOCKSERVER_PROPERTY_FILE: /config/mockserver.properties
- MOCKSERVER_INITIALIZATION_JSON_PATH: /config/mr-initializer.json
- LOG_LEVEL: "DEBUG"
- SERVER_PORT: 3095
- volumes:
- - ./assets/mr_sim/mr_mockserver.properties:/config/mockserver.properties
- - ./assets/mr_sim/mr-initializer.json:/config/mr-initializer.json
- networks:
- pmsh-network:
+ dockercompose_net:
+ aliases:
+ - cbs-sim
pmsh:
container_name: pmsh
AAI_SERVICE_PORT: 1080
DCAE_CA_CERTPATH: '/opt/app/pmsh/etc/certs/cacert.pem'
networks:
- pmsh-network:
+ dockercompose_net:
+ aliases:
+ - pmsh
networks:
- pmsh-network:
- driver: bridge
+ dockercompose_net:
+ external: true
+
#!/bin/bash
# Place the scripts in run order:
+source ${WORKSPACE}/scripts/dmaap-message-router/dmaap-mr-launch.sh
+dmaap_mr_launch
+DMAAP_MR_IP=${IP}
+
export DB_USER=pmsh
export DB_PASSWORD=pmsh
TEST_PLANS_DIR=$WORKSPACE/plans/dcaegen2-services-pmsh/testsuite
-docker-compose -f ${TEST_PLANS_DIR}/docker-compose.yml up -d db aai cbs-sim mr-sim
+docker-compose -f ${TEST_PLANS_DIR}/docker-compose.yml up -d db aai cbs-sim
# Slow machine running CSITs can affect db coming up in time for PMSH
echo "Waiting for postgres db to come up..."
fi
if [[ $(docker inspect --format '{{ .State.Running }}' cbs-sim) ]] && \
[[ $(docker inspect --format '{{ .State.Running }}' aai-sim) ]] && \
- [[ $(docker inspect --format '{{ .State.Running }}' mr-sim) ]] && \
[[ $(docker inspect --format '{{ .State.Running }}' db) ]] && \
[[ $(docker inspect --format '{{ .State.Running }}' pmsh) ]]
then
done
[[ "$containers_ok" == "false" ]] && echo "Error: required container not running." && exit 1
+# Create topics on MR
+curl -X POST http://${DMAAP_MR_IP}:3904/events/AAI_EVENT --header 'Content-Type: application/json' --data-raw '{"message": "dummy message"}'
+sleep 2
+curl -X POST http://${DMAAP_MR_IP}:3904/events/unauthenticated.PMSH_CL_INPUT --header 'Content-Type: application/json' --data-raw '{"message": "dummy message"}'
+
+
DB_IP_ADDRESS=$(docker inspect -f "{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}" db)
-MR_SIM_IP_ADDRESS=$(docker inspect -f "{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}" mr-sim)
CBS_SIM_IP_ADDRESS=$(docker inspect -f "{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}" cbs-sim)
#Pass any variables required by Robot test suites in ROBOT_VARIABLES
-ROBOT_VARIABLES="-v PMSH_IP:${PMSH_IP} -v MR_SIM_IP_ADDRESS:${MR_SIM_IP_ADDRESS} -v DB_IP_ADDRESS:${DB_IP_ADDRESS} -v CBS_SIM_IP_ADDRESS:${CBS_SIM_IP_ADDRESS}"
+ROBOT_VARIABLES="-v PMSH_IP:${PMSH_IP} -v MR_IP_ADDRESS:${DMAAP_MR_IP} -v DB_IP_ADDRESS:${DB_IP_ADDRESS} -v CBS_SIM_IP_ADDRESS:${CBS_SIM_IP_ADDRESS}"
#!/bin/bash
echo "Starting teardown script"
+source ${WORKSPACE}/scripts/dmaap-message-router/dmaap-mr-teardown.sh
+dmaap_mr_teardown
TEST_PLANS_DIR=$WORKSPACE/plans/dcaegen2-services-pmsh/testsuite
mkdir -p $WORKSPACE/archives
docker exec pmsh /bin/sh -c "cat /var/log/ONAP/dcaegen2/services/pmsh/*"
NEXUS_DOCKER_REPO_MSO=nexus3.onap.org:10001
DOCKER_ENVIRONMENT=remote
-TAG=1.6.0
+TAG=1.8.0-STAGING-latest
TIME_OUT_DEFAULT_VALUE_SEC=1200
PROJECT_NAME=etsiintegrationtesting
DEFAULT_NETWORK_NAME=etsiintegrationtesting_default
+ETSI_CATALOG_IMAGE_VERSION=1.0.9
adapters:
network:
encryptionKey: 07a7159d3bf51a0e53be7a8f89699be7
+aai:
+ auth: 221187EFA3AD4E33600DE0488F287099934CE65C3D0697BCECC00BB58E784E07CD74A24581DC31DBC086FF63DF116378776E9BE3D1325885
resourceTemplateId: vnfd2_vnfc4
vduId: vnfd2_vduForVnfc4
type: COMPUTE
+ - vnfdid: b1bb0ce7-2222-4fa7-95ed-4840d70a1177
+ vnfclist:
+ - vnfcid: VNFC5
+ resourceTemplateId: vnfd3_vnfc4
+ vduId: vnfd3_vduForVnfc4
+ type: COMPUTE
+ - vnfcid: VNFC6
+ resourceTemplateId: vnfd3_vnfc5
+ vduId: vnfd3_vduForVnfc5
+ type: COMPUTE
+ - vnfdid: 0c960b3a-d88f-11ea-87d0-0242ac130003
+ vnfclist:
+ - vnfcid: VNFC7
+ resourceTemplateId: vnfd4_vnfc5
+ vduId: vnfd4_vduForVnfc5
+ type: COMPUTE
+ - vnfcid: VNFC8
+ resourceTemplateId: vnfd4_vnfc6
+ vduId: vnfd4_vduForVnfc6
+ type: COMPUTE
result=$(docker inspect --format '{{.State.Running}}' $CONTAINER_NAME)
if [ $result != "true" ] ; then
+ docker logs $CONTAINER_NAME
echo "$SCRIPT_NAME $(current_timestamp) ERROR: $CONTAINER_NAME container is not running"
exit 1
fi
$WAIT_FOR_SCRIPT -t "$TIME_OUT" -h "$HOST_IP" -p "$PORT"
if [ $? -ne 0 ]; then
+ docker logs $CONTAINER_NAME
echo "$SCRIPT_NAME $(current_timestamp) ERROR: wait-for.sh failed ..."
exit 1
fi
so-vnfm-adapter:
image: onap/so/vnfm-adapter:${TAG}
################################################################################
- ve-vnfm-adapter:
- image: onap/so/ve-vnfm-adapter:${TAG}
-################################################################################
+ modeling-etsicatalog:
+ image: ${NEXUS_DOCKER_REPO_MSO}/onap/modeling/etsicatalog:${ETSI_CATALOG_IMAGE_VERSION}
ports:
- "3306:3306"
volumes:
+ - /var/lib/mysql
- ${TEST_LAB_DIR}/volumes/mariadb/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
- ${TEST_LAB_DIR}/volumes/mariadb/conf.d:/etc/mysql/conf.d
environment:
- MYSQL_ROOT_PASSWORD=password
+ - MYSQL_USER=etsicatalog
+ - MYSQL_PASSWORD=etsicatalog
+ - MYSQL_DATABASE=etsicatalog
hostname:
mariadb.so.testlab.onap.org
logging:
command:
- "/config/populate-aai-simulator.sh"
################################################################################
- ve-vnfm-adapter:
- image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/ve-vnfm-adapter:${TAG}
+ modeling-etsicatalog:
+ image: ${NEXUS_DOCKER_REPO_MSO}/onap/modeling/etsicatalog:${ETSI_CATALOG_IMAGE_VERSION}
ports:
- - "9098:9098"
+ - "8806:8806"
volumes:
- - ${CONFIG_DIR_PATH}/override-files/ve-vnfm-adapter/onapheat:/app/config
- - ${CONFIG_DIR_PATH}/certificates/truststore/root-ca.crt:/app/ca-certificates/root-ca.crt
+ - /var/lib/mysql
+ - ${CONFIG_DIR_PATH}/wait-for.sh:/service/wait-for.sh
environment:
- - APP=ve-vnfm-adapter
- - JVM_ARGS=-Xms64m -Xmx512m
- - DB_HOST=mariadb
+ - DB_IP=mariadb
+ - SDC_ADDR=http://sdc-simulator:9991
hostname:
- ve-vnfm-adapter
+ modeling-etsicatalog
depends_on:
- - request-db-adapter
- - aai-simulator
+ - mariadb
+ - sdc-simulator
logging:
driver: "json-file"
options:
max-size: "30m"
max-file: "5"
- user: root
- entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"'
-################################################################################
+ entrypoint: /bin/sh -c '/service/wait-for.sh -t 300 -h mariadb -p 3306 && /service/modeling/etsicatalog/docker/docker-entrypoint.sh'
export $(egrep -v '^#' $ENV_FILE | xargs)
-MANDATORY_VARIABLES_NAMES=( "NEXUS_DOCKER_REPO_MSO" "DOCKER_ENVIRONMENT" "TAG" "TIME_OUT_DEFAULT_VALUE_SEC" "PROJECT_NAME" "DEFAULT_NETWORK_NAME")
+MANDATORY_VARIABLES_NAMES=( "NEXUS_DOCKER_REPO_MSO" "DOCKER_ENVIRONMENT" "TAG" "TIME_OUT_DEFAULT_VALUE_SEC" "PROJECT_NAME" "DEFAULT_NETWORK_NAME", "ETSI_CATALOG_IMAGE_VERSION")
for var in "${MANDATORY_VARIABLES_NAMES[@]}"
do
echo "Sleeping for 3m"
sleep 3m
+docker ps -a
+
echo "Will execute $WAIT_FOR_WORKAROUND_SCRIPT script"
$WAIT_FOR_WORKAROUND_SCRIPT
exit 1
fi
+MODELING_ETSI_CATALOG_CONTAINER_NAME="modeling-etsicatalog"
+echo "Will execute $WAIT_FOR_CONTAINER_SCRIPT to wait for $MODELING_ETSI_CATALOG_CONTAINER_NAME container to start up"
+$WAIT_FOR_CONTAINER_SCRIPT -c "$MODELING_ETSI_CATALOG_CONTAINER_NAME" -t "300" -n "$DEFAULT_NETWORK_NAME"
+
+if [ $? -ne 0 ]; then
+ echo "ERROR: $WAIT_FOR_CONTAINER_SCRIPT failed"
+ echo "Will stop running docker containers . . ."
+ $TEAR_DOWN_SCRIPT
+ exit 1
+fi
+
REPO_IP='127.0.0.1'
ROBOT_VARIABLES="-v REPO_IP:${REPO_IP}"
+# install required Robot libraries
+pip install robotframework-archivelibrary
+
echo "Finished executing $SCRIPT_HOME/$SCRIPT_NAME"
</parent>
<artifactId>aai-simulator</artifactId>
<properties>
- <version.aai.schema>1.0.0</version.aai.schema>
+ <version.aai.schema>1.8.1</version.aai.schema>
</properties>
<dependencies>
<dependency>
import static org.onap.so.aaisimulator.utils.Constants.CUSTOMER_TYPE;
import static org.onap.so.aaisimulator.utils.Constants.CUSTOMER_URL;
import static org.onap.so.aaisimulator.utils.Constants.GENERIC_VNF;
-import static org.onap.so.aaisimulator.utils.Constants.GENERIC_VNF_VNF_ID;
import static org.onap.so.aaisimulator.utils.Constants.SERVICE_RESOURCE_TYPE;
import static org.onap.so.aaisimulator.utils.Constants.SERVICE_SUBSCRIPTION;
import static org.onap.so.aaisimulator.utils.Constants.X_HTTP_METHOD_OVERRIDE;
import static org.onap.so.aaisimulator.utils.RequestErrorResponseUtils.getRequestErrorResponseEntity;
import static org.onap.so.aaisimulator.utils.RequestErrorResponseUtils.getResourceVersion;
+import java.util.List;
import java.util.Optional;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.core.MediaType;
import org.onap.aai.domain.yang.GenericVnf;
import org.onap.aai.domain.yang.GenericVnfs;
import org.onap.aai.domain.yang.Relationship;
-import org.onap.aai.domain.yang.RelationshipData;
import org.onap.aai.domain.yang.ServiceInstance;
import org.onap.aai.domain.yang.ServiceInstances;
import org.onap.aai.domain.yang.ServiceSubscription;
public ResponseEntity<?> getRelatedToGenericVnf(@PathVariable("global-customer-id") final String globalCustomerId,
@PathVariable("service-type") final String serviceType,
@PathVariable(name = "service-instance-id") final String serviceInstanceId,
- @RequestParam(name = "vnf-name", required = true) final String vnfName, final HttpServletRequest request) {
+ @RequestParam(name = "vnf-name", required = false) final String vnfName, final HttpServletRequest request) {
LOGGER.info(
"Will retrieve generic vnf related to information for 'global customer id': {}, 'service type': {} and 'service instance id: '{} with vnfname: {}...",
globalCustomerId, serviceType, serviceInstanceId, vnfName);
- final Optional<Relationship> optional =
- cacheServiceProvider.getRelationship(globalCustomerId, serviceType, serviceInstanceId, vnfName);
+ final List<String> relatedToVnfIds =
+ getRelatedToVnfIds(globalCustomerId, serviceType, serviceInstanceId, vnfName);
- if (optional.isPresent()) {
-
- final Relationship relationship = optional.get();
- final Optional<RelationshipData> relationshipDataOptional = relationship.getRelationshipData().stream()
- .filter(existing -> GENERIC_VNF_VNF_ID.equals(existing.getRelationshipKey())).findFirst();
- if (relationshipDataOptional.isPresent()) {
- final RelationshipData relationshipData = relationshipDataOptional.get();
- final String vnfId = relationshipData.getRelationshipValue();
+ if (!relatedToVnfIds.isEmpty()) {
+ final GenericVnfs genericVnfs = new GenericVnfs();
+ relatedToVnfIds.stream().forEach(vnfId -> {
final Optional<GenericVnf> genericVnfOptional = genericVnfCacheServiceProvider.getGenericVnf(vnfId);
if (genericVnfOptional.isPresent()) {
- final GenericVnfs genericVnfs = new GenericVnfs();
- genericVnfs.getGenericVnf().add(genericVnfOptional.get());
- LOGGER.info("found service instance {} in cache", relationship);
- return ResponseEntity.ok(genericVnfs);
+ final GenericVnf genericVnf = genericVnfOptional.get();
+ LOGGER.info("found related-to generic-vnf {} in cache", genericVnf);
+ genericVnfs.getGenericVnf().add(genericVnf);
}
+ });
+ if (!genericVnfs.getGenericVnf().isEmpty()) {
+ LOGGER.info("Found {} related generic-vnfs", genericVnfs.getGenericVnf().size());
+ return ResponseEntity.ok(genericVnfs);
}
}
+
LOGGER.error(
"Couldn't find generic vnf related to information for 'global customer id': {}, 'service type': {} and 'service instance id: '{} with vnfname: {}...",
globalCustomerId, serviceType, serviceInstanceId, vnfName);
return getRequestErrorResponseEntity(request);
}
+
+ private List<String> getRelatedToVnfIds(final String globalCustomerId, final String serviceType,
+ final String serviceInstanceId, final String vnfName) {
+ if (vnfName != null) {
+ return cacheServiceProvider.getRelatedToVnfIds(globalCustomerId, serviceType, serviceInstanceId, vnfName);
+ }
+ return cacheServiceProvider.getRelatedToVnfIds(globalCustomerId, serviceType, serviceInstanceId);
+ }
}
*/
package org.onap.so.aaisimulator.service.providers;
+import java.util.List;
import java.util.Optional;
import org.onap.aai.domain.yang.Customer;
import org.onap.aai.domain.yang.Relationship;
boolean patchServiceInstance(final String globalCustomerId, final String serviceType,
final String serviceInstanceId, final ServiceInstance serviceInstance);
- Optional<Relationship> getRelationship(final String globalCustomerId, final String serviceType,
- final String serviceInstanceId, final String vnfName);
-
Optional<Relationship> addRelationShip(final String globalCustomerId, final String serviceType,
final String serviceInstanceId, final Relationship relationship, final String requestUri);
boolean deleteSericeInstance(final String globalCustomerId, final String serviceType,
final String serviceInstanceId, final String resourceVersion);
+ List<String> getRelatedToVnfIds(final String globalCustomerId, final String serviceType,
+ final String serviceInstanceId, final String vnfName);
+
+ List<String> getRelatedToVnfIds(final String globalCustomerId, final String serviceType,
+ final String serviceInstanceId);
+
}
import static org.onap.so.aaisimulator.utils.CacheName.CUSTOMER_CACHE;
import static org.onap.so.aaisimulator.utils.Constants.CUSTOMER_GLOBAL_CUSTOMER_ID;
import static org.onap.so.aaisimulator.utils.Constants.GENERIC_VNF;
+import static org.onap.so.aaisimulator.utils.Constants.GENERIC_VNF_VNF_ID;
import static org.onap.so.aaisimulator.utils.Constants.GENERIC_VNF_VNF_NAME;
import static org.onap.so.aaisimulator.utils.Constants.SERVICE_INSTANCE_SERVICE_INSTANCE_ID;
import static org.onap.so.aaisimulator.utils.Constants.SERVICE_INSTANCE_SERVICE_INSTANCE_NAME;
import static org.onap.so.aaisimulator.utils.Constants.SERVICE_SUBSCRIPTION_SERVICE_TYPE;
import static org.onap.so.aaisimulator.utils.HttpServiceUtils.getBiDirectionalRelationShipListRelatedLink;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
}
@Override
- public Optional<Relationship> getRelationship(final String globalCustomerId, final String serviceType,
+ public List<String> getRelatedToVnfIds(final String globalCustomerId, final String serviceType,
final String serviceInstanceId, final String vnfName) {
final Optional<ServiceInstance> optional = getServiceInstance(globalCustomerId, serviceType, serviceInstanceId);
final RelationshipList relationshipList = serviceInstance.getRelationshipList();
if (relationshipList != null) {
- final List<Relationship> relationship = relationshipList.getRelationship();
- return relationship.stream().filter(
+ final List<Relationship> relationships = relationshipList.getRelationship().stream().filter(
relationShip -> relationShip.getRelatedToProperty().stream().filter(relatedToProperty -> {
final String propertyKey = relatedToProperty.getPropertyKey();
final String propertyValue = relatedToProperty.getPropertyValue();
return GENERIC_VNF_VNF_NAME.equals(propertyKey) && propertyValue != null
&& propertyValue.equals(vnfName);
- }).findFirst().isPresent()).findFirst();
+ }).findFirst().isPresent()).collect(Collectors.toList());
+ LOGGER.info("Found relationships {} for vnf-name: {}", relationships, vnfName);
+ return getGenericVnfIdsIfPresent(relationships);
}
LOGGER.warn("Relationship list is nulll ...");
}
- LOGGER.error("Unable to RelationShip with property value: {}... ", vnfName);
+ LOGGER.error("Unable to find generic-vnf relationships with property value: {}... ", vnfName);
+ return Collections.emptyList();
+ }
- return Optional.empty();
+ @Override
+ public List<String> getRelatedToVnfIds(final String globalCustomerId, final String serviceType,
+ final String serviceInstanceId) {
+ final Optional<ServiceInstance> optional = getServiceInstance(globalCustomerId, serviceType, serviceInstanceId);
+
+ if (optional.isPresent()) {
+ LOGGER.info("Found service instance ...");
+ final ServiceInstance serviceInstance = optional.get();
+ final RelationshipList relationshipList = serviceInstance.getRelationshipList();
+
+ if (relationshipList != null) {
+ final List<Relationship> relationships = relationshipList.getRelationship();
+ LOGGER.info("Relationships found {}", relationships);
+ return getGenericVnfIdsIfPresent(relationships);
+ }
+ LOGGER.warn("Relationship list is nulll ...");
+ }
+ LOGGER.error("Unable to find generic-vnf relationships ... ");
+ return Collections.emptyList();
+ }
+
+ private List<String> getGenericVnfIdsIfPresent(final List<Relationship> relationships) {
+ final List<String> vnfIdsFound = new ArrayList<>();
+ relationships.stream().forEach(relationship -> {
+ relationship.getRelationshipData().stream()
+ .filter(existing -> GENERIC_VNF_VNF_ID.equals(existing.getRelationshipKey())).findFirst()
+ .ifPresent(consume -> {
+ vnfIdsFound.add(consume.getRelationshipValue());
+ });
+ });
+ return vnfIdsFound;
}
@Override
assertEquals(GENERIC_VNF_NAME, genericVnf.getVnfName());
}
+ @Test
+ public void test_putServiceInstanceRelatedTo_ableToRetrieveAllRelatedGenericVnfsFromCache() throws Exception {
+
+ final String url = getUrl(CUSTOMERS_URL, SERVICE_SUBSCRIPTIONS_URL, SERVICE_INSTANCE_URL);
+
+ invokeCustomerEndPointAndAssertResponse();
+
+ invokeServiceInstanceEndPointAndAssertResponse();
+
+ final String relationShipUrl = getUrl(CUSTOMERS_URL, SERVICE_SUBSCRIPTIONS_URL, SERVICE_INSTANCE_URL,
+ BI_DIRECTIONAL_RELATIONSHIP_LIST_URL);
+
+ final ResponseEntity<Relationship> responseEntity2 = testRestTemplateService.invokeHttpPut(relationShipUrl,
+ TestUtils.getRelationShipJsonObject(), Relationship.class);
+
+ assertEquals(HttpStatus.ACCEPTED, responseEntity2.getStatusCode());
+
+ final String genericVnfUrl = getUrl(GENERIC_VNF_URL, VNF_ID);
+ final ResponseEntity<Void> genericVnfResponse =
+ testRestTemplateService.invokeHttpPut(genericVnfUrl, TestUtils.getGenericVnf(), Void.class);
+ assertEquals(HttpStatus.ACCEPTED, genericVnfResponse.getStatusCode());
+
+ final ResponseEntity<GenericVnfs> actual =
+ testRestTemplateService.invokeHttpGet(url + RELATED_TO_URL, GenericVnfs.class);
+
+ assertEquals(HttpStatus.OK, actual.getStatusCode());
+
+ assertTrue(actual.hasBody());
+ final GenericVnfs genericVnfs = actual.getBody();
+ assertFalse(genericVnfs.getGenericVnf().isEmpty());
+ final GenericVnf genericVnf = genericVnfs.getGenericVnf().get(0);
+ assertEquals(GENERIC_VNF_NAME, genericVnf.getVnfName());
+ }
+
+
@Test
public void test_DeleteSericeInstance_ServiceInstanceRemovedFromCache() throws Exception {
final String url = getUrl(CUSTOMERS_URL, SERVICE_SUBSCRIPTIONS_URL, SERVICE_INSTANCE_URL);
ENV https_proxy=$HTTPS_PROXY
# Update the package list and upgrade installed packages
-RUN apk update && apk upgrade
+USER root
+RUN apk update
# Install commonly needed tools
RUN apk --no-cache add curl netcat-openbsd sudo nss
RUN chown -R so:so /app && chmod 700 /app/*.sh
+USER so
+
# Springboot configuration (required)
VOLUME /app/config
FROM docker.io/alpine
# Install packages
-RUN apk update && apk upgrade && apk add mysql-client && apk add bash
+USER root
+RUN apk upgrade && apk add mysql-client
-RUN apk --no-cache add curl netcat-openbsd sudo nss
+RUN apk --no-cache add bash curl netcat-openbsd sudo nss
<artifactId>sdc-simulator</artifactId>
<name>${project.artifactId}</name>
<dependencies>
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
package org.onap.so.sdcsimulator.configration;
import org.onap.so.sdcsimulator.utils.Constants;
+import org.onap.so.simulator.configuration.SimulatorSecurityConfigurer;
+import org.onap.so.simulator.model.UserCredentials;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
/**
* @author waqas.ikram@ericsson.com
*/
@Configuration
@EnableWebSecurity
-public class WebSecurityConfigImpl extends WebSecurityConfigurerAdapter {
+public class WebSecurityConfigImpl extends SimulatorSecurityConfigurer {
- private final String username;
- private final String password;
- private final String role;
- public WebSecurityConfigImpl(@Value("${spring.security.username}") final String username,
- @Value("${spring.security.password}") final String password,
- @Value("${spring.security.role}") final String role) {
- this.username = username;
- this.password = password;
- this.role = role;
+ @Autowired
+ public WebSecurityConfigImpl(final UserCredentials userCredentials) {
+ super(userCredentials.getUsers());
}
.httpBasic();
}
- @Bean
- public BCryptPasswordEncoder passwordEncoder() {
- return new BCryptPasswordEncoder();
- }
-
- @Autowired
- public void configureGlobal(final AuthenticationManagerBuilder auth) throws Exception {
- auth.inMemoryAuthentication().passwordEncoder(passwordEncoder()).withUser(username).password(password)
- .roles(role);
- }
}
import static org.onap.so.sdcsimulator.utils.Constants.CATALOG_URL;
import java.util.Optional;
import javax.ws.rs.core.MediaType;
-import org.onap.so.sdcsimulator.providers.ResourceProvider;
+import org.onap.so.sdcsimulator.models.AssetType;
+import org.onap.so.sdcsimulator.models.Metadata;
+import org.onap.so.sdcsimulator.providers.AssetProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
public class CatalogController {
private static final Logger LOGGER = LoggerFactory.getLogger(CatalogController.class);
- private ResourceProvider resourceProvider;
+ private final AssetProvider assetProvider;
@Autowired
- public CatalogController(final ResourceProvider resourceProvider) {
- this.resourceProvider = resourceProvider;
+ public CatalogController(final AssetProvider assetProvider) {
+ this.assetProvider = assetProvider;
+ }
+
+ @GetMapping(value = "/resources", produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ public ResponseEntity<?> getResources() {
+ LOGGER.info("Running getResources ...");
+ return ResponseEntity.ok().body(assetProvider.getAssetInfo(AssetType.RESOURCES));
}
@GetMapping(value = "/resources/{csarId}/toscaModel", produces = MediaType.APPLICATION_OCTET_STREAM)
- public ResponseEntity<byte[]> getCsar(@PathVariable("csarId") final String csarId) {
+ public ResponseEntity<byte[]> getResourceCsar(@PathVariable("csarId") final String csarId) {
LOGGER.info("Running getCsar for {} ...", csarId);
- final Optional<byte[]> resource = resourceProvider.getResource(csarId);
+ final Optional<byte[]> resource = assetProvider.getAsset(csarId, AssetType.RESOURCES);
if (resource.isPresent()) {
return new ResponseEntity<>(resource.get(), HttpStatus.OK);
}
return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
}
+ @GetMapping(value = "/resources/{csarId}/metadata",
+ produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ public ResponseEntity<Metadata> getResourceMetadata(@PathVariable("csarId") final String csarId) {
+ LOGGER.info("Running getResourceMetadata for {} ...", csarId);
+ final Optional<Metadata> resource = assetProvider.getMetadata(csarId, AssetType.RESOURCES);
+ if (resource.isPresent()) {
+ return new ResponseEntity<>(resource.get(), HttpStatus.OK);
+ }
+ LOGGER.error("Unable to find metadata for csarId: {}", csarId);
+
+ return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+
+
+ @GetMapping(value = "/services", produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ public ResponseEntity<?> getServices() {
+ LOGGER.info("Running getServices ...");
+ return ResponseEntity.ok().body(assetProvider.getAssetInfo(AssetType.SERVICES));
+ }
+
+ @GetMapping(value = "/services/{csarId}/toscaModel", produces = MediaType.APPLICATION_OCTET_STREAM)
+ public ResponseEntity<byte[]> getServiceCsar(@PathVariable("csarId") final String csarId) {
+ LOGGER.info("Running getServiceCsar for {} ...", csarId);
+ final Optional<byte[]> resource = assetProvider.getAsset(csarId, AssetType.SERVICES);
+ if (resource.isPresent()) {
+ return new ResponseEntity<>(resource.get(), HttpStatus.OK);
+ }
+ LOGGER.error("Unable to find csar: {}", csarId);
+
+ return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+
+
+ @GetMapping(value = "/services/{csarId}/metadata",
+ produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ public ResponseEntity<Metadata> getServiceMetadata(@PathVariable("csarId") final String csarId) {
+ LOGGER.info("Running getServiceMetadata for {} ...", csarId);
+ final Optional<Metadata> resource = assetProvider.getMetadata(csarId, AssetType.SERVICES);
+ if (resource.isPresent()) {
+ return new ResponseEntity<>(resource.get(), HttpStatus.OK);
+ }
+ LOGGER.error("Unable to find metadata for csarId: {}", csarId);
+
+ return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+
+
}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2021 Nordix Foundation.
+ * ================================================================================
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.so.sdcsimulator.models;
+
+import java.io.Serializable;
+import org.springframework.util.ObjectUtils;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ *
+ * @author Waqas Ikram (waqas.ikram@est.tech)
+ *
+ */
+public class Artifact implements Serializable {
+
+ private static final long serialVersionUID = 4106531921550274666L;
+
+ @JsonProperty("artifactName")
+ private String artifactName;
+
+ @JsonProperty("artifactType")
+ private String artifactType;
+
+ @JsonProperty("artifactURL")
+ private String artifactUrl;
+
+ @JsonProperty("artifactDescription")
+ private String artifactDescription;
+
+ @JsonProperty("artifactChecksum")
+ private String artifactChecksum;
+
+ @JsonProperty("artifactUUID")
+ private String artifactUuid;
+
+ @JsonProperty("artifactVersion")
+ private String artifactVersion;
+
+ @JsonProperty("artifactLabel")
+ private String artifactLabel;
+
+ @JsonProperty("artifactGroupType")
+ private String artifactGroupType;
+
+ public String getArtifactName() {
+ return artifactName;
+ }
+
+ public void setArtifactName(final String artifactName) {
+ this.artifactName = artifactName;
+ }
+
+ public Artifact artifactName(final String artifactName) {
+ this.artifactName = artifactName;
+ return this;
+ }
+
+ public String getArtifactType() {
+ return artifactType;
+ }
+
+ public void setArtifactType(final String artifactType) {
+ this.artifactType = artifactType;
+ }
+
+ public Artifact artifactType(final String artifactType) {
+ this.artifactType = artifactType;
+ return this;
+ }
+
+ public String getArtifactUrl() {
+ return artifactUrl;
+ }
+
+ public void setArtifactUrl(final String artifactUrl) {
+ this.artifactUrl = artifactUrl;
+ }
+
+ public Artifact artifactUrl(final String artifactURL) {
+ this.artifactUrl = artifactURL;
+ return this;
+ }
+
+ public String getArtifactDescription() {
+ return artifactDescription;
+ }
+
+ public void setArtifactDescription(final String artifactDescription) {
+ this.artifactDescription = artifactDescription;
+ }
+
+ public Artifact artifactDescription(final String artifactDescription) {
+ this.artifactDescription = artifactDescription;
+ return this;
+ }
+
+ public String getArtifactChecksum() {
+ return artifactChecksum;
+ }
+
+ public void setArtifactChecksum(final String artifactChecksum) {
+ this.artifactChecksum = artifactChecksum;
+ }
+
+ public Artifact artifactChecksum(final String artifactChecksum) {
+ this.artifactChecksum = artifactChecksum;
+ return this;
+ }
+
+ public String getArtifactUuid() {
+ return artifactUuid;
+ }
+
+ public void setArtifactUuid(final String artifactUuid) {
+ this.artifactUuid = artifactUuid;
+ }
+
+ public Artifact artifactUuid(final String artifactUuid) {
+ this.artifactUuid = artifactUuid;
+ return this;
+ }
+
+ public String getArtifactVersion() {
+ return artifactVersion;
+ }
+
+ public void setArtifactVersion(final String artifactVersion) {
+ this.artifactVersion = artifactVersion;
+ }
+
+ public Artifact artifactVersion(final String artifactVersion) {
+ this.artifactVersion = artifactVersion;
+ return this;
+ }
+
+ public String getArtifactLabel() {
+ return artifactLabel;
+ }
+
+ public void setArtifactLabel(final String artifactLabel) {
+ this.artifactLabel = artifactLabel;
+ }
+
+ public Artifact artifactLabel(final String artifactLabel) {
+ this.artifactLabel = artifactLabel;
+ return this;
+ }
+
+ public String getArtifactGroupType() {
+ return artifactGroupType;
+ }
+
+ public void setArtifactGroupType(final String artifactGroupType) {
+ this.artifactGroupType = artifactGroupType;
+ }
+
+ public Artifact artifactGroupType(final String artifactGroupType) {
+ this.artifactGroupType = artifactGroupType;
+ return this;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((artifactChecksum == null) ? 0 : artifactChecksum.hashCode());
+ result = prime * result + ((artifactDescription == null) ? 0 : artifactDescription.hashCode());
+ result = prime * result + ((artifactGroupType == null) ? 0 : artifactGroupType.hashCode());
+ result = prime * result + ((artifactLabel == null) ? 0 : artifactLabel.hashCode());
+ result = prime * result + ((artifactName == null) ? 0 : artifactName.hashCode());
+ result = prime * result + ((artifactType == null) ? 0 : artifactType.hashCode());
+ result = prime * result + ((artifactUrl == null) ? 0 : artifactUrl.hashCode());
+ result = prime * result + ((artifactUuid == null) ? 0 : artifactUuid.hashCode());
+ result = prime * result + ((artifactVersion == null) ? 0 : artifactVersion.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(final Object obj) {
+ if (obj instanceof AssetInfo) {
+ final Artifact other = (Artifact) obj;
+ return ObjectUtils.nullSafeEquals(artifactChecksum, other.artifactChecksum)
+ && ObjectUtils.nullSafeEquals(artifactDescription, other.artifactDescription)
+ && ObjectUtils.nullSafeEquals(artifactGroupType, other.artifactGroupType)
+ && ObjectUtils.nullSafeEquals(artifactLabel, other.artifactLabel)
+ && ObjectUtils.nullSafeEquals(artifactGroupType, other.artifactGroupType)
+ && ObjectUtils.nullSafeEquals(artifactName, other.artifactName)
+ && ObjectUtils.nullSafeEquals(artifactType, other.artifactType)
+ && ObjectUtils.nullSafeEquals(artifactUrl, other.artifactUrl)
+ && ObjectUtils.nullSafeEquals(artifactUuid, other.artifactUuid)
+ && ObjectUtils.nullSafeEquals(artifactVersion, other.artifactVersion);
+
+
+ }
+ return false;
+
+ }
+
+ @Override
+ public String toString() {
+ final StringBuilder sb = new StringBuilder();
+ sb.append("class Artifact {\n");
+ sb.append(" artifactName: ").append(artifactName).append("\n");
+ sb.append(" artifactType: ").append(artifactType).append("\n");
+ sb.append(" artifactURL: ").append(artifactUrl).append("\n");
+ sb.append(" artifactDescription: ").append(artifactDescription).append("\n");
+ sb.append(" artifactChecksum: ").append(artifactChecksum).append("\n");
+ sb.append(" artifactUUID: ").append(artifactUuid).append("\n");
+ sb.append(" artifactVersion: ").append(artifactVersion).append("\n");
+ sb.append(" artifactLabel: ").append(artifactLabel).append("\n");
+ sb.append(" artifactGroupType: ").append(artifactGroupType).append("\n");
+
+ sb.append("}");
+ return sb.toString();
+
+ }
+}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2021 Nordix Foundation.
+ * ================================================================================
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.so.sdcsimulator.models;
+
+import java.io.Serializable;
+import org.springframework.util.ObjectUtils;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * @author Waqas Ikram (waqas.ikram@est.tech)
+ *
+ */
+public class AssetInfo implements Serializable {
+
+ private static final long serialVersionUID = 3967660000071162759L;
+
+ @JsonProperty("uuid")
+ private String uuid;
+
+ @JsonProperty("invariantUUID")
+ private String invariantUuid;
+
+ @JsonProperty("name")
+ private String name;
+
+ @JsonProperty("version")
+ private String version;
+
+ @JsonProperty("toscaModelURL")
+ private String toscaModelUrl;
+
+ @JsonProperty("category")
+ private String category;
+
+ @JsonProperty("resourceType")
+ private String resourceType;
+
+ @JsonProperty("lifecycleState")
+ private String lifecycleState;
+
+ @JsonProperty("lastUpdaterUserId")
+ private String lastUpdaterUserId;
+
+ @JsonProperty("toscaResourceName")
+ private String toscaResourceName;
+
+ public String getUuid() {
+ return uuid;
+ }
+
+ public void setUuid(final String uuid) {
+ this.uuid = uuid;
+ }
+
+ public AssetInfo uuid(final String uuid) {
+ this.uuid = uuid;
+ return this;
+ }
+
+ public String getInvariantUuid() {
+ return invariantUuid;
+ }
+
+ public void setInvariantUuid(final String invariantUuid) {
+ this.invariantUuid = invariantUuid;
+ }
+
+ public AssetInfo invariantUuid(final String invariantUuid) {
+ this.invariantUuid = invariantUuid;
+ return this;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(final String name) {
+ this.name = name;
+ }
+
+ public AssetInfo name(final String name) {
+ this.name = name;
+ return this;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(final String version) {
+ this.version = version;
+ }
+
+ public AssetInfo version(final String version) {
+ this.version = version;
+ return this;
+ }
+
+ public String getToscaModelUrl() {
+ return toscaModelUrl;
+ }
+
+ public void setToscaModelUrl(final String toscaModelUrl) {
+ this.toscaModelUrl = toscaModelUrl;
+ }
+
+ public AssetInfo toscaModelUrl(final String toscaModelUrl) {
+ this.toscaModelUrl = toscaModelUrl;
+ return this;
+ }
+
+ public String getCategory() {
+ return category;
+ }
+
+ public void setCategory(final String category) {
+ this.category = category;
+ }
+
+ public AssetInfo category(final String category) {
+ this.category = category;
+ return this;
+ }
+
+ public String getResourceType() {
+ return resourceType;
+ }
+
+ public void setResourceType(final String resourceType) {
+ this.resourceType = resourceType;
+ }
+
+ public AssetInfo resourceType(final String resourceType) {
+ this.resourceType = resourceType;
+ return this;
+ }
+
+ public String getLifecycleState() {
+ return lifecycleState;
+ }
+
+ public void setLifecycleState(final String lifecycleState) {
+ this.lifecycleState = lifecycleState;
+ }
+
+ public AssetInfo lifecycleState(final String lifecycleState) {
+ this.lifecycleState = lifecycleState;
+ return this;
+ }
+
+ public String getLastUpdaterUserId() {
+ return lastUpdaterUserId;
+ }
+
+ public void setLastUpdaterUserId(final String lastUpdaterUserId) {
+ this.lastUpdaterUserId = lastUpdaterUserId;
+ }
+
+ public AssetInfo lastUpdaterUserId(final String lastUpdaterUserId) {
+ this.lastUpdaterUserId = lastUpdaterUserId;
+ return this;
+ }
+
+ public String getToscaResourceName() {
+ return toscaResourceName;
+ }
+
+ public void setToscaResourceName(final String toscaResourceName) {
+ this.toscaResourceName = toscaResourceName;
+ }
+
+ public AssetInfo toscaResourceName(final String toscaResourceName) {
+ this.toscaResourceName = toscaResourceName;
+ return this;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((category == null) ? 0 : category.hashCode());
+ result = prime * result + ((invariantUuid == null) ? 0 : invariantUuid.hashCode());
+ result = prime * result + ((lastUpdaterUserId == null) ? 0 : lastUpdaterUserId.hashCode());
+ result = prime * result + ((lifecycleState == null) ? 0 : lifecycleState.hashCode());
+ result = prime * result + ((name == null) ? 0 : name.hashCode());
+ result = prime * result + ((resourceType == null) ? 0 : resourceType.hashCode());
+ result = prime * result + ((toscaModelUrl == null) ? 0 : toscaModelUrl.hashCode());
+ result = prime * result + ((uuid == null) ? 0 : uuid.hashCode());
+ result = prime * result + ((version == null) ? 0 : version.hashCode());
+
+ return result;
+ }
+
+ @Override
+ public boolean equals(final Object obj) {
+ if (obj instanceof AssetInfo) {
+ final AssetInfo other = (AssetInfo) obj;
+ return ObjectUtils.nullSafeEquals(category, other.category)
+ && ObjectUtils.nullSafeEquals(invariantUuid, other.invariantUuid)
+ && ObjectUtils.nullSafeEquals(lastUpdaterUserId, other.lastUpdaterUserId)
+ && ObjectUtils.nullSafeEquals(lifecycleState, other.lifecycleState)
+ && ObjectUtils.nullSafeEquals(name, other.name)
+ && ObjectUtils.nullSafeEquals(resourceType, other.resourceType)
+ && ObjectUtils.nullSafeEquals(toscaModelUrl, other.toscaModelUrl)
+ && ObjectUtils.nullSafeEquals(uuid, other.uuid)
+ && ObjectUtils.nullSafeEquals(version, other.version);
+
+ }
+ return false;
+ }
+
+ @Override
+ public String toString() {
+ final StringBuilder sb = new StringBuilder();
+ sb.append("class ");
+ sb.append(this.getClass().getName());
+ sb.append(" {\n");
+ sb.append(" uuid: ").append(uuid).append("\n");
+ sb.append(" invariantUuid: ").append(invariantUuid).append("\n");
+ sb.append(" name: ").append(name).append("\n");
+ sb.append(" version: ").append(version).append("\n");
+ sb.append(" toscaModelUrl: ").append(toscaModelUrl).append("\n");
+ sb.append(" category: ").append(category).append("\n");
+ sb.append(" lifecycleState: ").append(lifecycleState).append("\n");
+ sb.append(" lastUpdaterUserId: ").append(lastUpdaterUserId).append("\n");
+
+ sb.append("}");
+ return sb.toString();
+ }
+
+}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2021 Nordix Foundation.
+ * ================================================================================
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.so.sdcsimulator.models;
+
+import static org.onap.so.sdcsimulator.utils.Constants.CATALOG_URL;
+import static org.onap.so.sdcsimulator.utils.Constants.FORWARD_SLASH;
+import java.io.File;
+import java.io.IOException;
+import org.springframework.core.io.Resource;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+/**
+ *
+ * @author Waqas Ikram (waqas.ikram@est.tech)
+ *
+ */
+public enum AssetType {
+
+ RESOURCES {
+ @Override
+ public AssetInfo getAssetInfo(final Resource resource) throws IOException {
+ return OBJ_MAPPER.readValue(resource.getInputStream(), ResourceAssetInfo.class);
+ }
+
+ @Override
+ public AssetInfo getAssetInfo(final File file) throws IOException {
+ return OBJ_MAPPER.readValue(file, ResourceAssetInfo.class);
+ }
+
+ @Override
+ public Metadata getMetadata(final Resource resource) throws IOException {
+ return OBJ_MAPPER.readValue(resource.getInputStream(), ResourceMetadata.class);
+ }
+
+ @Override
+ public Metadata getMetadata(final File file) throws IOException {
+ return OBJ_MAPPER.readValue(file, ResourceMetadata.class);
+ }
+
+ },
+ SERVICES {
+ @Override
+ public AssetInfo getAssetInfo(final Resource resource) throws IOException {
+ return OBJ_MAPPER.readValue(resource.getInputStream(), ServiceAssetInfo.class);
+ }
+
+ @Override
+ public AssetInfo getAssetInfo(final File file) throws IOException {
+ return OBJ_MAPPER.readValue(file, ServiceAssetInfo.class);
+ }
+
+ @Override
+ public Metadata getMetadata(final Resource resource) throws IOException {
+ return OBJ_MAPPER.readValue(resource.getInputStream(), ServiceMetadata.class);
+ }
+
+ @Override
+ public Metadata getMetadata(final File file) throws IOException {
+ return OBJ_MAPPER.readValue(file, ServiceMetadata.class);
+ }
+
+ };
+
+ private static final ObjectMapper OBJ_MAPPER =
+ new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+
+
+ public abstract AssetInfo getAssetInfo(final Resource resource) throws IOException;
+
+ public abstract AssetInfo getAssetInfo(final File file) throws IOException;
+
+ public abstract Metadata getMetadata(final Resource resource) throws IOException;
+
+ public abstract Metadata getMetadata(final File file) throws IOException;
+
+ public String getToscaModelUrl(final String filename) {
+ return CATALOG_URL + FORWARD_SLASH + this.toString().toLowerCase() + FORWARD_SLASH + filename + "/toscaModel";
+ }
+
+ public AssetInfo getDefaultAssetInfo(final String filename) {
+ AssetInfo defaultValue = null;
+
+ if (this.equals(RESOURCES)) {
+ defaultValue = new ResourceAssetInfo().subCategory("Network Service");
+ } else if (this.equals(SERVICES)) {
+ defaultValue = new ServiceAssetInfo().distributionStatus("DISTRIBUTED");
+ } else {
+ defaultValue = new AssetInfo();
+ }
+
+ return defaultValue.uuid(filename).invariantUuid(filename).name(filename).version("1.0")
+ .toscaModelUrl(getToscaModelUrl(filename)).category("Generic").lifecycleState("CERTIFIED")
+ .lastUpdaterUserId("SDC_SIMULATOR");
+ }
+
+}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2021 Nordix Foundation.
+ * ================================================================================
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.so.sdcsimulator.models;
+
+import java.util.HashSet;
+import java.util.Set;
+import org.springframework.util.ObjectUtils;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ *
+ * @author Waqas Ikram (waqas.ikram@est.tech)
+ *
+ */
+public class Metadata extends AssetInfo {
+
+ private static final long serialVersionUID = 2754071491333890698L;
+
+ @JsonProperty("resources")
+ private Set<Resource> resources = new HashSet<>();
+
+ @JsonProperty("artifacts")
+ private Set<Artifact> artifacts = new HashSet<>();
+
+
+ public Set<Resource> getResources() {
+ return resources;
+ }
+
+ public void setResources(final Set<Resource> resources) {
+ this.resources = resources;
+ }
+
+ public Metadata resources(final Set<Resource> resources) {
+ this.resources = resources;
+ return this;
+ }
+
+ public Set<Artifact> getArtifacts() {
+ return artifacts;
+ }
+
+ public void setArtifacts(final Set<Artifact> artifacts) {
+ this.artifacts = artifacts;
+ }
+
+ public Metadata artifacts(Set<Artifact> artifacts) {
+ this.artifacts = artifacts;
+ return this;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + super.hashCode();
+ result = prime * result + ((resources == null) ? 0 : resources.hashCode());
+ result = prime * result + ((artifacts == null) ? 0 : artifacts.hashCode());
+
+ return result;
+ }
+
+ @Override
+ public boolean equals(final Object obj) {
+ if (obj instanceof Metadata) {
+ final Metadata other = (Metadata) obj;
+ return super.equals(obj) && ObjectUtils.nullSafeEquals(resources, other.resources)
+ && ObjectUtils.nullSafeEquals(artifacts, other.artifacts);
+
+ }
+ return false;
+ }
+
+ @Override
+ public String toString() {
+ final StringBuilder sb = new StringBuilder();
+ sb.append(super.toString());
+ sb.deleteCharAt(sb.length() - 1);
+ sb.append(" resources: ").append(resources).append("\n");
+ sb.append(" artifacts: ").append(artifacts).append("\n");
+
+ sb.append("}");
+ return sb.toString();
+ }
+
+
+}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2021 Nordix Foundation.
+ * ================================================================================
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.so.sdcsimulator.models;
+
+import java.io.Serializable;
+import java.util.HashSet;
+import java.util.Set;
+import org.springframework.util.ObjectUtils;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ *
+ * @author Waqas Ikram (waqas.ikram@est.tech)
+ *
+ */
+public class Resource implements Serializable {
+
+ private static final long serialVersionUID = -8014206400770867160L;
+
+ @JsonProperty("resourceInstanceName")
+ private String resourceInstanceName;
+
+ @JsonProperty("resourceName")
+ private String resourceName;
+
+ @JsonProperty("resourceInvariantUUID")
+ private String resourceInvariantUuid;
+
+ @JsonProperty("resourceVersion")
+ private String resourceVersion;
+
+ @JsonProperty("resoucreType")
+ private String resourceType;
+
+ @JsonProperty("resourceUUID")
+ private String resourceUuid;
+
+ @JsonProperty("artifacts")
+ private Set<Artifact> artifacts = new HashSet<>();
+
+ public String getResourceInstanceName() {
+ return resourceInstanceName;
+ }
+
+ public void setResourceInstanceName(final String resourceInstanceName) {
+ this.resourceInstanceName = resourceInstanceName;
+ }
+
+ public Resource resourceInstanceName(final String resourceInstanceName) {
+ this.resourceInstanceName = resourceInstanceName;
+ return this;
+ }
+
+ public String getResourceName() {
+ return resourceName;
+ }
+
+ public void setResourceName(final String resourceName) {
+ this.resourceName = resourceName;
+ }
+
+ public Resource resourceName(final String resourceName) {
+ this.resourceName = resourceName;
+ return this;
+ }
+
+ public String getResourceInvariantUuid() {
+ return resourceInvariantUuid;
+ }
+
+ public void setResourceInvariantUuid(final String resourceInvariantUuid) {
+ this.resourceInvariantUuid = resourceInvariantUuid;
+ }
+
+ public Resource resourceInvariantUuid(final String resourceInvariantUuid) {
+ this.resourceInvariantUuid = resourceInvariantUuid;
+ return this;
+ }
+
+ public String getResourceVersion() {
+ return resourceVersion;
+ }
+
+ public void setResourceVersion(final String resourceVersion) {
+ this.resourceVersion = resourceVersion;
+ }
+
+ public Resource resourceVersion(final String resourceVersion) {
+ this.resourceVersion = resourceVersion;
+ return this;
+ }
+
+ public String getResourceType() {
+ return resourceType;
+ }
+
+ public void setResourceType(final String resourceType) {
+ this.resourceType = resourceType;
+ }
+
+ public Resource resourceType(final String resourceType) {
+ this.resourceType = resourceType;
+ return this;
+ }
+
+ public String getResourceUuid() {
+ return resourceUuid;
+ }
+
+ public void setResourceUuid(final String resourceUuid) {
+ this.resourceUuid = resourceUuid;
+ }
+
+ public Resource resourceUUID(final String resourceUuid) {
+ this.resourceUuid = resourceUuid;
+ return this;
+ }
+
+ public Set<Artifact> getArtifacts() {
+ return artifacts;
+ }
+
+ public void setArtifacts(final Set<Artifact> artifacts) {
+ this.artifacts = artifacts;
+ }
+
+ public Resource artifacts(final Set<Artifact> artifacts) {
+ this.artifacts = artifacts;
+ return this;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((artifacts == null) ? 0 : artifacts.hashCode());
+ result = prime * result + ((resourceType == null) ? 0 : resourceType.hashCode());
+ result = prime * result + ((resourceInstanceName == null) ? 0 : resourceInstanceName.hashCode());
+ result = prime * result + ((resourceInvariantUuid == null) ? 0 : resourceInvariantUuid.hashCode());
+ result = prime * result + ((resourceName == null) ? 0 : resourceName.hashCode());
+ result = prime * result + ((resourceUuid == null) ? 0 : resourceUuid.hashCode());
+ result = prime * result + ((resourceVersion == null) ? 0 : resourceVersion.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(final Object obj) {
+ if (obj instanceof Resource) {
+ final Resource other = (Resource) obj;
+ return ObjectUtils.nullSafeEquals(resourceInstanceName, other.resourceInstanceName)
+ && ObjectUtils.nullSafeEquals(resourceName, other.resourceName)
+ && ObjectUtils.nullSafeEquals(resourceInvariantUuid, other.resourceInvariantUuid)
+ && ObjectUtils.nullSafeEquals(resourceVersion, other.resourceVersion)
+ && ObjectUtils.nullSafeEquals(resourceType, other.resourceType)
+ && ObjectUtils.nullSafeEquals(resourceUuid, other.resourceUuid)
+ && ObjectUtils.nullSafeEquals(artifacts, other.artifacts);
+ }
+ return false;
+
+ }
+
+ @Override
+ public String toString() {
+ final StringBuilder sb = new StringBuilder();
+ sb.append("class Resource {\n");
+ sb.append(" resourceInstanceName: ").append(resourceInstanceName).append("\n");
+ sb.append(" resourceName: ").append(resourceName).append("\n");
+ sb.append(" resourceInvariantUuid: ").append(resourceInvariantUuid).append("\n");
+ sb.append(" resourceVersion: ").append(resourceVersion).append("\n");
+ sb.append(" resourceType: ").append(resourceType).append("\n");
+ sb.append(" resourceUuid: ").append(resourceUuid).append("\n");
+ sb.append(" artifacts: ").append(artifacts).append("\n");
+
+ sb.append("}");
+ return sb.toString();
+
+ }
+
+
+
+}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2021 Nordix Foundation.
+ * ================================================================================
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.so.sdcsimulator.models;
+
+import org.springframework.util.ObjectUtils;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ *
+ * @author Waqas Ikram (waqas.ikram@est.tech)
+ *
+ */
+public class ResourceAssetInfo extends AssetInfo {
+
+ private static final long serialVersionUID = -6812049917047990700L;
+
+ @JsonProperty("subCategory")
+ private String subCategory;
+
+ public String getSubCategory() {
+ return subCategory;
+ }
+
+ public void setSubCategory(final String subCategory) {
+ this.subCategory = subCategory;
+ }
+
+ public ResourceAssetInfo subCategory(final String subCategory) {
+ this.subCategory = subCategory;
+ return this;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + super.hashCode();
+ result = prime * result + ((subCategory == null) ? 0 : subCategory.hashCode());
+
+ return result;
+ }
+
+ @Override
+ public boolean equals(final Object obj) {
+ if (obj instanceof ResourceAssetInfo) {
+ final ResourceAssetInfo other = (ResourceAssetInfo) obj;
+ return super.equals(obj) && ObjectUtils.nullSafeEquals(subCategory, other.subCategory);
+
+ }
+ return false;
+ }
+
+ @Override
+ public String toString() {
+ final StringBuilder sb = new StringBuilder();
+ sb.append(super.toString());
+ sb.deleteCharAt(sb.length() - 1);
+ sb.append(" subCategory: ").append(subCategory).append("\n");
+
+ sb.append("}");
+ return sb.toString();
+ }
+
+}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2021 Nordix Foundation.
+ * ================================================================================
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.so.sdcsimulator.models;
+
+import java.io.Serializable;
+import org.springframework.util.ObjectUtils;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ *
+ * @author Waqas Ikram (waqas.ikram@est.tech)
+ *
+ */
+public class ResourceMetadata extends Metadata implements Serializable {
+
+ private static final long serialVersionUID = -6812049917047990700L;
+
+ @JsonProperty("subCategory")
+ private String subCategory;
+
+ public String getSubCategory() {
+ return subCategory;
+ }
+
+ public void setSubCategory(final String subCategory) {
+ this.subCategory = subCategory;
+ }
+
+ public ResourceMetadata subCategory(final String subCategory) {
+ this.subCategory = subCategory;
+ return this;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + super.hashCode();
+ result = prime * result + ((subCategory == null) ? 0 : subCategory.hashCode());
+
+ return result;
+ }
+
+ @Override
+ public boolean equals(final Object obj) {
+ if (obj instanceof ResourceMetadata) {
+ final ResourceMetadata other = (ResourceMetadata) obj;
+ return super.equals(obj) && ObjectUtils.nullSafeEquals(subCategory, other.subCategory);
+
+ }
+ return false;
+ }
+
+ @Override
+ public String toString() {
+ final StringBuilder sb = new StringBuilder();
+ sb.append(super.toString());
+ sb.deleteCharAt(sb.length() - 1);
+ sb.append(" subCategory: ").append(subCategory).append("\n");
+
+ sb.append("}");
+ return sb.toString();
+ }
+
+}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2021 Nordix Foundation.
+ * ================================================================================
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.so.sdcsimulator.models;
+
+import org.springframework.util.ObjectUtils;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ *
+ * @author Waqas Ikram (waqas.ikram@est.tech)
+ *
+ */
+public class ServiceAssetInfo extends AssetInfo {
+
+ private static final long serialVersionUID = 1487426510731947767L;
+
+ @JsonProperty("distributionStatus")
+ private String distributionStatus;
+
+ public String getDistributionStatus() {
+ return distributionStatus;
+ }
+
+ public void setDistributionStatus(final String distributionStatus) {
+ this.distributionStatus = distributionStatus;
+ }
+
+ public ServiceAssetInfo distributionStatus(final String distributionStatus) {
+ this.distributionStatus = distributionStatus;
+ return this;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + super.hashCode();
+ result = prime * result + ((distributionStatus == null) ? 0 : distributionStatus.hashCode());
+
+ return result;
+ }
+
+ @Override
+ public boolean equals(final Object obj) {
+ if (obj instanceof ServiceAssetInfo) {
+ final ServiceAssetInfo other = (ServiceAssetInfo) obj;
+ return super.equals(obj) && ObjectUtils.nullSafeEquals(distributionStatus, other.distributionStatus);
+
+ }
+ return false;
+ }
+
+ @Override
+ public String toString() {
+ final StringBuilder sb = new StringBuilder();
+ sb.append(super.toString());
+ sb.deleteCharAt(sb.length() - 1);
+ sb.append(" distributionStatus: ").append(distributionStatus).append("\n");
+
+ sb.append("}");
+ return sb.toString();
+ }
+
+
+}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2021 Nordix Foundation.
+ * ================================================================================
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.so.sdcsimulator.models;
+
+import java.io.Serializable;
+import org.springframework.util.ObjectUtils;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ *
+ * @author Waqas Ikram (waqas.ikram@est.tech)
+ *
+ */
+public class ServiceMetadata extends Metadata implements Serializable {
+
+ private static final long serialVersionUID = -5677805295913361365L;
+ @JsonProperty("distributionStatus")
+ private String distributionStatus;
+
+ public String getDistributionStatus() {
+ return distributionStatus;
+ }
+
+ public void setDistributionStatus(final String distributionStatus) {
+ this.distributionStatus = distributionStatus;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + super.hashCode();
+ result = prime * result + ((distributionStatus == null) ? 0 : distributionStatus.hashCode());
+
+ return result;
+ }
+
+ @Override
+ public boolean equals(final Object obj) {
+ if (obj instanceof ServiceMetadata) {
+ final ServiceMetadata other = (ServiceMetadata) obj;
+ return super.equals(obj) && ObjectUtils.nullSafeEquals(distributionStatus, other.distributionStatus);
+
+ }
+ return false;
+ }
+
+ @Override
+ public String toString() {
+ final StringBuilder sb = new StringBuilder();
+ sb.append(super.toString());
+ sb.deleteCharAt(sb.length() - 1);
+ sb.append(" distributionStatus: ").append(distributionStatus).append("\n");
+
+ sb.append("}");
+ return sb.toString();
+ }
+
+}
package org.onap.so.sdcsimulator.providers;
-import java.io.IOException;
-import java.io.InputStream;
import java.util.Optional;
+import java.util.Set;
+import org.onap.so.sdcsimulator.models.AssetInfo;
+import org.onap.so.sdcsimulator.models.AssetType;
+import org.onap.so.sdcsimulator.models.Metadata;
/**
* @author Eoin Hanan (eoin.hanan@est.tech)
+ * @author Waqas Ikram (waqas.ikram@est.tech)
+ *
*/
-public interface ResourceProvider {
+public interface AssetProvider {
- Optional<byte[]> getResource(final String csarId);
+ Optional<byte[]> getAsset(final String csarId, final AssetType assetType);
- Optional<InputStream> getInputStream(final String csarId) throws IOException;
+ Set<AssetInfo> getAssetInfo(final AssetType assetType);
+
+ Optional<Metadata> getMetadata(final String csarId, final AssetType assetType);
}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2019 Nordix Foundation.
+ * ================================================================================
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.sdcsimulator.providers;
+
+import static org.onap.so.sdcsimulator.utils.Constants.DOT_CSAR;
+import static org.onap.so.sdcsimulator.utils.Constants.DOT_JSON;
+import static org.onap.so.sdcsimulator.utils.Constants.FORWARD_SLASH;
+import static org.onap.so.sdcsimulator.utils.Constants.MAIN_RESOURCE_FOLDER;
+import static org.onap.so.sdcsimulator.utils.Constants.WILD_CARD_REGEX;
+import static org.springframework.core.io.support.ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.Set;
+import org.onap.so.sdcsimulator.models.AssetInfo;
+import org.onap.so.sdcsimulator.models.AssetType;
+import org.onap.so.sdcsimulator.models.Metadata;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.ResourcePatternResolver;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StreamUtils;
+
+/**
+ * @author Waqas Ikram (waqas.ikram@est.tech)
+ */
+@Service
+public class AssetProviderImpl implements AssetProvider {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(AssetProvider.class);
+
+ private final String resourceLocation;
+
+ private final ResourcePatternResolver resourcePatternResolver;
+
+ @Autowired
+ public AssetProviderImpl(@Value("${sdc.resource.location:/app/csars/}") final String resourceLocation,
+ final ResourcePatternResolver resourcePatternResolver) {
+ this.resourceLocation = resourceLocation;
+ this.resourcePatternResolver = resourcePatternResolver;
+ }
+
+ @Override
+ public Optional<byte[]> getAsset(final String csarId, final AssetType assetType) {
+ try {
+ final Optional<InputStream> optionalInputStream = getInputStream(csarId, assetType);
+ if (optionalInputStream.isPresent()) {
+ return Optional.of(StreamUtils.copyToByteArray(optionalInputStream.get()));
+ }
+ } catch (final IOException ioException) {
+ LOGGER.warn("Unable to create file stream ...", ioException);
+ }
+
+ return Optional.empty();
+ }
+
+ @Override
+ public Set<AssetInfo> getAssetInfo(final AssetType assetType) {
+ final Set<AssetInfo> result = new HashSet<>();
+
+ final Path dir = Paths.get(resourceLocation).resolve(assetType.toString());
+ if (Files.exists(dir)) {
+ try (final DirectoryStream<Path> stream = Files.newDirectoryStream(dir, WILD_CARD_REGEX + DOT_CSAR)) {
+ for (final Path entry : stream) {
+ final String filename = getFilenameWithoutExtension(entry);
+ result.add(getAssetInfo(assetType, filename, entry));
+ }
+ } catch (final IOException ioException) {
+ LOGGER.error("Unable to find assetInfo on filesystem", ioException);
+ }
+ }
+
+ try {
+ final String classPathdir = MAIN_RESOURCE_FOLDER + assetType.toString() + FORWARD_SLASH;
+ final String csarFileLocationPattern = CLASSPATH_ALL_URL_PREFIX + classPathdir + WILD_CARD_REGEX + DOT_CSAR;
+ final Resource[] resources = resourcePatternResolver.getResources(csarFileLocationPattern);
+ if (resources != null) {
+
+ for (final Resource resource : resources) {
+ final String filename = getFilenameWithoutExtension(resource.getFilename());
+ result.add(getAssetInfo(assetType, filename, resource));
+ }
+ }
+
+ } catch (final IOException ioException) {
+ LOGGER.error("Unable to find assetInfo in classpath", ioException);
+ }
+
+ return result;
+ }
+
+ @Override
+ public Optional<Metadata> getMetadata(final String csarId, final AssetType assetType) {
+ final Path dir = Paths.get(resourceLocation).resolve(assetType.toString());
+ final Path metadataFilePath = dir.resolve(csarId + DOT_JSON);
+ try {
+ if (Files.exists(metadataFilePath)) {
+ LOGGER.info("Found metadata file on file system using path: {}", metadataFilePath);
+
+ return Optional.of(assetType.getMetadata(metadataFilePath.toFile()));
+
+ }
+ } catch (final IOException ioException) {
+ LOGGER.error("Unable to find metadata file on filesystem", ioException);
+ }
+
+
+ try {
+ final String path = MAIN_RESOURCE_FOLDER + assetType.toString() + FORWARD_SLASH + csarId + DOT_JSON;
+ LOGGER.warn("Couldn't find metadata file on file system '{}', will search it in classpath", path);
+ final ClassPathResource classPathResource = getClassPathResource(path);
+ if (classPathResource.exists()) {
+ LOGGER.info("Found metadata file in classpath using path: {}", path);
+ return Optional.of(assetType.getMetadata(classPathResource));
+ }
+ } catch (final IOException ioException) {
+ LOGGER.error("Unable to find metadata file in classpath", ioException);
+ }
+ LOGGER.error("Couldn't find metadata file in classpath ....");
+ return Optional.empty();
+ }
+
+ private AssetInfo getAssetInfo(final AssetType assetType, final String filename, final Resource resource)
+ throws IOException {
+ final Resource jsonResource = resource.createRelative(filename + DOT_JSON);
+
+ if (jsonResource != null && jsonResource.exists()) {
+ final AssetInfo assetInfo = assetType.getAssetInfo(jsonResource);
+ assetInfo.setUuid(filename);
+ assetInfo.setToscaModelUrl(assetType.getToscaModelUrl(filename));
+ LOGGER.info("Found AssetInfo file in classpath: {}", assetInfo);
+ return assetInfo;
+
+ }
+
+ final AssetInfo assetInfo = assetType.getDefaultAssetInfo(filename);
+ LOGGER.info("Returning AssetInfo: {}", assetInfo);
+ return assetInfo;
+
+ }
+
+ private AssetInfo getAssetInfo(final AssetType assetType, final String filename, final Path entry)
+ throws IOException {
+ final Path assetJsonFilePath = entry.getParent().resolve(filename + DOT_JSON);
+ if (Files.exists(assetJsonFilePath)) {
+ final AssetInfo assetInfo = assetType.getAssetInfo(assetJsonFilePath.toFile());
+ assetInfo.setUuid(filename);
+ assetInfo.setToscaModelUrl(assetType.getToscaModelUrl(filename));
+ LOGGER.info("Found AssetInfo file on file system: {}", assetInfo);
+ return assetInfo;
+
+ }
+ final AssetInfo assetInfo = assetType.getDefaultAssetInfo(filename);
+ LOGGER.info("Returning AssetInfo: {}", assetInfo);
+ return assetInfo;
+ }
+
+ private String getFilenameWithoutExtension(final String filename) {
+ return filename.substring(0, filename.lastIndexOf('.'));
+ }
+
+ private String getFilenameWithoutExtension(final Path file) {
+ return getFilenameWithoutExtension(file.getFileName().toString());
+ }
+
+ private Optional<InputStream> getInputStream(final String csarId, final AssetType assetType) throws IOException {
+ final Path filePath = Paths.get(resourceLocation, assetType.toString(), csarId + DOT_CSAR);
+ if (Files.exists(filePath)) {
+ LOGGER.info("Found csar on file system using path: {}", filePath);
+ return Optional.of(Files.newInputStream(filePath));
+ }
+ LOGGER.warn("Couldn't find file on file system '{}', will search it in classpath", filePath);
+
+ final String path = MAIN_RESOURCE_FOLDER + assetType.toString() + FORWARD_SLASH + csarId + DOT_CSAR;
+ final ClassPathResource classPathResource = getClassPathResource(path);
+ if (classPathResource.exists()) {
+ LOGGER.info("Found csar in classpath using path: {}", path);
+ return Optional.of(classPathResource.getInputStream());
+ }
+
+ LOGGER.error("Couldn't find csar in classpath ....");
+ return Optional.empty();
+ }
+
+ private ClassPathResource getClassPathResource(final String path) {
+ return new ClassPathResource(path, this.getClass());
+ }
+
+}
+++ /dev/null
-/*-
- * ============LICENSE_START=======================================================
- * Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.sdcsimulator.providers;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Optional;
-import org.onap.so.sdcsimulator.utils.Constants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StreamUtils;
-
-/**
- * @author Eoin Hanan (eoin.hanan@est.tech)
- */
-@Service
-public class ResourceProviderImpl implements ResourceProvider {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(ResourceProvider.class);
-
- private final String resourceLocation;
-
- public ResourceProviderImpl(@Value("${sdc.resource.location:/app/csars/}") final String resourceLocation) {
- this.resourceLocation = resourceLocation;
- }
-
- @Override
- public Optional<byte[]> getResource(final String csarId) {
- try {
- final Optional<InputStream> optionalInputStream = getInputStream(csarId);
- if (optionalInputStream.isPresent()) {
- return Optional.of(StreamUtils.copyToByteArray(optionalInputStream.get()));
- }
- } catch (final IOException ioException) {
- LOGGER.warn("Unable to create file stream ...", ioException);
- }
-
- return Optional.empty();
- }
-
- @Override
- public Optional<InputStream> getInputStream(final String csarId) throws IOException {
- final Path filePath = Paths.get(resourceLocation, csarId + ".csar");
- if (Files.exists(filePath)) {
- return Optional.of(Files.newInputStream(filePath));
- }
-
- LOGGER.info("Couldn't find file on file system '{}', will return default csar", filePath);
- final ClassPathResource classPathResource = new ClassPathResource(getDefaultCsarPath(), this.getClass());
- if (classPathResource.exists()) {
- return Optional.of(classPathResource.getInputStream());
- }
-
- LOGGER.error("Couldn't find default csar in classpath ....");
- return Optional.empty();
- }
-
- /*
- * Used in test
- */
- String getDefaultCsarPath() {
- return Constants.DEFAULT_CSAR_PATH;
- }
-}
\ No newline at end of file
*/
public class Constants {
+ public static final String MAIN_RESOURCE_FOLDER = "/csar/";
+
public static final String BASE_URL = "/sdc/v1";
public static final String CATALOG_URL = BASE_URL + "/catalog";
public static final String HEALTHY = "healthy";
- public static final String DEFAULT_CSAR_NAME = "default_csar_file";
-
public static final String DOT = ".";
+ public static final String WILD_CARD_REGEX = "*";
+
public static final String DOT_CSAR = DOT + "csar";
- public static final String DEFAULT_CSAR_NAME_WITH_EXT = DEFAULT_CSAR_NAME + DOT_CSAR;
+ public static final String DOT_JSON = DOT + "json";
- public static final String DEFAULT_CSAR_PATH = "/csar/" + DEFAULT_CSAR_NAME_WITH_EXT;
+ public static final String FORWARD_SLASH = "/";
private Constants() {}
}
ssl-enable: false
spring:
security:
- username: mso
- #password: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
- password: $2a$04$Lcu/DWdyXsl/a3A0iqHTfOX1.zHQ3DlQS/nOPfafT.9pWbeEqlF7W
- role: mso
\ No newline at end of file
+ users:
+ - username: mso
+ #password: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+ password: $2a$04$Lcu/DWdyXsl/a3A0iqHTfOX1.zHQ3DlQS/nOPfafT.9pWbeEqlF7W
+ role: mso
+ - username: modeling
+ #password: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+ password: $2a$04$Lcu/DWdyXsl/a3A0iqHTfOX1.zHQ3DlQS/nOPfafT.9pWbeEqlF7W
+ role: mso
\ No newline at end of file
--- /dev/null
+{
+ "uuid": "73522444-e8e9-49c1-be29-d355800aa349",
+ "invariantUUID": "037f7b1b-5c62-44c1-b806-f92fe8970171",
+ "name": "EtsiVnfCSIT3",
+ "version": "1.0",
+ "toscaModelURL": "/sdc/v1/catalog/resources/73522444-e8e9-49c1-be29-d355800aa349/toscaModel",
+ "category": "Generic",
+ "subCategory": "Network Service",
+ "resourceType": "VF",
+ "lifecycleState": "CERTIFIED",
+ "lastUpdaterUserId": "cs0008",
+ "lastUpdaterFullName": "Carlos Santana",
+ "toscaResourceName": "org.openecomp.resource.vf.Etsivnfcsit3",
+ "resources": [
+ {
+ "resourceInstanceName": "Cp_vgw_mux_gw_private_net",
+ "resourceName": "VDU Cp",
+ "resourceInvariantUUID": "3e4b8692-e6b1-44e9-90b1-6c5f1abf469c",
+ "resourceVersion": "1.0",
+ "resoucreType": "CP",
+ "resourceUUID": "72b9cd47-e8b7-4033-bb1a-fa30e45e3233"
+ },
+ {
+ "resourceInstanceName": "Cp_vgw_onap_private",
+ "resourceName": "VDU Cp",
+ "resourceInvariantUUID": "3e4b8692-e6b1-44e9-90b1-6c5f1abf469c",
+ "resourceVersion": "1.0",
+ "resoucreType": "CP",
+ "resourceUUID": "72b9cd47-e8b7-4033-bb1a-fa30e45e3233"
+ },
+ {
+ "resourceInstanceName": "LLU_VNF",
+ "resourceName": "VNF",
+ "resourceInvariantUUID": "a85aa428-cdb6-4e96-b873-0c20bfd22cac",
+ "resourceVersion": "1.0",
+ "resoucreType": "VFC",
+ "resourceUUID": "bbe67a58-6fd6-4849-abdf-f6a73dbdd594"
+ },
+ {
+ "resourceInstanceName": "VDU_vgw_0",
+ "resourceName": "VDU Compute",
+ "resourceInvariantUUID": "d211a1fd-ae0d-4b33-9076-76defafa7adc",
+ "resourceVersion": "1.0",
+ "resoucreType": "VFC",
+ "resourceUUID": "5dcd4cc9-2db5-49aa-a51a-a0eb4124df4c"
+ },
+ {
+ "resourceInstanceName": "VL_mux_gw_private_net",
+ "resourceName": "VnfVirtualLink",
+ "resourceInvariantUUID": "a9351632-8045-4422-bda6-fdbf4c472b2b",
+ "resourceVersion": "1.0",
+ "resoucreType": "VL",
+ "resourceUUID": "22ba6824-e467-4f6a-87df-ccc8bee01fe4"
+ },
+ {
+ "resourceInstanceName": "Cp_vgw_cpe_public",
+ "resourceName": "VDU Cp",
+ "resourceInvariantUUID": "3e4b8692-e6b1-44e9-90b1-6c5f1abf469c",
+ "resourceVersion": "1.0",
+ "resoucreType": "CP",
+ "resourceUUID": "72b9cd47-e8b7-4033-bb1a-fa30e45e3233"
+ },
+ {
+ "resourceInstanceName": "Cp_vgw_public",
+ "resourceName": "VDU Cp",
+ "resourceInvariantUUID": "3e4b8692-e6b1-44e9-90b1-6c5f1abf469c",
+ "resourceVersion": "1.0",
+ "resoucreType": "CP",
+ "resourceUUID": "72b9cd47-e8b7-4033-bb1a-fa30e45e3233"
+ },
+ {
+ "resourceInstanceName": "VL_cpe_public",
+ "resourceName": "VnfVirtualLink",
+ "resourceInvariantUUID": "a9351632-8045-4422-bda6-fdbf4c472b2b",
+ "resourceVersion": "1.0",
+ "resoucreType": "VL",
+ "resourceUUID": "22ba6824-e467-4f6a-87df-ccc8bee01fe4"
+ }
+ ],
+ "artifacts": [
+ {
+ "artifactName": "vf-license-model.xml",
+ "artifactType": "VF_LICENSE",
+ "artifactURL": "/sdc/v1/catalog/resources/73522444-e8e9-49c1-be29-d355800aa349/artifacts/3e964c48-c539-41b6-b504-52905fbe1f93",
+ "artifactDescription": "VF license file",
+ "artifactChecksum": "MDAwOTQ0NWYzNzMzYjJmYjBlODc2ODUyY2MzOTIyMjQ=",
+ "artifactUUID": "3e964c48-c539-41b6-b504-52905fbe1f93",
+ "artifactVersion": "1",
+ "artifactLabel": "vflicense",
+ "artifactGroupType": "DEPLOYMENT"
+ },
+ {
+ "artifactName": "vgw6.csar",
+ "artifactType": "ETSI_PACKAGE",
+ "artifactURL": "/sdc/v1/catalog/resources/73522444-e8e9-49c1-be29-d355800aa349/artifacts/0737049a-204d-4009-932a-57a48119f5eb",
+ "artifactDescription": "Artifact created from csar",
+ "artifactChecksum": "ZjAyYjhmYzJkY2ExZjMyYzk1ZjlmNjk0YzkzNDNhY2Y=",
+ "artifactUUID": "0737049a-204d-4009-932a-57a48119f5eb",
+ "artifactVersion": "1",
+ "artifactLabel": "vgw6csar",
+ "artifactGroupType": "DEPLOYMENT"
+ },
+ {
+ "artifactName": "vendor-license-model.xml",
+ "artifactType": "VENDOR_LICENSE",
+ "artifactURL": "/sdc/v1/catalog/resources/73522444-e8e9-49c1-be29-d355800aa349/artifacts/f17c8eed-cf1f-44cd-a2b3-2caee9c34b17",
+ "artifactDescription": " Vendor license file",
+ "artifactChecksum": "NzY2ZGUzODNkNWEwNjM1MjRiMjNiNDY1ZWNkNWQyOTg=",
+ "artifactUUID": "f17c8eed-cf1f-44cd-a2b3-2caee9c34b17",
+ "artifactVersion": "1",
+ "artifactLabel": "vendorlicense",
+ "artifactGroupType": "DEPLOYMENT"
+ }
+ ],
+ "description": "test"
+}
\ No newline at end of file
--- /dev/null
+{
+ "uuid": "9bb8c882-44a1-4b67-a12c-5a998e18d6ba",
+ "invariantUUID": "388a89d0-3d3d-47f8-8621-32b7b12975d4",
+ "name": "EtsiNsServiceCSIT1",
+ "version": "1.0",
+ "toscaModelURL": "/sdc/v1/catalog/services/9bb8c882-44a1-4b67-a12c-5a998e18d6ba/toscaModel",
+ "category": "ETSI Network Service",
+ "lifecycleState": "CERTIFIED",
+ "lastUpdaterUserId": "cs0008",
+ "distributionStatus": "DISTRIBUTED",
+ "lastUpdaterFullName": "Carlos Santana",
+ "resources": [{
+ "resourceInstanceName": "EtsiVnfCSIT3 0",
+ "resourceName": "EtsiVnfCSIT3",
+ "resourceInvariantUUID": "037f7b1b-5c62-44c1-b806-f92fe8970171",
+ "resourceVersion": "1.0",
+ "resoucreType": "VF",
+ "resourceUUID": "73522444-e8e9-49c1-be29-d355800aa349",
+ "artifacts": [{
+ "artifactName": "vf-license-model.xml",
+ "artifactType": "VF_LICENSE",
+ "artifactURL": "/sdc/v1/catalog/services/9bb8c882-44a1-4b67-a12c-5a998e18d6ba/resourceInstances/etsivnfcsit30/artifacts/3e964c48-c539-41b6-b504-52905fbe1f93",
+ "artifactDescription": "VF license file",
+ "artifactChecksum": "MDAwOTQ0NWYzNzMzYjJmYjBlODc2ODUyY2MzOTIyMjQ=",
+ "artifactUUID": "3e964c48-c539-41b6-b504-52905fbe1f93",
+ "artifactVersion": "1",
+ "artifactLabel": "vflicense",
+ "artifactGroupType": "DEPLOYMENT"
+ }, {
+ "artifactName": "vgw6.csar",
+ "artifactType": "ETSI_PACKAGE",
+ "artifactURL": "/sdc/v1/catalog/services/9bb8c882-44a1-4b67-a12c-5a998e18d6ba/resourceInstances/etsivnfcsit30/artifacts/0737049a-204d-4009-932a-57a48119f5eb",
+ "artifactDescription": "Artifact created from csar",
+ "artifactChecksum": "ZjAyYjhmYzJkY2ExZjMyYzk1ZjlmNjk0YzkzNDNhY2Y=",
+ "artifactUUID": "0737049a-204d-4009-932a-57a48119f5eb",
+ "artifactVersion": "1",
+ "artifactLabel": "vgw6csar",
+ "artifactGroupType": "DEPLOYMENT"
+ }, {
+ "artifactName": "vendor-license-model.xml",
+ "artifactType": "VENDOR_LICENSE",
+ "artifactURL": "/sdc/v1/catalog/services/9bb8c882-44a1-4b67-a12c-5a998e18d6ba/resourceInstances/etsivnfcsit30/artifacts/f17c8eed-cf1f-44cd-a2b3-2caee9c34b17",
+ "artifactDescription": " Vendor license file",
+ "artifactChecksum": "NzY2ZGUzODNkNWEwNjM1MjRiMjNiNDY1ZWNkNWQyOTg=",
+ "artifactUUID": "f17c8eed-cf1f-44cd-a2b3-2caee9c34b17",
+ "artifactVersion": "1",
+ "artifactLabel": "vendorlicense",
+ "artifactGroupType": "DEPLOYMENT"
+ }]
+ }],
+ "artifacts": [{
+ "artifactName": "ns.csar",
+ "artifactType": "OTHER",
+ "artifactURL": "/sdc/v1/catalog/services/9bb8c882-44a1-4b67-a12c-5a998e18d6ba/artifacts/a6b88549-cf1f-4c08-9088-c5e3067db1c9",
+ "artifactDescription": "ns",
+ "artifactChecksum": "ODBmYmU0MDRkZWIxNGVkY2NjODkxMGE4MmZlMTNmOGU=",
+ "artifactUUID": "a6b88549-cf1f-4c08-9088-c5e3067db1c9",
+ "artifactVersion": "1",
+ "artifactLabel": "ns",
+ "artifactGroupType": "DEPLOYMENT"
+ }]
+}
\ No newline at end of file
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.util.Base64;
-import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-import org.onap.so.sdcsimulator.controller.CatalogController;
-import org.onap.so.sdcsimulator.providers.ResourceProvider;
+import org.onap.so.sdcsimulator.models.ResourceAssetInfo;
+import org.onap.so.sdcsimulator.models.ResourceMetadata;
+import org.onap.so.sdcsimulator.models.ServiceAssetInfo;
+import org.onap.so.sdcsimulator.models.ServiceMetadata;
import org.onap.so.sdcsimulator.utils.Constants;
+import org.onap.so.simulator.model.UserCredentials;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.context.annotation.Configuration;
+import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
@Configuration
public class CatalogControllerTest {
+ private static final String SUB_CATEGORY = "Network Service";
+
+ private static final String DISTRIBUTION_STATUS = "DISTRIBUTED";
+
+ private static final String SERVICE_ID = "9bb8c882-44a1-4b67-a12c-5a998e18d6ba";
+
+ private static final String RESOURCE_ID = "73522444-e8e9-49c1-be29-d355800aa349";
+
private static final String PASSWORD = "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U";
@LocalServerPort
@Autowired
private TestRestTemplate restTemplate;
- @Value("${spring.security.username}")
- private String username;
+ @Autowired
+ private UserCredentials userCredentials;
+
+ @Test
+ public void test_getResourceCsar_validCsarId_matchContent() {
+
+ final String url = getBaseUrl() + "/resources/" + RESOURCE_ID + "/toscaModel";
+
+ final ResponseEntity<byte[]> response =
+ restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(getHttpHeaders()), byte[].class);
+
+ assertEquals(HttpStatus.OK, response.getStatusCode());
+ assertTrue(response.hasBody());
+ assertEquals(117247, response.getBody().length);
+
+ }
@Test
- public void test_getCsar_validCsarId_matchContent() {
+ public void test_getServiceCsar_validCsarId_matchContent() {
- final String url = getBaseUrl() + "/resources/" + Constants.DEFAULT_CSAR_NAME + "/toscaModel";
+ final String url = getBaseUrl() + "/services/" + SERVICE_ID + "/toscaModel";
final ResponseEntity<byte[]> response =
restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(getHttpHeaders()), byte[].class);
assertEquals(HttpStatus.OK, response.getStatusCode());
assertTrue(response.hasBody());
- assertEquals(3982, response.getBody().length);
+ assertEquals(147743, response.getBody().length);
+
+ }
+
+ @Test
+ public void test_getResources_validResourcesFromClassPath() {
+
+ final ResponseEntity<Set<ResourceAssetInfo>> response =
+ restTemplate.exchange(getBaseUrl() + "/resources", HttpMethod.GET, new HttpEntity<>(getHttpHeaders()),
+ new ParameterizedTypeReference<Set<ResourceAssetInfo>>() {});
+
+ assertEquals(HttpStatus.OK, response.getStatusCode());
+ assertTrue(response.hasBody());
+ assertEquals(1, response.getBody().size());
+ assertEquals(SUB_CATEGORY, response.getBody().iterator().next().getSubCategory());
+
+ }
+
+ @Test
+ public void test_getServices_validServicesFromClassPath() {
+
+ final ResponseEntity<Set<ServiceAssetInfo>> response =
+ restTemplate.exchange(getBaseUrl() + "/services", HttpMethod.GET, new HttpEntity<>(getHttpHeaders()),
+ new ParameterizedTypeReference<Set<ServiceAssetInfo>>() {});
+
+ assertEquals(HttpStatus.OK, response.getStatusCode());
+ assertTrue(response.hasBody());
+ assertEquals(1, response.getBody().size());
+ assertEquals(DISTRIBUTION_STATUS, response.getBody().iterator().next().getDistributionStatus());
}
@Test
- public void test_getCsar_invalidCsar_internalServerError() {
- final ResourceProvider mockedResourceProvider = Mockito.mock(ResourceProvider.class);
- Mockito.when(mockedResourceProvider.getResource(Mockito.anyString())).thenReturn(Optional.empty());
- final CatalogController objUnderTest = new CatalogController(mockedResourceProvider);
+ public void test_getResourceCsar_invalidCsar_internalServerError() {
+ final String url = getBaseUrl() + "/resources/" + UUID.randomUUID().toString() + "/toscaModel";
+
+ final ResponseEntity<byte[]> response =
+ restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(getHttpHeaders()), byte[].class);
- final ResponseEntity<byte[]> response = objUnderTest.getCsar(Constants.DEFAULT_CSAR_NAME);
assertFalse(response.hasBody());
assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode());
}
+ @Test
+ public void test_getResourceMetadata_validMetadataFileInClasspath_matchContent() {
+
+ final String url = getBaseUrl() + "/resources/" + RESOURCE_ID + "/metadata";
+
+ final ResponseEntity<ResourceMetadata> response =
+ restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(getHttpHeaders()), ResourceMetadata.class);
+
+
+ assertEquals(HttpStatus.OK, response.getStatusCode());
+ assertTrue(response.hasBody());
+ final ResourceMetadata actual = response.getBody();
+ assertEquals(8, actual.getResources().size());
+ assertEquals(3, actual.getArtifacts().size());
+ assertEquals(SUB_CATEGORY, actual.getSubCategory());
+
+ }
+
+ @Test
+ public void test_getServiceMetadata_validMetadataFileInClasspath_matchContent() {
+
+ final String url = getBaseUrl() + "/services/" + SERVICE_ID + "/metadata";
+
+ final ResponseEntity<ServiceMetadata> response =
+ restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(getHttpHeaders()), ServiceMetadata.class);
+
+
+ assertEquals(HttpStatus.OK, response.getStatusCode());
+ assertTrue(response.hasBody());
+ final ServiceMetadata actual = response.getBody();
+ assertEquals(1, actual.getResources().size());
+ assertEquals(1, actual.getArtifacts().size());
+ assertEquals(DISTRIBUTION_STATUS, actual.getDistributionStatus());
+
+ }
+
+
private String getBaseUrl() {
return "http://localhost:" + port + Constants.CATALOG_URL;
}
private HttpHeaders getHttpHeaders() {
final HttpHeaders requestHeaders = new HttpHeaders();
- requestHeaders.add("Authorization", getBasicAuth(username));
+ requestHeaders.add("Authorization", getBasicAuth(userCredentials.getUsers().get(0).getUsername()));
requestHeaders.setContentType(MediaType.APPLICATION_JSON);
return requestHeaders;
}
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertFalse;
+import static org.onap.so.sdcsimulator.models.AssetType.RESOURCES;
+import static org.onap.so.sdcsimulator.utils.Constants.DOT_CSAR;
+import static org.onap.so.sdcsimulator.utils.Constants.FORWARD_SLASH;
+import static org.onap.so.sdcsimulator.utils.Constants.MAIN_RESOURCE_FOLDER;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
+import java.util.UUID;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import org.onap.so.sdcsimulator.utils.Constants;
import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.util.StreamUtils;
/**
* @author Waqas Ikram (waqas.ikram@est.tech)
* @author Eoin Hanan (eoin.hanan@est.tech)
*/
-public class ResourceProviderImplTest {
+public class AssetProviderImplTest {
+
+ private static final String VNF_RESOURCE_ID = "73522444-e8e9-49c1-be29-d355800aa349";
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
- private static final String DUMMY_CONTENT = "Hell world";
+ private static final String DUMMY_CONTENT = "Hello world";
+
+ private final PathMatchingResourcePatternResolver resourcePatternResolver =
+ new PathMatchingResourcePatternResolver();
@Test
public void test_getResource_withValidPath_matchContent() throws IOException {
- final File folder = temporaryFolder.newFolder();
- final Path file = Files.createFile(folder.toPath().resolve("empty.csar"));
+ final File folder = temporaryFolder.newFolder(RESOURCES.toString());
+ final String uuid = UUID.randomUUID().toString();
+ final Path file = Files.createFile(folder.toPath().resolve(uuid + DOT_CSAR));
Files.write(file, DUMMY_CONTENT.getBytes());
- final ResourceProviderImpl objUnderTest = new ResourceProviderImpl(folder.getPath());
+ final AssetProviderImpl objUnderTest = new AssetProviderImpl(folder.getParent(), resourcePatternResolver);
- assertArrayEquals(DUMMY_CONTENT.getBytes(), objUnderTest.getResource("empty").get());
+ assertArrayEquals(DUMMY_CONTENT.getBytes(), objUnderTest.getAsset(uuid, RESOURCES).get());
}
@Test
public void test_getResource_withoutValidPath_matchContent() throws IOException {
- final ClassPathResource classPathResource = new ClassPathResource(Constants.DEFAULT_CSAR_PATH, this.getClass());
+ final String validCsarPath = MAIN_RESOURCE_FOLDER + RESOURCES + FORWARD_SLASH + VNF_RESOURCE_ID + DOT_CSAR;
+ final ClassPathResource classPathResource = new ClassPathResource(validCsarPath, this.getClass());
final byte[] expectedResult = StreamUtils.copyToByteArray(classPathResource.getInputStream());
- final ResourceProviderImpl objUnderTest = new ResourceProviderImpl("");
+ final AssetProviderImpl objUnderTest = new AssetProviderImpl("", resourcePatternResolver);
- assertArrayEquals(expectedResult, objUnderTest.getResource(Constants.DEFAULT_CSAR_NAME).get());
+ assertArrayEquals(expectedResult, objUnderTest.getAsset(VNF_RESOURCE_ID, RESOURCES).get());
}
@Test
- public void test_getResource_unbleToreadFileFromClasspath_emptyOptional() throws IOException {
-
- final ResourceProviderImpl objUnderTest = new ResourceProviderImpl("") {
- @Override
- String getDefaultCsarPath() {
- return "/some/dummy/path";
- }
- };
- assertFalse(objUnderTest.getResource(Constants.DEFAULT_CSAR_NAME).isPresent());
+ public void test_getResource_unbleToReadFileFromClasspath_emptyOptional() throws IOException {
+
+ final AssetProviderImpl objUnderTest = new AssetProviderImpl("", resourcePatternResolver);
+ assertFalse(objUnderTest.getAsset(UUID.randomUUID().toString(), RESOURCES).isPresent());
}
}
public void setVnfcList(final List<Vnfc> vnfclist) {
this.vnfclist = vnfclist;
}
+
+ @Override
+ public String toString() {
+ final StringBuilder sb = new StringBuilder();
+ sb.append("class Vnfd {\n");
+ sb.append(" vnfdId: ").append(vnfdId).append("\n");
+ sb.append(" vnfclist: ").append(vnfclist).append("\n");
+ sb.append("}");
+ return sb.toString();
+ }
+
}
this.grantResourceId = grantResourceId;
}
- }
+ @Override
+ public String toString() {
+ final StringBuilder sb = new StringBuilder();
+ sb.append("class Vnfc {\n");
+ sb.append(" vnfcId: ").append(vnfcId).append("\n");
+ sb.append(" type: ").append(type).append("\n");
+ sb.append(" vduId: ").append(vduId).append("\n");
+ sb.append(" resourceTemplateId: ").append(resourceTemplateId).append("\n");
+ sb.append(" grantResourceId: ").append(grantResourceId).append("\n");
+ sb.append("}");
+ return sb.toString();
+ }
+ }
public List<Vnfd> getVnfdList() {
return vnfdList;
this.vnfdList = vnfdList;
}
+ @Override
+ public String toString() {
+ final StringBuilder sb = new StringBuilder();
+ sb.append("class Vnfds {\n");
+ sb.append(" vnfdList: ").append(vnfdList).append("\n");
+ sb.append("}");
+ return sb.toString();
+ }
+
+
+
}
@Override
protected List<GrantsAddResources> getAddResources(final String vnfdId) {
final List<GrantsAddResources> resources = new ArrayList<>();
-
+ LOGGER.info("Will find GrantsAddResources for vnfdId: {}", vnfdId);
for (final Vnfd vnfd : vnfds.getVnfdList()) {
if (vnfd.getVnfdId().equals(vnfdId)) {
+ LOGGER.info("Found vnfd: {}", vnfd);
for (final Vnfc vnfc : vnfd.getVnfcList()) {
final GrantsAddResources addResource = new GrantsAddResources();
vnfc.setGrantResourceId(UUID.randomUUID().toString());
addResource.getVimConnectionId());
}
LOGGER.info("VIM connections in grant response: {}", mapOfGrantResourceIdToVimConnectionId);
+ final String vnfInstanceId = operation.getVnfInstanceId();
+
+ LOGGER.info("vnfds: {}", vnfds);
for (final Vnfd vnfd : vnfds.getVnfdList()) {
- if (vnfd.getVnfdId().equals(svnfmService.getVnf(operation.getVnfInstanceId()).getVnfdId())) {
+ if (vnfd.getVnfdId().equals(svnfmService.getVnf(vnfInstanceId).getVnfdId())) {
for (final Vnfc vnfc : vnfd.getVnfcList()) {
final InlineResponse201InstantiatedVnfInfoVnfcResourceInfo vnfcResourceInfoItem =
new InlineResponse201InstantiatedVnfInfoVnfcResourceInfo();
import org.onap.so.adapters.vnfmadapter.extclients.vnfm.model.InlineResponse201.InstantiationStateEnum;
import org.onap.so.adapters.vnfmadapter.extclients.vnfm.model.InlineResponse201InstantiatedVnfInfoResourceHandle;
import org.onap.so.adapters.vnfmadapter.extclients.vnfm.model.InlineResponse201InstantiatedVnfInfoVnfcResourceInfo;
-import org.onap.so.svnfm.simulator.model.Vnfds;
-import org.onap.so.svnfm.simulator.repository.VnfOperationRepository;
import org.onap.so.svnfm.simulator.config.ApplicationConfig;
import org.onap.so.svnfm.simulator.model.VnfOperation;
+import org.onap.so.svnfm.simulator.model.Vnfds;
+import org.onap.so.svnfm.simulator.repository.VnfOperationRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class TerminateOperationProgressor extends OperationProgressor {
+ private static final Logger LOGGER = LoggerFactory.getLogger(TerminateOperationProgressor.class);
public TerminateOperationProgressor(final VnfOperation operation, final SvnfmService svnfmService,
final VnfOperationRepository vnfOperationRepository, final ApplicationConfig applicationConfig,
@Override
protected List<GrantsAddResources> getRemoveResources(final String vnfdId) {
final List<GrantsAddResources> resources = new ArrayList<>();
+ LOGGER.info("Will find RemoveResources for vnfdId: {}", vnfdId);
+ final String vnfInstanceId = operation.getVnfInstanceId();
final org.onap.so.adapters.vnfmadapter.extclients.vnfm.model.InlineResponse201 vnf =
- svnfmService.getVnf(operation.getVnfInstanceId());
+ svnfmService.getVnf(vnfInstanceId);
+ LOGGER.info("Found InlineResponse201: {} for vnfInstanceId: {}", vnf, vnfInstanceId);
for (final InlineResponse201InstantiatedVnfInfoVnfcResourceInfo vnfc : vnf.getInstantiatedVnfInfo()
.getVnfcResourceInfo()) {
final GrantsAddResources addResource = new GrantsAddResources();
# Test suites are relative paths under [integration/csit.git]/tests/.
# Place the suites in run order.
-so/etsi/etsi_tests.robot
+so/etsi/etsi_package_onboarding_tests.robot
+so/etsi/etsi_vnf_lcm_tests.robot
+so/etsi/etsi_vnf_package_management_tests.robot
+++ /dev/null
-#!/bin/bash
-#
-# ============LICENSE_START=======================================================
-# Copyright (C) 2019 Nordix Foundation.
-# ================================================================================
-# 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.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-
-# @author Rahul Tyagi (rahul.tyagi@est.tech)
-
-CDS_DATA_PATH=$WORKSPACE/plans/$PARENT/$SUB_PARENT/cds
-
-cd $CDS_DATA_PATH
-export LOCAL_IP=$(ip -4 addr show docker0 | grep -Po 'inet \K[\d.]+')
-unset http_proxy https_proxy
-
-#cd $WORKSPACE/archives/cds/ms/blueprintsprocessor/distribution/src/main/dc/
-
-############# update ip of sdnc in docker-compose###########
-SDNC_CONTAINER=$(docker ps -a -q --filter="name=sdnc_controller_container")
-SDNC_CONTAINER_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $SDNC_CONTAINER)
-echo " " >> docker-compose.yaml
-echo " extra_hosts:" >> docker-compose.yaml
-echo " - 'sdnc:$LOCAL_IP'" >> docker-compose.yaml
-#############################################################
-
-docker-compose up -d
-sleep 10
-################# Check state of BP ####################
-BP_CONTAINER=$(docker ps -a -q --filter="name=bp-rest")
-CCSDK_MARIADB=$(docker ps -a -q --filter="name=ccsdk-mariadb")
-for i in {1..10}; do
-if [ $(docker inspect --format='{{ .State.Running }}' $BP_CONTAINER) ] && \
-[ $(docker inspect --format='{{ .State.Running }}' $CCSDK_MARIADB) ]
-then
- echo "Blueprint proc Service Running"
- break
-else
- echo sleep $i
- sleep $i
-fi
-done
-
- "8000:8080"
restart: always
environment:
- APPLICATIONNAME: BlueprintsProcessor
- BUNDLEVERSION: 1.0.0
- APP_CONFIG_HOME: /opt/app/onap/config
- STICKYSELECTORKEY:
- ENVCONTEXT: dev
+ - APPLICATIONNAME=BlueprintsProcessor
+ - BUNDLEVERSION=1.0.0
+ - APP_CONFIG_HOME=/opt/app/onap/config
+ - ENVCONTEXT=dev
+ volumes:
+ - /etc/localtime:/etc/localtime:ro
+ - ${WORKSPACE}/plans/usecases-config-over-netconf/config-over-netconf/cds/resources:/opt/app/onap/res
+ entrypoint:
+ - /bin/sh
+ - -c
+ - "/opt/app/onap/res/importCerAndStartService.sh"
+ extra_hosts:
+ - sdnc:${LOCAL_IP}
--- /dev/null
+# Web Server Configurations
+# START -Controller Blueprints Properties & Load Resource Source Mappings
+resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,sdnc=source-rest,aai-data=source-rest,capability=source-capability,rest=source-rest,vault-data=source-rest,script=source-capability
+
+# Controller Blueprints Core Configuration
+blueprintsprocessor.blueprintDeployPath=/opt/app/onap/blueprints/deploy
+blueprintsprocessor.blueprintArchivePath=/opt/app/onap/blueprints/archive
+blueprintsprocessor.blueprintWorkingPath=/opt/app/onap/blueprints/working
+
+# Controller Blueprint Load Configurations
+blueprintsprocessor.loadBluePrintPaths=/opt/app/onap/model-catalog/blueprint-model
+blueprintsprocessor.loadModeTypePaths=/opt/app/onap/model-catalog/definition-type
+blueprintsprocessor.loadResourceDictionaryPaths=/opt/app/onap/model-catalog/resource-dictionary
+
+# CBA file extension
+controllerblueprints.loadCbaExtension=zip
+
+### END -Controller Blueprints Properties
+
+blueprintsprocessor.grpcEnable=true
+blueprintsprocessor.httpPort=8080
+blueprintsprocessor.grpcPort=9111
+
+# DB
+blueprintsprocessor.db.url=jdbc:mysql://db:3306/sdnctl
+blueprintsprocessor.db.username=sdnctl
+blueprintsprocessor.db.password=sdnctl
+blueprintsprocessor.db.driverClassName=org.mariadb.jdbc.Driver
+blueprintsprocessor.db.hibernateHbm2ddlAuto=update
+blueprintsprocessor.db.hibernateDDLAuto=update
+blueprintsprocessor.db.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
+blueprintsprocessor.db.hibernateDialect=org.hibernate.dialect.MySQL5InnoDBDialect
+
+# Processor-DB Endpoint
+blueprintsprocessor.db.processor-db.type=maria-db
+blueprintsprocessor.db.processor-db.url=jdbc:mysql://mariadb-galera:3306/sdnctl
+blueprintsprocessor.db.processor-db.username=root
+blueprintsprocessor.db.processor-db.password=secretpassword
+
+# Python Executor
+blueprints.processor.functions.python.executor.executionPath=/opt/app/onap/scripts/jython/ccsdk_blueprints
+blueprints.processor.functions.python.executor.modulePaths=/opt/app/onap/scripts/jython/ccsdk_blueprints,/opt/app/onap/scripts/jython/ccsdk_netconf,/opt/app/onap/scripts/jython/ccsdk_restconf
+
+security.user.password: {bcrypt}$2a$10$duaUzVUVW0YPQCSIbGEkQOXwafZGwQ/b32/Ys4R1iwSSawFgz7QNu
+security.user.name: ccsdkapps
+
+# Used in Health Check
+#endpoints.user.name=ccsdkapps
+#endpoints.user.password=ccsdkapps
+
+# Executor Options
+blueprintsprocessor.resourceResolution.enabled=true
+blueprintsprocessor.netconfExecutor.enabled=true
+blueprintsprocessor.restConfExecutor.enabled=true
+blueprintsprocessor.cliExecutor.enabled=true
+blueprintsprocessor.remoteScriptCommand.enabled=true
+
+# Command Executor
+blueprintsprocessor.grpcclient.remote-python.type=token-auth
+blueprintsprocessor.grpcclient.remote-python.host=localhost
+blueprintsprocessor.grpcclient.remote-python.port=50051
+blueprintsprocessor.grpcclient.remote-python.token=Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
+
+# Python Executor
+blueprintsprocessor.grpcclient.py-executor.type=tls-auth
+blueprintsprocessor.grpcclient.py-executor.host=py-executor-default:50052
+blueprintsprocessor.grpcclient.py-executor.trustCertCollection=/opt/app/onap/config/certs/py-executor/py-executor-chain.pem
+
+# Config Data REST client settings
+blueprintsprocessor.restconfEnabled=true
+blueprintsprocessor.restclient.sdnc.type=basic-auth
+blueprintsprocessor.restclient.sdnc.url=http://sdnc:8282
+blueprintsprocessor.restclient.sdnc.username=admin
+blueprintsprocessor.restclient.sdnc.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+blueprintprocessor.remoteScriptCommand.enabled=true
+
+# Encrypted username and password for health check service
+endpoints.user.name=eHbVUbJAj4AG2522cSbrOQ==
+endpoints.user.password=eHbVUbJAj4AG2522cSbrOQ==
+
+# BaseUrls for health check blueprint processor services
+blueprintprocessor.healthcheck.baseUrl=http://localhost:8080/
+blueprintprocessor.healthcheck.mapping-service-name-with-service-link=[Execution service,/api/v1/execution-service/health-check],[Resources service,/api/v1/resources/health-check],[Template service,/api/v1/template/health-check]
+
+# BaseUrls for health check Cds Listener services
+cdslistener.healthcheck.baseUrl=http://cds-sdc-listener:8080/
+cdslistener.healthcheck.mapping-service-name-with-service-link=[SDC Listener service,/api/v1/sdclistener/healthcheck]
+
+# Actuator Properties
+management.endpoints.web.exposure.include=*
+management.endpoint.health.show-details=always
+management.info.git.mode=full
+
+# Error Managements
+error.catalog.applicationId=cds
+error.catalog.type=properties
+error.catalog.errorDefinitionDir=/opt/app/onap/config/
\ No newline at end of file
--- /dev/null
+# Error Messages Configurations
+
+org.onap.ccsdk.cds.blueprintsprocessor.generic_failure=cause=Internal error in Blueprint Processor run time.,action=Contact CDS administrator team.
+org.onap.ccsdk.cds.blueprintsprocessor.resource_path_missing=cause=Resource path missing or wrong.,action=Please reload your artifact in run time.
+org.onap.ccsdk.cds.blueprintsprocessor.resource_writing_fail=cause=Fail to write resources files.,action=Please reload your files and make sure it is in the right format.
+org.onap.ccsdk.cds.blueprintsprocessor.io_file_interrupt=cause=IO file system interruption.,action=Please reload your file and make sure it is in the right format.
+org.onap.ccsdk.cds.blueprintsprocessor.invalid_request_format=cause=bad request provided.,action=Verify the request payload.
+org.onap.ccsdk.cds.blueprintsprocessor.unauthorized_request=cause=The request requires user authentication.,action=Please provide the right credentials.
+org.onap.ccsdk.cds.blueprintsprocessor.request_not_found=cause=Request mapping doesn't exist.,action=Please verify your request.
+org.onap.ccsdk.cds.blueprintsprocessor.conflict_adding_resource=cause=Duplicated entry while saving resource.,action=Please make the saving model doesn't exist.
+org.onap.ccsdk.cds.blueprintsprocessor.duplicate_data=cause=Duplicated data - was expecting one result, got more than one.,action=Please provide single resource at a time.
+org.onap.ccsdk.cds.blueprintsprocessor.resource_not_found=cause=No response was found for this request in the server.,action=Provide the ID to find the resource.
+org.onap.ccsdk.cds.blueprintsprocessor.unsupported_media_type=cause=An invalid media was provided.,action=Please make sure your media or artifact is in the proper structure or format.
+
+# Self Service API
+org.onap.ccsdk.cds.blueprintsprocessor.selfservice.api.generic_failure=cause=Internal error in Self Service API.,action=Verify the request and try again.
+org.onap.ccsdk.cds.blueprintsprocessor.selfservice.api.generic_process_failure=cause=Internal error while processing REST call to the Self Service API.,action=Verify the request and try again.
+org.onap.ccsdk.cds.blueprintsprocessor.selfservice.api.invalid_file_extension=cause=Failed trying to upload a non ZIP file format.,action=Please reload your file and make sure it is in ZIP format.
+org.onap.ccsdk.cds.blueprintsprocessor.selfservice.api.resource_path_missing=cause=Resource path missing or wrong.,action=Please reload your artifact in run time.
+org.onap.ccsdk.cds.blueprintsprocessor.selfservice.api.resource_writing_fail=cause=Fail to write resources files.,action=Please reload your files and make sure it is in the right format.
+org.onap.ccsdk.cds.blueprintsprocessor.selfservice.api.io_file_interrupt=cause=IO file system interruption.,action=Please reload your file and make sure it is in the right format.
+org.onap.ccsdk.cds.blueprintsprocessor.selfservice.api.invalid_request_format=cause=bad request provided.,action=Verify the request payload.
+org.onap.ccsdk.cds.blueprintsprocessor.selfservice.api.unauthorized_request=cause=The request requires user authentication.,action=Please provide the right credentials.
+org.onap.ccsdk.cds.blueprintsprocessor.selfservice.api.request_not_found=cause=Request mapping doesn't exist.,action=Please verify your request.
+org.onap.ccsdk.cds.blueprintsprocessor.selfservice.api.conflict_adding_resource=cause=Duplicated entry while saving resource.,action=Please make the saving model doesn't exist.
+org.onap.ccsdk.cds.blueprintsprocessor.selfservice.api.duplicate_data=cause=Duplicated data - was expecting one result, got more than one.,action=Please provide single resource at a time.
+org.onap.ccsdk.cds.blueprintsprocessor.selfservice.api.resource_not_found=cause=No response was found for this request in the server.,action=Provide the ID to find the resource.
+org.onap.ccsdk.cds.blueprintsprocessor.selfservice.api.unsupported_media_type=cause=An invalid media was provided.,action=Please make sure your media or artifact is in the proper structure or format.
+
+# Designer API
+org.onap.ccsdk.cds.blueprintsprocessor.designer.api.generic_failure=cause=Internal error while processing REST call to the Designer API.,action=Verify the request and try again.
+org.onap.ccsdk.cds.blueprintsprocessor.designer.api.invalid_file_extension=cause=Failed trying to upload a non ZIP file format.,action=Please reload your file and make sure it is in ZIP format.
+org.onap.ccsdk.cds.blueprintsprocessor.designer.api.resource_path_missing=cause=Resource path missing or wrong.,action=Please reload your artifact in run time.
+org.onap.ccsdk.cds.blueprintsprocessor.designer.api.resource_writing_fail=cause=Fail to write resources files.,action=Please reload your files and make sure it is in the right format.
+org.onap.ccsdk.cds.blueprintsprocessor.designer.api.io_file_interrupt=cause=IO file system interruption.,action=Please reload your file and make sure it is in the right format.
+org.onap.ccsdk.cds.blueprintsprocessor.designer.api.invalid_request_format=cause=bad request provided.,action=Verify the request payload.
+org.onap.ccsdk.cds.blueprintsprocessor.designer.api.unauthorized_request=cause=The request requires user authentication.,action=Please provide the right credentials.
+org.onap.ccsdk.cds.blueprintsprocessor.designer.api.request_not_found=cause=Request mapping doesn't exist.,action=Please verify your request.
+org.onap.ccsdk.cds.blueprintsprocessor.designer.api.conflict_adding_resource=cause=Duplicated entry while saving resource.,action=Please make the saving model doesn't exist.
+org.onap.ccsdk.cds.blueprintsprocessor.designer.api.duplicate_data=cause=Duplicated data - was expecting one result, got more than one.,action=Please provide single resource at a time.
+org.onap.ccsdk.cds.blueprintsprocessor.designer.api.resource_not_found=cause=No response was found for this request in the server.,action=Provide the ID to find the resource.
+org.onap.ccsdk.cds.blueprintsprocessor.designer.api.unsupported_media_type=cause=An invalid media was provided.,action=Please make sure your media or artifact is in the proper structure or format.
+
+# Resource API
+org.onap.ccsdk.cds.blueprintsprocessor.resource.api.generic_failure=cause=Internal error while processing REST call to the Resource API.,action=Verify the request and try again.
+org.onap.ccsdk.cds.blueprintsprocessor.resource.api.invalid_file_extension=cause=Failed trying to upload a non ZIP file format.,action=Please reload your file and make sure it is in ZIP format.
+org.onap.ccsdk.cds.blueprintsprocessor.resource.api.resource_path_missing=cause=Resource path missing or wrong.,action=Please reload your artifact in run time.
+org.onap.ccsdk.cds.blueprintsprocessor.resource.api.resource_writing_fail=cause=Fail to write resources files.,action=Please reload your files and make sure it is in the right format.
+org.onap.ccsdk.cds.blueprintsprocessor.resource.api.io_file_interrupt=cause=IO file system interruption.,action=Please reload your file and make sure it is in the right format.
+org.onap.ccsdk.cds.blueprintsprocessor.resource.api.invalid_request_format=cause=bad request provided.,action=Verify the request payload.
+org.onap.ccsdk.cds.blueprintsprocessor.resource.api.unauthorized_request=cause=The request requires user authentication.,action=Please provide the right credentials.
+org.onap.ccsdk.cds.blueprintsprocessor.resource.api.request_not_found=cause=Request mapping doesn't exist.,action=Please verify your request.
+org.onap.ccsdk.cds.blueprintsprocessor.resource.api.conflict_adding_resource=cause=Duplicated entry while saving resource.,action=Please make the saving model doesn't exist.
+org.onap.ccsdk.cds.blueprintsprocessor.resource.api.duplicate_data=cause=Duplicated data - was expecting one result, got more than one.,action=Please provide single resource at a time.
+org.onap.ccsdk.cds.blueprintsprocessor.resource.api.resource_not_found=cause=No response was found for this request in the server.,action=Provide the ID to find the resource.
+org.onap.ccsdk.cds.blueprintsprocessor.resource.api.unsupported_media_type=cause=An invalid media was provided.,action=Please make sure your media or artifact is in the proper structure or format.
+
+# Configs API
+org.onap.ccsdk.cds.blueprintsprocessor.configs.api.generic_failure=cause=Internal error while processing REST call to the Configs API.,action=Verify the request and try again.
+org.onap.ccsdk.cds.blueprintsprocessor.configs.api.resource_path_missing=cause=Resource path missing or wrong.,action=Please reload your artifact in run time.
+org.onap.ccsdk.cds.blueprintsprocessor.configs.api.io_file_interrupt=cause=IO file system interruption.,action=Please reload your file and make sure it is in the right format.
+org.onap.ccsdk.cds.blueprintsprocessor.configs.api.invalid_request_format=cause=bad request provided.,action=Verify the request payload.
+org.onap.ccsdk.cds.blueprintsprocessor.configs.api.unauthorized_request=cause=The request requires user authentication.,action=Please provide the right credentials.
+org.onap.ccsdk.cds.blueprintsprocessor.configs.api.request_not_found=cause=Request mapping doesn't exist.,action=Please verify your request.
+org.onap.ccsdk.cds.blueprintsprocessor.configs.api.conflict_adding_resource=cause=Duplicated entry while saving resource.,action=Please make the saving model doesn't exist.
+org.onap.ccsdk.cds.blueprintsprocessor.configs.api.duplicate_data=cause=Duplicated data - was expecting one result, got more than one.,action=Please provide single resource at a time.
+org.onap.ccsdk.cds.blueprintsprocessor.configs.api.resource_not_found=cause=No response was found for this request in the server.,action=Provide the ID to find the resource.
+
+# Python Executor
+org.onap.ccsdk.cds.blueprintsprocessor.functions.python.executor.generic_failure=cause=Internal error in Blueprint Processor run time.,action=Contact CDS administrator team.
+
+# Resource resolution
+org.onap.ccsdk.cds.blueprintsprocessor.resource.resolution.invalid_request_format=cause=bad request provided.,action=Verify the request payload.
+org.onap.ccsdk.cds.blueprintsprocessor.resource.resolution.resource_not_found=cause=No response was found for this resolution in CDS.,action=Verify definition of the resource in CBA.
+org.onap.ccsdk.cds.blueprintsprocessor.resource.resolution.internal_error=cause=Internal error while processing Resource Resolution.,action=Verify the payload.
+
+org.onap.ccsdk.cds.sdclistener.generic_failure=cause=Internal error in SDC Listener.,action=Contact CDS administrator team.
\ No newline at end of file
--- /dev/null
+#!/bin/sh
+
+chmod -R 775 /opt/app/onap/res
+cp -f /opt/app/onap/res/application.properties /opt/app/onap/config
+cp -f /opt/app/onap/res/error-messages_en.properties /opt/app/onap/config
+
+echo "Starting Service..."
+source /startService.sh
\ No newline at end of file
--- /dev/null
+version: '3'
+
+services:
+ netconf-pnp-simulator:
+ image: nexus3.onap.org:10001/onap/integration/simulators/netconf-pnp-simulator:2.8.6
+ container_name: netconf-simulator
+ restart: always
+ ports:
+ - "830:830"
+ - "6513:6513"
+ volumes:
+ - ${NETCONF_CONFIG_PATH}:/config/modules/mynetconf
--- /dev/null
+{
+ "mynetconf:netconflist": {
+ "netconf": [
+ {
+ "netconf-id": 3,
+ "netconf-param": 3
+ }
+ ]
+ }
+}
--- /dev/null
+module mynetconf {
+ yang-version 1.1;
+ namespace "urn:mynetconf:test";
+
+ prefix nft;
+
+ organization
+ "mynetconf";
+ contact
+ "my netconf address";
+ description
+ "yang model for mynetconf";
+ revision "2019-03-01" {
+ description
+ "initial version";
+ }
+
+ container netconflist {
+ list netconf {
+ key netconf-id;
+ leaf netconf-id {
+ type uint16;
+ }
+ leaf netconf-param {
+ type uint32;
+ }
+ }
+ }
+}
--- /dev/null
+#!/usr/bin/env python3
+
+__author__ = "Mislav Novakovic <mislav.novakovic@sartura.hr>"
+__copyright__ = "Copyright 2018, Deutsche Telekom AG"
+__license__ = "Apache 2.0"
+
+# 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.
+
+# This sample application demonstrates use of Python programming language bindings for sysrepo library.
+# Original c application was rewritten in Python to show similarities and differences
+# between the two.
+#
+# Most notable difference is in the very different nature of languages, c is weakly statically typed language
+# while Python is strongly dynamically typed. Python code is much easier to read and logic easier to comprehend
+# for smaller scripts. Memory safety is not an issue but lower performance can be expected.
+#
+# The original c implementation is also available in the source, so one can refer to it to evaluate trade-offs.
+
+import sysrepo as sr
+import sys
+
+
+# Helper function for printing changes given operation, old and new value.
+def print_change(op, old_val, new_val):
+ if op == sr.SR_OP_CREATED:
+ print(f"CREATED: {new_val.to_string()}")
+ elif op == sr.SR_OP_DELETED:
+ print(f"DELETED: {old_val.to_string()}")
+ elif op == sr.SR_OP_MODIFIED:
+ print(f"MODIFIED: {old_val.to_string()} to {new_val.to_string()}")
+ elif op == sr.SR_OP_MOVED:
+ print(f"MOVED: {new_val.xpath()} after {old_val.xpath()}")
+
+
+# Helper function for printing events.
+def ev_to_str(ev):
+ if ev == sr.SR_EV_VERIFY:
+ return "verify"
+ elif ev == sr.SR_EV_APPLY:
+ return "apply"
+ elif ev == sr.SR_EV_ABORT:
+ return "abort"
+ else:
+ return "unknown"
+
+
+# Function to print current configuration state.
+# It does so by loading all the items of a session and printing them out.
+def print_current_config(session, module_name):
+ select_xpath = f"/{module_name}:*//*"
+
+ values = session.get_items(select_xpath)
+
+ if values is not None:
+ print("========== BEGIN CONFIG ==========")
+ for i in range(values.val_cnt()):
+ print(values.val(i).to_string(), end='')
+ print("=========== END CONFIG ===========")
+
+
+# Function to be called for subscribed client of given session whenever configuration changes.
+def module_change_cb(sess, module_name, event, private_ctx):
+ try:
+ print("========== Notification " + ev_to_str(event) + " =============================================")
+ if event == sr.SR_EV_APPLY:
+ print_current_config(sess, module_name)
+
+ print("========== CHANGES: =============================================")
+
+ change_path = f"/{module_name}:*"
+
+ it = sess.get_changes_iter(change_path)
+
+ while True:
+ change = sess.get_change_next(it)
+ if change is None:
+ break
+ print_change(change.oper(), change.old_val(), change.new_val())
+
+ print("========== END OF CHANGES =======================================")
+ except Exception as e:
+ print(e)
+
+ return sr.SR_ERR_OK
+
+
+def main():
+ # Notable difference between c implementation is using exception mechanism for open handling unexpected events.
+ # Here it is useful because `Connection`, `Session` and `Subscribe` could throw an exception.
+ try:
+ module_name = "ietf-interfaces"
+ if len(sys.argv) > 1:
+ module_name = sys.argv[1]
+ else:
+ print("\nYou can pass the module name to be subscribed as the first argument")
+
+ print(f"Application will watch for changes in {module_name}")
+
+ # connect to sysrepo
+ conn = sr.Connection(module_name)
+
+ # start session
+ sess = sr.Session(conn)
+
+ # subscribe for changes in running config */
+ subscribe = sr.Subscribe(sess)
+
+ subscribe.module_change_subscribe(module_name, module_change_cb)
+
+ try:
+ print_current_config(sess, module_name)
+ except Exception as e:
+ print(e)
+
+ print("========== STARTUP CONFIG APPLIED AS RUNNING ==========")
+
+ sr.global_loop()
+
+ print("Application exit requested, exiting.")
+
+ except Exception as e:
+ print(e)
+
+
+if __name__ == '__main__':
+ main()
# @author Rahul Tyagi (rahul.tyagi@est.tech)
-
-SCRIPTS="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-export PARENT=usecases-config-over-netconf
-export SUB_PARENT=config-over-netconf
-source ${WORKSPACE}/plans/$PARENT/$SUB_PARENT/test.properties
+SCRIPTS="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "${WORKSPACE}"/plans/usecases-config-over-netconf/config-over-netconf/test.properties
export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
if [ "$MTU" == "" ]; then
- export MTU="1450"
+ export MTU="1450"
fi
-# clone integration branch for pnf-simulator
-mkdir -m 755 -p $WORKSPACE/temp/integration
-cd $WORKSPACE/temp
-git clone -b dublin --single-branch --depth=1 http://gerrit.onap.org/r/integration.git integration
-
-HOST_IP_ADDR=localhost
+export CONFIG_OVER_NETCONF=${CONFIG_OVER_NETCONF}
-# setup sdnc
+# Prepare enviroment
+echo "Uninstall docker-py and reinstall docker."
+pip uninstall -y docker-py
+pip uninstall -y docker
+pip install -U docker==2.7.0
-cd $SDNC_DOCKER_PATH
+# Disable Proxy - for local run
unset http_proxy https_proxy
-docker pull $NETOPEER_DOCKER_REPO:$NETOPEER_IMAGE_TAG
-docker tag $NETOPEER_DOCKER_REPO:$NETOPEER_IMAGE_TAG $NETOPEER_DOCKER_REPO:latest
-#sed -i "s/DMAAP_TOPIC_ENV=.*/DMAAP_TOPIC_ENV="AUTO"/g" diocker-compose.yml
-docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
+# Export default Networking bridge created on the host machine
+export LOCAL_IP=$(ip -4 addr show docker0 | grep -Po 'inet \K[\d.]+')
-docker pull $NEXUS_DOCKER_REPO/onap/sdnc-image:$SDNC_IMAGE_TAG
-docker tag $NEXUS_DOCKER_REPO/onap/sdnc-image:$SDNC_IMAGE_TAG onap/sdnc-image:latest
+###################### Netconf-PNP-Simulator Setup ######################
-docker pull $NEXUS_DOCKER_REPO/onap/sdnc-ansible-server-image:$ANSIBLE_IMAGE_TAG
-docker tag $NEXUS_DOCKER_REPO/onap/sdnc-ansible-server-image:$ANSIBLE_IMAGE_TAG onap/sdnc-ansible-server-image:latest
+# Export Netconf-Pnp Simulator conf path
+export NETCONF_CONFIG_PATH
-docker pull $NEXUS_DOCKER_REPO/onap/ccsdk-blueprintsprocessor:$BP_IMAGE_TAG
-docker tag $NEXUS_DOCKER_REPO/onap/ccsdk-blueprintsprocessor:$BP_IMAGE_TAG onap/ccsdk-blueprintsprocessor:latest
+# Start N etconf-Pnp-Simulator Container with docker-compose and configuration from docker-compose.yml
+docker-compose -f "${CONFIG_OVER_NETCONF}"/netconf-pnp-simulator/docker-compose.yml up -d
-export SDNC_CERT_PATH=${CERT_SUBPATH}
-#sed -i 's/sdnc_controller_container/sdnc_controller_container\n volumes: \n - $SDNC_CERT_PATH:\/opt\/opendaylight\/current\/certs/' docker-compose.yaml
-# start SDNC containers with docker compose and configuration from docker-compose.yml
-docker-compose up -d
+# Update default Networking bridge IP in mount.json file
+sed -i "s/pnfaddr/${LOCAL_IP}/g" "${REQUEST_DATA_PATH}"/mount.xml
-# start pnf simulator
+############################## SDNC Setup ##############################
-cd $INT_DOCKER_PATH
+export SDNC_CERT_PATH="${CERT_SUBPATH}"
-./simulator.sh start&
+docker pull "${NEXUS_DOCKER_REPO}"/onap/sdnc-image:"${SDNC_IMAGE_TAG}"
+docker tag "${NEXUS_DOCKER_REPO}"/onap/sdnc-image:"${SDNC_IMAGE_TAG}" onap/sdnc-image:latest
-# WAIT 10 minutes maximum and test every 5 seconds if SDNC is up using HealthCheck API
-TIME_OUT=1000
-INTERVAL=30
-TIME=0
-while [ "$TIME" -lt "$TIME_OUT" ]; do
- response=$(curl --write-out '%{http_code}' --silent --output /dev/null -H "Authorization: Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==" -X POST -H "X-FromAppId: csit-sdnc" -H "X-TransactionId: csit-sdnc" -H "Accept: application/json" -H "Content-Type: application/json" http://localhost:8282/restconf/operations/SLI-API:healthcheck );
- echo $response
+docker pull "${NEXUS_DOCKER_REPO}"/onap/sdnc-ansible-server-image:"${ANSIBLE_IMAGE_TAG}"
+docker tag "${NEXUS_DOCKER_REPO}"/onap/sdnc-ansible-server-image:"${ANSIBLE_IMAGE_TAG}" onap/sdnc-ansible-server-image:latest
- if [ "$response" == "200" ]; then
- echo SDNC started in $TIME seconds
- break;
- fi
+docker-compose -f "${CONFIG_OVER_NETCONF}"/sdn/docker-compose.yaml up -d
- echo Sleep: $INTERVAL seconds before testing if SDNC is up. Total wait time up now is: $TIME seconds. Timeout is: $TIME_OUT seconds
- sleep $INTERVAL
- TIME=$(($TIME+$INTERVAL))
+# Check if SDNC Service is healthy and ready
+for i in {1..10}; do
+ SDNC_IP=$(get-instance-ip.sh sdnc_controller_container)
+ RESP_CODE=$(curl --write-out '%{http_code}' --silent --output /dev/null -H "Authorization: Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==" -X POST -H "X-FromAppId: csit-sdnc" -H "X-TransactionId: csit-sdnc" -H "Accept: application/json" -H "Content-Type: application/json" http://localhost:8282/restconf/operations/SLI-API:healthcheck)
+ if [[ "${RESP_CODE}" == '200' ]]; then
+ echo "SDNC Service is Ready."
+ break
+ fi
+ echo "Waiting for SDNC Service to Start Up..."
+ sleep 2m
done
-export LOCAL_IP=$(ip -4 addr show docker0 | grep -Po 'inet \K[\d.]+')
-sed -i "s/pnfaddr/$LOCAL_IP/g" $REQUEST_DATA_PATH/mount.xml
+if [[ "${SDNC_IP}" == 'none' || "${SDNC_IP}" == '' || "${RESP_CODE}" != '200' ]]; then
+ echo "SDNC Service not started Could cause problems for testing activities...!"
+fi
+############################## CDS Setup ##############################
-if [ "$TIME" -ge "$TIME_OUT" ]; then
- echo TIME OUT: karaf session not started in $TIME_OUT seconds... Could cause problems for testing activities...
-fi
+docker pull "${NEXUS_DOCKER_REPO}"/onap/ccsdk-blueprintsprocessor:"${BP_IMAGE_TAG}"
+docker tag "${NEXUS_DOCKER_REPO}"/onap/ccsdk-blueprintsprocessor:"${BP_IMAGE_TAG}" onap/ccsdk-blueprintsprocessor:latest
-########################################## blueprintsprocessor setup ##########################################################
-source $CDS_DOCKER_PATH/cds_setup.sh
+docker-compose -f "${CONFIG_OVER_NETCONF}"/cds/docker-compose.yaml up -d
-########## update pnf simulator ip in config deploy request ########
+echo "Sleeping 1 minute"
+sleep 1m
-NETOPEER_CONTAINER=$(docker ps -a -q --filter="name=netopeer")
-NETOPEER_CONTAINER_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $SDNC_CONTAINER)
-RES_KEY=$(uuidgen -r)
-sed -i "s/pnfaddr/$LOCAL_IP/g" $REQUEST_DATA_PATH/config-deploy.json
-sed -i "s/pnfaddr/$LOCAL_IP/g" $REQUEST_DATA_PATH/config-assign.json
+BP_CONTAINER=$(docker ps -a -q --filter="name=bp-rest")
+CCSDK_MARIADB=$(docker ps -a -q --filter="name=ccsdk-mariadb")
-sed -i "s/reskey/$RES_KEY/g" $REQUEST_DATA_PATH/config-deploy.json
-sed -i "s/reskey/$RES_KEY/g" $REQUEST_DATA_PATH/config-assign.json
+for i in {1..10}; do
+ if [ $(docker inspect --format='{{ .State.Running }}' "${BP_CONTAINER}") ] &&
+ [ $(docker inspect --format='{{ .State.Running }}' "${CCSDK_MARIADB}") ]; then
+ echo "Blueprint Proc Service Running"
+ break
+ else
+ echo sleep "${i}"
+ sleep "${i}"
+ fi
+done
-#########################check if server is up gracefully ######################################
+############################ Update Setup ############################
-# Sleep additional 3 minutes (180 secs) to give application time to finish
+RES_KEY=$(uuidgen -r)
+sed -i "s/pnfaddr/$LOCAL_IP/g" "${REQUEST_DATA_PATH}"/config-deploy.json
+sed -i "s/pnfaddr/$LOCAL_IP/g" "${REQUEST_DATA_PATH}"/config-assign.json
-sleep 150
+sed -i "s/reskey/$RES_KEY/g" "${REQUEST_DATA_PATH}"/config-deploy.json
+sed -i "s/reskey/$RES_KEY/g" "${REQUEST_DATA_PATH}"/config-assign.json
# Pass any variables required by Robot test suites in ROBOT_VARIABLES
-
-ROBOT_VARIABLES="-v SCRIPTS:${SCRIPTS}"
+REPO_IP='127.0.0.1'
+ROBOT_VARIABLES+=" -v REPO_IP:${REPO_IP} "
+ROBOT_VARIABLES+=" -v SCRIPTS:${SCRIPTS} "
\ No newline at end of file
#!/bin/bash
-SDNC_DOCKER_COMPOSE_PATH=$SDNC_DOCKER_PATH/docker-compose.yaml
-PNFSIM_DOCKER_COMPOSE_PATH=$INT_DOCKER_PATH/docker-compose.yml
-CDS_DOCKER_COMPOSE_PATH=$CDS_DOCKER_PATH/docker-compose.yaml
+echo 'Stop, Removing all running containers...'
+docker stop $(docker ps -aq) && docker rm $(docker ps -aq)
-echo "==========================blueprint-processor logs =================================="
-docker logs bp-rest
+echo 'Removing Volumes...'
+echo y | docker volume prune
-echo "==========================sdnc-controller logs ======================================"
-docker logs sdnc_controller_container
-
-
-docker-compose -f $SDNC_DOCKER_COMPOSE_PATH down
-docker-compose -f $PNFSIM_DOCKER_COMPOSE_PATH down
-docker-compose -f $CDS_DOCKER_COMPOSE_PATH down
-
-rm -rf $WORKSPACE/temp
+echo 'Removing Networks...'
+echo y | docker network prune
\ No newline at end of file
NEXUS_DOCKER_REPO=nexus3.onap.org:10001
NEXUS_USERNAME=docker
NEXUS_PASSWD=docker
+BP_IMAGE_TAG=0.7.1
SDNC_IMAGE_TAG=1.7.6
ANSIBLE_IMAGE_TAG=1.7.6
-BP_IMAGE_TAG=0.6.4
-REQUEST_DATA_PATH=$WORKSPACE/tests/$PARENT/$SUB_PARENT/data
-TC_PLANS_PATH=$WORKSPACE/plans/$PARENT/$SUB_PARENT
-CDS_DOCKER_PATH=$TC_PLANS_PATH/cds
-SDNC_DOCKER_PATH=$TC_PLANS_PATH/sdn
-INT_DOCKER_PATH=$WORKSPACE/temp/integration/test/mocks/pnfsimulator
-CERT_SUBPATH=$TC_PLANS_PATH/certs
-NETOPEER_DOCKER_REPO=sysrepo/sysrepo-netopeer2
-NETOPEER_IMAGE_TAG=v0.7.7
+CERT_SUBPATH=${WORKSPACE}/plans/usecases-config-over-netconf/config-over-netconf/certs
+CONFIG_OVER_NETCONF=${WORKSPACE}/plans/usecases-config-over-netconf/config-over-netconf
+REQUEST_DATA_PATH=${WORKSPACE}/tests/usecases-config-over-netconf/config-over-netconf/data
+NETCONF_CONFIG_PATH=${WORKSPACE}/plans/usecases-config-over-netconf/config-over-netconf/netconf-pnp-simulator/netconf-config
\ No newline at end of file
##### update pnf simulator ip in config deploy request #######
RES_KEY=$(uuidgen -r)
sed -i "s/pnfaddr/$LOCAL_IP/g" $REQUEST_DATA_PATH/mount.json
+sed -i "s/pnfaddr/$LOCAL_IP/g" $REQUEST_DATA_PATH/mount2.json
##############################################################
ports:
- "830:830"
- "6513:6513"
+ volumes:
+ - ./:/config/modules
+
+ netconf-pnp-simulator-2:
+ image: nexus3.onap.org:10001/onap/integration/simulators/netconf-pnp-simulator:2.8.6
+ container_name: netconf-pnp-simulator-2
+ restart: always
+ ports:
+ - "831:830"
+ - "6514:6513"
volumes:
- ./:/config/modules
\ No newline at end of file
--- /dev/null
+{
+ "model-vers": {
+ "model-ver": [
+ {
+ "model-version-id": "cd4decf6-4f27-4775-9561-0e683ed43635",
+ "model-name": "EricService",
+ "model-version": "1.0",
+ "model-description": "service_instance_1.0",
+ "resource-version": "1594657102313"
+ },
+ {
+ "model-version-id": "4442dfc1-0d2d-46b4-b0bc-a2ac10448269",
+ "model-name": "EricService",
+ "model-version": "2.0",
+ "model-description": "service_instance_2.0",
+ "resource-version": "1594707742646"
+ }
+ ]
+ }
+}
\ No newline at end of file
{
- "pnf-name2":"PNFDemo-pnf-name2-val-78244",
+ "pnf-name2":"6513",
"pnf-name2-source":"PNFDemo-pnf-name2-source-val-99275",
"equip-type":"PNFDemo-equip-type-val-20348",
"equip-vendor":"PNFDemo-equip-vendor-val-52182",
--- /dev/null
+{
+ "pnf-name2":"6514",
+ "pnf-name2-source":"PNFDemo1-pnf-name2-source-val-99275",
+ "equip-type":"PNFDemo1-equip-type-val-20348",
+ "equip-vendor":"PNFDemo1-equip-vendor-val-52182",
+ "equip-model":"PNFDemo1-equip-model-val-8370",
+ "management-option":"PNFDemo1-management-option-val-72881",
+ "ipaddress-v4-oam":"pnfaddr",
+ "ipaddress-v6-oam":"0:0:0:0:0:0",
+ "sw-version":"pnf_sw_version-1.0.0",
+ "pnf-name":"PNFDemo1",
+ "pnf-id":"PNFDemo1",
+ "in-maint":false,
+ "resource-version":"1371558818531",
+ "selflink": "http://localhost:9993/pnf/PNFDemo1"
+}
\ No newline at end of file
{
- "service-instance-id": "5df8b6de-2083-11e7-93ae-92361f002676",
+ "service-instance-id": "df4decf6-h727-8875-8761-89683ed43645",
"service-instance-name": "Service_Ete_Name123452c4-3d7f-42ce-8188-818fab951269",
"environment-context": "General_Revenue-Bearing",
"workload-context": "Production",
- "model-version-id": "d88da85c-d9e8-4f73-b837-3a72a431622b",
+ "model-version-id": "cd4decf6-4f27-4775-9561-0e683ed43635",
"modelInvariantId": "fe41489e-1563-46a3-b90a-1db629e4375b",
"resource-version": "1595258335377",
"selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/5df8b6de-2083-11e7-93ae-92361f002676/service-data/service-topology/",
insert into $WORKFLOW_TABLE_NAME(artifact_uuid, artifact_name, name, operation_name, version, description, body, resource_target, source) values
('02bffbd9-6af0-4f8d-bf9b-d1dfccd28c84','GenericPnfSWUPDownload','GenericPnfSWUPDownload','GenericPnfSWUPDownload',1.0,'Pnf Workflow to download software',null,'pnf','native');
+ insert into $WORKFLOW_TABLE_NAME(artifact_uuid, artifact_name, name, operation_name, version, description, body, resource_target, source) values
+ ('03fcdjf2-6af0-4f8d-bf9b-s3frzca23c19','ServiceLevelUpgrade','ServiceLevelUpgrade','ServiceLevelUpgrade',1.0,'ServiceLevel Upgrade Workflow to upgrade software',null,'service','native');
+
COMMIT;
EOF
NEXUS_DOCKER_REPO_MSO=nexus3.onap.org:10001
DOCKER_ENVIRONMENT=remote
-TAG=1.7.7-STAGING-latest
+TAG=1.8.0-STAGING-latest
TIME_OUT_DEFAULT_VALUE_SEC=1200
PROJECT_NAME=pnfSwU
DEFAULT_NETWORK_NAME=pnfswu_default
ESR_SYSTEM_INFO_JSON_FILE=$AAI_SIMULATOR_DATA_DIR/esr-system-info.json
CLOUD_ESR_SYSTEM_INFO_JSON_FILE=$AAI_SIMULATOR_DATA_DIR/cloud-esr-system-info.json
PNF_JSON_FILE=$AAI_SIMULATOR_DATA_DIR/pnf.json
+ PNF2_JSON_FILE=$AAI_SIMULATOR_DATA_DIR/pnf2.json
SERVICE_INSTANCE_JSON_FILE=$AAI_SIMULATOR_DATA_DIR/service-instance-aai.json
STATUS_CODE_ACCEPTED="202"
exit 1
fi
+ echo "$SCRIPT_NAME $(current_timestamp): Adding PNF_2.0"
+ status_code=$(curl -k --write-out %{http_code} --silent --output /dev/null -H "$BASIC_AUTHORIZATION_HEADER" -H "$ACCEPT_HEADER" -H "$CONTENT_TYPE_HEADER" $BASE_URL/network/pnfs/pnf/PNFDemo1 -X PUT -d @$"$PNF2_JSON_FILE")
+
+ if [[ "$status_code" -ne "$STATUS_CODE_ACCEPTED" ]] ; then
+ echo "$SCRIPT_NAME $(current_timestamp) ERROR: Unable to put PNF data in AAI Simulator. Status code received: $status_code"
+ exit 1
+ fi
+
echo "$SCRIPT_NAME $(current_timestamp): Adding ServiceInstance"
- status_code=$(curl -k --write-out %{http_code} --silent --output /dev/null -H "$BASIC_AUTHORIZATION_HEADER" -H "$ACCEPT_HEADER" -H "$CONTENT_TYPE_HEADER" $BASE_URL/business/customers/customer/5df8b6de-2083-11e7-93ae-92361f002676/service-subscriptions/service-subscription/pNF/service-instances/service-instance/ETE_Customer_807c7a02-249c-4db8-9fa9-bee973fe08ce -X PUT -d @$"$SERVICE_INSTANCE_JSON_FILE")
+ status_code=$(curl -k --write-out %{http_code} --silent --output /dev/null -H "$BASIC_AUTHORIZATION_HEADER" -H "$ACCEPT_HEADER" -H "$CONTENT_TYPE_HEADER" $BASE_URL/business/customers/customer/807c7a02-249c-4db8-9fa9-bee973fe08ce/service-subscriptions/service-subscription/pNF/service-instances/service-instance/cd4decf6-4f27-4775-9561-0e683ed43635 -X PUT -d @$"$SERVICE_INSTANCE_JSON_FILE")
if [[ "$status_code" -ne "$STATUS_CODE_ACCEPTED" ]] ; then
echo "$SCRIPT_NAME $(current_timestamp) ERROR: Unable to put ServiceInstance data in AAI Simulator. Status code received: $status_code"
- /etc/localtime:/etc/localtime:ro
- ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates
- ${CONFIG_DIR_PATH}/distribution-test-zip/zipped_sdc_csar.tar.gz:/distribution-test-zip/zipped_sdc_csar.tar.gz
+ - ${CONFIG_DIR_PATH}/distribution-test-zip/zipped_sdc_csar_2.0.tar.gz:/distribution-test-zip/zipped_sdc_csar_2.0.tar.gz
- ${CONFIG_DIR_PATH}/override-files/sdc-controller/onapheat:/app/config
environment:
- APP=sdc-controller
entrypoint:
- /bin/sh
- -c
- - 'mkdir -p /app/distribution-test-zip/unzipped && cp -R /distribution-test-zip/zipped_sdc_csar.tar.gz /app && tar -xvzf /app/zipped_sdc_csar.tar.gz -C /app/distribution-test-zip/unzipped && /app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"'
+ - 'mkdir -p /app/distribution-test-zip/unzipped && cp -R /distribution-test-zip/zipped_sdc_csar.tar.gz /app && cp -R /distribution-test-zip/zipped_sdc_csar_2.0.tar.gz /app && tar -xvzf /app/zipped_sdc_csar.tar.gz -C /app/distribution-test-zip/unzipped && tar -xvzf /app/zipped_sdc_csar_2.0.tar.gz -C /app/distribution-test-zip/unzipped && /app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"'
################################################################################
bpmn-infra:
user: root
container_name: aai-simulator
volumes:
- /etc/localtime:/etc/localtime:ro
+ - ${CONFIG_DIR_PATH}/a51e2bef-961c-496f-b235-b4540400e885.json:/app/a51e2bef-961c-496f-b235-b4540400e885.json
ports:
- "9993:9993"
environment:
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>2.8.5</version>
+ </dependency>
</dependencies>
<build>
<plugins>
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019 Nordix Foundation.
+ * Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*/
package org.onap.aaisimulator.controller;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import javax.ws.rs.core.MediaType;
+import org.onap.aaisimulator.models.ServiceModelVersion;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@Value("${SERVICE_DESIGN_AND_CREATION_RESPONSES_LOCATION:./}")
private String responsesLocation;
- @GetMapping(path = "/models/model/{model-invariant-id}/model-vers",
- produces = MediaType.APPLICATION_XML_VALUE)
+ @GetMapping(path = "/models/model/{model-invariant-id}/model-vers", produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
public ResponseEntity<String> getModelVers(@PathVariable("model-invariant-id") String modelInvariantId) {
Path responsesPath = Paths.get(responsesLocation).toAbsolutePath();
LOGGER.info("Will get ModelVer for 'model-invariant-id': {}, looking under {}",
modelInvariantId, responsesPath.toString());
- Path responsePath = responsesPath.resolve(modelInvariantId + ".xml");
+ Path responsePath = responsesPath.resolve(modelInvariantId + ".json");
if (!responsePath.toFile().exists()) {
LOGGER.error("{} not found", responsePath.toString());
return ResponseEntity.notFound().build();
}
try {
String content = new String(Files.readAllBytes(responsePath), StandardCharsets.UTF_8);
+ Gson gson = new GsonBuilder().setPrettyPrinting().create();
+ ServiceModelVersion json = gson.fromJson(content, ServiceModelVersion.class);
+ String jsonInString = gson.toJson(json);
LOGGER.info("{} found with {} characters", responsePath.toString(), content.length());
- return ResponseEntity.ok().body(content);
+ return ResponseEntity.ok().body(jsonInString);
} catch (IOException e) {
LOGGER.error("Failed to read response from {}: {}}", responsePath.toString(), e.getMessage());
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
}
}
-}
+}
\ No newline at end of file
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2020 Nordix Foundation.
+ * ================================================================================
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.aaisimulator.models;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+public class ModelVersion {
+
+ @SerializedName("model-version-id")
+ @Expose
+ private String modelVersionId;
+
+ @SerializedName("model-name")
+ @Expose
+ private String modelName;
+
+ @SerializedName("model-version")
+ @Expose
+ private String modelVersion;
+
+ @SerializedName("model-description")
+ @Expose
+ private String modelDescription;
+
+ @SerializedName("resource-version")
+ @Expose
+ private String resourceVersion;
+
+ public String getModelVersionId() {
+ return modelVersionId;
+ }
+
+ public void setModelVersionId(String modelVersionId) {
+ this.modelVersionId = modelVersionId;
+ }
+
+ public String getModelName() {
+ return modelName;
+ }
+
+ public void setModelName(String modelName) {
+ this.modelName = modelName;
+ }
+
+ public String getModelVersion() {
+ return modelVersion;
+ }
+
+ public void setModelVersion(String modelVersion) {
+ this.modelVersion = modelVersion;
+ }
+
+ public String getModelDescription() {
+ return modelDescription;
+ }
+
+ public void setModelDescription(String modelDescription) {
+ this.modelDescription = modelDescription;
+ }
+
+ public String getResourceVersion() {
+ return resourceVersion;
+ }
+
+ public void setResourceVersion(String resourceVersion) {
+ this.resourceVersion = resourceVersion;
+ }
+}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2020 Nordix Foundation.
+ * ================================================================================
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.aaisimulator.models;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+import java.util.List;
+
+public class ModelVersions {
+
+ @SerializedName("model-ver")
+ @Expose
+ private List<ModelVersion> modelVer = null;
+
+ public List<ModelVersion> getModelVer() {
+ return modelVer;
+ }
+
+ public void setModelVer(List<ModelVersion> modelVer) {
+ this.modelVer = modelVer;
+ }
+}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2020 Nordix Foundation.
+ * ================================================================================
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.aaisimulator.models;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+public class ServiceModelVersion {
+
+ @SerializedName("model-vers")
+ @Expose
+ private ModelVersions modelVers;
+
+ public ModelVersions getModelVers() {
+ return modelVers;
+ }
+
+ public void setModelVers(ModelVersions modelVers) {
+ this.modelVers = modelVers;
+ }
+}
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019 Nordix Foundation.
+ * Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
package org.onap.aaisimulator.controller;
import org.junit.Test;
+import org.onap.aaisimulator.models.ServiceModelVersion;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.http.HttpStatus;
@Test
public void should_reply_sample_modelvers_response() {
- final String url = getUrl(SERVICE_DESIGN_AND_CREATION_URL,
- "/models/model/a51e2bef-961c-496f-b235-b4540400e885/model-vers");
- ResponseEntity<String> actual = testRestTemplateService.invokeHttpGet(url, String.class);
- String expectedXml = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
- "<model-vers xmlns=\"http://org.onap.aai.inventory/v11\">\n" +
- " <model-ver>\n" +
- " <model-version-id>c0818142-324d-4a8c-8065-45a61df247a5</model-version-id>\n" +
- " <model-name>EricService</model-name>\n" +
- " <model-version>1.0</model-version>\n" +
- " <model-description>blah</model-description>\n" +
- " <resource-version>1594657102313</resource-version>\n" +
- " </model-ver>\n" +
- " <model-ver>\n" +
- " <model-version-id>4442dfc1-0d2d-46b4-b0bc-a2ac10448269</model-version-id>\n" +
- " <model-name>EricService</model-name>\n" +
- " <model-version>2.0</model-version>\n" +
- " <model-description>blahhhh</model-description>\n" +
- " <resource-version>1594707742646</resource-version>\n" +
- " </model-ver>\n" +
- "</model-vers>";
+ final String url = getUrl(SERVICE_DESIGN_AND_CREATION_URL, "/models/model/a51e2bef-961c-496f-b235-b4540400e885/model-vers");
+
+ ResponseEntity<?> actual = testRestTemplateService.invokeHttpGet(url, String.class);
+
+ String expectedXml = "{\n"
+ + " \"model-vers\": {\n"
+ + " \"model-ver\": [\n"
+ + " {\n"
+ + " \"model-version-id\": \"cd4decf6-4f27-4775-9561-0e683ed43635\",\n"
+ + " \"model-name\": \"EricService\",\n"
+ + " \"model-version\": \"1.0\",\n"
+ + " \"model-description\": \"service_instance_1.0\",\n"
+ + " \"resource-version\": \"1594657102313\"\n"
+ + " },\n"
+ + " {\n"
+ + " \"model-version-id\": \"4442dfc1-0d2d-46b4-b0bc-a2ac10448269\",\n"
+ + " \"model-name\": \"EricService\",\n"
+ + " \"model-version\": \"2.0\",\n"
+ + " \"model-description\": \"service_instance_2.0\",\n"
+ + " \"resource-version\": \"1594707742646\"\n"
+ + " }\n"
+ + " ]\n"
+ + " }\n"
+ + "}";
assertEquals(HttpStatus.OK, actual.getStatusCode());
MediaType contentType = actual.getHeaders().getContentType();
assertNotNull(contentType);
- assertTrue(contentType.isCompatibleWith(MediaType.APPLICATION_XML));
+ assertTrue(contentType.isCompatibleWith(MediaType.APPLICATION_JSON));
assertEquals(expectedXml, actual.getBody());
}
}
\ No newline at end of file
--- /dev/null
+{
+ "model-vers": {
+ "model-ver": [
+ {
+ "model-version-id": "cd4decf6-4f27-4775-9561-0e683ed43635",
+ "model-name": "EricService",
+ "model-version": "1.0",
+ "model-description": "service_instance_1.0",
+ "resource-version": "1594657102313"
+ },
+ {
+ "model-version-id": "4442dfc1-0d2d-46b4-b0bc-a2ac10448269",
+ "model-name": "EricService",
+ "model-version": "2.0",
+ "model-description": "service_instance_2.0",
+ "resource-version": "1594707742646"
+ }
+ ]
+ }
+}
\ No newline at end of file
+++ /dev/null
-<?xml version="1.0" encoding="utf-8"?>
-<model-vers xmlns="http://org.onap.aai.inventory/v11">
- <model-ver>
- <model-version-id>c0818142-324d-4a8c-8065-45a61df247a5</model-version-id>
- <model-name>EricService</model-name>
- <model-version>1.0</model-version>
- <model-description>blah</model-description>
- <resource-version>1594657102313</resource-version>
- </model-ver>
- <model-ver>
- <model-version-id>4442dfc1-0d2d-46b4-b0bc-a2ac10448269</model-version-id>
- <model-name>EricService</model-name>
- <model-version>2.0</model-version>
- <model-description>blahhhh</model-description>
- <resource-version>1594707742646</resource-version>
- </model-ver>
-</model-vers>
\ No newline at end of file
WAIT_FOR_POPULATE_AAI_SCRIPT=$CONFIG_DIR/"wait-for-aai-config-job.sh"
WAIT_FOR_CONTAINER_SCRIPT=$CONFIG_DIR/"wait-for-container.sh"
PNF_PAYLOAD_PATH=$CONFIG_DIR/aai-simulator-populate-data/pnf.json
+PNF2_PAYLOAD_PATH=$CONFIG_DIR/aai-simulator-populate-data/pnf2.json
echo "Running $SCRIPT_HOME/$SCRIPT_NAME ..."
echo "updating PNF ip-address in pnf.json"
sed -i "s/pnfaddr/$LOCAL_IP/g" $PNF_PAYLOAD_PATH
+sed -i "s/pnfaddr/$LOCAL_IP/g" $PNF2_PAYLOAD_PATH
if [ "$DOCKER_ENVIRONMENT" == "remote" ]; then
echo "Starting docker containers with remote images ..."
-#!/bin/bash -x
+#!/bin/sh
# ============LICENSE_START===================================================
# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
# ============================================================================
# limitations under the License.
# ============LICENSE_END=====================================================
-bash -c "features disable distributed-locking"
+sh -c "features disable distributed-locking"
*** Test Cases ***
Functional Test Case 1
- [Documentation] Functional Test Case 1 - FTC1
- Start Process ${AUTOTEST_ROOT}/FTC1.sh remote auto-clean --env-file ${TEST_ENV} shell=true cwd=${AUTOTEST_ROOT}
+ [Documentation] Deploy PMS without SDNC
+ Start Process ${ARCHIVES}/test/pms_a1sim.sh
${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
Functional Test Case 2
- [Documentation] Functional Test Case 2 - FTC150
- Start Process ${AUTOTEST_ROOT}/FTC150.sh remote auto-clean --env-file ${TEST_ENV} shell=true cwd=${AUTOTEST_ROOT}
+ [Documentation] Deploy PMS with SDNC
+ Start Process ${ARCHIVES}/test/pms_a1sim_sdnc.sh
${cli_cmd_output}= Wait For Process timeout=3600
Should Be Equal as Integers ${cli_cmd_output.rc} 0
- ${ResultFileContent}= Get File ${AUTOTEST_ROOT}/.resultFTC150.txt
- Should Be Equal As Integers ${ResultFileContent} 0
-
-
Set Environment Variable MR_FILE_PREFIX_MAPPING PM_MEAS_FILES:A
Set Environment Variable DR_REDIR_FEEDS 2:A
Set Environment Variable FTP_FILE_PREFIXES A
+ Set Environment Variable HTTP_FILE_PREFIXES A
+ Set Environment Variable HTTP_TYPE HTTP
Set Environment Variable NUM_FTPFILES 1
+ Set Environment Variable NUM_HTTPFILES 1
Set Environment Variable NUM_PNFS 1
Set Environment Variable NUM_FTP_SERVERS 1
+ Set Environment Variable NUM_HTTP_SERVERS 1
Set Environment Variable DR_FEEDS 2:A
Set Environment Variable DR_REDIR_SIM drsim_redir
Set Environment Variable SFTP_SIMS sftp-server0:22
Set Environment Variable FTPES_SIMS ftpes-server-vsftpd0:21
+ Set Environment Variable HTTP_SIMS http-server0:80
--- /dev/null
+*** Settings ***
+Documentation DFC Functional test suite. Single event with single file - FTPES and SFTP protocols.
--- /dev/null
+*** Settings ***
+Library OperatingSystem
+Library RequestsLibrary
+Library Process
+
+Resource ../../resources/common-keywords.robot
+
+*** Variables ***
+${CONSUL_UPL_APP} /usr/bin/curl -v http://127.0.0.1:8500/v1/kv/dfc_app0?dc=dc1 -X PUT -H 'Accept: application/json' -H 'Content-Type: application/json' -H 'X-Requested-With: XMLHttpRequest' --data-binary @${SIMGROUP_ROOT}/consul/c12_feed2_PM_MEAS.json
+${CONSUL_GET_APP} /usr/bin/curl -v http://127.0.0.1:8500/v1/kv/dfc_app0?raw
+${CBS_GET_MERGED_CONFIG} /usr/bin/curl -v http://127.0.0.1:10000/service_component_all/dfc_app0
+
+*** Test Cases ***
+
+######## Single file, HTTP
+
+Verify single event with single 1MB HTTP file. From event poll to published file
+ [TAGS] DFC_FUNCTIONAL_20
+ [Documentation] Verify single event with single HTTP 1MB file from event poll to published file.
+ ${cli_cmd_output}= Run Process ${DFC_ROOT}/../dfc-containers-clean.sh stderr=STDOUT
+ Verify Single Event From Event Poll To Published File 1 --tc300 HTTP
+
+
+Verify single event with single 5MB HTTP file. From event poll to published file
+ [TAGS] DFC_FUNCTIONAL_21
+ [Documentation] Verify single event with single HTTP 5MB file from event poll to published file.
+ Verify Single Event From Event Poll To Published File 5 --tc301 HTTP
+
+
+Verify single event with single 50MB HTTP file. From event poll to published file
+ [TAGS] DFC_FUNCTIONAL_22
+ [Documentation] Verify single event with single HTTP 50MB file from event poll to published file.
+ Verify Single Event From Event Poll To Published File 50 --tc302 HTTP
+
+
+*** Keywords ***
+Verify Single Event From Event Poll To Published File
+ [Documentation] Keyword to verify single event with file with given parameters.
+ [Arguments] ${file_size_in_mb} ${mr_tc} ${http_type}
+ Set Environment Variable MR_TC ${mr_tc}
+ Set Environment Variable FILE_SIZE ${file_size_in_mb}MB
+ Set Environment Variable HTTP_TYPE ${http_type}
+ Set Default Environment Variables
+
+ ${cli_cmd_output}= Run Process ./simulators-start.sh cwd=${SIMGROUP_ROOT}
+ Log To Console Simulator-start:
+ Log To Console ${cli_cmd_output.stdout} ${cli_cmd_output.stderr}
+ MR Sim Emitted Files Equal 0 #Verify 0 file emitted from MR sim
+ DR Sim Published Files Equal 0 #Verify 0 file published to DR sim
+
+ ${cli_cmd_output}= Run Process ${CONSUL_UPL_APP} shell=yes
+ Log To Console Consul APP write:
+ Log To Console ${cli_cmd_output.stdout} ${cli_cmd_output.stderr}
+
+ ${cli_cmd_output}= Run Process ${CONSUL_GET_APP} shell=yes
+ Log To Console Consul APP read:
+ Log To Console ${cli_cmd_output.stdout} ${cli_cmd_output.stderr}
+
+ ${cli_cmd_output}= Run Process ${CBS_GET_MERGED_CONFIG} shell=yes
+ Log To Console CBS merged configuration:
+ Log To Console ${cli_cmd_output.stdout} ${cli_cmd_output.stderr}
+
+ Sleep 10
+
+ Start DFC
+
+ Wait Until Keyword Succeeds 1 minute 10 sec MR Sim Emitted Files Equal 1 #Verify 1 file emitted from MR sim
+ Wait Until Keyword Succeeds 1 minute 10 sec DR Sim Query Not Published Equal 1 #Verify 1 query response for not published files
+ Wait Until Keyword Succeeds 1 minute 10 sec DR Sim Published Files Equal 1 #Verify 1 file published to DR sim
+ DR Redir Sim Downloaded Volume Equal ${file_size_in_mb} 000 000 #Verify correct number of bytes published file data in DR redir sim
+
+ [Teardown] Test Teardown
+
+Set Default Environment Variables
+ [Documentation] Set default environment variables for simulators setup
+ Set Environment Variable DR_TC --tc normal
+ Set Environment Variable DR_REDIR_TC --tc normal
+ Set Environment Variable MR_GROUPS OpenDcae-c12:PM_MEAS_FILES
+ Set Environment Variable MR_FILE_PREFIX_MAPPING PM_MEAS_FILES:A
+ Set Environment Variable DR_REDIR_FEEDS 2:A
+ Set Environment Variable FTP_FILE_PREFIXES A
+ Set Environment Variable FTP_TYPE SFTP
+ Set Environment Variable HTTP_FILE_PREFIXES A
+ Set Environment Variable NUM_FTPFILES 1
+ Set Environment Variable NUM_HTTPFILES 1
+ Set Environment Variable NUM_PNFS 1
+ Set Environment Variable NUM_FTP_SERVERS 1
+ Set Environment Variable NUM_HTTP_SERVERS 1
+ Set Environment Variable DR_FEEDS 2:A
+ Set Environment Variable DR_REDIR_SIM drsim_redir
+ Set Environment Variable SFTP_SIMS sftp-server0:22
+ Set Environment Variable FTPES_SIMS ftpes-server-vsftpd0:21
+ Set Environment Variable HTTP_SIMS http-server0:80
*** Settings ***
-Documentation DFC Functional test suite. Single event with single file.
+Documentation DFC Functional test suite. Single event with single file - HTTP protocol.
Set Environment Variable MR_FILE_PREFIX_MAPPING PM_MEAS_FILES:A
Set Environment Variable DR_REDIR_FEEDS 2:A
Set Environment Variable FTP_FILE_PREFIXES A
+ Set Environment Variable HTTP_FILE_PREFIXES A
Set Environment Variable NUM_FTPFILES 1
+ Set Environment Variable NUM_HTTPFILES 1
Set Environment Variable NUM_PNFS 1
Set Environment Variable FILE_SIZE 1MB
Set Environment Variable FTP_TYPE SFTP
+ Set Environment Variable HTTP_TYPE HTTP
Set Environment Variable NUM_FTP_SERVERS 1
+ Set Environment Variable NUM_HTTP_SERVERS 1
Set Environment Variable DR_FEEDS 2:A
Set Environment Variable DR_REDIR_SIM drsim_redir
Set Environment Variable SFTP_SIMS sftp-server0:22
- Set Environment Variable FTPS_SIMS ftpes-server-vsftpd0:21
+ Set Environment Variable FTPES_SIMS ftpes-server-vsftpd0:21
+ Set Environment Variable HTTP_SIMS http-server0:80
${cli_cmd_output}= Run Process ./simulators-start.sh cwd=${SIMGROUP_ROOT}
Log To Console Simulator-start:
--- /dev/null
+{
+ "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"
+ }
+}
\ No newline at end of file
--- /dev/null
+{
+ "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"
+ }
+}
\ No newline at end of file
"dmaap_info": {
"client_id": "1475976809466",
"client_role": "org.onap.dcae.pmPublisher",
- "topic_url": "https://mr-sim:3095/events/unauthenticated.DCAE_CL_OUTPUT",
+ "topic_url": "http://dmaap:3904/events/unauthenticated.DCAE_CL_OUTPUT",
"location": "san-francisco"
},
"type": "message_router"
"dmaap_info": {
"client_id": "1575976809466",
"client_role": "org.onap.dcae.aaiSub",
- "topic_url": "https://mr-sim:3095/events/AAI_EVENT",
+ "topic_url": "http://dmaap:3904/events/AAI_EVENT",
"location": "san-francisco"
}
},
"policy_pm_subscriber": {
"dmaap_info": {
"location": "san-francisco",
- "topic_url": "https://mr-sim:3095/events/unauthenticated.PMSH_CL_INPUT",
+ "topic_url": "http://dmaap:3904/events/unauthenticated.PMSH_CL_INPUT",
"client_role": "org.onap.dcae.pmSubscriber",
"client_id": "1575876809456"
},
+++ /dev/null
-[
- {
- "httpRequest": {
- "path": "/events/AAI_EVENT/.*",
- "queryStringParameters" : {
- "timeout" : [ "1000" ]
- }
- },
- "httpResponse": {
- "statusCode": 200,
- "headers": {
- "content-type": [
- "application/json"
- ]
- },
- "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\",\"model-invariant-id\":\"7129e420-d396-4efb-af02-6b83499b12f8\",\"model-version-id\":\"e80a6ae3-cafd-4d24-850d-e14c084a5ca9\",\"orchestration-status\":\"Active\"}}"
- ]
- },
- "times": {
- "remainingTimes": 1,
- "unlimited": false
- }
- },
- {
- "httpRequest": {
- "path": "/events/AAI_EVENT/.*",
- "queryStringParameters" : {
- "timeout" : [ "1000" ]
- }
- },
- "httpResponse": {
- "statusCode": 200,
- "headers": {
- "content-type": [
- "application/json"
- ]
- },
- "body": []
- }
- }
-]
+++ /dev/null
-[
- {
- "httpRequest": {
- "path": "/events/AAI_EVENT/.*",
- "queryStringParameters" : {
- "timeout" : [ "1000" ]
- }
- },
- "httpResponse": {
- "statusCode": 200,
- "headers": {
- "content-type": [
- "application/json"
- ]
- },
- "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\",\"model-invariant-id\":\"7129e420-d396-4efb-af02-6b83499b12f8\",\"model-version-id\":\"e80a6ae3-cafd-4d24-850d-e14c084a5ca9\",\"orchestration-status\":\"Active\"}}"
- ]
- },
- "times": {
- "remainingTimes": 1,
- "unlimited": false
- }
- },
- {
- "httpRequest": {
- "path": "/events/AAI_EVENT/.*",
- "queryStringParameters" : {
- "timeout" : [ "1000" ]
- }
- },
- "httpResponse": {
- "statusCode": 200,
- "headers": {
- "content-type": [
- "application/json"
- ]
- },
- "body": []
- }
- }
-]
+++ /dev/null
-[
- {
- "httpRequest": {
- "path": "/events/unauthenticated.PMSH_CL_INPUT/.*",
- "queryStringParameters" : {
- "timeout" : [ "1000" ]
- }
- },
- "httpResponse": {
- "statusCode": 200,
- "headers": {
- "content-type": [
- "application/json"
- ]
- },
- "body": [
- "{\"name\": \"ResponseEvent\", \"nameSpace\": \"org.onap.policy.apex.onap.pmcontrol\", \"source\": \"APEX\", \"target\": \"DCAE\", \"version\": \"0.0.1\", \"status\": {\"subscriptionName\": \"ExtraPM-All-gNB-R2B\", \"nfName\": \"pnf-existing\", \"changeType\": \"CREATE\", \"message\": \"success\"}}"
- ]
- },
- "times": {
- "remainingTimes": 1,
- "unlimited": false
- }
- },
- {
- "httpRequest": {
- "path": "/events/unauthenticated.PMSH_CL_INPUT/.*",
- "queryStringParameters" : {
- "timeout" : [ "1000" ]
- }
- },
- "httpResponse": {
- "statusCode": 200,
- "headers": {
- "content-type": [
- "application/json"
- ]
- },
- "body": []
- }
- }
-]
--- /dev/null
+{
+ "name":"ResponseEvent",
+ "nameSpace":"org.onap.policy.apex.onap.pmcontrol",
+ "source":"APEX",
+ "target":"DCAE",
+ "version":"0.0.1",
+ "status":{
+ "subscriptionName":"ExtraPM-All-gNB-R2B",
+ "nfName":"pnf-existing",
+ "changeType":"CREATE",
+ "message":"success"
+ }
+}
\ No newline at end of file
*** Variables ***
${PMSH_BASE_URL} https://${PMSH_IP}:8443
-${MR_BASE_URL} https://${MR_SIM_IP_ADDRESS}:3095
+${MR_BASE_URL} http://${MR_IP_ADDRESS}:3904
${CBS_BASE_URL} https://${CBS_SIM_IP_ADDRESS}:10443
${SUBSCRIPTIONS_ENDPOINT} /subscriptions
+${POLICY_PUBLISH_MR_TOPIC} /events/unauthenticated.PMSH_CL_INPUT
+${AAI_MR_TOPIC} /events/AAI_EVENT
-${MR_EXPECTATION_AAI_PNF_CREATED} %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/mr-expectation-aai-pnf-created.json
-${MR_EXPECTATION_AAI_PNF_REMOVED} %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/mr-expectation-aai-pnf-deleted.json
-${MR_EXPECTATION_POLICY_RESPONSE_PNF_EXISTING} %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/mr-expectation-policy-subscription-created-pnf-existing.json
-${CBS_EXPECTATION_ADMIN_STATE_UNLOCKED} %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/cbs-expectation-unlocked-config.json
+${MR_AAI_PNF_CREATED} %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/aai-pnf-create.json
+${MR_AAI_PNF_REMOVED} %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/aai-pnf-delete.json
+${MR_POLICY_RESPONSE_PNF_EXISTING} %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/policy-sub-created-pnf-existing.json
+${CBS_EXPECTATION_ADMIN_STATE_UNLOCKED} %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/cbs-expectation-unlocked-config.json
${ADMIN_STATE_LOCKED_PATTERN} 'administrativeState': 'LOCKED'
${CLI_EXEC_GET_CBS_CONFIG_FIRST} docker exec pmsh /bin/sh -c "grep -m 1 'PMSH config from CBS' /var/log/ONAP/dcaegen2/services/pmsh/application.log"
[Tags] PMSH_02
[Documentation] Verify database has been created and is empty
[Timeout] 10 seconds
- ${resp}= Get Request pmsh_session ${SUBSCRIPTIONS_ENDPOINT}
+ ${resp}= Get Request pmsh_session ${SUBSCRIPTIONS_ENDPOINT}
Should Be True ${resp.status_code} == 200
Should Contain ${resp.text} []
Verify PNF detected in AAI when administrative state unlocked
[Tags] PMSH_03
[Documentation] Verify PNF detected when administrative state unlocked
- [Timeout] 40 seconds
+ [Timeout] 60 seconds
SetAdministrativeStateToUnlocked
Sleep 31 Allow PMSH time to pick up changes in CBS config
- ${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]['nf_sub_status']} PENDING_CREATE
+ ${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]['nf_sub_status']} PENDING_CREATE
Verify Policy response on MR is handled
[Tags] PMSH_04
[Documentation] Verify policy response on MR is handled
[Timeout] 60 seconds
- SimulatePolicyResponse ${MR_EXPECTATION_POLICY_RESPONSE_PNF_EXISTING}
+ SimulatePolicyResponse ${MR_POLICY_RESPONSE_PNF_EXISTING}
Sleep 31 seconds Ensure Policy response on MR is picked up
- ${resp}= Get Request pmsh_session ${SUBSCRIPTIONS_ENDPOINT}
- Should Be Equal As Strings ${resp.json()[0]['network_functions'][0]['nf_sub_status']} CREATED
+ ${resp}= Get Request pmsh_session ${SUBSCRIPTIONS_ENDPOINT}
+ Should Be Equal As Strings ${resp.json()[0]['network_functions'][0]['nf_sub_status']} CREATED
Verify AAI event on MR detailing new PNF being detected is handled
[Tags] PMSH_05
[Documentation] Verify PNF created AAI event on MR is handled
[Timeout] 60 seconds
- SimulateNewPNF
+ SimulateNewPNF ${MR_AAI_PNF_CREATED}
Sleep 31 seconds Ensure AAI event on MR is picked up
- ${resp}= Get Request pmsh_session ${SUBSCRIPTIONS_ENDPOINT}
+ ${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]['nf_sub_status']} PENDING_CREATE
+ 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
[Tags] PMSH_06
[Documentation] Verify PNF deleted AAI event on MR is handled
[Timeout] 60 seconds
- SimulateDeletedPNF
+ SimulateDeletedPNF ${MR_AAI_PNF_REMOVED}
Sleep 31 seconds Ensure AAI event on MR is picked up
- ${resp}= Get Request pmsh_session ${SUBSCRIPTIONS_ENDPOINT}
- Should Not Contain ${resp.text} pnf_newly_discovered
+ ${resp}= Get Request pmsh_session ${SUBSCRIPTIONS_ENDPOINT}
+ Should Not Contain ${resp.text} pnf_newly_discovered
*** Keywords ***
CreateSessions
- Create Session pmsh_session ${PMSH_BASE_URL}
- Create Session mr_sim_session ${MR_BASE_URL}
+ Create Session pmsh_session ${PMSH_BASE_URL}
+ Create Session mr_sim_session ${MR_BASE_URL}
Create Session cbs_sim_session ${CBS_BASE_URL}
SetAdministrativeStateToUnlocked
${resp} = Put Request cbs_sim_session /expectation data=${data}
Should Be True ${resp.status_code} == 201
-SimulateNewPNF
- ${data}= Get Data From File ${MR_EXPECTATION_AAI_PNF_CREATED}
- ${resp} = Put Request mr_sim_session /clear data={"path": "/events/AAI_EVENT/dcae_pmsh_cg/dcae_pmsh_aai_event"}
- Should Be True ${resp.status_code} == 200
- ${resp} = Put Request mr_sim_session /expectation data=${data}
- Should Be True ${resp.status_code} == 201
SimulatePolicyResponse
[Arguments] ${expected_contents}
- ${data}= Get Data From File ${expected_contents}
- ${resp} = Put Request mr_sim_session /clear data={"path": "/events/unauthenticated.PMSH_CL_INPUT/dcae_pmsh_cg/dcae_pmsh_policy_cl_input"}
- Should Be True ${resp.status_code} == 200
- ${resp} = Put Request mr_sim_session /expectation data=${data}
- Should Be True ${resp.status_code} == 201
+ ${json_value}= json_from_file ${expected_contents}
+ ${resp}= PostCall ${POLICY_PUBLISH_MR_TOPIC} ${json_value}
+ log ${resp.text}
+ Should Be Equal As Strings ${resp.status_code} 200
+ ${count}= Evaluate $resp.json().get('count')
+ log 'JSON Response Code:'${resp}
+
+SimulateNewPNF
+ [Arguments] ${expected_contents}
+ ${json_value}= json_from_file ${expected_contents}
+ ${resp}= PostCall ${AAI_MR_TOPIC} ${json_value}
+ log ${resp.text}
+ Should Be Equal As Strings ${resp.status_code} 200
+ ${count}= Evaluate $resp.json().get('count')
+ log 'JSON Response Code:'${resp}
SimulateDeletedPNF
- ${data}= Get Data From File ${MR_EXPECTATION_AAI_PNF_REMOVED}
- ${resp} = Put Request mr_sim_session /clear data={"path": "/events/AAI_EVENT/dcae_pmsh_cg/dcae_pmsh_aai_event"}
- Should Be True ${resp.status_code} == 200
- ${resp} = Put Request mr_sim_session /expectation data=${data}
- Should Be True ${resp.status_code} == 201
+ [Arguments] ${expected_contents}
+ ${json_value}= json_from_file ${expected_contents}
+ ${resp}= PostCall ${AAI_MR_TOPIC} ${json_value}
+ log ${resp.text}
+ Should Be Equal As Strings ${resp.status_code} 200
+ ${count}= Evaluate $resp.json().get('count')
+ log 'JSON Response Code:'${resp}
+
+PostCall
+ [Arguments] ${url} ${data}
+ ${headers}= Create Dictionary Accept=application/json Content-Type=application/json
+ ${resp}= Post Request mr_sim_session ${url} json=${data} headers=${headers}
+ [Return] ${resp}
{
- "distributionID": "cfe30d6c-eb67-4ffb-ba98-4b654162223a",
- "serviceName": "manualDistributionTestService",
- "serviceVersion": "1.0",
- "serviceUUID": "28d4acf3-4791-4998-8d06-1cdf6d1767a9",
- "serviceDescription": "Test",
- "serviceInvariantUUID": "0ddc448d-5513-44bc-8b02-5759d84600d5",
- "resources": [
- {
- "resourceInstanceName": "manualDistributionTestVNF 0",
- "resourceCustomizationUUID": "82ad3aa0-edc6-410c-a217-655fb064323f",
- "resourceName": "manualDistributionTestVNF",
- "resourceVersion": "1.0",
- "resoucreType": "VF",
- "resourceUUID": "e8e39dc4-4761-4da7-aedf-7d1fd3637772",
- "resourceInvariantUUID": "0a0b9979-863d-4b7e-b7f4-d27725a182b3",
- "category": "Application L4+",
- "subcategory": "Media Servers",
- "artifacts": [
+ "distributionID": "f0d0e9e2-10aa-4f66-a0cc-cf5ecb386b42",
+ "serviceName": "EtsiServiceCSIT3",
+ "serviceVersion": "1.0",
+ "serviceUUID": "fdea6501-dabd-4428-b52c-623336a3b403",
+ "serviceDescription": "test",
+ "serviceInvariantUUID": "10b3d278-e262-44ca-a0c0-4e663c2d7562",
+ "resources": [
{
- "artifactName": "manualdistributiontestvnf0_modules.json",
- "artifactType": "VF_MODULES_METADATA",
- "artifactURL": "/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/manualdistributiontestvnf0_modules.json",
- "artifactChecksum": "NTc0NDlkNzdmYzVmMDM3ZjMxMTE2NDBmYWJiMDM1NzY\u003d",
- "artifactDescription": "Auto-generated VF Modules information artifact",
- "artifactTimeout": 120,
- "artifactVersion": "1",
- "artifactUUID": "a10f397a-6546-4a27-843f-25821955ef3e",
- "relatedArtifactsInfo": []
- },
- {
- "artifactName": "base_ves_med1.yaml",
- "artifactType": "HEAT",
- "artifactURL": "/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/base_ves_med1.yaml",
- "artifactChecksum": "YTAwNTQ3NjczY2Y5MmUwZjUzZTY1ZjNhNTA0NGQyMDY\u003d",
- "artifactDescription": "created from csar",
- "artifactTimeout": 120,
- "artifactVersion": "2",
- "artifactUUID": "e216d9da-18c4-460f-8b2b-d7f8dd9e9295",
- "generatedArtifact": {
- "artifactName": "base_ves_med1.env",
- "artifactType": "HEAT_ENV",
- "artifactURL": "/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/base_ves_med1.env",
- "artifactChecksum": "Mjg5YTVhNTlmYTdjYTFlYjYxMDlhODYzNmJhZGJiZGE\u003d",
- "artifactDescription": "Auto-generated HEAT Environment deployment artifact",
- "artifactTimeout": 120,
- "artifactVersion": "2",
- "artifactUUID": "6243747f-e794-4519-82b2-6399846f1951",
- "generatedFromUUID": "e216d9da-18c4-460f-8b2b-d7f8dd9e9295"
- },
- "relatedArtifactsInfo": []
- },
- {
- "artifactName": "base_ves_med1.env",
- "artifactType": "HEAT_ENV",
- "artifactURL": "/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/base_ves_med1.env",
- "artifactChecksum": "Mjg5YTVhNTlmYTdjYTFlYjYxMDlhODYzNmJhZGJiZGE\u003d",
- "artifactDescription": "Auto-generated HEAT Environment deployment artifact",
- "artifactTimeout": 120,
- "artifactVersion": "2",
- "artifactUUID": "6243747f-e794-4519-82b2-6399846f1951",
- "relatedArtifactsInfo": []
- },
+ "resourceInstanceName": "EtsiVnfCSIT3 0",
+ "resourceCustomizationUUID": "3341825c-837c-4e84-8a82-cc69033ca92f",
+ "resourceName": "EtsiVnfCSIT3",
+ "resourceVersion": "1.0",
+ "resourceUUID": "bb7ff27f-d609-4d02-9926-2f4c5eb89316",
+ "resourceInvariantUUID": "037f7b1b-5c62-44c1-b806-f92fe8970171",
+ "category": "Generic",
+ "subcategory": "Network Service",
+ "artifacts": [],
+ "artifactsImpl": [],
+ "resourceType": "VF"
+ }
+ ],
+ "serviceArtifacts": [
{
- "artifactName": "TOSCA.meta",
- "artifactType": "OTHER",
- "artifactURL": "/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/TOSCA.meta",
- "artifactChecksum": "NWE2ODcyOWY0NGI2MzEyOGViYjUxNTEwMjU5OWRhZmI\u003d",
- "artifactDescription": "created from csar",
- "artifactTimeout": 120,
- "artifactVersion": "1",
- "artifactUUID": "6c64d38b-186f-4339-9a76-a266c40f40ec",
- "relatedArtifactsInfo": []
- },
+ "artifactName": "service-Etsiservicecsit3-csar.csar",
+ "artifactType": "TOSCA_CSAR",
+ "artifactURL": "/unzipped_sdc_csar/v1/catalog/services/Etsiservicecsit3/1.0/artifacts/service-Etsiservicecsit3-csar.csar",
+ "artifactChecksum": "NDcwMjRmZjg3MWYwY2FmMTAxN2RlZWEzMWE2OTU2ZjA=",
+ "artifactDescription": "TOSCA definition package ofthe asset",
+ "artifactTimeout": 0,
+ "artifactVersion": "1",
+ "artifactUUID": "587a89d9-ca2d-41b7-929e-de191fd4bf29",
+ "relatedArtifacts": []
+ }
+ ],
+ "workloadContext": "Production",
+ "resourcesImpl": [
{
- "artifactName": "descriptor.yaml",
- "artifactType": "OTHER",
- "artifactURL": "/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/descriptor.yaml",
- "artifactChecksum": "YWZkNTg2ZGMzZjRhZjgxNzNkODJiNjgwZmRlZjlmNDE\u003d",
- "artifactDescription": "created from csar",
- "artifactTimeout": 120,
- "artifactVersion": "1",
- "artifactUUID": "4bd0cdf6-0b12-4d19-b3d8-6dbc34fe397e",
- "relatedArtifactsInfo": []
+ "resourceInstanceName": "EtsiVnfCSIT3 0",
+ "resourceCustomizationUUID": "3341825c-837c-4e84-8a82-cc69033ca92f",
+ "resourceName": "EtsiVnfCSIT3",
+ "resourceVersion": "1.0",
+ "resourceUUID": "bb7ff27f-d609-4d02-9926-2f4c5eb89316",
+ "resourceInvariantUUID": "037f7b1b-5c62-44c1-b806-f92fe8970171",
+ "category": "Generic",
+ "subcategory": "Network Service",
+ "artifacts": [],
+ "artifactsImpl": [],
+ "resourceType": "VF"
}
- ]
- }
- ],
- "serviceArtifacts": [
- {
- "artifactName": "service-Manualdistributiontestservice-csar.csar",
- "artifactType": "TOSCA_CSAR",
- "artifactURL": "/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/artifacts/service-Manualdistributiontestservice-csar.csar",
- "artifactChecksum": "YWYxNmUxNTlhMmE3MjA1NGVhNTBhYTdkMmU0OTZjNzM\u003d",
- "artifactDescription": "TOSCA definition package of the asset",
- "artifactTimeout": 0,
- "artifactVersion": "1",
- "artifactUUID": "e6e8c36a-b939-4845-995a-41c50be890a0"
- }
- ],
- "workloadContext": "Production"
+ ]
}
--- /dev/null
+ubuntu_16.04
--- /dev/null
+{
+ "id": "73522444-e8e9-49c1-be29-d355800aa349",
+ "vnfdId": "b1bb0ce7-2222-4fa7-95ed-4840d70a1177",
+ "vnfProductName": "",
+ "vnfSoftwareVersion": "",
+ "vnfdVersion": "1.0",
+ "checksum": {},
+ "softwareImages": [],
+ "onboardingState": "ONBOARDED",
+ "operationalState": "ENABLED",
+ "_links": {
+ "self": {
+ "href": "http://so-vnfm-adapter:9092/so/vnfm-adapter/v1/vnfpkgm/v1/vnf_packages/73522444-e8e9-49c1-be29-d355800aa349"
+ },
+ "vnfd": {
+ "href": "http://so-vnfm-adapter:9092/so/vnfm-adapter/v1/vnfpkgm/v1/vnf_packages/73522444-e8e9-49c1-be29-d355800aa349/vnfd"
+ },
+ "packageContent": {
+ "href": "http://so-vnfm-adapter:9092/so/vnfm-adapter/v1/vnfpkgm/v1/vnf_packages/73522444-e8e9-49c1-be29-d355800aa349/package_content"
+ }
+ }
+}
--- /dev/null
+tosca_definitions_version: tosca_simple_yaml_1_0
+metadata:
+ template_name: vCPE_vgw
+ template_version: "1.0"
+ template_author: onap
+ VNFD_SCHEMA_VERSION: "2.5.1+1"
+ descriptor_id: b1bb0ce7-2222-4fa7-95ed-4840d70a1177
+description: vCPE_vgw
+
+imports:
+ - onap_dm.yaml
+
+topology_template:
+ #substitution_mappings:
+ # node_type: onap.vcpe_vgw
+ # requirements:
+ # virtual_link: [ Cp_vgw_public, virtual_link ] # expose as external CP
+ # virtual_link: [ Cp_vgw_onap_private, virtual_link ] # expose as external CP
+
+ inputs:
+ vcpe_image_name:
+ type: string
+ description: image name for vcpe in openstack glance
+ default: ubuntu_16.04
+ public_net_id:
+ type: string
+ description: public network id used during onap installation
+ default: external
+ onap_private_net_id:
+ type: string
+ description: onap OAM network id
+ default: oam_onap
+ onap_private_net_cidr:
+ type: string
+ description: oanp OAM network cidr
+ default: 10.0.0.0/16
+ mux_gw_private_net_id:
+ type: string
+ description: Private network that connects vGMUX to vGWs
+ default: zdfw1muxgw01_private
+ mux_gw_private_net_cidr:
+ type: string
+ description: he CIDR of the vGMUX private network
+ default: 10.5.0.0/24
+ cpe_public_net_id:
+ type: string
+ description: cpe public net name
+ default: zdfw1cpe01_public
+ cpe_public_net_cidr:
+ type: string
+ description: cpe public net cidr
+ default: 10.2.0.0/24
+ vgw_private_ip_0:
+ type: string
+ description: Private IP address that is assigned to the vGW to communicate with vGMUX
+ default: 10.5.0.21
+ vgw_private_ip_1:
+ type: string
+ description: Private IP address that is assigned to the vGW to communicate with ONAP components
+ default: 10.0.101.30
+ vgw_private_ip_2:
+ type: string
+ description: Private IP address that is assigned to the vGW to communicate with vCPE public network
+ default: 10.2.0.3
+ vgw_name_0:
+ type: string
+ description: Name of the vGW
+ default: zdcpe1cpe01gw01
+ dcae_collector_ip:
+ type: string
+ description: dcae collector ip
+ default: 10.0.4.102
+ dcae_collector_port:
+ type: string
+ description: dcae collector port
+ default: "8080"
+ pub_key:
+ type: string
+ description: ssh public key
+ default: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGx6SKrAuCz1V8KGevZueksLdWoPWJP6z3r29Z7TmPVEOjM+7PIPeSs2BVRx3rnHZBAlasMrZ+fJBS25ts9vfC+ItezQah/hr9vrkmwxCR54Lb84poW+sToPeF6i5eZY7W+jWJfLaFSFx9d2vp4zes/fOlT3NvYCXbn/3QdryQoGl7VFI8oemZypVcikZXElJeeKgAVdSwnrzuqtO/tmbXcAeSbYvVjki8ywYcsWMVMYWUWhh+1BAB6kXnTsIWqzrq0Pfvy+81WDwtiqsqmd93HY8hE0scBrXFBZzQS/AYfIFBlEuFNdLczchntjbZ0n7dmDXk8zHtCZYNk7kwb8k/
+ nexus_artifact_repo:
+ type: string
+ description: Root URL for the Nexus repository for Maven artifacts
+ default: https://nexus.onap.org
+ demo_artifacts_version:
+ type: string
+ description: artifacts version used in demo vnfs
+ default: 1.2.0
+ install_script_version:
+ type: string
+ description: install script version number
+ default: 1.2.0-SNAPSHOT
+ cloud_env:
+ type: string
+ description: cloud environment(openstack or rackspace)
+ default: openstack
+ mux_ip_addr:
+ type: string
+ description: IP address of vGMUX
+ default: 10.5.0.20
+ vg_vgmux_tunnel_vni:
+ type: string
+ description: vni value of vG-vGMUX vxlan tunnel
+ default: "100"
+ vnf_id:
+ type: string
+ description: The VNF ID is provided by ONAP
+ default: vCPE_Infrastructure_GW_demo_app
+ vf_module_id:
+ type: string
+ description: The vCPE Module ID is provided by ONAP
+ default: vCPE_Customer_GW
+
+ node_templates:
+ LLU_VNF:
+ type: tosca.nodes.nfv.VNF
+ properties:
+ descriptor_id: b1bb0ce7-2222-4fa7-95ed-4840d70a1177
+ provider: onap
+ product_name: vcpe_vgw
+ software_version: '1.0'
+ descriptor_version: '1.0'
+ flavour_id: simple
+ flavour_description: simple
+ vnfm_info: ['gvnfm']
+
+ #onap public net
+# VL_public:
+# type: tosca.nodes.nfv.VnfVirtualLink
+# properties:
+# connectivity_type:
+# layer_protocols: [ipv4]
+# vl_profile:
+# max_bitrate_requirements:
+# root: 10000000
+# leaf: 10000000
+# min_bitrate_requirements:
+# root: 10000000
+# leaf: 10000000
+# virtual_link_protocol_data:
+# - associated_layer_protocol: ipv4
+# l3_protocol_data:
+# ip_version: ipv4
+# name: { get_input: public_net_id }
+#
+# #onap oam net
+# VL_onap_private:
+# type: tosca.nodes.nfv.VnfVirtualLink
+# properties:
+# connectivity_type:
+# layer_protocols: [ipv4]
+# vl_profile:
+# max_bitrate_requirements:
+# root: 10000000
+# leaf: 10000000
+# min_bitrate_requirements:
+# root: 10000000
+# leaf: 10000000
+# virtual_link_protocol_data:
+# - associated_layer_protocol: ipv4
+# l3_protocol_data:
+# ip_version: ipv4
+# name: { get_input: onap_private_net_id }
+# cidr: { get_input: onap_private_net_cidr }
+
+ #Private network that connects vGMUX to vGWs
+ VL_mux_gw_private_net:
+ type: tosca.nodes.nfv.VnfVirtualLink
+ properties:
+ connectivity_type:
+ layer_protocols: [ipv4]
+ vl_profile:
+ max_bitrate_requirements:
+ root: 10000000
+ leaf: 10000000
+ min_bitrate_requirements:
+ root: 10000000
+ leaf: 10000000
+ virtual_link_protocol_data:
+ - associated_layer_protocol: ipv4
+ l3_protocol_data:
+ name: { get_input: mux_gw_private_net_id }
+ ip_version: ipv4
+ cidr: { get_input: mux_gw_private_net_cidr }
+ dhcp_enabled: false
+
+ #cpe public network
+ VL_cpe_public:
+ type: tosca.nodes.nfv.VnfVirtualLink
+ properties:
+ connectivity_type:
+ layer_protocols: [ipv4]
+ vl_profile:
+ max_bitrate_requirements:
+ root: 10000000
+ leaf: 10000000
+ min_bitrate_requirements:
+ root: 10000000
+ leaf: 10000000
+ virtual_link_protocol_data:
+ - associated_layer_protocol: ipv4
+ l3_protocol_data:
+ name: { get_input: cpe_public_net_id }
+ ip_version: ipv4
+ cidr: { get_input: cpe_public_net_cidr }
+ dhcp_enabled: false
+
+ # vgw related
+ Cp_vgw_public:
+ type: tosca.nodes.nfv.VduCp
+ properties:
+ layer_protocols: [ipv4]
+ trunk_mode: false
+ protocol:
+ - associated_layer_protocol: ipv4
+ address_data:
+ - address_type: ip_address
+ l3_address_data:
+ ip_address_assignment: false
+ floating_ip_activated: false
+ requirements:
+ - virtual_binding: VDU_vgw_0
+ #- virtual_link: VL_public
+
+ Cp_vgw_onap_private:
+ type: tosca.nodes.nfv.VduCp
+ properties:
+ layer_protocols: [ipv4]
+ trunk_mode: false
+ protocol:
+ - associated_layer_protocol: ipv4
+ address_data:
+ - address_type: ip_address
+ l3_address_data:
+ ip_address_assignment: false
+ floating_ip_activated: false
+ fixed_ip_address:
+ - { get_input: vgw_private_ip_1 }
+ requirements:
+ - virtual_binding: VDU_vgw_0
+ #- virtual_link: VL_onap_private
+
+ Cp_vgw_mux_gw_private_net:
+ type: tosca.nodes.nfv.VduCp
+ properties:
+ layer_protocols: [ipv4]
+ trunk_mode: false
+ protocol:
+ - associated_layer_protocol: ipv4
+ address_data:
+ - address_type: ip_address
+ l3_address_data:
+ ip_address_assignment: false
+ floating_ip_activated: false
+ fixed_ip_address:
+ - { get_input: vgw_private_ip_0 }
+ virtual_network_interface_requirements:
+ - name: dpdk support
+ support_mandatory: true
+ network_interface_requirements:
+ dataProcessingAccelerationLibrary: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "DPDK"}'
+ requirements:
+ - virtual_binding: VDU_vgw_0
+ - virtual_link: VL_mux_gw_private_net
+
+ Cp_vgw_cpe_public:
+ type: tosca.nodes.nfv.VduCp
+ properties:
+ layer_protocols: [ipv4]
+ trunk_mode: false
+ protocol:
+ - associated_layer_protocol: ipv4
+ address_data:
+ - address_type: ip_address
+ l3_address_data:
+ ip_address_assignment: false
+ floating_ip_activated: false
+ fixed_ip_address:
+ - { get_input: vgw_private_ip_2 }
+ requirements:
+ - virtual_binding: VDU_vgw_0
+ - virtual_link: VL_cpe_public
+
+ VDU_vgw_0:
+ type: tosca.nodes.nfv.Vdu.Compute
+ properties:
+ name: { get_input: vgw_name_0 }
+ description: vgw
+ vdu_profile:
+ min_number_of_instances: 1
+ max_number_of_instances: 1
+ watchdog: none
+ inject_files: # TODO SDC BUG
+ source_path: ../Artifacts/Deployment/OTHER/authorized_keys #SSH authorized_keys
+ dest_path: /home/ubuntu/.ssh/authorized_keys
+ meta_data:
+ vnf_id: { get_input: vnf_id }
+ vf_module_id: { get_input: vf_module_id }
+ mux_gw_private_net_ipaddr: { get_input: vgw_private_ip_0 }
+ oam_ipaddr: { get_input: vgw_private_ip_1 }
+ oam_cidr: { get_input: onap_private_net_cidr }
+ cpe_public_net_cidr: { get_input: cpe_public_net_cidr }
+ mux_gw_private_net_cidr: { get_input: mux_gw_private_net_cidr }
+ mux_ip_addr: { get_input: mux_ip_addr }
+ vg_vgmux_tunnel_vni: { get_input: vg_vgmux_tunnel_vni }
+ install_script_version: { get_input: install_script_version }
+ cloud_env: { get_input: cloud_env }
+ nexus_artifact_repo: { get_input: nexus_artifact_repo }
+ boot_data: |
+ #!/bin/bash
+ METADATA=`curl -s http://169.254.169.254/openstack/2012-08-10/meta_data.json`
+ apt-get -y install jq
+
+ get_metadata () {
+ echo $METADATA | jq -r ".meta.$1"
+ }
+
+ # Create configuration files
+ mkdir /opt/config
+ echo "$(get_metadata oam_ipaddr)" > /opt/config/oam_ipaddr.txt
+ echo "$(get_metadata oam_cidr)" > /opt/config/oam_cidr.txt
+ echo "$(get_metadata cpe_public_net_cidr)" > /opt/config/cpe_public_net_cidr.txt
+ echo "$(get_metadata mux_gw_private_net_ipaddr)" > /opt/config/mux_gw_private_net_ipaddr.txt
+ echo "$(get_metadata mux_gw_private_net_cidr)" > /opt/config/mux_gw_private_net_cidr.txt
+ echo "$(get_metadata install_script_version)" > /opt/config/install_script_version.txt
+ echo "$(get_metadata cloud_env)" > /opt/config/cloud_env.txt
+ echo "$(get_metadata mux_ip_addr)" > /opt/config/mux_ip_addr.txt
+ echo "$(get_metadata vg_vgmux_tunnel_vni)" > /opt/config/vg_vgmux_tunnel_vni.txt
+ echo "$(get_metadata nexus_artifact_repo)" > /opt/config/nexus_artifact_repo.txt
+
+ # Download and run install script
+ apt-get -y install unzip
+ INSTALL_SCRIPT_VERSION=$(get_metadata install_script_version)
+ NEXUS_ARTIFACT_REPO=$(get_metadata nexus_artifact_repo)
+ if [[ "${INSTALL_SCRIPT_VERSION}" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+ curl -k -L "${NEXUS_ARTIFACT_REPO}/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vcpe&a=vcpe-scripts&e=zip&v=${INSTALL_SCRIPT_VERSION}" -o /opt/vcpe-scripts-${INSTALL_SCRIPT_VERSION}.zip
+ unzip -j /opt/vcpe-scripts-${INSTALL_SCRIPT_VERSION}.zip -d /opt v_gw_install.sh
+ cd /opt
+ chmod +x v_gw_install.sh
+ ./v_gw_install.sh
+ capabilities:
+ virtual_compute:
+ properties:
+ virtual_memory:
+ virtual_mem_size: 4096 MB
+ vdu_mem_requirements:
+ memoryPageSize: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "2 MB"}'
+ numberOfPages: '{"schemaVersion": "0","schemaSelector": "","hardwarePlatform": "generic","mandatory": "true", "configurationValue": "1024"}'
+ virtual_cpu:
+ num_virtual_cpu: 2
+ cpu_architecture: generic
+ virtual_local_storage:
+ - size_of_storage: 40 GB
+ artifacts:
+ sw_image: #TODO need to put glance image name here
+ #file: { get_input: vcpe_image_name }
+ file: ../Artifacts/Deployment/OTHER/image
+ type: tosca.artifacts.nfv.SwImage
--- /dev/null
+tosca_definitions_version: tosca_simple_yaml_1_0
+artifact_types:
+ tosca.artifacts.nfv.SwImage:
+ derived_from: tosca.artifacts.Deployment.Image
+ description: describes the software image which is directly loaded on the virtualisation container realizing of the VDU or is to be loaded on a virtual
+ tosca.artifacts.Implementation.nfv.Mistral:
+ derived_from: tosca.artifacts.Implementation
+ description: artifacts for Mistral workflows
+ mime_type: application/x-yaml
+ file_ext: [ yaml ]
+
+capability_types:
+ tosca.capabilities.nfv.VirtualStorage:
+ derived_from: tosca.capabilities.Root
+ description: Describes the attachment capabilities related to Vdu.Storage
+ tosca.capabilities.nfv.VirtualCompute:
+ derived_from: tosca.capabilities.Node
+ description: Describes the capabilities related to virtual compute resources
+ properties:
+ logical_node:
+ type: map
+ description: Describes the Logical Node requirements
+ required: false
+ entry_schema:
+ type: tosca.datatypes.nfv.LogicalNodeData
+ requested_additional_capabilities:
+ type: map
+ description: Describes additional capability for a particular VDU
+ required: false
+ entry_schema:
+ type: tosca.datatypes.nfv.RequestedAdditionalCapability
+ compute_requirements:
+ type: map
+ required: false
+ entry_schema:
+ type: string
+ virtual_memory:
+ type: tosca.datatypes.nfv.VirtualMemory
+ description: Describes virtual memory of the virtualized compute
+ required: true
+ virtual_cpu:
+ type: tosca.datatypes.nfv.VirtualCpu
+ description: Describes virtual CPU(s) of the virtualized compute
+ required: true
+ virtual_local_storage:
+ type: list
+ description: A list of virtual system disks created and destroyed as part of the VM lifecycle
+ required: false
+ entry_schema:
+ type: tosca.datatypes.nfv.VirtualBlockStorageData
+ description: virtual system disk definition
+ tosca.capabilities.nfv.VirtualBindable:
+ derived_from: tosca.capabilities.Node
+ description: Indicates that the node that includes it can be pointed by a tosca.relationships.nfv.VirtualBindsTo relationship type which is used to model the VduHasCpd association
+ tosca.capabilities.nfv.VirtualLinkable:
+ derived_from: tosca.capabilities.Root
+ description: A node type that includes the VirtualLinkable capability indicates that it can be pointed by tosca.relationships.nfv.VirtualLinksTo relationship type
+ tosca.capabilities.nfv.ExtVirtualLinkable:
+ derived_from: tosca.capabilities.Root
+ tosca.capabilities.nfv.Forwarder:
+ derived_from: tosca.capabilities.Root
+ tosca.capabilities.nfv.ext.GuestOs:
+ derived_from: tosca.capabilities.Root
+ tosca.capabilities.nfv.ext.ImageFile:
+ derived_from: tosca.capabilities.Root
+ tosca.capabilities.nfv.ext.LocalAttachment:
+ derived_from: tosca.capabilities.Root
+ tosca.capabilities.nfv.ext.Compute.Container.Architecture:
+ derived_from: tosca.capabilities.Root
+ properties:
+ num_cpus:
+ type: string
+ required: false
+ flavor_extra_specs:
+ type: map
+ required: false
+ entry_schema:
+ type: string
+ mem_size:
+ type: string
+ required: false
+
+data_types:
+ tosca.datatypes.nfv.VnfcAdditionalConfigurableProperties:
+ derived_from: tosca.datatypes.Root
+ description: VnfcAdditionalConfigurableProperties type is an empty base type for deriving data types for describing additional configurable properties for a given VNFC.
+ # below description properties added as optional, since atleast one property required to define a dataType in SDC
+ properties:
+ description:
+ type: string
+ required: false
+ tosca.datatypes.nfv.VnfcConfigurableProperties:
+ derived_from: tosca.datatypes.Root
+ description: Defines the configurable properties of a VNFC
+ properties:
+ additional_vnfc_configurable_properties:
+ type: tosca.datatypes.nfv.VnfcAdditionalConfigurableProperties
+ description: Describes additional configuration for VNFC that can be modified using the ModifyVnfInfo operation
+ required: false
+ # derived types are expected to introduce
+ # additional_vnfc_configurable_properties with its type derived from
+ # tosca.datatypes.nfv.VnfcAdditionalConfigurableProperties
+ tosca.datatypes.nfv.RequestedAdditionalCapability:
+ derived_from: tosca.datatypes.Root
+ description: describes requested additional capability for a particular VDU
+ properties:
+ requested_additional_capability_name:
+ type: string
+ description: Identifies a requested additional capability for the VDU.
+ required: true
+ support_mandatory:
+ type: boolean
+ description: Indicates whether the requested additional capability is mandatory for successful operation.
+ required: true
+ min_requested_additional_capability_version:
+ type: string
+ description: Identifies the minimum version of the requested additional capability.
+ required: false
+ preferred_requested_additional_capability_version:
+ type: string
+ description: Identifies the preferred version of the requested additional capability.
+ required: false
+ target_performance_parameters:
+ type: map
+ description: Identifies specific attributes, dependent on the requested additional capability type.
+ required: true
+ entry_schema:
+ type: string
+ tosca.datatypes.nfv.VirtualMemory:
+ derived_from: tosca.datatypes.Root
+ description: supports the specification of requirements related to virtual memory of a virtual compute resource
+ properties:
+ virtual_mem_size:
+ type: scalar-unit.size
+ description: Amount of virtual memory.
+ required: true
+ virtual_mem_oversubscription_policy:
+ type: string
+ description: The memory core oversubscription policy in terms of virtual memory to physical memory on the platform.
+ required: false
+ vdu_mem_requirements:
+ type: map
+ description: The hardware platform specific VDU memory requirements. A map of strings that contains a set of key-value pairs that describes hardware platform specific VDU memory requirements.
+ required: false
+ entry_schema:
+ type: string
+ numa_enabled:
+ type: boolean
+ description: It specifies the memory allocation to be cognisant of the relevant process/core allocation.
+ required: false
+ default: false
+ tosca.datatypes.nfv.VirtualCpuPinning:
+ derived_from: tosca.datatypes.Root
+ description: Supports the specification of requirements related to the virtual CPU pinning configuration of a virtual compute resource
+ properties:
+ virtual_cpu_pinning_policy:
+ type: string
+ description: 'Indicates the policy for CPU pinning. The policy can take values of "static" or "dynamic". In case of "dynamic" the allocation of virtual CPU cores to logical CPU cores is decided by the VIM. (e.g.: SMT (Simultaneous Multi-Threading) requirements). In case of "static" the allocation is requested to be according to the virtual_cpu_pinning_rule.'
+ required: false
+ constraints:
+ - valid_values: [ static, dynamic ]
+ virtual_cpu_pinning_rule:
+ type: list
+ description: Provides the list of rules for allocating virtual CPU cores to logical CPU cores/threads
+ required: false
+ entry_schema:
+ type: string
+ tosca.datatypes.nfv.VirtualCpu:
+ derived_from: tosca.datatypes.Root
+ description: Supports the specification of requirements related to virtual CPU(s) of a virtual compute resource
+ properties:
+ cpu_architecture:
+ type: string
+ description: CPU architecture type. Examples are x86, ARM
+ required: false
+ num_virtual_cpu:
+ type: integer
+ description: Number of virtual CPUs
+ required: true
+ constraints:
+ - greater_than: 0
+ virtual_cpu_clock:
+ type: scalar-unit.frequency
+ description: Minimum virtual CPU clock rate
+ required: false
+ virtual_cpu_oversubscription_policy:
+ type: string
+ description: CPU core oversubscription policy e.g. the relation of virtual CPU cores to physical CPU cores/threads.
+ required: false
+ vdu_cpu_requirements:
+ type: map
+ description: The hardware platform specific VDU CPU requirements. A map of strings that contains a set of key-value pairs describing VDU CPU specific hardware platform requirements.
+ required: false
+ entry_schema:
+ type: string
+ virtual_cpu_pinning:
+ type: tosca.datatypes.nfv.VirtualCpuPinning
+ description: The virtual CPU pinning configuration for the virtualised compute resource.
+ required: false
+ tosca.datatypes.nfv.LogicalNodeData:
+ derived_from: tosca.datatypes.Root
+ description: Describes compute, memory and I/O requirements associated with a particular VDU.
+ properties:
+ logical_node_requirements:
+ type: map
+ description: The logical node-level compute, memory and I/O requirements. A map of strings that contains a set of key-value pairs that describes hardware platform specific deployment requirements, including the number of CPU cores on this logical node, a memory configuration specific to a logical node or a requirement related to the association of an I/O device with the logical node.
+ required: false
+ entry_schema:
+ type: string
+ tosca.datatypes.nfv.VirtualNetworkInterfaceRequirements:
+ derived_from: tosca.datatypes.Root
+ description: Describes requirements on a virtual network interface
+ properties:
+ name:
+ type: string
+ description: Provides a human readable name for the requirement.
+ required: false
+ description:
+ type: string
+ description: Provides a human readable description of the requirement.
+ required: false
+ support_mandatory:
+ type: boolean
+ description: Indicates whether fulfilling the constraint is mandatory (TRUE) for successful operation or desirable (FALSE).
+ required: true
+ network_interface_requirements:
+ type: map
+ description: The network interface requirements. A map of strings that contain a set of key-value pairs that describes the hardware platform specific network interface deployment requirements.
+ required: true
+ entry_schema:
+ type: string
+ nic_io_requirements:
+ type: tosca.datatypes.nfv.LogicalNodeData
+ description: references (couples) the CP with any logical node I/O requirements (for network devices) that may have been created. Linking these attributes is necessary so that so that I/O requirements that need to be articulated at the logical node level can be associated with the network interface requirements associated with the CP.
+ required: false
+
+ tosca.datatypes.nfv.injectFile: #used for vCPE usecase
+ derived_from: tosca.datatypes.Root
+ properties:
+ source_path:
+ type: string
+ required: true
+ dest_path:
+ type: string
+ required: true
+ tosca.datatypes.nfv.L2AddressData:
+ derived_from: tosca.datatypes.Root
+ description: Describes the information on the MAC addresses to be assigned to a connection point.
+ properties:
+ mac_address_assignment:
+ type: boolean
+ description: Specifies if the address assignment is the responsibility of management and orchestration function or not. If it is set to True, it is the management and orchestration function responsibility
+ required: true
+ tosca.datatypes.nfv.L3AddressData:
+ derived_from: tosca.datatypes.Root
+ description: Provides information about Layer 3 level addressing scheme and parameters applicable to a CP
+ properties:
+ ip_address_assignment:
+ type: boolean
+ description: Specifies if the address assignment is the responsibility of management and orchestration function or not. If it is set to True, it is the management and orchestration function responsibility
+ required: true
+ floating_ip_activated:
+ type: boolean
+ description: Specifies if the floating IP scheme is activated on the Connection Point or not
+ required: true
+ ip_address_type:
+ type: string
+ description: Defines address type. The address type should be aligned with the address type supported by the layer_protocols properties of the parent VnfExtCp
+ required: false
+ constraints:
+ - valid_values: [ ipv4, ipv6 ]
+ number_of_ip_address:
+ type: integer
+ description: Minimum number of IP addresses to be assigned
+ required: false
+ constraints:
+ - greater_than: 0
+ fixed_ip_address: #Introduced from Beijing release, only used for vCPE usecase
+ type: list
+ entry_schema:
+ type: string
+ required: false
+ tosca.datatypes.nfv.AddressData:
+ derived_from: tosca.datatypes.Root
+ description: Describes information about the addressing scheme and parameters applicable to a CP
+ properties:
+ address_type:
+ type: string
+ description: Describes the type of the address to be assigned to a connection point. The content type shall be aligned with the address type supported by the layerProtocol property of the connection point
+ required: true
+ constraints:
+ - valid_values: [ mac_address, ip_address ]
+ l2_address_data:
+ type: tosca.datatypes.nfv.L2AddressData
+ description: Provides the information on the MAC addresses to be assigned to a connection point.
+ required: false
+ l3_address_data:
+ type: tosca.datatypes.nfv.L3AddressData
+ description: Provides the information on the IP addresses to be assigned to a connection point
+ required: false
+ tosca.datatypes.nfv.ConnectivityType:
+ derived_from: tosca.datatypes.Root
+ description: describes additional connectivity information of a virtualLink
+ properties:
+ layer_protocols:
+ type: list
+ description: Identifies the protocol a virtualLink gives access to (ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire).The top layer protocol of the virtualLink protocol stack shall always be provided. The lower layer protocols may be included when there are specific requirements on these layers.
+ required: true
+ entry_schema:
+ type: string
+ constraints:
+ - valid_values: [ ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire ]
+ flow_pattern:
+ type: string
+ description: Identifies the flow pattern of the connectivity
+ required: false
+ constraints:
+ - valid_values: [ line, tree, mesh ]
+ tosca.datatypes.nfv.VlFlavour:
+ derived_from: tosca.datatypes.Root
+ properties:
+ flavourId:
+ type: string
+ tosca.datatypes.nfv.ext.AddressPairs:
+ properties:
+ ip:
+ type: string
+ required: false
+ mac:
+ type: string
+ required: false
+ tosca.datatypes.nfv.ext.FloatingIP:
+ properties:
+ external_network:
+ type: string
+ required: false
+ ip_address:
+ type: string
+ required: false
+ tosca.datatypes.nfv.ext.LocationInfo:
+ properties:
+ availability_zone:
+ type: string
+ required: false
+ vimid:
+ type: integer
+ required: false
+ tenant:
+ type: string
+ required: false
+ tosca.datatypes.nfv.ext.HostRouteInfo:
+ properties:
+ destination:
+ type: string
+ required: false
+ nexthop:
+ type: string
+ required: false
+ tosca.datatypes.nfv.ext.InjectData:
+ properties:
+ file_name:
+ type: string
+ required: false
+ file_data:
+ type: string
+ required: false
+ tosca.datatypes.nfv.ext.zte.WatchDog:
+ properties:
+ enable_delay:
+ type: integer
+ required: false
+ action:
+ type: string
+ required: false
+ tosca.datatypes.nfv.ext.LocalAffinityOrAntiAffinityRule:
+ properties:
+ scope:
+ type: string
+ required: false
+ affinity_antiaffinity:
+ type: string
+ required: false
+ tosca.datatypes.nfv.VduProfile:
+ derived_from: tosca.datatypes.Root
+ description: describes additional instantiation data for a given Vdu.Compute used in a specific deployment flavour.
+ properties:
+ min_number_of_instances:
+ type: integer
+ description: Minimum number of instances of the VNFC based on this Vdu.Compute that is permitted to exist for a particular VNF deployment flavour.
+ required: true
+ constraints:
+ - greater_or_equal: 0
+ max_number_of_instances:
+ type: integer
+ description: Maximum number of instances of the VNFC based on this Vdu.Compute that is permitted to exist for a particular VNF deployment flavour.
+ required: true
+ constraints:
+ - greater_or_equal: 0
+ watchdog: #Introduced from Beijing release, only used for vCPE usecase, outside the scope of SOL001 v2.5.1
+ type: string
+ required: true
+ vmBootUpTimeOut: #Introduced from Beijing release, only used for vCPE usecase, outside the scope of SOL001 v2.5.1
+ type: integer
+ required: false
+ tosca.datatypes.nfv.LinkBitrateRequirements:
+ derived_from: tosca.datatypes.Root
+ description: describes the requirements in terms of bitrate for a virtual link
+ properties:
+ root:
+ type: integer # in bits per second
+ description: Specifies the throughput requirement in bits per second of the link (e.g. bitrate of E-Line, root bitrate of E-Tree, aggregate capacity of E-LAN).
+ required: true
+ constraints:
+ - greater_or_equal: 0
+ leaf:
+ type: integer # in bits per second
+ description: Specifies the throughput requirement in bits per second of leaf connections to the link when applicable to the connectivity type (e.g. for E-Tree and E LAN branches).
+ required: false
+ constraints:
+ - greater_or_equal: 0
+ tosca.datatypes.nfv.Qos:
+ derived_from: tosca.datatypes.Root
+ description: describes QoS data for a given VL used in a VNF deployment flavour
+ properties:
+ latency:
+ type: scalar-unit.time #Number [ms]
+ description: Specifies the maximum latency
+ required: true
+ constraints:
+ - greater_than: 0 s
+ packet_delay_variation:
+ type: scalar-unit.time #Number [ms]
+ description: Specifies the maximum jitter
+ required: true
+ constraints:
+ - greater_or_equal: 0 s
+ packet_loss_ratio:
+ type: float #Number [0 ..1]
+ description: Specifies the maximum packet loss ratio
+ required: false
+ constraints:
+ - in_range: [ 0.0, 1.0 ]
+ tosca.datatypes.nfv.IpAllocationPool:
+ derived_from: tosca.datatypes.Root
+ description: Specifies a range of IP addresses
+ properties:
+ start_ip_address:
+ type: string
+ description: The IP address to be used as the first one in a pool of addresses derived from the cidr block full IP range
+ required: true
+ end_ip_address:
+ type: string
+ description: The IP address to be used as the last one in a pool of addresses derived from the cidr block full IP range
+ required: true
+ tosca.datatypes.nfv.L2ProtocolData:
+ derived_from: tosca.datatypes.Root
+ description: describes L2 protocol data for a given virtual link used in a specific VNF deployment flavour.
+ properties:
+ name:
+ type: string
+ description: Identifies the network name associated with this L2 protocol.
+ required: false
+ network_type:
+ type: string
+ description: Specifies the network type for this L2 protocol.The value may be overridden at run-time.
+ required: false
+ constraints:
+ - valid_values: [ flat, vlan, vxlan, gre ]
+ vlan_transparent:
+ type: boolean
+ description: Specifies whether to support VLAN transparency for this L2 protocol or not.
+ required: false
+ default: false
+ mtu:
+ type: integer
+ description: Specifies the maximum transmission unit (MTU) value for this L2 protocol.
+ required: false
+ constraints:
+ - greater_than: 0
+ segmentation_id: #Introduced from Beijing release, only used for vCPE usecase, outside the scope of SOL001 v2.5.1
+ type: integer
+ required: false
+ physical_network: #Introduced from Beijing release, only used for vCPE usecase, outside the scope of SOL001 v2.5.1
+ type: string
+ required: false
+ tosca.datatypes.nfv.L3ProtocolData:
+ derived_from: tosca.datatypes.Root
+ description: describes L3 protocol data for a given virtual link used in a specific VNF deployment flavour.
+ properties:
+ name:
+ type: string
+ description: Identifies the network name associated with this L3 protocol.
+ required: false
+ ip_version:
+ type: string
+ description: Specifies IP version of this L3 protocol.The value of the ip_version property shall be consistent with the value of the layer_protocol in the connectivity_type property of the virtual link node.
+ required: true
+ constraints:
+ - valid_values: [ ipv4, ipv6 ]
+ cidr:
+ type: string
+ description: Specifies the CIDR (Classless Inter-Domain Routing) of this L3 protocol. The value may be overridden at run-time.
+ required: true
+ ip_allocation_pools:
+ type: list
+ description: Specifies the allocation pools with start and end IP addresses for this L3 protocol. The value may be overridden at run-time.
+ required: false
+ entry_schema:
+ type: tosca.datatypes.nfv.IpAllocationPool
+ gateway_ip:
+ type: string
+ description: Specifies the gateway IP address for this L3 protocol. The value may be overridden at run-time.
+ required: false
+ dhcp_enabled:
+ type: boolean
+ description: Indicates whether DHCP (Dynamic Host Configuration Protocol) is enabled or disabled for this L3 protocol. The value may be overridden at run-time.
+ required: false
+ ipv6_address_mode:
+ type: string
+ description: Specifies IPv6 address mode. May be present when the value of the ipVersion attribute is "ipv6" and shall be absent otherwise. The value may be overridden at run-time.
+ required: false
+ constraints:
+ - valid_values: [ slaac, dhcpv6-stateful, dhcpv6-stateless ]
+ tosca.datatypes.nfv.VirtualLinkProtocolData:
+ derived_from: tosca.datatypes.Root
+ description: describes one protocol layer and associated protocol data for a given virtual link used in a specific VNF deployment flavour
+ properties:
+ associated_layer_protocol:
+ type: string
+ description: Identifies one of the protocols a virtualLink gives access to (ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire) as specified by the connectivity_type property.
+ required: true
+ constraints:
+ - valid_values: [ ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire ]
+ l2_protocol_data:
+ type: tosca.datatypes.nfv.L2ProtocolData
+ description: Specifies the L2 protocol data for a virtual link. Shall be present when the associatedLayerProtocol attribute indicates a L2 protocol and shall be absent otherwise.
+ required: false
+ l3_protocol_data:
+ type: tosca.datatypes.nfv.L3ProtocolData
+ description: Specifies the L3 protocol data for this virtual link. Shall be present when the associatedLayerProtocol attribute indicates a L3 protocol and shall be absent otherwise.
+ required: false
+
+ tosca.datatypes.nfv.VlProfile:
+ derived_from: tosca.datatypes.Root
+ description: Describes additional instantiation data for a given VL used in a specific VNF deployment flavour.
+ properties:
+ max_bitrate_requirements:
+ type: tosca.datatypes.nfv.LinkBitrateRequirements
+ description: Specifies the maximum bitrate requirements for a VL instantiated according to this profile.
+ required: true
+ min_bitrate_requirements:
+ type: tosca.datatypes.nfv.LinkBitrateRequirements
+ description: Specifies the minimum bitrate requirements for a VL instantiated according to this profile.
+ required: true
+ qos:
+ type: tosca.datatypes.nfv.Qos
+ description: Specifies the QoS requirements of a VL instantiated according to this profile.
+ required: false
+ virtual_link_protocol_data:
+ type: list
+ description: Specifies the protocol data for a virtual link.
+ required: false
+ entry_schema:
+ type: tosca.datatypes.nfv.VirtualLinkProtocolData
+ tosca.datatypes.nfv.VduLevel:
+ derived_from: tosca.datatypes.Root
+ description: Indicates for a given Vdu.Compute in a given level the number of instances to deploy
+ properties:
+ number_of_instances:
+ type: integer
+ description: Number of instances of VNFC based on this VDU to deploy for this level.
+ required: true
+ constraints:
+ - greater_or_equal: 0
+ tosca.datatypes.nfv.ScaleInfo:
+ derived_from: tosca.datatypes.Root
+ description: Indicates for a given scaleAspect the corresponding scaleLevel
+ properties:
+ scale_level:
+ type: integer
+ description: The scale level for a particular aspect
+ required: true
+ constraints:
+ - greater_or_equal: 0
+ tosca.datatypes.nfv.ScalingAspect:
+ derived_from: tosca.datatypes.Root
+ properties:
+ name:
+ type: string
+ required: true
+ description:
+ type: string
+ required: true
+ max_scale_level:
+ type: integer # positiveInteger
+ required: true
+ constraints:
+ - greater_or_equal: 0
+ step_deltas:
+ type: list
+ required: false
+ entry_schema:
+ type: string # Identifier
+ tosca.datatypes.nfv.InstantiationLevel:
+ derived_from: tosca.datatypes.Root
+ description: Describes the scale level for each aspect that corresponds to a given level of resources to be instantiated within a deployment flavour in term of the number VNFC instances
+ properties:
+ description:
+ type: string
+ description: Human readable description of the level
+ required: true
+ scale_info:
+ type: map # key: aspectId
+ description: Represents for each aspect the scale level that corresponds to this instantiation level. scale_info shall be present if the VNF supports scaling.
+ required: false
+ entry_schema:
+ type: tosca.datatypes.nfv.ScaleInfo
+ tosca.datatypes.nfv.VnfInstantiateOperationConfiguration:
+ derived_from: tosca.datatypes.Root
+ description: represents information that affect the invocation of the InstantiateVnf operation.
+ properties:
+ description:
+ type: string
+ required: false
+ tosca.datatypes.nfv.VnfScaleOperationConfiguration:
+ derived_from: tosca.datatypes.Root
+ description: Represents information that affect the invocation of the ScaleVnf operation
+ properties:
+ scaling_by_more_than_one_step_supported:
+ type: boolean
+ description: Signals whether passing a value larger than one in the numScalingSteps parameter of the ScaleVnf operation is supported by this VNF.
+ required: false
+ default: false
+ tosca.datatypes.nfv.VnfScaleToLevelOperationConfiguration:
+ derived_from: tosca.datatypes.Root
+ description: represents information that affect the invocation of the ScaleVnfToLevel operation
+ properties:
+ arbitrary_target_levels_supported:
+ type: boolean
+ description: Signals whether scaling according to the parameter "scaleInfo" is supported by this VNF
+ required: true
+ tosca.datatypes.nfv.VnfHealOperationConfiguration:
+ derived_from: tosca.datatypes.Root
+ description: represents information that affect the invocation of the HealVnf operation
+ properties:
+ causes:
+ type: list
+ description: Supported "cause" parameter values
+ required: false
+ entry_schema:
+ type: string
+ tosca.datatypes.nfv.VnfTerminateOperationConfiguration:
+ derived_from: tosca.datatypes.Root
+ description: represents information that affect the invocation of the TerminateVnf
+ properties:
+ min_graceful_termination_timeout:
+ type: scalar-unit.time # For TOSCA V1.2 use type as scalar-unit.time instead of integer
+ description: Minimum timeout value for graceful termination of a VNF instance
+ required: true
+ max_recommended_graceful_termination_timeout:
+ type: scalar-unit.time # For TOSCA V1.2 use type as scalar-unit.time instead of integer
+ description: Maximum recommended timeout value that can be needed to gracefully terminate a VNF instance of a particular type under certain conditions, such as maximum load condition. This is provided by VNF provider as information for the operator facilitating the selection of optimal timeout value. This value is not used as constraint
+ required: false
+ tosca.datatypes.nfv.VnfOperateOperationConfiguration:
+ derived_from: tosca.datatypes.Root
+ description: represents information that affect the invocation of the OperateVnf operation
+ properties:
+ min_graceful_stop_timeout:
+ type: scalar-unit.time
+ description: Minimum timeout value for graceful stop of a VNF instance
+ required: true
+ max_recommended_graceful_stop_timeout:
+ type: scalar-unit.time
+ description: Maximum recommended timeout value that can be needed to gracefully stop a VNF instance of a particular type under certain conditions, such as maximum load condition. This is provided by VNF provider as information for the operator facilitating the selection of optimal timeout value. This value is not used as constraint
+ required: false
+ tosca.datatypes.nfv.VnfChangeFlavourOperationConfiguration:
+ derived_from: tosca.datatypes.Root
+ description: represents information that affect the invocation of the ChangeVnfFlavour operation
+ properties:
+ description:
+ type: string
+ required: false
+ tosca.datatypes.nfv.VnfProfile:
+ derived_from: tosca.datatypes.Root
+ description: describes a profile for instantiating VNFs of a particular NS DF according to a specific VNFD and VNF DF.
+ properties:
+ instantiation_level:
+ type: string
+ description: Identifier of the instantiation level of the VNF DF to be used for instantiation. If not present, the default instantiation level as declared in the VNFD shall be used.
+ required: false
+ min_number_of_instances:
+ type: integer
+ description: Minimum number of instances of the VNF based on this VNFD that is permitted to exist for this VnfProfile.
+ required: true
+ constraints:
+ - greater_or_equal: 0
+ max_number_of_instances:
+ type: integer
+ description: Maximum number of instances of the VNF based on this VNFD that is permitted to exist for this VnfProfile.
+ required: true
+ constraints:
+ - greater_or_equal: 0
+ tosca.datatypes.nfv.UriAuthority:
+ derived_from: tosca.datatypes.Root
+ description: information that corresponds to the authority component of a URI as specified in IETF RFC 3986 [8]
+ properties:
+ user_info:
+ type: string # shall comply with IETF RFC 3986
+ description: user_info field of the authority component of a URI
+ required: false
+ host:
+ type: string # shall comply with IETF RFC 3986
+ description: host field of the authority component of a URI
+ required: false
+ port:
+ type: string # shall comply with IETF RFC 3986
+ description: port field of the authority component of a URI
+ required: false
+ tosca.datatypes.nfv.UriComponents:
+ derived_from: tosca.datatypes.Root
+ description: information used to build a URI that complies with IETF RFC 3986 [8].
+ properties:
+ scheme:
+ type: string # shall comply with IETF RFC3986
+ description: scheme component of a URI.
+ required: true
+ authority:
+ type: tosca.datatypes.nfv.UriAuthority
+ description: Authority component of a URI
+ required: false
+ path:
+ type: string # shall comply with IETF RFC 3986
+ description: path component of a URI.
+ required: false
+ query:
+ type: string # shall comply with IETF RFC 3986
+ description: query component of a URI.
+ required: false
+ fragment:
+ type: string # shall comply with IETF RFC 3986
+ description: fragment component of a URI.
+ required: false
+ tosca.datatypes.nfv.InterfaceDetails:
+ derived_from: tosca.datatypes.Root
+ description: information used to access an interface exposed by a VNF
+ properties:
+ uri_components:
+ type: tosca.datatypes.nfv.UriComponents
+ description: Provides components to build a Uniform Ressource Identifier (URI) where to access the interface end point.
+ required: false
+ interface_specific_data:
+ type: map
+ description: Provides additional details that are specific to the type of interface considered.
+ required: false
+ entry_schema:
+ type: string
+ tosca.datatypes.nfv.VirtualLinkMonitoringParameter:
+ derived_from: tosca.datatypes.Root
+ description: Represents information on virtualised resource related performance metrics applicable to the VNF.
+ properties:
+ name:
+ type: string
+ description: Human readable name of the monitoring parameter
+ required: true
+ performance_metric:
+ type: string
+ description: Identifies a performance metric derived from those defined in ETSI GS NFV-IFA 027.The packetOutgoingVirtualLink and packetIncomingVirtualLink metrics shall be obtained by aggregation the PacketOutgoing and PacketIncoming measurements defined in clause 7.1 of GS NFV-IFA 027 of all virtual link ports attached to the virtual link to which the metrics apply.
+ required: true
+ constraints:
+ - valid_values: [ packet_outgoing_virtual_link, packet_incoming_virtual_link ]
+ collection_period:
+ type: scalar-unit.time
+ description: Describes the recommended periodicity at which to collect the performance information.
+ required: false
+ constraints:
+ - greater_than: 0 s
+ tosca.datatypes.nfv.VnfcMonitoringParameter:
+ derived_from: tosca.datatypes.Root
+ description: Represents information on virtualised resource related performance metrics applicable to the VNF.
+ properties:
+ name:
+ type: string
+ description: Human readable name of the monitoring parameter
+ required: true
+ performance_metric:
+ type: string
+ description: Identifies the performance metric, according to ETSI GS NFV-IFA 027.
+ required: true
+ constraints:
+ - valid_values: [ v_cpu_usage_mean_vnf, v_cpu_usage_peak_vnf, v_memory_usage_mean_vnf, v_memory_usage_peak_vnf, v_disk_usage_mean_vnf, v_disk_usage_peak_vnf, byte_incoming_vnf_int_cp, byte_outgoing_vnf_int_cp, packet_incoming_vnf_int_cp, packet_outgoing_vnf_int_cp ]
+ collection_period:
+ type: scalar-unit.time
+ description: Describes the recommended periodicity at which to collect the performance information.
+ required: false
+ constraints:
+ - greater_than: 0 s
+ tosca.datatypes.nfv.VnfChangeExtConnectivityOperationConfiguration:
+ derived_from: tosca.datatypes.Root
+ description: represents information that affect the invocation of the ChangeExtVnfConnectivity operation
+ properties:
+ description:
+ type: string
+ required: false
+ tosca.datatypes.nfv.VnfMonitoringParameter:
+ derived_from: tosca.datatypes.Root
+ description: Represents information on virtualised resource related performance metrics applicable to the VNF.
+ properties:
+ name:
+ type: string
+ description: Human readable name of the monitoring parameter
+ required: true
+ performance_metric:
+ type: string
+ description: Identifies the performance metric, according to ETSI GS NFV-IFA 027.
+ required: true
+ constraints:
+ - valid_values: [ v_cpu_usage_mean_vnf, v_cpu_usage_peak_vnf, v_memory_usage_mean_vnf, v_memory_usage_peak_vnf, v_disk_usage_mean_vnf, v_disk_usage_peak_vnf, byte_incoming_vnf_ext_cp, byte_outgoing_vnf_ext_cp, packet_incoming_vnf_ext_cp, packet_outgoing_vnf_ext_cp ]
+ collection_period:
+ type: scalar-unit.time
+ description: Describes the recommended periodicity at which to collect the performance information.
+ required: false
+ constraints:
+ - greater_than: 0 s
+ tosca.datatypes.nfv.VnfLcmOperationsConfiguration:
+ derived_from: tosca.datatypes.Root
+ description: Represents information to configure lifecycle management operations
+ properties:
+ instantiate:
+ type: tosca.datatypes.nfv.VnfInstantiateOperationConfiguration
+ description: Configuration parameters for the InstantiateVnf operation
+ required: false
+ scale:
+ type: tosca.datatypes.nfv.VnfScaleOperationConfiguration
+ description: Configuration parameters for the ScaleVnf operation
+ required: false
+ scale_to_level:
+ type: tosca.datatypes.nfv.VnfScaleToLevelOperationConfiguration
+ description: Configuration parameters for the ScaleVnfToLevel operation
+ required: false
+ change_flavour:
+ type: tosca.datatypes.nfv.VnfChangeFlavourOperationConfiguration
+ description: Configuration parameters for the changeVnfFlavourOpConfig operation
+ required: false
+ heal:
+ type: tosca.datatypes.nfv.VnfHealOperationConfiguration
+ description: Configuration parameters for the HealVnf operation
+ required: false
+ terminate:
+ type: tosca.datatypes.nfv.VnfTerminateOperationConfiguration
+ description: Configuration parameters for the TerminateVnf operation
+ required: false
+ operate:
+ type: tosca.datatypes.nfv.VnfOperateOperationConfiguration
+ description: Configuration parameters for the OperateVnf operation
+ required: false
+ change_ext_connectivity:
+ type: tosca.datatypes.nfv.VnfChangeExtConnectivityOperationConfiguration
+ description: Configuration parameters for the changeExtVnfConnectivityOpConfig operation
+ required: false
+ tosca.datatypes.nfv.CpProtocolData:
+ derived_from: tosca.datatypes.Root
+ description: Describes and associates the protocol layer that a CP uses together with other protocol and connection point information
+ properties:
+ associated_layer_protocol:
+ type: string
+ required: true
+ description: One of the values of the property layer_protocols of the CP
+ constraints:
+ - valid_values: [ ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire ]
+ address_data:
+ type: list
+ description: Provides information on the addresses to be assigned to the CP
+ entry_schema:
+ type: tosca.datatypes.nfv.AddressData
+ required: false
+ tosca.datatypes.nfv.VnfAdditionalConfigurableProperties:
+ derived_from: tosca.datatypes.Root
+ description: is an empty base type for deriving data types for describing additional configurable properties for a given VNF
+ # below description properties added as optional, since atleast one property required to define a dataType in SDC
+ properties:
+ description:
+ type: string
+ required: false
+ tosca.datatypes.nfv.VnfConfigurableProperties:
+ derived_from: tosca.datatypes.Root
+ description: indicates configuration properties for a given VNF (e.g. related to auto scaling and auto healing).
+ properties:
+ is_autoscale_enabled:
+ type: boolean
+ description: It permits to enable (TRUE)/disable (FALSE) the auto-scaling functionality. If the properties is not present for configuring, then VNF property is not supported
+ required: false
+ is_autoheal_enabled:
+ type: boolean
+ description: It permits to enable (TRUE)/disable (FALSE) the auto-healing functionality. If the properties is not present for configuring, then VNF property is not supported
+ required: false
+ additional_configurable_properties:
+ description: It provides VNF specific configurable properties that can be modified using the ModifyVnfInfo operation
+ required: false
+ type: tosca.datatypes.nfv.VnfAdditionalConfigurableProperties
+ # derived types are expected to introduce
+ # additional_configurable_properties with its type derived from
+ # tosca.datatypes.nfv.VnfAdditionalConfigurableProperties
+ tosca.datatypes.nfv.VnfInfoModifiableAttributesExtensions:
+ derived_from: tosca.datatypes.Root
+ description: is an empty base type for deriving data types for describing VNF-specific extension
+ # below description properties added as optional, since atleast one property required to define a dataType in SDC
+ properties:
+ description:
+ type: string
+ required: false
+ tosca.datatypes.nfv.VnfInfoModifiableAttributesMetadata:
+ derived_from: tosca.datatypes.Root
+ description: is an empty base type for deriving data types for describing VNF-specific metadata
+ # below description properties added as optional, since atleast one property required to define a dataType in SDC
+ properties:
+ description:
+ type: string
+ required: false
+ tosca.datatypes.nfv.VnfInfoModifiableAttributes:
+ derived_from: tosca.datatypes.Root
+ description: Describes VNF-specific extension and metadata for a given VNF
+ properties:
+ extensions:
+ type: tosca.datatypes.nfv.VnfInfoModifiableAttributesExtensions
+ description: \"Extension\" properties of VnfInfo that are writeable
+ required: false
+ # derived types are expected to introduce
+ # extensions with its type derived from
+ # tosca.datatypes.nfv.VnfInfoModifiableAttributesExtensions
+ metadata:
+ type: tosca.datatypes.nfv.VnfInfoModifiableAttributesMetadata
+ description: \"Metadata\" properties of VnfInfo that are writeable
+ required: false
+ # derived types are expected to introduce
+ # metadata with its type derived from
+ # tosca.datatypes.nfv.VnfInfoModifiableAttributesMetadata
+ tosca.datatypes.nfv.VirtualLinkBitrateLevel:
+ derived_from: tosca.datatypes.Root
+ description: Describes bitrate requirements applicable to the virtual link instantiated from a particicular VnfVirtualLink
+ properties:
+ description:
+ type: string
+ required: false
+ bitrate_requirements:
+ type: tosca.datatypes.nfv.LinkBitrateRequirements
+ description: Virtual link bitrate requirements for an instantiation level or bitrate delta for a scaling step
+ required: true
+ tosca.datatypes.nfv.VnfOperationAdditionalParameters:
+ derived_from: tosca.datatypes.Root
+ description: Is an empty base type for deriving data type for describing VNF-specific parameters to be passed when invoking lifecycle management operations
+ # below description properties added as optional, since atleast one property required to define a dataType in SDC
+ properties:
+ description:
+ type: string
+ required: false
+ tosca.datatypes.nfv.VirtualFileStorageData:
+ derived_from: tosca.datatypes.Root
+ description: VirtualFileStorageData describes file storage requirements associated with compute resources in a particular VDU
+ properties:
+ size_of_storage:
+ type: scalar-unit.size
+ description: Size of virtualized storage resource
+ required: true
+ file_system_protocol:
+ type: string
+ description: The shared file system protocol (e.g. NFS, CIFS)
+ required: true
+ tosca.datatypes.nfv.VirtualObjectStorageData:
+ derived_from: tosca.datatypes.Root
+ description: VirtualObjectStorageData describes object storage requirements associated with compute resources in a particular VDU
+ properties:
+ max_size_of_storage:
+ type: scalar-unit.size
+ description: Maximum size of virtualized storage resource
+ required: false
+ tosca.datatypes.nfv.VirtualBlockStorageData:
+ derived_from: tosca.datatypes.Root
+ description: VirtualBlockStorageData describes block storage requirements associated with compute resources in a particular VDU, either as a local disk or as virtual attached storage
+ properties:
+ size_of_storage:
+ type: scalar-unit.size
+ description: Size of virtualised storage resource
+ required: true
+ vdu_storage_requirements:
+ type: map
+ description: The hardware platform specific storage requirements. A map of strings that contains a set of key-value pairs that represents the hardware platform specific storage deployment requirements.
+ required: false
+ entry_schema:
+ type: string
+ rdma_enabled:
+ type: boolean
+ description: Indicates if the storage support RDMA
+ required: false
+ default: false
+ tosca.datatypes.nfv.SwImageData:
+ derived_from: tosca.datatypes.Root
+ description: describes information related to a software image artifact
+ properties: # in SOL001 v0.8.0: "properties or metadata:"
+ name:
+ type: string
+ description: Name of this software image
+ required: true
+ version:
+ type: string
+ description: Version of this software image
+ required: true
+ checksum:
+ type: string
+ description: Checksum of the software image file
+ required: true
+ container_format:
+ type: string
+ description: The container format describes the container file format in which software image is provided
+ required: true
+ constraints:
+ - valid_values: [ aki, ami, ari, bare, docker, ova, ovf ]
+ disk_format:
+ type: string
+ description: The disk format of a software image is the format of the underlying disk image
+ required: true
+ constraints:
+ - valid_values: [ aki, ami, ari, iso, qcow2, raw, vdi, vhd, vhdx, vmdk ]
+ min_disk:
+ type: scalar-unit.size # Number
+ description: The minimal disk size requirement for this software image
+ required: true
+ min_ram:
+ type: scalar-unit.size # Number
+ description: The minimal RAM requirement for this software image
+ required: false
+ size:
+ type: scalar-unit.size # Number
+ description: The size of this software image
+ required: true
+ operating_system:
+ type: string
+ description: Identifies the operating system used in the software image
+ required: false
+ supported_virtualisation_environments:
+ type: list
+ description: Identifies the virtualisation environments (e.g. hypervisor) compatible with this software image
+ required: false
+ entry_schema:
+ type: string
+
+interface_types:
+ tosca.interfaces.nfv.Vnflcm:
+ #derived_from: tosca.interfaces.Root
+ #description: This interface encompasses a set of TOSCA operations corresponding to the VNF LCM operations defined in ETSI GS NFV-IFA 007 as well as to preamble and postamble procedures to the execution of the VNF LCM operations.
+ instantiate:
+ description: Invoked upon receipt of an Instantiate VNF request
+ # inputs:
+ # additional_parameters:
+ # type: tosca.datatypes.nfv.VnfOperationAdditionalParameters
+ # required: false
+ # derived types are expected to introduce additional_parameters with
+ # its type derived from
+ # tosca.datatypes.nfv.VnfOperationAdditionalParameters
+ instantiate_start:
+ description: Invoked before instantiate
+ instantiate_end:
+ description: Invoked after instantiate
+ terminate:
+ description: Invoked upon receipt Terminate VNF request
+ # inputs:
+ # additional_parameters:
+ # type: tosca.datatypes.nfv.VnfOperationAdditionalParameters
+ # required: false
+ # derived types are expected to introduce additional_parameters with
+ # its type derived from
+ # tosca.datatypes.nfv.VnfOperationAdditionalParameters
+ terminate_start:
+ description: Invoked before terminate
+ terminate_end:
+ description: Invoked after terminate
+ modify_information:
+ description: Invoked upon receipt of a Modify VNF Information request
+ modify_information_start:
+ description: Invoked before modify_information
+ modify_information_end:
+ description: Invoked after modify_information
+ change_flavour:
+ description: Invoked upon receipt of a Change VNF Flavour request
+ # inputs:
+ # additional_parameters:
+ # type: tosca.datatypes.nfv.VnfOperationAdditionalParameters
+ # required: false
+ # derived types are expected to introduce additional_parameters with
+ # its type derived from
+ # tosca.datatypes.nfv.VnfOperationAdditionalParameters
+ change_flavour_start:
+ description: Invoked before change_flavour
+ change_flavour_end:
+ description: Invoked after change_flavour
+ change_external_connectivity:
+ description: Invoked upon receipt of a Change External VNF Connectivity request
+ # inputs:
+ # additional_parameters:
+ # type: tosca.datatypes.nfv.VnfOperationAdditionalParameters
+ # required: false
+ # derived types are expected to introduce additional_parameters with
+ # its type derived from
+ # tosca.datatypes.nfv.VnfOperationAdditionalParameters
+ change_external_connectivity_start:
+ description: Invoked before change_external_connectivity
+ change_external_connectivity_end:
+ description: Invoked after change_external_connectivity
+ operate:
+ description: Invoked upon receipt of an Operate VNF request
+ # inputs:
+ # additional_parameters:
+ # type: tosca.datatypes.nfv.VnfOperationAdditionalParameters
+ # required: false
+ # derived types are expected to introduce additional_parameters with
+ # its type derived from
+ # tosca.datatypes.nfv.VnfOperationAdditionalParameters
+ operate_start:
+ description: Invoked before operate
+ operate_end:
+ description: Invoked after operate
+ heal:
+ description: Invoked upon receipt of a Heal VNF request
+ # inputs:
+ # additional_parameters:
+ # type: tosca.datatypes.nfv.VnfOperationAdditionalParameters
+ # required: false
+ # derived types are expected to introduce additional_parameters with
+ # its type derived from
+ # tosca.datatypes.nfv.VnfOperationAdditionalParameters
+ heal_start:
+ description: Invoked before heal
+ heal_end:
+ description: Invoked after heal
+ scale:
+ description: Invoked upon receipt of a Scale VNF request
+ # inputs:
+ # additional_parameters:
+ # type: tosca.datatypes.nfv.VnfOperationAdditionalParameters
+ # required: false
+ # derived types are expected to introduce additional_parameters with
+ # its type derived from
+ # tosca.datatypes.nfv.VnfOperationAdditionalParameters
+ scale_start:
+ description: Invoked before scale
+ scale_end:
+ description: Invoked after scale
+ scale_to_level:
+ description: Invoked upon receipt of a Scale VNF to Level request
+ # inputs:
+ # additional_parameters:
+ # type: tosca.datatypes.nfv.VnfOperationAdditionalParameters
+ # required: false
+ # derived types are expected to introduce additional_parameters with
+ # its type derived from
+ # tosca.datatypes.nfv.VnfOperationAdditionalParameters
+ scale_to_level_start:
+ description: Invoked before scale_to_level
+ scale_to_level_end:
+ description: Invoked after scale_to_level
+
+node_types:
+ tosca.nodes.nfv.Vdu.Compute:
+ derived_from: tosca.nodes.Root
+ description: Describes the virtual compute part of a VDU which is a construct supporting the description of the deployment and operational behavior of a VNFC
+ properties:
+ name:
+ type: string
+ description: Human readable name of the VDU
+ required: true
+ description:
+ type: string
+ description: Human readable description of the VDU
+ required: true
+ boot_order:
+ type: list # explicit index (boot index) not necessary, contrary to IFA011
+ description: References a node template name from which a valid boot device is created
+ required: false
+ entry_schema:
+ type: string
+ nfvi_constraints:
+ type: list
+ description: Describes constraints on the NFVI for the VNFC instance(s) created from this VDU
+ required: false
+ entry_schema:
+ type: string
+ monitoring_parameters:
+ type: list
+ description: Describes monitoring parameters applicable to a VNFC instantiated from this VDU
+ required: false
+ entry_schema:
+ type: tosca.datatypes.nfv.VnfcMonitoringParameter
+ #configurable_properties:
+ #type: tosca.datatypes.nfv.VnfcConfigurableProperties
+ #required: false
+ # derived types are expected to introduce
+ # configurable_properties with its type derived from
+ # tosca.datatypes.nfv.VnfcConfigurableProperties
+ vdu_profile:
+ type: tosca.datatypes.nfv.VduProfile
+ description: Defines additional instantiation data for the VDU.Compute node
+ required: true
+ sw_image_data:
+ type: tosca.datatypes.nfv.SwImageData
+ description: Defines information related to a SwImage artifact used by this Vdu.Compute node
+ required: false # property is required when the node template has an associated artifact of type tosca.artifacts.nfv.SwImage and not required otherwise
+ boot_data:
+ type: string
+ description: Contains a string or a URL to a file contained in the VNF package used to customize a virtualised compute resource at boot time. The bootData may contain variable parts that are replaced by deployment specific values before being sent to the VIM.
+ required: false
+ inject_files: #Introduced from Beijing release, used for vCPE usecase, outside the scope of SOL001 v2.5.1
+ type: tosca.datatypes.nfv.injectFile
+ required: false #Aligned with ONAP R2 IM. it should be false.
+ meta_data: #Introduced from Beijing release, used for metadata attached to the VM or container, outside the scope of SOL001 v2.5.1
+ type: map
+ entry_schema:
+ type: string
+ required: false
+ capabilities:
+ virtual_compute:
+ type: tosca.capabilities.nfv.VirtualCompute
+ occurrences: [ 1, 1 ]
+ virtual_binding:
+ type: tosca.capabilities.nfv.VirtualBindable
+ occurrences: [ 1, UNBOUNDED ]
+ requirements:
+ - virtual_storage:
+ capability: tosca.capabilities.nfv.VirtualStorage
+ relationship: tosca.relationships.nfv.AttachesTo
+ occurrences: [ 0, UNBOUNDED ]
+ tosca.nodes.nfv.Vdu.VirtualBlockStorage:
+ derived_from: tosca.nodes.Root
+ description: This node type describes the specifications of requirements related to virtual block storage resources
+ properties:
+ virtual_block_storage_data:
+ type: tosca.datatypes.nfv.VirtualBlockStorageData
+ description: Describes the block storage characteristics.
+ required: true
+ sw_image_data:
+ type: tosca.datatypes.nfv.SwImageData
+ description: Defines information related to a SwImage artifact used by this Vdu.Compute node.
+ required: false # property is required when the node template has an associated artifact of type tosca.artifacts.nfv.SwImage and not required otherwise
+ capabilities:
+ virtual_storage:
+ type: tosca.capabilities.nfv.VirtualStorage
+ description: Defines the capabilities of virtual_storage.
+ tosca.nodes.nfv.Vdu.VirtualFileStorage:
+ derived_from: tosca.nodes.Root
+ description: This node type describes the specifications of requirements related to virtual file storage resources
+ properties:
+ virtual_file_storage_data:
+ type: tosca.datatypes.nfv.VirtualFileStorageData
+ description: Describes the file storage characteristics.
+ required: true
+ capabilities:
+ virtual_storage:
+ type: tosca.capabilities.nfv.VirtualStorage
+ description: Defines the capabilities of virtual_storage.
+ requirements:
+ - virtual_link:
+ capability: tosca.capabilities.nfv.VirtualLinkable
+ relationship: tosca.relationships.nfv.VirtualLinksTo
+ #description: Describes the requirements for linking to virtual link
+ tosca.nodes.nfv.Vdu.VirtualObjectStorage:
+ derived_from: tosca.nodes.Root
+ description: This node type describes the specifications of requirements related to virtual object storage resources
+ properties:
+ virtual_object_storage_data:
+ type: tosca.datatypes.nfv.VirtualObjectStorageData
+ description: Describes the object storage characteristics.
+ required: true
+ capabilities:
+ virtual_storage:
+ type: tosca.capabilities.nfv.VirtualStorage
+ description: Defines the capabilities of virtual_storage.
+ tosca.nodes.nfv.Cp:
+ derived_from: tosca.nodes.Root
+ description: Provides information regarding the purpose of the connection point
+ properties:
+ layer_protocols:
+ type: list
+ description: Identifies which protocol the connection point uses for connectivity purposes
+ required: true
+ entry_schema:
+ type: string
+ constraints:
+ - valid_values: [ ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire ]
+ role: #Name in ETSI NFV IFA011 v0.7.3: cpRole
+ type: string
+ description: Identifies the role of the port in the context of the traffic flow patterns in the VNF or parent NS
+ required: false
+ constraints:
+ - valid_values: [ root, leaf ]
+ description:
+ type: string
+ description: Provides human-readable information on the purpose of the connection point
+ required: false
+ protocol:
+ type: list
+ description: Provides information on the addresses to be assigned to the connection point(s) instantiated from this Connection Point Descriptor
+ required: false
+ entry_schema:
+ type: tosca.datatypes.nfv.CpProtocolData
+ trunk_mode:
+ type: boolean
+ description: Provides information about whether the CP instantiated from this Cp is in Trunk mode (802.1Q or other), When operating in "trunk mode", the Cp is capable of carrying traffic for several VLANs. Absence of this property implies that trunkMode is not configured for the Cp i.e. It is equivalent to boolean value "false".
+ required: false
+ allowed_address_data: # #Introduced from Beijing release, align with resource IM, outside the scope of SOL001 v2.5.1
+ type: tosca.datatypes.nfv.AddressData # In the IM, it is a array, but here it is not a array. TBD.
+ required: false
+ tosca.nodes.nfv.VduCp:
+ derived_from: tosca.nodes.nfv.Cp
+ description: describes network connectivity between a VNFC instance based on this VDU and an internal VL
+ properties:
+ bitrate_requirement:
+ type: integer # in bits per second
+ description: Bitrate requirement in bit per second on this connection point
+ required: false
+ constraints:
+ - greater_or_equal: 0
+ virtual_network_interface_requirements:
+ type: list
+ description: Specifies requirements on a virtual network interface realising the CPs instantiated from this CPD
+ required: false
+ entry_schema:
+ type: tosca.datatypes.nfv.VirtualNetworkInterfaceRequirements
+ order:
+ type: integer
+ description: The order of the NIC on the compute instance (e.g.eth2)
+ required: false
+ constraints:
+ - greater_or_equal: 0
+ vnic_type:
+ type: string
+ description: Describes the type of the virtual network interface realizing the CPs instantiated from this CPD
+ required: false
+ constraints:
+ - valid_values: [ direct, normal, virtio, direct-physical ]
+ vnic_name: # Introduced from Beijing release, aligned with ONAP resource IM, outside the scope of SOL001 v2.5.1
+ type: string
+ required: false
+ requirements:
+ - virtual_link:
+ capability: tosca.capabilities.nfv.VirtualLinkable
+ relationship: tosca.relationships.nfv.VirtualLinksTo
+ - virtual_binding:
+ capability: tosca.capabilities.nfv.VirtualBindable
+ relationship: tosca.relationships.nfv.VirtualBindsTo
+ node: tosca.nodes.nfv.Vdu.Compute
+ tosca.nodes.nfv.VnfVirtualLink:
+ derived_from: tosca.nodes.Root
+ description: Describes the information about an internal VNF VL
+ properties:
+ connectivity_type:
+ type: tosca.datatypes.nfv.ConnectivityType
+ description: Specifies the protocol exposed by the VL and the flow pattern supported by the VL
+ required: true
+ description:
+ type: string
+ description: Provides human-readable information on the purpose of the VL
+ required: false
+ test_access:
+ type: list
+ description: Test access facilities available on the VL
+ required: false
+ entry_schema:
+ type: string
+ constraints:
+ - valid_values: [ passive_monitoring, active_loopback ]
+ vl_profile:
+ type: tosca.datatypes.nfv.VlProfile
+ description: Defines additional data for the VL
+ required: true
+ monitoring_parameters:
+ type: list
+ description: Describes monitoring parameters applicable to the VL
+ required: false
+ entry_schema:
+ type: tosca.datatypes.nfv.VirtualLinkMonitoringParameter
+ capabilities:
+ virtual_linkable:
+ type: tosca.capabilities.nfv.VirtualLinkable
+ tosca.nodes.nfv.VNF:
+ derived_from: tosca.nodes.Root
+ description: The generic abstract type from which all VNF specific abstract node types shall be derived to form, together with other node types, the TOSCA service template(s) representing the VNFD
+ properties:
+ descriptor_id: # instead of vnfd_id
+ type: string # GUID
+ description: Globally unique identifier of the VNFD
+ required: true
+ descriptor_version: # instead of vnfd_version
+ type: string
+ description: Identifies the version of the VNFD
+ required: true
+ provider: # instead of vnf_provider
+ type: string
+ description: Provider of the VNF and of the VNFD
+ required: true
+ product_name: # instead of vnf_product_name
+ type: string
+ description: Human readable name for the VNF Product
+ required: true
+ software_version: # instead of vnf_software_version
+ type: string
+ description: Software version of the VNF
+ required: true
+ product_info_name: # instead of vnf_product_info_name
+ type: string
+ description: Human readable name for the VNF Product
+ required: false
+ product_info_description: # instead of vnf_product_info_description
+ type: string
+ description: Human readable description of the VNF Product
+ required: false
+ vnfm_info:
+ type: list
+ required: true
+ description: Identifies VNFM(s) compatible with the VNF
+ entry_schema:
+ type: string
+ localization_languages:
+ type: list
+ description: Information about localization languages of the VNF
+ required: false
+ entry_schema:
+ type: string #IETF RFC 5646 string
+ default_localization_language:
+ type: string #IETF RFC 5646 string
+ description: Default localization language that is instantiated if no information about selected localization language is available
+ required: false
+ #configurable_properties:
+ #type: tosca.datatypes.nfv.VnfConfigurableProperties
+ #description: Describes the configurable properties of the VNF
+ #required: false
+ # derived types are expected to introduce configurable_properties
+ # with its type derived from
+ # tosca.datatypes.nfv.VnfConfigurableProperties
+ #modifiable_attributes:
+ #type: tosca.datatypes.nfv.VnfInfoModifiableAttributes
+ #description: Describes the modifiable attributes of the VNF
+ #required: false
+ # derived types are expected to introduce modifiable_attributes
+ # with its type derived from
+ # tosca.datatypes.nfv.VnfInfoModifiableAttributes
+ lcm_operations_configuration:
+ type: tosca.datatypes.nfv.VnfLcmOperationsConfiguration
+ description: Describes the configuration parameters for the VNF LCM operations
+ required: false
+ monitoring_parameters:
+ type: list
+ entry_schema:
+ type: tosca.datatypes.nfv.VnfMonitoringParameter
+ description: Describes monitoring parameters applicable to the VNF.
+ required: false
+ flavour_id:
+ type: string
+ description: Identifier of the Deployment Flavour within the VNFD
+ required: true
+ flavour_description:
+ type: string
+ description: Human readable description of the DF
+ required: true
+ #vnf_profile:
+ # type: tosca.datatypes.nfv.VnfProfile
+ # description: Describes a profile for instantiating VNFs of a particular NS DF according to a specific VNFD and VNF DF
+ # required: false
+ requirements:
+ - virtual_link:
+ capability: tosca.capabilities.nfv.VirtualLinkable
+ relationship: tosca.relationships.nfv.VirtualLinksTo
+ occurrences: [ 0, 1 ]
+ interfaces:
+ Vnflcm:
+ type: tosca.interfaces.nfv.Vnflcm
+ tosca.nodes.nfv.VnfExtCp:
+ derived_from: tosca.nodes.nfv.Cp
+ description: Describes a logical external connection point, exposed by the VNF enabling connection with an external Virtual Link
+ properties:
+ virtual_network_interface_requirements:
+ type: list
+ description: The actual virtual NIC requirements that is been assigned when instantiating the connection point
+ required: false
+ entry_schema:
+ type: tosca.datatypes.nfv.VirtualNetworkInterfaceRequirements
+ requirements:
+ - external_virtual_link:
+ capability: tosca.capabilities.nfv.VirtualLinkable
+ relationship: tosca.relationships.nfv.VirtualLinksTo
+ - internal_virtual_link: #name in ETSI NFV IFA011 v0.7.3: intVirtualLinkDesc
+ capability: tosca.capabilities.nfv.VirtualLinkable
+ relationship: tosca.relationships.nfv.VirtualLinksTo
+
+relationship_types:
+ tosca.relationships.nfv.VirtualBindsTo:
+ derived_from: tosca.relationships.DependsOn
+ description: Represents an association relationship between Vdu.Compute and VduCp node types
+ valid_target_types: [ tosca.capabilities.nfv.VirtualBindable ]
+ tosca.relationships.nfv.VirtualLinksTo:
+ derived_from: tosca.relationships.DependsOn
+ description: Represents an association relationship between the VduCp and VnfVirtualLink node types
+ valid_target_types: [ tosca.capabilities.nfv.VirtualLinkable ]
+ tosca.relationships.nfv.AttachesTo:
+ derived_from: tosca.relationships.Root
+ description: Represents an association relationship between the Vdu.Compute and one of the node types, Vdu.VirtualBlockStorage, Vdu.VirtualObjectStorage or Vdu.VirtualFileStorage
+ valid_target_types: [ tosca.capabilities.nfv.VirtualStorage ]
+
+group_types:
+ tosca.groups.nfv.PlacementGroup:
+ derived_from: tosca.groups.Root
+ description: PlacementGroup is used for describing the affinity or anti-affinity relationship applicable between the virtualization containers to be created based on different VDUs, or between internal VLs to be created based on different VnfVirtualLinkDesc(s)
+ properties:
+ description:
+ type: string
+ description: Human readable description of the group
+ required: true
+ members: [ tosca.nodes.nfv.Vdu.Compute, tosca.nodes.nfv.VnfVirtualLink ]
+
+policy_types:
+ tosca.policies.nfv.InstantiationLevels:
+ derived_from: tosca.policies.Root
+ description: The InstantiationLevels type is a policy type representing all the instantiation levels of resources to be instantiated within a deployment flavour and including default instantiation level in term of the number of VNFC instances to be created as defined in ETSI GS NFV-IFA 011 [1].
+ properties:
+ levels:
+ type: map # key: levelId
+ description: Describes the various levels of resources that can be used to instantiate the VNF using this flavour.
+ required: true
+ entry_schema:
+ type: tosca.datatypes.nfv.InstantiationLevel
+ default_level:
+ type: string # levelId
+ description: The default instantiation level for this flavour.
+ required: false # required if multiple entries in levels
+ tosca.policies.nfv.VduInstantiationLevels:
+ derived_from: tosca.policies.Root
+ description: The VduInstantiationLevels type is a policy type representing all the instantiation levels of resources to be instantiated within a deployment flavour in term of the number of VNFC instances to be created from each vdu.Compute. as defined in ETSI GS NFV-IFA 011 [1]
+ properties:
+ levels:
+ type: map # key: levelId
+ description: Describes the Vdu.Compute levels of resources that can be used to instantiate the VNF using this flavour
+ required: true
+ entry_schema:
+ type: tosca.datatypes.nfv.VduLevel
+ targets: [ tosca.nodes.nfv.Vdu.Compute ]
+ tosca.policies.nfv.VirtualLinkInstantiationLevels:
+ derived_from: tosca.policies.Root
+ description: The VirtualLinkInstantiationLevels type is a policy type representing all the instantiation levels of virtual link resources to be instantiated within a deployment flavour as defined in ETSI GS NFV-IFA 011 [1].
+ properties:
+ levels:
+ type: map # key: levelId
+ description: Describes the virtual link levels of resources that can be used to instantiate the VNF using this flavour.
+ required: true
+ entry_schema:
+ type: tosca.datatypes.nfv.VirtualLinkBitrateLevel
+ targets: [ tosca.nodes.nfv.VnfVirtualLink ]
+ tosca.policies.nfv.ScalingAspects:
+ derived_from: tosca.policies.Root
+ description: The ScalingAspects type is a policy type representing the scaling aspects used for horizontal scaling as defined in ETSI GS NFV-IFA 011 [1].
+ properties:
+ aspects:
+ type: map # key: aspectId
+ description: Describe maximum scale level for total number of scaling steps that can be applied to a particular aspect
+ required: true
+ entry_schema:
+ type: tosca.datatypes.nfv.ScalingAspect
+ tosca.policies.nfv.VduScalingAspectDeltas:
+ derived_from: tosca.policies.Root
+ description: The VduScalingAspectDeltas type is a policy type representing the Vdu.Compute detail of an aspect deltas used for horizontal scaling, as defined in ETSI GS NFV-IFA 011 [1].
+ properties:
+ aspect:
+ type: string
+ description: Represents the scaling aspect to which this policy applies
+ required: true
+ deltas:
+ type: map # key: scalingDeltaId
+ description: Describes the Vdu.Compute scaling deltas to be applied for every scaling steps of a particular aspect.
+ required: true
+ entry_schema:
+ type: tosca.datatypes.nfv.VduLevel
+ targets: [ tosca.nodes.nfv.Vdu.Compute ]
+ tosca.policies.nfv.VirtualLinkBitrateScalingAspectDeltas:
+ derived_from: tosca.policies.Root
+ description: The VirtualLinkBitrateScalingAspectDeltas type is a policy type representing the VnfVirtualLink detail of an aspect deltas used for horizontal scaling, as defined in ETSI GS NFV-IFA 011 [1].
+ properties:
+ aspect:
+ type: string
+ description: Represents the scaling aspect to which this policy applies.
+ required: true
+ deltas:
+ type: map # key: scalingDeltaId
+ description: Describes the VnfVirtualLink scaling deltas to be applied for every scaling steps of a particular aspect.
+ required: true
+ entry_schema:
+ type: tosca.datatypes.nfv.VirtualLinkBitrateLevel
+ targets: [ tosca.nodes.nfv.VnfVirtualLink ]
+ tosca.policies.nfv.VduInitialDelta:
+ derived_from: tosca.policies.Root
+ description: The VduInitialDelta type is a policy type representing the Vdu.Compute detail of an initial delta used for horizontal scaling, as defined in ETSI GS NFV-IFA 011 [1].
+ properties:
+ initial_delta:
+ type: tosca.datatypes.nfv.VduLevel
+ description: Represents the initial minimum size of the VNF.
+ required: true
+ targets: [ tosca.nodes.nfv.Vdu.Compute ]
+ tosca.policies.nfv.VirtualLinkBitrateInitialDelta:
+ derived_from: tosca.policies.Root
+ description: The VirtualLinkBitrateInitialDelta type is a policy type representing the VnfVirtualLink detail of an initial deltas used for horizontal scaling, as defined in ETSI GS NFV-IFA 011 [1].
+ properties:
+ initial_delta:
+ type: tosca.datatypes.nfv.VirtualLinkBitrateLevel
+ description: Represents the initial minimum size of the VNF.
+ required: true
+ targets: [ tosca.nodes.nfv.VnfVirtualLink ]
+ # tosca.policies.nfv.AffinityRule:
+ # derived_from: tosca.policies.Placement
+ # description: The AffinityRule describes the affinity rules applicable for the defined targets
+ # properties:
+ # scope:
+ # type: string
+ # description: scope of the rule is an NFVI_node, an NFVI_PoP, etc.
+ # required: true
+ # constraints:
+ # - valid_values: [ nfvi_node, zone, zone_group, nfvi_pop ]
+ # targets: [ tosca.nodes.nfv.Vdu.Compute, tosca.nodes.nfv.VnfVirtualLink, tosca.groups.nfv.PlacementGroup ]
+ #
+ # tosca.policies.nfv.AntiAffinityRule:
+ # derived_from: tosca.policies.Placement
+ # description: The AntiAffinityRule describes the anti-affinity rules applicable for the defined targets
+ # properties:
+ # scope:
+ # type: string
+ # description: scope of the rule is an NFVI_node, an NFVI_PoP, etc.
+ # required: true
+ # constraints:
+ # - valid_values: [ nfvi_node, zone, zone_group, nfvi_pop ]
+ # targets: [ tosca.nodes.nfv.Vdu.Compute, tosca.nodes.nfv.VnfVirtualLink, tosca.groups.nfv.PlacementGroup ]
+ tosca.policies.nfv.SecurityGroupRule:
+ derived_from: tosca.policies.Root
+ description: The SecurityGroupRule type is a policy type specified the matching criteria for the ingress and/or egress traffic to/from visited connection points as defined in ETSI GS NFV-IFA 011 [1].
+ properties:
+ description:
+ type: string
+ description: Human readable description of the security group rule.
+ required: false
+ direction:
+ type: string
+ description: The direction in which the security group rule is applied. The direction of 'ingress' or 'egress' is specified against the associated CP. I.e., 'ingress' means the packets entering a CP, while 'egress' means the packets sent out of a CP.
+ required: false
+ constraints:
+ - valid_values: [ ingress, egress ]
+ default: ingress
+ ether_type:
+ type: string
+ description: Indicates the protocol carried over the Ethernet layer.
+ required: false
+ constraints:
+ - valid_values: [ ipv4, ipv6 ]
+ default: ipv4
+ protocol:
+ type: string
+ description: Indicates the protocol carried over the IP layer. Permitted values include any protocol defined in the IANA protocol registry, e.g. TCP, UDP, ICMP, etc.
+ required: false
+ constraints:
+ - valid_values: [ hopopt, icmp, igmp, ggp, ipv4, st, tcp, cbt, egp, igp, bbn_rcc_mon, nvp_ii, pup, argus, emcon, xnet, chaos, udp, mux, dcn_meas, hmp, prm, xns_idp, trunk_1, trunk_2, leaf_1, leaf_2, rdp, irtp, iso_tp4, netblt, mfe_nsp, merit_inp, dccp, 3pc, idpr, xtp, ddp, idpr_cmtp, tp++, il, ipv6, sdrp, ipv6_route, ipv6_frag, idrp, rsvp, gre, dsr, bna, esp, ah, i_nlsp, swipe, narp, mobile, tlsp, skip, ipv6_icmp, ipv6_no_nxt, ipv6_opts, cftp, sat_expak, kryptolan, rvd, ippc, sat_mon, visa, ipcv, cpnx, cphb, wsn, pvp, br_sat_mon, sun_nd, wb_mon, wb_expak, iso_ip, vmtp, secure_vmtp, vines, ttp, iptm, nsfnet_igp, dgp, tcf, eigrp, ospfigp, sprite_rpc, larp, mtp, ax.25, ipip, micp, scc_sp, etherip, encap, gmtp, ifmp, pnni, pim, aris, scps, qnx, a/n, ip_comp, snp, compaq_peer, ipx_in_ip, vrrp, pgm, l2tp, ddx, iatp, stp, srp, uti, smp, sm, ptp, isis, fire, crtp, crudp, sscopmce, iplt, sps, pipe, sctp, fc, rsvp_e2e_ignore, mobility, udp_lite, mpls_in_ip, manet, hip, shim6, wesp, rohc ]
+ default: tcp
+ port_range_min:
+ type: integer
+ description: Indicates minimum port number in the range that is matched by the security group rule. If a value is provided at design-time, this value may be overridden at run-time based on other deployment requirements or constraints.
+ required: false
+ constraints:
+ - greater_or_equal: 0
+ - less_or_equal: 65535
+ default: 0
+ port_range_max:
+ type: integer
+ description: Indicates maximum port number in the range that is matched by the security group rule. If a value is provided at design-time, this value may be overridden at run-time based on other deployment requirements or constraints.
+ required: false
+ constraints:
+ - greater_or_equal: 0
+ - less_or_equal: 65535
+ default: 65535
+ targets: [ tosca.nodes.nfv.VduCp, tosca.nodes.nfv.VnfExtCp ]
+ tosca.policies.nfv.SupportedVnfInterface:
+ derived_from: tosca.policies.Root
+ description: this policy type represents interfaces produced by a VNF, the details to access them and the applicable connection points to use to access these interfaces
+ properties:
+ interface_name:
+ type: string
+ description: Identifies an interface produced by the VNF.
+ required: true
+ constraints:
+ - valid_values: [ vnf_indicator, vnf_configuration ]
+ details:
+ type: tosca.datatypes.nfv.InterfaceDetails
+ description: Provide additional data to access the interface endpoint
+ required: false
+ targets: [ tosca.nodes.nfv.VnfExtCp, tosca.nodes.nfv.VduCp ]
"requestDetails": {
"modelInfo": {
"modelType": "service",
- "modelInvariantId": "0ddc448d-5513-44bc-8b02-5759d84600d5",
- "modelVersionId": "28d4acf3-4791-4998-8d06-1cdf6d1767a9",
- "modelName": "manualDistributionTestService",
+ "modelInvariantId": "10b3d278-e262-44ca-a0c0-4e663c2d7562",
+ "modelVersionId": "fdea6501-dabd-4428-b52c-623336a3b403",
+ "modelName": "EtsiServiceCSIT3",
"modelVersion": "1.0"
},
"requestInfo": {
"aLaCarte": true
}
}
-}
\ No newline at end of file
+}
{
- "requestDetails": {
- "requestInfo": {
- "instanceName": "CsitEtsiInstance",
- "source": "VID",
- "suppressRollback": false,
- "requestorId": "demo"
- },
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "0ddc448d-5513-44bc-8b02-5759d84600d5",
- "modelVersionId": "28d4acf3-4791-4998-8d06-1cdf6d1767a9",
- "modelName": "manualDistributionTestService",
- "modelVersion": "1.0"
- },
- "requestParameters": {
- "userParams": [],
- "testApi": "GR_API",
- "subscriptionServiceType": "vCPE",
- "aLaCarte": true
- },
- "subscriberInfo": {
- "globalSubscriberId": "DemoCustomer"
- },
- "project": {
- "projectName": "etsiCsitProject"
- },
- "owningEntity": {
- "owningEntityId": "f2e1071e-3d47-4a65-94d4-e473ec03326a",
- "owningEntityName": "OE-Demonstration"
- }
+ "requestDetails": {
+ "requestInfo": {
+ "instanceName": "CsitEtsiInstance",
+ "source": "VID",
+ "suppressRollback": false,
+ "requestorId": "demo"
+ },
+ "modelInfo": {
+ "modelType": "service",
+ "modelInvariantId": "10b3d278-e262-44ca-a0c0-4e663c2d7562",
+ "modelVersionId": "fdea6501-dabd-4428-b52c-623336a3b403",
+ "modelName": "EtsiServiceCSIT3",
+ "modelVersion": "1.0"
+ },
+ "requestParameters": {
+ "userParams": [],
+ "testApi": "GR_API",
+ "subscriptionServiceType": "vCPE",
+ "aLaCarte": true
+ },
+ "subscriberInfo": {
+ "globalSubscriberId": "DemoCustomer"
+ },
+ "project": {
+ "projectName": "etsiCsitProject"
+ },
+ "owningEntity": {
+ "owningEntityId": "f2e1071e-3d47-4a65-94d4-e473ec03326a",
+ "owningEntityName": "OE-Demonstration"
}
+ }
}
"requestDetails": {
"modelInfo": {
"modelType": "vnf",
- "modelInvariantId": "b0f14066-2b65-40d2-b5a4-c8f2116fb5fc",
- "modelVersionId": "84b9649a-4eb9-4967-9abe-e8702f55518b",
- "modelName": "Sol004Zip3VSP",
- "modelCustomizationName": "Sol004Zip3VSP 0",
- "modelCustomizationId": "ff0860ac-fa9a-4fff-956b-80eeb7a330bc",
+ "modelInvariantId": "037f7b1b-5c62-44c1-b806-f92fe8970171",
+ "modelVersionId": "73522444-e8e9-49c1-be29-d355800aa349",
+ "modelName": "EtsiVnfCSIT3",
+ "modelCustomizationName": "EtsiVnfCSIT3 0",
+ "modelCustomizationId": "3341825c-837c-4e84-8a82-cc69033ca92f",
"modelVersion": "1.0"
},
"requestInfo": {
"tenantId": "693c7729b2364a26a3ca602e6f66187d"
}
}
-}
\ No newline at end of file
+}
{
- "requestDetails": {
- "requestInfo": {
- "instanceName": "CsitEtsiVnfInstance",
- "source": "VID",
- "suppressRollback": false,
- "requestorId": "demo",
- "productFamilyId": "f13844f4-dbf8-4d0e-a979-45204f3ddb4e"
- },
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "0a0b9979-863d-4b7e-b7f4-d27725a182b3",
- "modelVersionId": "8f43a8c9-c677-462a-ae36-8ddb5990a60d",
- "modelName": "manualDistributionTestVNF",
- "modelVersion": "1.0",
- "modelCustomizationId": "82ad3aa0-edc6-410c-a217-655fb064323f",
- "modelCustomizationName": "manualDistributionTestVNF 0"
- },
- "requestParameters": {
- "userParams": [],
- "testApi": "GR_API"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "EtsiCloudRegion",
- "cloudOwner": "CloudOwner",
- "tenantId": "693c7729b2364a26a3ca602e6f66187d"
- },
- "lineOfBusiness": {
- "lineOfBusinessName": "EtsiCsitLineOfBusiness"
- },
- "platform": {
- "platformName": "EtsiCsitPlatform"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "",
- "modelInfo": {
- "modelType": "service",
- "modelName": "Sol004Zip4Service",
- "modelInvariantId": "0ddc448d-5513-44bc-8b02-5759d84600d5",
- "modelVersion": "1.0",
- "modelVersionId": "99d59273-4450-4034-9141-027f0c1a807a"
- }
- }
- }
- ]
- }
-}
\ No newline at end of file
+ "requestDetails": {
+ "requestInfo": {
+ "instanceName": "CsitEtsiVnfInstance",
+ "source": "VID",
+ "suppressRollback": false,
+ "requestorId": "demo",
+ "productFamilyId": "f13844f4-dbf8-4d0e-a979-45204f3ddb4e"
+ },
+ "modelInfo": {
+ "modelType": "vnf",
+ "modelInvariantId": "037f7b1b-5c62-44c1-b806-f92fe8970171",
+ "modelVersionId": "73522444-e8e9-49c1-be29-d355800aa349",
+ "modelName": "EtsiVnfCSIT3",
+ "modelVersion": "1.0",
+ "modelCustomizationId": "3341825c-837c-4e84-8a82-cc69033ca92f",
+ "modelCustomizationName": "EtsiVnfCSIT3 0"
+ },
+ "requestParameters": {
+ "userParams": [],
+ "testApi": "GR_API"
+ },
+ "cloudConfiguration": {
+ "lcpCloudRegionId": "EtsiCloudRegion",
+ "cloudOwner": "CloudOwner",
+ "tenantId": "693c7729b2364a26a3ca602e6f66187d"
+ },
+ "lineOfBusiness": {
+ "lineOfBusinessName": "EtsiCsitLineOfBusiness"
+ },
+ "platform": {
+ "platformName": "EtsiCsitPlatform"
+ },
+ "relatedInstanceList": [{
+ "relatedInstance": {
+ "instanceId": "",
+ "modelInfo": {
+ "modelType": "service",
+ "modelName": "EtsiServiceCSIT3",
+ "modelInvariantId": "10b3d278-e262-44ca-a0c0-4e663c2d7562",
+ "modelVersion": "1.0",
+ "modelVersionId": "fdea6501-dabd-4428-b52c-623336a3b403"
+ }
+ }
+ }]
+ }
+}
--- /dev/null
+{"csarId": "73522444-e8e9-49c1-be29-d355800aa349"}
--- /dev/null
+*** Settings ***
+Library Collections
+Library RequestsLibrary
+Library OperatingSystem
+Library json
+
+*** Variables ***
+${SLEEP_INTERVAL_SEC}= 5
+${MAXIMUM_ATTEMPTS_BEFORE_TIMEOUT}= 48 # Represents the maximum number of attempts that will be made before a timeout. It sleeps for SLEEP_INTERVAL_SEC seconds before retry.
+
+*** Test Cases ***
+OnBoard VNF Package In Etsi Catalog
+ Create Session etsi_catalog_session http://${REPO_IP}:8806
+ ${data}= Get Binary File ${CURDIR}${/}data${/}vnfPackageOnboardRequest.json
+ &{headers}= Create Dictionary Content-Type=application/json Accept=application/json
+ ${resp}= Post On Session etsi_catalog_session /api/catalog/v1/vnfpackages data=${data} headers=${headers}
+ Run Keyword If '${resp.status_code}' == '202' log to console \nexecuted with expected result
+ Should Be Equal As Strings '${resp.status_code}' '202'
+ log to console ${resp.content}
+ ${onboarding_job_json_response}= Evaluate json.loads(r"""${resp.content}""", strict=False) json
+ ${job_ID}= Set Variable ${onboarding_job_json_response}[jobId]
+ Should Not Be Empty ${job_ID}
+ ${actual_job_status}= Set Variable ""
+
+ FOR ${INDEX} IN RANGE ${MAXIMUM_ATTEMPTS_BEFORE_TIMEOUT}
+ ${onboarding_job_status_request}= Get On Session etsi_catalog_session /api/catalog/v1/jobs/${job_ID}
+ Run Keyword If '${onboarding_job_status_request.status_code}' == '200' log to console \nexecuted with expected result
+ log to console ${onboarding_job_status_request.content}
+
+ ${onboarding_job_status_json_response}= Evaluate json.loads(r"""${onboarding_job_status_request.content}""", strict=False) json
+
+ ${actual_job_status}= Set Variable ""
+
+ ${response_descriptor_exists}= Run Keyword And Return Status Get From Dictionary ${onboarding_job_status_json_response} responseDescriptor
+ ${status_exists}= Run Keyword And Return Status Get From Dictionary ${onboarding_job_status_json_response}[responseDescriptor] status
+
+ ${actual_job_status}= Set Variable If ${response_descriptor_exists} == True and ${status_exists} == True
+ ... ${onboarding_job_status_json_response}[responseDescriptor][status]
+
+ Log To Console Received actual repsonse status:${actual_job_status}
+ Run Keyword If '${actual_job_status}' == 'finished' or '${actual_job_status}' == 'error' or '${actual_job_status}' == 'timeout' Exit For Loop
+ log to console Will try again after ${SLEEP_INTERVAL_SEC} seconds
+ SLEEP ${SLEEP_INTERVAL_SEC}
+ END
+ Log To Console final repsonse status received: ${actual_job_status}
+ Run Keyword If '${actual_job_status}' == 'finished' log to console \nexecuted with expected result
+ Should Be Equal As Strings '${actual_job_status}' 'finished'
+
+Distribute Service Template
+ Create Session sdc_controller_session http://${REPO_IP}:8085
+ ${data}= Get Binary File ${CURDIR}${/}data${/}distributeServiceTemplate.json
+ &{headers}= Create Dictionary Authorization=Basic bXNvX2FkbWluOnBhc3N3b3JkMSQ= resource-location=/distribution-test-zip/unzipped/ Content-Type=application/json Accept=application/json
+ ${resp}= Post On Session sdc_controller_session /test/treatNotification/v1 data=${data} headers=${headers}
+ Run Keyword If '${resp.status_code}' == '200' log to console \nexecuted with expected result
+ Should Be Equal As Strings '${resp.status_code}' '200'
${MAXIMUM_ATTEMPTS_BEFORE_TIMEOUT}= 48 # Represents the maximum number of attempts that will be made before a timeout. It sleeps for SLEEP_INTERVAL_SEC seconds before retry.
*** Test Cases ***
-Distribute Service Template
- Create Session sdc_controller_session http://${REPO_IP}:8085
- ${data}= Get Binary File ${CURDIR}${/}data${/}distributeServiceTemplate.json
- &{headers}= Create Dictionary Authorization=Basic bXNvX2FkbWluOnBhc3N3b3JkMSQ= resource-location=/distribution-test-zip/unzipped/ Content-Type=application/json Accept=application/json
- ${resp}= Post Request sdc_controller_session /test/treatNotification/v1 data=${data} headers=${headers}
- Run Keyword If '${resp.status_code}' == '200' log to console \nexecuted with expected result
- Should Be Equal As Strings '${resp.status_code}' '200'
-
Invoke Service Instantiation
Create Session api_handler_session http://${REPO_IP}:8080
${data}= Get Binary File ${CURDIR}${/}data${/}serviceInstantiationRequest.json
&{headers}= Create Dictionary Authorization=Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA== Content-Type=application/json Accept=application/json
- ${service_instantiation_request}= Post Request api_handler_session /onap/so/infra/serviceInstantiation/v7/serviceInstances data=${data} headers=${headers}
+ ${service_instantiation_request}= Post On Session api_handler_session /onap/so/infra/serviceInstantiation/v7/serviceInstances data=${data} headers=${headers}
Run Keyword If '${service_instantiation_request.status_code}' == '200' log to console \nexecuted with expected result
log to console ${service_instantiation_request.content}
${service_instantiation_json_response}= Evaluate json.loads(r"""${service_instantiation_request.content}""", strict=False) json
${actual_request_state}= Set Variable ""
FOR ${INDEX} IN RANGE ${MAXIMUM_ATTEMPTS_BEFORE_TIMEOUT}
- ${orchestration_status_request}= Get Request api_handler_session /onap/so/infra/orchestrationRequests/v7/${request_ID}
+ ${orchestration_status_request}= Get On Session api_handler_session /onap/so/infra/orchestrationRequests/v7/${request_ID}
Run Keyword If '${orchestration_status_request.status_code}' == '200' log to console \nexecuted with expected result
log to console ${orchestration_status_request.content}
${orchestration_json_response}= Evaluate json.loads(r"""${orchestration_status_request.content}""", strict=False) json
set to dictionary ${vnf_instantiate_request_json}[requestDetails][relatedInstanceList][0][relatedInstance] instanceId=${service_instance_Id}
${vnf_instantiate_request_string}= evaluate json.dumps(${vnf_instantiate_request_json}) json
&{headers}= Create Dictionary Authorization=Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA== Content-Type=application/json Accept=application/json
- ${vnf_instantiate_request}= Post Request api_handler_session /onap/so/infra/serviceInstantiation/v7/serviceInstances/${service_instance_Id}/vnfs data=${vnf_instantiate_request_string} headers=${headers}
+ ${vnf_instantiate_request}= Post On Session api_handler_session /onap/so/infra/serviceInstantiation/v7/serviceInstances/${service_instance_Id}/vnfs data=${vnf_instantiate_request_string} headers=${headers}
Run Keyword If '${vnf_instantiate_request.status_code}' == '200' log to console \nexecuted with expected result
${vnf_instantiate_json_response}= Evaluate json.loads(r"""${vnf_instantiate_request.content}""") json
${request_ID}= Set Variable ${vnf_instantiate_json_response}[requestReferences][requestId]
SET GLOBAL VARIABLE ${vnf_instance_Id}
FOR ${INDEX} IN RANGE ${MAXIMUM_ATTEMPTS_BEFORE_TIMEOUT}
- ${orchestration_status_request}= Get Request api_handler_session /onap/so/infra/orchestrationRequests/v7/${request_ID}
+ ${orchestration_status_request}= Get On Session api_handler_session /onap/so/infra/orchestrationRequests/v7/${request_ID}
Run Keyword If '${orchestration_status_request.status_code}' == '200' log to console \nexecuted with expected result
Log To Console ${orchestration_status_request.content}
${orchestration_json_response}= Evaluate json.loads(r"""${orchestration_status_request.content}""", strict=False) json
Create Session api_handler_session http://${REPO_IP}:8080
${data}= Get Binary File ${CURDIR}${/}data${/}vnfDeleteRequest.json
&{headers}= Create Dictionary Authorization=Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA== Content-Type=application/json Accept=application/json
- ${vnf_delete_request}= Delete Request api_handler_session /onap/so/infra/serviceInstantiation/v7/serviceInstances/${service_instance_Id}/vnfs/${vnf_instance_Id} data=${data} headers=${headers}
+ ${vnf_delete_request}= Delete On Session api_handler_session /onap/so/infra/serviceInstantiation/v7/serviceInstances/${service_instance_Id}/vnfs/${vnf_instance_Id} data=${data} headers=${headers}
${vnf_delete_json_response}= Evaluate json.loads(r"""${vnf_delete_request.content}""") json
Log to Console ${vnf_delete_json_response}
${request_ID}= Set Variable ${vnf_delete_json_response}[requestReferences][requestId]
${actual_request_state}= Set Variable ""
FOR ${INDEX} IN RANGE ${MAXIMUM_ATTEMPTS_BEFORE_TIMEOUT}
- ${orchestration_status_request}= Get Request api_handler_session /onap/so/infra/orchestrationRequests/v7/${request_ID}
+ ${orchestration_status_request}= Get On Session api_handler_session /onap/so/infra/orchestrationRequests/v7/${request_ID}
Run Keyword If '${orchestration_status_request.status_code}' == '200' log to console \nexecuted with expected result
Log To Console ${orchestration_status_request.content}
${orchestration_json_response}= Evaluate json.loads(r"""${orchestration_status_request.content}""") json
Create Session api_handler_session http://${REPO_IP}:8080
${data}= Get Binary File ${CURDIR}${/}data${/}serviceDeleteRequest.json
&{headers}= Create Dictionary Authorization=Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA== Content-Type=application/json Accept=application/json
- ${service_delete_request}= Delete Request api_handler_session /onap/so/infra/serviceInstantiation/v7/serviceInstances/${service_instance_Id} data=${data} headers=${headers}
+ ${service_delete_request}= Delete On Session api_handler_session /onap/so/infra/serviceInstantiation/v7/serviceInstances/${service_instance_Id} data=${data} headers=${headers}
${service_delete_json_response}= Evaluate json.loads(r"""${service_delete_request.content}""") json
Log to Console ${service_delete_json_response}
${request_ID}= Set Variable ${service_delete_json_response}[requestReferences][requestId]
${actual_request_state}= Set Variable ""
FOR ${INDEX} IN RANGE ${MAXIMUM_ATTEMPTS_BEFORE_TIMEOUT}
- ${orchestration_status_request}= Get Request api_handler_session /onap/so/infra/orchestrationRequests/v7/${request_ID}
+ ${orchestration_status_request}= Get On Session api_handler_session /onap/so/infra/orchestrationRequests/v7/${request_ID}
Run Keyword If '${orchestration_status_request.status_code}' == '200' log to console \nexecuted with expected result
Log To Console ${orchestration_status_request.content}
${orchestration_json_response}= Evaluate json.loads(r"""${orchestration_status_request.content}""") json
--- /dev/null
+*** Settings ***
+Library Collections
+Library RequestsLibrary
+Library OperatingSystem
+Library json
+Library ArchiveLibrary
+
+*** Variables ***
+${VNF_PACKAGE_ID}= 73522444-e8e9-49c1-be29-d355800aa349
+${PACKAGE_MANAGEMENT_BASE_URL}= /so/vnfm-adapter/v1/vnfpkgm/v1
+${BASIC_AUTH}= Basic dm5mbTpwYXNzd29yZDEk
+${TEST_DIR}= CSIT_ETSI_TEMP
+
+*** Test Cases ***
+Get VNF Packages
+ Create Session so_vnfm_adapter_session http://${REPO_IP}:9092
+ &{headers}= Create Dictionary Authorization=${BASIC_AUTH} Content-Type=application/json Accept=application/json
+ Log To Console \nGetting VNF Packages from so-vnfm-adapter
+ ${response}= Get On Session so_vnfm_adapter_session ${PACKAGE_MANAGEMENT_BASE_URL}/vnf_packages headers=${headers}
+ Log To Console \nResponse:${response}
+ Run Keyword If '${response.status_code}' == '200' Log To Console \nexecuted with expected result
+ Should Be Equal As Strings '${response.status_code}' '200'
+ Log To Console \nResponse Content:\n${response.content}
+ ${json_response} Evaluate json.loads(r"""${response.content}""", strict=False) json
+ ${vnf_package_id}= Set Variable ${json_response}[0][id]
+ Should Be Equal As Strings '${vnf_package_id}' '${VNF_PACKAGE_ID}'
+ ${expected}= Get File ${CURDIR}${/}data${/}responses${/}expectedVnfPackage.json
+ ${expected}= Evaluate json.loads(r"""${expected}""", strict=False) json
+ Should Be Equal ${json_response[0]} ${expected}
+ Log To Console \nexecuted with expected result
+
+Get VNF Package By VNF Package Id
+ Create Session so_vnfm_adapter_session http://${REPO_IP}:9092
+ &{headers}= Create Dictionary Authorization=${BASIC_AUTH} Content-Type=application/json Accept=application/json
+ Log To Console \nGetting VNF Package with id ${VNF_PACKAGE_ID} from so-vnfm-adapter
+ ${response}= Get On Session so_vnfm_adapter_session ${PACKAGE_MANAGEMENT_BASE_URL}/vnf_packages/${VNF_PACKAGE_ID} headers=${headers}
+ Log To Console \nResponse:${response}
+ Run Keyword If '${response.status_code}' == '200' Log To Console \nexecuted with expected result
+ Should Be Equal As Strings '${response.status_code}' '200'
+ Log To Console \nResponse:\n${response.content}
+ ${json_response} Evaluate json.loads(r"""${response.content}""", strict=False) json
+ ${vnf_package_id}= Set Variable ${json_response}[id]
+ Should Be Equal As Strings '${vnf_package_id}' '${VNF_PACKAGE_ID}'
+ ${expected}= Get File ${CURDIR}${/}data${/}responses${/}expectedVnfPackage.json
+ ${expected}= Evaluate json.loads(r"""${expected}""", strict=False) json
+ Should Be Equal ${json_response} ${expected}
+ Log To Console \nexecuted with expected result
+
+Get VNF Package Content
+ Create Session so_vnfm_adapter_session http://${REPO_IP}:9092
+ &{headers}= Create Dictionary Authorization=${BASIC_AUTH} Content-Type=application/json Accept=application/zip
+ Log to Console \nGetting Vnf Package Content from Vnf Package with id ${vnf_package_id} from so-vnfm-adapter
+ ${response}= Get On Session so_vnfm_adapter_session ${PACKAGE_MANAGEMENT_BASE_URL}/vnf_packages/${vnf_package_id}/package_content headers=${headers}
+ Log To Console Response:${response}
+ Run Keyword If '${response.status_code}' == '200' Log To Console \nexecuted with expected result
+ Should Be Equal As Strings '${response.status_code}' '200'
+ Create Directory ${TEMPDIR}${/}${TEST_DIR}
+ Empty Directory ${TEMPDIR}${/}${TEST_DIR}
+ Create Binary File ${TEMPDIR}${/}${TEST_DIR}${/}actualVnfPackageContent.csar ${response.content}
+ Should Be Equal File Size ${TEMPDIR}${/}${TEST_DIR}${/}actualVnfPackageContent.csar ${CURDIR}${/}data${/}responses${/}expectedVnfPackageContent.csar
+ Extract Zip File ${TEMPDIR}${/}${TEST_DIR}${/}actualVnfPackageContent.csar ${TEMPDIR}${/}${TEST_DIR}/actualContent
+ Extract Zip File ${CURDIR}${/}data${/}responses${/}expectedVnfPackageContent.csar ${TEMPDIR}${/}${TEST_DIR}${/}expectedContent
+ Should Contain Same Content ${TEMPDIR}${/}${TEST_DIR}${/}actualContent ${TEMPDIR}${/}${TEST_DIR}${/}expectedContent
+ File Should Exist ${TEMPDIR}${/}${TEST_DIR}${/}actualContent${/}Definitions${/}MainServiceTemplate.yaml
+ File Should Exist ${TEMPDIR}${/}${TEST_DIR}${/}actualContent${/}Definitions${/}onap_dm.yaml
+ File Should Exist ${TEMPDIR}${/}${TEST_DIR}${/}actualContent${/}TOSCA-Metadata${/}TOSCA.meta
+ ${expectedMainServiceTemplate}= Get Binary File ${TEMPDIR}${/}${TEST_DIR}${/}expectedContent${/}Definitions${/}MainServiceTemplate.yaml
+ ${actualMainServiceTemplate}= Get Binary File ${TEMPDIR}${/}${TEST_DIR}${/}actualContent${/}Definitions${/}MainServiceTemplate.yaml
+ Should Be Equal As Strings ${expectedMainServiceTemplate} ${actualMainServiceTemplate}
+ ${expectedOnapDm}= Get Binary File ${TEMPDIR}${/}${TEST_DIR}${/}expectedContent${/}Definitions${/}onap_dm.yaml
+ ${actualOnapDm}= Get Binary File ${TEMPDIR}${/}${TEST_DIR}${/}actualContent${/}Definitions${/}onap_dm.yaml
+ Should Be Equal As Strings ${expectedOnapDm} ${actualOnapDm}
+ ${expectedToscaMeta}= Get Binary File ${TEMPDIR}${/}${TEST_DIR}${/}expectedContent${/}TOSCA-Metadata${/}TOSCA.meta
+ ${actualToscaMeta}= Get Binary File ${TEMPDIR}${/}${TEST_DIR}${/}actualContent${/}TOSCA-Metadata${/}TOSCA.meta
+ Should Be Equal As Strings ${expectedOnapDm} ${actualOnapDm}
+ Remove Directory ${TEMPDIR}${/}${TEST_DIR} recursive=True
+ Log To Console \nexecuted with expected result
+
+Get VNF Package VNFD
+ Create Session so_vnfm_adapter_session http://${REPO_IP}:9092
+ &{headers}= Create Dictionary Authorization=${BASIC_AUTH} Content-Type=application/json Accept=application/zip
+ Log to Console \nGetting Vnfd from Vnf Package with id ${vnf_package_id} from so-vnfm-adapter
+ ${response}= Get On Session so_vnfm_adapter_session ${PACKAGE_MANAGEMENT_BASE_URL}/vnf_packages/${vnf_package_id}/vnfd headers=${headers}
+ Log To Console Response:${response}
+ Run Keyword If '${response.status_code}' == '200' Log To Console \nexecuted with expected result
+ Should Be Equal As Strings '${response.status_code}' '200'
+ Create Directory ${TEMPDIR}${/}${TEST_DIR}
+ Empty Directory ${TEMPDIR}${/}${TEST_DIR}
+ Create Binary File ${TEMPDIR}${/}${TEST_DIR}${/}actualVnfd.zip ${response.content}
+ Extract Zip File ${TEMPDIR}${/}${TEST_DIR}${/}actualVnfd.zip ${TEMPDIR}${/}${TEST_DIR}
+ File Should Exist ${TEMPDIR}${/}${TEST_DIR}${/}MainServiceTemplate.yaml
+ File Should Exist ${TEMPDIR}${/}${TEST_DIR}${/}onap_dm.yaml
+ ${expectedMainServiceTemplate}= Get Binary File ${CURDIR}${/}data${/}responses${/}expectedVnfd${/}MainServiceTemplate.yaml
+ ${actualMainServiceTemplate}= Get Binary File ${TEMPDIR}${/}${TEST_DIR}${/}MainServiceTemplate.yaml
+ Should Be Equal As Strings ${expectedMainServiceTemplate} ${actualMainServiceTemplate}
+ ${expectedOnapDm}= Get Binary File ${CURDIR}${/}data${/}responses${/}expectedVnfd${/}onap_dm.yaml
+ ${actualOnapDm}= Get Binary File ${TEMPDIR}${/}${TEST_DIR}${/}onap_dm.yaml
+ Should Be Equal As Strings ${expectedOnapDm} ${actualOnapDm}
+ Remove Directory ${TEMPDIR}${/}${TEST_DIR} recursive=True
+ Log To Console \nexecuted with expected result
+
+Get A VNF Package Artifact
+ ${artifactPath}= Convert To String image
+ Create Session so_vnfm_adapter_session http://${REPO_IP}:9092
+ &{headers}= Create Dictionary Authorization=${BASIC_AUTH} Content-Type=application/json Accept=application/octet-stream
+ Log to Console \nGetting ${artifactPath} artifact from Vnf Package with id ${vnf_package_id} from so-vnfm-adapter
+ ${response}= Get On Session so_vnfm_adapter_session ${PACKAGE_MANAGEMENT_BASE_URL}/vnf_packages/${vnf_package_id}/artifacts/${artifactPath} headers=${headers}
+ Log To Console Response:${response}
+ Run Keyword If '${response.status_code}' == '200' Log To Console \nexecuted with expected result
+ Should Be Equal As Strings '${response.status_code}' '200'
+ Create Directory ${TEMPDIR}${/}${TEST_DIR}
+ Empty Directory ${TEMPDIR}${/}${TEST_DIR}
+ Create Binary File ${TEMPDIR}${/}${TEST_DIR}${/}${artifactPath} ${response.content}
+ ${expectedArtifact}= Get Binary File ${CURDIR}${/}data${/}responses${/}expectedArtifacts${/}${artifactPath}
+ ${actualArtifact}= Get Binary File ${TEMPDIR}${/}${TEST_DIR}${/}${artifactPath}
+ Should Be Equal As Strings ${expectedArtifact} ${actualArtifact}
+ Remove Directory ${TEMPDIR}${/}${TEST_DIR} recursive=True
+ Log To Console \nexecuted with expected result
+
+*** Keywords ***
+Should Be Equal File Size
+ [Arguments] ${file1} ${file2}
+ Log To Console \nComparing file sizes between ${file1} and ${file2}
+ ${file1size}= Get File Size ${file1}
+ ${file2size}= Get File Size ${file2}
+ Should Be Equal ${file1size} ${file2size}
+ Log To Console Files are the same size
+
+Should Contain Same Content
+ [Arguments] ${dir1} ${dir2}
+ Log To Console \nComparing directory contents between:
+ Log To Console Directory 1: ${dir1}
+ Log To Console Directory 2: ${dir2}
+ @{dir1files}= List Files In Directory ${dir1}
+ Log To Console Files in directory 1: @{dir1files}
+ @{dir2files}= List Files In Directory ${dir2}
+ Log To Console Files in directory 2: @{dir2files}
+ Lists Should Be Equal ${dir1files} ${dir2files}
+ FOR ${file} IN @{dir1files}
+ Should Be Equal File Size ${dir1}${/}${file} ${dir2}${/}${file}
+ END
+ @{dir1directories}= List Directories In Directory ${dir1}
+ Log To Console Directories in directory 1: ${dir1directories}
+ @{dir2directories}= List Directories In Directory ${dir2}
+ Log To Console Directories in directory 2: ${dir2directories}
+ Lists Should Be Equal ${dir1directories} ${dir2directories}
+ FOR ${directory} IN @{dir1directories}
+ Should Contain Same Content ${dir1}${/}${directory} ${dir2}${/}${directory}
+ END
+ Log To Console executed with expected result
${SDNC_KEYSTORE_CONFIG_PATH} /config/netconf-keystore:keystore
${SDNC_MOUNT_PATH} /config/network-topology:network-topology/topology/topology-netconf/node/pnf-simulator
${PNFSIM_MOUNT_PATH} /config/network-topology:network-topology/topology/topology-netconf/node/pnf-simulator/yang-ext:mount/mynetconf:netconflist
-${BP_UPLOAD_URL} /api/v1/execution-service/upload
+${BP_UPLOAD_URL} /api/v1/blueprint-model/publish
${BP_PROCESS_URL} /api/v1/execution-service/process
${BP_ARCHIVE_PATH} ${CURDIR}/data/blueprint_archive.zip
--- /dev/null
+{
+ "distributionID": "6ac9fa0c-70f0-4213-a8d4-5b58d6a17697",
+ "serviceName": "Demo_svc",
+ "serviceVersion": "2.0",
+ "serviceUUID": "8351245d-50da-4695-8756-3a22618377f7",
+ "serviceDescription": "ServiceLevelUpgrade",
+ "serviceInvariantUUID": "fe41489e-1563-46a3-b90a-1db629e4375b",
+ "resources": [
+ {
+ "resourceInstanceName": "Demo_pnf 0",
+ "resourceCustomizationUUID": "23b43821-4eds-31f4-bfd4-66a7e0fd9bb2",
+ "resourceName": "Demo_pnf",
+ "resourceVersion": "1.0",
+ "resoucreType": "PNF",
+ "resourceUUID": "a42f6566-6a29-43e1-bac9-b91a59d702ac",
+ "resourceInvariantUUID": "fdf44827-35db-4ee5-bd70-7500e633576e",
+ "category": "Network L4+",
+ "subcategory": "Common Network Resources",
+ "artifacts": []
+ }
+ ],
+ "serviceArtifacts": [
+ {
+ "artifactName": "service-DemoSvc-csar_2.0.csar",
+ "artifactType": "TOSCA_CSAR",
+ "artifactURL": "//unzipped_sdc_csar/v1/catalog/services/DemoSvc/2.0/artifacts/service-DemoSvc-csar.csar",
+ "artifactChecksum": "YjFhZWZhOTU2MzljMDI4ZmVlNzlhOTgxYTcxMzg5ODI\u003d",
+ "artifactDescription": "TOSCA definition package of the asset",
+ "artifactTimeout": 0,
+ "artifactVersion": "2",
+ "artifactUUID": "809894a4-c862-4294-b2fb-e016b4268546"
+ }
+ ],
+ "workloadContext": "Production"
+ }
\ No newline at end of file
--- /dev/null
+{
+ "node": [
+ {
+ "node-id": "PNFDemo1",
+ "netconf-node-topology:protocol": {
+ "name": "TLS"
+ },
+ "netconf-node-topology:host": "pnfaddr",
+ "netconf-node-topology:key-based": {
+ "username": "netconf",
+ "key-id": "ODL_private_key_0"
+ },
+ "netconf-node-topology:port": 6514,
+ "netconf-node-topology:tcp-only": false,
+ "netconf-node-topology:max-connection-attempts": 5
+ }
+ ]
+}
\ No newline at end of file
--- /dev/null
+{
+ "requestDetails": {
+ "subscriberInfo": {
+ "globalSubscriberId": "807c7a02-249c-4db8-9fa9-bee973fe08ce"
+ },
+ "modelInfo": {
+ "modelVersion": "2.0",
+ "modelVersionId": "8351245d-50da-4695-8756-3a22618377f7",
+ "modelInvariantId": "fe41489e-1563-46a3-b90a-1db629e4375b",
+ "modelName": "Demo_svc",
+ "modelType": "service"
+ },
+ "requestInfo": {
+ "suppressRollback": false,
+ "requestorId": "demo",
+ "instanceName": "testInstanceName",
+ "source": "VID"
+ },
+ "requestParameters": {
+ "subscriptionServiceType": "pNF",
+ "userParams": [
+ {
+ "name": "targetSoftwareVersion",
+ "value": "pnf_sw_version-4.0.0"
+ }
+ ],
+ "aLaCarte": false,
+ "payload": "{\"k1\": \"v1\"}"
+ },
+ "project": {
+ "projectName": "ServiceLevelUpgrade"
+ },
+ "owningEntity": {
+ "owningEntityId": "67f2e84c-734d-4e90-a1e4-d2ffa2e75849",
+ "owningEntityName": "OE-Test"
+ }
+ }
+}
\ No newline at end of file
*** Variables ***
${SDNC_KEYSTORE_CONFIG_PATH} /restconf/config/netconf-keystore:keystore
${SDNC_MOUNT_PATH} /restconf/config/network-topology:network-topology/topology/topology-netconf/node/PNFDemo
+${SDNC_MOUNT_PATH2} /restconf/config/network-topology:network-topology/topology/topology-netconf/node/PNFDemo1
${PNFSIM_MOUNT_PATH} /restconf/config/network-topology:network-topology/topology/topology-netconf/node/PNFDemo/yang-ext:mount/pnf-sw-upgrade:software-upgrade
+${PNFSIM_MOUNT_PATH2} /restconf/config/network-topology:network-topology/topology/topology-netconf/node/PNFDemo1/yang-ext:mount/pnf-sw-upgrade:software-upgrade
${PNFSIM_DELETE_PATH} /restconf/config/network-topology:network-topology/topology/topology-netconf/node/PNFDemo
${BP_UPLOAD_URL} /api/v1/blueprint-model/publish
${BP_PROCESS_URL} /api/v1/execution-service/process
${serviceInstanceId}= Set Variable cd4decf6-4f27-4775-9561-0e683ed43635
SET GLOBAL VARIABLE ${serviceInstanceId}
${pnfName}= Set Variable PNFDemo
- SET GLOBAL VARIABLE ${pnfName}
+ SET GLOBAL VARIABLE ${pnfName}
+ ${pnfName1}= Set Variable PNFDemo1
+ SET GLOBAL VARIABLE ${pnfName1}
Get pnf workflow
Create Session api_handler_session http://${REPO_IP}:8080
&{headers}= Create Dictionary Authorization=Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA== Content-Type=application/json Accept=application/json
- ${get_pnfworkflows_request}= Get Request api_handler_session /onap/so/infra/workflowSpecifications/v1/pnfWorkflows headers=${headers}
+ ${get_pnfworkflows_request}= Get Request api_handler_session /onap/so/infra/workflowSpecifications/v1/workflows headers=${headers}
Run Keyword If '${get_pnfworkflows_request.status_code}' == '200' log to console \nexecuted with expected result
log to console ${get_pnfworkflows_request.content}
${pnfworkflows_json_response}= Evaluate json.loads(r"""${get_pnfworkflows_request.content}""", strict=False) json
${activate_workflow_name}= Set Variable ""
${download_workflow_uuid}= Set Variable ""
${download_workflow_name}= Set Variable ""
+ ${serviceLevel_workflow_uuid}= Set Variable ""
+ ${serviceLevel_workflow_name}= Set Variable ""
FOR ${member} IN @{all_wf_members}
${workflow_uuid}= Set Variable ${member}[workflowSpecification][artifactInfo][artifactUuid]
${workflow_name}= Set Variable ${member}[workflowSpecification][artifactInfo][artifactName]
${activate_workflow_name}= Set Variable If '${workflow_name}' == 'GenericPnfSoftwareUpgrade' ${workflow_name} ${activate_workflow_name}
${download_workflow_uuid}= Set Variable If '${workflow_name}' == 'GenericPnfSWUPDownload' ${workflow_uuid} ${download_workflow_uuid}
${download_workflow_name}= Set Variable If '${workflow_name}' == 'GenericPnfSWUPDownload' ${workflow_name} ${download_workflow_name}
+ ${serviceLevel_workflow_uuid}= Set Variable If '${workflow_name}' == 'ServiceLevelUpgrade' ${workflow_uuid} ${serviceLevel_workflow_uuid}
+ ${serviceLevel_workflow_name}= Set Variable If '${workflow_name}' == 'ServiceLevelUpgrade' ${workflow_name} ${serviceLevel_workflow_name}
END
SET GLOBAL VARIABLE ${activate_workflow_uuid}
SET GLOBAL VARIABLE ${download_workflow_uuid}
+ SET GLOBAL VARIABLE ${serviceLevel_workflow_uuid}
Run Keyword If '${activate_workflow_name}' == 'GenericPnfSoftwareUpgrade' log to console \nexecuted with expected result
Run Keyword If '${download_workflow_name}' == 'GenericPnfSWUPDownload' log to console \nexecuted with expected result
+ Run Keyword If '${serviceLevel_workflow_name}' == 'ServiceLevelUpgrade' log to console \nexecuted with expected result
Should Be Equal As Strings '${activate_workflow_name}' 'GenericPnfSoftwareUpgrade'
Should Be Equal As Strings '${download_workflow_name}' 'GenericPnfSWUPDownload'
+ Should Be Equal As Strings '${serviceLevel_workflow_name}' 'ServiceLevelUpgrade'
Invoke Service Instantiation for pnf software download
Create Session api_handler_session http://${REPO_IP}:8080
Log To Console final target software version received: ${sw_version}
Run Keyword If '${sw_version}' == 'pnf_sw_version-3.0.0' log to console \nexecuted with expected result
Should Be Equal As Strings '${sw_version}' 'pnf_sw_version-3.0.0'
+
+Distribute ServiceLevel Upgrade Template
+ Create Session sdc_controller_session http://${REPO_IP}:8085
+ ${data}= Get Binary File ${CURDIR}${/}data${/}distributeServiceTemplate_2.0.json
+ &{headers}= Create Dictionary Authorization=Basic bXNvX2FkbWluOnBhc3N3b3JkMSQ= resource-location=/app/distribution-test-zip/unzipped/ Content-Type=application/json Accept=application/json
+ ${resp}= Post Request sdc_controller_session /test/treatNotification/v1 data=${data} headers=${headers}
+ Run Keyword If '${resp.status_code}' == '200' log to console \nexecuted with expected result
+ Should Be Equal As Strings '${resp.status_code}' '200'
+ ${model_version_id_2}= Set Variable 8351245d-50da-4695-8756-3a22618377f7
+ SET GLOBAL VARIABLE ${model_version_id_2}
+
+Get Service-Model-Version From AAI Using Service-Model-InVariant-UUId
+ Create Session aai_simulator_session https://${REPO_IP}:9993
+ &{headers}= Create Dictionary Authorization=Basic YWFpOmFhaS5vbmFwLm9yZzpkZW1vMTIzNDU2IQ== Content-Type=application/xml Accept=application/xml verify=False
+ ${model-invariant-id}= Set Variable a51e2bef-961c-496f-b235-b4540400e885
+ ${get_serviceVersion}= Get Request aai_simulator_session aai/v11/service-design-and-creation/models/model/${model-invariant-id}/model-vers headers=${headers}
+ Run Keyword If '${get_serviceVersion.status_code}' == '200' log to console \nExecuted with expected
+ Log to console ${get_serviceVersion.content}
+ Should Be Equal As Strings ${get_serviceVersion.status_code} 200
+ ${serviceVersion_json_response}= Evaluate json.loads(r"""${get_serviceVersion.content}""", strict=False) json
+ ${all_service_version}= Set Variable ${serviceVersion_json_response['model-vers']['model-ver']}
+ ${model-version-id_1}= Set Variable ""
+ ${model-version-id_2}= Set Variable ""
+ FOR ${member} IN @{all_service_version}
+ ${model-version}= Set Variable ${member}[model-version]
+ ${model-version-id}= Set Variable ${member}[model-version-id]
+ Log to console The ServiceModel Version ${model-version} has ModelVersion Id : ${model-version-id}
+ ${model-version-id_1}= Set Variable If '${model-version}' == '1.0' ${model-version-id} ${model-version-id_1}
+ ${model-version-id_2}= Set Variable If '${model-version}' == '2.0' ${model-version-id} ${model-version-id_2}
+ END
+ SET GLOBAL VARIABLE ${model-version-id_1}
+ SET GLOBAL VARIABLE ${model-version-id_2}
+
+Invoke Service Instantiation for ServiceLevel Upgrade
+ Create Session api_handler_session http://${REPO_IP}:8080
+ ${data}= Get Binary File ${CURDIR}${/}data${/}serviceLevelUpgradeRequest.json
+ ${serviceInstanceId}= Set Variable ${model-version-id_1}
+ &{headers}= Create Dictionary Authorization=Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA== Content-Type=application/json Accept=application/json X-ONAP-RequestID=0ffc559c-5513-44bc-8b02-5759d84600f4 X-ONAP-PartnerName=ONAP X-RequestorID=VID
+ ${service_instantiation_request}= Post Request api_handler_session /onap/so/infra/instanceManagement/v1/serviceInstances/${serviceInstanceId}/workflows/${serviceLevel_workflow_uuid} data=${data} headers=${headers}
+ Run Keyword If '${service_instantiation_request.status_code}' == '200' log to console \nexecuted with expected result
+ log to console ${service_instantiation_request.content}
+ ${service_instantiation_json_response}= Evaluate json.loads(r"""${service_instantiation_request.content}""", strict=False) json
+ ${request_ID}= Set Variable ${service_instantiation_json_response}[requestReferences][requestId]
+ ${actual_service_request_state}= Set Variable ""
+ FOR ${INDEX} IN RANGE ${MAXIMUM_ATTEMPTS_BEFORE_TIMEOUT}
+ ${orchestration_status_service_request}= Get Request api_handler_session /onap/so/infra/orchestrationRequests/v7/${request_ID}
+ Run Keyword If '${orchestration_status_service_request.status_code}' == '200' log to console \nexecuted with expected result
+ log to console ${orchestration_status_service_request.content}
+ ${orchestration_json_service_response}= Evaluate json.loads(r"""${orchestration_status_service_request.content}""", strict=False) json
+ ${actual_service_request_state}= SET VARIABLE ${orchestration_json_service_response}[request][requestStatus][requestState]
+ Log To Console Received actual repsonse status:${actual_service_request_state}
+ RUN KEYWORD IF '${actual_service_request_state}' == 'COMPLETE' or '${actual_service_request_state}' == 'FAILED' Exit For Loop
+ log to console Will try again after ${SLEEP_INTERVAL_SEC} seconds
+ SLEEP ${SLEEP_INTERVAL_SEC}s
+ END
+ Log To Console final repsonse status received: ${actual_service_request_state}
+ Run Keyword If '${actual_service_request_state}' == 'COMPLETE' log to console \nexecuted with expected result
+ Should Be Equal As Strings '${actual_service_request_state}' 'COMPLETE'
+
+Test Verify PNF-1 Configuration for Service Level Upgrade
+ [Documentation] Checking PNF configuration params
+ Create Session sdnc http://${REPO_IP}:8282
+ &{headers}= Create Dictionary Authorization=Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ== Content-Type=application/json
+ ${mount}= Get File ${CURDIR}${/}data${/}mount.json
+ Log to console ${mount}
+ ${pnf_mount_resp}= Put Request sdnc ${SDNC_MOUNT_PATH} data=${mount} headers=${headers}
+ Should Be Equal As Strings ${pnf_mount_resp.status_code} 201
+ SLEEP 10
+ ${pnfsim_software_resp}= Get Request sdnc ${PNFSIM_MOUNT_PATH} headers=${headers}
+ Should Be Equal As Strings ${pnfsim_software_resp.status_code} 200
+ Log to console ${pnfsim_software_resp.content}
+ ${pnfsim_software_resp_json}= Evaluate json.loads(r"""${pnfsim_software_resp.content}""", strict=False) json
+ ${all_upgp_members}= Set Variable ${pnfsim_software_resp_json['software-upgrade']['upgrade-package']}
+ FOR ${member} IN @{all_upgp_members}
+ ${soft_ver}= Get From Dictionary ${member} software-version
+ ${soft_status}= Get From Dictionary ${member} current-status
+ Log to console The node ${pnfName} has software version ${soft_ver} : ${soft_status}
+ Run Keyword If '${soft_ver}' == 'pnf_sw_version-4.0.0' Exit For Loop
+ END
+ Run Keyword If '${soft_ver}' == 'pnf_sw_version-4.0.0' log to console \nexecuted with expected result
+ Should Be Equal As Strings '${soft_ver}' 'pnf_sw_version-4.0.0'
+ Should Be Equal As Strings '${soft_status}' 'ACTIVATION_COMPLETED'
+
+Test AAI-Update for PNF-1 Target Software Version after Service Level Upgrade
+ Create Session aai_simulator_session https://${REPO_IP}:9993
+ &{headers}= Create Dictionary Authorization=Basic YWFpOmFhaS5vbmFwLm9yZzpkZW1vMTIzNDU2IQ== Content-Type=application/json Accept=application/json verify=False
+ FOR ${INDEX} IN RANGE ${MAXIMUM_ATTEMPTS_BEFORE_TIMEOUT}
+ ${get_pnf_request}= Get Request aai_simulator_session aai/v11/network/pnfs/pnf/${pnfName} headers=${headers}
+ Run Keyword If '${get_pnf_request.status_code}' == '200' log to console \nexecuted with expected result
+ ${get_pnf_json_response}= Evaluate json.loads(r"""${get_pnf_request.content}""", strict=False) json
+ Log to console ${get_pnf_json_response}
+ ${sw_version}= Set Variable ${get_pnf_json_response}[sw-version]
+ Log to console ${sw_version}
+ Run Keyword If '${sw_version}' == 'pnf_sw_version-4.0.0' Exit For Loop
+ log to console Will try again after ${SLEEP_INTERVAL_SEC} seconds
+ SLEEP ${SLEEP_INTERVAL_SEC}s
+ END
+ Log To Console final target software version received: ${sw_version}
+ Run Keyword If '${sw_version}' == 'pnf_sw_version-4.0.0' log to console \nexecuted with expected result
+ Should Be Equal As Strings '${sw_version}' 'pnf_sw_version-4.0.0'
+
+Test Verify PNF-2 Configuration for Service Level Upgrade
+ [Documentation] Checking PNF configuration params
+ Create Session sdnc http://${REPO_IP}:8282
+ &{headers}= Create Dictionary Authorization=Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ== Content-Type=application/json
+ ${mount}= Get File ${CURDIR}${/}data${/}mount2.json
+ Log to console ${mount}
+ ${pnf_mount_resp}= Put Request sdnc ${SDNC_MOUNT_PATH2} data=${mount} headers=${headers}
+ Should Be Equal As Strings ${pnf_mount_resp.status_code} 201
+ SLEEP 10
+ ${pnfsim_software_resp}= Get Request sdnc ${PNFSIM_MOUNT_PATH2} headers=${headers}
+ Should Be Equal As Strings ${pnfsim_software_resp.status_code} 200
+ Log to console ${pnfsim_software_resp.content}
+ ${pnfsim_software_resp_json}= Evaluate json.loads(r"""${pnfsim_software_resp.content}""", strict=False) json
+ ${all_upgp_members}= Set Variable ${pnfsim_software_resp_json['software-upgrade']['upgrade-package']}
+ FOR ${member} IN @{all_upgp_members}
+ ${soft_ver}= Get From Dictionary ${member} software-version
+ ${soft_status}= Get From Dictionary ${member} current-status
+ Log to console The node ${pnfName1} has software version ${soft_ver} : ${soft_status}
+ Run Keyword If '${soft_ver}' == 'pnf_sw_version-4.0.0' Exit For Loop
+ END
+ Run Keyword If '${soft_ver}' == 'pnf_sw_version-4.0.0' log to console \nexecuted with expected result
+ Should Be Equal As Strings '${soft_ver}' 'pnf_sw_version-4.0.0'
+ Should Be Equal As Strings '${soft_status}' 'ACTIVATION_COMPLETED'
+
+Test AAI-Update for PNF-2 Target Software Version after Service Level Upgrade
+ Create Session aai_simulator_session https://${REPO_IP}:9993
+ &{headers}= Create Dictionary Authorization=Basic YWFpOmFhaS5vbmFwLm9yZzpkZW1vMTIzNDU2IQ== Content-Type=application/json Accept=application/json verify=False
+ FOR ${INDEX} IN RANGE ${MAXIMUM_ATTEMPTS_BEFORE_TIMEOUT}
+ ${get_pnf_request}= Get Request aai_simulator_session aai/v11/network/pnfs/pnf/${pnfName1} headers=${headers}
+ Run Keyword If '${get_pnf_request.status_code}' == '200' log to console \nexecuted with expected result
+ ${get_pnf_json_response}= Evaluate json.loads(r"""${get_pnf_request.content}""", strict=False) json
+ Log to console ${get_pnf_json_response}
+ ${sw_version}= Set Variable ${get_pnf_json_response}[sw-version]
+ Log to console ${sw_version}
+ Run Keyword If '${sw_version}' == 'pnf_sw_version-4.0.0' Exit For Loop
+ log to console Will try again after ${SLEEP_INTERVAL_SEC} seconds
+ SLEEP ${SLEEP_INTERVAL_SEC}s
+ END
+ Log To Console final target software version received: ${sw_version}
+ Run Keyword If '${sw_version}' == 'pnf_sw_version-4.0.0' log to console \nexecuted with expected result
+ Should Be Equal As Strings '${sw_version}' 'pnf_sw_version-4.0.0'
+
+Test AAI-Update for ServiceInstance after Service Level Upgrade
+ ${globalSubscriberId}= Set Variable 807c7a02-249c-4db8-9fa9-bee973fe08ce
+ Create Session aai_simulator_session https://${REPO_IP}:9993
+ &{headers}= Create Dictionary Authorization=Basic YWFpOmFhaS5vbmFwLm9yZzpkZW1vMTIzNDU2IQ== Content-Type=application/json Accept=application/json verify=False
+ ${get_service_request}= Get Request aai_simulator_session aai/v17/business/customers/customer/${globalSubscriberId}/service-subscriptions/service-subscription/pNF/service-instances/service-instance/${model_version_id_2} headers=${headers}
+ Run Keyword If '${get_service_request.status_code}' == '200' log to console \nexecuted with expected result
+ ${get_service_json_response}= Evaluate json.loads(r"""${get_service_request.content}""", strict=False) json
+ Log to console ${get_service_json_response}
+ ${service_instance_id}= Set Variable ${get_service_json_response}[service-instance-id]
+ Should Be Equal As Strings '${service_instance_id}' 'df4decf6-h727-8875-8761-89683ed43645'
+ ${model_version_id}= Set Variable ${get_service_json_response}[model-version-id]
+ Should Be Equal As Strings '${model_version_id}' '${model_version_id_2}'
\ No newline at end of file
# those strings are dependent on validation response and may need to be changed if vnf refrepo response changes
${response}= Remove String ${response} \\\\ \\u003c \\u003e \\"
${json_response}= evaluate json.loads('''${response}''') json
- Should Be Equal As Strings ${json_response[0]["results"]["criteria"]} PASS
+ Should Be Equal As Strings ${json_response[0]["results"]["criteria"]} ${OPERATION_STATUS_PASS}
FOR ${resault} IN @{json_response[0]["results"]["results"]}
Should Be Equal As Strings ${resault["errors"]} []
Should Be Equal As Strings ${resault["passed"]} True
+ run keyword if "${resault["vnfreqName"]}" == "${CERTIFICATION_RULE}"
+ ... Should Be Equal As Strings ${resault["warnings"]} ${expected_valid_no_security_warnings}
END
+Validate secure CSAR with invalid certificate
+ [Documentation] Valid CSAR with cms signature in manifest file and certificate in TOSCA, containing individual signatures for multiple artifacts, using common certificate and individual certificate
+
+ ${response}= Validate CSAR usign Post request ${csar_invalid_with_security} ${execute_security_csar_validation}
+ # Removing strings that are causing errors during evaluation,
+ # those strings are dependent on validation response and may need to be changed if vnf refrepo response changes
+ ${response}= Remove String ${response} \\\\ \\u003c \\u003e \\"
+ ${json_response}= evaluate json.loads('''${response}''') json
+ Should Be Equal As Strings ${json_response[0]["results"]["criteria"]} ${OPERATION_STATUS_FAILED}
+ ${validated_rules}= Get Length ${json_response[0]["results"]["results"]}
+ Should Be Equal As Strings ${validated_rules} 14
+ FOR ${resault} IN @{json_response[0]["results"]["results"]}
+ ${validation_errors}= Get Length ${resault["errors"]}
+ run keyword if "${resault["vnfreqName"]}" == "${CERTIFICATION_RULE}"
+ ... Should Be Equal As Strings ${validation_errors} 9
+ run keyword if "${resault["vnfreqName"]}" == "${PM_DICTIONARY_YAML_RULE}"
+ ... Should Be Equal As Strings ${validation_errors} 1
+ run keyword if "${resault["vnfreqName"]}" == "${MANIFEST_FILE_RULE}"
+ ... Should Be Equal As Strings ${validation_errors} 1
+ run keyword if "${resault["vnfreqName"]}" == "${NON_MANO_FILES_RULE}"
+ ... Should Be Equal As Strings ${validation_errors} 4
+ END
+
+
+Validate CSAR using selected rules
+ [Documentation] Valid CSAR using only selected rules provided in request parameters
+
+ ${response}= Validate CSAR usign Post request ${csar_invalid_with_security} ${execute_security_csar_validation_selected_rules}
+ # Removing strings that are causing errors during evaluation,
+ # those strings are dependent on validation response and may need to be changed if vnf refrepo response changes
+ ${response}= Remove String ${response} \\\\ \\u003c \\u003e \\"
+ ${json_response}= evaluate json.loads('''${response}''') json
+ Should Be Equal As Strings ${json_response[0]["results"]["criteria"]} ${OPERATION_STATUS_FAILED}
+ ${validated_rules}= Get Length ${json_response[0]["results"]["results"]}
+ Should Be Equal As Strings ${validated_rules} 3
+ FOR ${resault} IN @{json_response[0]["results"]["results"]}
+ ${validation_errors}= Get Length ${resault["errors"]}
+ run keyword if "${resault["vnfreqName"]}" == "${CERTIFICATION_RULE}"
+ ... Should Be Equal As Strings ${validation_errors} 9
+ run keyword if "${resault["vnfreqName"]}" == "${PM_DICTIONARY_YAML_RULE}"
+ ... Should Be Equal As Strings ${validation_errors} 1
+ END
+
+
+
Validate CSAR using rule r130206 and use get method to receive outcome
[Documentation] Validate CSAR with invalid PM_Dictionary (r130206) using rule r130206 , then use get method with validation id to receive valdiation outcome
${csarpath}= ${SCRIPTS}/../tests/vnfsdk-refrepo/csar
+${CERTIFICATION_RULE}= r130206
+${PM_DICTIONARY_YAML_RULE}= r816745
+${MANIFEST_FILE_RULE}= r01123
+${NON_MANO_FILES_RULE}= r146092
+${OPERATION_STATUS_FAILED}= FAILED
+${OPERATION_STATUS_PASS}= PASS
+
${csar_valid_no_security}= valid_no_security.csar
-${execute_no_security_csar_validation}= [{"scenario": "onap-dublin","testSuiteName": "validation","testCaseName": "csar-validate","parameters": {"csar": "file://${csar_valid_no_security}","pnf":"true"}}]
+${execute_no_security_csar_validation}= [{"scenario": "onap-vtp","testSuiteName": "validation","testCaseName": "csar-validate","parameters": {"csar": "file://${csar_valid_no_security}","pnf":"true"}}]
+${expected_valid_no_security_warnings}= [{u'lineNumber': -1, u'message': u'Warning. Consider adding package integrity and authenticity assurance according to ETSI NFV-SOL 004 Security Option 1', u'code': u'0x1006', u'file': u'', u'vnfreqNo': u'R130206'}]
+
+${csar_invalid_with_security}= invalid_with_security.csar
+${execute_security_csar_validation}= [{"scenario": "onap-vtp","testSuiteName": "validation","testCaseName": "csar-validate","parameters": {"csar": "file://${csar_invalid_with_security}","pnf":"true"}}]
+${execute_security_csar_validation_selected_rules}= [{"scenario": "onap-vtp","testSuiteName": "validation","testCaseName": "csar-validate","parameters": {"csar": "file://${csar_invalid_with_security}","pnf":"true","rules":"${CERTIFICATION_RULE},${PM_DICTIONARY_YAML_RULE}"}}]
${csar_invalid_pm_dictionary}= invalid_pm_dictionary.csar
-${execute_invalid_pm_dictionary_r130206_validation}= [{"scenario": "onap-dublin","testSuiteName": "validation","testCaseName": "csar-validate-r130206","parameters": {"csar": "file://${csar_invalid_pm_dictionary}","pnf":"true"}}]
-${execute_invalid_pm_dictionary_validation}= [{"scenario": "onap-dublin","testSuiteName": "validation","testCaseName": "csar-validate","parameters": {"csar": "file://${csar_invalid_pm_dictionary}","pnf":"true"}}]
+${execute_invalid_pm_dictionary_r130206_validation}= [{"scenario": "onap-vtp","testSuiteName": "validation","testCaseName": "csar-validate-r130206","parameters": {"csar": "file://${csar_invalid_pm_dictionary}","pnf":"true"}}]
+${execute_invalid_pm_dictionary_validation}= [{"scenario": "onap-vtp","testSuiteName": "validation","testCaseName": "csar-validate","parameters": {"csar": "file://${csar_invalid_pm_dictionary}","pnf":"true"}}]
Code Review / integration / csit.git / commitdiff