From de206fa9a1de57101f8dfd85c534d3c320c2293c Mon Sep 17 00:00:00 2001
From: JorgeEcheva26 <jorge.echevarriauribarri.practicas@telefonica.es>
Date: Fri, 8 Nov 2024 12:33:03 +0100
Subject: [PATCH] refactorization
modificados: network_app_samples/network_app_invoker_sample/network_app_invoker.py
modificados: network_app_samples/network_app_provider_sample/network_app_provider.py
nuevos archivos: opencapif_sdk/__init__.py
renombrados: sdk/api_schema_translator.py -> opencapif_sdk/api_schema_translator.py
renombrados: sdk/capif_invoker_connector.py -> opencapif_sdk/capif_invoker_connector.py
renombrados: sdk/capif_provider_connector.py -> opencapif_sdk/capif_provider_connector.py
renombrados: sdk/service_discoverer.py -> opencapif_sdk/service_discoverer.py
modificados: scripts/invoker_capif_connector.py
modificados: scripts/invoker_capif_connector_offboarding.py
modificados: scripts/invoker_capif_connector_update.py
modificados: scripts/invoker_service_discovery.py
modificados: scripts/invoker_service_get_token.py
modificados: scripts/provider_capif_connector.py
modificados: scripts/provider_capif_connector_offboarding.py
modificados: scripts/provider_capif_connector_update.py
modificados: scripts/provider_get_all_published_api.py
modificados: scripts/provider_get_published_api.py
modificados: scripts/provider_publish_api.py
modificados: scripts/provider_unpublish_api.py
modificados: scripts/provider_update_api.py
borrados: sdk/__init__.py
modificados: test/test.py
---
.../network_app_invoker_sample/network_app_invoker.py | 2 +-
.../network_app_provider_sample/network_app_provider.py | 2 +-
opencapif_sdk/__init__.py | 4 ++++
{sdk => opencapif_sdk}/api_schema_translator.py | 0
{sdk => opencapif_sdk}/capif_invoker_connector.py | 0
{sdk => opencapif_sdk}/capif_provider_connector.py | 0
{sdk => opencapif_sdk}/service_discoverer.py | 0
scripts/invoker_capif_connector.py | 2 +-
scripts/invoker_capif_connector_offboarding.py | 2 +-
scripts/invoker_capif_connector_update.py | 2 +-
scripts/invoker_service_discovery.py | 2 +-
scripts/invoker_service_get_token.py | 2 +-
scripts/provider_capif_connector.py | 2 +-
scripts/provider_capif_connector_offboarding.py | 2 +-
scripts/provider_capif_connector_update.py | 2 +-
scripts/provider_get_all_published_api.py | 2 +-
scripts/provider_get_published_api.py | 2 +-
scripts/provider_publish_api.py | 2 +-
scripts/provider_unpublish_api.py | 2 +-
scripts/provider_update_api.py | 2 +-
sdk/__init__.py | 4 ----
test/test.py | 2 +-
22 files changed, 20 insertions(+), 20 deletions(-)
create mode 100644 opencapif_sdk/__init__.py
rename {sdk => opencapif_sdk}/api_schema_translator.py (100%)
rename {sdk => opencapif_sdk}/capif_invoker_connector.py (100%)
rename {sdk => opencapif_sdk}/capif_provider_connector.py (100%)
rename {sdk => opencapif_sdk}/service_discoverer.py (100%)
delete mode 100644 sdk/__init__.py
diff --git a/network_app_samples/network_app_invoker_sample/network_app_invoker.py b/network_app_samples/network_app_invoker_sample/network_app_invoker.py
index 5c02fe5..865bd2d 100644
--- a/network_app_samples/network_app_invoker_sample/network_app_invoker.py
+++ b/network_app_samples/network_app_invoker_sample/network_app_invoker.py
@@ -1,7 +1,7 @@
import json
import time
import requests
-from sdk import capif_invoker_connector, service_discoverer
+from opencapif_sdk import capif_invoker_connector, service_discoverer
# Path to the OpenCAPIF SDK configuration file
capif_sdk_config_path = "./capif_sdk_config_sample.json"
diff --git a/network_app_samples/network_app_provider_sample/network_app_provider.py b/network_app_samples/network_app_provider_sample/network_app_provider.py
index 8bd6c84..3750e49 100644
--- a/network_app_samples/network_app_provider_sample/network_app_provider.py
+++ b/network_app_samples/network_app_provider_sample/network_app_provider.py
@@ -1,5 +1,5 @@
import threading
-from sdk import capif_provider_connector
+from opencapif_sdk import capif_provider_connector
from OpenSSL import crypto
from flask_jwt_extended import jwt_required, JWTManager
from flask import Flask, jsonify, request, redirect
diff --git a/opencapif_sdk/__init__.py b/opencapif_sdk/__init__.py
new file mode 100644
index 0000000..ca5a37b
--- /dev/null
+++ b/opencapif_sdk/__init__.py
@@ -0,0 +1,4 @@
+from opencapif_sdk.capif_invoker_connector import capif_invoker_connector
+from opencapif_sdk.capif_provider_connector import capif_provider_connector
+from opencapif_sdk.service_discoverer import service_discoverer
+from opencapif_sdk.api_schema_translator import api_schema_translator
\ No newline at end of file
diff --git a/sdk/api_schema_translator.py b/opencapif_sdk/api_schema_translator.py
similarity index 100%
rename from sdk/api_schema_translator.py
rename to opencapif_sdk/api_schema_translator.py
diff --git a/sdk/capif_invoker_connector.py b/opencapif_sdk/capif_invoker_connector.py
similarity index 100%
rename from sdk/capif_invoker_connector.py
rename to opencapif_sdk/capif_invoker_connector.py
diff --git a/sdk/capif_provider_connector.py b/opencapif_sdk/capif_provider_connector.py
similarity index 100%
rename from sdk/capif_provider_connector.py
rename to opencapif_sdk/capif_provider_connector.py
diff --git a/sdk/service_discoverer.py b/opencapif_sdk/service_discoverer.py
similarity index 100%
rename from sdk/service_discoverer.py
rename to opencapif_sdk/service_discoverer.py
diff --git a/scripts/invoker_capif_connector.py b/scripts/invoker_capif_connector.py
index 609f97d..688961c 100755
--- a/scripts/invoker_capif_connector.py
+++ b/scripts/invoker_capif_connector.py
@@ -1,7 +1,7 @@
import sys
import os
import utilities
-from sdk import capif_invoker_connector
+from opencapif_sdk import capif_invoker_connector
def showcase_capif_connector():
"""
diff --git a/scripts/invoker_capif_connector_offboarding.py b/scripts/invoker_capif_connector_offboarding.py
index 3f5f67d..52619f0 100755
--- a/scripts/invoker_capif_connector_offboarding.py
+++ b/scripts/invoker_capif_connector_offboarding.py
@@ -1,7 +1,7 @@
import sys
import os
import utilities
-from sdk import capif_invoker_connector
+from opencapif_sdk import capif_invoker_connector
def showcase_offboard_and_deregister_invoker():
capif_connector = capif_invoker_connector(config_file=utilities.get_config_file())
diff --git a/scripts/invoker_capif_connector_update.py b/scripts/invoker_capif_connector_update.py
index 8052c29..c97b717 100644
--- a/scripts/invoker_capif_connector_update.py
+++ b/scripts/invoker_capif_connector_update.py
@@ -1,7 +1,7 @@
import sys
import os
import utilities
-from sdk import capif_invoker_connector
+from opencapif_sdk import capif_invoker_connector
def showcase_capif_connector():
"""
diff --git a/scripts/invoker_service_discovery.py b/scripts/invoker_service_discovery.py
index 0084ada..569e4c3 100755
--- a/scripts/invoker_service_discovery.py
+++ b/scripts/invoker_service_discovery.py
@@ -1,5 +1,5 @@
import utilities
-from sdk import service_discoverer
+from opencapif_sdk import service_discoverer
def showcase_access_token_retrieval_from_capif():
service_discoverer = service_discoverer(config_file=utilities.get_config_file())
service_discoverer.discover()
diff --git a/scripts/invoker_service_get_token.py b/scripts/invoker_service_get_token.py
index be1b0ee..e2e92ff 100755
--- a/scripts/invoker_service_get_token.py
+++ b/scripts/invoker_service_get_token.py
@@ -1,5 +1,5 @@
import utilities
-from sdk import service_discoverer
+from opencapif_sdk import service_discoverer
def showcase_access_token_retrieval_from_capif():
service_discoverer = service_discoverer(config_file=utilities.get_config_file())
service_discoverer.get_tokens()
diff --git a/scripts/provider_capif_connector.py b/scripts/provider_capif_connector.py
index 5c639fd..a893af5 100755
--- a/scripts/provider_capif_connector.py
+++ b/scripts/provider_capif_connector.py
@@ -1,5 +1,5 @@
import utilities
-from sdk import capif_provider_connector
+from opencapif_sdk import capif_provider_connector
# Now import the classes from your sdk.py file
diff --git a/scripts/provider_capif_connector_offboarding.py b/scripts/provider_capif_connector_offboarding.py
index 4a676e1..36341a7 100755
--- a/scripts/provider_capif_connector_offboarding.py
+++ b/scripts/provider_capif_connector_offboarding.py
@@ -1,5 +1,5 @@
import utilities
-from sdk import capif_provider_connector
+from opencapif_sdk import capif_provider_connector
def offboard_capif_nef_connector():
capif_connector = capif_provider_connector(config_file=utilities.get_config_file())
diff --git a/scripts/provider_capif_connector_update.py b/scripts/provider_capif_connector_update.py
index 32875c5..5013f3b 100644
--- a/scripts/provider_capif_connector_update.py
+++ b/scripts/provider_capif_connector_update.py
@@ -1,5 +1,5 @@
import utilities
-from sdk import capif_provider_connector
+from opencapif_sdk import capif_provider_connector
def showcase_capif_nef_connector():
"""
diff --git a/scripts/provider_get_all_published_api.py b/scripts/provider_get_all_published_api.py
index 467ea7f..221dbd0 100644
--- a/scripts/provider_get_all_published_api.py
+++ b/scripts/provider_get_all_published_api.py
@@ -1,5 +1,5 @@
import utilities
-from sdk import capif_provider_connector
+from opencapif_sdk import capif_provider_connector
def showcase_capif_nef_connector():
"""
diff --git a/scripts/provider_get_published_api.py b/scripts/provider_get_published_api.py
index 12f0d29..8d32340 100644
--- a/scripts/provider_get_published_api.py
+++ b/scripts/provider_get_published_api.py
@@ -1,5 +1,5 @@
import utilities
-from sdk import capif_provider_connector
+from opencapif_sdk import capif_provider_connector
def showcase_capif_nef_connector():
"""
diff --git a/scripts/provider_publish_api.py b/scripts/provider_publish_api.py
index 7020f79..0487774 100644
--- a/scripts/provider_publish_api.py
+++ b/scripts/provider_publish_api.py
@@ -1,5 +1,5 @@
import utilities
-from sdk import capif_provider_connector
+from opencapif_sdk import capif_provider_connector
def showcase_capif_nef_connector():
"""
diff --git a/scripts/provider_unpublish_api.py b/scripts/provider_unpublish_api.py
index 719ecda..bb76152 100644
--- a/scripts/provider_unpublish_api.py
+++ b/scripts/provider_unpublish_api.py
@@ -1,5 +1,5 @@
import utilities
-from sdk import capif_provider_connector
+from opencapif_sdk import capif_provider_connector
def showcase_capif_nef_connector():
"""
diff --git a/scripts/provider_update_api.py b/scripts/provider_update_api.py
index e86b861..1103e64 100644
--- a/scripts/provider_update_api.py
+++ b/scripts/provider_update_api.py
@@ -1,5 +1,5 @@
import utilities
-from sdk import capif_provider_connector
+from opencapif_sdk import capif_provider_connector
def showcase_capif_nef_connector():
"""
diff --git a/sdk/__init__.py b/sdk/__init__.py
deleted file mode 100644
index 5c14ff4..0000000
--- a/sdk/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from sdk.capif_invoker_connector import capif_invoker_connector
-from sdk.capif_provider_connector import capif_provider_connector
-from sdk.service_discoverer import service_discoverer
-from sdk.api_schema_translator import api_schema_translator
diff --git a/test/test.py b/test/test.py
index d7e9e6f..143558a 100644
--- a/test/test.py
+++ b/test/test.py
@@ -2,7 +2,7 @@
import json
# flake8: noqa
-from sdk import capif_invoker_connector, capif_provider_connector, service_discoverer
+from opencapif_sdk import capif_invoker_connector, capif_provider_connector, service_discoverer
capif_sdk_config_path = "./capif_sdk_config_sample_test.json"
--
GitLab