From d353e5610d75356f0d0040e521a43160095bc1e8 Mon Sep 17 00:00:00 2001 From: Pelayo Torres Date: Wed, 24 Jul 2024 09:06:56 +0200 Subject: [PATCH] REL18 Security Service --- .../controllers/default_controller.py | 6 +- .../capif_routing_info/encoder.py | 2 +- .../capif_routing_info/models/__init__.py | 80 +-- .../capif_routing_info/models/aef_location.py | 12 +- .../capif_routing_info/models/aef_profile.py | 38 +- .../capif_routing_info/models/base_model.py | 2 +- .../models/civic_address.py | 4 +- .../models/communication_type.py | 4 +- .../models/custom_operation.py | 12 +- .../capif_routing_info/models/data_format.py | 4 +- .../models/ellipsoid_arc.py | 18 +- .../capif_routing_info/models/gad_shape.py | 8 +- .../models/geographic_area.py | 46 +- .../models/geographical_coordinates.py | 4 +- .../models/interface_description.py | 8 +- .../models/invalid_param.py | 4 +- .../models/ip_addr_range.py | 12 +- .../models/ipv4_address_range.py | 4 +- .../models/ipv4_address_range1.py | 4 +- .../capif_routing_info/models/ipv6_addr1.py | 4 +- .../models/ipv6_address_range.py | 4 +- .../models/ipv6_address_range1.py | 8 +- .../local2d_point_uncertainty_ellipse.py | 26 +- .../local3d_point_uncertainty_ellipsoid.py | 26 +- .../capif_routing_info/models/local_origin.py | 8 +- .../capif_routing_info/models/operation.py | 4 +- .../capif_routing_info/models/point.py | 18 +- .../models/point_altitude.py | 18 +- .../models/point_altitude_uncertainty.py | 22 +- .../models/point_uncertainty_circle.py | 18 +- .../models/point_uncertainty_ellipse.py | 22 +- .../capif_routing_info/models/polygon.py | 18 +- .../models/problem_details.py | 8 +- .../capif_routing_info/models/protocol.py | 4 +- .../models/relative_cartesian_location.py | 4 +- .../capif_routing_info/models/resource.py | 18 +- .../capif_routing_info/models/routing_info.py | 8 +- .../capif_routing_info/models/routing_rule.py | 18 +- .../models/security_method.py | 4 +- .../capif_routing_info/models/service_kpis.py | 4 +- .../models/supported_gad_shapes.py | 4 +- .../models/uncertainty_ellipse.py | 4 +- .../models/uncertainty_ellipsoid.py | 4 +- .../capif_routing_info/models/version.py | 12 +- .../capif_routing_info/test/__init__.py | 2 +- .../test/test_default_controller.py | 6 +- .../capif_routing_info/util.py | 2 +- .../.openapi-generator/FILES | 24 +- .../.openapi-generator/VERSION | 2 +- services/TS29222_CAPIF_Security_API/README.md | 2 +- .../capif_security/__main__.py | 19 - .../controllers/default_controller.py | 72 ++- .../controllers/security_controller_.py | 2 - .../capif_security/encoder.py | 5 +- .../capif_security/models/__init__.py | 12 +- .../models/access_token_claims.py | 51 +- .../capif_security/models/access_token_err.py | 17 +- .../models/access_token_err1.py | 17 +- .../capif_security/models/access_token_req.py | 151 ----- .../models/access_token_req1.py | 106 ++-- .../capif_security/models/access_token_rsp.py | 21 +- .../capif_security/models/base_model_.py | 69 --- .../capif_security/models/cause.py | 7 +- .../capif_security/models/cause_any_of.py | 42 -- .../models/interface_description.py | 95 ++- .../capif_security/models/invalid_param.py | 13 +- .../capif_security/models/invalid_param1.py | 13 +- .../capif_security/models/nf_type.py | 7 +- .../capif_security/models/nf_type_any_of.py | 95 --- .../capif_security/models/plmn_id.py | 17 +- .../capif_security/models/plmn_id_nid.py | 21 +- .../capif_security/models/problem_details.py | 49 +- .../capif_security/models/problem_details1.py | 111 +++- .../models/security_information.py | 70 ++- .../capif_security/models/security_method.py | 9 +- .../models/security_method_any_of.py | 44 -- .../models/security_notification.py | 21 +- .../capif_security/models/service_security.py | 25 +- .../capif_security/models/snssai.py | 13 +- .../models/websock_notif_config.py | 13 +- .../capif_security/openapi/openapi.yaml | 584 ++++++++++-------- .../capif_security/typing_utils.py | 2 - .../capif_security/util.py | 13 +- .../TS29222_CAPIF_Security_API/git_push.sh | 6 +- services/TS29222_CAPIF_Security_API/main.py | 61 -- .../requirements.txt | 2 +- services/TS29222_CAPIF_Security_API/setup.py | 4 +- .../test-requirements.txt | 6 +- services/TS29222_CAPIF_Security_API/tox.ini | 2 +- tests/libraries/security_api/bodyRequests.py | 4 +- 90 files changed, 1125 insertions(+), 1364 deletions(-) delete mode 100644 services/TS29222_CAPIF_Security_API/capif_security/__main__.py delete mode 100644 services/TS29222_CAPIF_Security_API/capif_security/controllers/security_controller_.py delete mode 100644 services/TS29222_CAPIF_Security_API/capif_security/models/access_token_req.py delete mode 100644 services/TS29222_CAPIF_Security_API/capif_security/models/base_model_.py delete mode 100644 services/TS29222_CAPIF_Security_API/capif_security/models/cause_any_of.py delete mode 100644 services/TS29222_CAPIF_Security_API/capif_security/models/nf_type_any_of.py delete mode 100644 services/TS29222_CAPIF_Security_API/capif_security/models/security_method_any_of.py delete mode 100644 services/TS29222_CAPIF_Security_API/main.py diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/controllers/default_controller.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/controllers/default_controller.py index 801b390..9dafc05 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/controllers/default_controller.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/controllers/default_controller.py @@ -3,9 +3,9 @@ from typing import Dict from typing import Tuple from typing import Union -from openapi_server.models.problem_details import ProblemDetails # noqa: E501 -from openapi_server.models.routing_info import RoutingInfo # noqa: E501 -from openapi_server import util +from capif_routing_info.models.problem_details import ProblemDetails # noqa: E501 +from capif_routing_info.models.routing_info import RoutingInfo # noqa: E501 +from capif_routing_info import util def service_apis_service_api_id_get(service_api_id, aef_id, supp_feat=None): # noqa: E501 diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/encoder.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/encoder.py index 60f4fa6..c81a749 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/encoder.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/encoder.py @@ -1,6 +1,6 @@ from connexion.apps.flask_app import FlaskJSONEncoder -from openapi_server.models.base_model import Model +from capif_routing_info.models.base_model import Model class JSONEncoder(FlaskJSONEncoder): diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/__init__.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/__init__.py index 00a1933..58b9b0c 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/__init__.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/__init__.py @@ -1,42 +1,42 @@ # flake8: noqa # import models into model package -from openapi_server.models.aef_location import AefLocation -from openapi_server.models.aef_profile import AefProfile -from openapi_server.models.civic_address import CivicAddress -from openapi_server.models.communication_type import CommunicationType -from openapi_server.models.custom_operation import CustomOperation -from openapi_server.models.data_format import DataFormat -from openapi_server.models.ellipsoid_arc import EllipsoidArc -from openapi_server.models.gad_shape import GADShape -from openapi_server.models.geographic_area import GeographicArea -from openapi_server.models.geographical_coordinates import GeographicalCoordinates -from openapi_server.models.interface_description import InterfaceDescription -from openapi_server.models.invalid_param import InvalidParam -from openapi_server.models.ip_addr_range import IpAddrRange -from openapi_server.models.ipv4_address_range import Ipv4AddressRange -from openapi_server.models.ipv4_address_range1 import Ipv4AddressRange1 -from openapi_server.models.ipv6_addr1 import Ipv6Addr1 -from openapi_server.models.ipv6_address_range import Ipv6AddressRange -from openapi_server.models.ipv6_address_range1 import Ipv6AddressRange1 -from openapi_server.models.local2d_point_uncertainty_ellipse import Local2dPointUncertaintyEllipse -from openapi_server.models.local3d_point_uncertainty_ellipsoid import Local3dPointUncertaintyEllipsoid -from openapi_server.models.local_origin import LocalOrigin -from openapi_server.models.operation import Operation -from openapi_server.models.point import Point -from openapi_server.models.point_altitude import PointAltitude -from openapi_server.models.point_altitude_uncertainty import PointAltitudeUncertainty -from openapi_server.models.point_uncertainty_circle import PointUncertaintyCircle -from openapi_server.models.point_uncertainty_ellipse import PointUncertaintyEllipse -from openapi_server.models.polygon import Polygon -from openapi_server.models.problem_details import ProblemDetails -from openapi_server.models.protocol import Protocol -from openapi_server.models.relative_cartesian_location import RelativeCartesianLocation -from openapi_server.models.resource import Resource -from openapi_server.models.routing_info import RoutingInfo -from openapi_server.models.routing_rule import RoutingRule -from openapi_server.models.security_method import SecurityMethod -from openapi_server.models.service_kpis import ServiceKpis -from openapi_server.models.supported_gad_shapes import SupportedGADShapes -from openapi_server.models.uncertainty_ellipse import UncertaintyEllipse -from openapi_server.models.uncertainty_ellipsoid import UncertaintyEllipsoid -from openapi_server.models.version import Version +from capif_routing_info.models.aef_location import AefLocation +from capif_routing_info.models.aef_profile import AefProfile +from capif_routing_info.models.civic_address import CivicAddress +from capif_routing_info.models.communication_type import CommunicationType +from capif_routing_info.models.custom_operation import CustomOperation +from capif_routing_info.models.data_format import DataFormat +from capif_routing_info.models.ellipsoid_arc import EllipsoidArc +from capif_routing_info.models.gad_shape import GADShape +from capif_routing_info.models.geographic_area import GeographicArea +from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates +from capif_routing_info.models.interface_description import InterfaceDescription +from capif_routing_info.models.invalid_param import InvalidParam +from capif_routing_info.models.ip_addr_range import IpAddrRange +from capif_routing_info.models.ipv4_address_range import Ipv4AddressRange +from capif_routing_info.models.ipv4_address_range1 import Ipv4AddressRange1 +from capif_routing_info.models.ipv6_addr1 import Ipv6Addr1 +from capif_routing_info.models.ipv6_address_range import Ipv6AddressRange +from capif_routing_info.models.ipv6_address_range1 import Ipv6AddressRange1 +from capif_routing_info.models.local2d_point_uncertainty_ellipse import Local2dPointUncertaintyEllipse +from capif_routing_info.models.local3d_point_uncertainty_ellipsoid import Local3dPointUncertaintyEllipsoid +from capif_routing_info.models.local_origin import LocalOrigin +from capif_routing_info.models.operation import Operation +from capif_routing_info.models.point import Point +from capif_routing_info.models.point_altitude import PointAltitude +from capif_routing_info.models.point_altitude_uncertainty import PointAltitudeUncertainty +from capif_routing_info.models.point_uncertainty_circle import PointUncertaintyCircle +from capif_routing_info.models.point_uncertainty_ellipse import PointUncertaintyEllipse +from capif_routing_info.models.polygon import Polygon +from capif_routing_info.models.problem_details import ProblemDetails +from capif_routing_info.models.protocol import Protocol +from capif_routing_info.models.relative_cartesian_location import RelativeCartesianLocation +from capif_routing_info.models.resource import Resource +from capif_routing_info.models.routing_info import RoutingInfo +from capif_routing_info.models.routing_rule import RoutingRule +from capif_routing_info.models.security_method import SecurityMethod +from capif_routing_info.models.service_kpis import ServiceKpis +from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes +from capif_routing_info.models.uncertainty_ellipse import UncertaintyEllipse +from capif_routing_info.models.uncertainty_ellipsoid import UncertaintyEllipsoid +from capif_routing_info.models.version import Version diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/aef_location.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/aef_location.py index 7e4da31..e60b523 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/aef_location.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/aef_location.py @@ -2,13 +2,13 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server.models.civic_address import CivicAddress -from openapi_server.models.geographic_area import GeographicArea -from openapi_server import util +from capif_routing_info.models.base_model import Model +from capif_routing_info.models.civic_address import CivicAddress +from capif_routing_info.models.geographic_area import GeographicArea +from capif_routing_info import util -from openapi_server.models.civic_address import CivicAddress # noqa: E501 -from openapi_server.models.geographic_area import GeographicArea # noqa: E501 +from capif_routing_info.models.civic_address import CivicAddress # noqa: E501 +from capif_routing_info.models.geographic_area import GeographicArea # noqa: E501 class AefLocation(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/aef_profile.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/aef_profile.py index 7b9982b..b5dd194 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/aef_profile.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/aef_profile.py @@ -2,25 +2,25 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server.models.aef_location import AefLocation -from openapi_server.models.data_format import DataFormat -from openapi_server.models.interface_description import InterfaceDescription -from openapi_server.models.ip_addr_range import IpAddrRange -from openapi_server.models.protocol import Protocol -from openapi_server.models.security_method import SecurityMethod -from openapi_server.models.service_kpis import ServiceKpis -from openapi_server.models.version import Version -from openapi_server import util - -from openapi_server.models.aef_location import AefLocation # noqa: E501 -from openapi_server.models.data_format import DataFormat # noqa: E501 -from openapi_server.models.interface_description import InterfaceDescription # noqa: E501 -from openapi_server.models.ip_addr_range import IpAddrRange # noqa: E501 -from openapi_server.models.protocol import Protocol # noqa: E501 -from openapi_server.models.security_method import SecurityMethod # noqa: E501 -from openapi_server.models.service_kpis import ServiceKpis # noqa: E501 -from openapi_server.models.version import Version # noqa: E501 +from capif_routing_info.models.base_model import Model +from capif_routing_info.models.aef_location import AefLocation +from capif_routing_info.models.data_format import DataFormat +from capif_routing_info.models.interface_description import InterfaceDescription +from capif_routing_info.models.ip_addr_range import IpAddrRange +from capif_routing_info.models.protocol import Protocol +from capif_routing_info.models.security_method import SecurityMethod +from capif_routing_info.models.service_kpis import ServiceKpis +from capif_routing_info.models.version import Version +from capif_routing_info import util + +from capif_routing_info.models.aef_location import AefLocation # noqa: E501 +from capif_routing_info.models.data_format import DataFormat # noqa: E501 +from capif_routing_info.models.interface_description import InterfaceDescription # noqa: E501 +from capif_routing_info.models.ip_addr_range import IpAddrRange # noqa: E501 +from capif_routing_info.models.protocol import Protocol # noqa: E501 +from capif_routing_info.models.security_method import SecurityMethod # noqa: E501 +from capif_routing_info.models.service_kpis import ServiceKpis # noqa: E501 +from capif_routing_info.models.version import Version # noqa: E501 class AefProfile(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/base_model.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/base_model.py index c01b423..4849636 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/base_model.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/base_model.py @@ -2,7 +2,7 @@ import pprint import typing -from openapi_server import util +from capif_routing_info import util T = typing.TypeVar('T') diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/civic_address.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/civic_address.py index 5f0f6f3..fd306ef 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/civic_address.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/civic_address.py @@ -2,8 +2,8 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server import util +from capif_routing_info.models.base_model import Model +from capif_routing_info import util class CivicAddress(Model): diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/communication_type.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/communication_type.py index 001efa0..c355c6d 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/communication_type.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/communication_type.py @@ -2,8 +2,8 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server import util +from capif_routing_info.models.base_model import Model +from capif_routing_info import util class CommunicationType(Model): diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/custom_operation.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/custom_operation.py index f258fc7..0e0995b 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/custom_operation.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/custom_operation.py @@ -2,13 +2,13 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server.models.communication_type import CommunicationType -from openapi_server.models.operation import Operation -from openapi_server import util +from capif_routing_info.models.base_model import Model +from capif_routing_info.models.communication_type import CommunicationType +from capif_routing_info.models.operation import Operation +from capif_routing_info import util -from openapi_server.models.communication_type import CommunicationType # noqa: E501 -from openapi_server.models.operation import Operation # noqa: E501 +from capif_routing_info.models.communication_type import CommunicationType # noqa: E501 +from capif_routing_info.models.operation import Operation # noqa: E501 class CustomOperation(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/data_format.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/data_format.py index 701260c..83f31a2 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/data_format.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/data_format.py @@ -2,8 +2,8 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server import util +from capif_routing_info.models.base_model import Model +from capif_routing_info import util class DataFormat(Model): diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ellipsoid_arc.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ellipsoid_arc.py index ec6f120..345698c 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ellipsoid_arc.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ellipsoid_arc.py @@ -2,15 +2,15 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server.models.gad_shape import GADShape -from openapi_server.models.geographical_coordinates import GeographicalCoordinates -from openapi_server.models.supported_gad_shapes import SupportedGADShapes -from openapi_server import util - -from openapi_server.models.gad_shape import GADShape # noqa: E501 -from openapi_server.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 -from openapi_server.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 +from capif_routing_info.models.base_model import Model +from capif_routing_info.models.gad_shape import GADShape +from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates +from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes +from capif_routing_info import util + +from capif_routing_info.models.gad_shape import GADShape # noqa: E501 +from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 +from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 class EllipsoidArc(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/gad_shape.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/gad_shape.py index 69ff529..d956d8d 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/gad_shape.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/gad_shape.py @@ -2,11 +2,11 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server.models.supported_gad_shapes import SupportedGADShapes -from openapi_server import util +from capif_routing_info.models.base_model import Model +from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes +from capif_routing_info import util -from openapi_server.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 +from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 class GADShape(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/geographic_area.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/geographic_area.py index 2215abe..5c15982 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/geographic_area.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/geographic_area.py @@ -2,29 +2,29 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server.models.ellipsoid_arc import EllipsoidArc -from openapi_server.models.geographical_coordinates import GeographicalCoordinates -from openapi_server.models.point import Point -from openapi_server.models.point_altitude import PointAltitude -from openapi_server.models.point_altitude_uncertainty import PointAltitudeUncertainty -from openapi_server.models.point_uncertainty_circle import PointUncertaintyCircle -from openapi_server.models.point_uncertainty_ellipse import PointUncertaintyEllipse -from openapi_server.models.polygon import Polygon -from openapi_server.models.supported_gad_shapes import SupportedGADShapes -from openapi_server.models.uncertainty_ellipse import UncertaintyEllipse -from openapi_server import util - -from openapi_server.models.ellipsoid_arc import EllipsoidArc # noqa: E501 -from openapi_server.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 -from openapi_server.models.point import Point # noqa: E501 -from openapi_server.models.point_altitude import PointAltitude # noqa: E501 -from openapi_server.models.point_altitude_uncertainty import PointAltitudeUncertainty # noqa: E501 -from openapi_server.models.point_uncertainty_circle import PointUncertaintyCircle # noqa: E501 -from openapi_server.models.point_uncertainty_ellipse import PointUncertaintyEllipse # noqa: E501 -from openapi_server.models.polygon import Polygon # noqa: E501 -from openapi_server.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 -from openapi_server.models.uncertainty_ellipse import UncertaintyEllipse # noqa: E501 +from capif_routing_info.models.base_model import Model +from capif_routing_info.models.ellipsoid_arc import EllipsoidArc +from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates +from capif_routing_info.models.point import Point +from capif_routing_info.models.point_altitude import PointAltitude +from capif_routing_info.models.point_altitude_uncertainty import PointAltitudeUncertainty +from capif_routing_info.models.point_uncertainty_circle import PointUncertaintyCircle +from capif_routing_info.models.point_uncertainty_ellipse import PointUncertaintyEllipse +from capif_routing_info.models.polygon import Polygon +from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes +from capif_routing_info.models.uncertainty_ellipse import UncertaintyEllipse +from capif_routing_info import util + +from capif_routing_info.models.ellipsoid_arc import EllipsoidArc # noqa: E501 +from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 +from capif_routing_info.models.point import Point # noqa: E501 +from capif_routing_info.models.point_altitude import PointAltitude # noqa: E501 +from capif_routing_info.models.point_altitude_uncertainty import PointAltitudeUncertainty # noqa: E501 +from capif_routing_info.models.point_uncertainty_circle import PointUncertaintyCircle # noqa: E501 +from capif_routing_info.models.point_uncertainty_ellipse import PointUncertaintyEllipse # noqa: E501 +from capif_routing_info.models.polygon import Polygon # noqa: E501 +from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 +from capif_routing_info.models.uncertainty_ellipse import UncertaintyEllipse # noqa: E501 class GeographicArea(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/geographical_coordinates.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/geographical_coordinates.py index a25d0f8..8b0e51f 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/geographical_coordinates.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/geographical_coordinates.py @@ -2,8 +2,8 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server import util +from capif_routing_info.models.base_model import Model +from capif_routing_info import util class GeographicalCoordinates(Model): diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/interface_description.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/interface_description.py index 332bdeb..00e9589 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/interface_description.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/interface_description.py @@ -2,12 +2,12 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server.models.security_method import SecurityMethod +from capif_routing_info.models.base_model import Model +from capif_routing_info.models.security_method import SecurityMethod import re -from openapi_server import util +from capif_routing_info import util -from openapi_server.models.security_method import SecurityMethod # noqa: E501 +from capif_routing_info.models.security_method import SecurityMethod # noqa: E501 import re # noqa: E501 class InterfaceDescription(Model): diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/invalid_param.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/invalid_param.py index e8cb5be..e6d4ede 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/invalid_param.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/invalid_param.py @@ -2,8 +2,8 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server import util +from capif_routing_info.models.base_model import Model +from capif_routing_info import util class InvalidParam(Model): diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ip_addr_range.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ip_addr_range.py index 1987a1b..d470760 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ip_addr_range.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ip_addr_range.py @@ -2,13 +2,13 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server.models.ipv4_address_range1 import Ipv4AddressRange1 -from openapi_server.models.ipv6_address_range1 import Ipv6AddressRange1 -from openapi_server import util +from capif_routing_info.models.base_model import Model +from capif_routing_info.models.ipv4_address_range1 import Ipv4AddressRange1 +from capif_routing_info.models.ipv6_address_range1 import Ipv6AddressRange1 +from capif_routing_info import util -from openapi_server.models.ipv4_address_range1 import Ipv4AddressRange1 # noqa: E501 -from openapi_server.models.ipv6_address_range1 import Ipv6AddressRange1 # noqa: E501 +from capif_routing_info.models.ipv4_address_range1 import Ipv4AddressRange1 # noqa: E501 +from capif_routing_info.models.ipv6_address_range1 import Ipv6AddressRange1 # noqa: E501 class IpAddrRange(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv4_address_range.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv4_address_range.py index 2dc2c8d..b50e0b2 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv4_address_range.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv4_address_range.py @@ -2,9 +2,9 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model +from capif_routing_info.models.base_model import Model import re -from openapi_server import util +from capif_routing_info import util import re # noqa: E501 diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv4_address_range1.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv4_address_range1.py index e72433d..39fa467 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv4_address_range1.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv4_address_range1.py @@ -2,9 +2,9 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model +from capif_routing_info.models.base_model import Model import re -from openapi_server import util +from capif_routing_info import util import re # noqa: E501 diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv6_addr1.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv6_addr1.py index 1845359..f4248ba 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv6_addr1.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv6_addr1.py @@ -2,8 +2,8 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server import util +from capif_routing_info.models.base_model import Model +from capif_routing_info import util class Ipv6Addr1(Model): diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv6_address_range.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv6_address_range.py index f928f7c..aeaff9c 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv6_address_range.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv6_address_range.py @@ -2,8 +2,8 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server import util +from capif_routing_info.models.base_model import Model +from capif_routing_info import util class Ipv6AddressRange(Model): diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv6_address_range1.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv6_address_range1.py index 552dab1..a1060d8 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv6_address_range1.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/ipv6_address_range1.py @@ -2,11 +2,11 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server.models.ipv6_addr1 import Ipv6Addr1 -from openapi_server import util +from capif_routing_info.models.base_model import Model +from capif_routing_info.models.ipv6_addr1 import Ipv6Addr1 +from capif_routing_info import util -from openapi_server.models.ipv6_addr1 import Ipv6Addr1 # noqa: E501 +from capif_routing_info.models.ipv6_addr1 import Ipv6Addr1 # noqa: E501 class Ipv6AddressRange1(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/local2d_point_uncertainty_ellipse.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/local2d_point_uncertainty_ellipse.py index 5a50d8a..c9b258b 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/local2d_point_uncertainty_ellipse.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/local2d_point_uncertainty_ellipse.py @@ -2,19 +2,19 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server.models.gad_shape import GADShape -from openapi_server.models.local_origin import LocalOrigin -from openapi_server.models.relative_cartesian_location import RelativeCartesianLocation -from openapi_server.models.supported_gad_shapes import SupportedGADShapes -from openapi_server.models.uncertainty_ellipse import UncertaintyEllipse -from openapi_server import util - -from openapi_server.models.gad_shape import GADShape # noqa: E501 -from openapi_server.models.local_origin import LocalOrigin # noqa: E501 -from openapi_server.models.relative_cartesian_location import RelativeCartesianLocation # noqa: E501 -from openapi_server.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 -from openapi_server.models.uncertainty_ellipse import UncertaintyEllipse # noqa: E501 +from capif_routing_info.models.base_model import Model +from capif_routing_info.models.gad_shape import GADShape +from capif_routing_info.models.local_origin import LocalOrigin +from capif_routing_info.models.relative_cartesian_location import RelativeCartesianLocation +from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes +from capif_routing_info.models.uncertainty_ellipse import UncertaintyEllipse +from capif_routing_info import util + +from capif_routing_info.models.gad_shape import GADShape # noqa: E501 +from capif_routing_info.models.local_origin import LocalOrigin # noqa: E501 +from capif_routing_info.models.relative_cartesian_location import RelativeCartesianLocation # noqa: E501 +from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 +from capif_routing_info.models.uncertainty_ellipse import UncertaintyEllipse # noqa: E501 class Local2dPointUncertaintyEllipse(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/local3d_point_uncertainty_ellipsoid.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/local3d_point_uncertainty_ellipsoid.py index 36e2e67..2539de2 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/local3d_point_uncertainty_ellipsoid.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/local3d_point_uncertainty_ellipsoid.py @@ -2,19 +2,19 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server.models.gad_shape import GADShape -from openapi_server.models.local_origin import LocalOrigin -from openapi_server.models.relative_cartesian_location import RelativeCartesianLocation -from openapi_server.models.supported_gad_shapes import SupportedGADShapes -from openapi_server.models.uncertainty_ellipsoid import UncertaintyEllipsoid -from openapi_server import util - -from openapi_server.models.gad_shape import GADShape # noqa: E501 -from openapi_server.models.local_origin import LocalOrigin # noqa: E501 -from openapi_server.models.relative_cartesian_location import RelativeCartesianLocation # noqa: E501 -from openapi_server.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 -from openapi_server.models.uncertainty_ellipsoid import UncertaintyEllipsoid # noqa: E501 +from capif_routing_info.models.base_model import Model +from capif_routing_info.models.gad_shape import GADShape +from capif_routing_info.models.local_origin import LocalOrigin +from capif_routing_info.models.relative_cartesian_location import RelativeCartesianLocation +from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes +from capif_routing_info.models.uncertainty_ellipsoid import UncertaintyEllipsoid +from capif_routing_info import util + +from capif_routing_info.models.gad_shape import GADShape # noqa: E501 +from capif_routing_info.models.local_origin import LocalOrigin # noqa: E501 +from capif_routing_info.models.relative_cartesian_location import RelativeCartesianLocation # noqa: E501 +from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 +from capif_routing_info.models.uncertainty_ellipsoid import UncertaintyEllipsoid # noqa: E501 class Local3dPointUncertaintyEllipsoid(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/local_origin.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/local_origin.py index ff016ef..45fc982 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/local_origin.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/local_origin.py @@ -2,11 +2,11 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server.models.geographical_coordinates import GeographicalCoordinates -from openapi_server import util +from capif_routing_info.models.base_model import Model +from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates +from capif_routing_info import util -from openapi_server.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 +from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 class LocalOrigin(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/operation.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/operation.py index 5f3a3b7..856dc77 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/operation.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/operation.py @@ -2,8 +2,8 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server import util +from capif_routing_info.models.base_model import Model +from capif_routing_info import util class Operation(Model): diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/point.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/point.py index e9db65b..88b0a92 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/point.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/point.py @@ -2,15 +2,15 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server.models.gad_shape import GADShape -from openapi_server.models.geographical_coordinates import GeographicalCoordinates -from openapi_server.models.supported_gad_shapes import SupportedGADShapes -from openapi_server import util - -from openapi_server.models.gad_shape import GADShape # noqa: E501 -from openapi_server.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 -from openapi_server.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 +from capif_routing_info.models.base_model import Model +from capif_routing_info.models.gad_shape import GADShape +from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates +from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes +from capif_routing_info import util + +from capif_routing_info.models.gad_shape import GADShape # noqa: E501 +from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 +from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 class Point(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/point_altitude.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/point_altitude.py index 9aa7cfc..ff5cab9 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/point_altitude.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/point_altitude.py @@ -2,15 +2,15 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server.models.gad_shape import GADShape -from openapi_server.models.geographical_coordinates import GeographicalCoordinates -from openapi_server.models.supported_gad_shapes import SupportedGADShapes -from openapi_server import util - -from openapi_server.models.gad_shape import GADShape # noqa: E501 -from openapi_server.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 -from openapi_server.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 +from capif_routing_info.models.base_model import Model +from capif_routing_info.models.gad_shape import GADShape +from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates +from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes +from capif_routing_info import util + +from capif_routing_info.models.gad_shape import GADShape # noqa: E501 +from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 +from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 class PointAltitude(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/point_altitude_uncertainty.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/point_altitude_uncertainty.py index b1aee47..fdcea5e 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/point_altitude_uncertainty.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/point_altitude_uncertainty.py @@ -2,17 +2,17 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server.models.gad_shape import GADShape -from openapi_server.models.geographical_coordinates import GeographicalCoordinates -from openapi_server.models.supported_gad_shapes import SupportedGADShapes -from openapi_server.models.uncertainty_ellipse import UncertaintyEllipse -from openapi_server import util - -from openapi_server.models.gad_shape import GADShape # noqa: E501 -from openapi_server.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 -from openapi_server.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 -from openapi_server.models.uncertainty_ellipse import UncertaintyEllipse # noqa: E501 +from capif_routing_info.models.base_model import Model +from capif_routing_info.models.gad_shape import GADShape +from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates +from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes +from capif_routing_info.models.uncertainty_ellipse import UncertaintyEllipse +from capif_routing_info import util + +from capif_routing_info.models.gad_shape import GADShape # noqa: E501 +from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 +from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 +from capif_routing_info.models.uncertainty_ellipse import UncertaintyEllipse # noqa: E501 class PointAltitudeUncertainty(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/point_uncertainty_circle.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/point_uncertainty_circle.py index ad1bb02..80faac4 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/point_uncertainty_circle.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/point_uncertainty_circle.py @@ -2,15 +2,15 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server.models.gad_shape import GADShape -from openapi_server.models.geographical_coordinates import GeographicalCoordinates -from openapi_server.models.supported_gad_shapes import SupportedGADShapes -from openapi_server import util - -from openapi_server.models.gad_shape import GADShape # noqa: E501 -from openapi_server.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 -from openapi_server.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 +from capif_routing_info.models.base_model import Model +from capif_routing_info.models.gad_shape import GADShape +from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates +from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes +from capif_routing_info import util + +from capif_routing_info.models.gad_shape import GADShape # noqa: E501 +from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 +from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 class PointUncertaintyCircle(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/point_uncertainty_ellipse.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/point_uncertainty_ellipse.py index ae5ce92..03c55bf 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/point_uncertainty_ellipse.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/point_uncertainty_ellipse.py @@ -2,17 +2,17 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server.models.gad_shape import GADShape -from openapi_server.models.geographical_coordinates import GeographicalCoordinates -from openapi_server.models.supported_gad_shapes import SupportedGADShapes -from openapi_server.models.uncertainty_ellipse import UncertaintyEllipse -from openapi_server import util - -from openapi_server.models.gad_shape import GADShape # noqa: E501 -from openapi_server.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 -from openapi_server.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 -from openapi_server.models.uncertainty_ellipse import UncertaintyEllipse # noqa: E501 +from capif_routing_info.models.base_model import Model +from capif_routing_info.models.gad_shape import GADShape +from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates +from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes +from capif_routing_info.models.uncertainty_ellipse import UncertaintyEllipse +from capif_routing_info import util + +from capif_routing_info.models.gad_shape import GADShape # noqa: E501 +from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 +from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 +from capif_routing_info.models.uncertainty_ellipse import UncertaintyEllipse # noqa: E501 class PointUncertaintyEllipse(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/polygon.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/polygon.py index 9dfe4c2..3af36a1 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/polygon.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/polygon.py @@ -2,15 +2,15 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server.models.gad_shape import GADShape -from openapi_server.models.geographical_coordinates import GeographicalCoordinates -from openapi_server.models.supported_gad_shapes import SupportedGADShapes -from openapi_server import util - -from openapi_server.models.gad_shape import GADShape # noqa: E501 -from openapi_server.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 -from openapi_server.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 +from capif_routing_info.models.base_model import Model +from capif_routing_info.models.gad_shape import GADShape +from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates +from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes +from capif_routing_info import util + +from capif_routing_info.models.gad_shape import GADShape # noqa: E501 +from capif_routing_info.models.geographical_coordinates import GeographicalCoordinates # noqa: E501 +from capif_routing_info.models.supported_gad_shapes import SupportedGADShapes # noqa: E501 class Polygon(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/problem_details.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/problem_details.py index 9c42429..3fc488d 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/problem_details.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/problem_details.py @@ -2,12 +2,12 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server.models.invalid_param import InvalidParam +from capif_routing_info.models.base_model import Model +from capif_routing_info.models.invalid_param import InvalidParam import re -from openapi_server import util +from capif_routing_info import util -from openapi_server.models.invalid_param import InvalidParam # noqa: E501 +from capif_routing_info.models.invalid_param import InvalidParam # noqa: E501 import re # noqa: E501 class ProblemDetails(Model): diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/protocol.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/protocol.py index b705e01..fe4b2bf 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/protocol.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/protocol.py @@ -2,8 +2,8 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server import util +from capif_routing_info.models.base_model import Model +from capif_routing_info import util class Protocol(Model): diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/relative_cartesian_location.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/relative_cartesian_location.py index aff0020..592f4bc 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/relative_cartesian_location.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/relative_cartesian_location.py @@ -2,8 +2,8 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server import util +from capif_routing_info.models.base_model import Model +from capif_routing_info import util class RelativeCartesianLocation(Model): diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/resource.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/resource.py index 696f10a..c654087 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/resource.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/resource.py @@ -2,15 +2,15 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server.models.communication_type import CommunicationType -from openapi_server.models.custom_operation import CustomOperation -from openapi_server.models.operation import Operation -from openapi_server import util - -from openapi_server.models.communication_type import CommunicationType # noqa: E501 -from openapi_server.models.custom_operation import CustomOperation # noqa: E501 -from openapi_server.models.operation import Operation # noqa: E501 +from capif_routing_info.models.base_model import Model +from capif_routing_info.models.communication_type import CommunicationType +from capif_routing_info.models.custom_operation import CustomOperation +from capif_routing_info.models.operation import Operation +from capif_routing_info import util + +from capif_routing_info.models.communication_type import CommunicationType # noqa: E501 +from capif_routing_info.models.custom_operation import CustomOperation # noqa: E501 +from capif_routing_info.models.operation import Operation # noqa: E501 class Resource(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/routing_info.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/routing_info.py index 839c876..8d08604 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/routing_info.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/routing_info.py @@ -2,11 +2,11 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server.models.routing_rule import RoutingRule -from openapi_server import util +from capif_routing_info.models.base_model import Model +from capif_routing_info.models.routing_rule import RoutingRule +from capif_routing_info import util -from openapi_server.models.routing_rule import RoutingRule # noqa: E501 +from capif_routing_info.models.routing_rule import RoutingRule # noqa: E501 class RoutingInfo(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/routing_rule.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/routing_rule.py index 96573ff..88cb2c7 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/routing_rule.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/routing_rule.py @@ -2,15 +2,15 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server.models.aef_profile import AefProfile -from openapi_server.models.ipv4_address_range import Ipv4AddressRange -from openapi_server.models.ipv6_address_range import Ipv6AddressRange -from openapi_server import util - -from openapi_server.models.aef_profile import AefProfile # noqa: E501 -from openapi_server.models.ipv4_address_range import Ipv4AddressRange # noqa: E501 -from openapi_server.models.ipv6_address_range import Ipv6AddressRange # noqa: E501 +from capif_routing_info.models.base_model import Model +from capif_routing_info.models.aef_profile import AefProfile +from capif_routing_info.models.ipv4_address_range import Ipv4AddressRange +from capif_routing_info.models.ipv6_address_range import Ipv6AddressRange +from capif_routing_info import util + +from capif_routing_info.models.aef_profile import AefProfile # noqa: E501 +from capif_routing_info.models.ipv4_address_range import Ipv4AddressRange # noqa: E501 +from capif_routing_info.models.ipv6_address_range import Ipv6AddressRange # noqa: E501 class RoutingRule(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/security_method.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/security_method.py index 2bf3a59..0ef293d 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/security_method.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/security_method.py @@ -2,8 +2,8 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server import util +from capif_routing_info.models.base_model import Model +from capif_routing_info import util class SecurityMethod(Model): diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/service_kpis.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/service_kpis.py index 3a55160..4c07b02 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/service_kpis.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/service_kpis.py @@ -2,9 +2,9 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model +from capif_routing_info.models.base_model import Model import re -from openapi_server import util +from capif_routing_info import util import re # noqa: E501 diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/supported_gad_shapes.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/supported_gad_shapes.py index 971a04c..e238c97 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/supported_gad_shapes.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/supported_gad_shapes.py @@ -2,8 +2,8 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server import util +from capif_routing_info.models.base_model import Model +from capif_routing_info import util class SupportedGADShapes(Model): diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/uncertainty_ellipse.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/uncertainty_ellipse.py index ae5d031..27a6acd 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/uncertainty_ellipse.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/uncertainty_ellipse.py @@ -2,8 +2,8 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server import util +from capif_routing_info.models.base_model import Model +from capif_routing_info import util class UncertaintyEllipse(Model): diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/uncertainty_ellipsoid.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/uncertainty_ellipsoid.py index ac84487..45538ba 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/uncertainty_ellipsoid.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/uncertainty_ellipsoid.py @@ -2,8 +2,8 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server import util +from capif_routing_info.models.base_model import Model +from capif_routing_info import util class UncertaintyEllipsoid(Model): diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/version.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/version.py index eb18ce3..1be123d 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/version.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/models/version.py @@ -2,13 +2,13 @@ from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from openapi_server.models.base_model import Model -from openapi_server.models.custom_operation import CustomOperation -from openapi_server.models.resource import Resource -from openapi_server import util +from capif_routing_info.models.base_model import Model +from capif_routing_info.models.custom_operation import CustomOperation +from capif_routing_info.models.resource import Resource +from capif_routing_info import util -from openapi_server.models.custom_operation import CustomOperation # noqa: E501 -from openapi_server.models.resource import Resource # noqa: E501 +from capif_routing_info.models.custom_operation import CustomOperation # noqa: E501 +from capif_routing_info.models.resource import Resource # noqa: E501 class Version(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/test/__init__.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/test/__init__.py index 364aba9..e95f59c 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/test/__init__.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/test/__init__.py @@ -3,7 +3,7 @@ import logging import connexion from flask_testing import TestCase -from openapi_server.encoder import JSONEncoder +from capif_routing_info.encoder import JSONEncoder class BaseTestCase(TestCase): diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/test/test_default_controller.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/test/test_default_controller.py index 74e2fbb..7241b49 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/test/test_default_controller.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/test/test_default_controller.py @@ -2,9 +2,9 @@ import unittest from flask import json -from openapi_server.models.problem_details import ProblemDetails # noqa: E501 -from openapi_server.models.routing_info import RoutingInfo # noqa: E501 -from openapi_server.test import BaseTestCase +from capif_routing_info.models.problem_details import ProblemDetails # noqa: E501 +from capif_routing_info.models.routing_info import RoutingInfo # noqa: E501 +from capif_routing_info.test import BaseTestCase class TestDefaultController(BaseTestCase): diff --git a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/util.py b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/util.py index bd83c5b..6f369d5 100644 --- a/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/util.py +++ b/services/TS29222_CAPIF_Routing_Info_API/capif_routing_info/util.py @@ -1,7 +1,7 @@ import datetime import typing -from openapi_server import typing_utils +from capif_routing_info import typing_utils def _deserialize(data, klass): diff --git a/services/TS29222_CAPIF_Security_API/.openapi-generator/FILES b/services/TS29222_CAPIF_Security_API/.openapi-generator/FILES index 80c09cf..1fd34c2 100644 --- a/services/TS29222_CAPIF_Security_API/.openapi-generator/FILES +++ b/services/TS29222_CAPIF_Security_API/.openapi-generator/FILES @@ -1,35 +1,49 @@ .dockerignore .gitignore +.openapi-generator-ignore .travis.yml Dockerfile README.md +git_push.sh capif_security/__init__.py capif_security/__main__.py capif_security/controllers/__init__.py capif_security/controllers/default_controller.py -capif_security/controllers/security_controller_.py +capif_security/controllers/security_controller.py capif_security/encoder.py capif_security/models/__init__.py capif_security/models/access_token_claims.py capif_security/models/access_token_err.py +capif_security/models/access_token_err1.py +capif_security/models/access_token_req1.py capif_security/models/access_token_rsp.py -capif_security/models/base_model_.py +capif_security/models/base_model.py capif_security/models/cause.py -capif_security/models/cause_any_of.py capif_security/models/interface_description.py capif_security/models/invalid_param.py +capif_security/models/invalid_param1.py +capif_security/models/nf_type.py +capif_security/models/no_profile_match_info.py +capif_security/models/no_profile_match_reason.py +capif_security/models/o_auth_grant_type.py +capif_security/models/plmn_id.py +capif_security/models/plmn_id_nid.py capif_security/models/problem_details.py +capif_security/models/problem_details1.py +capif_security/models/query_param_combination.py +capif_security/models/query_parameter.py +capif_security/models/res_owner_id.py capif_security/models/security_information.py capif_security/models/security_method.py -capif_security/models/security_method_any_of.py capif_security/models/security_notification.py capif_security/models/service_security.py +capif_security/models/snssai.py capif_security/models/websock_notif_config.py capif_security/openapi/openapi.yaml capif_security/test/__init__.py +capif_security/test/test_default_controller.py capif_security/typing_utils.py capif_security/util.py -git_push.sh requirements.txt setup.py test-requirements.txt diff --git a/services/TS29222_CAPIF_Security_API/.openapi-generator/VERSION b/services/TS29222_CAPIF_Security_API/.openapi-generator/VERSION index 4b448de..18bb418 100644 --- a/services/TS29222_CAPIF_Security_API/.openapi-generator/VERSION +++ b/services/TS29222_CAPIF_Security_API/.openapi-generator/VERSION @@ -1 +1 @@ -5.3.0-SNAPSHOT \ No newline at end of file +7.5.0 diff --git a/services/TS29222_CAPIF_Security_API/README.md b/services/TS29222_CAPIF_Security_API/README.md index 66df109..6534bce 100644 --- a/services/TS29222_CAPIF_Security_API/README.md +++ b/services/TS29222_CAPIF_Security_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 capif_security +python3 -m openapi_server ``` and open your browser to here: diff --git a/services/TS29222_CAPIF_Security_API/capif_security/__main__.py b/services/TS29222_CAPIF_Security_API/capif_security/__main__.py deleted file mode 100644 index fe1e26f..0000000 --- a/services/TS29222_CAPIF_Security_API/capif_security/__main__.py +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env python3 - -import connexion - -from capif_security import encoder - - -def main(): - app = connexion.App(__name__, specification_dir='./openapi/') - app.app.json_encoder = encoder.JSONEncoder - app.add_api('openapi.yaml', - arguments={'title': 'CAPIF_Security_API'}, - pythonic_params=True) - - app.run(port=8080) - - -if __name__ == '__main__': - main() diff --git a/services/TS29222_CAPIF_Security_API/capif_security/controllers/default_controller.py b/services/TS29222_CAPIF_Security_API/capif_security/controllers/default_controller.py index 7e04d4d..ee8182d 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/controllers/default_controller.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/controllers/default_controller.py @@ -1,20 +1,26 @@ import connexion - -from ..models.access_token_req import AccessTokenReq # noqa: E501 -from ..models.security_notification import SecurityNotification # noqa: E501 -from ..models.service_security import ServiceSecurity # noqa: E501 - -from ..core.servicesecurity import SecurityOperations - -from ..core.publisher import Publisher - -from flask import Response, request, current_app +from typing import Dict +from typing import Tuple +from typing import Union + +from capif_security.models.access_token_err import AccessTokenErr # noqa: E501 +from capif_security.models.access_token_rsp import AccessTokenRsp # noqa: E501 +from capif_security.models.problem_details import ProblemDetails # noqa: E501 +from capif_security.models.res_owner_id import ResOwnerId # noqa: E501 +from capif_security.models.security_notification import SecurityNotification # noqa: E501 +from capif_security.models.service_security import ServiceSecurity # noqa: E501 +from capif_security import util from cryptography import x509 from cryptography.hazmat.backends import default_backend from ..core.validate_user import ControlAccess from functools import wraps +from ..core.publisher import Publisher + +from ..core.servicesecurity import SecurityOperations + +from flask import Response, request, current_app service_security_ops = SecurityOperations() publish_ops = Publisher() @@ -58,21 +64,37 @@ def securities_security_id_token_post(security_id, body): # noqa: E501 :param security_id: Identifier of an individual API invoker :type security_id: str - :param grant_type: + :param grant_type: :type grant_type: str - :param client_id: + :param client_id: :type client_id: str - :param client_secret: + :param res_owner_id: + :type res_owner_id: dict | bytes + :param client_secret: :type client_secret: str - :param scope: + :param scope: :type scope: str + :param auth_code: + :type auth_code: str + :param redirect_uri: + :type redirect_uri: str - :rtype: AccessTokenRsp + :rtype: Union[AccessTokenRsp, Tuple[AccessTokenRsp, int], Tuple[AccessTokenRsp, int, Dict[str, str]] """ - - current_app.logger.info("Creating security token") if connexion.request.is_json: - body = AccessTokenReq.from_dict(connexion.request.get_json()) # noqa: E501 + res_owner_id = ResOwnerId.from_dict(connexion.request.get_json()) # noqa: E501 + + # body={"security_id": security_id, + # "grant_type": grant_type, + # "client_id": client_id, + # "res_owner_id": res_owner_id, + # "client_secret": client_secret, + # "scope": scope, + # "auth_code": auth_code, + # "redirect_uri": redirect_uri + # } + current_app.logger.debug(body) + res = service_security_ops.return_token(security_id, body) @@ -87,7 +109,7 @@ def trusted_invokers_api_invoker_id_delete(api_invoker_id): # noqa: E501 :param api_invoker_id: Identifier of an individual API invoker :type api_invoker_id: str - :rtype: None + :rtype: Union[None, Tuple[None, int], Tuple[None, int, Dict[str, str]] """ current_app.logger.info("Removing security context") return service_security_ops.delete_servicesecurity(api_invoker_id) @@ -103,9 +125,8 @@ def trusted_invokers_api_invoker_id_delete_post(api_invoker_id, body): # noqa: :param security_notification: Revoke the authorization of the API invoker for APIs. :type security_notification: dict | bytes - :rtype: None + :rtype: Union[None, Tuple[None, int], Tuple[None, int, Dict[str, str]] """ - if connexion.request.is_json: body = SecurityNotification.from_dict(connexion.request.get_json()) # noqa: E501 @@ -115,21 +136,20 @@ def trusted_invokers_api_invoker_id_delete_post(api_invoker_id, body): # noqa: return res @cert_validation() -def trusted_invokers_api_invoker_id_get(api_invoker_id, authentication_info=False, authorization_info=False): # noqa: E501 +def trusted_invokers_api_invoker_id_get(api_invoker_id, authentication_info=None, authorization_info=None): # noqa: E501 """trusted_invokers_api_invoker_id_get # noqa: E501 :param api_invoker_id: Identifier of an individual API invoker :type api_invoker_id: str - :param authentication_info: When set to 'true', it indicates the CAPIF core function to send the authentication information of the API invoker. Set to false or omitted otherwise. + :param authentication_info: When set to 'true', it indicates the CAPIF core function to send the authentication information of the API invoker. Set to false or omitted otherwise. :type authentication_info: bool - :param authorization_info: When set to 'true', it indicates the CAPIF core function to send the authorization information of the API invoker. Set to false or omitted otherwise. + :param authorization_info: When set to 'true', it indicates the CAPIF core function to send the authorization information of the API invoker. Set to false or omitted otherwise. :type authorization_info: bool :rtype: Union[ServiceSecurity, Tuple[ServiceSecurity, int], Tuple[ServiceSecurity, int, Dict[str, str]] """ - current_app.logger.info("Obtaining security context") res = service_security_ops.get_servicesecurity(api_invoker_id, authentication_info, authorization_info) @@ -172,7 +192,7 @@ def trusted_invokers_api_invoker_id_update_post(api_invoker_id, body): # noqa: :param service_security: Update the security context (e.g. re-negotiate the security methods). :type service_security: dict | bytes - :rtype: ServiceSecurity + :rtype: Union[ServiceSecurity, Tuple[ServiceSecurity, int], Tuple[ServiceSecurity, int, Dict[str, str]] """ current_app.logger.info("Updating security context") diff --git a/services/TS29222_CAPIF_Security_API/capif_security/controllers/security_controller_.py b/services/TS29222_CAPIF_Security_API/capif_security/controllers/security_controller_.py deleted file mode 100644 index 6d294ff..0000000 --- a/services/TS29222_CAPIF_Security_API/capif_security/controllers/security_controller_.py +++ /dev/null @@ -1,2 +0,0 @@ -from typing import List - diff --git a/services/TS29222_CAPIF_Security_API/capif_security/encoder.py b/services/TS29222_CAPIF_Security_API/capif_security/encoder.py index 80bad8f..b121630 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/encoder.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/encoder.py @@ -1,7 +1,6 @@ from connexion.apps.flask_app import FlaskJSONEncoder -import six -from models.base_model_ import Model +from capif_security.models.base_model import Model class JSONEncoder(FlaskJSONEncoder): @@ -10,7 +9,7 @@ class JSONEncoder(FlaskJSONEncoder): def default(self, o): if isinstance(o, Model): dikt = {} - for attr, _ in six.iteritems(o.openapi_types): + for attr in o.openapi_types: value = getattr(o, attr) if value is None and not self.include_nulls: continue diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/__init__.py b/services/TS29222_CAPIF_Security_API/capif_security/models/__init__.py index b6f04f8..475e67a 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/__init__.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/models/__init__.py @@ -1,7 +1,4 @@ -# coding: utf-8 - # flake8: noqa -from __future__ import absolute_import # import models into model package from capif_security.models.access_token_claims import AccessTokenClaims from capif_security.models.access_token_err import AccessTokenErr @@ -9,19 +6,22 @@ from capif_security.models.access_token_err1 import AccessTokenErr1 from capif_security.models.access_token_req1 import AccessTokenReq1 from capif_security.models.access_token_rsp import AccessTokenRsp from capif_security.models.cause import Cause -from capif_security.models.cause_any_of import CauseAnyOf from capif_security.models.interface_description import InterfaceDescription from capif_security.models.invalid_param import InvalidParam from capif_security.models.invalid_param1 import InvalidParam1 from capif_security.models.nf_type import NFType -from capif_security.models.nf_type_any_of import NFTypeAnyOf +from capif_security.models.no_profile_match_info import NoProfileMatchInfo +from capif_security.models.no_profile_match_reason import NoProfileMatchReason +from capif_security.models.o_auth_grant_type import OAuthGrantType from capif_security.models.plmn_id import PlmnId from capif_security.models.plmn_id_nid import PlmnIdNid from capif_security.models.problem_details import ProblemDetails from capif_security.models.problem_details1 import ProblemDetails1 +from capif_security.models.query_param_combination import QueryParamCombination +from capif_security.models.query_parameter import QueryParameter +from capif_security.models.res_owner_id import ResOwnerId from capif_security.models.security_information import SecurityInformation from capif_security.models.security_method import SecurityMethod -from capif_security.models.security_method_any_of import SecurityMethodAnyOf from capif_security.models.security_notification import SecurityNotification from capif_security.models.service_security import ServiceSecurity from capif_security.models.snssai import Snssai diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_claims.py b/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_claims.py index fc19f93..46593ae 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_claims.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_claims.py @@ -1,13 +1,12 @@ -# coding: utf-8 - -from __future__ import absolute_import from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from capif_security.models.base_model_ import Model +from capif_security.models.base_model import Model +from capif_security.models.res_owner_id import ResOwnerId from capif_security import util +from capif_security.models.res_owner_id import ResOwnerId # noqa: E501 class AccessTokenClaims(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -15,7 +14,7 @@ class AccessTokenClaims(Model): Do not edit the class manually. """ - def __init__(self, iss=None, scope=None, exp=None): # noqa: E501 + def __init__(self, iss=None, scope=None, exp=None, res_owner_id=None): # noqa: E501 """AccessTokenClaims - a model defined in OpenAPI :param iss: The iss of this AccessTokenClaims. # noqa: E501 @@ -24,22 +23,27 @@ class AccessTokenClaims(Model): :type scope: str :param exp: The exp of this AccessTokenClaims. # noqa: E501 :type exp: int + :param res_owner_id: The res_owner_id of this AccessTokenClaims. # noqa: E501 + :type res_owner_id: ResOwnerId """ self.openapi_types = { 'iss': str, 'scope': str, - 'exp': int + 'exp': int, + 'res_owner_id': ResOwnerId } self.attribute_map = { 'iss': 'iss', 'scope': 'scope', - 'exp': 'exp' + 'exp': 'exp', + 'res_owner_id': 'resOwnerId' } self._iss = iss self._scope = scope self._exp = exp + self._res_owner_id = res_owner_id @classmethod def from_dict(cls, dikt) -> 'AccessTokenClaims': @@ -53,7 +57,7 @@ class AccessTokenClaims(Model): return util.deserialize_model(dikt, cls) @property - def iss(self): + def iss(self) -> str: """Gets the iss of this AccessTokenClaims. @@ -63,7 +67,7 @@ class AccessTokenClaims(Model): return self._iss @iss.setter - def iss(self, iss): + def iss(self, iss: str): """Sets the iss of this AccessTokenClaims. @@ -76,7 +80,7 @@ class AccessTokenClaims(Model): self._iss = iss @property - def scope(self): + def scope(self) -> str: """Gets the scope of this AccessTokenClaims. @@ -86,7 +90,7 @@ class AccessTokenClaims(Model): return self._scope @scope.setter - def scope(self, scope): + def scope(self, scope: str): """Sets the scope of this AccessTokenClaims. @@ -99,7 +103,7 @@ class AccessTokenClaims(Model): self._scope = scope @property - def exp(self): + def exp(self) -> int: """Gets the exp of this AccessTokenClaims. Unsigned integer identifying a period of time in units of seconds. # noqa: E501 @@ -110,7 +114,7 @@ class AccessTokenClaims(Model): return self._exp @exp.setter - def exp(self, exp): + def exp(self, exp: int): """Sets the exp of this AccessTokenClaims. Unsigned integer identifying a period of time in units of seconds. # noqa: E501 @@ -124,3 +128,24 @@ class AccessTokenClaims(Model): raise ValueError("Invalid value for `exp`, must be a value greater than or equal to `0`") # noqa: E501 self._exp = exp + + @property + def res_owner_id(self) -> ResOwnerId: + """Gets the res_owner_id of this AccessTokenClaims. + + + :return: The res_owner_id of this AccessTokenClaims. + :rtype: ResOwnerId + """ + return self._res_owner_id + + @res_owner_id.setter + def res_owner_id(self, res_owner_id: ResOwnerId): + """Sets the res_owner_id of this AccessTokenClaims. + + + :param res_owner_id: The res_owner_id of this AccessTokenClaims. + :type res_owner_id: ResOwnerId + """ + + self._res_owner_id = res_owner_id diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_err.py b/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_err.py index 4423dcc..c600230 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_err.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_err.py @@ -1,11 +1,8 @@ -# coding: utf-8 - -from __future__ import absolute_import from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from capif_security.models.base_model_ import Model +from capif_security.models.base_model import Model from capif_security import util @@ -53,7 +50,7 @@ class AccessTokenErr(Model): return util.deserialize_model(dikt, cls) @property - def error(self): + def error(self) -> str: """Gets the error of this AccessTokenErr. @@ -63,7 +60,7 @@ class AccessTokenErr(Model): return self._error @error.setter - def error(self, error): + def error(self, error: str): """Sets the error of this AccessTokenErr. @@ -80,7 +77,7 @@ class AccessTokenErr(Model): self._error = error @property - def error_description(self): + def error_description(self) -> str: """Gets the error_description of this AccessTokenErr. @@ -90,7 +87,7 @@ class AccessTokenErr(Model): return self._error_description @error_description.setter - def error_description(self, error_description): + def error_description(self, error_description: str): """Sets the error_description of this AccessTokenErr. @@ -101,7 +98,7 @@ class AccessTokenErr(Model): self._error_description = error_description @property - def error_uri(self): + def error_uri(self) -> str: """Gets the error_uri of this AccessTokenErr. @@ -111,7 +108,7 @@ class AccessTokenErr(Model): return self._error_uri @error_uri.setter - def error_uri(self, error_uri): + def error_uri(self, error_uri: str): """Sets the error_uri of this AccessTokenErr. diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_err1.py b/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_err1.py index 8d2253f..2300779 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_err1.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_err1.py @@ -1,11 +1,8 @@ -# coding: utf-8 - -from __future__ import absolute_import from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from capif_security.models.base_model_ import Model +from capif_security.models.base_model import Model from capif_security import util @@ -53,7 +50,7 @@ class AccessTokenErr1(Model): return util.deserialize_model(dikt, cls) @property - def error(self): + def error(self) -> str: """Gets the error of this AccessTokenErr1. @@ -63,7 +60,7 @@ class AccessTokenErr1(Model): return self._error @error.setter - def error(self, error): + def error(self, error: str): """Sets the error of this AccessTokenErr1. @@ -80,7 +77,7 @@ class AccessTokenErr1(Model): self._error = error @property - def error_description(self): + def error_description(self) -> str: """Gets the error_description of this AccessTokenErr1. @@ -90,7 +87,7 @@ class AccessTokenErr1(Model): return self._error_description @error_description.setter - def error_description(self, error_description): + def error_description(self, error_description: str): """Sets the error_description of this AccessTokenErr1. @@ -101,7 +98,7 @@ class AccessTokenErr1(Model): self._error_description = error_description @property - def error_uri(self): + def error_uri(self) -> str: """Gets the error_uri of this AccessTokenErr1. @@ -111,7 +108,7 @@ class AccessTokenErr1(Model): return self._error_uri @error_uri.setter - def error_uri(self, error_uri): + def error_uri(self, error_uri: str): """Sets the error_uri of this AccessTokenErr1. diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_req.py b/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_req.py deleted file mode 100644 index 5a8ec22..0000000 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_req.py +++ /dev/null @@ -1,151 +0,0 @@ -# coding: utf-8 - -from __future__ import absolute_import -from datetime import date, datetime # noqa: F401 - -from typing import List, Dict # noqa: F401 - -from capif_security.models.base_model_ import Model -from capif_security.models.access_token_err import AccessTokenErr -from capif_security import util - - -class AccessTokenReq(Model): - """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - - Do not edit the class manually. - """ - - def __init__(self, grant_type=None, client_id=None, client_secret=None, scope=None): # noqa: E501 - """AccessTokenReq - a model defined in OpenAPI - - :param grant_type: The grant_type of this AccessTokenReq. # noqa: E501 - :type grant_type: str - :param client_id: The client_id of this AccessTokenReq. # noqa: E501 - :type client_id: str - :param client_secret: The client_secret of this AccessTokenReq. # noqa: E501 - :type client_secret: str - :param scope: The scope of this AccessTokenReq. # noqa: E501 - :type scope: str - """ - self.openapi_types = { - 'grant_type': str, - 'client_id': str, - 'client_secret': str, - 'scope': str - } - - self.attribute_map = { - 'grant_type': 'grant_type', - 'client_id': 'client_id', - 'client_secret': 'client_secret', - 'scope': 'scope' - } - - self._grant_type = grant_type - self._client_id = client_id - self._client_secret = client_secret - self._scope = scope - - @classmethod - def from_dict(cls, dikt) -> 'AccessTokenReq': - """Returns the dict as a model - - :param dikt: A dict. - :type: dict - :return: The AccessTokenReq of this AccessTokenReq. # noqa: E501 - :rtype: AccessTokenReq - """ - return util.deserialize_model(dikt, cls) - - @property - def grant_type(self): - """Gets the grant_type of this AccessTokenReq. - - - :return: The grant_type of this AccessTokenReq. - :rtype: str - """ - return self._grant_type - - @grant_type.setter - def grant_type(self, grant_type): - """Sets the grant_type of this AccessTokenReq. - - - :param grant_type: The grant_type of this AccessTokenReq. - :type grant_type: str - """ - allowed_values = ["client_credentials"] # noqa: E501 - if grant_type not in allowed_values: - raise ValueError( - "Invalid value for `grant_type` ({0}), must be one of {1}" - .format(grant_type, allowed_values) - ) - - self._grant_type = grant_type - - @property - def client_id(self): - """Gets the client_id of this AccessTokenReq. - - - :return: The client_id of this AccessTokenReq. - :rtype: str - """ - return self._client_id - - @client_id.setter - def client_id(self, client_id): - """Sets the client_id of this AccessTokenReq. - - - :param client_id: The client_id of this AccessTokenReq. - :type client_id: str - """ - if client_id is None: - raise ValueError("Invalid value for `client_id`, must not be `None`") # noqa: E501 - - self._client_id = client_id - - @property - def client_secret(self): - """Gets the client_secret of this AccessTokenReq. - - - :return: The client_secret of this AccessTokenReq. - :rtype: str - """ - return self._client_secret - - @client_secret.setter - def client_secret(self, client_secret): - """Sets the client_secret of this AccessTokenReq. - - - :param client_secret: The client_secret of this AccessTokenReq. - :type client_secret: str - """ - - self._client_secret = client_secret - - @property - def scope(self): - """Gets the scope of this AccessTokenReq. - - - :return: The scope of this AccessTokenReq. - :rtype: str - """ - return self._scope - - @scope.setter - def scope(self, scope): - """Sets the scope of this AccessTokenReq. - - - :param scope: The scope of this AccessTokenReq. - :type scope: str - """ - - self._scope = scope diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_req1.py b/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_req1.py index b119e9c..47e4a30 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_req1.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_req1.py @@ -1,11 +1,8 @@ -# coding: utf-8 - -from __future__ import absolute_import from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from capif_security.models.base_model_ import Model +from capif_security.models.base_model import Model from capif_security.models.nf_type import NFType from capif_security.models.plmn_id import PlmnId from capif_security.models.plmn_id_nid import PlmnIdNid @@ -14,7 +11,6 @@ import re from capif_security import util from capif_security.models.nf_type import NFType # noqa: E501 -from capif_security.models.access_token_err import AccessTokenErr from capif_security.models.plmn_id import PlmnId # noqa: E501 from capif_security.models.plmn_id_nid import PlmnIdNid # noqa: E501 from capif_security.models.snssai import Snssai # noqa: E501 @@ -26,7 +22,7 @@ class AccessTokenReq1(Model): Do not edit the class manually. """ - def __init__(self, grant_type=None, nf_instance_id=None, nf_type=None, target_nf_type=None, scope=None, target_nf_instance_id=None, requester_plmn=None, requester_plmn_list=None, requester_snssai_list=None, requester_fqdn=None, requester_snpn_list=None, target_plmn=None, target_snssai_list=None, target_nsi_list=None, target_nf_set_id=None, target_nf_service_set_id=None, hnrf_access_token_uri=None, source_nf_instance_id=None): # noqa: E501 + def __init__(self, grant_type=None, nf_instance_id=None, nf_type=None, target_nf_type=None, scope=None, target_nf_instance_id=None, requester_plmn=None, requester_plmn_list=None, requester_snssai_list=None, requester_fqdn=None, requester_snpn_list=None, target_plmn=None, target_snpn=None, target_snssai_list=None, target_nsi_list=None, target_nf_set_id=None, target_nf_service_set_id=None, hnrf_access_token_uri=None, source_nf_instance_id=None): # noqa: E501 """AccessTokenReq1 - a model defined in OpenAPI :param grant_type: The grant_type of this AccessTokenReq1. # noqa: E501 @@ -53,6 +49,8 @@ class AccessTokenReq1(Model): :type requester_snpn_list: List[PlmnIdNid] :param target_plmn: The target_plmn of this AccessTokenReq1. # noqa: E501 :type target_plmn: PlmnId + :param target_snpn: The target_snpn of this AccessTokenReq1. # noqa: E501 + :type target_snpn: PlmnIdNid :param target_snssai_list: The target_snssai_list of this AccessTokenReq1. # noqa: E501 :type target_snssai_list: List[Snssai] :param target_nsi_list: The target_nsi_list of this AccessTokenReq1. # noqa: E501 @@ -79,6 +77,7 @@ class AccessTokenReq1(Model): 'requester_fqdn': str, 'requester_snpn_list': List[PlmnIdNid], 'target_plmn': PlmnId, + 'target_snpn': PlmnIdNid, 'target_snssai_list': List[Snssai], 'target_nsi_list': List[str], 'target_nf_set_id': str, @@ -100,6 +99,7 @@ class AccessTokenReq1(Model): 'requester_fqdn': 'requesterFqdn', 'requester_snpn_list': 'requesterSnpnList', 'target_plmn': 'targetPlmn', + 'target_snpn': 'targetSnpn', 'target_snssai_list': 'targetSnssaiList', 'target_nsi_list': 'targetNsiList', 'target_nf_set_id': 'targetNfSetId', @@ -120,6 +120,7 @@ class AccessTokenReq1(Model): self._requester_fqdn = requester_fqdn self._requester_snpn_list = requester_snpn_list self._target_plmn = target_plmn + self._target_snpn = target_snpn self._target_snssai_list = target_snssai_list self._target_nsi_list = target_nsi_list self._target_nf_set_id = target_nf_set_id @@ -139,7 +140,7 @@ class AccessTokenReq1(Model): return util.deserialize_model(dikt, cls) @property - def grant_type(self): + def grant_type(self) -> str: """Gets the grant_type of this AccessTokenReq1. @@ -149,7 +150,7 @@ class AccessTokenReq1(Model): return self._grant_type @grant_type.setter - def grant_type(self, grant_type): + def grant_type(self, grant_type: str): """Sets the grant_type of this AccessTokenReq1. @@ -166,7 +167,7 @@ class AccessTokenReq1(Model): self._grant_type = grant_type @property - def nf_instance_id(self): + def nf_instance_id(self) -> str: """Gets the nf_instance_id of this AccessTokenReq1. String uniquely identifying a NF instance. The format of the NF Instance ID shall be a Universally Unique Identifier (UUID) version 4, as described in IETF RFC 4122. # noqa: E501 @@ -177,7 +178,7 @@ class AccessTokenReq1(Model): return self._nf_instance_id @nf_instance_id.setter - def nf_instance_id(self, nf_instance_id): + def nf_instance_id(self, nf_instance_id: str): """Sets the nf_instance_id of this AccessTokenReq1. String uniquely identifying a NF instance. The format of the NF Instance ID shall be a Universally Unique Identifier (UUID) version 4, as described in IETF RFC 4122. # noqa: E501 @@ -191,7 +192,7 @@ class AccessTokenReq1(Model): self._nf_instance_id = nf_instance_id @property - def nf_type(self): + def nf_type(self) -> NFType: """Gets the nf_type of this AccessTokenReq1. @@ -201,7 +202,7 @@ class AccessTokenReq1(Model): return self._nf_type @nf_type.setter - def nf_type(self, nf_type): + def nf_type(self, nf_type: NFType): """Sets the nf_type of this AccessTokenReq1. @@ -212,7 +213,7 @@ class AccessTokenReq1(Model): self._nf_type = nf_type @property - def target_nf_type(self): + def target_nf_type(self) -> NFType: """Gets the target_nf_type of this AccessTokenReq1. @@ -222,7 +223,7 @@ class AccessTokenReq1(Model): return self._target_nf_type @target_nf_type.setter - def target_nf_type(self, target_nf_type): + def target_nf_type(self, target_nf_type: NFType): """Sets the target_nf_type of this AccessTokenReq1. @@ -233,7 +234,7 @@ class AccessTokenReq1(Model): self._target_nf_type = target_nf_type @property - def scope(self): + def scope(self) -> str: """Gets the scope of this AccessTokenReq1. @@ -243,7 +244,7 @@ class AccessTokenReq1(Model): return self._scope @scope.setter - def scope(self, scope): + def scope(self, scope: str): """Sets the scope of this AccessTokenReq1. @@ -258,7 +259,7 @@ class AccessTokenReq1(Model): self._scope = scope @property - def target_nf_instance_id(self): + def target_nf_instance_id(self) -> str: """Gets the target_nf_instance_id of this AccessTokenReq1. String uniquely identifying a NF instance. The format of the NF Instance ID shall be a Universally Unique Identifier (UUID) version 4, as described in IETF RFC 4122. # noqa: E501 @@ -269,7 +270,7 @@ class AccessTokenReq1(Model): return self._target_nf_instance_id @target_nf_instance_id.setter - def target_nf_instance_id(self, target_nf_instance_id): + def target_nf_instance_id(self, target_nf_instance_id: str): """Sets the target_nf_instance_id of this AccessTokenReq1. String uniquely identifying a NF instance. The format of the NF Instance ID shall be a Universally Unique Identifier (UUID) version 4, as described in IETF RFC 4122. # noqa: E501 @@ -281,7 +282,7 @@ class AccessTokenReq1(Model): self._target_nf_instance_id = target_nf_instance_id @property - def requester_plmn(self): + def requester_plmn(self) -> PlmnId: """Gets the requester_plmn of this AccessTokenReq1. @@ -291,7 +292,7 @@ class AccessTokenReq1(Model): return self._requester_plmn @requester_plmn.setter - def requester_plmn(self, requester_plmn): + def requester_plmn(self, requester_plmn: PlmnId): """Sets the requester_plmn of this AccessTokenReq1. @@ -302,7 +303,7 @@ class AccessTokenReq1(Model): self._requester_plmn = requester_plmn @property - def requester_plmn_list(self): + def requester_plmn_list(self) -> List[PlmnId]: """Gets the requester_plmn_list of this AccessTokenReq1. @@ -312,7 +313,7 @@ class AccessTokenReq1(Model): return self._requester_plmn_list @requester_plmn_list.setter - def requester_plmn_list(self, requester_plmn_list): + def requester_plmn_list(self, requester_plmn_list: List[PlmnId]): """Sets the requester_plmn_list of this AccessTokenReq1. @@ -325,7 +326,7 @@ class AccessTokenReq1(Model): self._requester_plmn_list = requester_plmn_list @property - def requester_snssai_list(self): + def requester_snssai_list(self) -> List[Snssai]: """Gets the requester_snssai_list of this AccessTokenReq1. @@ -335,7 +336,7 @@ class AccessTokenReq1(Model): return self._requester_snssai_list @requester_snssai_list.setter - def requester_snssai_list(self, requester_snssai_list): + def requester_snssai_list(self, requester_snssai_list: List[Snssai]): """Sets the requester_snssai_list of this AccessTokenReq1. @@ -348,7 +349,7 @@ class AccessTokenReq1(Model): self._requester_snssai_list = requester_snssai_list @property - def requester_fqdn(self): + def requester_fqdn(self) -> str: """Gets the requester_fqdn of this AccessTokenReq1. Fully Qualified Domain Name # noqa: E501 @@ -359,7 +360,7 @@ class AccessTokenReq1(Model): return self._requester_fqdn @requester_fqdn.setter - def requester_fqdn(self, requester_fqdn): + def requester_fqdn(self, requester_fqdn: str): """Sets the requester_fqdn of this AccessTokenReq1. Fully Qualified Domain Name # noqa: E501 @@ -377,7 +378,7 @@ class AccessTokenReq1(Model): self._requester_fqdn = requester_fqdn @property - def requester_snpn_list(self): + def requester_snpn_list(self) -> List[PlmnIdNid]: """Gets the requester_snpn_list of this AccessTokenReq1. @@ -387,7 +388,7 @@ class AccessTokenReq1(Model): return self._requester_snpn_list @requester_snpn_list.setter - def requester_snpn_list(self, requester_snpn_list): + def requester_snpn_list(self, requester_snpn_list: List[PlmnIdNid]): """Sets the requester_snpn_list of this AccessTokenReq1. @@ -400,7 +401,7 @@ class AccessTokenReq1(Model): self._requester_snpn_list = requester_snpn_list @property - def target_plmn(self): + def target_plmn(self) -> PlmnId: """Gets the target_plmn of this AccessTokenReq1. @@ -410,7 +411,7 @@ class AccessTokenReq1(Model): return self._target_plmn @target_plmn.setter - def target_plmn(self, target_plmn): + def target_plmn(self, target_plmn: PlmnId): """Sets the target_plmn of this AccessTokenReq1. @@ -421,7 +422,28 @@ class AccessTokenReq1(Model): self._target_plmn = target_plmn @property - def target_snssai_list(self): + def target_snpn(self) -> PlmnIdNid: + """Gets the target_snpn of this AccessTokenReq1. + + + :return: The target_snpn of this AccessTokenReq1. + :rtype: PlmnIdNid + """ + return self._target_snpn + + @target_snpn.setter + def target_snpn(self, target_snpn: PlmnIdNid): + """Sets the target_snpn of this AccessTokenReq1. + + + :param target_snpn: The target_snpn of this AccessTokenReq1. + :type target_snpn: PlmnIdNid + """ + + self._target_snpn = target_snpn + + @property + def target_snssai_list(self) -> List[Snssai]: """Gets the target_snssai_list of this AccessTokenReq1. @@ -431,7 +453,7 @@ class AccessTokenReq1(Model): return self._target_snssai_list @target_snssai_list.setter - def target_snssai_list(self, target_snssai_list): + def target_snssai_list(self, target_snssai_list: List[Snssai]): """Sets the target_snssai_list of this AccessTokenReq1. @@ -444,7 +466,7 @@ class AccessTokenReq1(Model): self._target_snssai_list = target_snssai_list @property - def target_nsi_list(self): + def target_nsi_list(self) -> List[str]: """Gets the target_nsi_list of this AccessTokenReq1. @@ -454,7 +476,7 @@ class AccessTokenReq1(Model): return self._target_nsi_list @target_nsi_list.setter - def target_nsi_list(self, target_nsi_list): + def target_nsi_list(self, target_nsi_list: List[str]): """Sets the target_nsi_list of this AccessTokenReq1. @@ -467,7 +489,7 @@ class AccessTokenReq1(Model): self._target_nsi_list = target_nsi_list @property - def target_nf_set_id(self): + def target_nf_set_id(self) -> str: """Gets the target_nf_set_id of this AccessTokenReq1. NF Set Identifier (see clause 28.12 of 3GPP TS 23.003), formatted as the following string \"set.set.5gc.mnc.mcc\", or \"set.set.5gc.nid.mnc.mcc\" with encoded as defined in clause 5.4.2 (\"Mcc\" data type definition) encoding the Mobile Network Code part of the PLMN, comprising 3 digits. If there are only 2 significant digits in the MNC, one \"0\" digit shall be inserted at the left side to fill the 3 digits coding of MNC. Pattern: '^[0-9]{3}$' encoded as a value defined in Table 6.1.6.3.3-1 of 3GPP TS 29.510 but with lower case characters encoded as a string of characters consisting of alphabetic characters (A-Z and a-z), digits (0-9) and/or the hyphen (-) and that shall end with either an alphabetic character or a digit. # noqa: E501 @@ -478,7 +500,7 @@ class AccessTokenReq1(Model): return self._target_nf_set_id @target_nf_set_id.setter - def target_nf_set_id(self, target_nf_set_id): + def target_nf_set_id(self, target_nf_set_id: str): """Sets the target_nf_set_id of this AccessTokenReq1. NF Set Identifier (see clause 28.12 of 3GPP TS 23.003), formatted as the following string \"set.set.5gc.mnc.mcc\", or \"set.set.5gc.nid.mnc.mcc\" with encoded as defined in clause 5.4.2 (\"Mcc\" data type definition) encoding the Mobile Network Code part of the PLMN, comprising 3 digits. If there are only 2 significant digits in the MNC, one \"0\" digit shall be inserted at the left side to fill the 3 digits coding of MNC. Pattern: '^[0-9]{3}$' encoded as a value defined in Table 6.1.6.3.3-1 of 3GPP TS 29.510 but with lower case characters encoded as a string of characters consisting of alphabetic characters (A-Z and a-z), digits (0-9) and/or the hyphen (-) and that shall end with either an alphabetic character or a digit. # noqa: E501 @@ -490,7 +512,7 @@ class AccessTokenReq1(Model): self._target_nf_set_id = target_nf_set_id @property - def target_nf_service_set_id(self): + def target_nf_service_set_id(self) -> str: """Gets the target_nf_service_set_id of this AccessTokenReq1. NF Service Set Identifier (see clause 28.12 of 3GPP TS 23.003) formatted as the following string \"set.sn.nfi.5gc.mnc.mcc\", or \"set.sn.nfi.5gc.nid.mnc.mcc\" with encoded as defined in clause 5.4.2 (\"Mcc\" data type definition) encoding the Mobile Network Code part of the PLMN, comprising 3 digits. If there are only 2 significant digits in the MNC, one \"0\" digit shall be inserted at the left side to fill the 3 digits coding of MNC. Pattern: '^[0-9]{3}$' encoded as defined in clause 5.4.2 (\"Nid\" data type definition) encoded as defined in clause 5.3.2 encoded as defined in 3GPP TS 29.510 encoded as a string of characters consisting of alphabetic characters (A-Z and a-z), digits (0-9) and/or the hyphen (-) and that shall end with either an alphabetic character or a digit. # noqa: E501 @@ -501,7 +523,7 @@ class AccessTokenReq1(Model): return self._target_nf_service_set_id @target_nf_service_set_id.setter - def target_nf_service_set_id(self, target_nf_service_set_id): + def target_nf_service_set_id(self, target_nf_service_set_id: str): """Sets the target_nf_service_set_id of this AccessTokenReq1. NF Service Set Identifier (see clause 28.12 of 3GPP TS 23.003) formatted as the following string \"set.sn.nfi.5gc.mnc.mcc\", or \"set.sn.nfi.5gc.nid.mnc.mcc\" with encoded as defined in clause 5.4.2 (\"Mcc\" data type definition) encoding the Mobile Network Code part of the PLMN, comprising 3 digits. If there are only 2 significant digits in the MNC, one \"0\" digit shall be inserted at the left side to fill the 3 digits coding of MNC. Pattern: '^[0-9]{3}$' encoded as defined in clause 5.4.2 (\"Nid\" data type definition) encoded as defined in clause 5.3.2 encoded as defined in 3GPP TS 29.510 encoded as a string of characters consisting of alphabetic characters (A-Z and a-z), digits (0-9) and/or the hyphen (-) and that shall end with either an alphabetic character or a digit. # noqa: E501 @@ -513,7 +535,7 @@ class AccessTokenReq1(Model): self._target_nf_service_set_id = target_nf_service_set_id @property - def hnrf_access_token_uri(self): + def hnrf_access_token_uri(self) -> str: """Gets the hnrf_access_token_uri of this AccessTokenReq1. String providing an URI formatted according to RFC 3986. # noqa: E501 @@ -524,7 +546,7 @@ class AccessTokenReq1(Model): return self._hnrf_access_token_uri @hnrf_access_token_uri.setter - def hnrf_access_token_uri(self, hnrf_access_token_uri): + def hnrf_access_token_uri(self, hnrf_access_token_uri: str): """Sets the hnrf_access_token_uri of this AccessTokenReq1. String providing an URI formatted according to RFC 3986. # noqa: E501 @@ -536,7 +558,7 @@ class AccessTokenReq1(Model): self._hnrf_access_token_uri = hnrf_access_token_uri @property - def source_nf_instance_id(self): + def source_nf_instance_id(self) -> str: """Gets the source_nf_instance_id of this AccessTokenReq1. String uniquely identifying a NF instance. The format of the NF Instance ID shall be a Universally Unique Identifier (UUID) version 4, as described in IETF RFC 4122. # noqa: E501 @@ -547,7 +569,7 @@ class AccessTokenReq1(Model): return self._source_nf_instance_id @source_nf_instance_id.setter - def source_nf_instance_id(self, source_nf_instance_id): + def source_nf_instance_id(self, source_nf_instance_id: str): """Sets the source_nf_instance_id of this AccessTokenReq1. String uniquely identifying a NF instance. The format of the NF Instance ID shall be a Universally Unique Identifier (UUID) version 4, as described in IETF RFC 4122. # noqa: E501 diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_rsp.py b/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_rsp.py index 57f6720..f8e524d 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_rsp.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/models/access_token_rsp.py @@ -1,11 +1,8 @@ -# coding: utf-8 - -from __future__ import absolute_import from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from capif_security.models.base_model_ import Model +from capif_security.models.base_model import Model from capif_security import util @@ -58,7 +55,7 @@ class AccessTokenRsp(Model): return util.deserialize_model(dikt, cls) @property - def access_token(self): + def access_token(self) -> str: """Gets the access_token of this AccessTokenRsp. JWS Compact Serialized representation of JWS signed JSON object (AccessTokenClaims) # noqa: E501 @@ -69,7 +66,7 @@ class AccessTokenRsp(Model): return self._access_token @access_token.setter - def access_token(self, access_token): + def access_token(self, access_token: str): """Sets the access_token of this AccessTokenRsp. JWS Compact Serialized representation of JWS signed JSON object (AccessTokenClaims) # noqa: E501 @@ -83,7 +80,7 @@ class AccessTokenRsp(Model): self._access_token = access_token @property - def token_type(self): + def token_type(self) -> str: """Gets the token_type of this AccessTokenRsp. @@ -93,7 +90,7 @@ class AccessTokenRsp(Model): return self._token_type @token_type.setter - def token_type(self, token_type): + def token_type(self, token_type: str): """Sets the token_type of this AccessTokenRsp. @@ -110,7 +107,7 @@ class AccessTokenRsp(Model): self._token_type = token_type @property - def expires_in(self): + def expires_in(self) -> int: """Gets the expires_in of this AccessTokenRsp. Unsigned integer identifying a period of time in units of seconds. # noqa: E501 @@ -121,7 +118,7 @@ class AccessTokenRsp(Model): return self._expires_in @expires_in.setter - def expires_in(self, expires_in): + def expires_in(self, expires_in: int): """Sets the expires_in of this AccessTokenRsp. Unsigned integer identifying a period of time in units of seconds. # noqa: E501 @@ -137,7 +134,7 @@ class AccessTokenRsp(Model): self._expires_in = expires_in @property - def scope(self): + def scope(self) -> str: """Gets the scope of this AccessTokenRsp. @@ -147,7 +144,7 @@ class AccessTokenRsp(Model): return self._scope @scope.setter - def scope(self, scope): + def scope(self, scope: str): """Sets the scope of this AccessTokenRsp. diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/base_model_.py b/services/TS29222_CAPIF_Security_API/capif_security/models/base_model_.py deleted file mode 100644 index e8f6832..0000000 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/base_model_.py +++ /dev/null @@ -1,69 +0,0 @@ -import pprint - -import six -import typing - -from capif_security import util - -T = typing.TypeVar('T') - - -class Model(): - # openapiTypes: The key is attribute name and the - # value is attribute type. - openapi_types: typing.Dict[str, type] = {} - - # attributeMap: The key is attribute name and the - # value is json key in definition. - attribute_map: typing.Dict[str, str] = {} - - @classmethod - def from_dict(cls: typing.Type[T], dikt) -> T: - """Returns the dict as a model""" - return util.deserialize_model(dikt, cls) - - def to_dict(self): - """Returns the model properties as a dict - - :rtype: dict - """ - result = {} - - for attr, _ in six.iteritems(self.openapi_types): - value = getattr(self, attr) - if isinstance(value, list): - result[attr] = list(map( - lambda x: x.to_dict() if hasattr(x, "to_dict") else x, - value - )) - elif hasattr(value, "to_dict"): - result[attr] = value.to_dict() - elif isinstance(value, dict): - result[attr] = dict(map( - lambda item: (item[0], item[1].to_dict()) - if hasattr(item[1], "to_dict") else item, - value.items() - )) - else: - result[attr] = value - - return result - - def to_str(self): - """Returns the string representation of the model - - :rtype: str - """ - return pprint.pformat(self.to_dict()) - - def __repr__(self): - """For `print` and `pprint`""" - return self.to_str() - - def __eq__(self, other): - """Returns true if both objects are equal""" - return self.__dict__ == other.__dict__ - - def __ne__(self, other): - """Returns true if both objects are not equal""" - return not self == other diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/cause.py b/services/TS29222_CAPIF_Security_API/capif_security/models/cause.py index a93f5a8..227ba10 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/cause.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/models/cause.py @@ -1,15 +1,10 @@ -# coding: utf-8 - -from __future__ import absolute_import from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from capif_security.models.base_model_ import Model -from capif_security.models.cause_any_of import CauseAnyOf +from capif_security.models.base_model import Model from capif_security import util -from capif_security.models.cause_any_of import CauseAnyOf # noqa: E501 class Cause(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/cause_any_of.py b/services/TS29222_CAPIF_Security_API/capif_security/models/cause_any_of.py deleted file mode 100644 index 64b601c..0000000 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/cause_any_of.py +++ /dev/null @@ -1,42 +0,0 @@ -# coding: utf-8 - -from __future__ import absolute_import -from datetime import date, datetime # noqa: F401 - -from typing import List, Dict # noqa: F401 - -from capif_security.models.base_model_ import Model -from capif_security import util - - -class CauseAnyOf(Model): - """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - - Do not edit the class manually. - """ - - """ - allowed enum values - """ - OVERLIMIT_USAGE = "OVERLIMIT_USAGE" - UNEXPECTED_REASON = "UNEXPECTED_REASON" - def __init__(self): # noqa: E501 - """CauseAnyOf - a model defined in OpenAPI - - """ - self.openapi_types = { - } - - self.attribute_map = { - } - - @classmethod - def from_dict(cls, dikt) -> 'CauseAnyOf': - """Returns the dict as a model - - :param dikt: A dict. - :type: dict - :return: The Cause_anyOf of this CauseAnyOf. # noqa: E501 - :rtype: CauseAnyOf - """ - return util.deserialize_model(dikt, cls) diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/interface_description.py b/services/TS29222_CAPIF_Security_API/capif_security/models/interface_description.py index 546ef7f..0031775 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/interface_description.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/models/interface_description.py @@ -1,15 +1,14 @@ -# coding: utf-8 - -from __future__ import absolute_import from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from capif_security.models.base_model_ import Model +from capif_security.models.base_model import Model from capif_security.models.security_method import SecurityMethod +import re from capif_security import util from capif_security.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). @@ -17,35 +16,45 @@ class InterfaceDescription(Model): Do not edit the class manually. """ - def __init__(self, ipv4_addr=None, ipv6_addr=None, port=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): # noqa: E501 """InterfaceDescription - a model defined in OpenAPI :param ipv4_addr: The ipv4_addr of this InterfaceDescription. # noqa: E501 :type ipv4_addr: str :param ipv6_addr: The ipv6_addr of this InterfaceDescription. # noqa: E501 :type ipv6_addr: str + :param fqdn: The fqdn of this InterfaceDescription. # noqa: E501 + :type fqdn: str :param port: The port of this InterfaceDescription. # noqa: E501 :type port: int + :param api_prefix: The api_prefix of this InterfaceDescription. # noqa: E501 + :type api_prefix: str :param security_methods: The security_methods of this InterfaceDescription. # noqa: E501 :type security_methods: List[SecurityMethod] """ self.openapi_types = { 'ipv4_addr': str, 'ipv6_addr': str, + 'fqdn': str, 'port': int, + 'api_prefix': str, 'security_methods': List[SecurityMethod] } self.attribute_map = { 'ipv4_addr': 'ipv4Addr', 'ipv6_addr': 'ipv6Addr', + 'fqdn': 'fqdn', 'port': 'port', + 'api_prefix': 'apiPrefix', 'security_methods': 'securityMethods' } self._ipv4_addr = ipv4_addr self._ipv6_addr = ipv6_addr + self._fqdn = fqdn self._port = port + self._api_prefix = api_prefix self._security_methods = security_methods @classmethod @@ -60,10 +69,10 @@ class InterfaceDescription(Model): return util.deserialize_model(dikt, cls) @property - def ipv4_addr(self): + def ipv4_addr(self) -> str: """Gets the ipv4_addr of this InterfaceDescription. - string identifying a Ipv4 address formatted in the \"dotted decimal\" notation as defined in IETF RFC 1166. # noqa: E501 + string identifying a Ipv4 address formatted in the \"dotted decimal\" notation as defined in IETF RFC 1166. # noqa: E501 :return: The ipv4_addr of this InterfaceDescription. :rtype: str @@ -71,10 +80,10 @@ class InterfaceDescription(Model): return self._ipv4_addr @ipv4_addr.setter - def ipv4_addr(self, ipv4_addr): + def ipv4_addr(self, ipv4_addr: str): """Sets the ipv4_addr of this InterfaceDescription. - string identifying a Ipv4 address formatted in the \"dotted decimal\" notation as defined in IETF RFC 1166. # noqa: E501 + string identifying a Ipv4 address formatted in the \"dotted decimal\" notation as defined in IETF RFC 1166. # noqa: E501 :param ipv4_addr: The ipv4_addr of this InterfaceDescription. :type ipv4_addr: str @@ -83,10 +92,10 @@ class InterfaceDescription(Model): self._ipv4_addr = ipv4_addr @property - def ipv6_addr(self): + def ipv6_addr(self) -> str: """Gets the ipv6_addr of this InterfaceDescription. - string identifying a Ipv6 address formatted according to clause 4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of IETF RFC 5952 shall not be used. # noqa: E501 + string identifying a Ipv6 address formatted according to clause 4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of IETF RFC 5952 shall not be used. # noqa: E501 :return: The ipv6_addr of this InterfaceDescription. :rtype: str @@ -94,10 +103,10 @@ class InterfaceDescription(Model): return self._ipv6_addr @ipv6_addr.setter - def ipv6_addr(self, ipv6_addr): + def ipv6_addr(self, ipv6_addr: str): """Sets the ipv6_addr of this InterfaceDescription. - string identifying a Ipv6 address formatted according to clause 4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of IETF RFC 5952 shall not be used. # noqa: E501 + string identifying a Ipv6 address formatted according to clause 4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of IETF RFC 5952 shall not be used. # noqa: E501 :param ipv6_addr: The ipv6_addr of this InterfaceDescription. :type ipv6_addr: str @@ -106,7 +115,36 @@ class InterfaceDescription(Model): self._ipv6_addr = ipv6_addr @property - def port(self): + def fqdn(self) -> str: + """Gets the fqdn of this InterfaceDescription. + + Fully Qualified Domain Name # noqa: E501 + + :return: The fqdn of this InterfaceDescription. + :rtype: str + """ + return self._fqdn + + @fqdn.setter + def fqdn(self, fqdn: str): + """Sets the fqdn of this InterfaceDescription. + + Fully Qualified Domain Name # noqa: E501 + + :param fqdn: The fqdn of this InterfaceDescription. + :type fqdn: str + """ + if fqdn is not None and len(fqdn) > 253: + raise ValueError("Invalid value for `fqdn`, length must be less than or equal to `253`") # noqa: E501 + 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 + + self._fqdn = fqdn + + @property + def port(self) -> int: """Gets the port of this InterfaceDescription. Unsigned integer with valid values between 0 and 65535. # noqa: E501 @@ -117,7 +155,7 @@ class InterfaceDescription(Model): return self._port @port.setter - def port(self, port): + def port(self, port: int): """Sets the port of this InterfaceDescription. Unsigned integer with valid values between 0 and 65535. # noqa: E501 @@ -133,7 +171,30 @@ class InterfaceDescription(Model): self._port = port @property - def security_methods(self): + def api_prefix(self) -> str: + """Gets the api_prefix of this InterfaceDescription. + + A string representing a sequence of path segments that starts with the slash character. # noqa: E501 + + :return: The api_prefix of this InterfaceDescription. + :rtype: str + """ + return self._api_prefix + + @api_prefix.setter + def api_prefix(self, api_prefix: str): + """Sets the api_prefix of this InterfaceDescription. + + A string representing a sequence of path segments that starts with the slash character. # noqa: E501 + + :param api_prefix: The api_prefix of this InterfaceDescription. + :type api_prefix: str + """ + + self._api_prefix = api_prefix + + @property + def security_methods(self) -> List[SecurityMethod]: """Gets the security_methods of this InterfaceDescription. Security methods supported by the interface, it take precedence over the security methods provided in AefProfile, for this specific interface. # noqa: E501 @@ -144,7 +205,7 @@ class InterfaceDescription(Model): return self._security_methods @security_methods.setter - def security_methods(self, security_methods): + def security_methods(self, security_methods: List[SecurityMethod]): """Sets the security_methods of this InterfaceDescription. Security methods supported by the interface, it take precedence over the security methods provided in AefProfile, for this specific interface. # noqa: E501 diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/invalid_param.py b/services/TS29222_CAPIF_Security_API/capif_security/models/invalid_param.py index 3cf97a3..f86b208 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/invalid_param.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/models/invalid_param.py @@ -1,11 +1,8 @@ -# coding: utf-8 - -from __future__ import absolute_import from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from capif_security.models.base_model_ import Model +from capif_security.models.base_model import Model from capif_security import util @@ -48,7 +45,7 @@ class InvalidParam(Model): return util.deserialize_model(dikt, cls) @property - def param(self): + def param(self) -> str: """Gets the param of this InvalidParam. Attribute's name encoded as a JSON Pointer, or header's name. # noqa: E501 @@ -59,7 +56,7 @@ class InvalidParam(Model): return self._param @param.setter - def param(self, param): + def param(self, param: str): """Sets the param of this InvalidParam. Attribute's name encoded as a JSON Pointer, or header's name. # noqa: E501 @@ -73,7 +70,7 @@ class InvalidParam(Model): self._param = param @property - def reason(self): + def reason(self) -> str: """Gets the reason of this InvalidParam. A human-readable reason, e.g. \"must be a positive integer\". # noqa: E501 @@ -84,7 +81,7 @@ class InvalidParam(Model): return self._reason @reason.setter - def reason(self, reason): + def reason(self, reason: str): """Sets the reason of this InvalidParam. A human-readable reason, e.g. \"must be a positive integer\". # noqa: E501 diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/invalid_param1.py b/services/TS29222_CAPIF_Security_API/capif_security/models/invalid_param1.py index 93fbd3a..7791900 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/invalid_param1.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/models/invalid_param1.py @@ -1,11 +1,8 @@ -# coding: utf-8 - -from __future__ import absolute_import from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from capif_security.models.base_model_ import Model +from capif_security.models.base_model import Model from capif_security import util @@ -48,7 +45,7 @@ class InvalidParam1(Model): return util.deserialize_model(dikt, cls) @property - def param(self): + def param(self) -> str: """Gets the param of this InvalidParam1. If the invalid parameter is an attribute in a JSON body, this IE shall contain the attribute's name and shall be encoded as a JSON Pointer. If the invalid parameter is an HTTP header, this IE shall be formatted as the concatenation of the string \"header \" plus the name of such header. If the invalid parameter is a query parameter, this IE shall be formatted as the concatenation of the string \"query \" plus the name of such query parameter. If the invalid parameter is a variable part in the path of a resource URI, this IE shall contain the name of the variable, including the symbols \"{\" and \"}\" used in OpenAPI specification as the notation to represent variable path segments. # noqa: E501 @@ -59,7 +56,7 @@ class InvalidParam1(Model): return self._param @param.setter - def param(self, param): + def param(self, param: str): """Sets the param of this InvalidParam1. If the invalid parameter is an attribute in a JSON body, this IE shall contain the attribute's name and shall be encoded as a JSON Pointer. If the invalid parameter is an HTTP header, this IE shall be formatted as the concatenation of the string \"header \" plus the name of such header. If the invalid parameter is a query parameter, this IE shall be formatted as the concatenation of the string \"query \" plus the name of such query parameter. If the invalid parameter is a variable part in the path of a resource URI, this IE shall contain the name of the variable, including the symbols \"{\" and \"}\" used in OpenAPI specification as the notation to represent variable path segments. # noqa: E501 @@ -73,7 +70,7 @@ class InvalidParam1(Model): self._param = param @property - def reason(self): + def reason(self) -> str: """Gets the reason of this InvalidParam1. A human-readable reason, e.g. \"must be a positive integer\". In cases involving failed operations in a PATCH request, the reason string should identify the operation that failed using the operation's array index to assist in correlation of the invalid parameter with the failed operation, e.g.\" Replacement value invalid for attribute (failed operation index= 4)\" # noqa: E501 @@ -84,7 +81,7 @@ class InvalidParam1(Model): return self._reason @reason.setter - def reason(self, reason): + def reason(self, reason: str): """Sets the reason of this InvalidParam1. A human-readable reason, e.g. \"must be a positive integer\". In cases involving failed operations in a PATCH request, the reason string should identify the operation that failed using the operation's array index to assist in correlation of the invalid parameter with the failed operation, e.g.\" Replacement value invalid for attribute (failed operation index= 4)\" # noqa: E501 diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/nf_type.py b/services/TS29222_CAPIF_Security_API/capif_security/models/nf_type.py index 78c0598..184a7c0 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/nf_type.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/models/nf_type.py @@ -1,15 +1,10 @@ -# coding: utf-8 - -from __future__ import absolute_import from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from capif_security.models.base_model_ import Model -from capif_security.models.nf_type_any_of import NFTypeAnyOf +from capif_security.models.base_model import Model from capif_security import util -from capif_security.models.nf_type_any_of import NFTypeAnyOf # noqa: E501 class NFType(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/nf_type_any_of.py b/services/TS29222_CAPIF_Security_API/capif_security/models/nf_type_any_of.py deleted file mode 100644 index 5638ef9..0000000 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/nf_type_any_of.py +++ /dev/null @@ -1,95 +0,0 @@ -# coding: utf-8 - -from __future__ import absolute_import -from datetime import date, datetime # noqa: F401 - -from typing import List, Dict # noqa: F401 - -from capif_security.models.base_model_ import Model -from capif_security import util - - -class NFTypeAnyOf(Model): - """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - - Do not edit the class manually. - """ - - """ - allowed enum values - """ - NRF = "NRF" - UDM = "UDM" - AMF = "AMF" - SMF = "SMF" - AUSF = "AUSF" - NEF = "NEF" - PCF = "PCF" - SMSF = "SMSF" - NSSF = "NSSF" - UDR = "UDR" - LMF = "LMF" - GMLC = "GMLC" - _5G_EIR = "5G_EIR" - SEPP = "SEPP" - UPF = "UPF" - N3IWF = "N3IWF" - AF = "AF" - UDSF = "UDSF" - BSF = "BSF" - CHF = "CHF" - NWDAF = "NWDAF" - PCSCF = "PCSCF" - CBCF = "CBCF" - HSS = "HSS" - UCMF = "UCMF" - SOR_AF = "SOR_AF" - SPAF = "SPAF" - MME = "MME" - SCSAS = "SCSAS" - SCEF = "SCEF" - SCP = "SCP" - NSSAAF = "NSSAAF" - ICSCF = "ICSCF" - SCSCF = "SCSCF" - DRA = "DRA" - IMS_AS = "IMS_AS" - AANF = "AANF" - _5G_DDNMF = "5G_DDNMF" - NSACF = "NSACF" - MFAF = "MFAF" - EASDF = "EASDF" - DCCF = "DCCF" - MB_SMF = "MB_SMF" - TSCTSF = "TSCTSF" - ADRF = "ADRF" - GBA_BSF = "GBA_BSF" - CEF = "CEF" - MB_UPF = "MB_UPF" - NSWOF = "NSWOF" - PKMF = "PKMF" - MNPF = "MNPF" - SMS_GMSC = "SMS_GMSC" - SMS_IWMSC = "SMS_IWMSC" - MBSF = "MBSF" - MBSTF = "MBSTF" - def __init__(self): # noqa: E501 - """NFTypeAnyOf - a model defined in OpenAPI - - """ - self.openapi_types = { - } - - self.attribute_map = { - } - - @classmethod - def from_dict(cls, dikt) -> 'NFTypeAnyOf': - """Returns the dict as a model - - :param dikt: A dict. - :type: dict - :return: The NFType_anyOf of this NFTypeAnyOf. # noqa: E501 - :rtype: NFTypeAnyOf - """ - return util.deserialize_model(dikt, cls) diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/plmn_id.py b/services/TS29222_CAPIF_Security_API/capif_security/models/plmn_id.py index 1a0dfce..b7b42ec 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/plmn_id.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/models/plmn_id.py @@ -1,11 +1,8 @@ -# coding: utf-8 - -from __future__ import absolute_import from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from capif_security.models.base_model_ import Model +from capif_security.models.base_model import Model import re from capif_security import util @@ -50,7 +47,7 @@ class PlmnId(Model): return util.deserialize_model(dikt, cls) @property - def mcc(self): + def mcc(self) -> str: """Gets the mcc of this PlmnId. Mobile Country Code part of the PLMN, comprising 3 digits, as defined in clause 9.3.3.5 of 3GPP TS 38.413. # noqa: E501 @@ -61,7 +58,7 @@ class PlmnId(Model): return self._mcc @mcc.setter - def mcc(self, mcc): + def mcc(self, mcc: str): """Sets the mcc of this PlmnId. Mobile Country Code part of the PLMN, comprising 3 digits, as defined in clause 9.3.3.5 of 3GPP TS 38.413. # noqa: E501 @@ -77,10 +74,10 @@ class PlmnId(Model): self._mcc = mcc @property - def mnc(self): + def mnc(self) -> str: """Gets the mnc of this PlmnId. - Mobile Network Code part of the PLMN, comprising 2 or 3 digits, as defined in clause 9.3.3.5 of 3GPP TS 38.413. # noqa: E501 + Mobile Network Code part of the PLMN, comprising 2 or 3 digits, as defined in clause 9.3.3.5 of 3GPP TS 38.413. # noqa: E501 :return: The mnc of this PlmnId. :rtype: str @@ -88,10 +85,10 @@ class PlmnId(Model): return self._mnc @mnc.setter - def mnc(self, mnc): + def mnc(self, mnc: str): """Sets the mnc of this PlmnId. - Mobile Network Code part of the PLMN, comprising 2 or 3 digits, as defined in clause 9.3.3.5 of 3GPP TS 38.413. # noqa: E501 + Mobile Network Code part of the PLMN, comprising 2 or 3 digits, as defined in clause 9.3.3.5 of 3GPP TS 38.413. # noqa: E501 :param mnc: The mnc of this PlmnId. :type mnc: str diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/plmn_id_nid.py b/services/TS29222_CAPIF_Security_API/capif_security/models/plmn_id_nid.py index bf2a0a4..16fd95e 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/plmn_id_nid.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/models/plmn_id_nid.py @@ -1,11 +1,8 @@ -# coding: utf-8 - -from __future__ import absolute_import from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from capif_security.models.base_model_ import Model +from capif_security.models.base_model import Model import re from capif_security import util @@ -55,7 +52,7 @@ class PlmnIdNid(Model): return util.deserialize_model(dikt, cls) @property - def mcc(self): + def mcc(self) -> str: """Gets the mcc of this PlmnIdNid. Mobile Country Code part of the PLMN, comprising 3 digits, as defined in clause 9.3.3.5 of 3GPP TS 38.413. # noqa: E501 @@ -66,7 +63,7 @@ class PlmnIdNid(Model): return self._mcc @mcc.setter - def mcc(self, mcc): + def mcc(self, mcc: str): """Sets the mcc of this PlmnIdNid. Mobile Country Code part of the PLMN, comprising 3 digits, as defined in clause 9.3.3.5 of 3GPP TS 38.413. # noqa: E501 @@ -82,10 +79,10 @@ class PlmnIdNid(Model): self._mcc = mcc @property - def mnc(self): + def mnc(self) -> str: """Gets the mnc of this PlmnIdNid. - Mobile Network Code part of the PLMN, comprising 2 or 3 digits, as defined in clause 9.3.3.5 of 3GPP TS 38.413. # noqa: E501 + Mobile Network Code part of the PLMN, comprising 2 or 3 digits, as defined in clause 9.3.3.5 of 3GPP TS 38.413. # noqa: E501 :return: The mnc of this PlmnIdNid. :rtype: str @@ -93,10 +90,10 @@ class PlmnIdNid(Model): return self._mnc @mnc.setter - def mnc(self, mnc): + def mnc(self, mnc: str): """Sets the mnc of this PlmnIdNid. - Mobile Network Code part of the PLMN, comprising 2 or 3 digits, as defined in clause 9.3.3.5 of 3GPP TS 38.413. # noqa: E501 + Mobile Network Code part of the PLMN, comprising 2 or 3 digits, as defined in clause 9.3.3.5 of 3GPP TS 38.413. # noqa: E501 :param mnc: The mnc of this PlmnIdNid. :type mnc: str @@ -109,7 +106,7 @@ class PlmnIdNid(Model): self._mnc = mnc @property - def nid(self): + def nid(self) -> str: """Gets the nid of this PlmnIdNid. This represents the Network Identifier, which together with a PLMN ID is used to identify an SNPN (see 3GPP TS 23.003 and 3GPP TS 23.501 clause 5.30.2.1). # noqa: E501 @@ -120,7 +117,7 @@ class PlmnIdNid(Model): return self._nid @nid.setter - def nid(self, nid): + def nid(self, nid: str): """Sets the nid of this PlmnIdNid. This represents the Network Identifier, which together with a PLMN ID is used to identify an SNPN (see 3GPP TS 23.003 and 3GPP TS 23.501 clause 5.30.2.1). # noqa: E501 diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/problem_details.py b/services/TS29222_CAPIF_Security_API/capif_security/models/problem_details.py index e0708a2..27a5777 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/problem_details.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/models/problem_details.py @@ -1,11 +1,8 @@ -# coding: utf-8 - -from __future__ import absolute_import from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from capif_security.models.base_model_ import Model +from capif_security.models.base_model import Model from capif_security.models.invalid_param import InvalidParam import re from capif_security import util @@ -82,7 +79,7 @@ class ProblemDetails(Model): return util.deserialize_model(dikt, cls) @property - def type(self): + def type(self) -> str: """Gets the type of this ProblemDetails. string providing an URI formatted according to IETF RFC 3986. # noqa: E501 @@ -93,7 +90,7 @@ class ProblemDetails(Model): return self._type @type.setter - def type(self, type): + def type(self, type: str): """Sets the type of this ProblemDetails. string providing an URI formatted according to IETF RFC 3986. # noqa: E501 @@ -105,10 +102,10 @@ class ProblemDetails(Model): self._type = type @property - def title(self): + def title(self) -> str: """Gets the title of this ProblemDetails. - A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem. # noqa: E501 + A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem. # noqa: E501 :return: The title of this ProblemDetails. :rtype: str @@ -116,10 +113,10 @@ class ProblemDetails(Model): return self._title @title.setter - def title(self, title): + def title(self, title: str): """Sets the title of this ProblemDetails. - A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem. # noqa: E501 + A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem. # noqa: E501 :param title: The title of this ProblemDetails. :type title: str @@ -128,7 +125,7 @@ class ProblemDetails(Model): self._title = title @property - def status(self): + def status(self) -> int: """Gets the status of this ProblemDetails. The HTTP status code for this occurrence of the problem. # noqa: E501 @@ -139,7 +136,7 @@ class ProblemDetails(Model): return self._status @status.setter - def status(self, status): + def status(self, status: int): """Sets the status of this ProblemDetails. The HTTP status code for this occurrence of the problem. # noqa: E501 @@ -151,7 +148,7 @@ class ProblemDetails(Model): self._status = status @property - def detail(self): + def detail(self) -> str: """Gets the detail of this ProblemDetails. A human-readable explanation specific to this occurrence of the problem. # noqa: E501 @@ -162,7 +159,7 @@ class ProblemDetails(Model): return self._detail @detail.setter - def detail(self, detail): + def detail(self, detail: str): """Sets the detail of this ProblemDetails. A human-readable explanation specific to this occurrence of the problem. # noqa: E501 @@ -174,7 +171,7 @@ class ProblemDetails(Model): self._detail = detail @property - def instance(self): + def instance(self) -> str: """Gets the instance of this ProblemDetails. string providing an URI formatted according to IETF RFC 3986. # noqa: E501 @@ -185,7 +182,7 @@ class ProblemDetails(Model): return self._instance @instance.setter - def instance(self, instance): + def instance(self, instance: str): """Sets the instance of this ProblemDetails. string providing an URI formatted according to IETF RFC 3986. # noqa: E501 @@ -197,10 +194,10 @@ class ProblemDetails(Model): self._instance = instance @property - def cause(self): + def cause(self) -> str: """Gets the cause of this ProblemDetails. - A machine-readable application error cause specific to this occurrence of the problem. This IE should be present and provide application-related error information, if available. # noqa: E501 + A machine-readable application error cause specific to this occurrence of the problem. This IE should be present and provide application-related error information, if available. # noqa: E501 :return: The cause of this ProblemDetails. :rtype: str @@ -208,10 +205,10 @@ class ProblemDetails(Model): return self._cause @cause.setter - def cause(self, cause): + def cause(self, cause: str): """Sets the cause of this ProblemDetails. - A machine-readable application error cause specific to this occurrence of the problem. This IE should be present and provide application-related error information, if available. # noqa: E501 + A machine-readable application error cause specific to this occurrence of the problem. This IE should be present and provide application-related error information, if available. # noqa: E501 :param cause: The cause of this ProblemDetails. :type cause: str @@ -220,10 +217,10 @@ class ProblemDetails(Model): self._cause = cause @property - def invalid_params(self): + def invalid_params(self) -> List[InvalidParam]: """Gets the invalid_params of this ProblemDetails. - Description of invalid parameters, for a request rejected due to invalid parameters. # noqa: E501 + Description of invalid parameters, for a request rejected due to invalid parameters. # noqa: E501 :return: The invalid_params of this ProblemDetails. :rtype: List[InvalidParam] @@ -231,10 +228,10 @@ class ProblemDetails(Model): return self._invalid_params @invalid_params.setter - def invalid_params(self, invalid_params): + def invalid_params(self, invalid_params: List[InvalidParam]): """Sets the invalid_params of this ProblemDetails. - Description of invalid parameters, for a request rejected due to invalid parameters. # noqa: E501 + Description of invalid parameters, for a request rejected due to invalid parameters. # noqa: E501 :param invalid_params: The invalid_params of this ProblemDetails. :type invalid_params: List[InvalidParam] @@ -245,7 +242,7 @@ class ProblemDetails(Model): self._invalid_params = invalid_params @property - def supported_features(self): + def supported_features(self) -> str: """Gets the supported_features of this ProblemDetails. A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported. # noqa: E501 @@ -256,7 +253,7 @@ class ProblemDetails(Model): return self._supported_features @supported_features.setter - def supported_features(self, supported_features): + def supported_features(self, supported_features: str): """Sets the supported_features of this ProblemDetails. A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported. # noqa: E501 diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/problem_details1.py b/services/TS29222_CAPIF_Security_API/capif_security/models/problem_details1.py index 584e1a8..8de2911 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/problem_details1.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/models/problem_details1.py @@ -1,20 +1,19 @@ -# coding: utf-8 - -from __future__ import absolute_import from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from capif_security.models.base_model_ import Model +from capif_security.models.base_model import Model from capif_security.models.access_token_err1 import AccessTokenErr1 from capif_security.models.access_token_req1 import AccessTokenReq1 from capif_security.models.invalid_param1 import InvalidParam1 +from capif_security.models.no_profile_match_info import NoProfileMatchInfo import re from capif_security import util from capif_security.models.access_token_err1 import AccessTokenErr1 # noqa: E501 from capif_security.models.access_token_req1 import AccessTokenReq1 # noqa: E501 from capif_security.models.invalid_param1 import InvalidParam1 # noqa: E501 +from capif_security.models.no_profile_match_info import NoProfileMatchInfo # noqa: E501 import re # noqa: E501 class ProblemDetails1(Model): @@ -23,7 +22,7 @@ class ProblemDetails1(Model): Do not edit the class manually. """ - def __init__(self, type=None, title=None, status=None, detail=None, instance=None, cause=None, invalid_params=None, supported_features=None, access_token_error=None, access_token_request=None, nrf_id=None): # noqa: E501 + def __init__(self, type=None, title=None, status=None, detail=None, instance=None, cause=None, invalid_params=None, supported_features=None, access_token_error=None, access_token_request=None, nrf_id=None, supported_api_versions=None, no_profile_match_info=None): # noqa: E501 """ProblemDetails1 - a model defined in OpenAPI :param type: The type of this ProblemDetails1. # noqa: E501 @@ -48,6 +47,10 @@ class ProblemDetails1(Model): :type access_token_request: AccessTokenReq1 :param nrf_id: The nrf_id of this ProblemDetails1. # noqa: E501 :type nrf_id: str + :param supported_api_versions: The supported_api_versions of this ProblemDetails1. # noqa: E501 + :type supported_api_versions: List[str] + :param no_profile_match_info: The no_profile_match_info of this ProblemDetails1. # noqa: E501 + :type no_profile_match_info: NoProfileMatchInfo """ self.openapi_types = { 'type': str, @@ -60,7 +63,9 @@ class ProblemDetails1(Model): 'supported_features': str, 'access_token_error': AccessTokenErr1, 'access_token_request': AccessTokenReq1, - 'nrf_id': str + 'nrf_id': str, + 'supported_api_versions': List[str], + 'no_profile_match_info': NoProfileMatchInfo } self.attribute_map = { @@ -74,7 +79,9 @@ class ProblemDetails1(Model): 'supported_features': 'supportedFeatures', 'access_token_error': 'accessTokenError', 'access_token_request': 'accessTokenRequest', - 'nrf_id': 'nrfId' + 'nrf_id': 'nrfId', + 'supported_api_versions': 'supportedApiVersions', + 'no_profile_match_info': 'noProfileMatchInfo' } self._type = type @@ -88,6 +95,8 @@ class ProblemDetails1(Model): self._access_token_error = access_token_error self._access_token_request = access_token_request self._nrf_id = nrf_id + self._supported_api_versions = supported_api_versions + self._no_profile_match_info = no_profile_match_info @classmethod def from_dict(cls, dikt) -> 'ProblemDetails1': @@ -101,7 +110,7 @@ class ProblemDetails1(Model): return util.deserialize_model(dikt, cls) @property - def type(self): + def type(self) -> str: """Gets the type of this ProblemDetails1. String providing an URI formatted according to RFC 3986. # noqa: E501 @@ -112,7 +121,7 @@ class ProblemDetails1(Model): return self._type @type.setter - def type(self, type): + def type(self, type: str): """Sets the type of this ProblemDetails1. String providing an URI formatted according to RFC 3986. # noqa: E501 @@ -124,7 +133,7 @@ class ProblemDetails1(Model): self._type = type @property - def title(self): + def title(self) -> str: """Gets the title of this ProblemDetails1. @@ -134,7 +143,7 @@ class ProblemDetails1(Model): return self._title @title.setter - def title(self, title): + def title(self, title: str): """Sets the title of this ProblemDetails1. @@ -145,7 +154,7 @@ class ProblemDetails1(Model): self._title = title @property - def status(self): + def status(self) -> int: """Gets the status of this ProblemDetails1. @@ -155,7 +164,7 @@ class ProblemDetails1(Model): return self._status @status.setter - def status(self, status): + def status(self, status: int): """Sets the status of this ProblemDetails1. @@ -166,7 +175,7 @@ class ProblemDetails1(Model): self._status = status @property - def detail(self): + def detail(self) -> str: """Gets the detail of this ProblemDetails1. A human-readable explanation specific to this occurrence of the problem. # noqa: E501 @@ -177,7 +186,7 @@ class ProblemDetails1(Model): return self._detail @detail.setter - def detail(self, detail): + def detail(self, detail: str): """Sets the detail of this ProblemDetails1. A human-readable explanation specific to this occurrence of the problem. # noqa: E501 @@ -189,7 +198,7 @@ class ProblemDetails1(Model): self._detail = detail @property - def instance(self): + def instance(self) -> str: """Gets the instance of this ProblemDetails1. String providing an URI formatted according to RFC 3986. # noqa: E501 @@ -200,7 +209,7 @@ class ProblemDetails1(Model): return self._instance @instance.setter - def instance(self, instance): + def instance(self, instance: str): """Sets the instance of this ProblemDetails1. String providing an URI formatted according to RFC 3986. # noqa: E501 @@ -212,7 +221,7 @@ class ProblemDetails1(Model): self._instance = instance @property - def cause(self): + def cause(self) -> str: """Gets the cause of this ProblemDetails1. A machine-readable application error cause specific to this occurrence of the problem. This IE should be present and provide application-related error information, if available. # noqa: E501 @@ -223,7 +232,7 @@ class ProblemDetails1(Model): return self._cause @cause.setter - def cause(self, cause): + def cause(self, cause: str): """Sets the cause of this ProblemDetails1. A machine-readable application error cause specific to this occurrence of the problem. This IE should be present and provide application-related error information, if available. # noqa: E501 @@ -235,7 +244,7 @@ class ProblemDetails1(Model): self._cause = cause @property - def invalid_params(self): + def invalid_params(self) -> List[InvalidParam1]: """Gets the invalid_params of this ProblemDetails1. @@ -245,7 +254,7 @@ class ProblemDetails1(Model): return self._invalid_params @invalid_params.setter - def invalid_params(self, invalid_params): + def invalid_params(self, invalid_params: List[InvalidParam1]): """Sets the invalid_params of this ProblemDetails1. @@ -258,7 +267,7 @@ class ProblemDetails1(Model): self._invalid_params = invalid_params @property - def supported_features(self): + def supported_features(self) -> str: """Gets the supported_features of this ProblemDetails1. A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported. # noqa: E501 @@ -269,7 +278,7 @@ class ProblemDetails1(Model): return self._supported_features @supported_features.setter - def supported_features(self, supported_features): + def supported_features(self, supported_features: str): """Sets the supported_features of this ProblemDetails1. A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported. # noqa: E501 @@ -283,7 +292,7 @@ class ProblemDetails1(Model): self._supported_features = supported_features @property - def access_token_error(self): + def access_token_error(self) -> AccessTokenErr1: """Gets the access_token_error of this ProblemDetails1. @@ -293,7 +302,7 @@ class ProblemDetails1(Model): return self._access_token_error @access_token_error.setter - def access_token_error(self, access_token_error): + def access_token_error(self, access_token_error: AccessTokenErr1): """Sets the access_token_error of this ProblemDetails1. @@ -304,7 +313,7 @@ class ProblemDetails1(Model): self._access_token_error = access_token_error @property - def access_token_request(self): + def access_token_request(self) -> AccessTokenReq1: """Gets the access_token_request of this ProblemDetails1. @@ -314,7 +323,7 @@ class ProblemDetails1(Model): return self._access_token_request @access_token_request.setter - def access_token_request(self, access_token_request): + def access_token_request(self, access_token_request: AccessTokenReq1): """Sets the access_token_request of this ProblemDetails1. @@ -325,7 +334,7 @@ class ProblemDetails1(Model): self._access_token_request = access_token_request @property - def nrf_id(self): + def nrf_id(self) -> str: """Gets the nrf_id of this ProblemDetails1. Fully Qualified Domain Name # noqa: E501 @@ -336,7 +345,7 @@ class ProblemDetails1(Model): return self._nrf_id @nrf_id.setter - def nrf_id(self, nrf_id): + def nrf_id(self, nrf_id: str): """Sets the nrf_id of this ProblemDetails1. Fully Qualified Domain Name # noqa: E501 @@ -352,3 +361,47 @@ class ProblemDetails1(Model): raise ValueError("Invalid value for `nrf_id`, 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._nrf_id = nrf_id + + @property + def supported_api_versions(self) -> List[str]: + """Gets the supported_api_versions of this ProblemDetails1. + + + :return: The supported_api_versions of this ProblemDetails1. + :rtype: List[str] + """ + return self._supported_api_versions + + @supported_api_versions.setter + def supported_api_versions(self, supported_api_versions: List[str]): + """Sets the supported_api_versions of this ProblemDetails1. + + + :param supported_api_versions: The supported_api_versions of this ProblemDetails1. + :type supported_api_versions: List[str] + """ + if supported_api_versions is not None and len(supported_api_versions) < 1: + raise ValueError("Invalid value for `supported_api_versions`, number of items must be greater than or equal to `1`") # noqa: E501 + + self._supported_api_versions = supported_api_versions + + @property + def no_profile_match_info(self) -> NoProfileMatchInfo: + """Gets the no_profile_match_info of this ProblemDetails1. + + + :return: The no_profile_match_info of this ProblemDetails1. + :rtype: NoProfileMatchInfo + """ + return self._no_profile_match_info + + @no_profile_match_info.setter + def no_profile_match_info(self, no_profile_match_info: NoProfileMatchInfo): + """Sets the no_profile_match_info of this ProblemDetails1. + + + :param no_profile_match_info: The no_profile_match_info of this ProblemDetails1. + :type no_profile_match_info: NoProfileMatchInfo + """ + + self._no_profile_match_info = no_profile_match_info diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/security_information.py b/services/TS29222_CAPIF_Security_API/capif_security/models/security_information.py index 07368ef..10e8519 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/security_information.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/models/security_information.py @@ -1,16 +1,15 @@ -# coding: utf-8 - -from __future__ import absolute_import from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from capif_security.models.base_model_ import Model +from capif_security.models.base_model import Model from capif_security.models.interface_description import InterfaceDescription +from capif_security.models.o_auth_grant_type import OAuthGrantType from capif_security.models.security_method import SecurityMethod from capif_security import util from capif_security.models.interface_description import InterfaceDescription # noqa: E501 +from capif_security.models.o_auth_grant_type import OAuthGrantType # noqa: E501 from capif_security.models.security_method import SecurityMethod # noqa: E501 class SecurityInformation(Model): @@ -19,7 +18,7 @@ class SecurityInformation(Model): Do not edit the class manually. """ - def __init__(self, interface_details=None, aef_id=None, api_id=None, pref_security_methods=None, sel_security_method=None, authentication_info=None, authorization_info=None): # noqa: E501 + def __init__(self, interface_details=None, aef_id=None, api_id=None, pref_security_methods=None, sel_security_method=None, authentication_info=None, authorization_info=None, grant_type=None): # noqa: E501 """SecurityInformation - a model defined in OpenAPI :param interface_details: The interface_details of this SecurityInformation. # noqa: E501 @@ -36,6 +35,8 @@ class SecurityInformation(Model): :type authentication_info: str :param authorization_info: The authorization_info of this SecurityInformation. # noqa: E501 :type authorization_info: str + :param grant_type: The grant_type of this SecurityInformation. # noqa: E501 + :type grant_type: List[OAuthGrantType] """ self.openapi_types = { 'interface_details': InterfaceDescription, @@ -44,7 +45,8 @@ class SecurityInformation(Model): 'pref_security_methods': List[SecurityMethod], 'sel_security_method': SecurityMethod, 'authentication_info': str, - 'authorization_info': str + 'authorization_info': str, + 'grant_type': List[OAuthGrantType] } self.attribute_map = { @@ -54,7 +56,8 @@ class SecurityInformation(Model): 'pref_security_methods': 'prefSecurityMethods', 'sel_security_method': 'selSecurityMethod', 'authentication_info': 'authenticationInfo', - 'authorization_info': 'authorizationInfo' + 'authorization_info': 'authorizationInfo', + 'grant_type': 'grantType' } self._interface_details = interface_details @@ -64,6 +67,7 @@ class SecurityInformation(Model): self._sel_security_method = sel_security_method self._authentication_info = authentication_info self._authorization_info = authorization_info + self._grant_type = grant_type @classmethod def from_dict(cls, dikt) -> 'SecurityInformation': @@ -74,11 +78,10 @@ class SecurityInformation(Model): :return: The SecurityInformation of this SecurityInformation. # noqa: E501 :rtype: SecurityInformation """ - print(dikt) return util.deserialize_model(dikt, cls) @property - def interface_details(self): + def interface_details(self) -> InterfaceDescription: """Gets the interface_details of this SecurityInformation. @@ -88,7 +91,7 @@ class SecurityInformation(Model): return self._interface_details @interface_details.setter - def interface_details(self, interface_details): + def interface_details(self, interface_details: InterfaceDescription): """Sets the interface_details of this SecurityInformation. @@ -99,7 +102,7 @@ class SecurityInformation(Model): self._interface_details = interface_details @property - def aef_id(self): + def aef_id(self) -> str: """Gets the aef_id of this SecurityInformation. Identifier of the API exposing function # noqa: E501 @@ -110,7 +113,7 @@ class SecurityInformation(Model): return self._aef_id @aef_id.setter - def aef_id(self, aef_id): + def aef_id(self, aef_id: str): """Sets the aef_id of this SecurityInformation. Identifier of the API exposing function # noqa: E501 @@ -122,7 +125,7 @@ class SecurityInformation(Model): self._aef_id = aef_id @property - def api_id(self): + def api_id(self) -> str: """Gets the api_id of this SecurityInformation. API identifier # noqa: E501 @@ -133,7 +136,7 @@ class SecurityInformation(Model): return self._api_id @api_id.setter - def api_id(self, api_id): + def api_id(self, api_id: str): """Sets the api_id of this SecurityInformation. API identifier # noqa: E501 @@ -145,7 +148,7 @@ class SecurityInformation(Model): self._api_id = api_id @property - def pref_security_methods(self): + def pref_security_methods(self) -> List[SecurityMethod]: """Gets the pref_security_methods of this SecurityInformation. Security methods preferred by the API invoker for the API interface. # noqa: E501 @@ -156,7 +159,7 @@ class SecurityInformation(Model): return self._pref_security_methods @pref_security_methods.setter - def pref_security_methods(self, pref_security_methods): + def pref_security_methods(self, pref_security_methods: List[SecurityMethod]): """Sets the pref_security_methods of this SecurityInformation. Security methods preferred by the API invoker for the API interface. # noqa: E501 @@ -172,7 +175,7 @@ class SecurityInformation(Model): self._pref_security_methods = pref_security_methods @property - def sel_security_method(self): + def sel_security_method(self) -> SecurityMethod: """Gets the sel_security_method of this SecurityInformation. @@ -182,7 +185,7 @@ class SecurityInformation(Model): return self._sel_security_method @sel_security_method.setter - def sel_security_method(self, sel_security_method): + def sel_security_method(self, sel_security_method: SecurityMethod): """Sets the sel_security_method of this SecurityInformation. @@ -193,7 +196,7 @@ class SecurityInformation(Model): self._sel_security_method = sel_security_method @property - def authentication_info(self): + def authentication_info(self) -> str: """Gets the authentication_info of this SecurityInformation. Authentication related information # noqa: E501 @@ -204,7 +207,7 @@ class SecurityInformation(Model): return self._authentication_info @authentication_info.setter - def authentication_info(self, authentication_info): + def authentication_info(self, authentication_info: str): """Sets the authentication_info of this SecurityInformation. Authentication related information # noqa: E501 @@ -216,7 +219,7 @@ class SecurityInformation(Model): self._authentication_info = authentication_info @property - def authorization_info(self): + def authorization_info(self) -> str: """Gets the authorization_info of this SecurityInformation. Authorization related information # noqa: E501 @@ -227,7 +230,7 @@ class SecurityInformation(Model): return self._authorization_info @authorization_info.setter - def authorization_info(self, authorization_info): + def authorization_info(self, authorization_info: str): """Sets the authorization_info of this SecurityInformation. Authorization related information # noqa: E501 @@ -237,3 +240,26 @@ class SecurityInformation(Model): """ self._authorization_info = authorization_info + + @property + def grant_type(self) -> List[OAuthGrantType]: + """Gets the grant_type of this SecurityInformation. + + + :return: The grant_type of this SecurityInformation. + :rtype: List[OAuthGrantType] + """ + return self._grant_type + + @grant_type.setter + def grant_type(self, grant_type: List[OAuthGrantType]): + """Sets the grant_type of this SecurityInformation. + + + :param grant_type: The grant_type of this SecurityInformation. + :type grant_type: List[OAuthGrantType] + """ + if grant_type is not None and len(grant_type) < 1: + raise ValueError("Invalid value for `grant_type`, number of items must be greater than or equal to `1`") # noqa: E501 + + self._grant_type = grant_type diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/security_method.py b/services/TS29222_CAPIF_Security_API/capif_security/models/security_method.py index 966fcb4..c319a38 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/security_method.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/models/security_method.py @@ -1,16 +1,10 @@ -# coding: utf-8 - -from __future__ import absolute_import from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from capif_security.models.base_model_ import Model -from capif_security.models.security_method_any_of import SecurityMethodAnyOf +from capif_security.models.base_model import Model from capif_security import util -from capif_security.models.security_method_any_of import SecurityMethodAnyOf # noqa: E501 -import sys class SecurityMethod(Model): """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -37,5 +31,4 @@ class SecurityMethod(Model): :return: The SecurityMethod of this SecurityMethod. # noqa: E501 :rtype: SecurityMethod """ - print(dikt, file=sys.stderr) return util.deserialize_model(dikt, cls) diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/security_method_any_of.py b/services/TS29222_CAPIF_Security_API/capif_security/models/security_method_any_of.py deleted file mode 100644 index 0b5c3bf..0000000 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/security_method_any_of.py +++ /dev/null @@ -1,44 +0,0 @@ -# coding: utf-8 - -from __future__ import absolute_import -from datetime import date, datetime # noqa: F401 - -from typing import List, Dict # noqa: F401 - -from capif_security.models.base_model_ import Model -from capif_security import util - - -class SecurityMethodAnyOf(Model): - """NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - - Do not edit the class manually. - """ - - """ - allowed enum values - """ - PSK = "PSK" - PKI = "PKI" - OAUTH = "OAUTH" - def __init__(self): # noqa: E501 - """SecurityMethodAnyOf - a model defined in OpenAPI - - """ - self.openapi_types = { - } - - self.attribute_map = { - } - - @classmethod - def from_dict(cls, dikt) -> 'SecurityMethodAnyOf': - """Returns the dict as a model - - :param dikt: A dict. - :type: dict - :return: The SecurityMethod_anyOf of this SecurityMethodAnyOf. # noqa: E501 - :rtype: SecurityMethodAnyOf - """ - print(dikt) - return util.deserialize_model(dikt, cls) diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/security_notification.py b/services/TS29222_CAPIF_Security_API/capif_security/models/security_notification.py index 4437f65..538c655 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/security_notification.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/models/security_notification.py @@ -1,11 +1,8 @@ -# coding: utf-8 - -from __future__ import absolute_import from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from capif_security.models.base_model_ import Model +from capif_security.models.base_model import Model from capif_security.models.cause import Cause from capif_security import util @@ -60,7 +57,7 @@ class SecurityNotification(Model): return util.deserialize_model(dikt, cls) @property - def api_invoker_id(self): + def api_invoker_id(self) -> str: """Gets the api_invoker_id of this SecurityNotification. String identifying the API invoker assigned by the CAPIF core function. # noqa: E501 @@ -71,7 +68,7 @@ class SecurityNotification(Model): return self._api_invoker_id @api_invoker_id.setter - def api_invoker_id(self, api_invoker_id): + def api_invoker_id(self, api_invoker_id: str): """Sets the api_invoker_id of this SecurityNotification. String identifying the API invoker assigned by the CAPIF core function. # noqa: E501 @@ -85,7 +82,7 @@ class SecurityNotification(Model): self._api_invoker_id = api_invoker_id @property - def aef_id(self): + def aef_id(self) -> str: """Gets the aef_id of this SecurityNotification. String identifying the AEF. # noqa: E501 @@ -96,7 +93,7 @@ class SecurityNotification(Model): return self._aef_id @aef_id.setter - def aef_id(self, aef_id): + def aef_id(self, aef_id: str): """Sets the aef_id of this SecurityNotification. String identifying the AEF. # noqa: E501 @@ -108,7 +105,7 @@ class SecurityNotification(Model): self._aef_id = aef_id @property - def api_ids(self): + def api_ids(self) -> List[str]: """Gets the api_ids of this SecurityNotification. Identifier of the service API # noqa: E501 @@ -119,7 +116,7 @@ class SecurityNotification(Model): return self._api_ids @api_ids.setter - def api_ids(self, api_ids): + def api_ids(self, api_ids: List[str]): """Sets the api_ids of this SecurityNotification. Identifier of the service API # noqa: E501 @@ -135,7 +132,7 @@ class SecurityNotification(Model): self._api_ids = api_ids @property - def cause(self): + def cause(self) -> Cause: """Gets the cause of this SecurityNotification. @@ -145,7 +142,7 @@ class SecurityNotification(Model): return self._cause @cause.setter - def cause(self, cause): + def cause(self, cause: Cause): """Sets the cause of this SecurityNotification. diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/service_security.py b/services/TS29222_CAPIF_Security_API/capif_security/models/service_security.py index 47014d3..060c45a 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/service_security.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/models/service_security.py @@ -1,11 +1,8 @@ -# coding: utf-8 - -from __future__ import absolute_import from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from capif_security.models.base_model_ import Model +from capif_security.models.base_model import Model from capif_security.models.security_information import SecurityInformation from capif_security.models.websock_notif_config import WebsockNotifConfig import re @@ -69,7 +66,7 @@ class ServiceSecurity(Model): return util.deserialize_model(dikt, cls) @property - def security_info(self): + def security_info(self) -> List[SecurityInformation]: """Gets the security_info of this ServiceSecurity. @@ -79,7 +76,7 @@ class ServiceSecurity(Model): return self._security_info @security_info.setter - def security_info(self, security_info): + def security_info(self, security_info: List[SecurityInformation]): """Sets the security_info of this ServiceSecurity. @@ -92,7 +89,7 @@ class ServiceSecurity(Model): self._security_info = security_info @property - def notification_destination(self): + def notification_destination(self) -> str: """Gets the notification_destination of this ServiceSecurity. string providing an URI formatted according to IETF RFC 3986. # noqa: E501 @@ -103,7 +100,7 @@ class ServiceSecurity(Model): return self._notification_destination @notification_destination.setter - def notification_destination(self, notification_destination): + def notification_destination(self, notification_destination: str): """Sets the notification_destination of this ServiceSecurity. string providing an URI formatted according to IETF RFC 3986. # noqa: E501 @@ -117,7 +114,7 @@ class ServiceSecurity(Model): self._notification_destination = notification_destination @property - def request_test_notification(self): + def request_test_notification(self) -> bool: """Gets the request_test_notification of this ServiceSecurity. Set to true by API invoker to request the CAPIF core function to send a test notification as defined in in clause 7.6. Set to false or omitted otherwise. # noqa: E501 @@ -128,7 +125,7 @@ class ServiceSecurity(Model): return self._request_test_notification @request_test_notification.setter - def request_test_notification(self, request_test_notification): + def request_test_notification(self, request_test_notification: bool): """Sets the request_test_notification of this ServiceSecurity. Set to true by API invoker to request the CAPIF core function to send a test notification as defined in in clause 7.6. Set to false or omitted otherwise. # noqa: E501 @@ -140,7 +137,7 @@ class ServiceSecurity(Model): self._request_test_notification = request_test_notification @property - def websock_notif_config(self): + def websock_notif_config(self) -> WebsockNotifConfig: """Gets the websock_notif_config of this ServiceSecurity. @@ -150,7 +147,7 @@ class ServiceSecurity(Model): return self._websock_notif_config @websock_notif_config.setter - def websock_notif_config(self, websock_notif_config): + def websock_notif_config(self, websock_notif_config: WebsockNotifConfig): """Sets the websock_notif_config of this ServiceSecurity. @@ -161,7 +158,7 @@ class ServiceSecurity(Model): self._websock_notif_config = websock_notif_config @property - def supported_features(self): + def supported_features(self) -> str: """Gets the supported_features of this ServiceSecurity. A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported. # noqa: E501 @@ -172,7 +169,7 @@ class ServiceSecurity(Model): return self._supported_features @supported_features.setter - def supported_features(self, supported_features): + def supported_features(self, supported_features: str): """Sets the supported_features of this ServiceSecurity. A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported. # noqa: E501 diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/snssai.py b/services/TS29222_CAPIF_Security_API/capif_security/models/snssai.py index 89e4257..72ae4c4 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/snssai.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/models/snssai.py @@ -1,11 +1,8 @@ -# coding: utf-8 - -from __future__ import absolute_import from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from capif_security.models.base_model_ import Model +from capif_security.models.base_model import Model import re from capif_security import util @@ -50,7 +47,7 @@ class Snssai(Model): return util.deserialize_model(dikt, cls) @property - def sst(self): + def sst(self) -> int: """Gets the sst of this Snssai. Unsigned integer, within the range 0 to 255, representing the Slice/Service Type. It indicates the expected Network Slice behaviour in terms of features and services. Values 0 to 127 correspond to the standardized SST range. Values 128 to 255 correspond to the Operator-specific range. See clause 28.4.2 of 3GPP TS 23.003. Standardized values are defined in clause 5.15.2.2 of 3GPP TS 23.501. # noqa: E501 @@ -61,7 +58,7 @@ class Snssai(Model): return self._sst @sst.setter - def sst(self, sst): + def sst(self, sst: int): """Sets the sst of this Snssai. Unsigned integer, within the range 0 to 255, representing the Slice/Service Type. It indicates the expected Network Slice behaviour in terms of features and services. Values 0 to 127 correspond to the standardized SST range. Values 128 to 255 correspond to the Operator-specific range. See clause 28.4.2 of 3GPP TS 23.003. Standardized values are defined in clause 5.15.2.2 of 3GPP TS 23.501. # noqa: E501 @@ -79,7 +76,7 @@ class Snssai(Model): self._sst = sst @property - def sd(self): + def sd(self) -> str: """Gets the sd of this Snssai. 3-octet string, representing the Slice Differentiator, in hexadecimal representation. Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent 4 bits. The most significant character representing the 4 most significant bits of the SD shall appear first in the string, and the character representing the 4 least significant bit of the SD shall appear last in the string. This is an optional parameter that complements the Slice/Service type(s) to allow to differentiate amongst multiple Network Slices of the same Slice/Service type. This IE shall be absent if no SD value is associated with the SST. # noqa: E501 @@ -90,7 +87,7 @@ class Snssai(Model): return self._sd @sd.setter - def sd(self, sd): + def sd(self, sd: str): """Sets the sd of this Snssai. 3-octet string, representing the Slice Differentiator, in hexadecimal representation. Each character in the string shall take a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent 4 bits. The most significant character representing the 4 most significant bits of the SD shall appear first in the string, and the character representing the 4 least significant bit of the SD shall appear last in the string. This is an optional parameter that complements the Slice/Service type(s) to allow to differentiate amongst multiple Network Slices of the same Slice/Service type. This IE shall be absent if no SD value is associated with the SST. # noqa: E501 diff --git a/services/TS29222_CAPIF_Security_API/capif_security/models/websock_notif_config.py b/services/TS29222_CAPIF_Security_API/capif_security/models/websock_notif_config.py index 434d371..1482ee7 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/models/websock_notif_config.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/models/websock_notif_config.py @@ -1,11 +1,8 @@ -# coding: utf-8 - -from __future__ import absolute_import from datetime import date, datetime # noqa: F401 from typing import List, Dict # noqa: F401 -from capif_security.models.base_model_ import Model +from capif_security.models.base_model import Model from capif_security import util @@ -48,7 +45,7 @@ class WebsockNotifConfig(Model): return util.deserialize_model(dikt, cls) @property - def websocket_uri(self): + def websocket_uri(self) -> str: """Gets the websocket_uri of this WebsockNotifConfig. string formatted according to IETF RFC 3986 identifying a referenced resource. # noqa: E501 @@ -59,7 +56,7 @@ class WebsockNotifConfig(Model): return self._websocket_uri @websocket_uri.setter - def websocket_uri(self, websocket_uri): + def websocket_uri(self, websocket_uri: str): """Sets the websocket_uri of this WebsockNotifConfig. string formatted according to IETF RFC 3986 identifying a referenced resource. # noqa: E501 @@ -71,7 +68,7 @@ class WebsockNotifConfig(Model): self._websocket_uri = websocket_uri @property - def request_websocket_uri(self): + def request_websocket_uri(self) -> bool: """Gets the request_websocket_uri of this WebsockNotifConfig. Set by the SCS/AS to indicate that the Websocket delivery is requested. # noqa: E501 @@ -82,7 +79,7 @@ class WebsockNotifConfig(Model): return self._request_websocket_uri @request_websocket_uri.setter - def request_websocket_uri(self, request_websocket_uri): + def request_websocket_uri(self, request_websocket_uri: bool): """Sets the request_websocket_uri of this WebsockNotifConfig. Set by the SCS/AS to indicate that the Websocket delivery is requested. # noqa: E501 diff --git a/services/TS29222_CAPIF_Security_API/capif_security/openapi/openapi.yaml b/services/TS29222_CAPIF_Security_API/capif_security/openapi/openapi.yaml index 321eb2f..fe88c19 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/openapi/openapi.yaml +++ b/services/TS29222_CAPIF_Security_API/capif_security/openapi/openapi.yaml @@ -1,11 +1,11 @@ openapi: 3.0.0 info: - description: "API for CAPIF security management. \n© 2022, 3GPP Organizational\ + description: "API for CAPIF security management. \n© 2024, 3GPP Organizational\ \ Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). \nAll rights reserved.\n" title: CAPIF_Security_API - version: 1.2.0 + version: 1.3.0-alpha.4 externalDocs: - description: 3GPP TS 29.222 V17.5.0 Common API Framework for 3GPP Northbound APIs + description: 3GPP TS 29.222 V18.5.0 Common API Framework for 3GPP Northbound APIs url: https://www.3gpp.org/ftp/Specs/archive/29_series/29.222/ servers: - url: "{apiRoot}/capif-security/v1" @@ -90,7 +90,7 @@ paths: application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' - description: Payload Too Large + description: Content Too Large "415": content: application/problem+json: @@ -117,7 +117,7 @@ paths: description: Service Unavailable default: description: Generic Error - x-openapi-router-controller: capif_security.controllers.default_controller + x-openapi-router-controller: capif_security.controllers.default_controller /trustedInvokers/{apiInvokerId}: delete: operationId: trusted_invokers_api_invoker_id_delete @@ -193,7 +193,7 @@ paths: description: Service Unavailable default: description: Generic Error - x-openapi-router-controller: capif_security.controllers.default_controller + x-openapi-router-controller: capif_security.controllers.default_controller get: operationId: trusted_invokers_api_invoker_id_get parameters: @@ -205,9 +205,8 @@ paths: schema: type: string style: simple - - description: "When set to 'true', it indicates the CAPIF core function to\ - \ send the authentication information of the API invoker. Set to false or\ - \ omitted otherwise.\n" + - description: | + When set to 'true', it indicates the CAPIF core function to send the authentication information of the API invoker. Set to false or omitted otherwise. explode: true in: query name: authenticationInfo @@ -215,9 +214,8 @@ paths: schema: type: boolean style: form - - description: "When set to 'true', it indicates the CAPIF core function to\ - \ send the authorization information of the API invoker. Set to false or\ - \ omitted otherwise.\n" + - description: | + When set to 'true', it indicates the CAPIF core function to send the authorization information of the API invoker. Set to false or omitted otherwise. explode: true in: query name: authorizationInfo @@ -305,7 +303,7 @@ paths: description: Service Unavailable default: description: Generic Error - x-openapi-router-controller: capif_security.controllers.default_controller + x-openapi-router-controller: capif_security.controllers.default_controller put: callbacks: notificationDestination: @@ -372,7 +370,7 @@ paths: application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' - description: Payload Too Large + description: Content Too Large "415": content: application/problem+json: @@ -426,8 +424,8 @@ paths: description: Successful created. headers: Location: - description: "Contains the URI of the newly created resource, according\ - \ to the structure {apiRoot}/capif-security/v1/trustedInvokers/{apiInvokerId}\n" + description: | + Contains the URI of the newly created resource, according to the structure {apiRoot}/capif-security/v1/trustedInvokers/{apiInvokerId} explode: false required: true schema: @@ -462,7 +460,7 @@ paths: application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' - description: Payload Too Large + description: Content Too Large "414": content: application/problem+json: @@ -495,7 +493,7 @@ paths: description: Service Unavailable default: description: Generic Error - x-openapi-router-controller: capif_security.controllers.default_controller + x-openapi-router-controller: capif_security.controllers.default_controller /trustedInvokers/{apiInvokerId}/delete: post: operationId: trusted_invokers_api_invoker_id_delete_post @@ -569,7 +567,7 @@ paths: application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' - description: Payload Too Large + description: Content Too Large "415": content: application/problem+json: @@ -596,7 +594,7 @@ paths: description: Service Unavailable default: description: Generic Error - x-openapi-router-controller: capif_security.controllers.default_controller + x-openapi-router-controller: capif_security.controllers.default_controller /trustedInvokers/{apiInvokerId}/update: post: operationId: trusted_invokers_api_invoker_id_update_post @@ -674,7 +672,7 @@ paths: application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' - description: Payload Too Large + description: Content Too Large "415": content: application/problem+json: @@ -701,7 +699,7 @@ paths: description: Service Unavailable default: description: Generic Error - x-openapi-router-controller: capif_security.controllers.default_controller + x-openapi-router-controller: capif_security.controllers.default_controller components: responses: "307": @@ -787,7 +785,7 @@ components: application/problem+json: schema: $ref: '#/components/schemas/ProblemDetails' - description: Payload Too Large + description: Content Too Large "415": content: application/problem+json: @@ -796,10 +794,8 @@ components: description: Unsupported Media Type schemas: ServiceSecurity: - description: "Represents the details of the security method for each service\ - \ API interface. When included by the API invoker, it indicates the preferred\ - \ method of security. When included by the CAPIF core function, it indicates\ - \ the security method to be used for the service API interface.\n" + description: | + Represents the details of the security method for each service API interface. When included by the API invoker, it indicates the preferred method of security. When included by the CAPIF core function, it indicates the security method to be used for the service API interface. example: notificationDestination: notificationDestination supportedFeatures: supportedFeatures @@ -810,14 +806,19 @@ components: interfaceDetails: ipv6Addr: ipv6Addr securityMethods: - - null - - null + - PSK + - PSK + fqdn: fqdn port: 5248 + apiPrefix: apiPrefix ipv4Addr: ipv4Addr prefSecurityMethods: - null - null aefId: aefId + grantType: + - CLIENT_CREDENTIALS + - CLIENT_CREDENTIALS apiId: apiId - selSecurityMethod: null authenticationInfo: authenticationInfo @@ -825,14 +826,19 @@ components: interfaceDetails: ipv6Addr: ipv6Addr securityMethods: - - null - - null + - PSK + - PSK + fqdn: fqdn port: 5248 + apiPrefix: apiPrefix ipv4Addr: ipv4Addr prefSecurityMethods: - null - null aefId: aefId + grantType: + - CLIENT_CREDENTIALS + - CLIENT_CREDENTIALS apiId: apiId websockNotifConfig: requestWebsocketUri: true @@ -857,19 +863,8 @@ components: websockNotifConfig: $ref: '#/components/schemas/WebsockNotifConfig' supportedFeatures: - description: "A string used to indicate the features supported by an API\ - \ that is used as defined in clause 6.6 in 3GPP TS 29.500. The string\ - \ shall contain a bitmask indicating supported features in hexadecimal\ - \ representation Each character in the string shall take a value of \"\ - 0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the\ - \ support of 4 features as described in table\_5.2.2-3. The most significant\ - \ character representing the highest-numbered features shall appear first\ - \ in the string, and the character representing features 1 to 4 shall\ - \ appear last in the string. The list of features and their numbering\ - \ (starting with 1) are defined separately for each API. If the string\ - \ contains a lower number of characters than there are defined features\ - \ for an API, all features that would be represented by characters that\ - \ are not present in the string are not supported.\n" + description: | + A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of "0" to "9", "a" to "f" or "A" to "F" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported. pattern: "^[A-Fa-f0-9]*$" title: supportedFeatures type: string @@ -887,20 +882,26 @@ components: interfaceDetails: ipv6Addr: ipv6Addr securityMethods: - - null - - null + - PSK + - PSK + fqdn: fqdn port: 5248 + apiPrefix: apiPrefix ipv4Addr: ipv4Addr prefSecurityMethods: - null - null aefId: aefId + grantType: + - CLIENT_CREDENTIALS + - CLIENT_CREDENTIALS apiId: apiId + nullable: true oneOf: - - required: - - interfaceDetails - - required: - - aefId + - required: + - aefId + - required: + - interfaceDetails properties: interfaceDetails: $ref: '#/components/schemas/InterfaceDescription' @@ -929,15 +930,21 @@ components: description: Authorization related information title: authorizationInfo type: string + grantType: + items: + $ref: '#/components/schemas/OAuthGrantType' + minItems: 1 + title: grantType + type: array required: - prefSecurityMethods title: SecurityInformation type: object SecurityNotification: - description: Represents revoked authorization notification details. + description: Represents the revoked authorization notification details. example: apiInvokerId: apiInvokerId - cause: null + cause: OVERLIMIT_USAGE aefId: aefId apiIds: - apiIds @@ -968,24 +975,29 @@ components: title: SecurityNotification type: object AccessTokenReq: - type: object description: Represents the access token request information. - format: x-www-form-urlencoded properties: grant_type: - # enum: - # - client_credentials + enum: + - client_credentials + - authorization_code type: string client_id: type: string + resOwnerId: + $ref: '#/components/schemas/ResOwnerId' client_secret: type: string scope: type: string + authCode: + type: string + redirect_uri: + type: string required: - client_id - grant_type - - scope + type: object AccessTokenRsp: description: Represents the access token response information. example: @@ -1030,13 +1042,35 @@ components: minimum: 0 title: expires_in type: integer + resOwnerId: + $ref: '#/components/schemas/ResOwnerId' required: - exp - iss - scope type: object + ResOwnerId: + anyOf: [] + description: | + Represents the identifier of the resource owner. + nullable: true + properties: + gpsi: + description: "String identifying a Gpsi shall contain either an External\ + \ Id or an MSISDN. It shall be formatted as follows -External Identifier=\ + \ \"extid-'extid', where 'extid' shall be formatted according to clause\ + \ 19.7.2 of 3GPP TS 23.003 that describes an External Identifier. \n" + pattern: "^(msisdn-[0-9]{5,15}|extid-[^@]+@[^@]+|.+)$" + title: Gpsi + type: string + title: ResOwnerId + type: object AccessTokenErr: description: Represents an error in the access token request. + example: + error_description: error_description + error: invalid_request + error_uri: error_uri properties: error: enum: @@ -1060,15 +1094,36 @@ components: type: object Cause: anyOf: - - $ref: '#/components/schemas/Cause_anyOf' + - enum: + - OVERLIMIT_USAGE + - UNEXPECTED_REASON + type: string - description: | This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API. type: string - description: "Possible values are:\n- OVERLIMIT_USAGE: The revocation of the\ - \ authorization of the API invoker is due to the overlimit usage of the service\ - \ API\n- UNEXPECTED_REASON: The revocation of the authorization of the API\ - \ invoker is due to unexpected reason.\n" + description: "Indicates the cause for revoking the API invoker's authorization\ + \ to the service API. \nPossible values are:\n- OVERLIMIT_USAGE:\n The\ + \ revocation of the authorization of the API invoker is due to the overlimit\n\ + \ usage of the service API\n- UNEXPECTED_REASON:\n The revocation\ + \ of the authorization of the API invoker is due to unexpected reason.\n" title: Cause + 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 ProblemDetails: description: Represents additional information and details on an error response. properties: @@ -1078,7 +1133,7 @@ components: type: string title: description: "A short, human-readable summary of the problem type. It should\ - \ not change from occurrence to occurrence of the problem." + \ not change from occurrence to occurrence of the problem. \n" title: title type: string status: @@ -1095,33 +1150,21 @@ components: title: type type: string cause: - description: "A machine-readable application error cause specific to this\ - \ occurrence of the problem. This IE should be present and provide application-related\ - \ error information, if available." + description: | + A machine-readable application error cause specific to this occurrence of the problem. This IE should be present and provide application-related error information, if available. title: cause type: string invalidParams: - description: "Description of invalid parameters, for a request rejected\ - \ due to invalid parameters." + description: | + Description of invalid parameters, for a request rejected due to invalid parameters. items: $ref: '#/components/schemas/InvalidParam' minItems: 1 title: invalidParams type: array supportedFeatures: - description: "A string used to indicate the features supported by an API\ - \ that is used as defined in clause 6.6 in 3GPP TS 29.500. The string\ - \ shall contain a bitmask indicating supported features in hexadecimal\ - \ representation Each character in the string shall take a value of \"\ - 0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the\ - \ support of 4 features as described in table\_5.2.2-3. The most significant\ - \ character representing the highest-numbered features shall appear first\ - \ in the string, and the character representing features 1 to 4 shall\ - \ appear last in the string. The list of features and their numbering\ - \ (starting with 1) are defined separately for each API. If the string\ - \ contains a lower number of characters than there are defined features\ - \ for an API, all features that would be represented by characters that\ - \ are not present in the string are not supported.\n" + description: | + A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of "0" to "9", "a" to "f" or "A" to "F" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported. pattern: "^[A-Fa-f0-9]*$" title: supportedFeatures type: string @@ -1132,8 +1175,8 @@ components: title: type type: string InvalidParam: - description: "Represents the description of invalid parameters, for a request\ - \ rejected due to invalid parameters." + description: | + Represents the description of invalid parameters, for a request rejected due to invalid parameters. properties: param: description: "Attribute's name encoded as a JSON Pointer, or header's name." @@ -1168,9 +1211,8 @@ components: title: Uri_1 type: string cause: - description: "A machine-readable application error cause specific to this\ - \ occurrence of the problem. This IE should be present and provide application-related\ - \ error information, if available.\n" + description: | + A machine-readable application error cause specific to this occurrence of the problem. This IE should be present and provide application-related error information, if available. type: string invalidParams: items: @@ -1178,19 +1220,8 @@ components: minItems: 1 type: array supportedFeatures: - description: "A string used to indicate the features supported by an API\ - \ that is used as defined in clause 6.6 in 3GPP TS 29.500. The string\ - \ shall contain a bitmask indicating supported features in hexadecimal\ - \ representation Each character in the string shall take a value of \"\ - 0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall represent the\ - \ support of 4 features as described in table\_5.2.2-3. The most significant\ - \ character representing the highest-numbered features shall appear first\ - \ in the string, and the character representing features 1 to 4 shall\ - \ appear last in the string. The list of features and their numbering\ - \ (starting with 1) are defined separately for each API. If the string\ - \ contains a lower number of characters than there are defined features\ - \ for an API, all features that would be represented by characters that\ - \ are not present in the string are not supported.\n" + description: | + A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of "0" to "9", "a" to "f" or "A" to "F" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported. pattern: "^[A-Fa-f0-9]*$" title: supportedFeatures type: string @@ -1206,6 +1237,13 @@ components: .?$" title: Fqdn type: string + supportedApiVersions: + items: + type: string + minItems: 1 + type: array + noProfileMatchInfo: + $ref: '#/components/schemas/NoProfileMatchInfo' type: object Uri_1: description: String providing an URI formatted according to RFC 3986. @@ -1215,26 +1253,13 @@ components: description: It contains an invalid parameter and a related description. properties: param: - description: "If the invalid parameter is an attribute in a JSON body, this\ - \ IE shall contain the attribute's name and shall be encoded as a JSON\ - \ Pointer. If the invalid parameter is an HTTP header, this IE shall\ - \ be formatted as the concatenation of the string \"header \" plus the\ - \ name of such header. If the invalid parameter is a query parameter,\ - \ this IE shall be formatted as the concatenation of the string \"query\ - \ \" plus the name of such query parameter. If the invalid parameter\ - \ is a variable part in the path of a resource URI, this IE shall contain\ - \ the name of the variable, including the symbols \"{\" and \"}\" used\ - \ in OpenAPI specification as the notation to represent variable path\ - \ segments.\n" + description: | + If the invalid parameter is an attribute in a JSON body, this IE shall contain the attribute's name and shall be encoded as a JSON Pointer. If the invalid parameter is an HTTP header, this IE shall be formatted as the concatenation of the string "header " plus the name of such header. If the invalid parameter is a query parameter, this IE shall be formatted as the concatenation of the string "query " plus the name of such query parameter. If the invalid parameter is a variable part in the path of a resource URI, this IE shall contain the name of the variable, including the symbols "{" and "}" used in OpenAPI specification as the notation to represent variable path segments. title: param type: string reason: - description: "A human-readable reason, e.g. \"must be a positive integer\"\ - . In cases involving failed operations in a PATCH request, the reason\ - \ string should identify the operation that failed using the operation's\ - \ array index to assist in correlation of the invalid parameter with\ - \ the failed operation, e.g.\" Replacement value invalid for attribute\ - \ (failed operation index= 4)\"\n" + description: | + A human-readable reason, e.g. "must be a positive integer". In cases involving failed operations in a PATCH request, the reason string should identify the operation that failed using the operation's array index to assist in correlation of the invalid parameter with the failed operation, e.g." Replacement value invalid for attribute (failed operation index= 4)" title: reason type: string required: @@ -1242,18 +1267,8 @@ components: title: InvalidParam_1 type: object SupportedFeatures: - description: "A string used to indicate the features supported by an API that\ - \ is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain\ - \ a bitmask indicating supported features in hexadecimal representation Each\ - \ character in the string shall take a value of \"0\" to \"9\", \"a\" to\ - \ \"f\" or \"A\" to \"F\" and shall represent the support of 4 features as\ - \ described in table\_5.2.2-3. The most significant character representing\ - \ the highest-numbered features shall appear first in the string, and the\ - \ character representing features 1 to 4 shall appear last in the string.\ - \ The list of features and their numbering (starting with 1) are defined \ - \ separately for each API. If the string contains a lower number of characters\ - \ than there are defined features for an API, all features that would be\ - \ represented by characters that are not present in the string are not supported.\n" + description: | + A string used to indicate the features supported by an API that is used as defined in clause 6.6 in 3GPP TS 29.500. The string shall contain a bitmask indicating supported features in hexadecimal representation Each character in the string shall take a value of "0" to "9", "a" to "f" or "A" to "F" and shall represent the support of 4 features as described in table 5.2.2-3. The most significant character representing the highest-numbered features shall appear first in the string, and the character representing features 1 to 4 shall appear last in the string. The list of features and their numbering (starting with 1) are defined separately for each API. If the string contains a lower number of characters than there are defined features for an API, all features that would be represented by characters that are not present in the string are not supported. pattern: "^[A-Fa-f0-9]*$" title: supportedFeatures type: string @@ -1266,8 +1281,8 @@ components: title: Fqdn type: string WebsockNotifConfig: - description: Represents the configuration information for the delivery of notifications - over Websockets. + description: | + Represents the configuration information for the delivery of notifications over Websockets. example: requestWebsocketUri: true websocketUri: websocketUri @@ -1294,37 +1309,53 @@ components: example: ipv6Addr: ipv6Addr securityMethods: - - null - - null + - PSK + - PSK + fqdn: fqdn port: 5248 + apiPrefix: apiPrefix ipv4Addr: ipv4Addr - # oneOf: - # - required: - # - ipv4Addr - # - required: - # - ipv6Addr + nullable: true + oneOf: + - required: + - ipv4Addr + - required: + - ipv6Addr + - required: + - fqdn properties: ipv4Addr: - description: string identifying a Ipv4 address formatted in the "dotted - decimal" notation as defined in IETF RFC 1166. + description: | + string identifying a Ipv4 address formatted in the "dotted decimal" notation as defined in IETF RFC 1166. title: Ipv4Addr type: string ipv6Addr: - description: string identifying a Ipv6 address formatted according to clause - 4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 - of IETF RFC 5952 shall not be used. + description: | + string identifying a Ipv6 address formatted according to clause 4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of IETF RFC 5952 shall not be used. title: Ipv6Addr type: string + fqdn: + description: Fully Qualified Domain Name + maxLength: 253 + minLength: 4 + pattern: "^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\\.)+[A-Za-z]{2,63}\\\ + .?$" + title: Fqdn + type: string port: description: Unsigned integer with valid values between 0 and 65535. maximum: 65535 minimum: 0 title: Port type: integer + apiPrefix: + description: | + A string representing a sequence of path segments that starts with the slash character. + title: apiPrefix + type: string securityMethods: - description: "Security methods supported by the interface, it take precedence\ - \ over the security methods provided in AefProfile, for this specific\ - \ interface.\n" + description: | + Security methods supported by the interface, it take precedence over the security methods provided in AefProfile, for this specific interface. items: $ref: '#/components/schemas/SecurityMethod' minItems: 1 @@ -1334,20 +1365,32 @@ components: type: object SecurityMethod: anyOf: - - $ref: '#/components/schemas/SecurityMethod_anyOf' + - enum: + - PSK + - PKI + - OAUTH + type: string - description: | This string provides forward-compatibility with future extensions to the enumeration but is not used to encode content defined in the present version of this API. type: string - description: "Possible values are:\n- PSK: Security method 1 (Using TLS-PSK)\ - \ as described in 3GPP TS 33.122\n- PKI: Security method 2 (Using PKI) as\ - \ described in 3GPP TS 33.122\n- OAUTH: Security method 3 (TLS with OAuth\ - \ token) as described in 3GPP TS 33.122\n" + description: "Indicates the security method. \nPossible values are:\n- PSK:\ + \ Security method 1 (Using TLS-PSK) as described in 3GPP TS 33.122.\n- PKI:\ + \ Security method 2 (Using PKI) as described in 3GPP TS 33.122.\n- OAUTH:\ + \ Security method 3 (TLS with OAuth token) as described in 3GPP TS 33.122.\n" title: SecurityMethod DurationSec: description: Unsigned integer identifying a period of time in units of seconds. minimum: 0 title: expires_in type: integer + Gpsi: + description: "String identifying a Gpsi shall contain either an External Id\ + \ or an MSISDN. It shall be formatted as follows -External Identifier= \"\ + extid-'extid', where 'extid' shall be formatted according to clause 19.7.2\ + \ of 3GPP TS 23.003 that describes an External Identifier. \n" + pattern: "^(msisdn-[0-9]{5,15}|extid-[^@]+@[^@]+|.+)$" + title: Gpsi + type: string AccessTokenErr_1: description: Error returned in the access token response message properties: @@ -1375,8 +1418,8 @@ components: description: Contains information related to the access token request properties: grant_type: - # enum: - # - client_credentials + enum: + - client_credentials title: grant_type type: string nfInstanceId: @@ -1431,6 +1474,8 @@ components: type: array targetPlmn: $ref: '#/components/schemas/PlmnId' + targetSnpn: + $ref: '#/components/schemas/PlmnIdNid' targetSnssaiList: items: $ref: '#/components/schemas/Snssai' @@ -1491,15 +1536,69 @@ components: - scope title: AccessTokenReq_1 type: object + NoProfileMatchInfo: + description: Provides the reason for not finding NF matching the search criteria + properties: + reason: + $ref: '#/components/schemas/NoProfileMatchReason' + queryParamCombinationList: + items: + $ref: '#/components/schemas/QueryParamCombination' + minItems: 1 + title: queryParamCombinationList + type: array + required: + - reason + title: NoProfileMatchInfo + type: object + NoProfileMatchReason: + anyOf: + - enum: + - REQUESTER_PLMN_NOT_ALLOWED + - TARGET_NF_SUSPENDED + - TARGET_NF_UNDISCOVERABLE + - QUERY_PARAMS_COMBINATION_NO_MATCH + - TARGET_NF_TYPE_NOT_SUPPORTED + - UNSPECIFIED + type: string + - type: string + description: No Profile Match Reason + title: NoProfileMatchReason + QueryParamCombination: + description: Contains a list of Query Parameters + properties: + queryParams: + items: + $ref: '#/components/schemas/QueryParameter' + minItems: 1 + title: queryParams + type: array + required: + - queryParams + title: QueryParamCombination + type: object + QueryParameter: + description: Contains the name and value of a query parameter + properties: + name: + title: name + type: string + value: + title: value + type: string + required: + - name + - value + title: QueryParameter + type: object Ipv4Addr: - description: string identifying a Ipv4 address formatted in the "dotted decimal" - notation as defined in IETF RFC 1166. + description: | + string identifying a Ipv4 address formatted in the "dotted decimal" notation as defined in IETF RFC 1166. title: Ipv4Addr type: string Ipv6Addr: - description: string identifying a Ipv6 address formatted according to clause - 4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of - IETF RFC 5952 shall not be used. + description: | + string identifying a Ipv6 address formatted according to clause 4 in IETF RFC 5952. The mixed Ipv4 Ipv6 notation according to clause 5 of IETF RFC 5952 shall not be used. title: Ipv6Addr type: string Port: @@ -1517,14 +1616,78 @@ components: type: string NFType: anyOf: - - $ref: '#/components/schemas/NFType_anyOf' + - enum: + - NRF + - UDM + - AMF + - SMF + - AUSF + - NEF + - PCF + - SMSF + - NSSF + - UDR + - LMF + - GMLC + - 5G_EIR + - SEPP + - UPF + - N3IWF + - AF + - UDSF + - BSF + - CHF + - NWDAF + - PCSCF + - CBCF + - HSS + - UCMF + - SOR_AF + - SPAF + - MME + - SCSAS + - SCEF + - SCP + - NSSAAF + - ICSCF + - SCSCF + - DRA + - IMS_AS + - AANF + - 5G_DDNMF + - NSACF + - MFAF + - EASDF + - DCCF + - MB_SMF + - TSCTSF + - ADRF + - GBA_BSF + - CEF + - MB_UPF + - NSWOF + - PKMF + - MNPF + - SMS_GMSC + - SMS_IWMSC + - MBSF + - MBSTF + - PANF + - IP_SM_GW + - SMS_ROUTER + - DCSF + - MRF + - MRFP + - MF + - SLPKMF + - RH + type: string - type: string description: NF types known to NRF title: NFType PlmnId: - description: "When PlmnId needs to be converted to string (e.g. when used in\ - \ maps as key), the string shall be composed of three digits \"mcc\" followed\ - \ by \"-\" and two or three digits \"mnc\".\n" + description: | + When PlmnId needs to be converted to string (e.g. when used in maps as key), the string shall be composed of three digits "mcc" followed by "-" and two or three digits "mnc". properties: mcc: description: "Mobile Country Code part of the PLMN, comprising 3 digits,\ @@ -1534,7 +1697,7 @@ components: type: string mnc: description: "Mobile Network Code part of the PLMN, comprising 2 or 3 digits,\ - \ as defined in clause 9.3.3.5 of 3GPP TS 38.413." + \ as defined in clause 9.3.3.5 of 3GPP TS 38.413. \n" pattern: "^\\d{2,3}$" title: Mnc type: string @@ -1551,14 +1714,13 @@ components: type: string Mnc: description: "Mobile Network Code part of the PLMN, comprising 2 or 3 digits,\ - \ as defined in clause 9.3.3.5 of 3GPP TS 38.413." + \ as defined in clause 9.3.3.5 of 3GPP TS 38.413. \n" pattern: "^\\d{2,3}$" title: Mnc type: string Snssai: - description: "When Snssai needs to be converted to string (e.g. when used in\ - \ maps as key), the string shall be composed of one to three digits \"sst\"\ - \ optionally followed by \"-\" and 6 hexadecimal digits \"sd\".\n" + description: | + When Snssai needs to be converted to string (e.g. when used in maps as key), the string shall be composed of one to three digits "sst" optionally followed by "-" and 6 hexadecimal digits "sd". properties: sst: description: "Unsigned integer, within the range 0 to 255, representing\ @@ -1572,16 +1734,8 @@ components: title: sst type: integer sd: - description: "3-octet string, representing the Slice Differentiator, in\ - \ hexadecimal representation. Each character in the string shall take\ - \ a value of \"0\" to \"9\", \"a\" to \"f\" or \"A\" to \"F\" and shall\ - \ represent 4 bits. The most significant character representing the 4\ - \ most significant bits of the SD shall appear first in the string, and\ - \ the character representing the 4 least significant bit of the SD shall\ - \ appear last in the string. This is an optional parameter that complements\ - \ the Slice/Service type(s) to allow to differentiate amongst multiple\ - \ Network Slices of the same Slice/Service type. This IE shall be absent\ - \ if no SD value is associated with the SST.\n" + description: | + 3-octet string, representing the Slice Differentiator, in hexadecimal representation. Each character in the string shall take a value of "0" to "9", "a" to "f" or "A" to "F" and shall represent 4 bits. The most significant character representing the 4 most significant bits of the SD shall appear first in the string, and the character representing the 4 least significant bit of the SD shall appear last in the string. This is an optional parameter that complements the Slice/Service type(s) to allow to differentiate amongst multiple Network Slices of the same Slice/Service type. This IE shall be absent if no SD value is associated with the SST. pattern: "^[A-Fa-f0-9]{6}$" title: sd type: string @@ -1590,8 +1744,8 @@ components: title: Snssai type: object PlmnIdNid: - description: "Contains the serving core network operator PLMN ID and, for an\ - \ SNPN, the NID that together with the PLMN ID identifies the SNPN.\n" + description: | + Contains the serving core network operator PLMN ID and, for an SNPN, the NID that together with the PLMN ID identifies the SNPN. properties: mcc: description: "Mobile Country Code part of the PLMN, comprising 3 digits,\ @@ -1601,7 +1755,7 @@ components: type: string mnc: description: "Mobile Network Code part of the PLMN, comprising 2 or 3 digits,\ - \ as defined in clause 9.3.3.5 of 3GPP TS 38.413." + \ as defined in clause 9.3.3.5 of 3GPP TS 38.413. \n" pattern: "^\\d{2,3}$" title: Mnc type: string @@ -1655,75 +1809,3 @@ components: \ an alphabetic character or a digit.\n" title: NfServiceSetId type: string - Cause_anyOf: - enum: - - OVERLIMIT_USAGE - - UNEXPECTED_REASON - title: Cause_anyOf - type: string - SecurityMethod_anyOf: - enum: - - PSK - - PKI - - OAUTH - title: SecurityMethod_anyOf - type: string - NFType_anyOf: - enum: - - NRF - - UDM - - AMF - - SMF - - AUSF - - NEF - - PCF - - SMSF - - NSSF - - UDR - - LMF - - GMLC - - 5G_EIR - - SEPP - - UPF - - N3IWF - - AF - - UDSF - - BSF - - CHF - - NWDAF - - PCSCF - - CBCF - - HSS - - UCMF - - SOR_AF - - SPAF - - MME - - SCSAS - - SCEF - - SCP - - NSSAAF - - ICSCF - - SCSCF - - DRA - - IMS_AS - - AANF - - 5G_DDNMF - - NSACF - - MFAF - - EASDF - - DCCF - - MB_SMF - - TSCTSF - - ADRF - - GBA_BSF - - CEF - - MB_UPF - - NSWOF - - PKMF - - MNPF - - SMS_GMSC - - SMS_IWMSC - - MBSF - - MBSTF - title: NFType_anyOf - type: string diff --git a/services/TS29222_CAPIF_Security_API/capif_security/typing_utils.py b/services/TS29222_CAPIF_Security_API/capif_security/typing_utils.py index 0563f81..74e3c91 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/typing_utils.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/typing_utils.py @@ -1,5 +1,3 @@ -# coding: utf-8 - import sys if sys.version_info < (3, 7): diff --git a/services/TS29222_CAPIF_Security_API/capif_security/util.py b/services/TS29222_CAPIF_Security_API/capif_security/util.py index 72d18d9..97d93c9 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/util.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/util.py @@ -1,8 +1,7 @@ import datetime -import six -import typing_utils - +import typing +from capif_security import typing_utils def serialize_clean_camel_case(obj): res = obj.to_dict() @@ -64,7 +63,7 @@ def _deserialize(data, klass): if data is None: return None - if klass in six.integer_types or klass in (float, str, bool, bytearray): + if klass in (int, float, str, bool, bytearray): return _deserialize_primitive(data, klass) elif klass == object: return _deserialize_object(data) @@ -93,7 +92,7 @@ def _deserialize_primitive(data, klass): try: value = klass(data) except UnicodeEncodeError: - value = six.u(data) + value = data except TypeError: value = data return value @@ -158,7 +157,7 @@ def deserialize_model(data, klass): if not instance.openapi_types: return data - for attr, attr_type in six.iteritems(instance.openapi_types): + for attr, attr_type in instance.openapi_types.items(): if data is not None \ and instance.attribute_map[attr] in data \ and isinstance(data, (list, dict)): @@ -193,4 +192,4 @@ def _deserialize_dict(data, boxed_type): :rtype: dict """ return {k: _deserialize(v, boxed_type) - for k, v in six.iteritems(data)} + for k, v in data.items() } diff --git a/services/TS29222_CAPIF_Security_API/git_push.sh b/services/TS29222_CAPIF_Security_API/git_push.sh index 9405f72..f53a75d 100644 --- a/services/TS29222_CAPIF_Security_API/git_push.sh +++ b/services/TS29222_CAPIF_Security_API/git_push.sh @@ -1,7 +1,7 @@ #!/bin/sh # ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/ # -# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com" +# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com" git_user_id=$1 git_repo_id=$2 @@ -38,14 +38,14 @@ git add . git commit -m "$release_note" # Sets the new remote -git_remote=`git remote` +git_remote=$(git remote) if [ "$git_remote" = "" ]; then # git remote not defined if [ "$GIT_TOKEN" = "" ]; then echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment." git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git else - git remote add origin https://${git_user_id}:${GIT_TOKEN}@${git_host}/${git_user_id}/${git_repo_id}.git + git remote add origin https://${git_user_id}:"${GIT_TOKEN}"@${git_host}/${git_user_id}/${git_repo_id}.git fi fi diff --git a/services/TS29222_CAPIF_Security_API/main.py b/services/TS29222_CAPIF_Security_API/main.py deleted file mode 100644 index d770937..0000000 --- a/services/TS29222_CAPIF_Security_API/main.py +++ /dev/null @@ -1,61 +0,0 @@ - -from capif_security.models import ServiceSecurity - - -json_data = { - "securityInfo": [ - { - "interfaceDetails": { - "ipv4Addr": "string", - "ipv6Addr": "string", - "port": 65535, - "securityMethods": [ - "PSK", - "PKI" - ] - }, - "aefId": "string", - "apiId": "string", - "prefSecurityMethods": [ - "PSK", - "PKI" - ], - "selSecurityMethod": "PSK", - "authenticationInfo": "string", - "authorizationInfo": "string" - }, - { - "interfaceDetails": { - "ipv4Addr": "string", - "ipv6Addr": "string", - "port": 65535, - "securityMethods": [ - "PSK", - "string" - ] - }, - "aefId": "string", - "apiId": "string", - "prefSecurityMethods": [ - "PSK", - "string" - ], - "selSecurityMethod": "PSK", - "authenticationInfo": "string", - "authorizationInfo": "string" - } - ], - "notificationDestination": "string", - "requestTestNotification": True, - "websockNotifConfig": { - "websocketUri": "string", - "requestWebsocketUri": True - }, - "supportedFeatures": "fff" - } - -#print(json_data) - -my_ser = ServiceSecurity.from_dict(json_data) - -print(my_ser) \ No newline at end of file diff --git a/services/TS29222_CAPIF_Security_API/requirements.txt b/services/TS29222_CAPIF_Security_API/requirements.txt index b92f321..a226bf8 100644 --- a/services/TS29222_CAPIF_Security_API/requirements.txt +++ b/services/TS29222_CAPIF_Security_API/requirements.txt @@ -22,4 +22,4 @@ opentelemetry-sdk == 1.17.0 flask_executor == 1.0.0 Werkzeug == 2.2.3 gunicorn == 22.0.0 -packaging == 24.0 +packaging == 24.0 \ No newline at end of file diff --git a/services/TS29222_CAPIF_Security_API/setup.py b/services/TS29222_CAPIF_Security_API/setup.py index d763e2e..9653f40 100644 --- a/services/TS29222_CAPIF_Security_API/setup.py +++ b/services/TS29222_CAPIF_Security_API/setup.py @@ -1,5 +1,3 @@ -# coding: utf-8 - import sys from setuptools import setup, find_packages @@ -33,7 +31,7 @@ setup( entry_points={ 'console_scripts': ['capif_security=capif_security.__main__:main']}, long_description="""\ - API for CAPIF security management. © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. + API for CAPIF security management. © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. """ ) diff --git a/services/TS29222_CAPIF_Security_API/test-requirements.txt b/services/TS29222_CAPIF_Security_API/test-requirements.txt index 202a684..58f51d6 100644 --- a/services/TS29222_CAPIF_Security_API/test-requirements.txt +++ b/services/TS29222_CAPIF_Security_API/test-requirements.txt @@ -1,4 +1,4 @@ -pytest~=4.6.7 # needed for python 2.7+3.4 +pytest~=7.1.0 pytest-cov>=2.8.1 -pytest-randomly == 1.2.3 # needed for python 2.7+3.4 -Flask-Testing == 0.8.0 +pytest-randomly>=1.2.3 +Flask-Testing==0.8.1 diff --git a/services/TS29222_CAPIF_Security_API/tox.ini b/services/TS29222_CAPIF_Security_API/tox.ini index f9b3b3b..17b99b7 100644 --- a/services/TS29222_CAPIF_Security_API/tox.ini +++ b/services/TS29222_CAPIF_Security_API/tox.ini @@ -5,7 +5,7 @@ skipsdist=True [testenv] deps=-r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt - {toxinidir} + {toxinidir} commands= pytest --cov=capif_security diff --git a/tests/libraries/security_api/bodyRequests.py b/tests/libraries/security_api/bodyRequests.py index 6adcc4c..dabee87 100644 --- a/tests/libraries/security_api/bodyRequests.py +++ b/tests/libraries/security_api/bodyRequests.py @@ -76,10 +76,10 @@ def create_security_notification_body(api_invoker_id, api_ids, cause="OVERLIMIT_ return data -def create_access_token_req_body(client_id, scope, client_secret=None,grant_type="client_credentials"): +def create_access_token_req_body(client_id, scope, client_secret=None, grant_type="client_credentials"): data = { - "client_id": client_id, "grant_type": grant_type, + "client_id": client_id, "scope": scope } -- GitLab