From 18142b1ab449223f4ccf7fc993bb26779fa5ef2e Mon Sep 17 00:00:00 2001 From: dfragkos <43905384+JFrgs@users.noreply.github.com> Date: Fri, 4 Feb 2022 15:34:29 +0200 Subject: [PATCH 1/6] Update test_description.md Update test_description.md --- .../MonitoringEvent API/test_description.md | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/test_plan/MonitoringEvent API/test_description.md b/docs/test_plan/MonitoringEvent API/test_description.md index e9232f97..51ee97ab 100644 --- a/docs/test_plan/MonitoringEvent API/test_description.md +++ b/docs/test_plan/MonitoringEvent API/test_description.md @@ -39,14 +39,14 @@ This test case will check that the NetApp creates a subscription successfully to * Actions: 1. Netapp subscribes to Monitoring Event API with an HTTP POST request for a registered UE - 2. Endpoint: **{apiroot}/nef/api/v1/3gpp-monitoring-event/{scsAsId}/subscriptions** + 2. Endpoint: **{apiroot}/nef/api/v1/3gpp-monitoring-event/v1/{scsAsId}/subscriptions** 3. Request Body: [request body] * Post-Conditions: 1. 201 Created response 2. Response body: [response body] 3. The URI of the created resource is returned in the 'Location' HTTP header according to the structure: -**{apiRoot}/nef/api/v1/3gpp-monitoring-event/{scsAsId}/subscriptions/{subscriptionId}** +**{apiRoot}/nef/api/v1/3gpp-monitoring-event/v1/{scsAsId}/subscriptions/{subscriptionId}** ## βœ” Test Case 2: One-time request to the Monitoring Event API by Authorized NetApp @@ -59,7 +59,7 @@ This test case will check that the NetApp sends an one-time response request to * Actions: 1. Netapp sends an HTTP POST request to Monitoring Event API - 2. Endpoint: **{apiroot}/nef/api/v1/3gpp-monitoring-event/{scsAsId}/subscriptions** + 2. Endpoint: **{apiroot}/nef/api/v1/3gpp-monitoring-event/v1/{scsAsId}/subscriptions** 3. Request Body: [one time request body] * Post-Conditions: @@ -78,7 +78,7 @@ This test case will check that whether the NetApp tries to subscribe to the Moni * Actions: 1. Netapp subscribes to Monitoring Event API with an HTTP POST request for a registered UE - 2. Endpoint: **{apiroot}/nef/api/v1/3gpp-monitoring-event/{scsAsId}/subscriptions** + 2. Endpoint: **{apiroot}/nef/api/v1/3gpp-monitoring-event/v1/{scsAsId}/subscriptions** 3. Request Body: [request body] * Post-Conditions: @@ -93,7 +93,7 @@ This test case will check that an unauthorised NetApp cannot create a subscripti * Actions: 1. Netapp subscribes to Monitoring Event API with an HTTP POST request - 2. Endpoint: **{apiroot}/nef/api/v1/3gpp-monitoring-event/{scsAsId}/subscriptions** + 2. Endpoint: **{apiroot}/nef/api/v1/3gpp-monitoring-event/v1/{scsAsId}/subscriptions** 3. Request Body: [request body] * Post-Conditions: @@ -109,7 +109,7 @@ This test case will check if the active subscriptions are retrieved successfully * Actions: 1. Netapp sends an HTTP GET request to Monitoring Event API - 2. Endpoint: **{apiroot}/nef/api/v1/3gpp-monitoring-event/{scsAsId}/subscriptions** + 2. Endpoint: **{apiroot}/nef/api/v1/3gpp-monitoring-event/v1/{scsAsId}/subscriptions** * Post-Conditions: 1. 200 OK response @@ -127,7 +127,7 @@ This test case will check if there are no active subscription to be retrieved by * Actions: 1. Netapp sends an HTTP GET request to Monitoring Event API - 2. Endpoint: **{apiroot}/nef/api/v1/3gpp-monitoring-event/{scsAsId}/subscriptions** + 2. Endpoint: **{apiroot}/nef/api/v1/3gpp-monitoring-event/v1/{scsAsId}/subscriptions** * Post-Conditions: 1. 204 No Content @@ -143,7 +143,7 @@ This test case will check if the individual subscription by the NetApp from Moni * Actions: 1. Netapp sends an HTTP GET request to Monitoring Event API 2. Netapp provides in the request the path parameter {subscriptionid}, which initially retrieved in the creation of the subscription - 3. Endpoint: **{apiroot}/nef/api/v1/3gpp-monitoring-event/{scsAsId}/subscriptions/{subscriptionid}** + 3. Endpoint: **{apiroot}/nef/api/v1/3gpp-monitoring-event/v1/{scsAsId}/subscriptions/{subscriptionid}** * Post-Conditions: 1. 200 OK response @@ -159,7 +159,7 @@ This test case will check if the individual subscription retrieved by the NetApp * Actions: 1. Netapp sends an HTTP GET request to Monitoring Event API 2. Netapp provides in the request the path parameter {subscriptionid} - 3. Endpoint: **{apiroot}/nef/api/v1/3gpp-monitoring-event/{scsAsId}/subscriptions/{subscriptionid}** + 3. Endpoint: **{apiroot}/nef/api/v1/3gpp-monitoring-event/v1/{scsAsId}/subscriptions/{subscriptionid}** * Post-Conditions: 1. 404 Not Found @@ -173,7 +173,7 @@ This test case will check that an unauthorised NetApp cannot retrieve all active * Actions: 1. Netapp sends an HTTP GET request to Monitoring Event API - 2. Endpoint: **{apiroot}/nef/api/v1/3gpp-monitoring-event/{scsAsId}/subscriptions** + 2. Endpoint: **{apiroot}/nef/api/v1/3gpp-monitoring-event/v1/{scsAsId}/subscriptions** * Post-Conditions: 1. 401 Unauthorized @@ -188,7 +188,7 @@ This test case will check that an unauthorised NetApp cannot retrieve an individ * Actions: 1. Netapp sends an HTTP GET request to Monitoring Event API 2. Netapp provides in the request the path parameter {subscriptionid} - 3. Endpoint: **{apiroot}/nef/api/v1/3gpp-monitoring-event/{scsAsId}/subscriptions/{subscriptionid}** + 3. Endpoint: **{apiroot}/nef/api/v1/3gpp-monitoring-event/v1/{scsAsId}/subscriptions/{subscriptionid}** * Post-Conditions: 1. 401 Unauthorized @@ -204,7 +204,7 @@ This test case will check if the individual subscription by the NetApp from Moni * Actions: 1. Netapp sends an HTTP PUT request to Monitoring Event API 2. Netapp provides in the request the path parameter {subscriptionid}, which initially retrieved in the creation of the subscription - 3. Endpoint: **{apiroot}/nef/api/v1/3gpp-monitoring-event/{scsAsId}/subscriptions/{subscriptionid}** + 3. Endpoint: **{apiroot}/nef/api/v1/3gpp-monitoring-event/v1/{scsAsId}/subscriptions/{subscriptionid}** 4. Request body: [request body] * Post-Conditions: @@ -222,7 +222,7 @@ This test case will check if the individual subscription that the NetApp tries t * Actions: 1. Netapp sends an HTTP PUT request to Monitoring Event API 2. Netapp provides in the request the path parameter {subscriptionid} - 3. Endpoint: **{apiroot}/nef/api/v1/3gpp-monitoring-event/{scsAsId}/subscriptions/{subscriptionid}** + 3. Endpoint: **{apiroot}/nef/api/v1/3gpp-monitoring-event/v1/{scsAsId}/subscriptions/{subscriptionid}** 4. Request body: [request body] * Post-Conditions: @@ -238,7 +238,7 @@ This test case will check that an unauthorised NetApp cannot update an individua * Actions: 1. Netapp sends an HTTP PUT request to Monitoring Event API 2. Netapp provides in the request the path parameter {subscriptionid} - 3. Endpoint: **{apiroot}/nef/api/v1/3gpp-monitoring-event/{scsAsId}/subscriptions/{subscriptionid}** + 3. Endpoint: **{apiroot}/nef/api/v1/3gpp-monitoring-event/v1/{scsAsId}/subscriptions/{subscriptionid}** 4. Request body: [request body] * Post-Conditions: @@ -255,7 +255,7 @@ This test case will check if the individual subscription by the NetApp from Moni * Actions: 1. Netapp sends an HTTP DELETE request to Monitoring Event API 2. Netapp provides in the request the path parameter {subscriptionid}, which initially retrieved in the creation of the subscription - 3. Endpoint: **{apiroot}/nef/api/v1/3gpp-monitoring-event/{scsAsId}/subscriptions/{subscriptionid}** + 3. Endpoint: **{apiroot}/nef/api/v1/3gpp-monitoring-event/v1/{scsAsId}/subscriptions/{subscriptionid}** * Post-Conditions: 1. 200 OK response @@ -272,7 +272,7 @@ This test case will check if the individual subscription that the NetApp tries t * Actions: 1. Netapp sends an HTTP DELETE request to Monitoring Event API 2. Netapp provides in the request the path parameter {subscriptionid} - 3. Endpoint: **{apiroot}/nef/api/v1/3gpp-monitoring-event/{scsAsId}/subscriptions/{subscriptionid}** + 3. Endpoint: **{apiroot}/nef/api/v1/3gpp-monitoring-event/v1/{scsAsId}/subscriptions/{subscriptionid}** * Post-Conditions: 1. 404 Not Found @@ -287,7 +287,7 @@ This test case will check that an unauthorised NetApp cannot retrieve an individ * Actions: 1. Netapp sends an HTTP DELETE request to Monitoring Event API 2. Netapp provides in the request the path parameter {subscriptionid} - 3. Endpoint: **{apiroot}/nef/api/v1/3gpp-monitoring-event/{scsAsId}/subscriptions/{subscriptionid}** + 3. Endpoint: **{apiroot}/nef/api/v1/3gpp-monitoring-event/v1/{scsAsId}/subscriptions/{subscriptionid}** * Post-Conditions: 1. 401 Unauthorized From e73b78fa2fa3e6ed4e8103ecf00d4337ceb08e97 Mon Sep 17 00:00:00 2001 From: dfragkos <43905384+JFrgs@users.noreply.github.com> Date: Wed, 15 Feb 2023 23:18:42 +0200 Subject: [PATCH 2/6] Update CHANGELOG.md --- CHANGELOG.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1123f227..3f1d31c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,29 @@ # Changelog +## v1.6.2 + +### NEF APIs / backend + +- Create environment variable for MongoClient host πŸ‘‰ ```MONGO_CLIENT``` +- Add publish service from evolved5g library to publish the service APIs into CAPIF +- Add service description `json` files to support the publish service +- Fix LOCATION_REPORTING one time requests bug (commit e27c82470a51faa4e0ebebf7dd28207993779e02) + +### Docker 🐳 + +- Change mongo service in docker-compose πŸ‘‰mongo_nef +- Create env variables for CAPIF hostname πŸ‘‰`CAPIF_HOST` +- Create env variables for CAPIF ports πŸ‘‰`CAPIF_HTTP_PORT` `CAPIF_HTTP_PORT` + +### Libraries + +- πŸͺ› Fix python version incompatibility between docker-image and poetry (from `3.9.7` πŸ‘‰ `^3.9.7`) + +### Other + + - βœ” Add /app/app/core/certificates folder to save certificates from CAPIF locally + - βœ” Creation of Test descriptions for UE_REACHABILITY and LOSS_OF_CONNECTIVITY events on Monitoring Event API /docs/test_plan +- πŸͺ› Fix python `make db-reset` command + ## v1.6.1 ### UI changes From d1b6605573612b2b86c81a6d7c0c9afd1ef40238 Mon Sep 17 00:00:00 2001 From: dfragkos <43905384+JFrgs@users.noreply.github.com> Date: Thu, 16 Feb 2023 00:19:08 +0200 Subject: [PATCH 3/6] Update CHANGELOG.md --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f1d31c7..2f40fb48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,6 @@ ### NEF APIs / backend -- Create environment variable for MongoClient host πŸ‘‰ ```MONGO_CLIENT``` - Add publish service from evolved5g library to publish the service APIs into CAPIF - Add service description `json` files to support the publish service - Fix LOCATION_REPORTING one time requests bug (commit e27c82470a51faa4e0ebebf7dd28207993779e02) From 331c7747bb7e95e47863a2b686a6336aed026c50 Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Mon, 24 Apr 2023 11:49:20 +0200 Subject: [PATCH 4/6] Removed space before SUBSCRIBE_NOTIFY at service_as_session_with_qos.json and service_monitoring_event.json --- .../app/app/core/capif_files/service_as_session_with_qos.json | 4 ++-- .../app/app/core/capif_files/service_monitoring_event.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/app/app/core/capif_files/service_as_session_with_qos.json b/backend/app/app/core/capif_files/service_as_session_with_qos.json index 9017f453..b69fda6d 100644 --- a/backend/app/app/core/capif_files/service_as_session_with_qos.json +++ b/backend/app/app/core/capif_files/service_as_session_with_qos.json @@ -10,7 +10,7 @@ "resources": [ { "resourceName": "QOS_SUBSCRIPTIONS", - "commType": " SUBSCRIBE_NOTIFY", + "commType": "SUBSCRIBE_NOTIFY", "uri": "/{scsAsId}/subscriptions", "custOpName": "http_post", "operations": ["GET","POST"], @@ -18,7 +18,7 @@ }, { "resourceName": "QOS_SUBSCRIPTION_SINGLE", - "commType": " SUBSCRIBE_NOTIFY", + "commType": "SUBSCRIBE_NOTIFY", "uri": "/{scsAsId}/subscriptions/{subscriptionId}", "custOpName": "http_get", "operations": ["GET","PUT","DELETE"], diff --git a/backend/app/app/core/capif_files/service_monitoring_event.json b/backend/app/app/core/capif_files/service_monitoring_event.json index 4b79ac37..36d8a97b 100644 --- a/backend/app/app/core/capif_files/service_monitoring_event.json +++ b/backend/app/app/core/capif_files/service_monitoring_event.json @@ -10,7 +10,7 @@ "resources": [ { "resourceName": "MONITORING_SUBSCRIPTIONS", - "commType": " SUBSCRIBE_NOTIFY", + "commType": "SUBSCRIBE_NOTIFY", "uri": "/{scsAsId}/subscriptions", "custOpName": "http_post", "operations": ["GET","POST"], @@ -18,7 +18,7 @@ }, { "resourceName": "MONITORING_SUBSCRIPTION_SINGLE", - "commType": " SUBSCRIBE_NOTIFY", + "commType": "SUBSCRIBE_NOTIFY", "uri": "/{scsAsId}/subscriptions/{subscriptionId}", "custOpName": "http_get", "operations": ["GET","PUT","DELETE"], From eebe1b44c93f96b0f96f439354a0b77711e65a60 Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Mon, 24 Apr 2023 16:13:55 +0200 Subject: [PATCH 5/6] change {} to example value in order to accomplish rfc3981 format --- .../app/app/core/capif_files/service_as_session_with_qos.json | 4 ++-- .../app/app/core/capif_files/service_monitoring_event.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/app/app/core/capif_files/service_as_session_with_qos.json b/backend/app/app/core/capif_files/service_as_session_with_qos.json index b69fda6d..a76b3da3 100644 --- a/backend/app/app/core/capif_files/service_as_session_with_qos.json +++ b/backend/app/app/core/capif_files/service_as_session_with_qos.json @@ -11,7 +11,7 @@ { "resourceName": "QOS_SUBSCRIPTIONS", "commType": "SUBSCRIBE_NOTIFY", - "uri": "/{scsAsId}/subscriptions", + "uri": "/scsAsId001/subscriptions", "custOpName": "http_post", "operations": ["GET","POST"], "description": "Endpoint to manage monitoring subscriptions" @@ -19,7 +19,7 @@ { "resourceName": "QOS_SUBSCRIPTION_SINGLE", "commType": "SUBSCRIBE_NOTIFY", - "uri": "/{scsAsId}/subscriptions/{subscriptionId}", + "uri": "/scsAsId001/subscriptions/subscriptionId001", "custOpName": "http_get", "operations": ["GET","PUT","DELETE"], "description": "Endpoint to manage single subscription" diff --git a/backend/app/app/core/capif_files/service_monitoring_event.json b/backend/app/app/core/capif_files/service_monitoring_event.json index 36d8a97b..ae6cebf0 100644 --- a/backend/app/app/core/capif_files/service_monitoring_event.json +++ b/backend/app/app/core/capif_files/service_monitoring_event.json @@ -11,7 +11,7 @@ { "resourceName": "MONITORING_SUBSCRIPTIONS", "commType": "SUBSCRIBE_NOTIFY", - "uri": "/{scsAsId}/subscriptions", + "uri": "/scsAsId001/subscriptions", "custOpName": "http_post", "operations": ["GET","POST"], "description": "Endpoint to manage monitoring subscriptions" @@ -19,7 +19,7 @@ { "resourceName": "MONITORING_SUBSCRIPTION_SINGLE", "commType": "SUBSCRIBE_NOTIFY", - "uri": "/{scsAsId}/subscriptions/{subscriptionId}", + "uri": "/scsAsId001/subscriptions/subscriptionId001", "custOpName": "http_get", "operations": ["GET","PUT","DELETE"], "description": "Endpoint to manage single subscription" From 3db40837004775438be3c9cb80bfb493f8a5d33d Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Mon, 24 Apr 2023 17:41:41 +0200 Subject: [PATCH 6/6] Fix enum value --- .../app/app/core/capif_files/service_as_session_with_qos.json | 4 ++-- .../app/app/core/capif_files/service_monitoring_event.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/app/app/core/capif_files/service_as_session_with_qos.json b/backend/app/app/core/capif_files/service_as_session_with_qos.json index a76b3da3..fac360f1 100644 --- a/backend/app/app/core/capif_files/service_as_session_with_qos.json +++ b/backend/app/app/core/capif_files/service_as_session_with_qos.json @@ -39,12 +39,12 @@ ], "protocol": "HTTP_1_1", "dataFormat": "JSON", - "securityMethods": ["Oauth", "PSK"], + "securityMethods": ["OAUTH", "PSK"], "interfaceDescriptions": [ { "ipv4Addr": "127.0.0.1", "port": 8888, - "securityMethods": ["Oauth"] + "securityMethods": ["OAUTH"] } ] } diff --git a/backend/app/app/core/capif_files/service_monitoring_event.json b/backend/app/app/core/capif_files/service_monitoring_event.json index ae6cebf0..2524925d 100644 --- a/backend/app/app/core/capif_files/service_monitoring_event.json +++ b/backend/app/app/core/capif_files/service_monitoring_event.json @@ -39,12 +39,12 @@ ], "protocol": "HTTP_1_1", "dataFormat": "JSON", - "securityMethods": ["Oauth", "PSK"], + "securityMethods": ["OAUTH", "PSK"], "interfaceDescriptions": [ { "ipv4Addr": "127.0.0.1", "port": 8888, - "securityMethods": ["Oauth"] + "securityMethods": ["OAUTH"] } ] }