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 5c02fe58539b46b2334e8d3a5ec8e1a532832792..865bd2db0c09bf47b3f89787aa86d60a8f1ea094 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 8bd6c8422e91e8608f8444dbdb88c2f25dcecdee..3750e497c8f7fd5ee98481c3a4639dac0dea95d3 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 0000000000000000000000000000000000000000..ca5a37baacf79a8cb55728d3501e5603893898a3 --- /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 609f97d2665be860a81101df021511142c67bb6b..688961cd74c83233c3f2068aa52bacb71292624b 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 3f5f67d738b215b734d6d55b5581bcc90a5794b3..52619f02888457ecbc1f590c3e314e090bd66247 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 8052c29ec5b53eb3619e3199d4c97d389ec96456..c97b717f39a898dfdefd2c2e5ab99453d0b6cd33 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 0084ada20d437fec69916cd961f982e10f8cde33..569e4c35e0364b9279356b5df8fbbee7caed785f 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 be1b0eeee894f377e7c6809897b08467dd407555..e2e92ffb7756132675a03a7077229a853d4749bb 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 5c639fdc339b5b22b583ed32ad18d18dd1a78ad0..a893af5afc9fec51a9b1d8f70f6cf77dc8875cee 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 4a676e157718eb9ba070b698bd2ab1d155759bba..36341a798a5b7c2af64392505400981c94c99553 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 32875c5697845f81d49bae9e5fce2baca3a06ead..5013f3b650c4db8e91d7e5a18799a9eaba2b27a6 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 467ea7f4a2f77bb55c6603ff805bcc22d197c522..221dbd0fd9529daff84933a582ea2c11b6448e58 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 12f0d29a3a2c2f13d1e52b6b52dc51e7ce32547a..8d3234053a5dcb849e08e958e817cbd45d883d87 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 7020f799b370f81d2ab025f5a857449a6711bcf8..0487774d28cc89a5a7eb275cda76ed1ecee24913 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 719ecdad6b726c1aa2008b042f9f1cc579a29d23..bb76152eb13a0720e3e92a1de6b08a7efb862d1e 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 e86b8610df052f2a566fca449ab8f712583bc608..1103e645779d09958ad7e0b89afd63cd7b4f764d 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 5c14ff4e4eda3da89bdb8b775b471005cc98b16f..0000000000000000000000000000000000000000 --- 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 d7e9e6fdee199b339faf17d3116260647469119d..143558a062a5ad51983b22f43a89727f847a7e2c 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"