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 8cc2fa42c0ccad2f63b4ba09d6b636db5f8fd791..58ceb6fa03cecf99c22e18707da49c53534c7173 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 5feec72a09b690011fb88feb452d9f30908d1391..5930f5c4a7b6c8638c90b67a4642cf70328f4587 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 7e29a763c7d768da77ad3a676bba63d221139ae3..12519903c5df540483c3b15b12a8c5df686d7aa1 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 d9131896ff0e0d17d9f44caa93d58df8af6cf10b..d3ccfd78e62d5cf101ac40bfb81aa8b96a8c9c22 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 02d872f572fd2b2b245f883b15cd92ad77e2fcac..954426989c236f6c4c45a550e26c23eab4bbdce8 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 0d54904cfb24ee79280504484ebfc7529d4f9fd1..94175bdcf3e1c29b993d30a91e99a1f4ced2b64f 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 548b7408262c54241bb0fb81466339410e41d6bc..7b9fbe4f167620a2fb673fa02612b6af2b0b9364 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"
]
}
]