From 6f70628b52454d53404dd1b4e0af207dc13e1d45 Mon Sep 17 00:00:00 2001
From: JorgeEcheva26 <jorge.echevarriauribarri.practicas@telefonica.es>
Date: Tue, 5 Nov 2024 12:55:38 +0100
Subject: [PATCH] scripts and network apps modified

---
 .../network_app_invoker_sample/network_app_invoker.py  |  9 ---------
 scripts/invoker_capif_connector.py                     |  5 -----
 scripts/invoker_capif_connector_offboarding.py         |  5 -----
 scripts/invoker_capif_connector_update.py              |  5 -----
 scripts/invoker_service_discovery.py                   | 10 ----------
 scripts/invoker_service_get_token.py                   | 10 ----------
 scripts/provider_capif_connector.py                    |  7 -------
 scripts/provider_capif_connector_offboarding.py        |  7 -------
 scripts/provider_capif_connector_update.py             | 10 +---------
 scripts/provider_get_all_published_api.py              |  9 ---------
 scripts/provider_get_published_api.py                  | 10 ----------
 scripts/provider_publish_api.py                        | 10 ----------
 scripts/provider_unpublish_api.py                      |  8 --------
 scripts/provider_update_api.py                         | 10 ----------
 14 files changed, 1 insertion(+), 114 deletions(-)

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 70ea86b..60dbf87 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,15 +1,6 @@
 import json
-import sys
-import os
 import time
 import requests
-
-# Add the SDK directory to PYTHONPATH using a relative path
-script_dir = os.path.dirname(os.path.abspath(__file__))  # Current script directory
-sdk_path = os.path.join(script_dir, '..', '..', 'sdk')  # Go up two levels and point to 'sdk'
-sys.path.insert(0, sdk_path)
-
-# Import necessary classes from the SDK
 from sdk import capif_invoker_connector, service_discoverer
 
 # Path to the OpenCAPIF SDK configuration file
diff --git a/scripts/invoker_capif_connector.py b/scripts/invoker_capif_connector.py
index bcac3b5..609f97d 100755
--- a/scripts/invoker_capif_connector.py
+++ b/scripts/invoker_capif_connector.py
@@ -1,11 +1,6 @@
 import sys
 import os
 import utilities
-
-# Add the SDK directory to PYTHONPATH using a relative path
-script_dir = os.path.dirname(os.path.abspath(__file__))  # Current script directory
-sdk_path = os.path.join(script_dir, '..', 'sdk')  # Go up one level and point to 'sdk'
-sys.path.insert(0, sdk_path)
 from 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 2e59cd3..3f5f67d 100755
--- a/scripts/invoker_capif_connector_offboarding.py
+++ b/scripts/invoker_capif_connector_offboarding.py
@@ -1,11 +1,6 @@
 import sys
 import os
 import utilities
-
-# Add the SDK directory to PYTHONPATH using a relative path
-script_dir = os.path.dirname(os.path.abspath(__file__))  # Current script directory
-sdk_path = os.path.join(script_dir, '..', 'sdk')  # Go up one level and point to 'sdk'
-sys.path.insert(0, sdk_path)
 from sdk import capif_invoker_connector
 
 def showcase_offboard_and_deregister_invoker():
diff --git a/scripts/invoker_capif_connector_update.py b/scripts/invoker_capif_connector_update.py
index ba0665b..8052c29 100644
--- a/scripts/invoker_capif_connector_update.py
+++ b/scripts/invoker_capif_connector_update.py
@@ -1,11 +1,6 @@
 import sys
 import os
 import utilities
-
-# Add the SDK directory to PYTHONPATH using a relative path
-script_dir = os.path.dirname(os.path.abspath(__file__))  # Current script directory
-sdk_path = os.path.join(script_dir, '..', 'sdk')  # Go up one level and point to 'sdk'
-sys.path.insert(0, sdk_path)
 from sdk import capif_invoker_connector
 
 def showcase_capif_connector():
diff --git a/scripts/invoker_service_discovery.py b/scripts/invoker_service_discovery.py
index e9c035e..0084ada 100755
--- a/scripts/invoker_service_discovery.py
+++ b/scripts/invoker_service_discovery.py
@@ -1,14 +1,4 @@
-import sys
-import os
 import utilities
-
-# Add the SDK directory to PYTHONPATH using a relative path
-script_dir = os.path.dirname(os.path.abspath(__file__))  # Current script directory
-sdk_path = os.path.join(script_dir, '..', 'sdk')  # Go up one level and point to 'sdk'
-sys.path.insert(0, sdk_path)
-
-# Now import the classes from your sdk.py file
-
 from sdk import service_discoverer
 def showcase_access_token_retrieval_from_capif():
     service_discoverer = service_discoverer(config_file=utilities.get_config_file())
diff --git a/scripts/invoker_service_get_token.py b/scripts/invoker_service_get_token.py
index f6095bb..be1b0ee 100755
--- a/scripts/invoker_service_get_token.py
+++ b/scripts/invoker_service_get_token.py
@@ -1,14 +1,4 @@
-import sys
-import os
 import utilities
-
-# Add the SDK directory to PYTHONPATH using a relative path
-script_dir = os.path.dirname(os.path.abspath(__file__))  # Current script directory
-sdk_path = os.path.join(script_dir, '..', 'sdk')  # Go up one level and point to 'sdk'
-sys.path.insert(0, sdk_path)
-
-# Now import the classes from your sdk.py file
-
 from sdk import service_discoverer
 def showcase_access_token_retrieval_from_capif():
     service_discoverer = service_discoverer(config_file=utilities.get_config_file())
