From 2ebe25eb8255620ea2977d2a7dafda73f41ff864 Mon Sep 17 00:00:00 2001 From: Pelayo Torres Date: Thu, 3 Apr 2025 12:38:51 +0200 Subject: [PATCH] Auditing API realease V18.6.0 --- .../.openapi-generator/FILES | 1 + .../.openapi-generator/VERSION | 2 +- services/TS29222_CAPIF_Auditing_API/README.md | 2 +- .../logs/controllers/default_controller.py | 1 - .../logs/encoder.py | 2 +- .../logs/models/__init__.py | 11 ++++ .../logs/models/base_model.py | 1 + .../logs/models/interface_description.py | 47 +++++++++++++--- .../logs/models/invalid_param.py | 3 +- .../logs/models/invocation_log.py | 11 ++-- .../logs/models/invocation_logs.py | 11 ++-- .../models/invocation_logs_retrieve_res.py | 14 +++-- .../logs/models/log.py | 8 ++- .../logs/models/o_auth_grant_type.py | 34 ++++++++++++ .../logs/models/operation.py | 3 +- .../logs/models/problem_details.py | 11 ++-- .../logs/models/protocol.py | 3 +- .../logs/models/security_method.py | 3 +- .../logs/openapi/openapi.yaml | 55 +++++++++++++++++-- .../logs/test/__init__.py | 1 + .../logs/test/test_default_controller.py | 7 +++ .../logs/typing_utils.py | 1 + services/TS29222_CAPIF_Auditing_API/setup.py | 3 +- 23 files changed, 197 insertions(+), 38 deletions(-) create mode 100644 services/TS29222_CAPIF_Auditing_API/logs/models/o_auth_grant_type.py diff --git a/services/TS29222_CAPIF_Auditing_API/.openapi-generator/FILES b/services/TS29222_CAPIF_Auditing_API/.openapi-generator/FILES index 684a73b6..bd1da334 100644 --- a/services/TS29222_CAPIF_Auditing_API/.openapi-generator/FILES +++ b/services/TS29222_CAPIF_Auditing_API/.openapi-generator/FILES @@ -19,6 +19,7 @@ logs/models/invocation_log.py logs/models/invocation_logs.py logs/models/invocation_logs_retrieve_res.py logs/models/log.py +logs/models/o_auth_grant_type.py logs/models/operation.py logs/models/problem_details.py logs/models/protocol.py diff --git a/services/TS29222_CAPIF_Auditing_API/.openapi-generator/VERSION b/services/TS29222_CAPIF_Auditing_API/.openapi-generator/VERSION index 18bb4182..b23eb275 100644 --- a/services/TS29222_CAPIF_Auditing_API/.openapi-generator/VERSION +++ b/services/TS29222_CAPIF_Auditing_API/.openapi-generator/VERSION @@ -1 +1 @@ -7.5.0 +7.11.0 diff --git a/services/TS29222_CAPIF_Auditing_API/README.md b/services/TS29222_CAPIF_Auditing_API/README.md index 7f120ad3..17eb857e 100644 --- a/services/TS29222_CAPIF_Auditing_API/README.md +++ b/services/TS29222_CAPIF_Auditing_API/README.md @@ -15,7 +15,7 @@ To run the server, please execute the following from the root directory: ``` pip3 install -r requirements.txt -python3 -m openapi_server +python3 -m logs ``` and open your browser to here: diff --git a/services/TS29222_CAPIF_Auditing_API/logs/controllers/default_controller.py b/services/TS29222_CAPIF_Auditing_API/logs/controllers/default_controller.py index 87ecabbf..469bff22 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/controllers/default_controller.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/controllers/default_controller.py @@ -46,7 +46,6 @@ def api_invocation_logs_get(aef_id=None, api_invoker_id=None, time_range_start=N :rtype: Union[InvocationLogsRetrieveRes, Tuple[InvocationLogsRetrieveRes, int], Tuple[InvocationLogsRetrieveRes, int, Dict[str, str]] """ - current_app.logger.info("Audit logs") if aef_id is None or api_invoker_id is None: diff --git a/services/TS29222_CAPIF_Auditing_API/logs/encoder.py b/services/TS29222_CAPIF_Auditing_API/logs/encoder.py index a6803052..3c674456 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/encoder.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/encoder.py @@ -16,4 +16,4 @@ class CustomJSONEncoder(JSONEncoder): attr = o.attribute_map[attr] dikt[attr] = value return dikt - return JSONEncoder.default(self, o) + return JSONEncoder.default(self, o) \ No newline at end of file diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/__init__.py b/services/TS29222_CAPIF_Auditing_API/logs/models/__init__.py index d036df69..316dfd92 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/models/__init__.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/models/__init__.py @@ -1,2 +1,13 @@ # flake8: noqa # import models into model package +from logs.models.interface_description import InterfaceDescription +from logs.models.invalid_param import InvalidParam +from logs.models.invocation_log import InvocationLog +from logs.models.invocation_logs import InvocationLogs +from logs.models.invocation_logs_retrieve_res import InvocationLogsRetrieveRes +from logs.models.log import Log +from logs.models.o_auth_grant_type import OAuthGrantType +from logs.models.operation import Operation +from logs.models.problem_details import ProblemDetails +from logs.models.protocol import Protocol +from logs.models.security_method import SecurityMethod diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/base_model.py b/services/TS29222_CAPIF_Auditing_API/logs/models/base_model.py index 16381a1d..56493bbf 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/models/base_model.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/models/base_model.py @@ -1,4 +1,5 @@ import pprint + import typing from logs import util diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/interface_description.py b/services/TS29222_CAPIF_Auditing_API/logs/models/interface_description.py index f4700962..b2302306 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/models/interface_description.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/models/interface_description.py @@ -1,11 +1,16 @@ -import re # noqa: E501 from datetime import date, datetime # noqa: F401 + from typing import List, Dict # noqa: F401 -from logs import util from logs.models.base_model import Model -from logs.models.security_method import SecurityMethod # noqa: E501 +from logs.models.o_auth_grant_type import OAuthGrantType +from logs.models.security_method import SecurityMethod +import re +from logs import util +from logs.models.o_auth_grant_type import OAuthGrantType # noqa: E501 +from logs.models.security_method import SecurityMethod # noqa: E501 +import re # noqa: E501 class InterfaceDescription(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -13,7 +18,7 @@ class InterfaceDescription(Model): Do not edit the class manually. """ - def __init__(self, ipv4_addr=None, ipv6_addr=None, fqdn=None, port=None, api_prefix=None, security_methods=None): # noqa: E501 + def __init__(self, ipv4_addr=None, ipv6_addr=None, fqdn=None, port=None, api_prefix=None, security_methods=None, grant_types=None): # noqa: E501 """InterfaceDescription - a model defined in OpenAPI :param ipv4_addr: The ipv4_addr of this InterfaceDescription. # noqa: E501 @@ -28,6 +33,8 @@ class InterfaceDescription(Model): :type api_prefix: str :param security_methods: The security_methods of this InterfaceDescription. # noqa: E501 :type security_methods: List[SecurityMethod] + :param grant_types: The grant_types of this InterfaceDescription. # noqa: E501 + :type grant_types: List[OAuthGrantType] """ self.openapi_types = { 'ipv4_addr': str, @@ -35,7 +42,8 @@ class InterfaceDescription(Model): 'fqdn': str, 'port': int, 'api_prefix': str, - 'security_methods': List[SecurityMethod] + 'security_methods': List[SecurityMethod], + 'grant_types': List[OAuthGrantType] } self.attribute_map = { @@ -44,7 +52,8 @@ class InterfaceDescription(Model): 'fqdn': 'fqdn', 'port': 'port', 'api_prefix': 'apiPrefix', - 'security_methods': 'securityMethods' + 'security_methods': 'securityMethods', + 'grant_types': 'grantTypes' } self._ipv4_addr = ipv4_addr @@ -53,6 +62,7 @@ class InterfaceDescription(Model): self._port = port self._api_prefix = api_prefix self._security_methods = security_methods + self._grant_types = grant_types @classmethod def from_dict(cls, dikt) -> 'InterfaceDescription': @@ -136,7 +146,7 @@ class InterfaceDescription(Model): if fqdn is not None and len(fqdn) < 4: raise ValueError("Invalid value for `fqdn`, length must be greater than or equal to `4`") # noqa: E501 if fqdn is not None and not re.search(r'^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\.)+[A-Za-z]{2,63}\.?$', fqdn): # noqa: E501 - raise ValueError("Invalid value for `fqdn`, must be a follow pattern or equal to `/^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\.)+[A-Za-z]{2,63}\.?$/`") # noqa: E501 + raise ValueError(r"Invalid value for `fqdn`, must be a follow pattern or equal to `/^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\.)+[A-Za-z]{2,63}\.?$/`") # noqa: E501 self._fqdn = fqdn @@ -214,3 +224,26 @@ class InterfaceDescription(Model): raise ValueError("Invalid value for `security_methods`, number of items must be greater than or equal to `1`") # noqa: E501 self._security_methods = security_methods + + @property + def grant_types(self) -> List[OAuthGrantType]: + """Gets the grant_types of this InterfaceDescription. + + + :return: The grant_types of this InterfaceDescription. + :rtype: List[OAuthGrantType] + """ + return self._grant_types + + @grant_types.setter + def grant_types(self, grant_types: List[OAuthGrantType]): + """Sets the grant_types of this InterfaceDescription. + + + :param grant_types: The grant_types of this InterfaceDescription. + :type grant_types: List[OAuthGrantType] + """ + if grant_types is not None and len(grant_types) < 1: + raise ValueError("Invalid value for `grant_types`, number of items must be greater than or equal to `1`") # noqa: E501 + + self._grant_types = grant_types diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/invalid_param.py b/services/TS29222_CAPIF_Auditing_API/logs/models/invalid_param.py index a7c83e71..7da75a55 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/models/invalid_param.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/models/invalid_param.py @@ -1,8 +1,9 @@ from datetime import date, datetime # noqa: F401 + from typing import List, Dict # noqa: F401 -from logs import util from logs.models.base_model import Model +from logs import util class InvalidParam(Model): diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/invocation_log.py b/services/TS29222_CAPIF_Auditing_API/logs/models/invocation_log.py index f5d5e0ec..26d42ad5 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/models/invocation_log.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/models/invocation_log.py @@ -1,11 +1,14 @@ -import re # noqa: E501 from datetime import date, datetime # noqa: F401 + from typing import List, Dict # noqa: F401 -from logs import util from logs.models.base_model import Model -from logs.models.log import Log # noqa: E501 +from logs.models.log import Log +import re +from logs import util +from logs.models.log import Log # noqa: E501 +import re # noqa: E501 class InvocationLog(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -153,6 +156,6 @@ class InvocationLog(Model): :type supported_features: str """ if supported_features is not None and not re.search(r'^[A-Fa-f0-9]*$', supported_features): # noqa: E501 - raise ValueError("Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`") # noqa: E501 + raise ValueError(r"Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`") # noqa: E501 self._supported_features = supported_features diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/invocation_logs.py b/services/TS29222_CAPIF_Auditing_API/logs/models/invocation_logs.py index a4fe7ca4..f1ed39c0 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/models/invocation_logs.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/models/invocation_logs.py @@ -1,11 +1,14 @@ -import re # noqa: E501 from datetime import date, datetime # noqa: F401 + from typing import List, Dict # noqa: F401 -from logs import util from logs.models.base_model import Model -from logs.models.invocation_log import InvocationLog # noqa: E501 +from logs.models.invocation_log import InvocationLog +import re +from logs import util +from logs.models.invocation_log import InvocationLog # noqa: E501 +import re # noqa: E501 class InvocationLogs(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -91,6 +94,6 @@ class InvocationLogs(Model): :type supported_features: str """ if supported_features is not None and not re.search(r'^[A-Fa-f0-9]*$', supported_features): # noqa: E501 - raise ValueError("Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`") # noqa: E501 + raise ValueError(r"Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`") # noqa: E501 self._supported_features = supported_features diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/invocation_logs_retrieve_res.py b/services/TS29222_CAPIF_Auditing_API/logs/models/invocation_logs_retrieve_res.py index b26a62f2..4ebdec7c 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/models/invocation_logs_retrieve_res.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/models/invocation_logs_retrieve_res.py @@ -1,12 +1,18 @@ -import re # noqa: E501 from datetime import date, datetime # noqa: F401 + from typing import List, Dict # noqa: F401 -from logs import util from logs.models.base_model import Model +from logs.models.invocation_log import InvocationLog +from logs.models.invocation_logs import InvocationLogs +from logs.models.log import Log +import re +from logs import util + from logs.models.invocation_log import InvocationLog # noqa: E501 +from logs.models.invocation_logs import InvocationLogs # noqa: E501 from logs.models.log import Log # noqa: E501 - +import re # noqa: E501 class InvocationLogsRetrieveRes(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -159,7 +165,7 @@ class InvocationLogsRetrieveRes(Model): :type supported_features: str """ if supported_features is not None and not re.search(r'^[A-Fa-f0-9]*$', supported_features): # noqa: E501 - raise ValueError("Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`") # noqa: E501 + raise ValueError(r"Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`") # noqa: E501 self._supported_features = supported_features diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/log.py b/services/TS29222_CAPIF_Auditing_API/logs/models/log.py index 2fb185c6..ef5604a6 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/models/log.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/models/log.py @@ -1,13 +1,17 @@ from datetime import date, datetime # noqa: F401 + from typing import List, Dict # noqa: F401 -from logs import util from logs.models.base_model import Model +from logs.models.interface_description import InterfaceDescription +from logs.models.operation import Operation +from logs.models.protocol import Protocol +from logs import util + from logs.models.interface_description import InterfaceDescription # noqa: E501 from logs.models.operation import Operation # noqa: E501 from logs.models.protocol import Protocol # noqa: E501 - class Log(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/o_auth_grant_type.py b/services/TS29222_CAPIF_Auditing_API/logs/models/o_auth_grant_type.py new file mode 100644 index 00000000..280b8ef7 --- /dev/null +++ b/services/TS29222_CAPIF_Auditing_API/logs/models/o_auth_grant_type.py @@ -0,0 +1,34 @@ +from datetime import date, datetime # noqa: F401 + +from typing import List, Dict # noqa: F401 + +from logs.models.base_model import Model +from logs import util + + +class OAuthGrantType(Model): + """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + + Do not edit the class manually. + """ + + def __init__(self): # noqa: E501 + """OAuthGrantType - a model defined in OpenAPI + + """ + self.openapi_types = { + } + + self.attribute_map = { + } + + @classmethod + def from_dict(cls, dikt) -> 'OAuthGrantType': + """Returns the dict as a model + + :param dikt: A dict. + :type: dict + :return: The OAuthGrantType of this OAuthGrantType. # noqa: E501 + :rtype: OAuthGrantType + """ + return util.deserialize_model(dikt, cls) diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/operation.py b/services/TS29222_CAPIF_Auditing_API/logs/models/operation.py index d36a4e88..a8efafdc 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/models/operation.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/models/operation.py @@ -1,8 +1,9 @@ from datetime import date, datetime # noqa: F401 + from typing import List, Dict # noqa: F401 -from logs import util from logs.models.base_model import Model +from logs import util class Operation(Model): diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/problem_details.py b/services/TS29222_CAPIF_Auditing_API/logs/models/problem_details.py index beca8ffd..2a77eb97 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/models/problem_details.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/models/problem_details.py @@ -1,11 +1,14 @@ -import re # noqa: E501 from datetime import date, datetime # noqa: F401 + from typing import List, Dict # noqa: F401 -from logs import util from logs.models.base_model import Model -from logs.models.invalid_param import InvalidParam # noqa: E501 +from logs.models.invalid_param import InvalidParam +import re +from logs import util +from logs.models.invalid_param import InvalidParam # noqa: E501 +import re # noqa: E501 class ProblemDetails(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -259,6 +262,6 @@ class ProblemDetails(Model): :type supported_features: str """ if supported_features is not None and not re.search(r'^[A-Fa-f0-9]*$', supported_features): # noqa: E501 - raise ValueError("Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`") # noqa: E501 + raise ValueError(r"Invalid value for `supported_features`, must be a follow pattern or equal to `/^[A-Fa-f0-9]*$/`") # noqa: E501 self._supported_features = supported_features diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/protocol.py b/services/TS29222_CAPIF_Auditing_API/logs/models/protocol.py index db5cdc90..989d9e4c 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/models/protocol.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/models/protocol.py @@ -1,8 +1,9 @@ from datetime import date, datetime # noqa: F401 + from typing import List, Dict # noqa: F401 -from logs import util from logs.models.base_model import Model +from logs import util class Protocol(Model): diff --git a/services/TS29222_CAPIF_Auditing_API/logs/models/security_method.py b/services/TS29222_CAPIF_Auditing_API/logs/models/security_method.py index db5311a1..b32bbf5b 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/models/security_method.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/models/security_method.py @@ -1,8 +1,9 @@ from datetime import date, datetime # noqa: F401 + from typing import List, Dict # noqa: F401 -from logs import util from logs.models.base_model import Model +from logs import util class SecurityMethod(Model): diff --git a/services/TS29222_CAPIF_Auditing_API/logs/openapi/openapi.yaml b/services/TS29222_CAPIF_Auditing_API/logs/openapi/openapi.yaml index 7a2cfcd0..298ad8a4 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/openapi/openapi.yaml +++ b/services/TS29222_CAPIF_Auditing_API/logs/openapi/openapi.yaml @@ -1,11 +1,11 @@ openapi: 3.0.0 info: - description: "API for auditing. \n© 2023, 3GPP Organizational Partners (ARIB, ATIS,\ + description: "API for auditing. \n© 2024, 3GPP Organizational Partners (ARIB, ATIS,\ \ CCSA, ETSI, TSDSI, TTA, TTC). \nAll rights reserved.\n" title: CAPIF_Auditing_API - version: 1.3.0-alpha.2 + version: 1.3.0 externalDocs: - description: 3GPP TS 29.222 V18.1.0 Common API Framework for 3GPP Northbound APIs + description: 3GPP TS 29.222 V18.6.0 Common API Framework for 3GPP Northbound APIs url: https://www.3gpp.org/ftp/Specs/archive/29_series/29.222/ servers: - url: "{apiRoot}/logs/v1" @@ -359,6 +359,9 @@ components: description: Represents the description of an API's interface. example: ipv6Addr: ipv6Addr + grantTypes: + - CLIENT_CREDENTIALS + - CLIENT_CREDENTIALS securityMethods: - PSK - PSK @@ -367,7 +370,10 @@ components: apiPrefix: apiPrefix ipv4Addr: ipv4Addr nullable: true - oneOf: [] + oneOf: + - required: ["fqdn"] + - required: ["ipv4Addr"] + - required: ["ipv6Addr"] properties: ipv4Addr: description: | @@ -406,6 +412,12 @@ components: minItems: 1 title: securityMethods type: array + grantTypes: + items: + $ref: '#/components/schemas/OAuthGrantType' + minItems: 1 + title: grantTypes + type: array title: InterfaceDescription type: object SecurityMethod: @@ -508,6 +520,9 @@ components: invocationTime: 2000-01-23T04:56:07.000+00:00 srcInterface: ipv6Addr: ipv6Addr + grantTypes: + - CLIENT_CREDENTIALS + - CLIENT_CREDENTIALS securityMethods: - PSK - PSK @@ -525,6 +540,9 @@ components: apiVersion: apiVersion destInterface: ipv6Addr: ipv6Addr + grantTypes: + - CLIENT_CREDENTIALS + - CLIENT_CREDENTIALS securityMethods: - PSK - PSK @@ -539,6 +557,9 @@ components: invocationTime: 2000-01-23T04:56:07.000+00:00 srcInterface: ipv6Addr: ipv6Addr + grantTypes: + - CLIENT_CREDENTIALS + - CLIENT_CREDENTIALS securityMethods: - PSK - PSK @@ -556,6 +577,9 @@ components: apiVersion: apiVersion destInterface: ipv6Addr: ipv6Addr + grantTypes: + - CLIENT_CREDENTIALS + - CLIENT_CREDENTIALS securityMethods: - PSK - PSK @@ -602,6 +626,9 @@ components: invocationTime: 2000-01-23T04:56:07.000+00:00 srcInterface: ipv6Addr: ipv6Addr + grantTypes: + - CLIENT_CREDENTIALS + - CLIENT_CREDENTIALS securityMethods: - PSK - PSK @@ -619,6 +646,9 @@ components: apiVersion: apiVersion destInterface: ipv6Addr: ipv6Addr + grantTypes: + - CLIENT_CREDENTIALS + - CLIENT_CREDENTIALS securityMethods: - PSK - PSK @@ -724,3 +754,20 @@ components: minimum: 0 title: Port type: integer + OAuthGrantType: + anyOf: + - enum: + - CLIENT_CREDENTIALS + - AUTHORIZATION_CODE + - AUTHORIZATION_CODE_WITH_PKCE + type: string + - description: | + This string provides forward-compatibility with future extensions to the enumeration and is not used to encode content defined in the present version of this API. + type: string + description: "Indicates the supported authorization flow (e.g. client credentials\ + \ flow, authorization code flow, etc.) to the API invoker. \nPossible\ + \ values are:\n- CLIENT_CREDENTIALS: Indicate that the grant type is is client\ + \ credentials flow.\n- AUTHORIZATION_CODE: Indicate that the grant type is\ + \ authorization code.\n- AUTHORIZATION_CODE_WITH_PKCE: Indicate that the grant\ + \ type is authorization code with PKCE.\n" + title: OAuthGrantType diff --git a/services/TS29222_CAPIF_Auditing_API/logs/test/__init__.py b/services/TS29222_CAPIF_Auditing_API/logs/test/__init__.py index 9209767d..a3e8ced6 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/test/__init__.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/test/__init__.py @@ -2,6 +2,7 @@ import logging import connexion from flask_testing import TestCase + from logs.encoder import JSONEncoder diff --git a/services/TS29222_CAPIF_Auditing_API/logs/test/test_default_controller.py b/services/TS29222_CAPIF_Auditing_API/logs/test/test_default_controller.py index 3223c999..edeb6213 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/test/test_default_controller.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/test/test_default_controller.py @@ -1,5 +1,12 @@ import unittest +from flask import json + +from logs.models.interface_description import InterfaceDescription # noqa: E501 +from logs.models.invocation_logs_retrieve_res import InvocationLogsRetrieveRes # noqa: E501 +from logs.models.operation import Operation # noqa: E501 +from logs.models.problem_details import ProblemDetails # noqa: E501 +from logs.models.protocol import Protocol # noqa: E501 from logs.test import BaseTestCase diff --git a/services/TS29222_CAPIF_Auditing_API/logs/typing_utils.py b/services/TS29222_CAPIF_Auditing_API/logs/typing_utils.py index d21c4f63..74e3c913 100644 --- a/services/TS29222_CAPIF_Auditing_API/logs/typing_utils.py +++ b/services/TS29222_CAPIF_Auditing_API/logs/typing_utils.py @@ -1,6 +1,7 @@ import sys if sys.version_info < (3, 7): + import typing def is_generic(klass): """ Determine whether klass is a generic class """ diff --git a/services/TS29222_CAPIF_Auditing_API/setup.py b/services/TS29222_CAPIF_Auditing_API/setup.py index c593a412..9e2a513e 100644 --- a/services/TS29222_CAPIF_Auditing_API/setup.py +++ b/services/TS29222_CAPIF_Auditing_API/setup.py @@ -1,3 +1,4 @@ +import sys from setuptools import setup, find_packages NAME = "logs" @@ -30,7 +31,7 @@ setup( entry_points={ 'console_scripts': ['logs=logs.__main__:main']}, long_description="""\ - API for auditing. © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. + API for auditing. © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. """ ) -- GitLab