From: Martin Skorupski Date: Fri, 3 Feb 2023 10:56:11 +0000 (+0100) Subject: Clean-up existing docker-compose solutions X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=a3be9ade3bec5ca8cd5b41032704872f87d8c065;p=oam.git Clean-up existing docker-compose solutions - Delete integration smo non-rt-ric folder IssueID: OAM-311 Change-Id: Iee7d13f567f4b549cabf776b70d40e81ede63ff5 Signed-off-by: Martin Skorupski --- diff --git a/solution/integration/smo/non-rt-ric/.env b/solution/integration/smo/non-rt-ric/.env deleted file mode 100644 index 6cf3a12..0000000 --- a/solution/integration/smo/non-rt-ric/.env +++ /dev/null @@ -1,60 +0,0 @@ -# ============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================================================= -# - -#PMS -PMS_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-plt-a1policymanagementservice" -PMS_IMAGE_TAG="2.4.1" - -#A1_SIM -A1_SIM_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/a1-simulator" -A1_SIM_IMAGE_TAG="2.3.1" - -#RAPP -RAPP_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-plt-rappcatalogue" -RAPP_IMAGE_TAG="1.1.0" - -#CONTROL_PANEL -CONTROL_PANEL_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-controlpanel" -CONTROL_PANEL_IMAGE_TAG="2.3.0" - -#GATEWAY -NONRTRIC_GATEWAY_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-gateway" -NONRTRIC_GATEWAY_IMAGE_TAG="1.0.0" - -#ICS -ICS_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-plt-informationcoordinatorservice" -ICS_IMAGE_TAG="1.3.1" - -#PRODUCER -PRODUCER_IMAGE_BASE="eexit/mirror-http-server" -PRODUCER_IMAGE_TAG="latest" - -#ORU -ORU_APP_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-rapp-orufhrecovery" -ORU_APP_IMAGE_TAG="1.1.0" - -#ODU -ODU_APP_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-rapp-ransliceassurance" -ODU_APP_IMAGE_TAG="1.1.1" - -#DB -DB_IMAGE_BASE="mariadb" -DB_IMAGE_TAG="10.5" - -#A1CONTROLLER -A1CONTROLLER_IMAGE_BASE="nexus3.onap.org:10002/onap/sdnc-image" -A1CONTROLLER_IMAGE_TAG="2.3.2" \ No newline at end of file diff --git a/solution/integration/smo/non-rt-ric/config/control-panel/nginx.conf b/solution/integration/smo/non-rt-ric/config/control-panel/nginx.conf deleted file mode 100644 index 3416fd4..0000000 --- a/solution/integration/smo/non-rt-ric/config/control-panel/nginx.conf +++ /dev/null @@ -1,27 +0,0 @@ -events{} - -http { - include /etc/nginx/mime.types; - resolver 127.0.0.11; - server { - listen 8080; - server_name localhost; - root /usr/share/nginx/html; - index index.html; - location /a1-policy/ { - set $upstream nonrtric-gateway; - proxy_pass http://$upstream:9090; - } - location /data-producer/{ - set $upstream nonrtric-gateway; - proxy_pass http://$upstream:9090; - } - location /data-consumer/{ - set $upstream nonrtric-gateway; - proxy_pass http://$upstream:9090; - } - location / { - try_files $uri $uri/ /index.html; - } - } -} diff --git a/solution/integration/smo/non-rt-ric/config/nonrtric-gateway/application-nonrtricgateway.yaml b/solution/integration/smo/non-rt-ric/config/nonrtric-gateway/application-nonrtricgateway.yaml deleted file mode 100644 index d4d93be..0000000 --- a/solution/integration/smo/non-rt-ric/config/nonrtric-gateway/application-nonrtricgateway.yaml +++ /dev/null @@ -1,56 +0,0 @@ -################################################################################ -# 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. # -################################################################################ - -server: - port: 9090 -spring: - cloud: - gateway: - httpclient: - ssl: - useInsecureTrustManager: true - wiretap: true - httpserver: - wiretap: true - routes: - - id: A1-Policy - uri: http://policy-agent:8081 - predicates: - - Path=/a1-policy/** - - id: A1-EI - uri: http://ics:8083 - predicates: - - Path=/ei-producer/** - - id: A1-EI2 - uri: http://ics:8083 - predicates: - - Path=/data-producer/**,/data-consumer/** -management: - endpoint: - gateway: - enabled: true - endpoints: - web: - exposure: - include: "gateway,loggers,logfile,health,info,metrics,threaddump,heapdump" -logging: - level: - ROOT: ERROR - org.springframework: ERROR - org.springframework.cloud.gateway: INFO - reactor.netty: INFO - file: - name: /var/log/nonrtric-gateway/application.log diff --git a/solution/integration/smo/non-rt-ric/config/oru-app/o-ru-to-o-du-map.txt b/solution/integration/smo/non-rt-ric/config/oru-app/o-ru-to-o-du-map.txt deleted file mode 100644 index 0d55bd6..0000000 --- a/solution/integration/smo/non-rt-ric/config/oru-app/o-ru-to-o-du-map.txt +++ /dev/null @@ -1,11 +0,0 @@ -{ - "highstreet-O-RU-11221": "highstreet-O-DU-1122", - "highstreet-O-RU-11222": "highstreet-O-DU-1122", - "highstreet-O-RU-11223": "highstreet-O-DU-1122", - "ERICSSON-O-RU-11221": "HCL-O-DU-1122", - "ERICSSON-O-RU-11222": "HCL-O-DU-1122", - "ERICSSON-O-RU-11223": "HCL-O-DU-1122", - "HIGHSTREET-O-RU-12121": "ERICSSON-O-DU-1212", - "HIGHSTREET-O-RU-12122": "ERICSSON-O-DU-1212", - "HIGHSTREET-O-RU-12123": "ERICSSON-O-DU-1212" -} diff --git a/solution/integration/smo/non-rt-ric/config/pms/application_configuration.json b/solution/integration/smo/non-rt-ric/config/pms/application_configuration.json deleted file mode 100644 index 938c68f..0000000 --- a/solution/integration/smo/non-rt-ric/config/pms/application_configuration.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "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://onap-dmaap:3904/events/A1-POLICY-AGENT-WRITE" - } - } - }, - "streams_subscribes":{ - "dmaap_subscriber":{ - "type":"message_router", - "dmaap_info":{ - "topic_url":"http://onap-dmaap:3904/events/A1-POLICY-AGENT-READ/users/policy-agent?timeout=15000&limit=100" - } - } - } - } - } \ No newline at end of file diff --git a/solution/integration/smo/non-rt-ric/config/pms/application_configuration.json.nosdnc b/solution/integration/smo/non-rt-ric/config/pms/application_configuration.json.nosdnc deleted file mode 100644 index 938c68f..0000000 --- a/solution/integration/smo/non-rt-ric/config/pms/application_configuration.json.nosdnc +++ /dev/null @@ -1,39 +0,0 @@ -{ - "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://onap-dmaap:3904/events/A1-POLICY-AGENT-WRITE" - } - } - }, - "streams_subscribes":{ - "dmaap_subscriber":{ - "type":"message_router", - "dmaap_info":{ - "topic_url":"http://onap-dmaap:3904/events/A1-POLICY-AGENT-READ/users/policy-agent?timeout=15000&limit=100" - } - } - } - } - } \ No newline at end of file diff --git a/solution/integration/smo/non-rt-ric/config/pms/application_configuration.json.sdnc b/solution/integration/smo/non-rt-ric/config/pms/application_configuration.json.sdnc deleted file mode 100644 index d9c7197..0000000 --- a/solution/integration/smo/non-rt-ric/config/pms/application_configuration.json.sdnc +++ /dev/null @@ -1,48 +0,0 @@ -{ - "config":{ - "controller": [ - { - "name": "controller1", - "baseUrl": "https://a1controller: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://onap-dmaap:3904/events/A1-POLICY-AGENT-WRITE" - } - } - }, - "streams_subscribes":{ - "dmaap_subscriber":{ - "type":"message_router", - "dmaap_info":{ - "topic_url":"http://onap-dmaap:3904/events/A1-POLICY-AGENT-READ/users/policy-agent?timeout=15000&limit=100" - } - } - } - } - } diff --git a/solution/integration/smo/non-rt-ric/data/prepareDmaapMsg.sh b/solution/integration/smo/non-rt-ric/data/prepareDmaapMsg.sh deleted file mode 100755 index 0a65a2e..0000000 --- a/solution/integration/smo/non-rt-ric/data/prepareDmaapMsg.sh +++ /dev/null @@ -1,156 +0,0 @@ -#!/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================================================= -# - -# 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: -# ./prepareDmaapMsg.sh [dmaap-mr port] [a1-sim-OSC port] [a1-sim-STD port] [http/https] - -dmaa_mr_port=${1:-3904} -a1_sim_OSC_port=${2:-30001} -a1_sim_STD_port=${3:-30003} -a1_sim_STD_v2_port=${4:-30005} -httpx=${5:-"http"} -SHELL_FOLDER=$(cd "$(dirname "$0")";pwd) - -echo "using dmaap-mr port: "$dmaa_mr_port -echo "using a1-sim-OSC port: "$a1_sim_OSC_port -echo "using a1-sim-STD port: "$a1_sim_STD_port -echo "using a1-sim-STD-v2 port: "$a1_sim_STD_v2_port -echo "using protocol: "$httpx -echo -e "\n" - -echo "dmaap-mr topics:" -curl -skw %{http_code} $httpx://localhost:$dmaa_mr_port/topics/listAll -echo -e "\n" - -echo "dmaap-mr create topic A1-POLICY-AGENT-READ:" -curl -skw %{http_code} -X POST "$httpx://localhost:$dmaa_mr_port/topics/create" -H "accept: application/json" -H "Content-Type: application/json" -d "{ \"topicName\": \"A1-POLICY-AGENT-READ\", \"topicDescription\": \"test topic\", \"partitionCount\": 1, \"replicationCount\": 1, \"transactionEnabled\": \"false\"}" -echo -e "\n" - -echo "dmaap-mr create topic A1-POLICY-AGENT-WRITE:" -curl -skw %{http_code} -X POST "$httpx://localhost:$dmaa_mr_port/topics/create" -H "accept: application/json" -H "Content-Type: application/json" -d "{ \"topicName\": \"A1-POLICY-AGENT-WRITE\", \"topicDescription\": \"test topic\", \"partitionCount\": 1, \"replicationCount\": 1, \"transactionEnabled\": \"false\"}" -echo -e "\n" - -echo "dmaap-mr topics:" -curl -skw %{http_code} $httpx://localhost:$dmaa_mr_port/topics/listAll -echo -e "\n" - -echo "ric1 version:" -curl -skw %{http_code} $httpx://localhost:$a1_sim_OSC_port/counter/interface -echo -e "\n" - -echo "ric2 version:" -curl -skw %{http_code} $httpx://localhost:$a1_sim_STD_port/counter/interface -echo -e "\n" - -echo "ric3 version:" -curl -skw %{http_code} $httpx://localhost:$a1_sim_STD_v2_port/counter/interface -echo -e "\n" - -echo "create policy type 1 to ric1:" -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 -echo -e "\n" - -echo "create policy type 2 to ric3:" -curl -skw %{http_code} $httpx://localhost:$a1_sim_STD_v2_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 -echo -e "\n" - -for i in {1..12}; do - echo "policy types from policy agent:" - curlString="curl -skw %{http_code} $httpx://localhost:8091/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 - -## Using PMS v1 interface -echo "create service 1 to policy agent via dmaap_mr:" -curl -k -X POST -sw %{http_code} -H accept:application/json -H Content-Type:application/json "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-READ/" --data-binary @${SHELL_FOLDER}/testdata/dmaap/v1/dmaap-msg-service-create.json -echo -e "\n" - -echo "get result from mr of previous request:" -curl -X GET "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-WRITE/users/policy-agent?timeout=15000&limit=100" -H "accept: application/json" -H "Content-Type: application/json" | jq . -echo -e "\n" - -echo "create policies to ric1 & ric2 & ric3 with type1 and service1 via dmaa_mr:" -curl -k -X POST -sw %{http_code} -H accept:application/json -H Content-Type:application/json "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-READ/" --data-binary @${SHELL_FOLDER}/testdata/dmaap/v1/dmaap-msg-policy-create.json -echo -e "\n" - -echo "get result from mr of previous request:" -curl -X GET "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-WRITE/users/policy-agent?timeout=15000&limit=100" -H "accept: application/json" -H "Content-Type: application/json" | jq . -echo -e "\n" - -echo "get policy from policy agent via dmaap_mr:" -curl -k -X POST -sw %{http_code} -H accept:application/json -H Content-Type:application/json "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-READ/" --data-binary @${SHELL_FOLDER}/testdata/dmaap/v1/dmaap-msg-policy-get.json -echo -e "\n" - -echo "get result from mr of previous request:" -curl -X GET "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-WRITE/users/policy-agent?timeout=15000&limit=100" -H "accept: application/json" -H "Content-Type: application/json" | jq . -echo -e "\n" - -## Using PMS v2 interface -echo "create service 2 to policy agent via dmaap_mr:" -curl -k -X POST -sw %{http_code} -H accept:application/json -H Content-Type:application/json "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-READ/" --data-binary @${SHELL_FOLDER}/testdata/dmaap/v2/dmaap-msg-service-create.json -echo -e "\n" - -echo "get result from mr of previous request:" -curl -X GET "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-WRITE/users/policy-agent?timeout=15000&limit=100" -H "accept: application/json" -H "Content-Type: application/json" | jq . -echo -e "\n" - -echo "create policies to ric1 & ric2 & ric3 with type1 and service1 via dmaa_mr:" -curl -k -X POST -sw %{http_code} -H accept:application/json -H Content-Type:application/json "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-READ/" --data-binary @${SHELL_FOLDER}/testdata/dmaap/v2/dmaap-msg-policy-create.json -echo -e "\n" - -echo "get result from mr of previous request:" -curl -X GET "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-WRITE/users/policy-agent?timeout=15000&limit=100" -H "accept: application/json" -H "Content-Type: application/json" | jq . -echo -e "\n" - -echo "get policy from policy agent via dmaap_mr:" -curl -k -X POST -sw %{http_code} -H accept:application/json -H Content-Type:application/json "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-READ/" --data-binary @${SHELL_FOLDER}/testdata/dmaap/v2/dmaap-msg-policy-get.json -echo -e "\n" - -echo "get result from mr of previous request:" -curl -X GET "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-WRITE/users/policy-agent?timeout=15000&limit=100" -H "accept: application/json" -H "Content-Type: application/json" | jq . -echo -e "\n" - -## Get metric from rics -echo "policy numbers from ric1:" -curl -skw %{http_code} $httpx://localhost:$a1_sim_OSC_port/counter/num_instances -echo -e "\n" - -echo "policy numbers from ric2:" -curl -skw %{http_code} $httpx://localhost:$a1_sim_STD_port/counter/num_instances -echo -e "\n" - -echo "policy numbers from ric3:" -curl -skw %{http_code} $httpx://localhost:$a1_sim_STD_v2_port/counter/num_instances -echo -e "\n" - diff --git a/solution/integration/smo/non-rt-ric/data/prepareIcsData.sh b/solution/integration/smo/non-rt-ric/data/prepareIcsData.sh deleted file mode 100755 index c407140..0000000 --- a/solution/integration/smo/non-rt-ric/data/prepareIcsData.sh +++ /dev/null @@ -1,89 +0,0 @@ -#!/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================================================= -# - -# The scripts in data/ will generate some dummy data in the running system. -# It will create: -# one InfoProducer in ICS -# one InfoType in ICS -# one InfoJob in ICS - -# Run command: -# ./prepareIcsData.sh [ICS port] [http/https] - -ics_port=${1:-8083} -httpx=${2:-"http"} -SHELL_FOLDER=$(cd "$(dirname "$0")";pwd) - -echo "using ics port: "$ics_port -echo "using protocol: "$httpx -echo -e "\n" - -echo "ICS status:" -curl -skw " %{http_code}" $httpx://localhost:$ics_port/status -echo -e "\n" - -# Create InfoType -echo "Create InfoType:" -curl -X PUT -skw %{http_code} $httpx://localhost:$ics_port/data-producer/v1/info-types/type1 -H accept:application/json -H Content-Type:application/json --data-binary @${SHELL_FOLDER}/testdata/ICS/InfoType.json -echo -e "\n" - -# Get InfoTypes -echo "Get InfoTypes:" -curl -X GET -skw %{http_code} $httpx://localhost:$ics_port/data-producer/v1/info-types -H Content-Type:application/json | jq -echo -e "\n" - -# Get Individual InfoType -echo "Get Individual InfoType:" -curl -X GET -skw %{http_code} $httpx://localhost:$ics_port/data-producer/v1/info-types/type1 -H Content-Type:application/json | jq -echo -e "\n" - -# Create InfoProducer -echo "Create InfoProducer:" -curl -X PUT -skw %{http_code} $httpx://localhost:$ics_port/data-producer/v1/info-producers/1 -H Content-Type:application/json --data-binary @${SHELL_FOLDER}/testdata/ICS/InfoProducer.json -echo -e "\n" - -# Get InfoProducers -echo "Get InfoProducers:" -curl -X GET -skw %{http_code} $httpx://localhost:$ics_port/data-producer/v1/info-producers -H Content-Type:application/json | jq -echo -e "\n" - -# Get Individual InfoProducer -echo "Get Individual InfoProducer:" -curl -X GET -skw %{http_code} $httpx://localhost:$ics_port/data-producer/v1/info-producers/1 -H Content-Type:application/json | jq -echo -e "\n" - -# Get Individual InfoProducer Status -echo "Get Individual InfoProducer:" -curl -X GET -skw %{http_code} $httpx://localhost:$ics_port/data-producer/v1/info-producers/1/status -H Content-Type:application/json | jq -echo -e "\n" - -# Create InfoJob -echo "Create InfoJob Of A Certain Type type1:" -curl -X PUT -skw %{http_code} $httpx://localhost:$ics_port/A1-EI/v1/eijobs/job1 -H Content-Type:application/json --data-binary @${SHELL_FOLDER}/testdata/ICS/InfoJob.json -echo -e "\n" - -# Get InfoJobs -echo "Get InfoJobs:" -curl -X GET -skw %{http_code} $httpx://localhost:$ics_port/A1-EI/v1/eijobs -H Content-Type:application/json | jq -echo -e "\n" - -# Get Individual InfoJob: -echo "Get Individual InfoJob:" -curl -X GET -skw %{http_code} $httpx://localhost:$ics_port/A1-EI/v1/eijobs/job1 -H Content-Type:application/json | jq -echo -e "\n" \ No newline at end of file diff --git a/solution/integration/smo/non-rt-ric/data/preparePmsData.sh b/solution/integration/smo/non-rt-ric/data/preparePmsData.sh deleted file mode 100755 index ea65d12..0000000 --- a/solution/integration/smo/non-rt-ric/data/preparePmsData.sh +++ /dev/null @@ -1,157 +0,0 @@ -#!/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:-8091} -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..60}; 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" diff --git a/solution/integration/smo/non-rt-ric/data/testdata/ICS/InfoJob.json b/solution/integration/smo/non-rt-ric/data/testdata/ICS/InfoJob.json deleted file mode 100644 index 003c70f..0000000 --- a/solution/integration/smo/non-rt-ric/data/testdata/ICS/InfoJob.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "eiTypeId": "type1", - "jobResultUri": "https://ricsim_g3_1:8185/datadelivery", - "jobOwner": "ricsim_g3_1", - "jobStatusNotificationUri": "http://producer:80/", - "jobDefinition": { - "jobparam1": "value1_job1", - "jobparam2": "value2_job1", - "jobparam3": "value3_job1" - } -} \ No newline at end of file diff --git a/solution/integration/smo/non-rt-ric/data/testdata/ICS/InfoProducer.json b/solution/integration/smo/non-rt-ric/data/testdata/ICS/InfoProducer.json deleted file mode 100644 index a691e8b..0000000 --- a/solution/integration/smo/non-rt-ric/data/testdata/ICS/InfoProducer.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "supported_info_types": ["type1"], - "info_job_callback_url": "http://producer:80/callbacks/job/prod-a", - "info_producer_supervision_callback_url": "http://producer:80/callbacks/supervision/prod-a" -} \ No newline at end of file diff --git a/solution/integration/smo/non-rt-ric/data/testdata/ICS/InfoType.json b/solution/integration/smo/non-rt-ric/data/testdata/ICS/InfoType.json deleted file mode 100644 index 03762e5..0000000 --- a/solution/integration/smo/non-rt-ric/data/testdata/ICS/InfoType.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "info_job_data_schema":{ - "$schema":"http://json-schema.org/draft-07/schema#", - "title":"STD_Type1_1.0.0", - "description":"EI-Type 1", - "type":"object" - } - } \ No newline at end of file diff --git a/solution/integration/smo/non-rt-ric/data/testdata/OSC/policy_type.json b/solution/integration/smo/non-rt-ric/data/testdata/OSC/policy_type.json deleted file mode 100644 index aeea773..0000000 --- a/solution/integration/smo/non-rt-ric/data/testdata/OSC/policy_type.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "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" - ] - } -} diff --git a/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v1/dmaap-msg-pms-status.json b/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v1/dmaap-msg-pms-status.json deleted file mode 100644 index 5c7968e..0000000 --- a/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v1/dmaap-msg-pms-status.json +++ /dev/null @@ -1,14 +0,0 @@ -[ - { - "apiVersion": "1.0", - "operation": "GET", - "correlationId": "1596363451067769100", - "originatorId": "849e6c6b420", - "payload": {}, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-02 10:17:31.067784", - "type": "request", - "url": "/status" - } -] \ No newline at end of file diff --git a/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v1/dmaap-msg-policy-create.json b/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v1/dmaap-msg-policy-create.json deleted file mode 100644 index 23d7bed..0000000 --- a/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v1/dmaap-msg-policy-create.json +++ /dev/null @@ -1,102 +0,0 @@ -[ - { - "apiVersion": "1.0", - "operation": "PUT", - "correlationId": "1596304565904621535", - "originatorId": "849e6c6b420", - "payload": { - "scope": { - "ueId": "ue3000", - "qosId": "qos3000" - }, - "qosObjectives": { - "priorityLevel": 3000 - } - }, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-01 17:56:05.905035", - "type": "request", - "url": "/policy?id=0f7bb041e1584b1fa17e87520d70a3000&ric=ric1&service=service1&type=1" - }, - { - "apiVersion": "1.0", - "operation": "PUT", - "correlationId": "1596304566656253556", - "originatorId": "849e6c6b420", - "payload": { - "scope": { - "ueId": "ue3100", - "qosId": "qos3100" - }, - "qosObjectives": { - "priorityLevel": 3100 - } - }, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-01 17:56:06.656949", - "type": "request", - "url": "/policy?id=0f7bb041e1584b1fa17e87520d70a3100&ric=ric1&service=service1&type=1" - }, - { - "apiVersion": "1.0", - "operation": "PUT", - "correlationId": "1596304566656253557", - "originatorId": "849e6c6b420", - "payload": { - "scope": { - "ueId": "ue3100", - "qosId": "qos3100" - }, - "qosObjectives": { - "priorityLevel": 3200 - } - }, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-01 17:56:06.656949", - "type": "request", - "url": "/policy?id=0f7bb041e1584b1fa17e87520d70a3101&ric=ric1&service=service1&type=1" - }, - { - "apiVersion": "1.0", - "operation": "PUT", - "correlationId": "1596304566656253558", - "originatorId": "849e6c6b420", - "payload": { - "scope": { - "ueId": "ue3102", - "qosId": "qos3102" - }, - "qosObjectives": { - "priorityLevel": 3201 - } - }, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-01 17:56:06.656949", - "type": "request", - "url": "/policy?id=0f7bb041e1584b1fa17e87520d70a3102&ric=ric2&service=service1" - }, - { - "apiVersion": "1.0", - "operation": "PUT", - "correlationId": "1596304566656253558", - "originatorId": "849e6c6b420", - "payload": { - "scope": { - "ueId": "ue3103", - "qosId": "qos3103" - }, - "qosObjectives": { - "priorityLevel": 3203 - } - }, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-01 17:56:06.656949", - "type": "request", - "url": "/policy?id=0f7bb041e1584b1fa17e87520d70a3103&ric=ric3&service=service1&type=2" - } -] \ No newline at end of file diff --git a/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v1/dmaap-msg-policy-delete.json b/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v1/dmaap-msg-policy-delete.json deleted file mode 100644 index 6065af3..0000000 --- a/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v1/dmaap-msg-policy-delete.json +++ /dev/null @@ -1,50 +0,0 @@ -[ - { - "apiVersion": "1.0", - "operation": "DELETE", - "correlationId": "1596304567816229314", - "originatorId": "849e6c6b420", - "payload": {}, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-01 17:56:07.816235", - "type": "request", - "url": "/policy?id=0f7bb041e1584b1fa17e87520d70a3000" - }, - { - "apiVersion": "1.0", - "operation": "DELETE", - "correlationId": "1596304567816229314", - "originatorId": "849e6c6b420", - "payload": {}, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-01 17:56:07.816235", - "type": "request", - "url": "/policy?id=0f7bb041e1584b1fa17e87520d70a3100" - }, - { - "apiVersion": "1.0", - "operation": "DELETE", - "correlationId": "1596304567816229314", - "originatorId": "849e6c6b420", - "payload": {}, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-01 17:56:07.816235", - "type": "request", - "url": "/policy?id=0f7bb041e1584b1fa17e87520d70a3101" - }, - { - "apiVersion": "1.0", - "operation": "DELETE", - "correlationId": "1596304567816229314", - "originatorId": "849e6c6b420", - "payload": {}, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-01 17:56:07.816235", - "type": "request", - "url": "/policy?id=0f7bb041e1584b1fa17e87520d70a3102" - } -] \ No newline at end of file diff --git a/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v1/dmaap-msg-policy-get.json b/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v1/dmaap-msg-policy-get.json deleted file mode 100644 index abcaa35..0000000 --- a/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v1/dmaap-msg-policy-get.json +++ /dev/null @@ -1,50 +0,0 @@ -[ - { - "apiVersion": "1.0", - "operation": "GET", - "correlationId": "1596304567017739720", - "originatorId": "849e6c6b420", - "payload": {}, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-01 17:56:07.017744", - "type": "request", - "url": "/policy?id=0f7bb041e1584b1fa17e87520d70a3000" - }, - { - "apiVersion": "1.0", - "operation": "GET", - "correlationId": "1596304567017739720", - "originatorId": "849e6c6b420", - "payload": {}, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-01 17:56:07.017744", - "type": "request", - "url": "/policy?id=0f7bb041e1584b1fa17e87520d70a3100" - }, - { - "apiVersion": "1.0", - "operation": "GET", - "correlationId": "1596304567017739720", - "originatorId": "849e6c6b420", - "payload": {}, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-01 17:56:07.017744", - "type": "request", - "url": "/policy?id=0f7bb041e1584b1fa17e87520d70a3101" - }, - { - "apiVersion": "1.0", - "operation": "GET", - "correlationId": "1596304567017739720", - "originatorId": "849e6c6b420", - "payload": {}, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-01 17:56:07.017744", - "type": "request", - "url": "/policy?id=0f7bb041e1584b1fa17e87520d70a3102" - } -] \ No newline at end of file diff --git a/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v1/dmaap-msg-policy-schemas-get.json b/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v1/dmaap-msg-policy-schemas-get.json deleted file mode 100644 index 05a7975..0000000 --- a/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v1/dmaap-msg-policy-schemas-get.json +++ /dev/null @@ -1,13 +0,0 @@ -[ - { - "type": "request", - "correlationId": "c09ac7d1-de62-0016-2000-e63701125557-201", - "target": "policy-agent", - "timestamp": "2019-05-14T11:44:51.36Z", - "apiVersion": "1.0", - "originatorId": "849e6c6b420", - "requestId": "23343221", - "operation": "GET", - "url": "/policy_schemas?ric=ric1" - } -] diff --git a/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v1/dmaap-msg-rics-get.json b/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v1/dmaap-msg-rics-get.json deleted file mode 100644 index 59562d3..0000000 --- a/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v1/dmaap-msg-rics-get.json +++ /dev/null @@ -1,14 +0,0 @@ -[ - { - "apiVersion": "1.0", - "operation": "GET", - "correlationId": "1596363459399504200", - "originatorId": "849e6c6b420", - "payload": {}, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-02 10:17:39.399517", - "type": "request", - "url": "/rics" - } -] \ No newline at end of file diff --git a/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v1/dmaap-msg-service-create.json b/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v1/dmaap-msg-service-create.json deleted file mode 100644 index 3e3d542..0000000 --- a/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v1/dmaap-msg-service-create.json +++ /dev/null @@ -1,46 +0,0 @@ -[ - { - "apiVersion": "1.0", - "operation": "PUT", - "correlationId": "1596363458549998500", - "originatorId": "849e6c6b420", - "payload": { - "callbackUrl": "http://callback-receiver:8090/callbacks/1", - "keepAliveIntervalSeconds": "1000", - "serviceName": "serv1" - }, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-02 10:17:38.550324", - "type": "request", - "url": "/service" - }, - { - "apiVersion": "1.0", - "operation": "PUT", - "correlationId": "1596363458549998501", - "originatorId": "849e6c6b421", - "payload": { - "callbackUrl": "http://callback-receiver:8090/callbacks/1", - "keepAliveIntervalSeconds": "1000", - "serviceName": "service1" - }, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-02 10:17:38.550324", - "type": "request", - "url": "/service" - }, - { - "apiVersion": "1.0", - "operation": "PUT", - "correlationId": "1596363459196978900", - "originatorId": "849e6c6b420", - "payload": {}, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-02 10:17:39.197067", - "type": "request", - "url": "/services/keepalive?name=serv1" - } -] \ No newline at end of file diff --git a/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v1/dmaap-msg-services-get.json b/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v1/dmaap-msg-services-get.json deleted file mode 100644 index e9c2f8c..0000000 --- a/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v1/dmaap-msg-services-get.json +++ /dev/null @@ -1,14 +0,0 @@ -[ - { - "apiVersion": "1.0", - "operation": "GET", - "correlationId": "1596363458896827100", - "originatorId": "849e6c6b420", - "payload": {}, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-02 10:17:38.897367", - "type": "request", - "url": "/services" - } -] \ No newline at end of file diff --git a/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v2/dmaap-msg-pms-status.json b/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v2/dmaap-msg-pms-status.json deleted file mode 100644 index 439da01..0000000 --- a/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v2/dmaap-msg-pms-status.json +++ /dev/null @@ -1,14 +0,0 @@ -[ - { - "apiVersion": "1.0", - "operation": "GET", - "correlationId": "1596363451067769100", - "originatorId": "849e6c6b420", - "payload": {}, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-02 10:17:31.067784", - "type": "request", - "url": "/a1-policy/v2/status" - } -] \ No newline at end of file diff --git a/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v2/dmaap-msg-policy-create.json b/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v2/dmaap-msg-policy-create.json deleted file mode 100644 index 3b42dfe..0000000 --- a/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v2/dmaap-msg-policy-create.json +++ /dev/null @@ -1,114 +0,0 @@ -[ - { - "apiVersion": "1.0", - "operation": "PUT", - "correlationId": "1596304565904621535", - "originatorId": "849e6c6b420", - "payload": { - "policy_data": { - "scope": { - "ueId": "ue3010", - "qosId": "qos3010" - }, - "qosObjectives": { - "priorityLevel": 3010 - } - }, - "policy_id": "0f7bb041e1584b1fa17e87520d70a3010", - "policytype_id": "1", - "ric_id": "ric1", - "service_id": "service2", - "status_notification_uri": "http://example.com", - "transient": true - }, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-01 17:56:05.905035", - "type": "request", - "url": "/a1-policy/v2/policies/" - }, - { - "apiVersion": "1.0", - "operation": "PUT", - "correlationId": "1596304566656253556", - "originatorId": "849e6c6b420", - "payload": { - "policy_data": { - "scope": { - "ueId": "ue3120", - "qosId": "qos3120" - }, - "qosObjectives": { - "priorityLevel": 3120 - } - }, - "policy_id": "0f7bb041e1584b1fa17e87520d70a3120", - "policytype_id": "1", - "ric_id": "ric1", - "service_id": "service2", - "status_notification_uri": "http://example.com", - "transient": true - }, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-01 17:56:06.656949", - "type": "request", - "url": "/a1-policy/v2/policies/" - }, - { - "apiVersion": "1.0", - "operation": "PUT", - "correlationId": "1596304566656253557", - "originatorId": "849e6c6b420", - "payload": { - "policy_data": { - "scope": { - "ueId": "ue3131", - "qosId": "qos3131" - }, - "qosObjectives": { - "priorityLevel": 3101 - } - }, - "policy_id": "0f7bb041e1584b1fa17e87520d70a3131", - "policytype_id": "1", - "ric_id": "ric1", - "service_id": "service2", - "status_notification_uri": "http://example.com", - "transient": true - }, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-01 17:56:06.656949", - "type": "request", - "url": "/a1-policy/v2/policies/" - }, - { - "apiVersion": "1.0", - "operation": "PUT", - "correlationId": "1596304566656253758", - "originatorId": "849e6c6b422", - "payload": { - "policy_data": { - "scope": { - "ueId": "ue3153", - "qosId": "qos3153" - }, - "qosObjectives": { - "priorityLevel": 3103 - } - }, - "policy_id": "0f7bb041e1584b1fa17e87520d70a3153", - "policytype_id": "2", - "ric_id": "ric2", - "service_id": "service2", - "status_notification_uri": "http://example.com", - "transient": true - }, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-01 17:56:06.656949", - "type": "request", - "url": "/a1-policy/v2/policies/" - } -] \ No newline at end of file diff --git a/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v2/dmaap-msg-policy-delete.json b/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v2/dmaap-msg-policy-delete.json deleted file mode 100644 index 1a126fd..0000000 --- a/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v2/dmaap-msg-policy-delete.json +++ /dev/null @@ -1,50 +0,0 @@ -[ - { - "apiVersion": "1.0", - "operation": "DELETE", - "correlationId": "1596304567816229314", - "originatorId": "849e6c6b420", - "payload": {}, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-01 17:56:07.816235", - "type": "request", - "url": "/a1-policy/v2/policies/0f7bb041e1584b1fa17e87520d70a3000" - }, - { - "apiVersion": "1.0", - "operation": "DELETE", - "correlationId": "1596304567816229314", - "originatorId": "849e6c6b420", - "payload": {}, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-01 17:56:07.816235", - "type": "request", - "url": "/a1-policy/v2/policies/0f7bb041e1584b1fa17e87520d70a3100" - }, - { - "apiVersion": "1.0", - "operation": "DELETE", - "correlationId": "1596304567816229314", - "originatorId": "849e6c6b420", - "payload": {}, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-01 17:56:07.816235", - "type": "request", - "url": "/a1-policy/v2/policies/0f7bb041e1584b1fa17e87520d70a3101" - }, - { - "apiVersion": "1.0", - "operation": "DELETE", - "correlationId": "1596304567816229314", - "originatorId": "849e6c6b420", - "payload": {}, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-01 17:56:07.816235", - "type": "request", - "url": "/a1-policy/v2/policies/0f7bb041e1584b1fa17e87520d70a3102" - } -] \ No newline at end of file diff --git a/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v2/dmaap-msg-policy-get.json b/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v2/dmaap-msg-policy-get.json deleted file mode 100644 index a45e06b..0000000 --- a/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v2/dmaap-msg-policy-get.json +++ /dev/null @@ -1,50 +0,0 @@ -[ - { - "apiVersion": "1.0", - "operation": "GET", - "correlationId": "1596304567017739720", - "originatorId": "849e6c6b420", - "payload": {}, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-01 17:56:07.017744", - "type": "request", - "url": "/a1-policy/v2/policies/0f7bb041e1584b1fa17e87520d70a3000" - }, - { - "apiVersion": "1.0", - "operation": "GET", - "correlationId": "1596304567017739720", - "originatorId": "849e6c6b420", - "payload": {}, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-01 17:56:07.017744", - "type": "request", - "url": "/a1-policy/v2/policies/0f7bb041e1584b1fa17e87520d70a3100" - }, - { - "apiVersion": "1.0", - "operation": "GET", - "correlationId": "1596304567017739720", - "originatorId": "849e6c6b420", - "payload": {}, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-01 17:56:07.017744", - "type": "request", - "url": "/a1-policy/v2/policies/0f7bb041e1584b1fa17e87520d70a3101" - }, - { - "apiVersion": "1.0", - "operation": "GET", - "correlationId": "1596304567017739720", - "originatorId": "849e6c6b420", - "payload": {}, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-01 17:56:07.017744", - "type": "request", - "url": "/a1-policy/v2/policies/0f7bb041e1584b1fa17e87520d70a3102" - } -] \ No newline at end of file diff --git a/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v2/dmaap-msg-policy-schemas-get.json b/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v2/dmaap-msg-policy-schemas-get.json deleted file mode 100644 index b1b2b55..0000000 --- a/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v2/dmaap-msg-policy-schemas-get.json +++ /dev/null @@ -1,13 +0,0 @@ -[ - { - "type": "request", - "correlationId": "c09ac7d1-de62-0016-2000-e63701125557-201", - "target": "policy-agent", - "timestamp": "2019-05-14T11:44:51.36Z", - "apiVersion": "1.0", - "originatorId": "849e6c6b420", - "requestId": "23343221", - "operation": "GET", - "url": "/a1-policy/v2/policy-types/1" - } -] diff --git a/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v2/dmaap-msg-rics-get.json b/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v2/dmaap-msg-rics-get.json deleted file mode 100644 index 9c047c0..0000000 --- a/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v2/dmaap-msg-rics-get.json +++ /dev/null @@ -1,14 +0,0 @@ -[ - { - "apiVersion": "1.0", - "operation": "GET", - "correlationId": "1596363459399504200", - "originatorId": "849e6c6b420", - "payload": {}, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-02 10:17:39.399517", - "type": "request", - "url": "/a1-policy/v2/rics" - } -] \ No newline at end of file diff --git a/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v2/dmaap-msg-service-create.json b/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v2/dmaap-msg-service-create.json deleted file mode 100644 index 1cd9c25..0000000 --- a/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v2/dmaap-msg-service-create.json +++ /dev/null @@ -1,46 +0,0 @@ -[ - { - "apiVersion": "1.0", - "operation": "PUT", - "correlationId": "1596363458549998500", - "originatorId": "849e6c6b420", - "payload": { - "callback_url": "http://callback-receiver:8090/callbacks/1", - "keep_alive_interval_seconds": "1000", - "service_id": "serv2" - }, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-02 10:17:38.550324", - "type": "request", - "url": "/a1-policy/v2/services" - }, - { - "apiVersion": "1.0", - "operation": "PUT", - "correlationId": "1596363458549998501", - "originatorId": "849e6c6b421", - "payload": { - "callback_url": "http://callback-receiver:8090/callbacks/1", - "keep_alive_interval_seconds": "1000", - "service_id": "service2" - }, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-02 10:17:38.550324", - "type": "request", - "url": "/a1-policy/v2/services" - }, - { - "apiVersion": "1.0", - "operation": "PUT", - "correlationId": "1596363459196978900", - "originatorId": "849e6c6b420", - "payload": {}, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-02 10:17:39.197067", - "type": "request", - "url": "/a1-policy/v2/services/serv2/keepalive" - } -] \ No newline at end of file diff --git a/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v2/dmaap-msg-services-get.json b/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v2/dmaap-msg-services-get.json deleted file mode 100644 index 7d2d153..0000000 --- a/solution/integration/smo/non-rt-ric/data/testdata/dmaap/v2/dmaap-msg-services-get.json +++ /dev/null @@ -1,14 +0,0 @@ -[ - { - "apiVersion": "1.0", - "operation": "GET", - "correlationId": "1596363458896827100", - "originatorId": "849e6c6b420", - "payload": {}, - "requestId": "23343221", - "target": "policy-agent", - "timestamp": "2020-08-02 10:17:38.897367", - "type": "request", - "url": "a1-policy/v2/services" - } -] \ No newline at end of file diff --git a/solution/integration/smo/non-rt-ric/data/testdata/policy.json b/solution/integration/smo/non-rt-ric/data/testdata/policy.json deleted file mode 100644 index ac1b538..0000000 --- a/solution/integration/smo/non-rt-ric/data/testdata/policy.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "scope": { - "ueId": "ue3100", - "qosId": "qos3100" - }, - "qosObjectives": { - "priorityLevel": 3100 - } -} diff --git a/solution/integration/smo/non-rt-ric/data/testdata/service.json b/solution/integration/smo/non-rt-ric/data/testdata/service.json deleted file mode 100644 index 7bb6651..0000000 --- a/solution/integration/smo/non-rt-ric/data/testdata/service.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "callbackUrl": "https://callback-receiver:8091/callbacks/1", - "keepAliveIntervalSeconds": "3600", - "serviceName": "service1" -} diff --git a/solution/integration/smo/non-rt-ric/data/testdata/v2/policy_osc.json b/solution/integration/smo/non-rt-ric/data/testdata/v2/policy_osc.json deleted file mode 100644 index 902f911..0000000 --- a/solution/integration/smo/non-rt-ric/data/testdata/v2/policy_osc.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "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 diff --git a/solution/integration/smo/non-rt-ric/data/testdata/v2/policy_std_v2.json b/solution/integration/smo/non-rt-ric/data/testdata/v2/policy_std_v2.json deleted file mode 100644 index dcb7e38..0000000 --- a/solution/integration/smo/non-rt-ric/data/testdata/v2/policy_std_v2.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "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 diff --git a/solution/integration/smo/non-rt-ric/data/testdata/v2/policy_type.json b/solution/integration/smo/non-rt-ric/data/testdata/v2/policy_type.json deleted file mode 100644 index 931498c..0000000 --- a/solution/integration/smo/non-rt-ric/data/testdata/v2/policy_type.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "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 diff --git a/solution/integration/smo/non-rt-ric/data/testdata/v2/service.json b/solution/integration/smo/non-rt-ric/data/testdata/v2/service.json deleted file mode 100644 index d984cba..0000000 --- a/solution/integration/smo/non-rt-ric/data/testdata/v2/service.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "callback_url": "http://callback-receiver:8090/callbacks/ric-registration", - "keep_alive_interval_seconds": "0", - "service_id": "ric-registration" -} \ No newline at end of file diff --git a/solution/integration/smo/non-rt-ric/docker-compose.yml b/solution/integration/smo/non-rt-ric/docker-compose.yml deleted file mode 100644 index 654bf93..0000000 --- a/solution/integration/smo/non-rt-ric/docker-compose.yml +++ /dev/null @@ -1,222 +0,0 @@ -# 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: - nonrtric: - driver: bridge - oam: - external: true - smo: - external: true - -services: - policy-agent: - image: "${PMS_IMAGE_BASE}:${PMS_IMAGE_TAG}" - container_name: policy-agent - networks: - - default - - oam - - smo - ports: - - 8091:8081 - - 8433:8433 - volumes: - - ./config/pms/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/pms/keystore-policyagent.jks:/opt/app/policy-agent/etc/cert/keystore.jks:ro - # - ./config/pms/truststore-policyagent.jks:/opt/app/policy-agent/etc/cert/truststore.jks:ro - # - ./config/pms/application-policyagent.yaml:/opt/app/policy-agent/config/application.yaml:ro - - a1-sim-OSC: - image: "${A1_SIM_IMAGE_BASE}:${A1_SIM_IMAGE_TAG}" - container_name: a1-sim-OSC - networks: - - default - - oam - - smo - ports: - - 30001:8085 - - 30002:8185 - environment: - - A1_VERSION=OSC_2.1.0 - - REMOTE_HOSTS_LOGGING=1 - - ALLOW_HTTP=true - - a1-sim-STD: - image: "${A1_SIM_IMAGE_BASE}:${A1_SIM_IMAGE_TAG}" - container_name: a1-sim-STD - networks: - - default - - oam - - smo - ports: - - 30003:8085 - - 30004:8185 - environment: - - A1_VERSION=STD_1.1.3 - - REMOTE_HOSTS_LOGGING=1 - - ALLOW_HTTP=true - - a1-sim-STD-v2: - image: "${A1_SIM_IMAGE_BASE}:${A1_SIM_IMAGE_TAG}" - container_name: a1-sim-STD-v2 - networks: - - default - - oam - - smo - ports: - - 30005:8085 - - 30006:8185 - environment: - - A1_VERSION=STD_2.0.0 - - REMOTE_HOSTS_LOGGING=1 - - ALLOW_HTTP=true - - r-app: - image: "${RAPP_IMAGE_BASE}:${RAPP_IMAGE_TAG}" - container_name: r-app - networks: - - default - ports: - - 8680:8680 - - 8633:8633 - - policy-control-panel: - image: "${CONTROL_PANEL_IMAGE_BASE}:${CONTROL_PANEL_IMAGE_TAG}" - container_name: policy-control-panel - networks: - - default - ports: - - 8182:8080 - - 8082:8082 - volumes: - - ./config/control-panel/nginx.conf:/etc/nginx/nginx.conf:ro - - nonrtric-gateway: - image: "${NONRTRIC_GATEWAY_IMAGE_BASE}:${NONRTRIC_GATEWAY_IMAGE_TAG}" - container_name: nonrtric-gateway - networks: - - default - ports: - - 9090:9090 - volumes: - - ./config/nonrtric-gateway/application-nonrtricgateway.yaml:/opt/app/nonrtric-gateway/config/application.yaml:ro - - ics: - image: "${ICS_IMAGE_BASE}:${ICS_IMAGE_TAG}" - container_name: ics - networks: - - default - ports: - - 8083:8083 - - 8434:8434 - - producer: - image: "${PRODUCER_IMAGE_BASE}:${PRODUCER_IMAGE_TAG}" - container_name: producer - networks: - - default - ports: - - 8088:80 - - oru-app: - image: "${ORU_APP_IMAGE_BASE}:${ORU_APP_IMAGE_TAG}" - container_name: oru-app - networks: - - default - - oam - - smo - environment: - - MR-HOST=http://onap-dmaap - - MR-PORT=3904 - - SDNR-HOST=http://sdnr - - SDNR-PORT=8181 - - VERBOSE=on - volumes: - - ./config/oru-app/o-ru-to-o-du-map.txt:/usr/src/app/o-ru-to-o-du-map.txt:ro - - odu-app: - image: "${ODU_APP_IMAGE_BASE}:${ODU_APP_IMAGE_TAG}" - container_name: odu-app - networks: - - default - - oam - - smo - environment: - - MR_HOST=http://onap-dmaap - - MR_PORT=3904 - - SDNR_ADDRESS=http://sdnr:8181 - - SDNR_USER=admin - - SDNR_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U - - LOG_LEVEL=Info - - POLLTIME=10 - - db: - image: "${DB_IMAGE_BASE}:${DB_IMAGE_TAG}" - container_name: sdncdb - networks: - - default - ports: - - "3306" - environment: - - MYSQL_ROOT_PASSWORD=itsASecret - - MYSQL_ROOT_HOST=% - - MYSQL_USER=sdnctl - - MYSQL_PASSWORD=gamma - - MYSQL_DATABASE=sdnctl - logging: - driver: "json-file" - options: - max-size: "30m" - max-file: "5" - - a1controller: - image: "${A1CONTROLLER_IMAGE_BASE}:${A1CONTROLLER_IMAGE_TAG}" - depends_on : - - db - container_name: a1controller - networks: - - default - entrypoint: ["/opt/onap/sdnc/bin/startODL.sh"] - ports: - - 8282:8181 - - 8444:8443 - links: - - db:dbhost - - db:sdnctldb01 - - db:sdnctldb02 - environment: - - MYSQL_ROOT_PASSWORD=itsASecret - - MYSQL_USER=sdnctl - - MYSQL_PASSWORD=gamma - - MYSQL_DATABASE=sdnctl - - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties - - SDNC_BIN=/opt/onap/sdnc/bin - - ODL_CERT_DIR=/tmp - - ODL_ADMIN_USERNAME=admin - - ODL_ADMIN_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U - - ODL_USER=admin - - ODL_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U - - SDNC_DB_INIT=true - - A1_TRUSTSTORE_PASSWORD=a1adapter - - AAI_TRUSTSTORE_PASSWORD=changeit - logging: - driver: "json-file" - options: - max-size: "30m" - max-file: "5" \ No newline at end of file diff --git a/solution/integration/smo/non-rt-ric/test/health_check.sh b/solution/integration/smo/non-rt-ric/test/health_check.sh deleted file mode 100755 index 537a20f..0000000 --- a/solution/integration/smo/non-rt-ric/test/health_check.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/usr/bin/env bash -############################################################################### -# Copyright 2017 Huawei Technologies Co., Ltd. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# Modifications copyright (c) 2021 Nordix Foundation -# -############################################################################### - -unset http_proxy https_proxy -SHELL_FOLDER=$(cd "$(dirname "$0")";pwd) -docker stop $(docker ps -aq) -docker system prune -f -docker network create oam -docker network create smo - -cd ${SHELL_FOLDER}/../config/pms/ -cp application_configuration.json.nosdnc application_configuration.json - -cd ${SHELL_FOLDER}/../ - -# start NONRTRIC containers with docker compose and configuration from docker-compose.yml -docker-compose up -d - -checkStatus(){ - for i in {1..60}; 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:8091/status" "hunky dory200" "PMS" - -# check ICS status -echo "check ICS status:" -checkStatus "curl -skw %{http_code} http://localhost:8083/status" '{"status":"hunky dory","no_of_producers":0,"no_of_types":0,"no_of_jobs":0}200' "ICS" - -echo "NONRTRIC health check passed." diff --git a/solution/integration/smo/non-rt-ric/test/pms_a1sim.sh b/solution/integration/smo/non-rt-ric/test/pms_a1sim.sh deleted file mode 100755 index 38c7e04..0000000 --- a/solution/integration/smo/non-rt-ric/test/pms_a1sim.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/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================================================= - -unset http_proxy https_proxy -SHELL_FOLDER=$(cd "$(dirname "$0")";pwd) -docker stop $(docker ps -aq) -docker system prune -f -docker network create oam -docker network create smo - -cd ${SHELL_FOLDER}/../config/pms/ -cp application_configuration.json.nosdnc application_configuration.json - -cd ${SHELL_FOLDER}/../ -docker-compose up -d - -checkStatus(){ - for i in {1..60}; 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:8091/status" "hunky dory200" "PMS" - -cd ${SHELL_FOLDER}/../data -./preparePmsData.sh -./prepareIcsData.sh - - diff --git a/solution/integration/smo/non-rt-ric/test/pms_a1sim_sdnc.sh b/solution/integration/smo/non-rt-ric/test/pms_a1sim_sdnc.sh deleted file mode 100755 index cbd1024..0000000 --- a/solution/integration/smo/non-rt-ric/test/pms_a1sim_sdnc.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/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================================================= - -unset http_proxy https_proxy -SHELL_FOLDER=$(cd "$(dirname "$0")";pwd) -docker stop $(docker ps -aq) -docker system prune -f -docker network create oam -docker network create smo - -cd ${SHELL_FOLDER}/../config/pms/ -cp application_configuration.json.sdnc application_configuration.json - -cd ${SHELL_FOLDER}/../ -docker-compose -f docker-compose.yml up -d - -checkStatus(){ - for i in {1..60}; 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:8091/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 -./prepareIcsData.sh