diff --git a/scripts/provider_capif_connector.py b/scripts/provider_capif_connector.py
index 4c46482..5c639fd 100755
--- a/scripts/provider_capif_connector.py
+++ b/scripts/provider_capif_connector.py
@@ -1,11 +1,4 @@
-import sys
-import os
 import utilities
-
-# Add the SDK directory to PYTHONPATH using a relative path
-script_dir = os.path.dirname(os.path.abspath(__file__))  # Current script directory
-sdk_path = os.path.join(script_dir, '..', 'sdk')  # Go up one level and point to 'sdk'
-sys.path.insert(0, sdk_path)
 from 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 642fb27..4a676e1 100755
--- a/scripts/provider_capif_connector_offboarding.py
+++ b/scripts/provider_capif_connector_offboarding.py
@@ -1,11 +1,4 @@
-import sys
-import os
 import utilities
-
-# Add the SDK directory to PYTHONPATH using a relative path
-script_dir = os.path.dirname(os.path.abspath(__file__))  # Current script directory
-sdk_path = os.path.join(script_dir, '..', 'sdk')  # Go up one level and point to 'sdk'
-sys.path.insert(0, sdk_path)
 from sdk import capif_provider_connector
 
 def offboard_capif_nef_connector():
diff --git a/scripts/provider_capif_connector_update.py b/scripts/provider_capif_connector_update.py
index 53b3e8a..32875c5 100644
--- a/scripts/provider_capif_connector_update.py
+++ b/scripts/provider_capif_connector_update.py
@@ -1,12 +1,4 @@
-import sys
-import os
-import utilities
-
-
-# Add the SDK directory to PYTHONPATH using a relative path
-script_dir = os.path.dirname(os.path.abspath(__file__))  # Current script directory
-sdk_path = os.path.join(script_dir, '..', 'sdk')  # Go up one level and point to 'sdk'
-sys.path.insert(0, sdk_path)
+import utilities 
 from 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 f9cbb0c..467ea7f 100644
--- a/scripts/provider_get_all_published_api.py
+++ b/scripts/provider_get_all_published_api.py
@@ -1,13 +1,4 @@
-import sys
-import os
 import utilities
-
-# Add the SDK directory to PYTHONPATH using a relative path
-script_dir = os.path.dirname(os.path.abspath(__file__))  # Current script directory
-sdk_path = os.path.join(script_dir, '..', 'sdk')  # Go up one level and point to 'sdk'
-sys.path.insert(0, sdk_path)
-
-# Now import the classes from your sdk.py file
 from 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 5ffd0bb..12f0d29 100644
--- a/scripts/provider_get_published_api.py
+++ b/scripts/provider_get_published_api.py
@@ -1,14 +1,4 @@
-import sys
-import os
 import utilities
-
-# Add the SDK directory to PYTHONPATH using a relative path
-script_dir = os.path.dirname(os.path.abspath(__file__))  # Current script directory
-sdk_path = os.path.join(script_dir, '..', 'sdk')  # Go up one level and point to 'sdk'
-sys.path.insert(0, sdk_path)
-
-# Now import the classes from your sdk.py file
-
 from 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 646e86f..7020f79 100644
--- a/scripts/provider_publish_api.py
+++ b/scripts/provider_publish_api.py
@@ -1,14 +1,4 @@
-import sys
-import os
 import utilities
-
-# Add the SDK directory to PYTHONPATH using a relative path
-script_dir = os.path.dirname(os.path.abspath(__file__))  # Current script directory
-sdk_path = os.path.join(script_dir, '..', 'sdk')  # Go up one level and point to 'sdk'
-sys.path.insert(0, sdk_path)
-
-# Now import the classes from your sdk.py file
-
 from 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 81ab9e2..719ecda 100644
--- a/scripts/provider_unpublish_api.py
+++ b/scripts/provider_unpublish_api.py
@@ -1,13 +1,5 @@
-import sys
-import os
 import utilities
-
-# Add the SDK directory to PYTHONPATH using a relative path
-script_dir = os.path.dirname(os.path.abspath(__file__))  # Current script directory
-sdk_path = os.path.join(script_dir, '..', 'sdk')  # Go up one level and point to 'sdk'
-sys.path.insert(0, sdk_path)
 from sdk import capif_provider_connector
-# Now import the classes from your sdk.py file
 
 def showcase_capif_nef_connector():
     """
diff --git a/scripts/provider_update_api.py b/scripts/provider_update_api.py
index 8ac9548..e86b861 100644
--- a/scripts/provider_update_api.py
+++ b/scripts/provider_update_api.py
@@ -1,14 +1,4 @@
-import sys
-import os
 import utilities
-
-# Add the SDK directory to PYTHONPATH using a relative path
-script_dir = os.path.dirname(os.path.abspath(__file__))  # Current script directory
-sdk_path = os.path.join(script_dir, '..', 'sdk')  # Go up one level and point to 'sdk'
-sys.path.insert(0, sdk_path)
-
-# Now import the classes from your sdk.py file
-
 from sdk import capif_provider_connector
 
 def showcase_capif_nef_connector():
-- 
GitLab