From 199d1aa8c163a5eb26c7c2cbb1ae51be573900a7 Mon Sep 17 00:00:00 2001 From: JorgeEcheva26 <jorge.echevarriauribarri.practicas@telefonica.es> Date: Tue, 3 Dec 2024 13:07:41 +0100 Subject: [PATCH] OAUTH --- .../nef_upf_vendor_1.json | 8 +++---- .../nef_upf_vendor_2.json | 12 +++++----- opencapif_sdk/api_schema_translator.py | 4 ++-- opencapif_sdk/service_discoverer.py | 22 ++++--------------- samples/provider_api_description_sample.json | 8 +++---- test/network_app_provider_api_spec_2.json | 12 +++++----- test/network_app_provider_api_spec_3.json | 8 +++---- 7 files changed, 30 insertions(+), 44 deletions(-) diff --git a/network_app_samples/network_app_provider_sample/nef_upf_vendor_1.json b/network_app_samples/network_app_provider_sample/nef_upf_vendor_1.json index 8cc2fa4..58ceb6f 100755 --- a/network_app_samples/network_app_provider_sample/nef_upf_vendor_1.json +++ b/network_app_samples/network_app_provider_sample/nef_upf_vendor_1.json @@ -143,14 +143,14 @@ "protocol": "HTTP_1_1", "dataFormat": "JSON", "securityMethods": [ - "Oauth" + "OAUTH" ], "interfaceDescriptions": [ { "ipv4Addr": "localhost", "port": 8088, "securityMethods": [ - "Oauth" + "OAUTH" ] } ] @@ -297,7 +297,7 @@ "protocol": "HTTP_1_1", "dataFormat": "JSON", "securityMethods": [ - "Oauth", + "OAUTH", "PSK" ], "interfaceDescriptions": [ @@ -305,7 +305,7 @@ "ipv4Addr": "localhost", "port": 8088, "securityMethods": [ - "Oauth" + "OAUTH" ] } ] diff --git a/network_app_samples/network_app_provider_sample/nef_upf_vendor_2.json b/network_app_samples/network_app_provider_sample/nef_upf_vendor_2.json index 5feec72..5930f5c 100755 --- a/network_app_samples/network_app_provider_sample/nef_upf_vendor_2.json +++ b/network_app_samples/network_app_provider_sample/nef_upf_vendor_2.json @@ -127,7 +127,7 @@ "protocol": "HTTP_1_1", "dataFormat": "JSON", "securityMethods": [ - "Oauth", + "OAUTH", "PSK" ], "interfaceDescriptions": [ @@ -135,7 +135,7 @@ "ipv4Addr": "localhost", "port": 8888, "securityMethods": [ - "Oauth" + "OAUTH" ] } ] @@ -283,14 +283,14 @@ "protocol": "HTTP_1_1", "dataFormat": "JSON", "securityMethods": [ - "Oauth" + "OAUTH" ], "interfaceDescriptions": [ { "ipv4Addr": "localhost", "port": 8888, "securityMethods": [ - "Oauth" + "OAUTH" ] } ] @@ -421,7 +421,7 @@ "protocol": "HTTP_1_1", "dataFormat": "JSON", "securityMethods": [ - "Oauth", + "OAUTH", "PSK" ], "interfaceDescriptions": [ @@ -429,7 +429,7 @@ "ipv4Addr": "localhost", "port": 8888, "securityMethods": [ - "Oauth" + "OAUTH" ] } ] diff --git a/opencapif_sdk/api_schema_translator.py b/opencapif_sdk/api_schema_translator.py index 7e29a76..1251990 100644 --- a/opencapif_sdk/api_schema_translator.py +++ b/opencapif_sdk/api_schema_translator.py @@ -143,12 +143,12 @@ class api_schema_translator: ], "protocol": "HTTP_1_1", "dataFormat": "JSON", - "securityMethods": ["Oauth"], + "securityMethods": ["OAUTH"], "interfaceDescriptions": [ { "ipv4Addr": ip, "port": port, - "securityMethods": ["Oauth"] + "securityMethods": ["OAUTH"] } ] } diff --git a/opencapif_sdk/service_discoverer.py b/opencapif_sdk/service_discoverer.py index d913189..d3ccfd7 100644 --- a/opencapif_sdk/service_discoverer.py +++ b/opencapif_sdk/service_discoverer.py @@ -225,21 +225,9 @@ class service_discoverer: api_id = self.invoker_capif_details["registered_security_contexes"][i]['api_id'] for n in range(0, len(aef_profiles)): aef_id = self.invoker_capif_details["registered_security_contexes"][i]['aef_profiles'][n]['aef_id'] - ip = self.invoker_capif_details["registered_security_contexes"][i]['aef_profiles'][n]['ip'] - port = self.invoker_capif_details["registered_security_contexes"][i]['aef_profiles'][n]['port'] + security_info = { - "interfaceDetails": [ - { - "ipv4Addr": ip, - "ipv6Addr": "string", - "fqdn": "string", - "port": port, - "securityMethods": [ - "Oauth" - ] - } - ], - "prefSecurityMethods": ["Oauth"], + "prefSecurityMethods": ["OAUTH"], "authenticationInfo": "string", "authorizationInfo": "string", "aefId": aef_id, @@ -298,9 +286,8 @@ class service_discoverer: api_id = self.invoker_capif_details["registered_security_contexes"][i]['api_id'] for n in range(0, len(aef_profiles)): aef_id = self.invoker_capif_details["registered_security_contexes"][i]['aef_profiles'][n]['aef_id'] - security_info = { - "prefSecurityMethods": ["Oauth"], + "prefSecurityMethods": ["OAUTH"], "authenticationInfo": "string", "authorizationInfo": "string", "aefId": aef_id, @@ -308,9 +295,8 @@ class service_discoverer: } payload["securityInfo"].append(security_info) - payload["securityInfo"].append(security_info) - try: + print(payload) response = requests.put(url, json=payload, cert=(self.signed_key_crt_path, diff --git a/samples/provider_api_description_sample.json b/samples/provider_api_description_sample.json index 02d872f..9544269 100755 --- a/samples/provider_api_description_sample.json +++ b/samples/provider_api_description_sample.json @@ -47,14 +47,14 @@ "protocol": "HTTP_1_1", "dataFormat": "JSON", "securityMethods": [ - "Oauth" + "OAUTH" ], "interfaceDescriptions": [ { "ipv4Addr": "127.0.0.1", "port": 8888, "securityMethods": [ - "Oauth" + "OAUTH" ] } ] @@ -122,14 +122,14 @@ "protocol": "HTTP_1_1", "dataFormat": "JSON", "securityMethods": [ - "Oauth" + "OAUTH" ], "interfaceDescriptions": [ { "ipv4Addr": "127.0.0.1", "port": 8899, "securityMethods": [ - "Oauth" + "OAUTH" ] } ] diff --git a/test/network_app_provider_api_spec_2.json b/test/network_app_provider_api_spec_2.json index 0d54904..94175bd 100755 --- a/test/network_app_provider_api_spec_2.json +++ b/test/network_app_provider_api_spec_2.json @@ -47,7 +47,7 @@ "protocol": "HTTP_1_1", "dataFormat": "JSON", "securityMethods": [ - "Oauth", + "OAUTH", "PSK" ], "interfaceDescriptions": [ @@ -55,7 +55,7 @@ "ipv4Addr": "127.0.0.1", "port": 8888, "securityMethods": [ - "Oauth" + "OAUTH" ] } ] @@ -123,14 +123,14 @@ "protocol": "HTTP_1_1", "dataFormat": "JSON", "securityMethods": [ - "Oauth" + "OAUTH" ], "interfaceDescriptions": [ { "ipv4Addr": "127.0.0.1", "port": 8899, "securityMethods": [ - "Oauth" + "OAUTH" ] } ] @@ -181,7 +181,7 @@ "protocol": "HTTP_1_1", "dataFormat": "JSON", "securityMethods": [ - "Oauth", + "OAUTH", "PSK" ], "interfaceDescriptions": [ @@ -189,7 +189,7 @@ "ipv4Addr": "127.0.0.1", "port": 8888, "securityMethods": [ - "Oauth" + "OAUTH" ] } ] diff --git a/test/network_app_provider_api_spec_3.json b/test/network_app_provider_api_spec_3.json index 548b740..7b9fbe4 100755 --- a/test/network_app_provider_api_spec_3.json +++ b/test/network_app_provider_api_spec_3.json @@ -47,7 +47,7 @@ "protocol": "HTTP_1_1", "dataFormat": "JSON", "securityMethods": [ - "Oauth", + "OAUTH", "PSK" ], "interfaceDescriptions": [ @@ -55,7 +55,7 @@ "ipv4Addr": "127.0.0.1", "port": 8888, "securityMethods": [ - "Oauth" + "OAUTH" ] } ] @@ -123,14 +123,14 @@ "protocol": "HTTP_1_1", "dataFormat": "JSON", "securityMethods": [ - "Oauth" + "OAUTH" ], "interfaceDescriptions": [ { "ipv4Addr": "127.0.0.1", "port": 8899, "securityMethods": [ - "Oauth" + "OAUTH" ] } ] -- GitLab