From aaa37ddd8787cf1c73fc245b91d0921f940045da Mon Sep 17 00:00:00 2001
From: JorgeEcheva26 <jorge.echevarriauribarri.practicas@telefonica.com>
Date: Tue, 14 Jan 2025 13:49:24 +0100
Subject: [PATCH] simpificacion de event req
---
config/capif_sdk_config.json | 22 +--------------------
opencapif_sdk/capif_event_feature.py | 25 ++----------------------
opencapif_sdk/capif_invoker_connector.py | 4 ++++
3 files changed, 7 insertions(+), 44 deletions(-)
diff --git a/config/capif_sdk_config.json b/config/capif_sdk_config.json
index 6feb89b..b728c1a 100644
--- a/config/capif_sdk_config.json
+++ b/config/capif_sdk_config.json
@@ -53,27 +53,7 @@
]
}
],
- "eventReq":{
- "immRep": true,
- "notifMethod": "string",
- "maxReportNbr": 5,
- "monDur": "DATE-time",
- "repPeriod": 5,
- "sampRatio": "integer from 1 to 100",
- "partitionCriteria": [
- "TAC"
- ],
- "grpRepTime": 3,
- "notifFlag": "ACTIVATE",
- "notifFlagInstruct": {
- "bufferedNotifs":"SEND_ALL",
- "subscription":"CLOSE"
- },
- "mutingSetting": {
- "maxNoOfNotif":5,
- "durationBufferedNotif":5
- }
- },
+ "eventReq":"string",
"requestTestNotification": true,
"websockNotifConfig": {
"websocketUri":"",
diff --git a/opencapif_sdk/capif_event_feature.py b/opencapif_sdk/capif_event_feature.py
index 5e640a1..3300d63 100644
--- a/opencapif_sdk/capif_event_feature.py
+++ b/opencapif_sdk/capif_event_feature.py
@@ -49,29 +49,8 @@ class capif_invoker_event_feature(capif_invoker_connector):
path = self.capif_https_url + f"/{subscriberId}/subscriptions"
- payload = {
- "events": [
- "SERVICE_API_AVAILABLE",
- "string"
- ],
- "eventFilters": [
- {
- "apiIds": [
- "string"
- ],
- "apiInvokerIds": [
- "string"
- ],
- "aefIds": [
- "string"
- ]
- }
- ],
- "eventReq": "string",
- "notificationDestination": f"{self.capif_callback_url}",
- "requestTestNotification": true,
- "websockNotifConfig": "string",
- }
+ payload = self.events_config
+
try:
diff --git a/opencapif_sdk/capif_invoker_connector.py b/opencapif_sdk/capif_invoker_connector.py
index 6a159f1..678afbe 100644
--- a/opencapif_sdk/capif_invoker_connector.py
+++ b/opencapif_sdk/capif_invoker_connector.py
@@ -99,6 +99,10 @@ class capif_invoker_connector:
csr_country_name = os.getenv('INVOKER_CSR_COUNTRY_NAME', csr_config.get('csr_country_name', '')).strip()
csr_email_address = os.getenv('INVOKER_CSR_EMAIL_ADDRESS', csr_config.get('csr_email_address', '')).strip()
+ # Events configuration
+ events_config = invoker_config.get('events', {})
+ self.events_config = events_config
+
# Define the invoker folder path and create it if it doesn't exist
self.invoker_folder = os.path.join(invoker_general_folder, capif_username)
os.makedirs(self.invoker_folder, exist_ok=True)
--
GitLab